--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_accounting.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_accounting.lib.php
@@ -3 +3 @@
- * Copyright (C) 2013-2021 Alexandre Spangaro   <aspangaro@open-dsi.fr>

+ * Copyright (C) 2013-2017 Alexandre Spangaro   <aspangaro@open-dsi.fr>

@@ -5,2 +5 @@
- * Copyright (C) 2019      Eric Seigne          <eric.seigne@cap-rel.fr>

- * Copyright (C) 2021      Frédéric France      <frederic.france@netlogic.fr>

+ * Copyright (C) 2019      Eric Seigne         <eric.seigne@cap-rel.fr>

@@ -60 +59 @@
-	$head[$h][1] = $langs->trans("AccountAccounting");

+	$head[$h][1] = $langs->trans("Asset");

@@ -98,9 +97,5 @@
-	if ($account < 0 || is_empty($account)) {

-		return '';

-	}

-

-	if (getDolGlobalString('ACCOUNTING_MANAGE_ZERO')) {

-		return $account;

-	}

-

-	$g = getDolGlobalInt('ACCOUNTING_LENGTH_GACCOUNT');

+	if ($account < 0 || is_empty($account)) return '';

+

+	if (!is_empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $account;

+

+	$g = $conf->global->ACCOUNTING_LENGTH_GACCOUNT;

@@ -137,9 +132,5 @@
-	if ($accounta < 0 || is_empty($accounta)) {

-		return '';

-	}

-

-	if (getDolGlobalString('ACCOUNTING_MANAGE_ZERO')) {

-		return $accounta;

-	}

-

-	$a = getDolGlobalInt('ACCOUNTING_LENGTH_AACCOUNT');

+	if ($accounta < 0 || is_empty($accounta)) return '';

+

+	if (!is_empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $accounta;

+

+	$a = $conf->global->ACCOUNTING_LENGTH_AACCOUNT;

@@ -185,202 +176,70 @@
-	global $langs;

-

-	print "\n\n<!-- start banner journal -->\n";

-

-	if (!is_empty($varlink)) {

-		$varlink = '?'.$varlink;

-	}

-

-	$head = array();

-	$h = 0;

-	$head[$h][0] = $_SERVER["PHP_SELF"].$varlink;

-	$head[$h][1] = $langs->trans("Journalization");

-	$head[$h][2] = 'journal';

-

-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].$varlink.'">';

-	print '<input type="hidden" name="token" value="'.newToken().'">';

-

-	print dol_get_fiche_head($head, 'journal');

-

-	foreach ($moreparam as $key => $value) {

-		print '<input type="hidden" name="'.$key.'" value="'.$value.'">';

-	}

-	print '<table class="border centpercent tableforfield">';

-

-	// Ligne de titre

-	print '<tr>';

-	print '<td class="titlefieldcreate">'.$langs->trans("Name").'</td>';

-	print '<td colspan="3">';

-	print $nom;

-	print '</td>';

-	print '</tr>';

-

-	// Calculation mode

-	if ($calcmode) {

-		print '<tr>';

-		print '<td>'.$langs->trans("CalculationMode").'</td>';

-		if (!$variante) {

-			print '<td colspan="3">';

-		} else {

-			print '<td>';

-		}

-		print $calcmode;

-		if ($variante) {

-			print '</td><td colspan="2">'.$variante;

-		}

-		print '</td>';

-		print '</tr>';

-	}

-

-	// Ligne de la periode d'analyse du rapport

-	print '<tr>';

-	print '<td>'.$langs->trans("ReportPeriod").'</td>';

-	if (!$periodlink) {

-		print '<td colspan="3">';

-	} else {

-		print '<td>';

-	}

-	if ($period) {

-		print $period;

-	}

-	if ($periodlink) {

-		print '</td><td colspan="2">'.$periodlink;

-	}

-	print '</td>';

-	print '</tr>';

-

-	// Ligne de description

-	print '<tr>';

-	print '<td>'.$langs->trans("ReportDescription").'</td>';

-	print '<td colspan="3">'.$description.'</td>';

-	print '</tr>';

-

-	print '</table>';

-

-	print dol_get_fiche_end();

-

-	print '<div class="center"><input type="submit" class="button" name="submit" value="'.$langs->trans("Refresh").'"></div>';

-

-	print '</form>';

-

-	print "\n<!-- end banner journal -->\n\n";

-}

-

-/**

- * Return Default dates for transfer based on periodicity option in accountancy setup

- *

- * @return	array		Dates of periodicity by default

- */

-function getDefaultDatesForTransfer()

-{

-	global $db, $conf;

-

-	$date_start = '';

-	$date_end = '';

-	$pastmonth = 0;

-	$pastmonthyear = 0;

-

-	// Period by default on transfer (0: previous month | 1: current month | 2: fiscal year)

-	$periodbydefaultontransfer = getDolGlobalInt('ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER', 0);

-	if ($periodbydefaultontransfer == 2) {	// fiscal year

-		$sql = "SELECT date_start, date_end FROM ".MAIN_DB_PREFIX."accounting_fiscalyear";

-		$sql .= " WHERE date_start < '".$db->idate(dol_now())."' AND date_end > '".$db->idate(dol_now())."'";

-		$sql .= $db->plimit(1);

-		$res = $db->query($sql);

-		if ($res->num_rows > 0) {

-			$obj = $db->fetch_object($res);

-

-			$date_start = $db->jdate($obj->date_start);

-			$date_end = $db->jdate($obj->date_end);

-		} else {

-			$month_start = getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1);

-			$year_start = dol_print_date(dol_now(), '%Y');

-			if ($month_start > dol_print_date(dol_now(), '%m')) {

-				$year_start = $year_start - 1;

-			}

-			$year_end = $year_start + 1;

-			$month_end = $month_start - 1;

-			if ($month_end < 1) {

-				$month_end = 12;

-				$year_end--;

-			}

-			$date_start = dol_mktime(0, 0, 0, $month_start, 1, $year_start);

-			$date_end = dol_get_last_day($year_end, $month_end);

-		}

-	} elseif ($periodbydefaultontransfer == 1) {	// current month

-		$year_current = (int) dol_print_date(dol_now('gmt'), "%Y", 'gmt');

-		$pastmonth = (int) dol_print_date(dol_now('gmt'), '%m', 'gmt');

-		$pastmonthyear = $year_current;

-		if ($pastmonth == 0) {

-			$pastmonth = 12;

-			$pastmonthyear--;

-		}

-	} else {	// previous month

-		$year_current = (int) dol_print_date(dol_now('gmt'), "%Y", 'gmt');

-		$pastmonth = (int) dol_print_date(dol_now('gmt'), '%m', 'gmt') - 1;

-		$pastmonthyear = $year_current;

-		if ($pastmonth == 0) {

-			$pastmonth = 12;

-			$pastmonthyear--;

-		}

-	}

-

-	return array(

-		'date_start' => $date_start,

-		'date_end' => $date_end,

-		'pastmonthyear' => $pastmonthyear,

-		'pastmonth' => $pastmonth

-	);

-}

-

-/**

- * Get current period of fiscal year

- *

- * @param 	DoliDB		$db				Database handler

- * @param 	stdClass	$conf			Config

- * @param 	int 		$from_time		[=null] Get current time or set time to find fiscal period

- * @return 	array		Period of fiscal year : [date_start, date_end]

- */

-function getCurrentPeriodOfFiscalYear($db, $conf, $from_time = null)

-{

-	$now = dol_now();

-	$now_arr = dol_getdate($now);

-	if ($from_time === null) {

-		$from_time = $now;

-	}

-	$from_db_time = $db->idate($from_time);

-

-	$sql  = "SELECT date_start, date_end FROM ".$db->prefix()."accounting_fiscalyear";

-	$sql .= " WHERE date_start <= '".$db->escape($from_db_time)."' AND date_end >= '".$db->escape($from_db_time)."'";

-	$sql .= $db->order('date_start', 'DESC');

-	$sql .= $db->plimit(1);

-	$res = $db->query($sql);

-	if ($db->num_rows($res) > 0) {

-		$obj = $db->fetch_object($res);

-

-		$date_start = $db->jdate($obj->date_start);

-		$date_end = $db->jdate($obj->date_end);

-	} else {

-		$month_start = 1;

-		$conf_fiscal_month_start = (int) $conf->global->SOCIETE_FISCAL_MONTH_START;

-		if ($conf_fiscal_month_start >= 1 && $conf_fiscal_month_start <= 12) {

-			$month_start = $conf_fiscal_month_start;

-		}

-		$year_start = $now_arr['year'];

-		if ($conf_fiscal_month_start > $now_arr['mon']) {

-			$year_start = $year_start - 1;

-		}

-		$year_end = $year_start + 1;

-		$month_end = $month_start - 1;

-		if ($month_end < 1) {

-			$month_end = 12;

-			$year_end--;

-		}

-		$date_start = dol_mktime(0, 0, 0, $month_start, 1, $year_start);

-		$date_end = dol_get_last_day($year_end, $month_end);

-	}

-

-	return array(

-		'date_start' => $date_start,

-		'date_end' => $date_end,

-	);

-}

+    global $langs;

+

+    print "\n\n<!-- start banner journal -->\n";

+

+    if (!is_empty($varlink)) $varlink = '?'.$varlink;

+

+    $head = array();

+    $h = 0;

+    $head[$h][0] = $_SERVER["PHP_SELF"].$varlink;

+    $head[$h][1] = $langs->trans("Journalization");

+    $head[$h][2] = 'journal';

+

+    print '<form method="POST" action="'.$_SERVER["PHP_SELF"].$varlink.'">';

+    print '<input type="hidden" name="token" value="'.newToken().'">';

+

+    dol_fiche_head($head, 'journal');

+

+    foreach ($moreparam as $key => $value)

+    {

+        print '<input type="hidden" name="'.$key.'" value="'.$value.'">';

+    }

+    print '<table width="100%" class="border">';

+

+    // Ligne de titre

+    print '<tr>';

+    print '<td width="110">'.$langs->trans("Name").'</td>';

+    print '<td colspan="3">';

+    print $nom;

+    print '</td>';

+    print '</tr>';

+

+    // Calculation mode

+    if ($calcmode)

+    {

+        print '<tr>';

+        print '<td width="110">'.$langs->trans("CalculationMode").'</td>';

+        if (!$variante) print '<td colspan="3">';

+        else print '<td>';

+        print $calcmode;

+        if ($variante) print '</td><td colspan="2">'.$variante;

+        print '</td>';

+        print '</tr>';

+    }

+

+    // Ligne de la periode d'analyse du rapport

+    print '<tr>';

+    print '<td>'.$langs->trans("ReportPeriod").'</td>';

+    if (!$periodlink) print '<td colspan="3">';

+    else print '<td>';

+    if ($period) print $period;

+    if ($periodlink) print '</td><td colspan="2">'.$periodlink;

+    print '</td>';

+    print '</tr>';

+

+    // Ligne de description

+    print '<tr>';

+    print '<td>'.$langs->trans("ReportDescription").'</td>';

+    print '<td colspan="3">'.$description.'</td>';

+    print '</tr>';

+

+    print '</table>';

+

+    dol_fiche_end();

+

+    print '<div class="center"><input type="submit" class="button" name="submit" value="'.$langs->trans("Refresh").'"></div>';

+

+    print '</form>';

+

+    print "\n<!-- end banner journal -->\n\n";

+}

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_admin.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_admin.lib.php
@@ -6 +5,0 @@
- * Copyright (C) 2023       Eric Seigne      		<eric.seigne@cap-rel.fr>

@@ -39,11 +38,5 @@
-	$string = '?';

-	if (isset($versionarray[0])) {

-		$string = $versionarray[0];

-	}

-	if (isset($versionarray[1])) {

-		$string .= '.'.$versionarray[1];

-	}

-	if (isset($versionarray[2])) {

-		$string .= '.'.$versionarray[2];

-	}

-	return $string;

+    $string = '?';

+    if (isset($versionarray[0])) $string = $versionarray[0];

+    if (isset($versionarray[1])) $string .= '.'.$versionarray[1];

+    if (isset($versionarray[2])) $string .= '.'.$versionarray[2];

+    return $string;

@@ -55 +48 @@
- *  For example: if (versioncompare(versiondolibarrarray(),array(4,0,-5)) >= 0) is true if version is 4.0 alpha or higher.

+ *  For example: if (versioncompare(versiondolibarrarray(),array(4,0,-4)) >= 0) is true if version is 4.0 alpha or higher.

@@ -69,51 +62,26 @@
-	$ret = 0;

-	$level = 0;

-	$count1 = count($versionarray1);

-	$count2 = count($versionarray2);

-	$maxcount = max($count1, $count2);

-	while ($level < $maxcount) {

-		$operande1 = isset($versionarray1[$level]) ? $versionarray1[$level] : 0;

-		$operande2 = isset($versionarray2[$level]) ? $versionarray2[$level] : 0;

-		if (preg_match('/alpha|dev/i', $operande1)) {

-			$operande1 = -5;

-		}

-		if (preg_match('/alpha|dev/i', $operande2)) {

-			$operande2 = -5;

-		}

-		if (preg_match('/beta$/i', $operande1)) {

-			$operande1 = -4;

-		}

-		if (preg_match('/beta$/i', $operande2)) {

-			$operande2 = -4;

-		}

-		if (preg_match('/beta([0-9])+/i', $operande1)) {

-			$operande1 = -3;

-		}

-		if (preg_match('/beta([0-9])+/i', $operande2)) {

-			$operande2 = -3;

-		}

-		if (preg_match('/rc$/i', $operande1)) {

-			$operande1 = -2;

-		}

-		if (preg_match('/rc$/i', $operande2)) {

-			$operande2 = -2;

-		}

-		if (preg_match('/rc([0-9])+/i', $operande1)) {

-			$operande1 = -1;

-		}

-		if (preg_match('/rc([0-9])+/i', $operande2)) {

-			$operande2 = -1;

-		}

-		$level++;

-		//print 'level '.$level.' '.$operande1.'-'.$operande2.'<br>';

-		if ($operande1 < $operande2) {

-			$ret = -$level;

-			break;

-		}

-		if ($operande1 > $operande2) {

-			$ret = $level;

-			break;

-		}

-	}

-	//print join('.',$versionarray1).'('.count($versionarray1).') / '.join('.',$versionarray2).'('.count($versionarray2).') => '.$ret.'<br>'."\n";

-	return $ret;

+    $ret = 0;

+    $level = 0;

+    $count1 = count($versionarray1);

+    $count2 = count($versionarray2);

+    $maxcount = max($count1, $count2);

+    while ($level < $maxcount)

+    {

+        $operande1 = isset($versionarray1[$level]) ? $versionarray1[$level] : 0;

+        $operande2 = isset($versionarray2[$level]) ? $versionarray2[$level] : 0;

+        if (preg_match('/alpha|dev/i', $operande1)) $operande1 = -5;

+        if (preg_match('/alpha|dev/i', $operande2)) $operande2 = -5;

+        if (preg_match('/beta$/i', $operande1)) $operande1 = -4;

+        if (preg_match('/beta$/i', $operande2)) $operande2 = -4;

+        if (preg_match('/beta([0-9])+/i', $operande1)) $operande1 = -3;

+        if (preg_match('/beta([0-9])+/i', $operande2)) $operande2 = -3;

+        if (preg_match('/rc$/i', $operande1)) $operande1 = -2;

+        if (preg_match('/rc$/i', $operande2)) $operande2 = -2;

+        if (preg_match('/rc([0-9])+/i', $operande1)) $operande1 = -1;

+        if (preg_match('/rc([0-9])+/i', $operande2)) $operande2 = -1;

+        $level++;

+        //print 'level '.$level.' '.$operande1.'-'.$operande2.'<br>';

+        if ($operande1 < $operande2) { $ret = -$level; break; }

+        if ($operande1 > $operande2) { $ret = $level; break; }

+    }

+    //print join('.',$versionarray1).'('.count($versionarray1).') / '.join('.',$versionarray2).'('.count($versionarray2).') => '.$ret.'<br>'."\n";

+    return $ret;

@@ -127 +94,0 @@
- *  @see versioncompare()

@@ -131 +98 @@
-	return explode('.', PHP_VERSION);

+    return explode('.', PHP_VERSION);

@@ -138 +104,0 @@
- *  @see versioncompare()

@@ -142 +108 @@
-	return explode('.', DOL_VERSION);

+    return explode('.', DOL_VERSION);

@@ -155,250 +121,185 @@
- *	@param		string		$sqlfile					Full path to sql file

- * 	@param		int			$silent						1=Do not output anything, 0=Output line for update page

- * 	@param		int			$entity						Entity targeted for multicompany module

- *	@param		int			$usesavepoint				1=Run a savepoint before each request and a rollback to savepoint if error (this allow to have some request with errors inside global transactions).

- *	@param		string		$handler					Handler targeted for menu (replace __HANDLER__ with this value between quotes)

- *	@param 		string		$okerror					Family of errors we accept ('default', 'none')

- *  @param		int			$linelengthlimit			Limit for length of each line (Use 0 if unknown, may be faster if defined)

- *  @param		int			$nocommentremoval			Do no try to remove comments (in such a case, we consider that each line is a request, so use also $linelengthlimit=0)

- *  @param		int			$offsetforchartofaccount	Offset to use to load chart of account table to update sql on the fly to add offset to rowid and account_parent value

- *  @param		int			$colspan					2=Add a colspan=2 on td

- *  @param		int			$onlysqltoimportwebsite		Only sql resquests used to import a website template are allowed

- *  @param		string		$database					Database (replace __DATABASE__ with this value)

- * 	@return		int										Return integer <=0 if KO, >0 if OK

- */

-function run_sql($sqlfile, $silent = 1, $entity = 0, $usesavepoint = 1, $handler = '', $okerror = 'default', $linelengthlimit = 32768, $nocommentremoval = 0, $offsetforchartofaccount = 0, $colspan = 0, $onlysqltoimportwebsite = 0, $database = '')

-{

-	global $db, $conf, $langs, $user;

-

-	dol_syslog("Admin.lib::run_sql run sql file ".$sqlfile." silent=".$silent." entity=".$entity." usesavepoint=".$usesavepoint." handler=".$handler." okerror=".$okerror, LOG_DEBUG);

-

-	if (!is_numeric($linelengthlimit)) {

-		dol_syslog("Admin.lib::run_sql param linelengthlimit is not a numeric", LOG_ERR);

-		return -1;

-	}

-

-	$ok = 0;

-	$error = 0;

-	$i = 0;

-	$buffer = '';

-	$arraysql = array();

-

-	// Get version of database

-	$versionarray = $db->getVersionArray();

-

-	$fp = fopen($sqlfile, "r");

-	if ($fp) {

-		while (!feof($fp)) {

-			// Warning fgets with second parameter that is null or 0 hang.

-			if ($linelengthlimit > 0) {

-				$buf = fgets($fp, $linelengthlimit);

-			} else {

-				$buf = fgets($fp);

-			}

-

-			// Test if request must be ran only for particular database or version (if yes, we must remove the -- comment)

-			$reg = array();

-			if (preg_match('/^--\sV(MYSQL|PGSQL)([^\s]*)/i', $buf, $reg)) {

-				$qualified = 1;

-

-				// restrict on database type

-				if (!empty($reg[1])) {

-					if (!preg_match('/'.preg_quote($reg[1]).'/i', $db->type)) {

-						$qualified = 0;

-					}

-				}

-

-				// restrict on version

-				if ($qualified) {

-					if (!empty($reg[2])) {

-						if (is_numeric($reg[2])) {	// This is a version

-							$versionrequest = explode('.', $reg[2]);

-							//var_dump($versionrequest);

-							//var_dump($versionarray);

-							if (!count($versionrequest) || !count($versionarray) || versioncompare($versionrequest, $versionarray) > 0) {

-								$qualified = 0;

-							}

-						} else { // This is a test on a constant. For example when we have -- VMYSQLUTF8UNICODE, we test constant $conf->global->UTF8UNICODE

-							$dbcollation = strtoupper(preg_replace('/_/', '', $conf->db->dolibarr_main_db_collation));

-							//var_dump($reg[2]);

-							//var_dump($dbcollation);

-							if (empty($conf->db->dolibarr_main_db_collation) || ($reg[2] != $dbcollation)) {

-								$qualified = 0;

-							}

-							//var_dump($qualified);

-						}

-					}

-				}

-

-				if ($qualified) {

-					// Version qualified, delete SQL comments

-					$buf = preg_replace('/^--\sV(MYSQL|PGSQL)([^\s]*)/i', '', $buf);

-					//print "Ligne $i qualifi?e par version: ".$buf.'<br>';

-				}

-			}

-

-			// Add line buf to buffer if not a comment

-			if ($nocommentremoval || !preg_match('/^\s*--/', $buf)) {

-				if (empty($nocommentremoval)) {

-					$buf = preg_replace('/([,;ERLT\)])\s*--.*$/i', '\1', $buf); //remove comment from a line that not start with -- before add it to the buffer

-				}

-				if ($buffer) {

-					$buffer .= ' ';

-				}

-				$buffer .= trim($buf);

-			}

-

-			//print $buf.'<br>';exit;

-

-			if (preg_match('/;/', $buffer)) {	// If string contains ';', it's end of a request string, we save it in arraysql.

-				// Found new request

-				if ($buffer) {

-					$arraysql[$i] = $buffer;

-				}

-				$i++;

-				$buffer = '';

-			}

-		}

-

-		if ($buffer) {

-			$arraysql[$i] = $buffer;

-		}

-		fclose($fp);

-	} else {

-		dol_syslog("Admin.lib::run_sql failed to open file ".$sqlfile, LOG_ERR);

-	}

-

-	// Loop on each request to see if there is a __+MAX_table__ key

-	$listofmaxrowid = array(); // This is a cache table

-	foreach ($arraysql as $i => $sql) {

-		$newsql = $sql;

-

-		// Replace __+MAX_table__ with max of table

-		while (preg_match('/__\+MAX_([A-Za-z0-9_]+)__/i', $newsql, $reg)) {

-			$table = $reg[1];

-			if (!isset($listofmaxrowid[$table])) {

-				//var_dump($db);

-				$sqlgetrowid = 'SELECT MAX(rowid) as max from '.preg_replace('/^llx_/', MAIN_DB_PREFIX, $table);

-				$resql = $db->query($sqlgetrowid);

-				if ($resql) {

-					$obj = $db->fetch_object($resql);

-					$listofmaxrowid[$table] = $obj->max;

-					if (empty($listofmaxrowid[$table])) {

-						$listofmaxrowid[$table] = 0;

-					}

-				} else {

-					if (!$silent) {

-						print '<tr><td class="tdtop"'.($colspan ? ' colspan="'.$colspan.'"' : '').'>';

-						print '<div class="error">'.$langs->trans("Failed to get max rowid for ".$table)."</div>";

-						print '</td></tr>';

-					}

-					$error++;

-					break;

-				}

-			}

-			// Replace __+MAX_llx_table__ with +999

-			$from = '__+MAX_'.$table.'__';

-			$to = '+'.$listofmaxrowid[$table];

-			$newsql = str_replace($from, $to, $newsql);

-			dol_syslog('Admin.lib::run_sql New Request '.($i + 1).' (replacing '.$from.' to '.$to.')', LOG_DEBUG);

-

-			$arraysql[$i] = $newsql;

-		}

-

-		if ($offsetforchartofaccount > 0) {

-			// Replace lines

-			// 'INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1401, 'PCG99-ABREGE', 'CAPIT', '1234', 1400,...'

-			// with

-			// 'INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1401 + 200100000, 'PCG99-ABREGE','CAPIT', '1234', 1400 + 200100000,...'

-			// Note: string with 'PCG99-ABREGE','CAPIT', 1234  instead of  'PCG99-ABREGE','CAPIT', '1234' is also supported

-			$newsql = preg_replace('/VALUES\s*\(__ENTITY__, \s*(\d+)\s*,(\s*\'[^\',]*\'\s*,\s*\'[^\',]*\'\s*,\s*\'?[^\',]*\'?\s*),\s*\'?([^\',]*)\'?/ims', 'VALUES (__ENTITY__, \1 + '.((int) $offsetforchartofaccount).', \2, \3 + '.((int) $offsetforchartofaccount), $newsql);

-			$newsql = preg_replace('/([,\s])0 \+ '.((int) $offsetforchartofaccount).'/ims', '\1 0', $newsql);

-			//var_dump($newsql);

-			$arraysql[$i] = $newsql;

-

-			// FIXME Because we force the rowid during insert, we must also update the sequence with postgresql by running

-			// SELECT dol_util_rebuild_sequences();

-		}

-	}

-

-	// Loop on each request to execute request

-	$cursorinsert = 0;

-	$listofinsertedrowid = array();

-	$keyforsql = md5($sqlfile);

-	foreach ($arraysql as $i => $sql) {

-		if ($sql) {

-			// Test if th SQL is allowed SQL

-			if ($onlysqltoimportwebsite) {

-				$newsql = str_replace(array("\'"), '__BACKSLASHQUOTE__', $sql);	// Replace the \' char

-

-				// Remove all strings contents including the ' so we can analyse SQL instruction only later

-				$l = strlen($newsql);

-				$is = 0;

-				$quoteopen = 0;

-				$newsqlclean = '';

-				while ($is < $l) {

-					$char = $newsql[$is];

-					if ($char == "'") {

-						if ($quoteopen) {

-							$quoteopen--;

-						} else {

-							$quoteopen++;

-						}

-					} elseif (empty($quoteopen)) {

-						$newsqlclean .= $char;

-					}

-					$is++;

-				}

-				$newsqlclean = str_replace(array("null"), '__000__', $newsqlclean);

-				//print $newsqlclean."<br>\n";

-

-				$qualified = 0;

-

-				// A very small control. This can still by bypassed by adding a second SQL request concatenated

-				if (preg_match('/^--/', $newsqlclean)) {

-					$qualified = 1;

-				} elseif (preg_match('/^UPDATE llx_website SET \w+ = \d+\+\d+ WHERE rowid = \d+;$/', $newsqlclean)) {

-					$qualified = 1;

-				} elseif (preg_match('/^INSERT INTO llx_website_page\([a-z0-9_\s,]+\) VALUES\([0-9_\s,\+]+\);$/', $newsqlclean)) {

-					// Insert must match

-					// INSERT INTO llx_website_page(rowid, fk_page, fk_website, pageurl, aliasalt, title, description, lang, image, keywords, status, date_creation, tms, import_key, grabbed_from, type_container, htmlheader, content, author_alias) VALUES(1+123, null, 17, , , , , , , , , , , null, , , , , );

-					$qualified = 1;

-				}

-

-				// Another check to allow some legitimate original urls

-				if (!$qualified) {

-					if (preg_match('/^UPDATE llx_website SET \w+ = \'[a-zA-Z,\s]*\' WHERE rowid = \d+;$/', $sql)) {

-						$qualified = 1;

-					}

-				}

-

-				if (!$qualified) {

-					$error++;

-					//print 'Request '.($i + 1)." contains non allowed instructions.<br>\n";

-					//print "newsqlclean = ".$newsqlclean."<br>\n";

-					dol_syslog('Admin.lib::run_sql Request '.($i + 1)." contains non allowed instructions.", LOG_WARNING);

-					dol_syslog('$newsqlclean='.$newsqlclean, LOG_DEBUG);

-					break;

-				}

-			}

-

-			// Replace the prefix tables

-			if (MAIN_DB_PREFIX != 'llx_') {

-				$sql = preg_replace('/llx_/i', MAIN_DB_PREFIX, $sql);

-			}

-

-			if (!empty($handler)) {

-				$sql = preg_replace('/__HANDLER__/i', "'".$db->escape($handler)."'", $sql);

-			}

-

-			if (!empty($database)) {

-				$sql = preg_replace('/__DATABASE__/i', $db->escape($database), $sql);

-			}

-

-			$newsql = preg_replace('/__ENTITY__/i', (!empty($entity) ? $entity : $conf->entity), $sql);

-

-			// Add log of request

-			if (!$silent) {

-				print '<tr class="trforrunsql'.$keyforsql.'"><td class="tdtop opacitymedium"'.($colspan ? ' colspan="'.$colspan.'"' : '').'>'.$langs->trans("Request").' '.($i + 1)." sql='".dol_htmlentities($newsql, ENT_NOQUOTES)."'</td></tr>\n";

-			}

-			dol_syslog('Admin.lib::run_sql Request '.($i + 1), LOG_DEBUG);

+ *	@param		string	$sqlfile			Full path to sql file

+ * 	@param		int		$silent				1=Do not output anything, 0=Output line for update page

+ * 	@param		int		$entity				Entity targeted for multicompany module

+ *	@param		int		$usesavepoint		1=Run a savepoint before each request and a rollback to savepoint if error (this allow to have some request with errors inside global transactions).

+ *	@param		string	$handler			Handler targeted for menu (replace __HANDLER__ with this value)

+ *	@param 		string	$okerror			Family of errors we accept ('default', 'none')

+ *  @param		int		$linelengthlimit	Limit for length of each line (Use 0 if unknown, may be faster if defined)

+ *  @param		int		$nocommentremoval	Do no try to remove comments (in such a case, we consider that each line is a request, so use also $linelengthlimit=0)

+ *  @param		int		$offsetforchartofaccount	Offset to use to load chart of account table to update sql on the fly to add offset to rowid and account_parent value

+ * 	@return		int							<=0 if KO, >0 if OK

+ */

+function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handler = '', $okerror = 'default', $linelengthlimit = 32768, $nocommentremoval = 0, $offsetforchartofaccount = 0)

+{

+    global $db, $conf, $langs, $user;

+

+    dol_syslog("Admin.lib::run_sql run sql file ".$sqlfile." silent=".$silent." entity=".$entity." usesavepoint=".$usesavepoint." handler=".$handler." okerror=".$okerror, LOG_DEBUG);

+

+    if (!is_numeric($linelengthlimit))

+    {

+    	dol_syslog("Admin.lib::run_sql param linelengthlimit is not a numeric", LOG_ERR);

+    	return -1;

+    }

+

+    $ok = 0;

+    $error = 0;

+    $i = 0;

+    $buffer = '';

+    $arraysql = array();

+

+    // Get version of database

+    $versionarray = $db->getVersionArray();

+

+    $fp = fopen($sqlfile, "r");

+    if ($fp)

+    {

+        while (!feof($fp))

+        {

+        	// Warning fgets with second parameter that is null or 0 hang.

+        	if ($linelengthlimit > 0) $buf = fgets($fp, $linelengthlimit);

+        	else $buf = fgets($fp);

+

+            // Test if request must be ran only for particular database or version (if yes, we must remove the -- comment)

+            $reg = array();

+            if (preg_match('/^--\sV(MYSQL|PGSQL)([^\s]*)/i', $buf, $reg))

+            {

+            	$qualified = 1;

+

+            	// restrict on database type

+            	if (!empty($reg[1]))

+            	{

+            		if (!preg_match('/'.preg_quote($reg[1]).'/i', $db->type)) $qualified = 0;

+            	}

+

+            	// restrict on version

+            	if ($qualified)

+            	{

+            		if (!empty($reg[2]))

+            		{

+            			if (is_numeric($reg[2]))	// This is a version

+            			{

+			                $versionrequest = explode('.', $reg[2]);

+			                //print var_dump($versionrequest);

+			                //print var_dump($versionarray);

+			                if (!count($versionrequest) || !count($versionarray) || versioncompare($versionrequest, $versionarray) > 0)

+			                {

+			                	$qualified = 0;

+			                }

+            			}

+            			else						// This is a test on a constant. For example when we have -- VMYSQLUTF8UNICODE, we test constant $conf->global->UTF8UNICODE

+            			{

+            				$dbcollation = strtoupper(preg_replace('/_/', '', $conf->db->dolibarr_main_db_collation));

+            				//var_dump($reg[2]);

+            				//var_dump($dbcollation);

+            				if (empty($conf->db->dolibarr_main_db_collation) || ($reg[2] != $dbcollation)) $qualified = 0;

+            				//var_dump($qualified);

+            			}

+            		}

+            	}

+

+                if ($qualified)

+                {

+                    // Version qualified, delete SQL comments

+                    $buf = preg_replace('/^--\sV(MYSQL|PGSQL)([^\s]*)/i', '', $buf);

+                    //print "Ligne $i qualifi?e par version: ".$buf.'<br>';

+                }

+            }

+

+            // Add line buf to buffer if not a comment

+            if ($nocommentremoval || !preg_match('/^\s*--/', $buf))

+            {

+            	if (empty($nocommentremoval)) $buf = preg_replace('/([,;ERLT\)])\s*--.*$/i', '\1', $buf); //remove comment from a line that not start with -- before add it to the buffer

+                $buffer .= trim($buf);

+            }

+

+            //print $buf.'<br>';exit;

+

+            if (preg_match('/;/', $buffer))	// If string contains ';', it's end of a request string, we save it in arraysql.

+            {

+                // Found new request

+                if ($buffer) $arraysql[$i] = $buffer;

+                $i++;

+                $buffer = '';

+            }

+        }

+

+        if ($buffer) $arraysql[$i] = $buffer;

+        fclose($fp);

+    }

+    else

+    {

+        dol_syslog("Admin.lib::run_sql failed to open file ".$sqlfile, LOG_ERR);

+    }

+

+    // Loop on each request to see if there is a __+MAX_table__ key

+    $listofmaxrowid = array(); // This is a cache table

+    foreach ($arraysql as $i => $sql)

+    {

+        $newsql = $sql;

+

+        // Replace __+MAX_table__ with max of table

+        while (preg_match('/__\+MAX_([A-Za-z0-9_]+)__/i', $newsql, $reg))

+        {

+            $table = $reg[1];

+            if (!isset($listofmaxrowid[$table]))

+            {

+                //var_dump($db);

+                $sqlgetrowid = 'SELECT MAX(rowid) as max from '.preg_replace('/^llx_/', MAIN_DB_PREFIX, $table);

+                $resql = $db->query($sqlgetrowid);

+                if ($resql)

+                {

+                    $obj = $db->fetch_object($resql);

+                    $listofmaxrowid[$table] = $obj->max;

+                    if (empty($listofmaxrowid[$table])) $listofmaxrowid[$table] = 0;

+                }

+                else

+                {

+                    if (!$silent) print '<tr><td class="tdtop" colspan="2">';

+                    if (!$silent) print '<div class="error">'.$langs->trans("Failed to get max rowid for ".$table)."</div></td>";

+                    if (!$silent) print '</tr>';

+                    $error++;

+                    break;

+                }

+            }

+            // Replace __+MAX_llx_table__ with +999

+            $from = '__+MAX_'.$table.'__';

+            $to = '+'.$listofmaxrowid[$table];

+            $newsql = str_replace($from, $to, $newsql);

+            dol_syslog('Admin.lib::run_sql New Request '.($i + 1).' (replacing '.$from.' to '.$to.')', LOG_DEBUG);

+

+            $arraysql[$i] = $newsql;

+        }

+

+        if ($offsetforchartofaccount > 0)

+        {

+        	// Replace lines

+        	// 'INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1401, 'PCG99-ABREGE','CAPIT', 'XXXXXX', '1', '0', '...', 1);'

+        	// with

+        	// 'INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1401 + 200100000, 'PCG99-ABREGE','CAPIT', 'XXXXXX', '1', '0', '...', 1);'

+        	$newsql = preg_replace('/VALUES\s*\(__ENTITY__, \s*(\d+)\s*,(\s*\'[^\',]*\'\s*,\s*\'[^\',]*\'\s*,\s*\'?[^\',]*\'?\s*),\s*\'?([^\',]*)\'?/ims', 'VALUES (__ENTITY__, \1 + '.$offsetforchartofaccount.', \2, \3 + '.$offsetforchartofaccount, $newsql);

+        	$newsql = preg_replace('/([,\s])0 \+ '.$offsetforchartofaccount.'/ims', '\1 0', $newsql);

+        	//var_dump($newsql);

+        	$arraysql[$i] = $newsql;

+        }

+    }

+

+    // Loop on each request to execute request

+    $cursorinsert = 0;

+    $listofinsertedrowid = array();

+    foreach ($arraysql as $i => $sql)

+    {

+        if ($sql)

+        {

+        	// Replace the prefix tables

+        	if (MAIN_DB_PREFIX != 'llx_')

+        	{

+        		$sql = preg_replace('/llx_/i', MAIN_DB_PREFIX, $sql);

+        	}

+

+            if (!empty($handler)) $sql = preg_replace('/__HANDLER__/i', "'".$handler."'", $sql);

+

+            $newsql = preg_replace('/__ENTITY__/i', (!empty($entity) ? $entity : $conf->entity), $sql);

+

+            // Ajout trace sur requete (eventuellement a commenter si beaucoup de requetes)

+            if (!$silent) print '<tr><td class="tdtop">'.$langs->trans("Request").' '.($i + 1)." sql='".dol_htmlentities($newsql, ENT_NOQUOTES)."'</td></tr>\n";

+            dol_syslog('Admin.lib::run_sql Request '.($i + 1), LOG_DEBUG);

@@ -407,68 +308,69 @@
-			// Replace for encrypt data

-			if (preg_match_all('/__ENCRYPT\(\'([^\']+)\'\)__/i', $newsql, $reg)) {

-				$num = count($reg[0]);

-

-				for ($j = 0; $j < $num; $j++) {

-					$from = $reg[0][$j];

-					$to = $db->encrypt($reg[1][$j]);

-					$newsql = str_replace($from, $to, $newsql);

-				}

-				$sqlmodified++;

-			}

-

-			// Replace for decrypt data

-			if (preg_match_all('/__DECRYPT\(\'([A-Za-z0-9_]+)\'\)__/i', $newsql, $reg)) {

-				$num = count($reg[0]);

-

-				for ($j = 0; $j < $num; $j++) {

-					$from = $reg[0][$j];

-					$to = $db->decrypt($reg[1][$j]);

-					$newsql = str_replace($from, $to, $newsql);

-				}

-				$sqlmodified++;

-			}

-

-			// Replace __x__ with the rowid of the result of the insert number x

-			while (preg_match('/__([0-9]+)__/', $newsql, $reg)) {

-				$cursor = $reg[1];

-				if (empty($listofinsertedrowid[$cursor])) {

-					if (!$silent) {

-						print '<tr><td class="tdtop"'.($colspan ? ' colspan="'.$colspan.'"' : '').'>';

-						print '<div class="error">'.$langs->trans("FileIsNotCorrect")."</div>";

-						print '</td></tr>';

-					}

-					$error++;

-					break;

-				}

-

-				$from = '__'.$cursor.'__';

-				$to = $listofinsertedrowid[$cursor];

-				$newsql = str_replace($from, $to, $newsql);

-				$sqlmodified++;

-			}

-

-			if ($sqlmodified) {

-				dol_syslog('Admin.lib::run_sql New Request '.($i + 1), LOG_DEBUG);

-			}

-

-			$result = $db->query($newsql, $usesavepoint);

-			if ($result) {

-				if (!$silent) {

-					print '<!-- Result = OK -->'."\n";

-				}

-

-				if (preg_replace('/insert into ([^\s]+)/i', $newsql, $reg)) {

-					$cursorinsert++;

-

-					// It's an insert

-					$table = preg_replace('/([^a-zA-Z_]+)/i', '', $reg[1]);

-					$insertedrowid = $db->last_insert_id($table);

-					$listofinsertedrowid[$cursorinsert] = $insertedrowid;

-					dol_syslog('Admin.lib::run_sql Insert nb '.$cursorinsert.', done in table '.$table.', rowid is '.$listofinsertedrowid[$cursorinsert], LOG_DEBUG);

-				}

-				// 	          print '<td class="right">OK</td>';

-			} else {

-				$errno = $db->errno();

-				if (!$silent) {

-					print '<!-- Result = '.$errno.' -->'."\n";

-				}

+            // Replace for encrypt data

+            if (preg_match_all('/__ENCRYPT\(\'([^\']+)\'\)__/i', $newsql, $reg))

+            {

+                $num = count($reg[0]);

+

+                for ($j = 0; $j < $num; $j++)

+                {

+                    $from = $reg[0][$j];

+                    $to = $db->encrypt($reg[1][$j], 1);

+                    $newsql = str_replace($from, $to, $newsql);

+                }

+                $sqlmodified++;

+            }

+

+            // Replace for decrypt data

+            if (preg_match_all('/__DECRYPT\(\'([A-Za-z0-9_]+)\'\)__/i', $newsql, $reg))

+            {

+                $num = count($reg[0]);

+

+                for ($j = 0; $j < $num; $j++)

+                {

+                    $from = $reg[0][$j];

+                    $to = $db->decrypt($reg[1][$j]);

+                    $newsql = str_replace($from, $to, $newsql);

+                }

+                $sqlmodified++;

+            }

+

+            // Replace __x__ with rowid of insert nb x

+            while (preg_match('/__([0-9]+)__/', $newsql, $reg))

+            {

+                $cursor = $reg[1];

+                if (empty($listofinsertedrowid[$cursor]))

+                {

+                    if (!$silent) print '<tr><td class="tdtop" colspan="2">';

+                    if (!$silent) print '<div class="error">'.$langs->trans("FileIsNotCorrect")."</div></td>";

+                    if (!$silent) print '</tr>';

+                    $error++;

+                    break;

+                }

+                $from = '__'.$cursor.'__';

+                $to = $listofinsertedrowid[$cursor];

+                $newsql = str_replace($from, $to, $newsql);

+                $sqlmodified++;

+            }

+

+            if ($sqlmodified) dol_syslog('Admin.lib::run_sql New Request '.($i + 1), LOG_DEBUG);

+

+            $result = $db->query($newsql, $usesavepoint);

+            if ($result)

+            {

+                if (!$silent) print '<!-- Result = OK -->'."\n";

+

+                if (preg_replace('/insert into ([^\s]+)/i', $newsql, $reg))

+                {

+                    $cursorinsert++;

+

+                    // It's an insert

+                    $table = preg_replace('/([^a-zA-Z_]+)/i', '', $reg[1]);

+                    $insertedrowid = $db->last_insert_id($table);

+                    $listofinsertedrowid[$cursorinsert] = $insertedrowid;

+                    dol_syslog('Admin.lib::run_sql Insert nb '.$cursorinsert.', done in table '.$table.', rowid is '.$listofinsertedrowid[$cursorinsert], LOG_DEBUG);

+                }

+                // 	          print '<td class="right">OK</td>';

+            }

+            else

+            {

+                $errno = $db->errno();

+                if (!$silent) print '<!-- Result = '.$errno.' -->'."\n";

@@ -477 +379 @@
-				$okerrors = array(	// By default

+            	$okerrors = array(	// By default

@@ -490 +392 @@
-					'DB_ERROR_22P02'

+            		'DB_ERROR_22P02'

@@ -492,2 +394,10 @@
-				if ($okerror == 'none') {

-					$okerrors = array();

+                if ($okerror == 'none') $okerrors = array();

+

+                // Is it an error we accept

+				if (!in_array($errno, $okerrors))

+				{

+				    if (!$silent) print '<tr><td class="tdtop" colspan="2">';

+				    if (!$silent) print '<div class="error">'.$langs->trans("Error")." ".$db->errno().": ".$newsql."<br>".$db->error()."</div></td>";

+				    if (!$silent) print '</tr>'."\n";

+				    dol_syslog('Admin.lib::run_sql Request '.($i + 1)." Error ".$db->errno()." ".$newsql."<br>".$db->error(), LOG_ERR);

+				    $error++;

@@ -495,60 +405,25 @@
-

-				// Is it an error we accept

-				if (!in_array($errno, $okerrors)) {

-					if (!$silent) {

-						print '<tr><td class="tdtop"'.($colspan ? ' colspan="'.$colspan.'"' : '').'>';

-						print '<div class="error">'.$langs->trans("Error")." ".$db->errno()." (Req ".($i + 1)."): ".$newsql."<br>".$db->error()."</div>";

-						print '</td></tr>'."\n";

-					}

-					dol_syslog('Admin.lib::run_sql Request '.($i + 1)." Error ".$db->errno()." ".$newsql."<br>".$db->error(), LOG_ERR);

-					$error++;

-				}

-			}

-		}

-	}

-

-	if (!$silent) {

-		print '<tr><td>'.$langs->trans("ProcessMigrateScript").'</td>';

-		print '<td class="right">';

-		if ($error == 0) {

-			print '<span class="ok">'.$langs->trans("OK").'</span>';

-		} else {

-			print '<span class="error">'.$langs->trans("Error").'</span>';

-		}

-

-		//if (!empty($conf->use_javascript_ajax)) {		// use_javascript_ajax is not defined

-		print '<script type="text/javascript">

-		jQuery(document).ready(function() {

-			function init_trrunsql'.$keyforsql.'()

-			{

-				console.log("toggle .trforrunsql'.$keyforsql.'");

-				jQuery(".trforrunsql'.$keyforsql.'").toggle();

-			}

-			init_trrunsql'.$keyforsql.'();

-			jQuery(".trforrunsqlshowhide'.$keyforsql.'").click(function() {

-				init_trrunsql'.$keyforsql.'();

-			});

-		});

-		</script>';

-		if (count($arraysql)) {

-			print ' - <a class="trforrunsqlshowhide'.$keyforsql.'" href="#" title="'.($langs->trans("ShowHideTheNRequests", count($arraysql))).'">'.$langs->trans("ShowHideDetails").'</a>';

-		} else {

-			print ' - <span class="opacitymedium">'.$langs->trans("ScriptIsEmpty").'</span>';

-		}

-		//}

-

-		print '</td></tr>'."\n";

-	}

-

-	if ($error == 0) {

-		$ok = 1;

-	} else {

-		$ok = 0;

-	}

-

-	return $ok;

-}

-

-

-/**

- *	Delete a constant

+            }

+

+            if (!$silent) print '</tr>'."\n";

+        }

+    }

+

+    if ($error == 0)

+    {

+        if (!$silent) print '<tr><td>'.$langs->trans("ProcessMigrateScript").'</td>';

+        if (!$silent) print '<td class="right">'.$langs->trans("OK").'</td></tr>'."\n";

+        $ok = 1;

+    }

+    else

+    {

+        if (!$silent) print '<tr><td>'.$langs->trans("ProcessMigrateScript").'</td>';

+        if (!$silent) print '<td class="right"><font class="error">'.$langs->trans("KO").'</font></td></tr>'."\n";

+        $ok = 0;

+    }

+

+    return $ok;

+}

+

+

+/**

+ *	Effacement d'une constante dans la base de donnees

@@ -557 +432 @@
- *	@param	    string|int	$name		Name of constant or rowid of line

+ *	@param	    string		$name		Name of constant or rowid of line

@@ -559 +434 @@
- *	@return     int         			Return integer <0 if KO, >0 if OK

+ *	@return     int         			<0 if KO, >0 if OK

@@ -565,30 +440,30 @@
-	global $conf;

-

-	if (empty($name)) {

-		dol_print_error('', 'Error call dolibar_del_const with parameter name empty');

-		return -1;

-	}

-

-	$sql = "DELETE FROM ".MAIN_DB_PREFIX."const";

-	$sql .= " WHERE (".$db->decrypt('name')." = '".$db->escape($name)."'";

-	if (is_numeric($name)) {

-		$sql .= " OR rowid = ".((int) $name);

-	}

-	$sql .= ")";

-	if ($entity >= 0) {

-		$sql .= " AND entity = ".((int) $entity);

-	}

-

-	dol_syslog("admin.lib::dolibarr_del_const", LOG_DEBUG);

-	$resql = $db->query($sql);

-	if ($resql) {

-		$conf->global->$name = '';

-		return 1;

-	} else {

-		dol_print_error($db);

-		return -1;

-	}

-}

-

-/**

- *	Get the value of a setup constant from database

+    global $conf;

+

+    if (empty($name))

+    {

+    	dol_print_error('', 'Error call dolibar_del_const with parameter name empty');

+    	return -1;

+    }

+

+    $sql = "DELETE FROM ".MAIN_DB_PREFIX."const";

+    $sql .= " WHERE (".$db->decrypt('name')." = '".$db->escape($name)."'";

+    if (is_numeric($name)) $sql .= " OR rowid = '".$db->escape($name)."'";

+    $sql .= ")";

+    if ($entity >= 0) $sql .= " AND entity = ".$entity;

+

+    dol_syslog("admin.lib::dolibarr_del_const", LOG_DEBUG);

+    $resql = $db->query($sql);

+    if ($resql)

+    {

+        $conf->global->$name = '';

+        return 1;

+    }

+    else

+    {

+        dol_print_error($db);

+        return -1;

+    }

+}

+

+/**

+ *	Recupere une constante depuis la base de donnees.

@@ -597 +472 @@
- *	@param	    string		$name		Name of constant

+ *	@param	    string		$name		Nom de la constante

@@ -599 +474 @@
- *	@return     string      			Value of constant

+ *	@return     string      			Valeur de la constante

@@ -605,17 +480,16 @@
-	$value = '';

-

-	$sql = "SELECT ".$db->decrypt('value')." as value";

-	$sql .= " FROM ".MAIN_DB_PREFIX."const";

-	$sql .= " WHERE name = ".$db->encrypt($name);

-	$sql .= " AND entity = ".((int) $entity);

-

-	dol_syslog("admin.lib::dolibarr_get_const", LOG_DEBUG);

-	$resql = $db->query($sql);

-	if ($resql) {

-		$obj = $db->fetch_object($resql);

-		if ($obj) {

-			include_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php';

-			$value = dolDecrypt($obj->value);

-		}

-	}

-	return $value;

+    global $conf;

+    $value = '';

+

+    $sql = "SELECT ".$db->decrypt('value')." as value";

+    $sql .= " FROM ".MAIN_DB_PREFIX."const";

+    $sql .= " WHERE name = ".$db->encrypt($name, 1);

+    $sql .= " AND entity = ".$entity;

+

+    dol_syslog("admin.lib::dolibarr_get_const", LOG_DEBUG);

+    $resql = $db->query($sql);

+    if ($resql)

+    {

+        $obj = $db->fetch_object($resql);

+        if ($obj) $value = $obj->value;

+    }

+    return $value;

@@ -631 +505 @@
- *	@param	    string		$type		Type of constant. Deprecated, only strings are allowed for $value. Caller must json encode/decode to store other type of data.

+ *	@param	    string		$type		Type of constante (chaine par defaut)

@@ -641,57 +515,49 @@
-	global $conf;

-

-	// Clean parameters

-	$name = trim($name);

-

-	// Check parameters

-	if (empty($name)) {

-		dol_print_error($db, "Error: Call to function dolibarr_set_const with wrong parameters", LOG_ERR);

-		exit;

-	}

-

-	//dol_syslog("dolibarr_set_const name=$name, value=$value type=$type, visible=$visible, note=$note entity=$entity");

-

-	$db->begin();

-

-	$sql = "DELETE FROM ".MAIN_DB_PREFIX."const";

-	$sql .= " WHERE name = ".$db->encrypt($name);

-	if ($entity >= 0) {

-		$sql .= " AND entity = ".((int) $entity);

-	}

-

-	dol_syslog("admin.lib::dolibarr_set_const", LOG_DEBUG);

-	$resql = $db->query($sql);

-

-	if (strcmp($value, '')) {	// true if different. Must work for $value='0' or $value=0

-		if (!preg_match('/^(MAIN_LOGEVENTS|MAIN_AGENDA_ACTIONAUTO)/', $name) && (preg_match('/(_KEY|_EXPORTKEY|_SECUREKEY|_SERVERKEY|_PASS|_PASSWORD|_PW|_PW_TICKET|_PW_EMAILING|_SECRET|_SECURITY_TOKEN|_WEB_TOKEN)$/', $name))) {

-			// This seems a sensitive constant, we encrypt its value

-			// To list all sensitive constant, you can make a

-			// WHERE name like '%\_KEY' or name like '%\_EXPORTKEY' or name like '%\_SECUREKEY' or name like '%\_SERVERKEY' or name like '%\_PASS' or name like '%\_PASSWORD' or name like '%\_SECRET'

-			// or name like '%\_SECURITY_TOKEN' or name like '%\WEB_TOKEN'

-			include_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php';

-			$newvalue = dolEncrypt($value);

-		} else {

-			$newvalue = $value;

-		}

-

-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."const(name, value, type, visible, note, entity)";

-		$sql .= " VALUES (";

-		$sql .= $db->encrypt($name);

-		$sql .= ", ".$db->encrypt($newvalue);

-		$sql .= ", '".$db->escape($type)."', ".((int) $visible).", '".$db->escape($note)."', ".((int) $entity).")";

-

-		//print "sql".$value."-".pg_escape_string($value)."-".$sql;exit;

-		//print "xx".$db->escape($value);

-		dol_syslog("admin.lib::dolibarr_set_const", LOG_DEBUG);

-		$resql = $db->query($sql);

-	}

-

-	if ($resql) {

-		$db->commit();

-		$conf->global->$name = $value;

-		return 1;

-	} else {

-		$error = $db->lasterror();

-		$db->rollback();

-		return -1;

-	}

+    global $conf;

+

+    // Clean parameters

+    $name = trim($name);

+

+    // Check parameters

+    if (empty($name))

+    {

+        dol_print_error($db, "Error: Call to function dolibarr_set_const with wrong parameters", LOG_ERR);

+        exit;

+    }

+

+    //dol_syslog("dolibarr_set_const name=$name, value=$value type=$type, visible=$visible, note=$note entity=$entity");

+

+    $db->begin();

+

+    $sql = "DELETE FROM ".MAIN_DB_PREFIX."const";

+    $sql .= " WHERE name = ".$db->encrypt($name, 1);

+    if ($entity >= 0) $sql .= " AND entity = ".$entity;

+

+    dol_syslog("admin.lib::dolibarr_set_const", LOG_DEBUG);

+    $resql = $db->query($sql);

+

+    if (strcmp($value, ''))	// true if different. Must work for $value='0' or $value=0

+    {

+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity)";

+        $sql .= " VALUES (";

+        $sql .= $db->encrypt($name, 1);

+        $sql .= ", ".$db->encrypt($value, 1);

+        $sql .= ",'".$db->escape($type)."',".$visible.",'".$db->escape($note)."',".$entity.")";

+

+        //print "sql".$value."-".pg_escape_string($value)."-".$sql;exit;

+        //print "xx".$db->escape($value);

+        dol_syslog("admin.lib::dolibarr_set_const", LOG_DEBUG);

+        $resql = $db->query($sql);

+    }

+

+    if ($resql)

+    {

+        $db->commit();

+        $conf->global->$name = $value;

+        return 1;

+    }

+    else

+    {

+        $error = $db->lasterror();

+        $db->rollback();

+        return -1;

+    }

@@ -706,12 +572,5 @@
- * @param	int		$nbofactivatedmodules		Number if activated modules

- * @param	int		$nboftotalmodules			Nb of total modules

- * @param	int		$nbmodulesnotautoenabled	Nb of modules not auto enabled that are activated

- * @return  array								Array of tabs to show

- */

-function modules_prepare_head($nbofactivatedmodules, $nboftotalmodules, $nbmodulesnotautoenabled)

-{

-	global $langs, $conf, $user, $form;

-

-	$desc = $langs->trans("ModulesDesc", '{picto}');

-	$desc = str_replace('{picto}', img_picto('', 'switch_off'), $desc);

-

+ * @return  array				Array of tabs to show

+ */

+function modules_prepare_head()

+{

+	global $langs, $conf, $user;

@@ -720,11 +579,4 @@
-	$mode = getDolGlobalString('MAIN_MODULE_SETUP_ON_LIST_BY_DEFAULT', 'commonkanban');

-	$head[$h][0] = DOL_URL_ROOT."/admin/modules.php?mode=".$mode;

-	if ($nbmodulesnotautoenabled <= getDolGlobalInt('MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING', 1)) {	// If only minimal initial modules enabled)

-		//$head[$h][1] = $form->textwithpicto($langs->trans("AvailableModules"), $desc);

-		$head[$h][1] = $langs->trans("AvailableModules");

-		$head[$h][1] .= $form->textwithpicto('', $langs->trans("YouMustEnableOneModule").'.<br><br><span class="opacitymedium">'.$desc.'</span>', 1, 'warning');

-	} else {

-		//$head[$h][1] = $langs->trans("AvailableModules").$form->textwithpicto('<span class="badge marginleftonly">'.$nbofactivatedmodules.' / '.$nboftotalmodules.'</span>', $desc, 1, 'help', '', 1, 3);

-		$head[$h][1] = $langs->trans("AvailableModules").'<span class="badge marginleftonly">'.$nbofactivatedmodules.' / '.$nboftotalmodules.'</span>';

-	}

-	$head[$h][2] = 'modules';

+

+	$head[$h][0] = DOL_URL_ROOT."/admin/modules.php?mode=commonkanban";

+	$head[$h][1] = $langs->trans("AvailableModules");

+	$head[$h][2] = 'commonkanban';

@@ -750,0 +603 @@
+

@@ -756,39 +609,63 @@
-function ihm_prepare_head()

-{

-	global $langs, $conf, $user;

-	$h = 0;

-	$head = array();

-

-	$head[$h][0] = DOL_URL_ROOT."/admin/ihm.php?mode=other";

-	$head[$h][1] = $langs->trans("LanguageAndPresentation");

-	$head[$h][2] = 'other';

-	$h++;

-

-	$head[$h][0] = DOL_URL_ROOT."/admin/ihm.php?mode=template";

-	$head[$h][1] = $langs->trans("SkinAndColors");

-	$head[$h][2] = 'template';

-	$h++;

-

-	$head[$h][0] = DOL_URL_ROOT."/admin/ihm.php?mode=dashboard";

-	$head[$h][1] = $langs->trans("Dashboard");

-	$head[$h][2] = 'dashboard';

-	$h++;

-

-	$head[$h][0] = DOL_URL_ROOT."/admin/ihm.php?mode=login";

-	$head[$h][1] = $langs->trans("LoginPage");

-	$head[$h][2] = 'login';

-	$h++;

-

-	$head[$h][0] = DOL_URL_ROOT."/admin/ihm.php?mode=css";

-	$head[$h][1] = $langs->trans("CSSPage");

-	$head[$h][2] = 'css';

-	$h++;

-

-	complete_head_from_modules($conf, $langs, null, $head, $h, 'ihm_admin');

-

-	complete_head_from_modules($conf, $langs, null, $head, $h, 'ihm_admin', 'remove');

-

-

-	return $head;

-}

-

+function security_prepare_head()

+{

+    global $db, $langs, $conf, $user;

+    $h = 0;

+    $head = array();

+

+    $head[$h][0] = DOL_URL_ROOT."/admin/security_other.php";

+    $head[$h][1] = $langs->trans("Miscellaneous");

+    $head[$h][2] = 'misc';

+    $h++;

+

+    $head[$h][0] = DOL_URL_ROOT."/admin/security.php";

+    $head[$h][1] = $langs->trans("Passwords");

+    $head[$h][2] = 'passwords';

+    $h++;

+

+    $head[$h][0] = DOL_URL_ROOT."/admin/security_file.php";

+    $head[$h][1] = $langs->trans("Files").' ('.$langs->trans("Upload").')';

+    $head[$h][2] = 'file';

+    $h++;

+

+    /*

+    $head[$h][0] = DOL_URL_ROOT."/admin/security_file_download.php";

+    $head[$h][1] = $langs->trans("Files").' ('.$langs->trans("Download").')';

+    $head[$h][2] = 'filedownload';

+    $h++;

+	*/

+

+    $head[$h][0] = DOL_URL_ROOT."/admin/proxy.php";

+    $head[$h][1] = $langs->trans("ExternalAccess");

+    $head[$h][2] = 'proxy';

+    $h++;

+

+    $head[$h][0] = DOL_URL_ROOT."/admin/events.php";

+    $head[$h][1] = $langs->trans("Audit");

+    $head[$h][2] = 'audit';

+    $h++;

+

+

+    // Show permissions lines

+    $nbPerms = 0;

+    $sql = "SELECT COUNT(r.id) as nb";

+    $sql .= " FROM ".MAIN_DB_PREFIX."rights_def as r";

+    $sql .= " WHERE r.libelle NOT LIKE 'tou%'"; // On ignore droits "tous"

+    $sql .= " AND entity = ".$conf->entity;

+    $sql .= " AND bydefault = 1";

+    if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) $sql .= " AND r.perms NOT LIKE '%_advance'"; // Hide advanced perms if option is not enabled

+    $resql = $db->query($sql);

+    if ($resql)

+    {

+    	$obj = $db->fetch_object($resql);

+    	if ($obj) $nbPerms = $obj->nb;

+    }

+    else dol_print_error($db);

+

+    $head[$h][0] = DOL_URL_ROOT."/admin/perms.php";

+    $head[$h][1] = $langs->trans("DefaultRights");

+    if ($nbPerms > 0) $head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbPerms.'</span>' : '');

+    $head[$h][2] = 'default';

+    $h++;

+

+    return $head;

+}

@@ -798 +675 @@
- *

+ * @param object $object descriptor class

@@ -801,76 +677,0 @@
-function security_prepare_head()

-{

-	global $db, $langs, $conf, $user;

-	$h = 0;

-	$head = array();

-

-	$head[$h][0] = DOL_URL_ROOT."/admin/security_other.php";

-	$head[$h][1] = $langs->trans("Miscellaneous");

-	$head[$h][2] = 'misc';

-	$h++;

-

-	$head[$h][0] = DOL_URL_ROOT."/admin/security.php";

-	$head[$h][1] = $langs->trans("Passwords");

-	$head[$h][2] = 'passwords';

-	$h++;

-

-	$head[$h][0] = DOL_URL_ROOT."/admin/security_file.php";

-	$head[$h][1] = $langs->trans("Files").' ('.$langs->trans("Upload").')';

-	$head[$h][2] = 'file';

-	$h++;

-

-	/*

-	$head[$h][0] = DOL_URL_ROOT."/admin/security_file_download.php";

-	$head[$h][1] = $langs->trans("Files").' ('.$langs->trans("Download").')';

-	$head[$h][2] = 'filedownload';

-	$h++;

-	*/

-

-	$head[$h][0] = DOL_URL_ROOT."/admin/proxy.php";

-	$head[$h][1] = $langs->trans("ExternalAccess");

-	$head[$h][2] = 'proxy';

-	$h++;

-

-	$head[$h][0] = DOL_URL_ROOT."/admin/events.php";

-	$head[$h][1] = $langs->trans("Audit");

-	$head[$h][2] = 'audit';

-	$h++;

-

-

-	// Show permissions lines

-	$nbPerms = 0;

-	$sql = "SELECT COUNT(r.id) as nb";

-	$sql .= " FROM ".MAIN_DB_PREFIX."rights_def as r";

-	$sql .= " WHERE r.libelle NOT LIKE 'tou%'"; // On ignore droits "tous"

-	$sql .= " AND entity = ".((int) $conf->entity);

-	$sql .= " AND bydefault = 1";

-	if (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {

-		$sql .= " AND r.perms NOT LIKE '%_advance'"; // Hide advanced perms if option is not enabled

-	}

-	$resql = $db->query($sql);

-	if ($resql) {

-		$obj = $db->fetch_object($resql);

-		if ($obj) {

-			$nbPerms = $obj->nb;

-		}

-	} else {

-		dol_print_error($db);

-	}

-

-	$head[$h][0] = DOL_URL_ROOT."/admin/perms.php";

-	$head[$h][1] = $langs->trans("DefaultRights");

-	if ($nbPerms > 0) {

-		$head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">'.$nbPerms.'</span>' : '');

-	}

-	$head[$h][2] = 'default';

-	$h++;

-

-	return $head;

-}

-

-/**

- * Prepare array with list of tabs

- *

- * @param 	object 	$object 	Descriptor class

- * @return  array				Array of tabs to show

- */

@@ -879,6 +680,6 @@
-	global $langs, $conf;

-	$h = 0;

-	$head = array();

-

-	// FIX for compatibity habitual tabs

-	$object->id = $object->numero;

+    global $langs, $conf, $user;

+    $h = 0;

+    $head = array();

+

+    // FIX for compatibity habitual tabs

+    $object->id = $object->numero;

@@ -896 +697,2 @@
-	if ($object->isCoreOrExternalModule() == 'external') {

+	if ($object->isCoreOrExternalModule() == 'external')

+	{

@@ -903,6 +705,6 @@
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'modulehelp_admin');

-

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'modulehelp_admin', 'remove');

-

-

-	return $head;

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'modulehelp_admin');

+

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'modulehelp_admin', 'remove');

+

+

+    return $head;

@@ -917,20 +719,20 @@
-	global $langs, $conf;

-	$h = 0;

-	$head = array();

-

-	$head[$h][0] = DOL_URL_ROOT."/admin/translation.php?mode=searchkey";

-	$head[$h][1] = $langs->trans("TranslationKeySearch");

-	$head[$h][2] = 'searchkey';

-	$h++;

-

-	$head[$h][0] = DOL_URL_ROOT."/admin/translation.php?mode=overwrite";

-	$head[$h][1] = '<span class="valignmiddle">'.$langs->trans("TranslationOverwriteKey").'</span><span class="fa fa-plus-circle valignmiddle paddingleft"></span>';

-	$head[$h][2] = 'overwrite';

-	$h++;

-

-	complete_head_from_modules($conf, $langs, null, $head, $h, 'translation_admin');

-

-	complete_head_from_modules($conf, $langs, null, $head, $h, 'translation_admin', 'remove');

-

-

-	return $head;

+    global $langs, $conf, $user;

+    $h = 0;

+    $head = array();

+

+    $head[$h][0] = DOL_URL_ROOT."/admin/translation.php?mode=overwrite";

+    $head[$h][1] = $langs->trans("TranslationOverwriteKey").'<span class="fa fa-plus-circle valignmiddle paddingleft"></span>';

+    $head[$h][2] = 'overwrite';

+    $h++;

+

+    $head[$h][0] = DOL_URL_ROOT."/admin/translation.php?mode=searchkey";

+    $head[$h][1] = $langs->trans("TranslationKeySearch");

+    $head[$h][2] = 'searchkey';

+    $h++;

+

+    complete_head_from_modules($conf, $langs, null, $head, $h, 'translation_admin');

+

+    complete_head_from_modules($conf, $langs, null, $head, $h, 'translation_admin', 'remove');

+

+

+    return $head;

@@ -947,42 +749,43 @@
-	global $langs, $conf, $user;

-	$h = 0;

-	$head = array();

-

-	$head[$h][0] = DOL_URL_ROOT."/admin/defaultvalues.php?mode=createform";

-	$head[$h][1] = $langs->trans("DefaultCreateForm");

-	$head[$h][2] = 'createform';

-	$h++;

-

-	$head[$h][0] = DOL_URL_ROOT."/admin/defaultvalues.php?mode=filters";

-	$head[$h][1] = $langs->trans("DefaultSearchFilters");

-	$head[$h][2] = 'filters';

-	$h++;

-

-	$head[$h][0] = DOL_URL_ROOT."/admin/defaultvalues.php?mode=sortorder";

-	$head[$h][1] = $langs->trans("DefaultSortOrder");

-	$head[$h][2] = 'sortorder';

-	$h++;

-

-	if (!empty($conf->use_javascript_ajax)) {

-		$head[$h][0] = DOL_URL_ROOT."/admin/defaultvalues.php?mode=focus";

-		$head[$h][1] = $langs->trans("DefaultFocus");

-		$head[$h][2] = 'focus';

-		$h++;

-

-		$head[$h][0] = DOL_URL_ROOT."/admin/defaultvalues.php?mode=mandatory";

-		$head[$h][1] = $langs->trans("DefaultMandatory");

-		$head[$h][2] = 'mandatory';

-		$h++;

-	}

-

-	/*$head[$h][0] = DOL_URL_ROOT."/admin/translation.php?mode=searchkey";

-	$head[$h][1] = $langs->trans("TranslationKeySearch");

-	$head[$h][2] = 'searchkey';

-	$h++;*/

-

-	complete_head_from_modules($conf, $langs, null, $head, $h, 'defaultvalues_admin');

-

-	complete_head_from_modules($conf, $langs, null, $head, $h, 'defaultvalues_admin', 'remove');

-

-

-	return $head;

+    global $langs, $conf, $user;

+    $h = 0;

+    $head = array();

+

+    $head[$h][0] = DOL_URL_ROOT."/admin/defaultvalues.php?mode=createform";

+    $head[$h][1] = $langs->trans("DefaultCreateForm");

+    $head[$h][2] = 'createform';

+    $h++;

+

+    $head[$h][0] = DOL_URL_ROOT."/admin/defaultvalues.php?mode=filters";

+    $head[$h][1] = $langs->trans("DefaultSearchFilters");

+    $head[$h][2] = 'filters';

+    $h++;

+

+    $head[$h][0] = DOL_URL_ROOT."/admin/defaultvalues.php?mode=sortorder";

+    $head[$h][1] = $langs->trans("DefaultSortOrder");

+    $head[$h][2] = 'sortorder';

+    $h++;

+

+    if (!empty($conf->use_javascript_ajax))

+    {

+    	$head[$h][0] = DOL_URL_ROOT."/admin/defaultvalues.php?mode=focus";

+	    $head[$h][1] = $langs->trans("DefaultFocus");

+	    $head[$h][2] = 'focus';

+	    $h++;

+

+	    $head[$h][0] = DOL_URL_ROOT."/admin/defaultvalues.php?mode=mandatory";

+	    $head[$h][1] = $langs->trans("DefaultMandatory");

+	    $head[$h][2] = 'mandatory';

+	    $h++;

+    }

+

+    /*$head[$h][0] = DOL_URL_ROOT."/admin/translation.php?mode=searchkey";

+    $head[$h][1] = $langs->trans("TranslationKeySearch");

+    $head[$h][2] = 'searchkey';

+    $h++;*/

+

+    complete_head_from_modules($conf, $langs, null, $head, $h, 'defaultvalues_admin');

+

+    complete_head_from_modules($conf, $langs, null, $head, $h, 'defaultvalues_admin', 'remove');

+

+

+    return $head;

@@ -999,20 +802,24 @@
-	global $conf;

-

-	$arrayofSessions = array();

-	// session.save_path can be returned empty so we set a default location and work from there

-	$sessPath = '/tmp';

-	$iniPath = ini_get("session.save_path");

-	if ($iniPath) {

-		$sessPath = $iniPath;

-	}

-	$sessPath .= '/'; // We need the trailing slash

-	dol_syslog('admin.lib:listOfSessions sessPath='.$sessPath);

-

-	$dh = @opendir(dol_osencode($sessPath));

-	if ($dh) {

-		while (($file = @readdir($dh)) !== false) {

-			if (preg_match('/^sess_/i', $file) && $file != "." && $file != "..") {

-				$fullpath = $sessPath.$file;

-				if (!@is_dir($fullpath) && is_readable($fullpath)) {

-					$sessValues = file_get_contents($fullpath); // get raw session data

-					// Example of possible value

+    global $conf;

+

+    $arrayofSessions = array();

+    // session.save_path can be returned empty so we set a default location and work from there

+    $sessPath = '/tmp';

+    $iniPath = ini_get("session.save_path");

+    if ($iniPath) {

+        $sessPath = $iniPath;

+    }

+    $sessPath .= '/'; // We need the trailing slash

+    dol_syslog('admin.lib:listOfSessions sessPath='.$sessPath);

+

+    $dh = @opendir(dol_osencode($sessPath));

+    if ($dh)

+    {

+        while (($file = @readdir($dh)) !== false)

+        {

+            if (preg_match('/^sess_/i', $file) && $file != "." && $file != "..")

+            {

+                $fullpath = $sessPath.$file;

+                if (!@is_dir($fullpath) && is_readable($fullpath))

+                {

+                    $sessValues = file_get_contents($fullpath); // get raw session data

+                    // Example of possible value

@@ -1023,22 +830,21 @@
-					if (preg_match('/dol_login/i', $sessValues) && // limit to dolibarr session

-						(preg_match('/dol_entity\|i:'.$conf->entity.';/i', $sessValues) || preg_match('/dol_entity\|s:([0-9]+):"'.$conf->entity.'"/i', $sessValues)) && // limit to current entity

-					preg_match('/dol_company\|s:([0-9]+):"('.getDolGlobalString('MAIN_INFO_SOCIETE_NOM').')"/i', $sessValues)) { // limit to company name

-						$tmp = explode('_', $file);

-						$idsess = $tmp[1];

-						$regs = array();

-						$loginfound = preg_match('/dol_login\|s:[0-9]+:"([A-Za-z0-9]+)"/i', $sessValues, $regs);

-						if ($loginfound) {

-							$arrayofSessions[$idsess]["login"] = $regs[1];

-						}

-						$arrayofSessions[$idsess]["age"] = time() - filectime($fullpath);

-						$arrayofSessions[$idsess]["creation"] = filectime($fullpath);

-						$arrayofSessions[$idsess]["modification"] = filemtime($fullpath);

-						$arrayofSessions[$idsess]["raw"] = $sessValues;

-					}

-				}

-			}

-		}

-		@closedir($dh);

-	}

-

-	return $arrayofSessions;

+                    if (preg_match('/dol_login/i', $sessValues) && // limit to dolibarr session

+                        (preg_match('/dol_entity\|i:'.$conf->entity.';/i', $sessValues) || preg_match('/dol_entity\|s:([0-9]+):"'.$conf->entity.'"/i', $sessValues)) && // limit to current entity

+                    preg_match('/dol_company\|s:([0-9]+):"('.$conf->global->MAIN_INFO_SOCIETE_NOM.')"/i', $sessValues)) // limit to company name

+                    {

+                        $tmp = explode('_', $file);

+                        $idsess = $tmp[1];

+                        $regs = array();

+                        $loginfound = preg_match('/dol_login\|s:[0-9]+:"([A-Za-z0-9]+)"/i', $sessValues, $regs);

+                        if ($loginfound) $arrayofSessions[$idsess]["login"] = $regs[1];

+                        $arrayofSessions[$idsess]["age"] = time() - filectime($fullpath);

+                        $arrayofSessions[$idsess]["creation"] = filectime($fullpath);

+                        $arrayofSessions[$idsess]["modification"] = filemtime($fullpath);

+                        $arrayofSessions[$idsess]["raw"] = $sessValues;

+                    }

+                }

+            }

+        }

+        @closedir($dh);

+    }

+

+    return $arrayofSessions;

@@ -1055,39 +861,36 @@
-	global $conf;

-

-	$sessPath = ini_get("session.save_path")."/";

-	dol_syslog('admin.lib:purgeSessions mysessionid='.$mysessionid.' sessPath='.$sessPath);

-

-	$error = 0;

-

-	$dh = @opendir(dol_osencode($sessPath));

-	if ($dh) {

-		while (($file = @readdir($dh)) !== false) {

-			if ($file != "." && $file != "..") {

-				$fullpath = $sessPath.$file;

-				if (!@is_dir($fullpath)) {

-					$sessValues = file_get_contents($fullpath); // get raw session data

-

-					if (preg_match('/dol_login/i', $sessValues) && // limit to dolibarr session

-					preg_match('/dol_entity\|s:([0-9]+):"('.$conf->entity.')"/i', $sessValues) && // limit to current entity

-					preg_match('/dol_company\|s:([0-9]+):"(' . getDolGlobalString('MAIN_INFO_SOCIETE_NOM').')"/i', $sessValues)) { // limit to company name

-						$tmp = explode('_', $file);

-						$idsess = $tmp[1];

-						// We remove session if it's not ourself

-						if ($idsess != $mysessionid) {

-							$res = @unlink($fullpath);

-							if (!$res) {

-								$error++;

-							}

-						}

-					}

-				}

-			}

-		}

-		@closedir($dh);

-	}

-

-	if (!$error) {

-		return 1;

-	} else {

-		return -$error;

-	}

+    global $conf;

+

+    $sessPath = ini_get("session.save_path")."/";

+    dol_syslog('admin.lib:purgeSessions mysessionid='.$mysessionid.' sessPath='.$sessPath);

+

+    $error = 0;

+    $dh = @opendir(dol_osencode($sessPath));

+    while (($file = @readdir($dh)) !== false)

+    {

+        if ($file != "." && $file != "..")

+        {

+            $fullpath = $sessPath.$file;

+            if (!@is_dir($fullpath))

+            {

+                $sessValues = file_get_contents($fullpath); // get raw session data

+

+                if (preg_match('/dol_login/i', $sessValues) && // limit to dolibarr session

+                preg_match('/dol_entity\|s:([0-9]+):"('.$conf->entity.')"/i', $sessValues) && // limit to current entity

+                preg_match('/dol_company\|s:([0-9]+):"('.$conf->global->MAIN_INFO_SOCIETE_NOM.')"/i', $sessValues)) // limit to company name

+                {

+                    $tmp = explode('_', $file);

+                    $idsess = $tmp[1];

+                    // We remove session if it's not ourself

+                    if ($idsess != $mysessionid)

+                    {

+                        $res = @unlink($fullpath);

+                        if (!$res) $error++;

+                    }

+                }

+            }

+        }

+    }

+    @closedir($dh);

+

+    if (!$error) return 1;

+    else return -$error;

@@ -1101,10 +904,9 @@
- *  @param      string		$value      			Name of module to activate

- *  @param      int			$withdeps  				Activate/Disable also all dependencies

- * 	@param		int			$noconfverification		Remove verification of $conf variable for module

- *  @return     array      			    			array('nbmodules'=>nb modules activated with success, 'errors=>array of error messages, 'nbperms'=>Nb permission added);

- */

-function activateModule($value, $withdeps = 1, $noconfverification = 0)

-{

-	global $db, $langs, $conf, $mysoc;

-

-	$ret = array();

+ *  @param      string		$value      Name of module to activate

+ *  @param      int			$withdeps   Activate/Disable also all dependencies

+ *  @return     array      			    array('nbmodules'=>nb modules activated with success, 'errors=>array of error messages, 'nbperms'=>Nb permission added);

+ */

+function activateModule($value, $withdeps = 1)

+{

+    global $db, $langs, $conf, $mysoc;

+

+    $ret = array();

@@ -1118,23 +920,23 @@
-	$ret = array('nbmodules'=>0, 'errors'=>array(), 'nbperms'=>0);

-	$modName = $value;

-	$modFile = $modName.".class.php";

-

-	// Loop on each directory to fill $modulesdir

-	$modulesdir = dolGetModulesDirs();

-

-	// Loop on each modulesdir directories

-	$found = false;

-	foreach ($modulesdir as $dir) {

-		if (file_exists($dir.$modFile)) {

-			$found = @include_once $dir.$modFile;

-			if ($found) {

-				break;

-			}

-		}

-	}

-

-	$objMod = new $modName($db);

-

-	// Test if PHP version ok

-	$verphp = versionphparray();

-	$vermin = isset($objMod->phpmin) ? $objMod->phpmin : 0;

+    $ret = array('nbmodules'=>0, 'errors'=>array(), 'nbperms'=>0);

+    $modName = $value;

+    $modFile = $modName.".class.php";

+

+    // Loop on each directory to fill $modulesdir

+    $modulesdir = dolGetModulesDirs();

+

+    // Loop on each modulesdir directories

+    $found = false;

+    foreach ($modulesdir as $dir)

+    {

+        if (file_exists($dir.$modFile))

+        {

+            $found = @include_once $dir.$modFile;

+            if ($found) break;

+        }

+    }

+

+    $objMod = new $modName($db);

+

+    // Test if PHP version ok

+    $verphp = versionphparray();

+    $vermin = isset($objMod->phpmin) ? $objMod->phpmin : 0;

@@ -1146,4 +948,4 @@
-	// Test if Dolibarr version ok

-	$verdol = versiondolibarrarray();

-	$vermin = isset($objMod->need_dolibarr_version) ? $objMod->need_dolibarr_version : 0;

-	//print 'version: '.versioncompare($verdol,$vermin).' - '.join(',',$verdol).' - '.join(',',$vermin);exit;

+    // Test if Dolibarr version ok

+    $verdol = versiondolibarrarray();

+    $vermin = isset($objMod->need_dolibarr_version) ? $objMod->need_dolibarr_version : 0;

+    //print 'version: '.versioncompare($verdol,$vermin).' - '.join(',',$verdol).' - '.join(',',$vermin);exit;

@@ -1162,77 +964,80 @@
-	if ($noconfverification == 0) {

-		if (getDolGlobalString($const_name)) {

-			return $ret;

-		}

-	}

-

-	$result = $objMod->init(); // Enable module

-

-	if ($result <= 0) {

-		$ret['errors'][] = $objMod->error;

-	} else {

-		if ($withdeps) {

-			if (isset($objMod->depends) && is_array($objMod->depends) && !empty($objMod->depends)) {

-				// Activation of modules this module depends on

-				// this->depends may be array('modModule1', 'mmodModule2') or array('always'=>array('modModule1'), 'FR'=>array('modModule2"))

-				foreach ($objMod->depends as $key => $modulestringorarray) {

-					//var_dump((! is_numeric($key)) && ! preg_match('/^always/', $key) && $mysoc->country_code && ! preg_match('/^'.$mysoc->country_code.'/', $key));exit;

-					if ((!is_numeric($key)) && !preg_match('/^always/', $key) && $mysoc->country_code && !preg_match('/^'.$mysoc->country_code.'/', $key)) {

-						dol_syslog("We are not concerned by dependency with key=".$key." because our country is ".$mysoc->country_code);

-						continue;

-					}

-

-					if (!is_array($modulestringorarray)) {

-						$modulestringorarray = array($modulestringorarray);

-					}

-

-					foreach ($modulestringorarray as $modulestring) {

-						$activate = false;

-						$activateerr = '';

-						foreach ($modulesdir as $dir) {

-							if (file_exists($dir.$modulestring.".class.php")) {

-								$resarray = activateModule($modulestring);

-								if (empty($resarray['errors'])) {

-									$activate = true;

-								} else {

-									$activateerr = join(', ', $resarray['errors']);

-									foreach ($resarray['errors'] as $errorMessage) {

-										dol_syslog($errorMessage, LOG_ERR);

-									}

-								}

-								break;

-							}

-						}

-

-						if ($activate) {

-							$ret['nbmodules'] += $resarray['nbmodules'];

-							$ret['nbperms'] += $resarray['nbperms'];

-						} else {

-							if ($activateerr) {

-								$ret['errors'][] = $activateerr;

-							}

-							$ret['errors'][] = $langs->trans('activateModuleDependNotSatisfied', $objMod->name, $modulestring);

-						}

-					}

-				}

-			}

-

-			if (isset($objMod->conflictwith) && is_array($objMod->conflictwith) && !empty($objMod->conflictwith)) {

-				// Desactivation des modules qui entrent en conflit

-				$num = count($objMod->conflictwith);

-				for ($i = 0; $i < $num; $i++) {

-					foreach ($modulesdir as $dir) {

-						if (file_exists($dir.$objMod->conflictwith[$i].".class.php")) {

-							unActivateModule($objMod->conflictwith[$i], 0);

-						}

-					}

-				}

-			}

-		}

-	}

-

-	if (!count($ret['errors'])) {

-		$ret['nbmodules']++;

-		$ret['nbperms'] += (is_array($objMod->rights) ? count($objMod->rights) : 0);

-	}

-

-	return $ret;

+	if (!empty($conf->global->$const_name)) {

+        return $ret;

+    }

+

+    $result = $objMod->init(); // Enable module

+

+    if ($result <= 0)

+    {

+        $ret['errors'][] = $objMod->error;

+    }

+    else

+    {

+        if ($withdeps)

+        {

+            if (isset($objMod->depends) && is_array($objMod->depends) && !empty($objMod->depends))

+            {

+                // Activation of modules this module depends on

+                // this->depends may be array('modModule1', 'mmodModule2') or array('always1'=>"modModule1", 'FR'=>'modModule2')

+                foreach ($objMod->depends as $key => $modulestring)

+                {

+                	//var_dump((! is_numeric($key)) && ! preg_match('/^always/', $key) && $mysoc->country_code && ! preg_match('/^'.$mysoc->country_code.'/', $key));exit;

+                	if ((!is_numeric($key)) && !preg_match('/^always/', $key) && $mysoc->country_code && !preg_match('/^'.$mysoc->country_code.'/', $key))

+                    {

+                        dol_syslog("We are not concerned by dependency with key=".$key." because our country is ".$mysoc->country_code);

+                        continue;

+                    }

+                	$activate = false;

+                	foreach ($modulesdir as $dir)

+                	{

+                		if (file_exists($dir.$modulestring.".class.php"))

+                		{

+                			$resarray = activateModule($modulestring);

+    						if (empty($resarray['errors'])) {

+    						    $activate = true;

+                            } else {

+    						    foreach ($resarray['errors'] as $errorMessage) {

+                                    dol_syslog($errorMessage, LOG_ERR);

+                                }

+                            }

+    						break;

+                		}

+                	}

+

+    				if ($activate)

+    				{

+    				    $ret['nbmodules'] += $resarray['nbmodules'];

+    				    $ret['nbperms'] += $resarray['nbperms'];

+    				}

+    				else

+    				{

+    				    $ret['errors'][] = $langs->trans('activateModuleDependNotSatisfied', $objMod->name, $modulestring);

+    				}

+                }

+            }

+

+            if (isset($objMod->conflictwith) && is_array($objMod->conflictwith) && !empty($objMod->conflictwith))

+            {

+                // Desactivation des modules qui entrent en conflit

+                $num = count($objMod->conflictwith);

+                for ($i = 0; $i < $num; $i++)

+                {

+                	foreach ($modulesdir as $dir)

+                	{

+                		if (file_exists($dir.$objMod->conflictwith[$i].".class.php"))

+                		{

+                			unActivateModule($objMod->conflictwith[$i], 0);

+                		}

+                	}

+                }

+            }

+        }

+    }

+

+    if (!count($ret['errors']))

+    {

+        $ret['nbmodules']++;

+        $ret['nbperms'] += count($objMod->rights);

+    }

+

+    return $ret;

@@ -1251,53 +1056,54 @@
-	global $db, $modules, $conf;

-

-	// Check parameters

-	if (empty($value)) {

-		return 'ErrorBadParameter';

-	}

-

-	$ret = '';

-	$modName = $value;

-	$modFile = $modName.".class.php";

-

-	// Loop on each directory to fill $modulesdir

-	$modulesdir = dolGetModulesDirs();

-

-	// Loop on each modulesdir directories

-	$found = false;

-	foreach ($modulesdir as $dir) {

-		if (file_exists($dir.$modFile)) {

-			$found = @include_once $dir.$modFile;

-			if ($found) {

-				break;

-			}

-		}

-	}

-

-	if ($found) {

-		$objMod = new $modName($db);

-		$result = $objMod->remove();

-		if ($result <= 0) {

-			$ret = $objMod->error;

-		}

-	} else { // We come here when we try to unactivate a module when module does not exists anymore in sources

-		//print $dir.$modFile;exit;

-		// TODO Replace this after DolibarrModules is moved as abstract class with a try catch to show module we try to disable has not been found or could not be loaded

-		include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

-		$genericMod = new DolibarrModules($db);

-		$genericMod->name = preg_replace('/^mod/i', '', $modName);

-		$genericMod->rights_class = strtolower(preg_replace('/^mod/i', '', $modName));

-		$genericMod->const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', $modName));

-		dol_syslog("modules::unActivateModule Failed to find module file, we use generic function with name ".$modName);

-		$genericMod->remove('');

-	}

-

-	// Disable modules that depends on module we disable

-	if (!$ret && $requiredby && is_object($objMod) && is_array($objMod->requiredby)) {

-		$countrb = count($objMod->requiredby);

-		for ($i = 0; $i < $countrb; $i++) {

-			//var_dump($objMod->requiredby[$i]);

-			unActivateModule($objMod->requiredby[$i]);

-		}

-	}

-

-	return $ret;

+    global $db, $modules, $conf;

+

+    // Check parameters

+    if (empty($value)) return 'ErrorBadParameter';

+

+    $ret = '';

+    $modName = $value;

+    $modFile = $modName.".class.php";

+

+    // Loop on each directory to fill $modulesdir

+    $modulesdir = dolGetModulesDirs();

+

+    // Loop on each modulesdir directories

+    $found = false;

+    foreach ($modulesdir as $dir)

+    {

+        if (file_exists($dir.$modFile))

+        {

+            $found = @include_once $dir.$modFile;

+            if ($found) break;

+        }

+    }

+

+    if ($found)

+    {

+        $objMod = new $modName($db);

+        $result = $objMod->remove();

+        if ($result <= 0) $ret = $objMod->error;

+    }

+    else    // We come here when we try to unactivate a module when module does not exists anymore in sources

+    {

+        //print $dir.$modFile;exit;

+    	// TODO Replace this after DolibarrModules is moved as abstract class with a try catch to show module we try to disable has not been found or could not be loaded

+        include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

+    	$genericMod = new DolibarrModules($db);

+        $genericMod->name = preg_replace('/^mod/i', '', $modName);

+        $genericMod->rights_class = strtolower(preg_replace('/^mod/i', '', $modName));

+        $genericMod->const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', $modName));

+        dol_syslog("modules::unActivateModule Failed to find module file, we use generic function with name ".$modName);

+        $genericMod->remove('');

+    }

+

+    // Disable modules that depends on module we disable

+    if (!$ret && $requiredby && is_object($objMod) && is_array($objMod->requiredby))

+    {

+        $countrb = count($objMod->requiredby);

+        for ($i = 0; $i < $countrb; $i++)

+        {

+            //var_dump($objMod->requiredby[$i]);

+            unActivateModule($objMod->requiredby[$i]);

+        }

+    }

+

+    return $ret;

@@ -1322 +1128 @@
- *  @param		array		$tabcomplete   		Tab complete (will replace all other in future). Key is table name.

+ *  @param		array		$tabfieldcheck		Tabfieldcheck

@@ -1325,7 +1131,7 @@
-function complete_dictionary_with_modules(&$taborder, &$tabname, &$tablib, &$tabsql, &$tabsqlsort, &$tabfield, &$tabfieldvalue, &$tabfieldinsert, &$tabrowid, &$tabcond, &$tabhelp, &$tabcomplete)

-{

-	global $db, $modules, $conf, $langs;

-

-	dol_syslog("complete_dictionary_with_modules Search external modules to complete the list of dictionnary tables", LOG_DEBUG, 1);

-

-	// Search modules

+function complete_dictionary_with_modules(&$taborder, &$tabname, &$tablib, &$tabsql, &$tabsqlsort, &$tabfield, &$tabfieldvalue, &$tabfieldinsert, &$tabrowid, &$tabcond, &$tabhelp, &$tabfieldcheck)

+{

+    global $db, $modules, $conf, $langs;

+

+    dol_syslog("complete_dictionary_with_modules Search external modules to complete the list of dictionnary tables", LOG_DEBUG, 1);

+

+    // Search modules

@@ -1333,40 +1139,43 @@
-	$i = 0; // is a sequencer of modules found

-	$j = 0; // j is module number. Automatically affected if module number not defined.

-

-	foreach ($modulesdir as $dir) {

-		// Load modules attributes in arrays (name, numero, orders) from dir directory

-		//print $dir."\n<br>";

-		dol_syslog("Scan directory ".$dir." for modules");

-		$handle = @opendir(dol_osencode($dir));

-		if (is_resource($handle)) {

-			while (($file = readdir($handle)) !== false) {

-				//print "$i ".$file."\n<br>";

-				if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php') {

-					$modName = substr($file, 0, dol_strlen($file) - 10);

-

-					if ($modName) {

-						include_once $dir.$file;

-						$objMod = new $modName($db);

-

-						if ($objMod->numero > 0) {

-							$j = $objMod->numero;

-						} else {

-							$j = 1000 + $i;

-						}

-

-						$modulequalified = 1;

-

-						// We discard modules according to features level (PS: if module is activated we always show it)

-						$const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));

-						if ($objMod->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2 && !getDolGlobalString($const_name)) {

-							$modulequalified = 0;

-						}

-						if ($objMod->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1 && !getDolGlobalString($const_name)) {

-							$modulequalified = 0;

-						}

-						// If module is not activated disqualified

-						if (!getDolGlobalString($const_name)) {

-							$modulequalified = 0;

-						}

-

-						if ($modulequalified) {

+    $i = 0; // is a sequencer of modules found

+    $j = 0; // j is module number. Automatically affected if module number not defined.

+

+    foreach ($modulesdir as $dir)

+    {

+    	// Load modules attributes in arrays (name, numero, orders) from dir directory

+    	//print $dir."\n<br>";

+    	dol_syslog("Scan directory ".$dir." for modules");

+        $handle = @opendir(dol_osencode($dir));

+        if (is_resource($handle))

+        {

+            while (($file = readdir($handle)) !== false)

+            {

+                //print "$i ".$file."\n<br>";

+                if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php')

+                {

+                    $modName = substr($file, 0, dol_strlen($file) - 10);

+

+                    if ($modName)

+                    {

+                        include_once $dir.$file;

+                        $objMod = new $modName($db);

+

+                        if ($objMod->numero > 0)

+                        {

+                            $j = $objMod->numero;

+                        }

+                        else

+                        {

+                            $j = 1000 + $i;

+                        }

+

+                        $modulequalified = 1;

+

+                        // We discard modules according to features level (PS: if module is activated we always show it)

+                        $const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));

+                        if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2 && !$conf->global->$const_name) $modulequalified = 0;

+                        if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && !$conf->global->$const_name) $modulequalified = 0;

+                        //If module is not activated disqualified

+                        if (empty($conf->global->$const_name)) $modulequalified = 0;

+

+                        if ($modulequalified)

+                        {

@@ -1380,3 +1189,97 @@
-							// Complete the arrays &$tabname,&$tablib,&$tabsql,&$tabsqlsort,&$tabfield,&$tabfieldvalue,&$tabfieldinsert,&$tabrowid,&$tabcond

-							if (empty($objMod->dictionaries) && !empty($objMod->dictionnaries)) {

-								$objMod->dictionaries = $objMod->dictionnaries; // For backward compatibility

+                            // Complete the arrays &$tabname,&$tablib,&$tabsql,&$tabsqlsort,&$tabfield,&$tabfieldvalue,&$tabfieldinsert,&$tabrowid,&$tabcond

+                            if (empty($objMod->dictionaries) && !empty($objMod->dictionnaries)) $objMod->dictionaries = $objMod->dictionnaries; // For backward compatibility

+

+                            if (!empty($objMod->dictionaries))

+                            {

+                                //var_dump($objMod->dictionaries['tabname']);

+                                $nbtabname = $nbtablib = $nbtabsql = $nbtabsqlsort = $nbtabfield = $nbtabfieldvalue = $nbtabfieldinsert = $nbtabrowid = $nbtabcond = $nbtabfieldcheck = $nbtabhelp = 0;

+                                foreach ($objMod->dictionaries['tabname'] as $val) { $nbtabname++; $taborder[] = max($taborder) + 1; $tabname[] = $val; }		// Position

+                                foreach ($objMod->dictionaries['tablib'] as $val) { $nbtablib++; $tablib[] = $val; }

+                                foreach ($objMod->dictionaries['tabsql'] as $val) { $nbtabsql++; $tabsql[] = $val; }

+                                foreach ($objMod->dictionaries['tabsqlsort'] as $val) { $nbtabsqlsort++; $tabsqlsort[] = $val; }

+                                foreach ($objMod->dictionaries['tabfield'] as $val) { $nbtabfield++; $tabfield[] = $val; }

+                                foreach ($objMod->dictionaries['tabfieldvalue'] as $val) { $nbtabfieldvalue++; $tabfieldvalue[] = $val; }

+                                foreach ($objMod->dictionaries['tabfieldinsert'] as $val) { $nbtabfieldinsert++; $tabfieldinsert[] = $val; }

+                                foreach ($objMod->dictionaries['tabrowid'] as $val) { $nbtabrowid++; $tabrowid[] = $val; }

+                                foreach ($objMod->dictionaries['tabcond'] as $val) { $nbtabcond++; $tabcond[] = $val; }

+                                if (!empty($objMod->dictionaries['tabhelp']))       foreach ($objMod->dictionaries['tabhelp'] as $val) { $nbtabhelp++; $tabhelp[] = $val; }

+                                if (!empty($objMod->dictionaries['tabfieldcheck'])) foreach ($objMod->dictionaries['tabfieldcheck'] as $val) { $nbtabfieldcheck++; $tabfieldcheck[] = $val; }

+

+                                if ($nbtabname != $nbtablib || $nbtablib != $nbtabsql || $nbtabsql != $nbtabsqlsort)

+                                {

+                                    print 'Error in descriptor of module '.$const_name.'. Array ->dictionaries has not same number of record for key "tabname", "tablib", "tabsql" and "tabsqlsort"';

+                                    //print "$const_name: $nbtabname=$nbtablib=$nbtabsql=$nbtabsqlsort=$nbtabfield=$nbtabfieldvalue=$nbtabfieldinsert=$nbtabrowid=$nbtabcond=$nbtabfieldcheck=$nbtabhelp\n";

+                                }

+                                else

+                                {

+                                	$taborder[] = 0; // Add an empty line

+                                }

+                            }

+

+                            $j++;

+                            $i++;

+                        }

+                        else dol_syslog("Module ".get_class($objMod)." not qualified");

+                    }

+                }

+            }

+            closedir($handle);

+        }

+        else

+        {

+            dol_syslog("htdocs/admin/modules.php: Failed to open directory ".$dir.". See permission and open_basedir option.", LOG_WARNING);

+        }

+    }

+

+    dol_syslog("", LOG_DEBUG, -1);

+

+    return 1;

+}

+

+/**

+ *  Activate external modules mandatory when country is country_code

+ *

+ * 	@param		string		$country_code	CountryCode

+ * 	@return		int			1

+ */

+function activateModulesRequiredByCountry($country_code)

+{

+	global $db, $conf, $langs;

+

+	$modulesdir = dolGetModulesDirs();

+

+	foreach ($modulesdir as $dir)

+	{

+		// Load modules attributes in arrays (name, numero, orders) from dir directory

+		dol_syslog("Scan directory ".$dir." for modules");

+		$handle = @opendir(dol_osencode($dir));

+		if (is_resource($handle))

+		{

+			while (($file = readdir($handle)) !== false)

+			{

+				if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php')

+				{

+					$modName = substr($file, 0, dol_strlen($file) - 10);

+

+					if ($modName)

+					{

+						include_once $dir.$file;

+						$objMod = new $modName($db);

+

+						$modulequalified = 1;

+

+						// We discard modules according to features level (PS: if module is activated we always show it)

+						$const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));

+

+						if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;

+						if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;

+						if (!empty($conf->global->$const_name)) $modulequalified = 0; // already activated

+

+						if ($modulequalified)

+						{

+							// Load languages files of module

+							if (isset($objMod->automatic_activation) && is_array($objMod->automatic_activation) && isset($objMod->automatic_activation[$country_code]))

+							{

+								activateModule($modName);

+

+								setEventMessages($objMod->automatic_activation[$country_code], null, 'warnings');

@@ -1384,89 +1286,0 @@
-

-							if (!empty($objMod->dictionaries)) {

-								//var_dump($objMod->dictionaries['tabname']);

-								$nbtabname = $nbtablib = $nbtabsql = $nbtabsqlsort = $nbtabfield = $nbtabfieldvalue = $nbtabfieldinsert = $nbtabrowid = $nbtabcond = $nbtabfieldcheck = $nbtabhelp = 0;

-								$tabnamerelwithkey = array();

-								foreach ($objMod->dictionaries['tabname'] as $key => $val) {

-									$tmptablename = preg_replace('/'.MAIN_DB_PREFIX.'/', '', $val);

-									$nbtabname++;

-									$taborder[] = max($taborder) + 1;

-									$tabname[] = $val;

-									$tabnamerelwithkey[$key] = $val;

-									$tabcomplete[$tmptablename]['picto'] = $objMod->picto;

-								}		// Position

-								foreach ($objMod->dictionaries['tablib'] as $key => $val) {

-									$tmptablename = preg_replace('/'.MAIN_DB_PREFIX.'/', '', $tabnamerelwithkey[$key]);

-									$nbtablib++;

-									$tablib[] = $val;

-									$tabcomplete[$tmptablename]['lib'] = $val;

-								}

-								foreach ($objMod->dictionaries['tabsql'] as $key => $val) {

-									$tmptablename = preg_replace('/'.MAIN_DB_PREFIX.'/', '', $tabnamerelwithkey[$key]);

-									$nbtabsql++;

-									$tabsql[] = $val;

-									$tabcomplete[$tmptablename]['sql'] = $val;

-								}

-								foreach ($objMod->dictionaries['tabsqlsort'] as $key => $val) {

-									$tmptablename = preg_replace('/'.MAIN_DB_PREFIX.'/', '', $tabnamerelwithkey[$key]);

-									$nbtabsqlsort++;

-									$tabsqlsort[] = $val;

-									$tabcomplete[$tmptablename]['sqlsort'] = $val;

-								}

-								foreach ($objMod->dictionaries['tabfield'] as $key => $val) {

-									$tmptablename = preg_replace('/'.MAIN_DB_PREFIX.'/', '', $tabnamerelwithkey[$key]);

-									$nbtabfield++;

-									$tabfield[] = $val;

-									$tabcomplete[$tmptablename]['field'] = $val;

-								}

-								foreach ($objMod->dictionaries['tabfieldvalue'] as $key => $val) {

-									$tmptablename = preg_replace('/'.MAIN_DB_PREFIX.'/', '', $tabnamerelwithkey[$key]);

-									$nbtabfieldvalue++;

-									$tabfieldvalue[] = $val;

-									$tabcomplete[$tmptablename]['value'] = $val;

-								}

-								foreach ($objMod->dictionaries['tabfieldinsert'] as $key => $val) {

-									$tmptablename = preg_replace('/'.MAIN_DB_PREFIX.'/', '', $tabnamerelwithkey[$key]);

-									$nbtabfieldinsert++;

-									$tabfieldinsert[] = $val;

-									$tabcomplete[$tmptablename]['fieldinsert'] = $val;

-								}

-								foreach ($objMod->dictionaries['tabrowid'] as $key => $val) {

-									$tmptablename = preg_replace('/'.MAIN_DB_PREFIX.'/', '', $tabnamerelwithkey[$key]);

-									$nbtabrowid++;

-									$tabrowid[] = $val;

-									$tabcomplete[$tmptablename]['rowid'] = $val;

-								}

-								foreach ($objMod->dictionaries['tabcond'] as $key => $val) {

-									$tmptablename = preg_replace('/'.MAIN_DB_PREFIX.'/', '', $tabnamerelwithkey[$key]);

-									$nbtabcond++;

-									$tabcond[] = $val;

-									$tabcomplete[$tmptablename]['rowid'] = $val;

-								}

-								if (!empty($objMod->dictionaries['tabhelp'])) {

-									foreach ($objMod->dictionaries['tabhelp'] as $key => $val) {

-										$tmptablename = preg_replace('/'.MAIN_DB_PREFIX.'/', '', $tabnamerelwithkey[$key]);

-										$nbtabhelp++;

-										$tabhelp[] = $val;

-										$tabcomplete[$tmptablename]['help'] = $val;

-									}

-								}

-								if (!empty($objMod->dictionaries['tabfieldcheck'])) {

-									foreach ($objMod->dictionaries['tabfieldcheck'] as $key => $val) {

-										$tmptablename = preg_replace('/'.MAIN_DB_PREFIX.'/', '', $tabnamerelwithkey[$key]);

-										$nbtabfieldcheck++;

-										$tabcomplete[$tmptablename]['fieldcheck'] = $val;

-									}

-								}

-

-								if ($nbtabname != $nbtablib || $nbtablib != $nbtabsql || $nbtabsql != $nbtabsqlsort) {

-									print 'Error in descriptor of module '.$const_name.'. Array ->dictionaries has not same number of record for key "tabname", "tablib", "tabsql" and "tabsqlsort"';

-									//print "$const_name: $nbtabname=$nbtablib=$nbtabsql=$nbtabsqlsort=$nbtabfield=$nbtabfieldvalue=$nbtabfieldinsert=$nbtabrowid=$nbtabcond=$nbtabfieldcheck=$nbtabhelp\n";

-								} else {

-									$taborder[] = 0; // Add an empty line

-								}

-							}

-

-							$j++;

-							$i++;

-						} else {

-							dol_syslog("Module ".get_class($objMod)." not qualified");

@@ -1473,0 +1288 @@
+						else dol_syslog("Module ".get_class($objMod)." not qualified");

@@ -1478 +1293,3 @@
-		} else {

+		}

+		else

+		{

@@ -1483,64 +1299,0 @@
-	dol_syslog("", LOG_DEBUG, -1);

-

-	return 1;

-}

-

-/**

- *  Activate external modules mandatory when country is country_code

- *

- * 	@param		string		$country_code	CountryCode

- * 	@return		int			1

- */

-function activateModulesRequiredByCountry($country_code)

-{

-	global $db, $conf, $langs;

-

-	$modulesdir = dolGetModulesDirs();

-

-	foreach ($modulesdir as $dir) {

-		// Load modules attributes in arrays (name, numero, orders) from dir directory

-		dol_syslog("Scan directory ".$dir." for modules");

-		$handle = @opendir(dol_osencode($dir));

-		if (is_resource($handle)) {

-			while (($file = readdir($handle)) !== false) {

-				if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php') {

-					$modName = substr($file, 0, dol_strlen($file) - 10);

-

-					if ($modName) {

-						include_once $dir.$file;

-						$objMod = new $modName($db);

-

-						$modulequalified = 1;

-

-						// We discard modules according to features level (PS: if module is activated we always show it)

-						$const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));

-

-						if ($objMod->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {

-							$modulequalified = 0;

-						}

-						if ($objMod->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {

-							$modulequalified = 0;

-						}

-						if (getDolGlobalString($const_name)) {

-							$modulequalified = 0; // already activated

-						}

-

-						if ($modulequalified) {

-							// Load languages files of module

-							if (isset($objMod->automatic_activation) && is_array($objMod->automatic_activation) && isset($objMod->automatic_activation[$country_code])) {

-								activateModule($modName);

-

-								setEventMessages($objMod->automatic_activation[$country_code], null, 'warnings');

-							}

-						} else {

-							dol_syslog("Module ".get_class($objMod)." not qualified");

-						}

-					}

-				}

-			}

-			closedir($handle);

-		} else {

-			dol_syslog("htdocs/admin/modules.php: Failed to open directory ".$dir.". See permission and open_basedir option.", LOG_WARNING);

-		}

-	}

-

@@ -1558,53 +1311,56 @@
-	global $db, $modules, $conf, $langs;

-

-	// Search modules

-	$filename = array();

-	$modules = array();

-	$orders = array();

-	$categ = array();

-	$dirmod = array();

-

-	$i = 0; // is a sequencer of modules found

-	$j = 0; // j is module number. Automatically affected if module number not defined.

-

-	dol_syslog("complete_elementList_with_modules Search external modules to complete the list of contact element", LOG_DEBUG, 1);

-

-	$modulesdir = dolGetModulesDirs();

-

-	foreach ($modulesdir as $dir) {

-		// Load modules attributes in arrays (name, numero, orders) from dir directory

-		//print $dir."\n<br>";

-		dol_syslog("Scan directory ".$dir." for modules");

-		$handle = @opendir(dol_osencode($dir));

-		if (is_resource($handle)) {

-			while (($file = readdir($handle)) !== false) {

-				//print "$i ".$file."\n<br>";

-				if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php') {

-					$modName = substr($file, 0, dol_strlen($file) - 10);

-

-					if ($modName) {

-						include_once $dir.$file;

-						$objMod = new $modName($db);

-

-						if ($objMod->numero > 0) {

-							$j = $objMod->numero;

-						} else {

-							$j = 1000 + $i;

-						}

-

-						$modulequalified = 1;

-

-						// We discard modules according to features level (PS: if module is activated we always show it)

-						$const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));

-						if ($objMod->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2 && getDolGlobalString($const_name)) {

-							$modulequalified = 0;

-						}

-						if ($objMod->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1 && getDolGlobalString($const_name)) {

-							$modulequalified = 0;

-						}

-						// If module is not activated disqualified

-						if (!getDolGlobalString($const_name)) {

-							$modulequalified = 0;

-						}

-

-						if ($modulequalified) {

+    global $db, $modules, $conf, $langs;

+

+    // Search modules

+    $filename = array();

+    $modules = array();

+    $orders = array();

+    $categ = array();

+    $dirmod = array();

+

+    $i = 0; // is a sequencer of modules found

+    $j = 0; // j is module number. Automatically affected if module number not defined.

+

+    dol_syslog("complete_elementList_with_modules Search external modules to complete the list of contact element", LOG_DEBUG, 1);

+

+    $modulesdir = dolGetModulesDirs();

+

+    foreach ($modulesdir as $dir)

+    {

+    	// Load modules attributes in arrays (name, numero, orders) from dir directory

+    	//print $dir."\n<br>";

+    	dol_syslog("Scan directory ".$dir." for modules");

+        $handle = @opendir(dol_osencode($dir));

+        if (is_resource($handle))

+        {

+            while (($file = readdir($handle)) !== false)

+            {

+                //print "$i ".$file."\n<br>";

+                if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php')

+                {

+                    $modName = substr($file, 0, dol_strlen($file) - 10);

+

+                    if ($modName)

+                    {

+                        include_once $dir.$file;

+                        $objMod = new $modName($db);

+

+                        if ($objMod->numero > 0)

+                        {

+                            $j = $objMod->numero;

+                        }

+                        else

+                        {

+                            $j = 1000 + $i;

+                        }

+

+                        $modulequalified = 1;

+

+                        // We discard modules according to features level (PS: if module is activated we always show it)

+                        $const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));

+                        if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2 && !$conf->global->$const_name) $modulequalified = 0;

+                        if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && !$conf->global->$const_name) $modulequalified = 0;

+                        //If module is not activated disqualified

+                        if (empty($conf->global->$const_name)) $modulequalified = 0;

+

+                        if ($modulequalified)

+                        {

@@ -1612,39 +1368,37 @@
-							if (isset($objMod->langfiles) && is_array($objMod->langfiles)) {

-								foreach ($objMod->langfiles as $langfile) {

-									$langs->load($langfile);

-								}

-							}

-

-							$modules[$i] = $objMod;

-							$filename[$i] = $modName;

-							$orders[$i]  = $objMod->family."_".$j; // Sort on family then module number

-							$dirmod[$i] = $dir;

-							//print "x".$modName." ".$orders[$i]."\n<br>";

-

-							if (!empty($objMod->module_parts['contactelement'])) {

-								if (is_array($objMod->module_parts['contactelement'])) {

-									foreach ($objMod->module_parts['contactelement'] as $elem => $title) {

-										$elementList[$elem] = $langs->trans($title);

-									}

-								} else {

-									$elementList[$objMod->name] = $langs->trans($objMod->name);

-								}

-							}

-

-							$j++;

-							$i++;

-						} else {

-							dol_syslog("Module ".get_class($objMod)." not qualified");

-						}

-					}

-				}

-			}

-			closedir($handle);

-		} else {

-			dol_syslog("htdocs/admin/modules.php: Failed to open directory ".$dir.". See permission and open_basedir option.", LOG_WARNING);

-		}

-	}

-

-	dol_syslog("", LOG_DEBUG, -1);

-

-	return 1;

+                            if (isset($objMod->langfiles) && is_array($objMod->langfiles))

+                            {

+                             	foreach ($objMod->langfiles as $langfile)

+                              	{

+                               		$langs->load($langfile);

+                               	}

+                           	}

+

+                            $modules[$i] = $objMod;

+                            $filename[$i] = $modName;

+                            $orders[$i]  = $objMod->family."_".$j; // Sort on family then module number

+                            $dirmod[$i] = $dir;

+                            //print "x".$modName." ".$orders[$i]."\n<br>";

+

+                            if (!empty($objMod->module_parts['contactelement']))

+                            {

+                            	$elementList[$objMod->name] = $langs->trans($objMod->name);

+                            }

+

+                            $j++;

+                            $i++;

+                        }

+                        else dol_syslog("Module ".get_class($objMod)." not qualified");

+                    }

+                }

+            }

+            closedir($handle);

+        }

+        else

+        {

+            dol_syslog("htdocs/admin/modules.php: Failed to open directory ".$dir.". See permission and open_basedir option.", LOG_WARNING);

+        }

+    }

+

+    dol_syslog("", LOG_DEBUG, -1);

+

+    return 1;

@@ -1658,3 +1412,2 @@
- *	@param	int		$strictw3c		0=Include form into table (deprecated), 1=Form is outside table to respect W3C (deprecated), 2=No form nor button at all, 3=No form nor button at all and each field has a unique name (form is output by caller, recommended)

- *  @param  string  $helptext       Tooltip help to use for the column name of values

- *  @param	string	$text			Text to use for the column name of values

+ *	@param	int		$strictw3c		0=Include form into table (deprecated), 1=Form is outside table to respect W3C (deprecated), 2=No form nor button at all (form is output by caller, recommended)

+ *  @param  string  $helptext       Help

@@ -1663,38 +1416,40 @@
-function form_constantes($tableau, $strictw3c = 0, $helptext = '', $text = 'Value')

-{

-	global $db, $langs, $conf, $user;

-	global $_Avery_Labels;

-

-	$form = new Form($db);

-

-	if (empty($strictw3c)) {

-		dol_syslog("Warning: Function form_constantes is calle with parameter strictw3c = 0, this is deprecated. Value must be 2 now.", LOG_DEBUG);

-	}

-	if (!empty($strictw3c) && $strictw3c == 1) {

-		print "\n".'<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';

-		print '<input type="hidden" name="token" value="'.newToken().'">';

-		print '<input type="hidden" name="action" value="updateall">';

-	}

-

-	print '<div class="div-table-responsive-no-min">';

-	print '<table class="noborder centpercent">';

-	print '<tr class="liste_titre">';

-	print '<td class="">'.$langs->trans("Description").'</td>';

-	print '<td>';

-	$text = $langs->trans($text);

-	print $form->textwithpicto($text, $helptext, 1, 'help', '', 0, 2, 'idhelptext');

-	print '</td>';

-	if (empty($strictw3c)) {

-		print '<td class="center" width="80">'.$langs->trans("Action").'</td>';

-	}

-	print "</tr>\n";

-

-	$label = '';

-	foreach ($tableau as $key => $const) {	// Loop on each param

-		$label = '';

-		// $const is a const key like 'MYMODULE_ABC'

-		if (is_numeric($key)) {		// Very old behaviour

-			$type = 'string';

-		} else {

-			if (is_array($const)) {

-				$type = $const['type'];

+function form_constantes($tableau, $strictw3c = 0, $helptext = '')

+{

+    global $db, $langs, $conf, $user;

+    global $_Avery_Labels;

+

+    $form = new Form($db);

+

+    if (empty($strictw3c)) {

+    	dol_syslog("Warning: Function form_constantes is calle with parameter strictw3c = 0, this is deprecated. Value must be 2 now.", LOG_DEBUG);

+    }

+    if (!empty($strictw3c) && $strictw3c == 1)

+    {

+        print "\n".'<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';

+        print '<input type="hidden" name="token" value="'.newToken().'">';

+        print '<input type="hidden" name="action" value="updateall">';

+    }

+

+    print '<table class="noborder centpercent">';

+    print '<tr class="liste_titre">';

+    print '<td class="titlefield">'.$langs->trans("Description").'</td>';

+    print '<td>';

+    $text = $langs->trans("Value");

+    print $form->textwithpicto($text, $helptext, 1, 'help', '', 0, 2, 'idhelptext');

+    print '</td>';

+    if (empty($strictw3c)) print '<td class="center" width="80">'.$langs->trans("Action").'</td>';

+    print "</tr>\n";

+

+    $label = '';

+    foreach ($tableau as $key => $const)	// Loop on each param

+    {

+    	$label = '';

+    	// $const is a const key like 'MYMODULE_ABC'

+    	if (is_numeric($key)) {		// Very old behaviour

+    		$type = 'string';

+    	}

+    	else

+    	{

+    		if (is_array($const))

+    		{

+    			$type = $const['type'];

@@ -1702,158 +1457,166 @@
-				$const = $key;

-			} else {

-				$type = $const;

-				$const = $key;

-			}

-		}

-

-		$sql = "SELECT ";

-		$sql .= "rowid";

-		$sql .= ", ".$db->decrypt('name')." as name";

-		$sql .= ", ".$db->decrypt('value')." as value";

-		$sql .= ", type";

-		$sql .= ", note";

-		$sql .= " FROM ".MAIN_DB_PREFIX."const";

-		$sql .= " WHERE ".$db->decrypt('name')." = '".$db->escape($const)."'";

-		$sql .= " AND entity IN (0, ".$conf->entity.")";

-		$sql .= " ORDER BY name ASC, entity DESC";

-		$result = $db->query($sql);

-

-		dol_syslog("List params", LOG_DEBUG);

-		if ($result) {

-			$obj = $db->fetch_object($result); // Take first result of select

-

-			if (empty($obj)) {	// If not yet into table

-				$obj = (object) array('rowid'=>'', 'name'=>$const, 'value'=>'', 'type'=>$type, 'note'=>'');

-			}

-

-			if (empty($strictw3c)) {

-				print "\n".'<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';

-				print '<input type="hidden" name="token" value="'.newToken().'">';

-				print '<input type="hidden" name="page_y" value="'.newToken().'">';

-			}

-

-			print '<tr class="oddeven">';

-

-			// Show label of parameter

-			print '<td>';

-			if (empty($strictw3c)) {

-				print '<input type="hidden" name="action" value="update">';

-			}

-			print '<input type="hidden" name="rowid'.(empty($strictw3c) ? '' : '[]').'" value="'.$obj->rowid.'">';

-			print '<input type="hidden" name="constname'.(empty($strictw3c) ? '' : '[]').'" value="'.$const.'">';

-			print '<input type="hidden" name="constnote_'.$obj->name.'" value="'.nl2br(dol_escape_htmltag($obj->note)).'">';

-			print '<input type="hidden" name="consttype_'.$obj->name.'" value="'.($obj->type ? $obj->type : 'string').'">';

-			if (!empty($tableau[$key]['tooltip'])) {

-				print $form->textwithpicto($label ? $label : $langs->trans('Desc'.$const), $tableau[$key]['tooltip']);

-			} else {

-				print($label ? $label : $langs->trans('Desc'.$const));

-			}

-

-			if ($const == 'ADHERENT_MAILMAN_URL') {

-				print '. '.$langs->trans("Example").': <a href="#" id="exampleclick1">'.img_down().'</a><br>';

-				//print 'http://lists.exampe.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&subscribees=%EMAIL%&send_welcome_msg_to_this_batch=1';

-				print '<div id="example1" class="hidden">';

-				print 'http://lists.example.com/cgi-bin/mailman/admin/%LISTE%/members/add?subscribees_upload=%EMAIL%&amp;adminpw=%MAILMAN_ADMINPW%&amp;subscribe_or_invite=0&amp;send_welcome_msg_to_this_batch=0&amp;notification_to_list_owner=0';

-				print '</div>';

-			} elseif ($const == 'ADHERENT_MAILMAN_UNSUB_URL') {

-				print '. '.$langs->trans("Example").': <a href="#" id="exampleclick2">'.img_down().'</a><br>';

-				print '<div id="example2" class="hidden">';

-				print 'http://lists.example.com/cgi-bin/mailman/admin/%LISTE%/members/remove?unsubscribees_upload=%EMAIL%&amp;adminpw=%MAILMAN_ADMINPW%&amp;send_unsub_ack_to_this_batch=0&amp;send_unsub_notifications_to_list_owner=0';

-				print '</div>';

-				//print 'http://lists.example.com/cgi-bin/mailman/admin/%LISTE%/members/remove?adminpw=%MAILMAN_ADMINPW%&unsubscribees=%EMAIL%';

-			} elseif ($const == 'ADHERENT_MAILMAN_LISTS') {

-				print '. '.$langs->trans("Example").': <a href="#" id="exampleclick3">'.img_down().'</a><br>';

-				print '<div id="example3" class="hidden">';

-				print 'mymailmanlist<br>';

-				print 'mymailmanlist1,mymailmanlist2<br>';

-				print 'TYPE:Type1:mymailmanlist1,TYPE:Type2:mymailmanlist2<br>';

-				if (isModEnabled('categorie')) {

-					print 'CATEG:Categ1:mymailmanlist1,CATEG:Categ2:mymailmanlist2<br>';

-				}

-				print '</div>';

-				//print 'http://lists.example.com/cgi-bin/mailman/admin/%LISTE%/members/remove?adminpw=%MAILMAN_ADMINPW%&unsubscribees=%EMAIL%';

-			} elseif (in_array($const, ['ADHERENT_MAIL_FROM', 'ADHERENT_CC_MAIL_FROM'])) {

-				print ' '.img_help(1, $langs->trans("EMailHelpMsgSPFDKIM"));

-			}

-

-			print "</td>\n";

-

-			// Value

-			if ($const == 'ADHERENT_CARD_TYPE' || $const == 'ADHERENT_ETIQUETTE_TYPE') {

-				print '<td>';

-				// List of possible labels (defined into $_Avery_Labels variable set into format_cards.lib.php)

-				require_once DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php';

-				$arrayoflabels = array();

-				foreach (array_keys($_Avery_Labels) as $codecards) {

-					$arrayoflabels[$codecards] = $_Avery_Labels[$codecards]['name'];

-				}

-				print $form->selectarray('constvalue'.(empty($strictw3c) ? '' : ($strictw3c == 3 ? '_'.$const : '[]')), $arrayoflabels, ($obj->value ? $obj->value : 'CARD'), 1, 0, 0);

-				print '<input type="hidden" name="consttype" value="yesno">';

-				print '<input type="hidden" name="constnote'.(empty($strictw3c) ? '' : '[]').'" value="'.nl2br(dol_escape_htmltag($obj->note)).'">';

-				print '</td>';

-			} else {

-				print '<td>';

-				print '<input type="hidden" name="consttype'.(empty($strictw3c) ? '' : ($strictw3c == 3 ? '_'.$const : '[]')).'" value="'.($obj->type ? $obj->type : 'string').'">';

-				print '<input type="hidden" name="constnote'.(empty($strictw3c) ? '' : ($strictw3c == 3 ? '_'.$const : '[]')).'" value="'.nl2br(dol_escape_htmltag($obj->note)).'">';

-				if ($obj->type == 'textarea' || in_array($const, array('ADHERENT_CARD_TEXT', 'ADHERENT_CARD_TEXT_RIGHT', 'ADHERENT_ETIQUETTE_TEXT'))) {

-					print '<textarea class="flat" name="constvalue'.(empty($strictw3c) ? '' : ($strictw3c == 3 ? '_'.$const : '[]')).'" cols="50" rows="5" wrap="soft">'."\n";

-					print $obj->value;

-					print "</textarea>\n";

-				} elseif ($obj->type == 'html') {

-					require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';

-					$doleditor = new DolEditor('constvalue'.(empty($strictw3c) ? '' : ($strictw3c == 3 ? '_'.$const : '[]')), $obj->value, '', 160, 'dolibarr_notes', '', false, false, isModEnabled('fckeditor'), ROWS_5, '90%');

-					$doleditor->Create();

-				} elseif ($obj->type == 'yesno') {

-					print $form->selectyesno('constvalue'.(empty($strictw3c) ? '' : ($strictw3c == 3 ? '_'.$const : '[]')), $obj->value, 1);

-				} elseif (preg_match('/emailtemplate/', $obj->type)) {

-					include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';

-					$formmail = new FormMail($db);

-

-					$tmp = explode(':', $obj->type);

-

-					$nboftemplates = $formmail->fetchAllEMailTemplate($tmp[1], $user, null, -1); // We set lang=null to get in priority record with no lang

-					//$arraydefaultmessage = $formmail->getEMailTemplate($db, $tmp[1], $user, null, 0, 1, '');

-					$arrayofmessagename = array();

-					if (is_array($formmail->lines_model)) {

-						foreach ($formmail->lines_model as $modelmail) {

-							//var_dump($modelmail);

-							$moreonlabel = '';

-							if (!empty($arrayofmessagename[$modelmail->label])) {

-								$moreonlabel = ' <span class="opacitymedium">('.$langs->trans("SeveralLangugeVariatFound").')</span>';

-							}

-							// The 'label' is the key that is unique if we exclude the language

-							$arrayofmessagename[$modelmail->label.':'.$tmp[1]] = $langs->trans(preg_replace('/\(|\)/', '', $modelmail->label)).$moreonlabel;

-						}

-					}

-					//var_dump($arraydefaultmessage);

-					//var_dump($arrayofmessagename);

-					print $form->selectarray('constvalue'.(empty($strictw3c) ? '' : ($strictw3c == 3 ? '_'.$const : '[]')), $arrayofmessagename, $obj->value.':'.$tmp[1], 'None', 0, 0, '', 0, 0, 0, '', '', 1);

-				} elseif (preg_match('/MAIL_FROM$/i', $const)) {

-					print img_picto('', 'email', 'class="pictofixedwidth"').'<input type="text" class="flat minwidth300" name="constvalue'.(empty($strictw3c) ? '' : ($strictw3c == 3 ? '_'.$const : '[]')).'" value="'.dol_escape_htmltag($obj->value).'">';

-				} else { // type = 'string' ou 'chaine'

-					print '<input type="text" class="flat minwidth300" name="constvalue'.(empty($strictw3c) ? '' : ($strictw3c == 3 ? '_'.$const : '[]')).'" value="'.dol_escape_htmltag($obj->value).'">';

-				}

-				print '</td>';

-			}

-

-			// Submit

-			if (empty($strictw3c)) {

-				print '<td class="center">';

-				print '<input type="submit" class="button small reposition" value="'.$langs->trans("Update").'" name="update">';

-				print "</td>";

-			}

-

-			print "</tr>\n";

-

-			if (empty($strictw3c)) {

-				print "</form>\n";

-			}

-		}

-	}

-	print '</table>';

-	print '</div>';

-

-	if (!empty($strictw3c) && $strictw3c == 1) {

-		print '<div align="center"><input type="submit" class="button small reposition" value="'.$langs->trans("Update").'" name="update"></div>';

-		print "</form>\n";

-	}

+    			$const = $key;

+    		}

+    		else

+    		{

+    			$type = $const;

+    			$const = $key;

+    		}

+    	}

+

+        $sql = "SELECT ";

+        $sql .= "rowid";

+        $sql .= ", ".$db->decrypt('name')." as name";

+        $sql .= ", ".$db->decrypt('value')." as value";

+        $sql .= ", type";

+        $sql .= ", note";

+        $sql .= " FROM ".MAIN_DB_PREFIX."const";

+        $sql .= " WHERE ".$db->decrypt('name')." = '".$db->escape($const)."'";

+        $sql .= " AND entity IN (0, ".$conf->entity.")";

+        $sql .= " ORDER BY name ASC, entity DESC";

+        $result = $db->query($sql);

+

+        dol_syslog("List params", LOG_DEBUG);

+        if ($result)

+        {

+            $obj = $db->fetch_object($result); // Take first result of select

+

+            if (empty($obj))	// If not yet into table

+            {

+            	$obj = (object) array('rowid'=>'', 'name'=>$const, 'value'=>'', 'type'=>$type, 'note'=>'');

+            }

+

+            if (empty($strictw3c))

+            {

+            	print "\n".'<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';

+            	print '<input type="hidden" name="token" value="'.newToken().'">';

+            }

+

+            print '<tr class="oddeven">';

+

+            // Show constant

+            print '<td>';

+            if (empty($strictw3c)) print '<input type="hidden" name="action" value="update">';

+            print '<input type="hidden" name="rowid'.(empty($strictw3c) ? '' : '[]').'" value="'.$obj->rowid.'">';

+            print '<input type="hidden" name="constname'.(empty($strictw3c) ? '' : '[]').'" value="'.$const.'">';

+            print '<input type="hidden" name="constnote_'.$obj->name.'" value="'.nl2br(dol_escape_htmltag($obj->note)).'">';

+            print '<input type="hidden" name="consttype_'.$obj->name.'" value="'.($obj->type ? $obj->type : 'string').'">';

+

+            print ($label ? $label : $langs->trans('Desc'.$const));

+

+            if ($const == 'ADHERENT_MAILMAN_URL')

+            {

+                print '. '.$langs->trans("Example").': <a href="#" id="exampleclick1">'.img_down().'</a><br>';

+                //print 'http://lists.exampe.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&subscribees=%EMAIL%&send_welcome_msg_to_this_batch=1';

+                print '<div id="example1" class="hidden">';

+                print 'http://lists.example.com/cgi-bin/mailman/admin/%LISTE%/members/add?subscribees_upload=%EMAIL%&amp;adminpw=%MAILMAN_ADMINPW%&amp;subscribe_or_invite=0&amp;send_welcome_msg_to_this_batch=0&amp;notification_to_list_owner=0';

+                print '</div>';

+            }

+            if ($const == 'ADHERENT_MAILMAN_UNSUB_URL')

+            {

+                print '. '.$langs->trans("Example").': <a href="#" id="exampleclick2">'.img_down().'</a><br>';

+                print '<div id="example2" class="hidden">';

+                print 'http://lists.example.com/cgi-bin/mailman/admin/%LISTE%/members/remove?unsubscribees_upload=%EMAIL%&amp;adminpw=%MAILMAN_ADMINPW%&amp;send_unsub_ack_to_this_batch=0&amp;send_unsub_notifications_to_list_owner=0';

+                print '</div>';

+                //print 'http://lists.example.com/cgi-bin/mailman/admin/%LISTE%/members/remove?adminpw=%MAILMAN_ADMINPW%&unsubscribees=%EMAIL%';

+            }

+            if ($const == 'ADHERENT_MAILMAN_LISTS')

+            {

+            	print '. '.$langs->trans("Example").': <a href="#" id="exampleclick3">'.img_down().'</a><br>';

+            	print '<div id="example3" class="hidden">';

+            	print 'mymailmanlist<br>';

+            	print 'mymailmanlist1,mymailmanlist2<br>';

+            	print 'TYPE:Type1:mymailmanlist1,TYPE:Type2:mymailmanlist2<br>';

+            	if ($conf->categorie->enabled) print 'CATEG:Categ1:mymailmanlist1,CATEG:Categ2:mymailmanlist2<br>';

+            	print '</div>';

+            	//print 'http://lists.example.com/cgi-bin/mailman/admin/%LISTE%/members/remove?adminpw=%MAILMAN_ADMINPW%&unsubscribees=%EMAIL%';

+            }

+

+            print "</td>\n";

+

+            // Value

+            if ($const == 'ADHERENT_CARD_TYPE' || $const == 'ADHERENT_ETIQUETTE_TYPE')

+            {

+                print '<td>';

+                // List of possible labels (defined into $_Avery_Labels variable set into format_cards.lib.php)

+                require_once DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php';

+                $arrayoflabels = array();

+                foreach (array_keys($_Avery_Labels) as $codecards)

+                {

+                    $arrayoflabels[$codecards] = $_Avery_Labels[$codecards]['name'];

+                }

+                print $form->selectarray('constvalue'.(empty($strictw3c) ? '' : '[]'), $arrayoflabels, ($obj->value ? $obj->value : 'CARD'), 1, 0, 0);

+                print '<input type="hidden" name="consttype" value="yesno">';

+                print '<input type="hidden" name="constnote'.(empty($strictw3c) ? '' : '[]').'" value="'.nl2br(dol_escape_htmltag($obj->note)).'">';

+                print '</td>';

+            }

+            else

+            {

+                print '<td>';

+                print '<input type="hidden" name="consttype'.(empty($strictw3c) ? '' : '[]').'" value="'.($obj->type ? $obj->type : 'string').'">';

+                print '<input type="hidden" name="constnote'.(empty($strictw3c) ? '' : '[]').'" value="'.nl2br(dol_escape_htmltag($obj->note)).'">';

+                if ($obj->type == 'textarea' || in_array($const, array('ADHERENT_CARD_TEXT', 'ADHERENT_CARD_TEXT_RIGHT', 'ADHERENT_ETIQUETTE_TEXT')))

+                {

+                    print '<textarea class="flat" name="constvalue'.(empty($strictw3c) ? '' : '[]').'" cols="50" rows="5" wrap="soft">'."\n";

+                    print $obj->value;

+                    print "</textarea>\n";

+                }

+                elseif ($obj->type == 'html')

+                {

+                	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';

+                	$doleditor = new DolEditor('constvalue_'.$const.(empty($strictw3c) ? '' : '[]'), $obj->value, '', 160, 'dolibarr_notes', '', false, false, $conf->fckeditor->enabled, ROWS_5, '90%');

+                	$doleditor->Create();

+                }

+                elseif ($obj->type == 'yesno')

+                {

+                	print $form->selectyesno('constvalue'.(empty($strictw3c) ? '' : '[]'), $obj->value, 1);

+                }

+                elseif (preg_match('/emailtemplate/', $obj->type))

+                {

+                	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';

+                	$formmail = new FormMail($db);

+

+                	$tmp = explode(':', $obj->type);

+

+                	$nboftemplates = $formmail->fetchAllEMailTemplate($tmp[1], $user, null, -1); // We set lang=null to get in priority record with no lang

+                	//$arraydefaultmessage = $formmail->getEMailTemplate($db, $tmp[1], $user, null, 0, 1, '');

+                	$arrayofmessagename = array();

+                	if (is_array($formmail->lines_model))

+                	{

+	                	foreach ($formmail->lines_model as $modelmail)

+	                	{

+	                		//var_dump($modelmail);

+	                		$moreonlabel = '';

+	                		if (!empty($arrayofmessagename[$modelmail->label])) $moreonlabel = ' <span class="opacitymedium">('.$langs->trans("SeveralLangugeVariatFound").')</span>';

+	                		// The 'label' is the key that is unique if we exclude the language

+	                		$arrayofmessagename[$modelmail->label.':'.$tmp[1]] = $langs->trans(preg_replace('/\(|\)/', '', $modelmail->label)).$moreonlabel;

+	                	}

+                	}

+                	//var_dump($arraydefaultmessage);

+                	//var_dump($arrayofmessagename);

+                	print $form->selectarray('constvalue_'.$obj->name, $arrayofmessagename, $obj->value.':'.$tmp[1], 'None', 0, 0, '', 0, 0, 0, '', '', 1);

+                }

+                else	// type = 'string' ou 'chaine'

+                {

+                    print '<input type="text" class="flat" size="48" name="constvalue'.(empty($strictw3c) ? '' : '[]').'" value="'.dol_escape_htmltag($obj->value).'">';

+                }

+                print '</td>';

+            }

+            // Submit

+            if (empty($strictw3c))

+            {

+            	print '<td class="center">';

+            	print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';

+	            print "</td>";

+            }

+    	    print "</tr>\n";

+

+            if (empty($strictw3c)) print "</form>\n";

+        }

+    }

+    print '</table>';

+

+    if (!empty($strictw3c) && $strictw3c == 1)

+    {

+    	print '<div align="center"><input type="submit" class="button" value="'.$langs->trans("Update").'" name="update"></div>';

+    	print "</form>\n";

+    }

@@ -1874,2 +1637 @@
-	$listofmodules = explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL'));	// List of modules qualified for external user management

-

+	$listofmodules = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);

@@ -1878,2 +1640,2 @@
-		$tmpmodules = dol_sort_array($modules, 'module_position');

-		foreach ($tmpmodules as $module) {		// Loop on array of modules

+		foreach ($modules as $module)

+		{

@@ -1885,3 +1647 @@
-			if (!in_array($modulename, $listofmodules)) {

-				continue;

-			}

+			if (!in_array($modulename, $listofmodules)) continue;

@@ -1890,5 +1650,2 @@
-			if ($i > 0) {

-				$text .= ', ';

-			} else {

-				$text .= ' ';

-			}

+			if ($i > 0) $text .= ', ';

+			else $text .= ' ';

@@ -1896,7 +1653 @@
-

-			$tmptext = $langs->trans('Module'.$module->numero.'Name');

-			if ($tmptext != 'Module'.$module->numero.'Name') {

-				$text .= $langs->trans('Module'.$module->numero.'Name');

-			} else {

-				$text .= $langs->trans($module->name);

-			}

+			$text .= $langs->trans('Module'.$module->numero.'Name');

@@ -1905 +1655,0 @@
-

@@ -1917 +1667 @@
- *	@return		int						Return integer <0 if KO, >0 if OK

+ *	@return		int						<0 if KO, >0 if OK

@@ -1925,7 +1675,7 @@
-	$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity, libelle, description)";

-	$sql .= " VALUES ('".$db->escape($name)."','".$db->escape($type)."',".((int) $conf->entity).", ";

-	$sql .= ($label ? "'".$db->escape($label)."'" : 'null').", ";

-	$sql .= (!empty($description) ? "'".$db->escape($description)."'" : "null");

-	$sql .= ")";

-

-	dol_syslog("admin.lib::addDocumentModel", LOG_DEBUG);

+    $sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity, libelle, description)";

+    $sql .= " VALUES ('".$db->escape($name)."','".$type."',".$conf->entity.", ";

+    $sql .= ($label ? "'".$db->escape($label)."'" : 'null').", ";

+    $sql .= (!empty($description) ? "'".$db->escape($description)."'" : "null");

+    $sql .= ")";

+

+    dol_syslog("admin.lib::addDocumentModel", LOG_DEBUG);

@@ -1933 +1683,2 @@
-	if ($resql) {

+	if ($resql)

+	{

@@ -1936 +1687,3 @@
-	} else {

+	}

+	else

+	{

@@ -1948 +1701 @@
- *	@return		int						Return integer <0 if KO, >0 if OK

+ *	@return		int						<0 if KO, >0 if OK

@@ -1958,2 +1711,2 @@
-	$sql .= " AND type = '".$db->escape($type)."'";

-	$sql .= " AND entity = ".((int) $conf->entity);

+	$sql .= " AND type = '".$type."'";

+	$sql .= " AND entity = ".$conf->entity;

@@ -1963 +1716,2 @@
-	if ($resql) {

+	if ($resql)

+	{

@@ -1966 +1720,3 @@
-	} else {

+	}

+	else

+	{

@@ -1983,3 +1738,0 @@
-	$phpinfostring = ob_get_contents();

-	ob_end_clean();

-

@@ -1987 +1740 @@
-	$info_lines = explode("\n", strip_tags($phpinfostring, "<tr><td><h2>"));

+	$info_lines = explode("\n", strip_tags(ob_get_clean(), "<tr><td><h2>")); // end of ob_start()

@@ -1989 +1742,2 @@
-	foreach ($info_lines as $line) {

+	foreach ($info_lines as $line)

+	{

@@ -1994 +1748,2 @@
-		if (preg_match("~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~", $line, $val)) {

+		if (preg_match("~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~", $line, $val))

+		{

@@ -1996 +1751,3 @@
-		} elseif (preg_match("~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~", $line, $val)) {

+		}

+		elseif (preg_match("~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~", $line, $val))

+		{

@@ -2020,4 +1777,4 @@
-	$head[$h][0] = DOL_URL_ROOT."/admin/openinghours.php";

-	$head[$h][1] = $langs->trans("OpeningHours");

-	$head[$h][2] = 'openinghours';

-	$h++;

+   	$head[$h][0] = DOL_URL_ROOT."/admin/openinghours.php";

+   	$head[$h][1] = $langs->trans("OpeningHours");

+   	$head[$h][2] = 'openinghours';

+   	$h++;

@@ -2030,5 +1786,0 @@
-	$head[$h][0] = DOL_URL_ROOT."/admin/company_socialnetworks.php";

-	$head[$h][1] = $langs->trans("SocialNetworksInformation");

-	$head[$h][2] = 'socialnetworks';

-	$h++;

-

@@ -2054 +1806,2 @@
-	if (!empty($user->admin) && (empty($_SESSION['leftmenu']) || $_SESSION['leftmenu'] != 'email_templates')) {

+	if (!empty($user->admin) && (empty($_SESSION['leftmenu']) || $_SESSION['leftmenu'] != 'email_templates'))

+	{

@@ -2060 +1813,2 @@
-		if (isModEnabled('mailing')) {

+		if ($conf->mailing->enabled)

+		{

@@ -2066,7 +1819,0 @@
-

-		if (isModEnabled('ticket')) {

-			$head[$h][0] = DOL_URL_ROOT."/admin/mails_ticket.php";

-			$head[$h][1] = $langs->trans("OutGoingEmailSetupForEmailing", $langs->transnoentitiesnoconv("Ticket"));

-			$head[$h][2] = 'common_ticket';

-			$h++;

-		}

@@ -2075,2 +1822,7 @@
-	// admin and non admin can view this menu entry, but it is not shown yet when we on user menu "Email templates"

-	if (empty($_SESSION['leftmenu']) || $_SESSION['leftmenu'] != 'email_templates') {

+	$head[$h][0] = DOL_URL_ROOT."/admin/mails_templates.php";

+	$head[$h][1] = $langs->trans("EMailTemplates");

+	$head[$h][2] = 'templates';

+	$h++;

+

+	if (!empty($user->admin) && (empty($_SESSION['leftmenu']) || $_SESSION['leftmenu'] != 'email_templates'))

+	{

@@ -2083,10 +1834,0 @@
-	$head[$h][0] = DOL_URL_ROOT."/admin/mails_templates.php";

-	$head[$h][1] = $langs->trans("EMailTemplates");

-	$head[$h][2] = 'templates';

-	$h++;

-

-	$head[$h][0] = DOL_URL_ROOT."/admin/mails_ingoing.php";

-	$head[$h][1] = $langs->trans("InGoingEmailSetup", $langs->transnoentitiesnoconv("EMailing"));

-	$head[$h][2] = 'common_ingoing';

-	$h++;

-

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_agenda.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_agenda.lib.php
@@ -5 +4,0 @@
- * Copyright (C) 2022       Frédéric France         <frederic.france@netlogic.fr>

@@ -23,2 +22,2 @@
- * \file		htdocs/core/lib/agenda.lib.php

- * \brief		Set of function for the agenda module

+ *  \file		htdocs/core/lib/agenda.lib.php

+ *  \brief		Set of function for the agenda module

@@ -55 +53,0 @@
-	global $massaction;

@@ -65,40 +63,24 @@
-	print '<input type="hidden" name="year" value="'.((int) $year).'">';

-	print '<input type="hidden" name="month" value="'.((int) $month).'">';

-	print '<input type="hidden" name="day" value="'.((int) $day).'">';

-	if ($massaction != 'predelete' && $massaction != 'preaffecttag') {		// When $massaction == 'predelete', action may be already output to 'delete' by the mass action system.

-		print '<input type="hidden" name="action" value="'.$action.'">';

-	}

-	print '<input type="hidden" name="search_showbirthday" value="'.((int) $showbirthday).'">';

-

-	print '<div class="divsearchfield">';

-	// Type

-	$multiselect = 0;

-	if (getDolGlobalString('MAIN_ENABLE_MULTISELECT_TYPE')) {     // We use an option here because it adds bugs when used on agenda page "peruser" and "list"

-		$multiselect = (getDolGlobalString('AGENDA_USE_EVENT_TYPE'));

-	}

-	print img_picto($langs->trans("ActionType"), 'square', 'class="pictofixedwidth inline-block" style="color: #ddd;"');

-	print $formactions->select_type_actions($actioncode, "search_actioncode", $excludetype, (!getDolGlobalString('AGENDA_USE_EVENT_TYPE') ? 1 : -1), 0, $multiselect, 0, 'maxwidth500 widthcentpercentminusx');

-	print '</div>';

-

-	if ($canedit) {

-		// Assigned to user

-		print '<div class="divsearchfield">';

-		print img_picto($langs->trans("ActionsToDoBy"), 'user', 'class="pictofixedwidth inline-block"');

-		print $form->select_dolusers($filtert, 'search_filtert', 1, '', !$canedit, '', '', 0, 0, 0, '', 0, '', 'minwidth150 maxwidth500 widthcentpercentminusxx');

-		print '</div>';

-

-		// Assigned to user group

-		print '<div class="divsearchfield">';

-		print img_picto($langs->trans("ToUserOfGroup"), 'object_group', 'class="pictofixedwidth inline-block"');

-		print $form->select_dolgroups($usergroupid, 'usergroup', 1, '', !$canedit, '', '', '0', false, 'minwidth100 maxwidth500 widthcentpercentminusxx');

-		print '</div>';

-

-		if (isModEnabled('resource')) {

-			include_once DOL_DOCUMENT_ROOT.'/resource/class/html.formresource.class.php';

-			$formresource = new FormResource($db);

-

-			// Resource

-			print '<div class="divsearchfield">';

-			print img_picto($langs->trans("Resource"), 'object_resource', 'class="pictofixedwidth inline-block"');

-			print $formresource->select_resource_list($resourceid, "search_resourceid", '', 1, 0, 0, null, '', 2, 0, 'maxwidth500');

-			print '</div>';

+	print '<input type="hidden" name="year" value="'.$year.'">';

+	print '<input type="hidden" name="month" value="'.$month.'">';

+	print '<input type="hidden" name="day" value="'.$day.'">';

+	print '<input type="hidden" name="action" value="'.$action.'">';

+	print '<input type="hidden" name="search_showbirthday" value="'.$showbirthday.'">';

+

+	print '<div class="fichecenter">';

+

+	if ($conf->browser->layout == 'phone') print '<div class="fichehalfleft">';

+	else print '<table class="nobordernopadding centpercent"><tr><td class="borderright">';

+

+	print '<table class="nobordernopadding centpercent tableforfield">';

+

+	if ($canedit)

+	{

+		// Type

+		print '<tr>';

+		print '<td class="nowrap">';

+		print $langs->trans("Type");

+		print '</td><td class="nowraponall">';

+		$multiselect = 0;

+		if (!empty($conf->global->MAIN_ENABLE_MULTISELECT_TYPE))     // We use an option here because it adds bugs when used on agenda page "peruser" and "list"

+		{

+			$multiselect = (!empty($conf->global->AGENDA_USE_EVENT_TYPE));

@@ -106,5 +88,40 @@
-	}

-

-	if (isModEnabled('societe') && $user->hasRight('societe', 'lire')) {

-		print '<div class="divsearchfield">';

-		print img_picto($langs->trans("ThirdParty"), 'company', 'class="pictofixedwidth inline-block"');

+		print '<span class="fas fa-square inline-block fawidth30" style=" color: #ddd;"></span>';

+		print $formactions->select_type_actions($actioncode, "search_actioncode", $excludetype, (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : -1), 0, $multiselect, 0, 'maxwidth500');

+		print '</td></tr>';

+

+		// Assigned to

+		print '<tr>';

+		print '<td class="nowrap">';

+		print $langs->trans("ActionsToDoBy").' &nbsp; ';

+		print '</td><td>';

+		print img_picto('', 'user', 'class="fawidth30 inline-block"');

+		print $form->select_dolusers($filtert, 'search_filtert', 1, '', !$canedit, '', '', 0, 0, 0, '', 0, '', 'maxwidth500');

+		if (empty($conf->dol_optimize_smallscreen)) print ' &nbsp; '.$langs->trans("or").' '.$langs->trans("ToUserOfGroup").' &nbsp; ';

+		else print '<br>';

+		print img_picto('', 'object_group', 'class="fawidth30 inline-block"');

+		print $form->select_dolgroups($usergroupid, 'usergroup', 1, '', !$canedit, '', '', '0', false, 'maxwidth500');

+		print '</td></tr>';

+

+		if ($conf->resource->enabled)

+		{

+		    include_once DOL_DOCUMENT_ROOT.'/resource/class/html.formresource.class.php';

+		    $formresource = new FormResource($db);

+

+    		// Resource

+    		print '<tr>';

+    		print '<td class="nowrap">';

+    		print $langs->trans("Resource");

+    		print '</td><td class="nowraponall">';

+    		print img_picto('', 'object_resource', 'class="fawidth30 inline-block"');

+    		print $formresource->select_resource_list($resourceid, "search_resourceid", '', 1, 0, 0, null, '', 2, 0, 'maxwidth500');

+    		print '</td></tr>';

+		}

+	}

+

+	if (!empty($conf->societe->enabled) && $user->rights->societe->lire)

+	{

+		print '<tr>';

+		print '<td class="nowrap">';

+		print $langs->trans("ThirdParty").' &nbsp; ';

+		print '</td><td class="nowraponall">';

+		print img_picto('', 'company', 'class="fawidth30 inline-block"');

@@ -112,4 +129,5 @@
-		print '</div>';

-	}

-

-	if (isModEnabled('projet') && $user->hasRight('projet', 'lire')) {

+		print '</td></tr>';

+	}

+

+	if (!empty($conf->projet->enabled) && $user->rights->projet->lire)

+	{

@@ -119,2 +137,5 @@
-		print '<div class="divsearchfield">';

-		print img_picto($langs->trans("Project"), 'project', 'class="pictofixedwidth inline-block"');

+		print '<tr>';

+		print '<td class="nowrap">';

+		print $langs->trans("Project").' &nbsp; ';

+		print '</td><td class="nowraponall">';

+		print img_picto('', 'project', 'class="fawidth30 inline-block"');

@@ -122,4 +143,5 @@
-		print '</div>';

-	}

-

-	if ($canedit && !preg_match('/list/', $_SERVER["PHP_SELF"])) {

+		print '</td></tr>';

+	}

+

+	if ($canedit && !preg_match('/list/', $_SERVER["PHP_SELF"]))

+	{

@@ -127,2 +149,4 @@
-		print '<div class="divsearchfield">';

-		print img_picto($langs->trans("Status"), 'setup', 'class="pictofixedwidth inline-block"');

+		print '<tr>';

+		print '<td class="nowrap">';

+		print $langs->trans("Status");

+		print ' &nbsp;</td><td class="nowraponall">';

@@ -130 +154,29 @@
-		print '</div>';

+		print '</td></tr>';

+	}

+

+	if ($canedit && $action == 'show_peruser')

+	{

+		// Filter on hours

+		print '<tr>';

+		print '<td class="nowrap">'.$langs->trans("VisibleTimeRange").'</td>';

+		print "<td class='nowrap'>";

+		print '<div class="ui-grid-a"><div class="ui-block-a">';

+		print '<input type="number" class="short" name="begin_h" value="'.$begin_h.'" min="0" max="23">';

+		if (empty($conf->dol_use_jmobile)) print ' - ';

+		else print '</div><div class="ui-block-b">';

+		print '<input type="number" class="short" name="end_h" value="'.$end_h.'" min="1" max="24">';

+		if (empty($conf->dol_use_jmobile)) print ' '.$langs->trans("H");

+		print '</div></div>';

+		print '</td></tr>';

+

+		// Filter on days

+		print '<tr>';

+		print '<td class="nowrap">'.$langs->trans("VisibleDaysRange").'</td>';

+		print "<td class='nowrap'>";

+		print '<div class="ui-grid-a"><div class="ui-block-a">';

+		print '<input type="number" class="short" name="begin_d" value="'.$begin_d.'" min="1" max="7">';

+		if (empty($conf->dol_use_jmobile)) print ' - ';

+		else print '</div><div class="ui-block-b">';

+		print '<input type="number" class="short" name="end_d" value="'.$end_d.'" min="1" max="7">';

+		print '</div></div>';

+		print '</td></tr>';

@@ -135 +186,0 @@
-	$object = null;

@@ -138 +189,22 @@
-	print '<div class="clearboth"></div>';

+	print '</table>';

+

+	if ($conf->browser->layout == 'phone') print '</div>';

+	else print '</td>';

+

+	if ($conf->browser->layout == 'phone') print '<div class="fichehalfright">';

+	else print '<td class="center nowrap" valign="middle">';

+

+	print '<table class="centpercent"><tr><td align="center">';

+	print '<div class="formleftzone">';

+	print '<input type="submit" class="button" style="min-width:120px" name="refresh" value="'.$langs->trans("Refresh").'">';

+	print '</div>';

+	print '</td></tr>';

+	print '</table>';

+

+	if ($conf->browser->layout == 'phone') print '</div>';

+	else print '</td></tr></table>';

+

+	print '</div>'; // Close fichecenter

+	print '<div style="clear:both"></div>';

+

+	//print '</form>';

@@ -150 +222 @@
-	global $langs, $conf, $user, $db, $socid;

+	global $langs, $conf, $user, $db, $bc, $socid;

@@ -157,5 +229,3 @@
-	$sql = "SELECT a.id, a.label, a.datep as dp, a.datep2 as dp2, a.fk_user_author, a.percent";

-	$sql .= ", c.code, c.libelle as type_label";

-	$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";

-	$sql .= ", s.code_client, s.code_compta, s.client";

-	$sql .= ", s.logo, s.email, s.entity";

+	$sql = "SELECT a.id, a.label, a.datep as dp, a.datep2 as dp2, a.fk_user_author, a.percent,";

+	$sql .= " c.code, c.libelle as type_label,";

+	$sql .= " s.nom as sname, s.rowid, s.client";

@@ -164,12 +234,6 @@
-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";

-	if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {

-		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

-	}

-	$sql .= " WHERE a.entity IN (".getEntity('agenda').")";

-	$sql .= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep2 > '".$db->idate($now)."'))";

-	if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {

-		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);

-	}

-	if ($socid) {

-		$sql .= " AND s.rowid = ".((int) $socid);

-	}

+    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";

+	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

+	$sql .= " WHERE a.entity = ".$conf->entity;

+    $sql .= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep2 > '".$db->idate($now)."'))";

+	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;

+	if ($socid) $sql .= " AND s.rowid = ".$socid;

@@ -180,2 +244,3 @@
-	if ($resql) {

-		$num = $db->num_rows($resql);

+	if ($resql)

+	{

+	    $num = $db->num_rows($resql);

@@ -184,3 +249,3 @@
-		print '<table class="noborder centpercent">';

-		print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("LastActionsToDo", $max).'</th>';

-		print '<th colspan="2" class="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/list.php?mode=show_list&status=todo">'.$langs->trans("FullList").'</a></th>';

+	    print '<table class="noborder centpercent">';

+	    print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("LastActionsToDo", $max).'</th>';

+		print '<th colspan="2" class="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/list.php?status=todo">'.$langs->trans("FullList").'</a></th>';

@@ -189 +254,2 @@
-		$i = 0;

+		$var = true;

+	    $i = 0;

@@ -192,35 +258,31 @@
-		$customerstatic = new Client($db);

-

-		while ($i < $num) {

-			$obj = $db->fetch_object($resql);

-

-

-			print '<tr class="oddeven">';

-

-			$staticaction->type_code = $obj->code;

-			$staticaction->label = ($obj->label ? $obj->label : $obj->type_label);

-			$staticaction->id = $obj->id;

-			print '<td>'.$staticaction->getNomUrl(1, 34).'</td>';

-

-			// print '<td>'.dol_trunc($obj->label,22).'</td>';

-

-			print '<td>';

-			if ($obj->socid > 0) {

-				$customerstatic->id = $obj->socid;

-				$customerstatic->name = $obj->name;

-				//$customerstatic->name_alias = $obj->name_alias;

-				$customerstatic->code_client = $obj->code_client;

-				$customerstatic->code_compta = $obj->code_compta;

-				$customerstatic->client = $obj->client;

-				$customerstatic->logo = $obj->logo;

-				$customerstatic->email = $obj->email;

-				$customerstatic->entity = $obj->entity;

-				print $customerstatic->getNomUrl(1, '', 40);

-			}

-			print '</td>';

-

-			$datep = $db->jdate($obj->dp);

-			$datep2 = $db->jdate($obj->dp2);

-

-			// Date

-			print '<td width="100" class="right tddate">'.dol_print_date($datep, 'day').'&nbsp;';

+	    $customerstatic = new Client($db);

+

+        while ($i < $num)

+        {

+            $obj = $db->fetch_object($resql);

+

+

+            print '<tr class="oddeven">';

+

+            $staticaction->type_code = $obj->code;

+            $staticaction->label = ($obj->label ? $obj->label : $obj->type_label);

+            $staticaction->id = $obj->id;

+            print '<td>'.$staticaction->getNomUrl(1, 34).'</td>';

+

+            // print '<td>'.dol_trunc($obj->label,22).'</td>';

+

+            print '<td>';

+            if ($obj->rowid > 0)

+            {

+            	$customerstatic->id = $obj->rowid;

+            	$customerstatic->name = $obj->sname;

+            	$customerstatic->client = $obj->client;

+            	print $customerstatic->getNomUrl(1, '', 16);

+            }

+            print '</td>';

+

+            $datep = $db->jdate($obj->dp);

+            $datep2 = $db->jdate($obj->dp2);

+

+            // Date

+			print '<td width="100" class="right">'.dol_print_date($datep, 'day').'&nbsp;';

@@ -228,15 +290,5 @@
-			if ($obj->percent == 0 && $datep && $datep < time()) {

-				$late = 1;

-			}

-			if ($obj->percent == 0 && !$datep && $datep2 && $datep2 < time()) {

-				$late = 1;

-			}

-			if ($obj->percent > 0 && $obj->percent < 100 && $datep2 && $datep2 < time()) {

-				$late = 1;

-			}

-			if ($obj->percent > 0 && $obj->percent < 100 && !$datep2 && $datep && $datep < time()) {

-				$late = 1;

-			}

-			if ($late) {

-				print img_warning($langs->trans("Late"));

-			}

+			if ($obj->percent == 0 && $datep && $datep < time()) $late = 1;

+			if ($obj->percent == 0 && !$datep && $datep2 && $datep2 < time()) $late = 1;

+			if ($obj->percent > 0 && $obj->percent < 100 && $datep2 && $datep2 < time()) $late = 1;

+			if ($obj->percent > 0 && $obj->percent < 100 && !$datep2 && $datep && $datep < time()) $late = 1;

+			if ($late) print img_warning($langs->trans("Late"));

@@ -250,7 +302,9 @@
-			$i++;

-		}

-		print "</table></div><br>";

-

-		$db->free($resql);

-	} else {

-		dol_print_error($db);

+            $i++;

+        }

+	    print "</table></div><br>";

+

+	    $db->free($resql);

+	}

+	else

+	{

+	    dol_print_error($db);

@@ -269 +323 @@
-	global $langs, $conf, $user, $db, $socid;

+	global $langs, $conf, $user, $db, $bc, $socid;

@@ -273,5 +327,3 @@
-	$sql = "SELECT a.id, a.percent, a.datep as da, a.datep2 as da2, a.fk_user_author, a.label";

-	$sql .= ", c.code, c.libelle";

-	$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";

-	$sql .= ", s.code_client, s.code_compta, s.client";

-	$sql .= ", s.logo, s.email, s.entity";

+	$sql = "SELECT a.id, a.percent, a.datep as da, a.datep2 as da2, a.fk_user_author, a.label,";

+	$sql .= " c.code, c.libelle,";

+	$sql .= " s.rowid, s.nom as sname, s.client";

@@ -280,12 +332,6 @@
-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";

-	if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {

-		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

-	}

-	$sql .= " WHERE a.entity IN (".getEntity('agenda').")";

-	$sql .= " AND (a.percent >= 100 OR (a.percent = -1 AND a.datep2 <= '".$db->idate($now)."'))";

-	if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {

-		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);

-	}

-	if ($socid) {

-		$sql .= " AND s.rowid = ".((int) $socid);

-	}

+    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";

+	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

+	$sql .= " WHERE a.entity = ".$conf->entity;

+    $sql .= " AND (a.percent >= 100 OR (a.percent = -1 AND a.datep2 <= '".$db->idate($now)."'))";

+	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;

+    if ($socid) $sql .= " AND s.rowid = ".$socid;

@@ -296 +342,2 @@
-	if ($resql) {

+	if ($resql)

+	{

@@ -302 +349 @@
-		print '<th colspan="2" class="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/list.php?mode=show_list&status=done">'.$langs->trans("FullList").'</a></th>';

+		print '<th colspan="2" class="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/list.php?status=done">'.$langs->trans("FullList").'</a></th>';

@@ -304 +351 @@
-

+		$var = true;

@@ -307,4 +354,5 @@
-		$staticaction = new ActionComm($db);

-		$customerstatic = new Societe($db);

-

-		while ($i < $num) {

+	    $staticaction = new ActionComm($db);

+	    $customerstatic = new Societe($db);

+

+		while ($i < $num)

+		{

@@ -317 +365 @@
-			$staticaction->label = $obj->label;

+			$staticaction->libelle = $obj->label;

@@ -321 +369 @@
-			//print '<td>'.dol_trunc($obj->label,24).'</td>';

+            //print '<td>'.dol_trunc($obj->label,24).'</td>';

@@ -324,11 +372,6 @@
-			if ($obj->socid > 0) {

-				$customerstatic->id = $obj->socid;

-				$customerstatic->name = $obj->name;

-				//$customerstatic->name_alias = $obj->name_alias;

-				$customerstatic->code_client = $obj->code_client;

-				$customerstatic->code_compta = $obj->code_compta;

-				$customerstatic->client = $obj->client;

-				$customerstatic->logo = $obj->logo;

-				$customerstatic->email = $obj->email;

-				$customerstatic->entity = $obj->entity;

-				print $customerstatic->getNomUrl(1, '', 30);

+			if ($obj->rowid > 0)

+			{

+                $customerstatic->id = $obj->rowid;

+                $customerstatic->name = $obj->sname;

+                $customerstatic->client = $obj->client;

+			    print $customerstatic->getNomUrl(1, '', 24);

@@ -339 +382 @@
-			print '<td width="100" class="right tddate">'.dol_print_date($db->jdate($obj->da2), 'day');

+			print '<td width="100" class="right">'.dol_print_date($db->jdate($obj->da2), 'day');

@@ -342,2 +385,2 @@
-			// Status

-			print '<td class="right" width="14">'.$staticaction->LibStatut($obj->percent, 3)."</td>\n";

+			// Statut

+			print "<td class=\"right\" width=\"14\">".$staticaction->LibStatut($obj->percent, 3)."</td>\n";

@@ -353 +396,3 @@
-	} else {

+	}

+	else

+	{

@@ -366,5 +411 @@
-	global $langs, $conf, $user, $db;

-

-	$extrafields = new ExtraFields($db);

-	$extrafields->fetch_name_optionals_label('actioncomm');

-

+	global $langs, $conf, $user;

@@ -384,4 +425,7 @@
-	$head[$h][0] = DOL_URL_ROOT."/admin/agenda_reminder.php";

-	$head[$h][1] = $langs->trans("Reminders");

-	$head[$h][2] = 'reminders';

-	$h++;

+	if ($conf->global->MAIN_FEATURES_LEVEL > 0)

+	{

+	    $head[$h][0] = DOL_URL_ROOT."/admin/agenda_reminder.php";

+	    $head[$h][1] = $langs->trans("Reminders");

+	    $head[$h][2] = 'reminders';

+	    $h++;

+	}

@@ -403,4 +446,0 @@
-	$nbExtrafields = $extrafields->attributes['actioncomm']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

@@ -434,4 +474,5 @@
-	// Tab to link resources

-	if (isModEnabled('resource')) {

-		include_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';

-		$resource = new Dolresource($db);

+    // Tab to link resources

+	if ($conf->resource->enabled)

+	{

+	    include_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';

+	    $resource = new DolResource($db);

@@ -440,2 +481,2 @@
-		$listofresourcelinked = $resource->getElementResources($object->element, $object->id);

-		$nbResources = (is_array($listofresourcelinked) ? count($listofresourcelinked) : 0);

+        $listofresourcelinked = $resource->getElementResources($object->element, $object->id);

+        $nbResources = (is_array($listofresourcelinked) ?count($listofresourcelinked) : 0);

@@ -443,3 +484 @@
-		if ($nbResources > 0) {

-			$head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">'.($nbResources).'</span>' : '');

-		}

+		if ($nbResources > 0) $head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.($nbResources).'</span>' : '');

@@ -450,13 +489,11 @@
-	// Attached files

-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

-	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

-	$upload_dir = $conf->agenda->dir_output."/".$object->id;

-	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));

-	$nbLinks = Link::count($db, $object->element, $object->id);

-	$head[$h][0] = DOL_URL_ROOT.'/comm/action/document.php?id='.$object->id;

-	$head[$h][1] = $langs->trans("Documents");

-	if (($nbFiles + $nbLinks) > 0) {

-		$head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>' : '');

-	}

-	$head[$h][2] = 'documents';

-	$h++;

+    // Attached files

+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

+    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

+    $upload_dir = $conf->agenda->dir_output."/".$object->id;

+    $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));

+    $nbLinks = Link::count($db, $object->element, $object->id);

+    $head[$h][0] = DOL_URL_ROOT.'/comm/action/document.php?id='.$object->id;

+    $head[$h][1] = $langs->trans("Documents");

+    if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>' : '');

+    $head[$h][2] = 'documents';

+    $h++;

@@ -485,50 +522,51 @@
-	global $langs, $conf, $user;

-

-	$h = 0;

-	$head = array();

-

-	$head[$h][0] = DOL_URL_ROOT.'/comm/action/list.php?mode=show_list'.($param ? '&'.$param : '');

-	$head[$h][1] = $langs->trans("ViewList");

-	$head[$h][2] = 'cardlist';

-	$h++;

-

-	$head[$h][0] = DOL_URL_ROOT.'/comm/action/index.php?mode=show_month'.($param ? '&'.$param : '');

-	$head[$h][1] = $langs->trans("ViewCal");

-	$head[$h][2] = 'cardmonth';

-	$h++;

-

-	$head[$h][0] = DOL_URL_ROOT.'/comm/action/index.php?mode=show_week'.($param ? '&'.$param : '');

-	$head[$h][1] = $langs->trans("ViewWeek");

-	$head[$h][2] = 'cardweek';

-	$h++;

-

-	$head[$h][0] = DOL_URL_ROOT.'/comm/action/index.php?mode=show_day'.($param ? '&'.$param : '');

-	$head[$h][1] = $langs->trans("ViewDay");

-	$head[$h][2] = 'cardday';

-	$h++;

-

-	//if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))

-	if (getDolGlobalString('AGENDA_SHOW_PERTYPE')) {

-		$head[$h][0] = DOL_URL_ROOT.'/comm/action/pertype.php'.($param ? '?'.$param : '');

-		$head[$h][1] = $langs->trans("ViewPerType");

-		$head[$h][2] = 'cardpertype';

-		$h++;

-	}

-

-	$newparam = $param;

-	$newparam = preg_replace('/&?search_filtert=\d+/', '', $newparam);

-	$head[$h][0] = DOL_URL_ROOT.'/comm/action/peruser.php'.($newparam ? '?'.$newparam : '');

-	$head[$h][1] = $langs->trans("ViewPerUser");

-	$head[$h][2] = 'cardperuser';

-	$h++;

-

-

-	// Show more tabs from modules

-	// Entries must be declared in modules descriptor with line

-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname);   												to remove a tab

-	complete_head_from_modules($conf, $langs, null, $head, $h, 'agenda');

-

-	complete_head_from_modules($conf, $langs, null, $head, $h, 'agenda', 'remove');

-

-	return $head;

+    global $langs, $conf, $user;

+

+    $h = 0;

+    $head = array();

+

+    $head[$h][0] = DOL_URL_ROOT.'/comm/action/list.php'.($param ? '?'.$param : '');

+    $head[$h][1] = $langs->trans("ViewList");

+    $head[$h][2] = 'cardlist';

+    $h++;

+

+    $head[$h][0] = DOL_URL_ROOT.'/comm/action/index.php?action=show_month'.($param ? '&'.$param : '');

+    $head[$h][1] = $langs->trans("ViewCal");

+    $head[$h][2] = 'cardmonth';

+    $h++;

+

+    $head[$h][0] = DOL_URL_ROOT.'/comm/action/index.php?action=show_week'.($param ? '&'.$param : '');

+    $head[$h][1] = $langs->trans("ViewWeek");

+    $head[$h][2] = 'cardweek';

+    $h++;

+

+    $head[$h][0] = DOL_URL_ROOT.'/comm/action/index.php?action=show_day'.($param ? '&'.$param : '');

+    $head[$h][1] = $langs->trans("ViewDay");

+    $head[$h][2] = 'cardday';

+    $h++;

+

+    //if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))

+    if (!empty($conf->global->AGENDA_SHOW_PERTYPE))

+    {

+        $head[$h][0] = DOL_URL_ROOT.'/comm/action/pertype.php'.($param ? '?'.$param : '');

+        $head[$h][1] = $langs->trans("ViewPerType");

+        $head[$h][2] = 'cardpertype';

+        $h++;

+    }

+

+    $newparam = $param;

+    $newparam = preg_replace('/&?search_filtert=\d+/', '', $newparam);

+    $head[$h][0] = DOL_URL_ROOT.'/comm/action/peruser.php'.($newparam ? '?'.$newparam : '');

+    $head[$h][1] = $langs->trans("ViewPerUser");

+    $head[$h][2] = 'cardperuser';

+    $h++;

+

+

+    // Show more tabs from modules

+    // Entries must be declared in modules descriptor with line

+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

+    // $this->tabs = array('entity:-tabname);   												to remove a tab

+    complete_head_from_modules($conf, $langs, null, $head, $h, 'agenda');

+

+    complete_head_from_modules($conf, $langs, null, $head, $h, 'agenda', 'remove');

+

+    return $head;

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_ajax.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_ajax.lib.php
@@ -28,11 +28,11 @@
- * Generic function that return javascript to add to a page to transform a common input field into an autocomplete field by calling an Ajax page (ex: /societe/ajax/ajaxcompanies.php).

- * The HTML field must be an input text with id=search_$htmlname.

- * This use the jQuery "autocomplete" function. If we want to use the select2, we must also convert the input into select on funcntions that call this method.

- *

- * @param string	$selected 			Preselected value

- * @param string	$htmlname 			HTML name of input field

- * @param string	$url 				Ajax Url to call for request: /path/page.php. Must return a json array ('key'=>id, 'value'=>String shown into input field once selected, 'label'=>String shown into combo list)

- * @param string	$urloption			More parameters on URL request

- * @param int		$minLength			Minimum number of chars to trigger that Ajax search

- * @param int		$autoselect			Automatic selection if just one value (trigger("change") on field is done if search return only 1 result)

- * @param array		$ajaxoptions		Multiple options array

+ *	Generic function that return javascript to add to a page to transform a common input field into an autocomplete field by calling an Ajax page (ex: /societe/ajaxcompanies.php).

+ *  The HTML field must be an input text with id=search_$htmlname.

+ *  This use the jQuery "autocomplete" function. If we want to use the select2, we must also convert the input into select on funcntions that call this method.

+ *

+ *  @param	string	$selected           Preselected value

+ *	@param	string	$htmlname           HTML name of input field

+ *	@param	string	$url                Ajax Url to call for request: /path/page.php. Must return a json array ('key'=>id, 'value'=>String shown into input field once selected, 'label'=>String shown into combo list)

+ *  @param	string	$urloption			More parameters on URL request

+ *  @param	int		$minLength			Minimum number of chars to trigger that Ajax search

+ *  @param	int		$autoselect			Automatic selection if just one value

+ *  @param	array   $ajaxoptions		Multiple options array

@@ -44,4 +44,3 @@
- * @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(), $moreparams = '')

+ *	@return string              		Script

+ */

+function ajax_autocompleter($selected, $htmlname, $url, $urloption = '', $minLength = 2, $autoselect = 0, $ajaxoptions = array())

@@ -49,19 +48,11 @@
-	if (empty($minLength)) {

-		$minLength = 1;

-	}

-

-	$dataforrenderITem = 'ui-autocomplete';

-	$dataforitem = 'ui-autocomplete-item';

-	// Allow two constant to use other values for backward compatibility

-	if (defined('JS_QUERY_AUTOCOMPLETE_RENDERITEM')) {

-		$dataforrenderITem = constant('JS_QUERY_AUTOCOMPLETE_RENDERITEM');

-	}

-	if (defined('JS_QUERY_AUTOCOMPLETE_ITEM')) {

-		$dataforitem = constant('JS_QUERY_AUTOCOMPLETE_ITEM');

-	}

-

-	$htmlnamejquery = str_replace('.', '\\\\.', $htmlname);

-

-	// 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.'" '.($moreparams ? $moreparams : '').' />';

+    if (empty($minLength)) $minLength = 1;

+

+    $dataforrenderITem = 'ui-autocomplete';

+    $dataforitem = 'ui-autocomplete-item';

+    // Allow two constant to use other values for backward compatibility

+    if (defined('JS_QUERY_AUTOCOMPLETE_RENDERITEM')) $dataforrenderITem = constant('JS_QUERY_AUTOCOMPLETE_RENDERITEM');

+    if (defined('JS_QUERY_AUTOCOMPLETE_ITEM'))       $dataforitem = constant('JS_QUERY_AUTOCOMPLETE_ITEM');

+

+    // 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.'" />';

@@ -72 +63 @@
-					var autoselect = '.((int) $autoselect).';

+					var autoselect = '.$autoselect.';

@@ -76 +67 @@
-					$("input#search_'.$htmlnamejquery.'").keydown(function(e) {

+					$("input#search_'.$htmlname.'").keydown(function(e) {

@@ -79 +69,0 @@
-							if (e.keyCode == 13) { return false; } /* disable "ENTER" key useful for barcode readers */

@@ -81 +71 @@
-							$("#'.$htmlnamejquery.'").val("");

+							$("#'.$htmlname.'").val("");

@@ -86 +76 @@
-					$("input#search_'.$htmlnamejquery.'").keyup(function() {

+					$("input#search_'.$htmlname.'").keyup(function() {

@@ -89,2 +79,2 @@
-	                            $("#search_'.$htmlnamejquery.'").val("");

-	                            $("#'.$htmlnamejquery.'").val("").trigger("change");

+	                            $("#search_'.$htmlname.'").val("");

+	                            $("#'.$htmlname.'").val("").trigger("change");

@@ -121 +111 @@
-    				$("input#search_'.$htmlnamejquery.'").autocomplete({

+    				$("input#search_'.$htmlname.'").autocomplete({

@@ -123 +113 @@
-    						$.get("'.$url.($urloption ? '?'.$urloption : '').'", { "'.str_replace('.', '_', $htmlname).'": request.term }, function(data){

+    						$.get("'.$url.($urloption ? '?'.$urloption : '').'", { '.$htmlname.': request.term }, function(data){

@@ -128,7 +118,4 @@
-											$("#search_'.$htmlnamejquery.'").val(item.value);

-											$("#'.$htmlnamejquery.'").val(item.key).trigger("change");

-										}

-										var label = "";

-										if (item.label != null) {

-											label = item.label.toString();

-										}

+											$("#search_'.$htmlname.'").val(item.value);

+											$("#'.$htmlname.'").val(item.key).trigger("change");

+										}

+										var label = item.label.toString();

@@ -147,22 +134,3 @@
-

-										console.log("Return value from GET to the rest of code");

-										return { label: label,

-												 value: item.value,

-												 id: item.key,

-												 disabled: item.disabled,

-												 update: update,

-												 textarea: textarea,

-												 pbq: item.pbq,

-												 type: item.type,

-												 qty: item.qty,

-												 discount: item.discount,

-												 pricebasetype: item.pricebasetype,

-												 price_ht: item.price_ht,

-												 price_ttc: item.price_ttc,

-												 price_unit_ht: item.price_unit_ht,

-												 price_unit_ht_locale: item.price_unit_ht_locale,

-												 description : item.description,

-												 ref_customer: item.ref_customer,

-												 tva_tx: item.tva_tx,

-												 default_vat_code: item.default_vat_code

-										}

+										return { label: label, value: item.value, id: item.key, disabled: item.disabled,

+												 update: update, textarea: textarea,

+												 pbq: item.pbq, type: item.type, qty: item.qty, discount: item.discount, pricebasetype: item.pricebasetype, price_ht: item.price_ht, price_ttc: item.price_ttc }

@@ -170,2 +137,0 @@
-								} else {

-									console.error("Error: Ajax url '.$url.($urloption ? '?'.$urloption : '').' has returned an empty page. Should be an empty json array.");

@@ -172,0 +139 @@
+								else console.error("Error: Ajax url '.$url.($urloption ? '?'.$urloption : '').' has returned an empty page. Should be an empty json array.");

@@ -176 +143 @@
-    					minLength: '.((int) $minLength).',

+    					minLength: '.$minLength.',

@@ -178 +145 @@
-    						console.log("We will trigger change on input '.$htmlname.' because of the select definition of autocomplete code for input#search_'.$htmlname.'");

+    						console.log("Call change on input '.$htmlname.' because of select definition of autocomplete select call on input#search_'.$htmlname.'");

@@ -181 +147,0 @@
-							console.log("Propagate before some properties retrieved by ajax into data-xxx properties of #'.$htmlnamejquery.' component");

@@ -183,30 +149,7 @@
-

-							// For supplier price and customer when price by quantity is off

-							$("#'.$htmlnamejquery.'").attr("data-up", ui.item.price_ht);

-							$("#'.$htmlnamejquery.'").attr("data-up-locale", ui.item.price_unit_ht_locale);

-							$("#'.$htmlnamejquery.'").attr("data-base", ui.item.pricebasetype);

-							$("#'.$htmlnamejquery.'").attr("data-qty", ui.item.qty);

-							$("#'.$htmlnamejquery.'").attr("data-discount", ui.item.discount);

-							$("#'.$htmlnamejquery.'").attr("data-description", ui.item.description);

-							$("#'.$htmlnamejquery.'").attr("data-ref-customer", ui.item.ref_customer);

-							$("#'.$htmlnamejquery.'").attr("data-tvatx", ui.item.tva_tx);

-							$("#'.$htmlnamejquery.'").attr("data-default-vat-code", ui.item.default_vat_code);

-	';

-	if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {

-		$script .= '

-							// For customer price when PRODUIT_CUSTOMER_PRICES_BY_QTY is on

-							console.log("PRODUIT_CUSTOMER_PRICES_BY_QTY is on, propagate also prices by quantity into data-pbqxxx properties");

-							$("#'.$htmlnamejquery.'").attr("data-pbq", ui.item.pbq);

-							$("#'.$htmlnamejquery.'").attr("data-pbqup", ui.item.price_ht);

-							$("#'.$htmlnamejquery.'").attr("data-pbqbase", ui.item.pricebasetype);

-							$("#'.$htmlnamejquery.'").attr("data-pbqqty", ui.item.qty);

-							$("#'.$htmlnamejquery.'").attr("data-pbqpercent", ui.item.discount);

-		';

-	}

-	$script .= '

-							// A new value has been selected, we trigger the handlers on #htmlnamejquery

-							console.log("Trigger changes on #'.$htmlnamejquery.'");

-							$("#'.$htmlnamejquery.'").val(ui.item.id).trigger("change");	// Select new value

-

-							// Complementary actions

-

+							$("#'.$htmlname.'").attr("data-pbq", ui.item.pbq);

+							$("#'.$htmlname.'").attr("data-pbqup", ui.item.price_ht);

+							$("#'.$htmlname.'").attr("data-pbqbase", ui.item.pricebasetype);

+							$("#'.$htmlname.'").attr("data-pbqqty", ui.item.qty);

+							$("#'.$htmlname.'").attr("data-pbqpercent", ui.item.discount);

+

+    						$("#'.$htmlname.'").val(ui.item.id).trigger("change");	// Select new value

@@ -228 +170,0 @@
-

@@ -241 +182,0 @@
-

@@ -244 +185 @@
-    							console.log("Make action update on each ui.item.update (if there is)")

+    							console.log("Make action update on each ui.item.update")

@@ -247 +187,0 @@
-									console.log("Set value "+value+" into #"+key);

@@ -252 +192 @@
-    							console.log("Make action textarea on each ui.item.textarea (if there is)")

+    							console.log("Make action textarea on each ui.item.textarea")

@@ -263,3 +203,3 @@
-    						console.log("ajax_autocompleter new value selected, we trigger change also on original component so on field #search_'.$htmlname.'");

-

-    						$("#search_'.$htmlnamejquery.'").trigger("change");	// We have changed value of the combo select, we must be sure to trigger all js hook binded on this event. This is required to trigger other javascript change method binded on original field by other code.

+    						console.log("ajax_autocompleter new value selected, we trigger change on original component so field #search_'.$htmlname.'");

+

+    						$("#search_'.$htmlname.'").trigger("change");	// We have changed value of the combo select, we must be sure to trigger all js hook binded on this event. This is required to trigger other javascript change method binded on original field by other code.

@@ -288 +228 @@
- *	@param	array	$fields				Array of key of fields to autocomplete

+ *	@param	string	$fields				Other fields to autocomplete

@@ -406 +346 @@
-	$newtitle = dol_textishtml($title) ? dol_string_nohtmltag($title, 1) : $title;

+	$newtitle = dol_textishtml($title) ?dol_string_nohtmltag($title, 1) : $title;

@@ -410 +350 @@
-	$msg .= '<script>

+    $msg .= '<script>

@@ -426,3 +366,3 @@
-	$msg .= "\n";

-

-	return $msg;

+    $msg .= "\n";

+

+    return $msg;

@@ -442,2 +381,0 @@
- * @param	string	$idforemptyvalue			'-1'

- * @param	string	$morecss					More css

@@ -447 +385 @@
-function ajax_combobox($htmlname, $events = array(), $minLengthToAutocomplete = 0, $forcefocus = 0, $widthTypeOfAutocomplete = 'resolve', $idforemptyvalue = '-1', $morecss = '')

+function ajax_combobox($htmlname, $events = array(), $minLengthToAutocomplete = 0, $forcefocus = 0, $widthTypeOfAutocomplete = 'resolve')

@@ -452,35 +390,17 @@
-	if (!empty($conf->browser->layout) && $conf->browser->layout == 'phone' && getDolGlobalString('MAIN_DISALLOW_SELECT2_WITH_SMARTPHONE')) {

-		return '';

-	}

-

-	if (getDolGlobalString('MAIN_DISABLE_AJAX_COMBOX')) {

-		return '';

-	}

-	if (empty($conf->use_javascript_ajax)) {

-		return '';

-	}

-	if (!getDolGlobalString('MAIN_USE_JQUERY_MULTISELECT') && !defined('REQUIRE_JQUERY_MULTISELECT')) {

-		return '';

-	}

-	if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {

-		return '';

-	}

-

-	if (empty($minLengthToAutocomplete)) {

-		$minLengthToAutocomplete = 0;

-	}

-

-	$moreselect2theme = ($morecss ? dol_escape_js(' '.$morecss) : '');

-	$moreselect2theme = preg_replace('/widthcentpercentminus[^\s]*/', '', $moreselect2theme);

-

-	$tmpplugin = 'select2';

-	$msg = "\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id = '.$htmlname.' -->

-		<script>

-			$(document).ready(function () {

-				$(\''.(preg_match('/^\./', $htmlname) ? $htmlname : '#'.$htmlname).'\').'.$tmpplugin.'({

-					dir: \'ltr\',';

-	if (preg_match('/onrightofpage/', $morecss)) {	// when $morecss contains 'onrightofpage', the select2 component must also be inside a parent with class="parentonrightofpage"

-		$msg .= ' dropdownAutoWidth: true, dropdownParent: $(\'#'.$htmlname.'\').parent(), '."\n";

-	}

-	$msg .= '		width: \''.dol_escape_js($widthTypeOfAutocomplete).'\',		/* off or resolve */

-					minimumInputLength: '.((int) $minLengthToAutocomplete).',

+	if (!empty($conf->browser->layout) && $conf->browser->layout == 'phone' && !empty($conf->global->MAIN_DISALLOW_SELECT2_WITH_SMARTPHONE)) return '';

+

+	if (!empty($conf->global->MAIN_DISABLE_AJAX_COMBOX)) return '';

+	if (empty($conf->use_javascript_ajax)) return '';

+	if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && !defined('REQUIRE_JQUERY_MULTISELECT')) return '';

+	if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) return '';

+

+	if (empty($minLengthToAutocomplete)) $minLengthToAutocomplete = 0;

+

+    $tmpplugin = 'select2';

+    $msg = "\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id = '.$htmlname.' -->

+          <script>

+        	$(document).ready(function () {

+        		$(\''.(preg_match('/^\./', $htmlname) ? $htmlname : '#'.$htmlname).'\').'.$tmpplugin.'({

+        		    dir: \'ltr\',

+        			width: \''.$widthTypeOfAutocomplete.'\',		/* off or resolve */

+					minimumInputLength: '.$minLengthToAutocomplete.',

@@ -488,16 +408 @@
-					matcher: function (params, data) {

-						if ($.trim(params.term) === "") {

-							return data;

-						}

-						keywords = (params.term).split(" ");

-						for (var i = 0; i < keywords.length; i++) {

-							if (((data.text).toUpperCase()).indexOf((keywords[i]).toUpperCase()) == -1) {

-								return null;

-							}

-						}

-						return data;

-					},

-					theme: \'default'.$moreselect2theme.'\',		/* to add css on generated html components */

-					containerCssClass: \':all:\',					/* Line to add class of origin SELECT propagated to the new <span class="select2-selection...> tag */

-					selectionCssClass: \':all:\',					/* Line to add class of origin SELECT propagated to the new <span class="select2-selection...> tag */

-					dropdownCssClass: \'ui-dialog\',

+    				containerCssClass: \':all:\',					/* Line to add class of origin SELECT propagated to the new <span class="select2-selection...> tag */

@@ -507,10 +412,3 @@
-						//console.log("data html is "+$(data.element).attr("data-html"));

-						if (data.id == '.((int) $idforemptyvalue).' && $(data.element).attr("data-html") == undefined) {

-							return \'&nbsp;\';

-						}

-						if ($(data.element).attr("data-html") != undefined) {

-							/* If property html set, we decode html entities and use this. */

-							/* Note that HTML content must have been sanitized from js with dol_escape_htmltag(xxx, 0, 0, \'\', 0, 1) when building the select option. */

-							return htmlEntityDecodeJs($(data.element).attr("data-html"));

-						}

-						return data.text;

+					    //console.log(data.html);

+						if ($(data.element).attr("data-html") != undefined) return htmlEntityDecodeJs($(data.element).attr("data-html"));		// If property html set, we decode html entities and use this

+					    return data.text;

@@ -519 +416,0 @@
-						if (selection.id == '.((int) $idforemptyvalue).') return \'<span class="placeholder">\'+selection.text+\'</span>\';

@@ -524 +421,2 @@
-					}

+					},

+					dropdownCssClass: \'ui-dialog\'

@@ -526,3 +424 @@
-	if ($forcefocus) {

-		$msg .= '.select2(\'focus\')';

-	}

+	if ($forcefocus) $msg .= '.select2(\'focus\')';

@@ -531,25 +427,3 @@
-	$msg .= '});'."\n";

-	$msg .= "</script>\n";

-

-	$msg .= ajax_event($htmlname, $events);

-

-	return $msg;

-}

-

-

-/**

- * Add event management script.

- *

- * @param	string	$htmlname					Name of html select field ('myid' or '.myclass')

- * @param	array	$events						Add some Ajax events option on change of $htmlname component to call ajax to autofill a HTML element (select#htmlname and #inputautocompletehtmlname)

- * 												Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))

- * @return	string								Return JS string to manage event

- */

-function ajax_event($htmlname, $events)

-{

-	$out = '';

-

-	if (is_array($events) && count($events)) {   // If an array of js events to do were provided.

-		$out = '<!-- JS code to manage event for id = ' . $htmlname . ' -->

-	<script>

-		$(document).ready(function () {

+	if (is_array($events) && count($events))    // If an array of js events to do were provided.

+	{

+		$msg .= '

@@ -557 +431 @@
-				var obj = '.json_encode($events) . ';

+				var obj = '.json_encode($events).';

@@ -563,0 +438 @@
+

@@ -593,3 +468 @@
-								if (typeof(selecthtml_dom[0][0]) !== \'undefined\') {

-									$("#inputautocomplete"+htmlname).val(selecthtml_dom[0][0].innerHTML);

-								}

+								$("#inputautocomplete"+htmlname).val(selecthtml_dom[0][0].innerHTML);

@@ -602,3 +475 @@
-			}

-		});

-	</script>';

+			}';

@@ -607 +478,4 @@
-	return $out;

+	$msg .= '});'."\n";

+    $msg .= "</script>\n";

+

+    return $msg;

@@ -609 +482,0 @@
-

@@ -615,3 +488,3 @@
- * 	@param	array	$input					Array of complementary actions to do if success ("disabled"|"enabled'|'set'|'del') => CSS element to switch, 'alert' => message to show, ... Example: array('disabled'=>array(0=>'cssid'))

- * 	@param	int		$entity					Entity. Current entity is used if null.

- *  @param	int		$revertonoff			1=Revert on/off

+ * 	@param	array	$input					Array of options. ("disabled"|"enabled'|'set'|'del') => CSS element to switch, 'alert' => message to show, ... Example: array('disabled'=>array(0=>'cssid'))

+ * 	@param	int		$entity					Entity to set. Use current entity if null.

+ *  @param	int		$revertonoff			Revert on/off

@@ -620,6 +493 @@
- *  @param	string	$marginleftonlyshort	1 = Add a short left margin on picto, 2 = Add a larger left margin on picto, 0 = No left margin.

- *  @param	int		$forcenoajax			1 = Force to use a ahref link instead of ajax code.

- *  @param	int		$setzeroinsteadofdel	1 = Set constantto '0' instead of deleting it

- *  @param	string	$suffix					Suffix to use on the name of the switch_on picto. Example: '', '_red'

- *  @param	string	$mode					Add parameter &mode= to the href link (Used for href link)

- *  @param	string	$morecss				More CSS

+ *  @param	string	$marginleftonlyshort	1 = Add a short left margin on picto, 2 = Add a larger left margin on picto, 0 = No margin left. Works for fontawesome picto only.

@@ -628 +496 @@
-function ajax_constantonoff($code, $input = array(), $entity = null, $revertonoff = 0, $strict = 0, $forcereload = 0, $marginleftonlyshort = 2, $forcenoajax = 0, $setzeroinsteadofdel = 0, $suffix = '', $mode = '', $morecss = 'inline-block')

+function ajax_constantonoff($code, $input = array(), $entity = null, $revertonoff = 0, $strict = 0, $forcereload = 0, $marginleftonlyshort = 2)

@@ -633,2 +501,6 @@
-	if (!isset($input)) {

-		$input = array();

+	if (! isset($input)) $input = array();

+

+	if (empty($conf->use_javascript_ajax))

+	{

+		if (empty($conf->global->$code)) print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_'.$code.'&entity='.$entity.'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';

+		else print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_'.$code.'&entity='.$entity.'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';

@@ -636,8 +508,2 @@
-

-	if (empty($conf->use_javascript_ajax) || $forcenoajax) {

-		if (empty($conf->global->$code)) {

-			$out = '<a '.($morecss ? 'class="'.$morecss.'" ' : '').'href="'.$_SERVER['PHP_SELF'].'?action=set_'.$code.'&token='.newToken().'&entity='.$entity.($mode ? '&mode='.$mode : '').($forcereload ? '&dol_resetcache=1' : '').'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';

-		} else {

-			$out = '<a '.($morecss ? 'class="'.$morecss.'" ' : '').' href="'.$_SERVER['PHP_SELF'].'?action=del_'.$code.'&token='.newToken().'&entity='.$entity.($mode ? '&mode='.$mode : '').($forcereload ? '&dol_resetcache=1' : '').'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';

-		}

-	} else {

+	else

+	{

@@ -649,7 +515,6 @@
-				var code = \''.dol_escape_js($code).'\';

-				var entity = \''.dol_escape_js($entity).'\';

-				var strict = \''.dol_escape_js($strict).'\';

-				var userid = \''.dol_escape_js($user->id).'\';

-				var yesButton = \''.dol_escape_js($langs->transnoentities("Yes")).'\';

-				var noButton = \''.dol_escape_js($langs->transnoentities("No")).'\';

-				var token = \''.currentToken().'\';

+				var code = \''.$code.'\';

+				var entity = \''.$entity.'\';

+				var strict = \''.$strict.'\';

+				var userid = \''.$user->id.'\';

+				var yesButton = "'.dol_escape_js($langs->transnoentities("Yes")).'";

+				var noButton = "'.dol_escape_js($langs->transnoentities("No")).'";

@@ -662 +527 @@
-						confirmConstantAction("set", url, code, input, input.alert.set, entity, yesButton, noButton, strict, userid, token);

+						confirmConstantAction("set", url, code, input, input.alert.set, entity, yesButton, noButton, strict, userid);

@@ -664 +529 @@
-						setConstant(url, code, input, entity, 0, '.((int) $forcereload).', userid, token);

+						setConstant(url, code, input, entity, 0, '.$forcereload.', userid);

@@ -673,8 +538,4 @@
-						confirmConstantAction("del", url, code, input, input.alert.del, entity, yesButton, noButton, strict, userid, token);

-					} else {';

-		if (empty($setzeroinsteadofdel)) {

-			$out .=' 	delConstant(url, code, input, entity, 0, '.((int) $forcereload).', userid, token);';

-		} else {

-			$out .=' 	setConstant(url, code, input, entity, 0, '.((int) $forcereload).', userid, token, 0);';

-		}

-		$out .= '	}

+						confirmConstantAction("del", url, code, input, input.alert.del, entity, yesButton, noButton, strict, userid);

+					} else {

+						delConstant(url, code, input, entity, 0, '.$forcereload.', userid);

+					}

@@ -686,2 +547,2 @@
-		$out .= '<span id="set_'.$code.'" class="valignmiddle inline-block linkobject '.(!empty($conf->global->$code) ? 'hideobject' : '').'">'.($revertonoff ? img_picto($langs->trans("Enabled"), 'switch_on', '', false, 0, 0, '', '', $marginleftonlyshort) : img_picto($langs->trans("Disabled"), 'switch_off', '', false, 0, 0, '', '', $marginleftonlyshort)).'</span>';

-		$out .= '<span id="del_'.$code.'" class="valignmiddle inline-block linkobject '.(!empty($conf->global->$code) ? '' : 'hideobject').'">'.($revertonoff ? img_picto($langs->trans("Disabled"), 'switch_off'.$suffix, '', false, 0, 0, '', '', $marginleftonlyshort) : img_picto($langs->trans("Enabled"), 'switch_on'.$suffix, '', false, 0, 0, '', '', $marginleftonlyshort)).'</span>';

+		$out .= '<span id="set_'.$code.'" class="valignmiddle linkobject '.(!empty($conf->global->$code) ? 'hideobject' : '').'">'.($revertonoff ?img_picto($langs->trans("Enabled"), 'switch_on', '', false, 0, 0, '', '', $marginleftonlyshort) : img_picto($langs->trans("Disabled"), 'switch_off', '', false, 0, 0, '', '', $marginleftonlyshort)).'</span>';

+		$out .= '<span id="del_'.$code.'" class="valignmiddle linkobject '.(!empty($conf->global->$code) ? '' : 'hideobject').'">'.($revertonoff ?img_picto($langs->trans("Disabled"), 'switch_off', '', false, 0, 0, '', '', $marginleftonlyshort) : img_picto($langs->trans("Enabled"), 'switch_on', '', false, 0, 0, '', '', $marginleftonlyshort)).'</span>';

@@ -695,2 +556,2 @@
- *  On/off button to change a property status of an object

- *  This uses the ajax service objectonoff.php (May be called when MAIN_DIRECT_STATUS_UPDATE is set for some pages)

+ *  On/off button to change status of an object

+ *  This is called when MAIN_DIRECT_STATUS_UPDATE is set and it use tha ajax service objectonoff.php

@@ -699 +560 @@
- *  @param  string  $code       Name of property in object : 'status' or 'status_buy' for product by example

+ *  @param  string  $code       Name of constant : status or status_buy for product by example

@@ -701,2 +562,2 @@
- *  @param  string  $text_on    Text if on ('Text' or 'Text:Picto on:Css picto on')

- *  @param  string  $text_off   Text if off ('Text' or 'Text:Picto off:Css picto off')

+ *  @param  string  $text_on    Text if on

+ *  @param  string  $text_off   Text if off

@@ -704,3 +564,0 @@
- *  @param	string	$morecss	More CSS

- *  @param	string	$htmlname	Name of HTML component. Keep '' or use a different value if you need to use this component several time on the same page for the same field.

- *  @param	int		$forcenojs	Force the component to work as link post (without javascript) instead of ajax call

@@ -709 +567 @@
-function ajax_object_onoff($object, $code, $field, $text_on, $text_off, $input = array(), $morecss = '', $htmlname = '', $forcenojs = 0)

+function ajax_object_onoff($object, $code, $field, $text_on, $text_off, $input = array())

@@ -711,11 +569,3 @@
-	global $conf, $langs;

-

-	if (empty($htmlname)) {

-		$htmlname = $code;

-	}

-	//var_dump($object->module); var_dump($object->element);

-

-	$out = '';

-

-	if (!empty($conf->use_javascript_ajax)) {

-		$out .= '<script>

+    global $langs;

+

+    $out = '<script>

@@ -726,2 +576 @@
-            $("#set_'.$htmlname.'_'.$object->id.'").click(function() {

-				console.log("Click managed by ajax_object_onoff");

+            $("#set_'.$code.'_'.$object->id.'").click(function() {

@@ -730 +579 @@
-                    field: \''.dol_escape_js($field).'\',

+                    field: \''.$field.'\',

@@ -732,3 +581,2 @@
-                    element: \''.dol_escape_js((empty($object->module) || $object->module == $object->element) ? $object->element : $object->element.'@'.$object->module).'\',

-                    id: \''.((int) $object->id).'\',

-					token: \''.currentToken().'\'

+                    element: \''.$object->element.'\',

+                    id: \''.$object->id.'\'

@@ -737,2 +585,2 @@
-                    $("#set_'.$htmlname.'_'.$object->id.'").hide();

-                    $("#del_'.$htmlname.'_'.$object->id.'").show();

+                    $("#set_'.$code.'_'.$object->id.'").hide();

+                    $("#del_'.$code.'_'.$object->id.'").show();

@@ -758,2 +606 @@
-            $("#del_'.$htmlname.'_'.$object->id.'").click(function() {

-				console.log("Click managed by ajax_object_onoff");

+            $("#del_'.$code.'_'.$object->id.'").click(function() {

@@ -762 +609 @@
-                    field: \''.dol_escape_js($field).'\',

+                    field: \''.$field.'\',

@@ -764,3 +611,2 @@
-                    element: \''.dol_escape_js((empty($object->module) || $object->module == $object->element) ? $object->element : $object->element.'@'.$object->module).'\',

-                    id: \''.((int) $object->id).'\',

-					token: \''.currentToken().'\'

+                    element: \''.$object->element.'\',

+                    id: \''.$object->id.'\'

@@ -769,2 +615,2 @@
-                    $("#del_'.$htmlname.'_'.$object->id.'").hide();

-                    $("#set_'.$htmlname.'_'.$object->id.'").show();

+                    $("#del_'.$code.'_'.$object->id.'").hide();

+                    $("#set_'.$code.'_'.$object->id.'").show();

@@ -790,32 +636,4 @@
-	}

-

-	$switchon = 'switch_on';

-	$switchoff = 'switch_off';

-	$cssswitchon = '';

-	$cssswitchoff = '';

-	$tmparray = explode(':', $text_on);

-	if (!empty($tmparray[1])) {

-		$text_on = $tmparray[0];

-		$switchon = $tmparray[1];

-		if (!empty($tmparray[2])) {

-			$cssswitchon = $tmparray[2];

-		}

-	}

-	$tmparray = explode(':', $text_off);

-	if (!empty($tmparray[1])) {

-		$text_off = $tmparray[0];

-		$switchoff = $tmparray[1];

-		if (!empty($tmparray[2])) {

-			$cssswitchoff = $tmparray[2];

-		}

-	}

-

-	if (empty($conf->use_javascript_ajax) || $forcenojs) {

-		$out .= '<a id="set_'.$htmlname.'_'.$object->id.'" class="linkobject '.($object->$code == 1 ? 'hideobject' : '').($morecss ? ' '.$morecss : '').'" href="'.DOL_URL_ROOT.'/core/ajax/objectonoff.php?action=set&token='.newToken().'&id='.((int) $object->id).'&element='.urlencode($object->element).'&field='.urlencode($field).'&value=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'">'.img_picto($langs->trans($text_off), $switchoff, '', false, 0, 0, '', $cssswitchoff).'</a>';

-		$out .= '<a id="del_'.$htmlname.'_'.$object->id.'" class="linkobject '.($object->$code == 1 ? '' : 'hideobject').($morecss ? ' '.$morecss : '').'" href="'.DOL_URL_ROOT.'/core/ajax/objectonoff.php?action=set&token='.newToken().'&id='.((int) $object->id).'&element='.urlencode($object->element).'&field='.urlencode($field).'&value=0&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'">'.img_picto($langs->trans($text_on), $switchon, '', false, 0, 0, '', $cssswitchon).'</a>';

-	} else {

-		$out .= '<span id="set_'.$htmlname.'_'.$object->id.'" class="linkobject '.($object->$code == 1 ? 'hideobject' : '').($morecss ? ' '.$morecss : '').'">'.img_picto($langs->trans($text_off), $switchoff, '', false, 0, 0, '', $cssswitchoff).'</span>';

-		$out .= '<span id="del_'.$htmlname.'_'.$object->id.'" class="linkobject '.($object->$code == 1 ? '' : 'hideobject').($morecss ? ' '.$morecss : '').'">'.img_picto($langs->trans($text_on), $switchon, '', false, 0, 0, '', $cssswitchon).'</span>';

-	}

-

-	return $out;

+    $out .= '<span id="set_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code == 1 ? 'hideobject' : '').'">'.img_picto($langs->trans($text_off), 'switch_off').'</span>';

+    $out .= '<span id="del_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code == 1 ? '' : 'hideobject').'">'.img_picto($langs->trans($text_on), 'switch_on').'</span>';

+

+    return $out;

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_asset.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_asset.lib.php
@@ -2,2 +2 @@
-/* Copyright (C) 2018-2022  OpenDSI     <support@open-dsi.fr>

- * Copyright (C) 2022       Frédéric France         <frederic.france@netlogic.fr>

+/* Copyright (C) 2018      Alexandre Spangaro  <aspangaro@open-dsi.fr>

@@ -30 +29 @@
-function assetAdminPrepareHead()

+function asset_admin_prepare_head()

@@ -32,5 +31 @@
-	global $langs, $conf, $db;

-

-	$extrafields = new ExtraFields($db);

-	$extrafields->fetch_name_optionals_label('asset');

-	$extrafields->fetch_name_optionals_label('asset_model');

+	global $langs, $conf;

@@ -51 +46 @@
-	//	'entity:+tabname:Title:@asset:/asset/mypage.php?id=__ID__'

+	//	'entity:+tabname:Title:@assets:/asset/mypage.php?id=__ID__'

@@ -54 +49 @@
-	//	'entity:-tabname:Title:@asset:/asset/mypage.php?id=__ID__'

+	//	'entity:-tabname:Title:@assets:/asset/mypage.php?id=__ID__'

@@ -56 +51 @@
-	complete_head_from_modules($conf, $langs, null, $head, $h, 'asset_admin');

+	complete_head_from_modules($conf, $langs, null, $head, $h, 'assets_admin');

@@ -58 +53 @@
-	$head[$h][0] = DOL_URL_ROOT.'/asset/admin/asset_extrafields.php';

+	$head[$h][0] = DOL_URL_ROOT.'/asset/admin/assets_extrafields.php';

@@ -60,5 +55 @@
-	$nbExtrafields = $extrafields->attributes['asset']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= ' <span class="badge">'.$nbExtrafields.'</span>';

-	}

-	$head[$h][2] = 'asset_extrafields';

+	$head[$h][2] = 'attributes';

@@ -67,7 +58,3 @@
-	$head[$h][0] = DOL_URL_ROOT.'/asset/admin/assetmodel_extrafields.php';

-	$head[$h][1] = $langs->trans("ExtraFieldsAssetModel");

-	$nbExtrafields = $extrafields->attributes['asset_model']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

-	$head[$h][2] = 'assetmodel_extrafields';

+	$head[$h][0] = DOL_URL_ROOT.'/asset/admin/assets_type_extrafields.php';

+	$head[$h][1] = $langs->trans("ExtraFieldsAssetsType");

+	$head[$h][2] = 'attributes_type';

@@ -76 +63 @@
-	complete_head_from_modules($conf, $langs, null, $head, $h, 'asset_admin', 'remove');

+	complete_head_from_modules($conf, $langs, null, $head, $h, 'assets_admin', 'remove');

@@ -82 +69 @@
- * Prepare array of tabs for Asset

+ * Prepare admin pages header

@@ -84,2 +71,2 @@
- * @param	Asset	$object		Asset

- * @return 	array				Array of tabs

+ * @param   Contrat	$object		Object related to tabs

+ * @return array head array with tabs

@@ -87 +74 @@
-function assetPrepareHead(Asset $object)

+function asset_prepare_head(Asset $object)

@@ -91 +78 @@
-	$langs->loadLangs(array("assets", "admin"));

+	$langs->load("assets");

@@ -96 +83 @@
-	$head[$h][0] = DOL_URL_ROOT . '/asset/card.php?id=' . $object->id;

+	$head[$h][0] = DOL_URL_ROOT.'/asset/card.php';

@@ -99,61 +85,0 @@
-	$h++;

-

-	if (empty($object->not_depreciated)) {

-		$head[$h][0] = DOL_URL_ROOT . '/asset/depreciation_options.php?id=' . $object->id;

-		$head[$h][1] = $langs->trans("AssetDepreciationOptions");

-		$head[$h][2] = 'depreciation_options';

-		$h++;

-	}

-

-	$head[$h][0] = DOL_URL_ROOT . '/asset/accountancy_codes.php?id=' . $object->id;

-	$head[$h][1] = $langs->trans("AssetAccountancyCodes");

-	$head[$h][2] = 'accountancy_codes';

-	$h++;

-

-	if (empty($object->not_depreciated)) {

-		$head[$h][0] = DOL_URL_ROOT . '/asset/depreciation.php?id=' . $object->id;

-		$head[$h][1] = $langs->trans("AssetDepreciation");

-		$head[$h][2] = 'depreciation';

-		$h++;

-	}

-

-	if (isset($object->disposal_date) && $object->disposal_date !== "") {

-		$head[$h][0] = DOL_URL_ROOT . '/asset/disposal.php?id=' . $object->id;

-		$head[$h][1] = $langs->trans("AssetDisposal");

-		$head[$h][2] = 'disposal';

-		$h++;

-	}

-

-	if (isset($object->fields['note_public']) || isset($object->fields['note_private'])) {

-		$nbNote = 0;

-		if (!empty($object->note_private)) {

-			$nbNote++;

-		}

-		if (!empty($object->note_public)) {

-			$nbNote++;

-		}

-		$head[$h][0] = DOL_URL_ROOT . '/asset/note.php?id=' . $object->id;

-		$head[$h][1] = $langs->trans('Notes');

-		if ($nbNote > 0) {

-			$head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">' . $nbNote . '</span>' : '');

-		}

-		$head[$h][2] = 'note';

-		$h++;

-	}

-

-	require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';

-	require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';

-	$upload_dir = $conf->asset->dir_output . "/asset/" . dol_sanitizeFileName($object->ref);

-	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));

-	$nbLinks = Link::count($db, $object->element, $object->id);

-	$head[$h][0] = DOL_URL_ROOT . '/asset/document.php?id=' . $object->id;

-	$head[$h][1] = $langs->trans('Documents');

-	if (($nbFiles + $nbLinks) > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">' . ($nbFiles + $nbLinks) . '</span>';

-	}

-	$head[$h][2] = 'document';

-	$h++;

-

-	$head[$h][0] = DOL_URL_ROOT . '/asset/agenda.php?id=' . $object->id;

-	$head[$h][1] = $langs->trans("Events");

-	$head[$h][2] = 'agenda';

@@ -165 +91 @@
-	//	'entity:+tabname:Title:@asset:/asset/mypage.php?id=__ID__'

+	//	'entity:+tabname:Title:@assets:/assets/mypage.php?id=__ID__'

@@ -168 +94 @@
-	//	'entity:-tabname:Title:@asset:/asset/mypage.php?id=__ID__'

+	//	'entity:-tabname:Title:@assets:/assets/mypage.php?id=__ID__'

@@ -170 +96,26 @@
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'asset');

+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'assets');

+

+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

+	$upload_dir = $conf->assets->dir_output.'/'.dol_sanitizeFileName($object->ref);

+	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));

+	$nbLinks = Link::count($db, $object->element, $object->id);

+	$head[$h][0] = DOL_URL_ROOT.'/asset/document.php?id='.$object->id;

+	$head[$h][1] = $langs->trans('Documents');

+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

+	$head[$h][2] = 'documents';

+	$h++;

+

+	$nbNote = 0;

+	if (!empty($object->note_private)) $nbNote++;

+	if (!empty($object->note_public)) $nbNote++;

+	$head[$h][0] = DOL_URL_ROOT.'/asset/note.php?id='.$object->id;

+	$head[$h][1] = $langs->trans("Notes");

+	if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

+	$head[$h][2] = 'note';

+	$h++;

+

+	$head[$h][0] = DOL_URL_ROOT.'/asset/info.php?id='.$object->id;

+	$head[$h][1] = $langs->trans("Info");

+	$head[$h][2] = 'info';

+	$h++;

@@ -178 +129 @@
- * Prepare array of tabs for AssetModel

+ *  Return array head with list of tabs to view object informations

@@ -180,2 +131,2 @@
- * @param	AssetModel	$object		AssetModel

- * @return 	array					Array of tabs

+ *  @param	AssetType	$object		Asset

+ *  @return array					head

@@ -183 +134 @@
-function assetModelPrepareHead($object)

+function asset_type_prepare_head(AssetType $object)

@@ -185,3 +136 @@
-	global $langs, $conf;

-

-	$langs->loadLangs(array("assets", "admin"));

+	global $langs, $conf, $user;

@@ -192 +141 @@
-	$head[$h][0] = DOL_URL_ROOT . '/asset/model/card.php?id=' . $object->id;

+	$head[$h][0] = DOL_URL_ROOT.'/asset/type.php?rowid='.$object->id;

@@ -197,33 +145,0 @@
-	$head[$h][0] = DOL_URL_ROOT . '/asset/model/depreciation_options.php?id=' . $object->id;

-	$head[$h][1] = $langs->trans("AssetDepreciationOptions");

-	$head[$h][2] = 'depreciation_options';

-	$h++;

-

-	$head[$h][0] = DOL_URL_ROOT . '/asset/model/accountancy_codes.php?id=' . $object->id;

-	$head[$h][1] = $langs->trans("AssetAccountancyCodes");

-	$head[$h][2] = 'accountancy_codes';

-	$h++;

-

-	if (isset($object->fields['note_public']) || isset($object->fields['note_private'])) {

-		$nbNote = 0;

-		if (!empty($object->note_private)) {

-			$nbNote++;

-		}

-		if (!empty($object->note_public)) {

-			$nbNote++;

-		}

-		$head[$h][0] = DOL_URL_ROOT . '/asset/model/note.php?id=' . $object->id;

-		$head[$h][1] = $langs->trans('Notes');

-		if ($nbNote > 0) {

-			$head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">' . $nbNote . '</span>' : '');

-		}

-		$head[$h][2] = 'note';

-		$h++;

-	}

-

-	$head[$h][0] = DOL_URL_ROOT . '/asset/model/agenda.php?id=' . $object->id;

-	$head[$h][1] = $langs->trans("Events");

-	$head[$h][2] = 'agenda';

-	$h++;

-

-

@@ -232,7 +148,3 @@
-	//$this->tabs = array(

-	//	'entity:+tabname:Title:@asset:/asset/mypage.php?id=__ID__'

-	//); // to add new tab

-	//$this->tabs = array(

-	//	'entity:-tabname:Title:@asset:/asset/mypage.php?id=__ID__'

-	//); // to remove a tab

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'assetmodel');

+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

+	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab

+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'assettype');

@@ -240 +152 @@
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'assetmodel', 'remove');

+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'assettype', 'remove');

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_bank.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_bank.lib.php
@@ -7 +6,0 @@
- * Copyright (C) 2021		Ferran Marcet		<fmarcet@2byte.es>

@@ -30 +28,0 @@
-

@@ -39,56 +37,54 @@
-	global $db, $langs, $conf;

-	$h = 0;

-	$head = array();

-

-	$head[$h][0] = DOL_URL_ROOT.'/compta/bank/card.php?id='.$object->id;

-	$head[$h][1] = $langs->trans("BankAccount");

-	$head[$h][2] = 'bankname';

-	$h++;

-

-	$head[$h][0] = DOL_URL_ROOT."/compta/bank/bankentries_list.php?id=".$object->id;

-	$head[$h][1] = $langs->trans("BankTransactions");

-	$head[$h][2] = 'journal';

-	$h++;

-

-	//    if ($conf->global->MAIN_FEATURES_LEVEL >= 1)

-	//    {

-	$head[$h][0] = DOL_URL_ROOT."/compta/bank/treso.php?account=".$object->id;

-	$head[$h][1] = $langs->trans("PlannedTransactions");

-	$head[$h][2] = 'cash';

-	$h++;

-	//    }

-

-	$head[$h][0] = DOL_URL_ROOT."/compta/bank/annuel.php?account=".$object->id;

-	$head[$h][1] = $langs->trans("IOMonthlyReporting");

-	$head[$h][2] = 'annual';

-	$h++;

-

-	$head[$h][0] = DOL_URL_ROOT."/compta/bank/graph.php?account=".$object->id;

-	$head[$h][1] = $langs->trans("Graph");

-	$head[$h][2] = 'graph';

-	$h++;

-

-	if ($object->courant != Account::TYPE_CASH || getDolGlobalString('BANK_CAN_RECONCILIATE_CASHACCOUNT')) {

-		$nbReceipts = 0;

-

-		// List of all standing receipts

-		$sql = "SELECT COUNT(DISTINCT(b.num_releve)) as nb";

-		$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";

-		$sql .= " WHERE b.fk_account = ".((int) $object->id);

-

-		$resql = $db->query($sql);

-		if ($resql) {

-			$obj = $db->fetch_object($resql);

-			if ($obj) {

-				$nbReceipts = $obj->nb;

-			}

-			$db->free($resql);

-		}

-

-		$head[$h][0] = DOL_URL_ROOT."/compta/bank/releve.php?account=".((int) $object->id);

-		$head[$h][1] = $langs->trans("AccountStatements");

-		if (($nbReceipts) > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbReceipts).'</span>';

-		}

-		$head[$h][2] = 'statement';

-		$h++;

+    global $db, $langs, $conf, $user;

+    $h = 0;

+    $head = array();

+

+    $head[$h][0] = DOL_URL_ROOT.'/compta/bank/card.php?id='.$object->id;

+    $head[$h][1] = $langs->trans("BankAccount");

+    $head[$h][2] = 'bankname';

+    $h++;

+

+    $head[$h][0] = DOL_URL_ROOT."/compta/bank/bankentries_list.php?id=".$object->id;

+    $head[$h][1] = $langs->trans("BankTransactions");

+    $head[$h][2] = 'journal';

+    $h++;

+

+    //    if ($conf->global->MAIN_FEATURES_LEVEL >= 1)

+    //    {

+    $head[$h][0] = DOL_URL_ROOT."/compta/bank/treso.php?account=".$object->id;

+    $head[$h][1] = $langs->trans("PlannedTransactions");

+    $head[$h][2] = 'cash';

+    $h++;

+    //    }

+

+    $head[$h][0] = DOL_URL_ROOT."/compta/bank/annuel.php?account=".$object->id;

+    $head[$h][1] = $langs->trans("IOMonthlyReporting");

+    $head[$h][2] = 'annual';

+    $h++;

+

+    $head[$h][0] = DOL_URL_ROOT."/compta/bank/graph.php?account=".$object->id;

+    $head[$h][1] = $langs->trans("Graph");

+    $head[$h][2] = 'graph';

+    $h++;

+

+    if ($object->courant != Account::TYPE_CASH)

+    {

+    	$nbReceipts = 0;

+

+    	// List of all standing receipts

+    	$sql = "SELECT COUNT(DISTINCT(b.num_releve)) as nb";

+    	$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";

+    	$sql .= " WHERE b.fk_account = ".$object->id;

+

+    	$resql = $db->query($sql);

+    	if ($resql)

+    	{

+    		$obj = $db->fetch_object($resql);

+    		if ($obj) $nbReceipts = $obj->nb;

+    		$db->free($resql);

+    	}

+

+    	$head[$h][0] = DOL_URL_ROOT."/compta/bank/releve.php?account=".$object->id;

+	    $head[$h][1] = $langs->trans("AccountStatements");

+	    if (($nbReceipts) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbReceipts).'</span>';

+	    $head[$h][2] = 'statement';

+	    $h++;

@@ -97,13 +93,11 @@
-	// Attached files

-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

-	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

-	$upload_dir = $conf->bank->dir_output."/".dol_sanitizeFileName($object->ref);

-	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));

-	$nbLinks = Link::count($db, $object->element, $object->id);

-	$head[$h][0] = DOL_URL_ROOT."/compta/bank/document.php?account=".$object->id;

-	$head[$h][1] = $langs->trans("Documents");

-	if (($nbFiles + $nbLinks) > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

-	}

-	$head[$h][2] = 'document';

-	$h++;

+    // Attached files

+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

+    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

+    $upload_dir = $conf->bank->dir_output."/".dol_sanitizeFileName($object->ref);

+    $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));

+    $nbLinks = Link::count($db, $object->element, $object->id);

+    $head[$h][0] = DOL_URL_ROOT."/compta/bank/document.php?account=".$object->id;

+    $head[$h][1] = $langs->trans("Documents");

+    if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

+    $head[$h][2] = 'document';

+    $h++;

@@ -112,9 +106,9 @@
-	// Entries must be declared in modules descriptor with line

-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname);   												to remove a tab

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'bank');

-

-	/*$head[$h][0] = DOL_URL_ROOT . "/compta/bank/info.php?id=" . $object->id;

-	$head[$h][1] = $langs->trans("Info");

-	$head[$h][2] = 'info';

-	$h++;*/

+    // Entries must be declared in modules descriptor with line

+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

+    // $this->tabs = array('entity:-tabname);   												to remove a tab

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'bank');

+

+    /*$head[$h][0] = DOL_URL_ROOT . "/compta/bank/info.php?id=" . $object->id;

+    $head[$h][1] = $langs->trans("Info");

+    $head[$h][2] = 'info';

+    $h++;*/

@@ -124 +118 @@
-	return $head;

+    return $head;

@@ -134,8 +128 @@
-	global $langs, $conf, $db;

-

-	$langs->loadLangs(array("compta"));

-

-	$extrafields = new ExtraFields($db);

-	$extrafields->fetch_name_optionals_label('bank_account');

-	$extrafields->fetch_name_optionals_label('bank');

-

+	global $langs, $conf, $user;

@@ -150,4 +137,4 @@
-	$head[$h][0] = DOL_URL_ROOT.'/admin/chequereceipts.php';

-	$head[$h][1] = $langs->trans("CheckReceiptShort");

-	$head[$h][2] = 'checkreceipts';

-	$h++;

+    $head[$h][0] = DOL_URL_ROOT.'/admin/chequereceipts.php';

+    $head[$h][1] = $langs->trans("CheckReceiptShort");

+    $head[$h][2] = 'checkreceipts';

+    $h++;

@@ -163,5 +150 @@
-	$head[$h][1] = $langs->trans("ExtraFields").' ('.$langs->trans("BankAccounts").')';

-	$nbExtrafields = $extrafields->attributes['bank_account']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

+	$head[$h][1] = $langs->trans("ExtraFields");

@@ -169,9 +151,0 @@
-	$h++;

-

-	$head[$h][0] = DOL_URL_ROOT.'/admin/bankline_extrafields.php';

-	$head[$h][1] = $langs->trans("ExtraFields").' ('.$langs->trans("BankTransactions").')';

-	$nbExtrafields = $extrafields->attributes['bank']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

-	$head[$h][2] = 'bankline_extrafields';

@@ -196 +170 @@
-	global $langs, $conf, $db;

+	global $langs, $conf, $user, $db;

@@ -214,3 +188 @@
-	if (($nbFiles + $nbLinks) > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

-	}

+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

@@ -246,5 +218,5 @@
-	// Show more tabs from modules

-	// Entries must be declared in modules descriptor with line

-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname);   												to remove a tab

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'various_payment');

+    // Show more tabs from modules

+    // Entries must be declared in modules descriptor with line

+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

+    // $this->tabs = array('entity:-tabname);   												to remove a tab

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'various_payment');

@@ -253 +225 @@
-	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

+    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

@@ -256 +228 @@
-	$nbLinks = Link::count($db, $object->element, $object->id);

+    $nbLinks = Link::count($db, $object->element, $object->id);

@@ -259,3 +231 @@
-	if (($nbFiles + $nbLinks) > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

-	}

+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

@@ -278,2 +248 @@
- *      @param  Account     $account    A bank account (used to get BIC/SWIFT)

- *      @param	string		$swift		Swift value (used to get BIC/SWIFT, param $account non used if provided)

+ *      @param  Account     $account    A bank account

@@ -282,12 +251,8 @@
-function checkSwiftForAccount(Account $account = null, $swift = null)

-{

-	if ($account == null && $swift == null) {

-		return false;

-	} elseif ($swift == null) {

-		$swift = $account->bic;

-	}

-	if (preg_match("/^([a-zA-Z]){4}([a-zA-Z]){2}([0-9a-zA-Z]){2}([0-9a-zA-Z]{3})?$/", $swift)) {

-		return true;

-	} else {

-		return false;

-	}

+function checkSwiftForAccount($account)

+{

+    $swift = $account->bic;

+    if (preg_match("/^([a-zA-Z]){4}([a-zA-Z]){2}([0-9a-zA-Z]){2}([0-9a-zA-Z]{3})?$/", $swift)) {

+        return true;

+    } else {

+        return false;

+    }

@@ -299,39 +264,12 @@
- *      @param  Account     $account    	A bank account

- *      @param	string		$ibantocheck	Bank account number (used to get BAN, $account not used if provided)

- *      @return boolean                 	True if informations are valid, false otherwise

- */

-function checkIbanForAccount(Account $account = null, $ibantocheck = null)

-{

-	if ($account == null && $ibantocheck == null) {

-		return false;

-	} elseif ($ibantocheck == null) {

-		$ibantocheck = ($account->iban ? $account->iban : $account->iban_prefix);		// iban or iban_prefix for backward compatibility

-	}

-	require_once DOL_DOCUMENT_ROOT.'/includes/php-iban/oophp-iban.php';

-

-	$iban = new PHP_IBAN\IBAN($ibantocheck);

-	$check = $iban->Verify();

-

-	if ($check) {

-		return true;

-	} else {

-		return false;

-	}

-}

-

-/**

- * Returns the iban human readable

- *

- * @param Account $account Account object

- * @return string

- */

-function getIbanHumanReadable(Account $account)

-{

-	if ($account->getCountryCode() == 'FR') {

-		require_once DOL_DOCUMENT_ROOT.'/includes/php-iban/oophp-iban.php';

-		$ibantoprint = preg_replace('/[^a-zA-Z0-9]/', '', empty($account->iban) ? '' : $account->iban);

-		$iban = new PHP_IBAN\IBAN($ibantoprint);

-		return $iban->HumanFormat();

-	}

-

-	return $account->iban;

+ *      @param  Account     $account    A bank account

+ *      @return boolean                 True if informations are valid, false otherwise

+ */

+function checkIbanForAccount($account)

+{

+    require_once DOL_DOCUMENT_ROOT.'/includes/php-iban/oophp-iban.php';

+

+    $iban = new IBAN($account->iban);

+    $check = $iban->Verify();

+

+    if ($check) return true;

+    else return false;

@@ -348,66 +286,63 @@
-	$country_code = $account->getCountryCode();

-

-	// For compatibility between

-	// account of type CompanyBankAccount class (we use number, cle_rib)

-	// account of type Account class (we use num_compte, cle)

-	if (empty($account->number)) {

-		$account->number = $account->num_compte;

-	}

-	if (empty($account->cle)) {

-		$account->cle = $account->cle_rib;

-	}

-

-	dol_syslog("bank.lib::checkBanForAccount account->code_banque=".$account->code_banque." account->code_guichet=".$account->code_guichet." account->number=".$account->number." account->cle=".$account->cle." account->iban=".$account->iban." country_code=".$country_code, LOG_DEBUG);

-

-	if ($country_code == 'FR') { // France rules

-		$coef = array(62, 34, 3);

-		// Concatenation des differents codes.

-		$rib = strtolower(trim($account->code_banque).trim($account->code_guichet).trim($account->number).trim($account->cle));

-		// On remplace les eventuelles lettres par des chiffres.

-		//$rib = strtr($rib, "abcdefghijklmnopqrstuvwxyz","12345678912345678912345678");	//Ne marche pas

-		$rib = strtr($rib, "abcdefghijklmnopqrstuvwxyz", "12345678912345678923456789");

-		// Separation du rib en 3 groupes de 7 + 1 groupe de 2.

-		// Multiplication de chaque groupe par les coef du tableau

-

-		for ($i = 0, $s = 0; $i < 3; $i++) {

-			$code = substr($rib, 7 * $i, 7);

-			$s += ((int) $code) * $coef[$i];

-		}

-		// Soustraction du modulo 97 de $s a 97 pour obtenir la cle

-		$cle_rib = 97 - ($s % 97);

-		if ($cle_rib == $account->cle) {

-			return true;

-		}

-		return false;

-	}

-

-	if ($country_code == 'BE') { // Belgium rules

-	}

-

-	if ($country_code == 'ES') { // Spanish rules

-		$CCC = strtolower(trim($account->number));

-		$rib = strtolower(trim($account->code_banque).trim($account->code_guichet));

-		$cle_rib = strtolower(checkES($rib, $CCC));

-		if ($cle_rib == strtolower($account->cle)) {

-			return true;

-		}

-		return false;

-	}

-	if ($country_code == 'AU') {  // Australian

-		if (strlen($account->code_banque) > 7) {

-			return false; // Sould be 6 but can be 123-456

-		} elseif (strlen($account->code_banque) < 6) {

-			return false; // Sould be 6

-		} else {

-			return true;

-		}

-	}

-

-	// No particular rule

-	// If account is CompanyBankAccount class, we use number

-	// If account is Account class, we use num_compte

-	if (empty($account->number)) {

-		return false;

-	}

-

-	return true;

+    $country_code = $account->getCountryCode();

+

+    // For compatibility between

+    // account of type CompanyBankAccount class (we use number, cle_rib)

+    // account of type Account class (we use num_compte, cle)

+    if (empty($account->number))

+        $account->number = $account->num_compte;

+    if (empty($account->cle))

+        $account->cle = $account->cle_rib;

+

+    dol_syslog("bank.lib::checkBanForAccount account->code_banque=".$account->code_banque." account->code_guichet=".$account->code_guichet." account->number=".$account->number." account->cle=".$account->cle." account->iban=".$account->iban." country_code=".$country_code, LOG_DEBUG);

+

+    if ($country_code == 'FR') { // France rules

+        $coef = array(62, 34, 3);

+        // Concatenation des differents codes.

+        $rib = strtolower(trim($account->code_banque).trim($account->code_guichet).trim($account->number).trim($account->cle));

+        // On remplace les eventuelles lettres par des chiffres.

+        //$rib = strtr($rib, "abcdefghijklmnopqrstuvwxyz","12345678912345678912345678");	//Ne marche pas

+        $rib = strtr($rib, "abcdefghijklmnopqrstuvwxyz", "12345678912345678923456789");

+        // Separation du rib en 3 groupes de 7 + 1 groupe de 2.

+        // Multiplication de chaque groupe par les coef du tableau

+

+        for ($i = 0, $s = 0; $i < 3; $i++) {

+            $code = substr($rib, 7 * $i, 7);

+            $s += (0 + (int) $code) * $coef[$i];

+        }

+        // Soustraction du modulo 97 de $s a 97 pour obtenir la cle

+        $cle_rib = 97 - ($s % 97);

+        if ($cle_rib == $account->cle) {

+            return true;

+        }

+        return false;

+    }

+

+    if ($country_code == 'BE') { // Belgium rules

+    }

+

+    if ($country_code == 'ES') { // Spanish rules

+        $CCC = strtolower(trim($account->number));

+        $rib = strtolower(trim($account->code_banque).trim($account->code_guichet));

+        $cle_rib = strtolower(checkES($rib, $CCC));

+        if ($cle_rib == strtolower($account->cle)) {

+            return true;

+        }

+        return false;

+    }

+    if ($country_code == 'AU') {  // Australian

+        if (strlen($account->code_banque) > 7)

+            return false; // Sould be 6 but can be 123-456

+        elseif (strlen($account->code_banque) < 6)

+            return false; // Sould be 6

+        else

+            return true;

+    }

+

+    // No particular rule

+    // If account is CompanyBankAccount class, we use number

+    // If account is Account class, we use num_compte

+    if (empty($account->number)) {

+        return false;

+    }

+

+    return true;

@@ -427,54 +362,50 @@
-	if (empty($IentOfi) || empty($InumCta) || strlen($IentOfi) != 8 || strlen($InumCta) != 10) {

-		$keycontrol = "";

-		return $keycontrol;

-	}

-

-	$ccc = $IentOfi.$InumCta;

-	$numbers = "1234567890";

-

-	$i = 0;

-

-	while ($i <= strlen($ccc) - 1) {

-		if (strpos($numbers, substr($ccc, $i, 1)) === false) {

-			$keycontrol = "";

-			return $keycontrol;

-		}

-		$i++;

-	}

-

-	$values = array(1, 2, 4, 8, 5, 10, 9, 7, 3, 6);

-	$sum = 0;

-

-	for ($i = 2; $i < 10; $i++) {

-		$sum += $values[$i] * substr($IentOfi, $i - 2, 1);

-	}

-

-	$key = 11 - $sum % 11;

-

-	if ($key == 10) {

-		$key = 1;

-	}

-	if ($key == 11) {

-		$key = 0;

-	}

-

-	$keycontrol = $key;

-

-	$sum = 0;

-

-	for ($i = 0; $i < 11; $i++) {

-		$sum += $values[$i] * (int) substr($InumCta, $i, 1); //int to cast result of substr to a number

-	}

-

-	$key = 11 - $sum % 11;

-

-	if ($key == 10) {

-		$key = 1;

-	}

-	if ($key == 11) {

-		$key = 0;

-	}

-

-	$keycontrol .= $key;

-	return $keycontrol;

-}

+    if (empty($IentOfi) || empty($InumCta) || strlen($IentOfi) != 8 || strlen($InumCta) != 10) {

+        $keycontrol = "";

+        return $keycontrol;

+    }

+

+    $ccc = $IentOfi.$InumCta;

+    $numbers = "1234567890";

+

+    $i = 0;

+

+    while ($i <= strlen($ccc) - 1) {

+        if (strpos($numbers, substr($ccc, $i, 1)) === false) {

+            $keycontrol = "";

+            return $keycontrol;

+        }

+        $i++;

+    }

+

+    $values = array(1, 2, 4, 8, 5, 10, 9, 7, 3, 6);

+    $sum = 0;

+

+    for ($i = 2; $i < 10; $i++) {

+        $sum += $values[$i] * substr($IentOfi, $i - 2, 1);

+    }

+

+    $key = 11 - $sum % 11;

+

+    if ($key == 10)

+        $key = 1;

+    if ($key == 11)

+        $key = 0;

+

+    $keycontrol = $key;

+

+    $sum = 0;

+

+    for ($i = 0; $i < 11; $i++) {

+        $sum += $values[$i] * (int) substr($InumCta, $i, 1); //int to cast result of substr to a number

+    }

+

+    $key = 11 - $sum % 11;

+

+    if ($key == 10)

+        $key = 1;

+    if ($key == 11)

+        $key = 0;

+

+    $keycontrol .= $key;

+    return $keycontrol;

+}

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_barcode.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_barcode.lib.php
@@ -23 +23 @@
- *	\brief      Set of functions used for barcode generation (internal lib, also code 'phpbarcode')

+ *	\brief      Set of functions used for barcode generation

@@ -38,3 +38 @@
-if (defined('DOL_DEFAULT_TTF_BOLD')) {

-	$font_loc = constant('DOL_DEFAULT_TTF_BOLD');

-}

+if (defined('DOL_DEFAULT_TTF_BOLD')) $font_loc = constant('DOL_DEFAULT_TTF_BOLD');

@@ -43,6 +41,2 @@
-if (isset($_SERVER['WINDIR']) && @file_exists($_SERVER['WINDIR'])) {

-	$font_loc = $_SERVER['WINDIR'].'\Fonts\arialbd.ttf';

-}

-if (empty($font_loc)) {

-	die('DOL_DEFAULT_TTF_BOLD must de defined with full path to a TTF font.');

-}

+if (isset($_SERVER['WINDIR']) && @file_exists($_SERVER['WINDIR'])) $font_loc = $_SERVER['WINDIR'].'\Fonts\arialbd.ttf';

+if (empty($font_loc)) die('DOL_DEFAULT_TTF_BOLD must de defined with full path to a TTF font.');

@@ -59,8 +53,2 @@
-if (defined('PHP-BARCODE_PATH_COMMAND')) {

-	$genbarcode_loc = constant('PHP-BARCODE_PATH_COMMAND');

-} else {

-	$genbarcode_loc = '';

-	if (getDolGlobalString('GENBARCODE_LOCATION')) {

-		$genbarcode_loc = $conf->global->GENBARCODE_LOCATION;

-	}

-}

+if (defined('PHP-BARCODE_PATH_COMMAND')) $genbarcode_loc = constant('PHP-BARCODE_PATH_COMMAND');

+else $genbarcode_loc = $conf->global->GENBARCODE_LOCATION;

@@ -75 +63 @@
- * @param	string	       $encoding	Encoding ('EAN13', 'ISBN', 'C128', 'UPC', 'CBR', 'QRCODE', 'DATAMATRIX', 'ANY'...)

+ * @param	string	       $encoding	Encoding

@@ -82,25 +70,21 @@
-	dol_syslog("barcode.lib.php::barcode_print $code $encoding $scale $mode");

-

-	$bars = barcode_encode($code, $encoding);

-	if (!$bars || !empty($bars['error'])) {

-		// Return error message instead of array

-		if (empty($bars['error'])) {

-			$error = 'Bad Value '.$code.' for encoding '.$encoding;

-		} else {

-			$error = $bars['error'];

-		}

-		dol_syslog('barcode.lib.php::barcode_print '.$error, LOG_ERR);

-		return $error;

-	}

-	if (!$mode) {

-		$mode = "png";

-	}

-	//if (preg_match("/^(text|txt|plain)$/i",$mode)) print barcode_outtext($bars['text'],$bars['bars']);

-	//elseif (preg_match("/^(html|htm)$/i",$mode)) print barcode_outhtml($bars['text'],$bars['bars'], $scale,0, 0);

-	//else

-	barcode_outimage($bars['text'], $bars['bars'], $scale, $mode);

-	return $bars;

-}

-

-/**

- * Encodes $code with $encoding using genbarcode OR built-in encoder if you don't have genbarcode only EAN-13/ISBN or UPC is possible

+    dol_syslog("barcode.lib.php::barcode_print $code $encoding $scale $mode");

+

+    $bars = barcode_encode($code, $encoding);

+    if (!$bars || !empty($bars['error']))

+    {

+        // Return error message instead of array

+        if (empty($bars['error'])) $error = 'Bad Value '.$code.' for encoding '.$encoding;

+        else $error = $bars['error'];

+        dol_syslog('barcode.lib.php::barcode_print '.$error, LOG_ERR);

+        return $error;

+    }

+    if (!$mode) $mode = "png";

+    //if (preg_match("/^(text|txt|plain)$/i",$mode)) print barcode_outtext($bars['text'],$bars['bars']);

+    //elseif (preg_match("/^(html|htm)$/i",$mode)) print barcode_outhtml($bars['text'],$bars['bars'], $scale,0, 0);

+    //else

+    barcode_outimage($bars['text'], $bars['bars'], $scale, $mode);

+    return $bars;

+}

+

+/**

+ * Encodes $code with $encoding using genbarcode OR built-in encoder if you don't have genbarcode only EAN-13/ISBN is possible

@@ -129,37 +113,39 @@
-	global $genbarcode_loc;

-

-	if ((preg_match("/^upc$/i", $encoding))

-	&& (preg_match("/^[0-9]{11,12}$/", $code))

-	) {

-		/* use built-in UPC-Encoder */

-		dol_syslog("barcode.lib.php::barcode_encode Use barcode_encode_upc");

-		$bars = barcode_encode_upc($code, $encoding);

-	} elseif ((preg_match("/^ean$/i", $encoding))

-

-	|| (($encoding) && (preg_match("/^isbn$/i", $encoding))

-	&& ((strlen($code) == 9 || strlen($code) == 10) ||

-	(((preg_match("/^978/", $code) && strlen($code) == 12) ||

-	(strlen($code) == 13)))))

-

-	|| ((!isset($encoding) || !$encoding || (preg_match("/^ANY$/i", $encoding)))

-	&& (preg_match("/^[0-9]{12,13}$/", $code)))

-	) {

-		/* use built-in EAN-Encoder */

-		dol_syslog("barcode.lib.php::barcode_encode Use barcode_encode_ean");

-		$bars = barcode_encode_ean($code, $encoding);

-	} elseif (file_exists($genbarcode_loc)) {	// For example C39

-		/* use genbarcode */

-		dol_syslog("barcode.lib.php::barcode_encode Use genbarcode ".$genbarcode_loc." code=".$code." encoding=".$encoding);

-		$bars = barcode_encode_genbarcode($code, $encoding);

-	} else {

-		print "barcode_encode needs an external program for encodings other then EAN/ISBN (code=".dol_escape_htmltag($code).", encoding=".dol_escape_htmltag($encoding).")<BR>\n";

-		print "<UL>\n";

-		print "<LI>download gnu-barcode from <A href=\"https://www.gnu.org/software/barcode/\">www.gnu.org/software/barcode/</A>\n";

-		print "<LI>compile and install them\n";

-		print "<LI>specify path the genbarcode in barcode module setup\n";

-		print "</UL>\n";

-		print "<BR>\n";

-		return false;

-	}

-

-	return $bars;

+    global $genbarcode_loc;

+

+    if (

+    (preg_match("/^ean$/i", $encoding))

+

+    || (($encoding) && (preg_match("/^isbn$/i", $encoding))

+    && ((strlen($code) == 9 || strlen($code) == 10) ||

+    (((preg_match("/^978/", $code) && strlen($code) == 12) ||

+    (strlen($code) == 13)))))

+

+    || ((!isset($encoding) || !$encoding || (preg_match("/^ANY$/i", $encoding)))

+    && (preg_match("/^[0-9]{12,13}$/", $code)))

+    )

+    {

+        /* use built-in EAN-Encoder */

+        dol_syslog("barcode.lib.php::barcode_encode Use barcode_encode_ean");

+        $bars = barcode_encode_ean($code, $encoding);

+    }

+    elseif (file_exists($genbarcode_loc))	// For example C39

+    {

+        /* use genbarcode */

+        dol_syslog("barcode.lib.php::barcode_encode Use genbarcode ".$genbarcode_loc." code=".$code." encoding=".$encoding);

+        $bars = barcode_encode_genbarcode($code, $encoding);

+    }

+    else

+    {

+        print "barcode_encode needs an external programm for encodings other then EAN/ISBN (code=".$code.", encoding=".$encoding.")<BR>\n";

+        print "<UL>\n";

+        print "<LI>download gnu-barcode from <A href=\"https://www.gnu.org/software/barcode/\">www.gnu.org/software/barcode/</A>\n";

+        print "<LI>compile and install them\n";

+        print "<LI>download genbarcode from <A href=\"http://www.ashberg.de/bar/\">www.ashberg.de/bar/</A>\n";

+        print "<LI>compile and install them\n";

+        print "<LI>specify path the genbarcode in barcode module setup\n";

+        print "</UL>\n";

+        print "<BR>\n";

+        return false;

+    }

+

+    return $bars;

@@ -177,43 +163,8 @@
-	$even = true;

-	$esum = 0;

-	$osum = 0;

-	$ln = strlen($ean) - 1;

-	for ($i = $ln; $i >= 0; $i--) {

-		if ($even) {

-			$esum += $ean[$i];

-		} else {

-			$osum += $ean[$i];

-		}

-		$even = !$even;

-	}

-	return (10 - ((3 * $esum + $osum) % 10)) % 10;

-}

-

-

-/**

- * Generate EAN bars

- *

- * @param	string	$ean	EAN to encode

- * @return	string			Encoded EAN

- */

-function barcode_gen_ean_bars($ean)

-{

-	$digits = array(3211, 2221, 2122, 1411, 1132, 1231, 1114, 1312, 1213, 3112);

-	$mirror = array("000000", "001011", "001101", "001110", "010011", "011001", "011100", "010101", "010110", "011010");

-	$guards = array("9a1a", "1a1a1", "a1a7");

-

-	$line = $guards[0];

-	for ($i = 1; $i < 13; $i++) {

-		$str = $digits[$ean[$i]];

-		if ($i < 7 && $mirror[$ean[0]][$i - 1] == 1) {

-			$line .= strrev($str);

-		} else {

-			$line .= $str;

-		}

-		if ($i == 6) {

-			$line .= $guards[1];

-		}

-	}

-	$line .= $guards[2];

-

-	return $line;

+    $even = true; $esum = 0; $osum = 0;

+    $ln = strlen($ean) - 1;

+    for ($i = $ln; $i >= 0; $i--)

+    {

+        if ($even) $esum += $ean[$i]; else $osum += $ean[$i];

+        $even = !$even;

+    }

+    return (10 - ((3 * $esum + $osum) % 10)) % 10;

@@ -231,43 +182,48 @@
-	$ean = trim($ean);

-	if (preg_match("/[^0-9]/i", $ean)) {

-		return array("error"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (not a numeric)", "text"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (not a numeric)");

-	}

-	$encoding = strtoupper($encoding);

-	if ($encoding == "ISBN") {

-		if (!preg_match("/^978/", $ean)) {

-			$ean = "978".$ean;

-		}

-	}

-	if (preg_match("/^97[89]/", $ean)) {

-		$encoding = "ISBN";

-	}

-	if (strlen($ean) < 12 || strlen($ean) > 13) {

-		return array("error"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (must have 12/13 numbers)", "text"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (must have 12/13 numbers)");

-	}

-

-	$ean = substr($ean, 0, 12);

-	$eansum = barcode_gen_ean_sum($ean);

-	$ean .= $eansum;

-	$bars = barcode_gen_ean_bars($ean);

-

-	/* create text */

-	$pos = 0;

-	$text = "";

-	for ($a = 0; $a < 13; $a++) {

-		if ($a > 0) {

-			$text .= " ";

-		}

-		$text .= $pos.":12:".$ean[$a];

-		if ($a == 0) {

-			$pos += 12;

-		} elseif ($a == 6) {

-			$pos += 12;

-		} else {

-			$pos += 7;

-		}

-	}

-

-	return array(

-		"error" => '',

-		"encoding" => $encoding,

-		"bars" => $bars,

+    $digits = array(3211, 2221, 2122, 1411, 1132, 1231, 1114, 1312, 1213, 3112);

+    $mirror = array("000000", "001011", "001101", "001110", "010011", "011001", "011100", "010101", "010110", "011010");

+    $guards = array("9a1a", "1a1a1", "a1a");

+

+    $ean = trim($ean);

+    if (preg_match("/[^0-9]/i", $ean))

+    {

+        return array("error"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (not a numeric)", "text"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (not a numeric)");

+    }

+    $encoding = strtoupper($encoding);

+    if ($encoding == "ISBN")

+    {

+        if (!preg_match("/^978/", $ean)) $ean = "978".$ean;

+    }

+    if (preg_match("/^978/", $ean)) $encoding = "ISBN";

+    if (strlen($ean) < 12 || strlen($ean) > 13)

+    {

+        return array("error"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (must have 12/13 numbers)", "text"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (must have 12/13 numbers)");

+    }

+

+    $ean = substr($ean, 0, 12);

+    $eansum = barcode_gen_ean_sum($ean);

+    $ean .= $eansum;

+    $line = $guards[0];

+    for ($i = 1; $i < 13; $i++)

+    {

+        $str = $digits[$ean[$i]];

+        if ($i < 7 && $mirror[$ean[0]][$i - 1] == 1) $line .= strrev($str); else $line .= $str;

+        if ($i == 6) $line .= $guards[1];

+    }

+    $line .= $guards[2];

+

+    /* create text */

+    $pos = 0;

+    $text = "";

+    for ($a = 0; $a < 13; $a++)

+    {

+        if ($a > 0) $text .= " ";

+        $text .= "$pos:12:{$ean[$a]}";

+        if ($a == 0) $pos += 12;

+        elseif ($a == 6) $pos += 12;

+        else $pos += 7;

+    }

+

+    return array(

+        "error" => '',

+        "encoding" => $encoding,

+		"bars" => $line,

@@ -275,51 +231 @@
-	);

-}

-

-/**

- * Encode UPC

- *

- * @param	string	$upc		Code

- * @param	string	$encoding	Encoding

- * @return	array				array('encoding': the encoding which has been used, 'bars': the bars, 'text': text-positioning info, 'error': error message if error)

- */

-function barcode_encode_upc($upc, $encoding = "UPC")

-{

-	$upc = trim($upc);

-	if (preg_match("/[^0-9]/i", $upc)) {

-		return array("error"=>"Invalid encoding/code. encoding=".$encoding." code=".$upc." (not a numeric)", "text"=>"Invalid encoding/code. encoding=".$encoding." code=".$upc." (not a numeric)");

-	}

-	$encoding = strtoupper($encoding);

-	if (strlen($upc) < 11 || strlen($upc) > 12) {

-		return array("error"=>"Invalid encoding/code. encoding=".$encoding." code=".$upc." (must have 11/12 numbers)", "text"=>"Invalid encoding/code. encoding=".$encoding." code=".$upc." (must have 11/12 numbers)");

-	}

-

-	$upc = substr("0".$upc, 0, 12);

-	$eansum = barcode_gen_ean_sum($upc);

-	$upc .= $eansum;

-	$bars = barcode_gen_ean_bars($upc);

-

-	/* create text */

-	$pos = 0;

-	$text = "";

-	for ($a = 1; $a < 13; $a++) {

-		if ($a > 1) {

-			$text .= " ";

-		}

-		$text .= $pos.":12:".$upc[$a];

-		if ($a == 1) {

-			$pos += 15;

-		} elseif ($a == 6) {

-			$pos += 17;

-		} elseif ($a == 11) {

-			$pos += 15;

-		} else {

-			$pos += 7;

-		}

-	}

-

-	return array(

-		"error" => '',

-		"encoding" => $encoding,

-		"bars" => $bars,

-		"text" => $text

-	);

+    );

@@ -337,39 +243,31 @@
-	global $conf, $db, $genbarcode_loc;

-

-	// Clean parameters

-	if (preg_match("/^ean$/i", $encoding) && strlen($code) == 13) {

-		$code = substr($code, 0, 12);

-	}

-	if (!$encoding) {

-		$encoding = "ANY";

-	}

-	$encoding = dol_string_nospecial($encoding, '_');

-	$code = dol_string_nospecial($code, "_");

-

-	$command = escapeshellarg($genbarcode_loc);

-	$paramclear = " ".escapeshellarg($code)." ".escapeshellarg(strtoupper($encoding));

-

-	$fullcommandclear = $command." ".$paramclear." 2>&1";

-	//print $fullcommandclear."<br>\n";exit;

-

-	dol_syslog("Run command ".$fullcommandclear);

-

-	$outputfile = $conf->user->dir_temp.'/genbarcode.tmp'; // File used with popen method

-

-	// Execute a CLI

-	include_once DOL_DOCUMENT_ROOT.'/core/class/utils.class.php';

-	$utils = new Utils($db);

-	$result = $utils->executeCLI($fullcommandclear, $outputfile);

-

-	if (!empty($result['output'])) {

-		$tmparr = explode("\n", $result['output']);

-		$bars = $tmparr[0];

-		$text = $tmparr[1];

-		$encoding = $tmparr[2];

-	} else {

-		dol_syslog("barcode.lib.php::barcode_encode_genbarcode failed to run ".$fullcommandclear, LOG_ERR);

-		return false;

-	}

-

-	//var_dump($bars);

-	$ret = array(

+    global $genbarcode_loc;

+

+    // Clean parameters

+    if (preg_match("/^ean$/i", $encoding) && strlen($code) == 13) $code = substr($code, 0, 12);

+    if (!$encoding) $encoding = "ANY";

+    $encoding = preg_replace("/[\\\|]/", "_", $encoding);

+    $code = preg_replace("/[\\\|]/", "_", $code);

+

+    $command = escapeshellarg($genbarcode_loc);

+    //$paramclear=" \"".str_replace("\"", "\\\"",$code)."\" \"".str_replace("\"", "\\\"",strtoupper($encoding))."\"";

+    $paramclear = " ".escapeshellarg($code)." ".escapeshellarg(strtoupper($encoding));

+

+    $fullcommandclear = $command." ".$paramclear." 2>&1";

+    //print $fullcommandclear."<br>\n";exit;

+

+    dol_syslog("Run command ".$fullcommandclear);

+    $fp = popen($fullcommandclear, "r");

+    if ($fp)

+    {

+        $bars = fgets($fp, 1024);

+        $text = fgets($fp, 1024);

+        $encoding = fgets($fp, 1024);

+        pclose($fp);

+    }

+    else

+    {

+        dol_syslog("barcode.lib.php::barcode_encode_genbarcode failed to run popen ".$fullcommandclear, LOG_ERR);

+        return false;

+    }

+    //var_dump($bars);

+    $ret = array(

@@ -379,18 +277,12 @@
-		"error" => ""

-	);

-	//var_dump($ret);

-	if (preg_match('/permission denied/i', $ret['bars'])) {

-		$ret['error'] = $ret['bars'];

-		$ret['bars'] = '';

-		return $ret;

-	}

-	if (!$ret['bars']) {

-		return false;

-	}

-	if (!$ret['text']) {

-		return false;

-	}

-	if (!$ret['encoding']) {

-		return false;

-	}

-	return $ret;

+    	"error" => ""

+    );

+    //var_dump($ret);

+    if (preg_match('/permission denied/i', $ret['bars']))

+    {

+    	$ret['error'] = $ret['bars']; $ret['bars'] = '';

+    	return $ret;

+    }

+    if (!$ret['bars']) return false;

+    if (!$ret['text']) return false;

+    if (!$ret['encoding']) return false;

+    return $ret;

@@ -412,137 +304,111 @@
-	global $bar_color, $bg_color, $text_color;

-	global $font_loc, $filebarcode;

-

-	//print "$text, $bars, $scale, $mode, $total_y, $space, $font_loc, $filebarcode<br>";

-	//var_dump($text);

-	//var_dump($bars);

-	//var_dump($font_loc);

-

-	/* set defaults */

-	if ($scale < 1) {

-		$scale = 2;

-	}

-	$total_y = (int) $total_y;

-	if ($total_y < 1) {

-		$total_y = (int) $scale * 60;

-	}

-	if (!$space) {

-		$space = array('top'=>2 * $scale, 'bottom'=>2 * $scale, 'left'=>2 * $scale, 'right'=>2 * $scale);

-	}

-

-	/* count total width */

-	$xpos = 0;

-	$width = true;

-	$ln = strlen($bars);

-	for ($i = 0; $i < $ln; $i++) {

-		$val = strtolower($bars[$i]);

-		if ($width) {

-			$xpos += $val * $scale;

-			$width = false;

-			continue;

-		}

-		if (preg_match("/[a-z]/", $val)) {

-			/* tall bar */

-			$val = ord($val) - ord('a') + 1;

-		}

-		$xpos += $val * $scale;

-		$width = true;

-	}

-

-	/* allocate the image */

-	$total_x = ($xpos) + $space['right'] + $space['right'];

-	$xpos = $space['left'];

-	if (!function_exists("imagecreate")) {

-		print "You don't have the gd2 extension enabled<br>\n";

-		return "";

-	}

-	$im = imagecreate($total_x, $total_y);

-	/* create two images */

-	$col_bg = ImageColorAllocate($im, $bg_color[0], $bg_color[1], $bg_color[2]);

-	$col_bar = ImageColorAllocate($im, $bar_color[0], $bar_color[1], $bar_color[2]);

-	$col_text = ImageColorAllocate($im, $text_color[0], $text_color[1], $text_color[2]);

-	$height = round($total_y - ($scale * 10));

-	$height2 = round($total_y - $space['bottom']);

-

-	/* paint the bars */

-	$width = true;

-	$ln = strlen($bars);

-	for ($i = 0; $i < $ln; $i++) {

-		$val = strtolower($bars[$i]);

-		if ($width) {

-			$xpos += $val * $scale;

-			$width = false;

-			continue;

-		}

-		if (preg_match("/[a-z]/", $val)) {

-			/* tall bar */

-			$val = ord($val) - ord('a') + 1;

-			$h = $height2;

-		} else {

-			$h = $height;

-		}

-		imagefilledrectangle($im, $xpos, $space['top'], $xpos + ($val * $scale) - 1, $h, $col_bar);

-		$xpos += $val * $scale;

-		$width = true;

-	}

-

-	$chars = explode(" ", $text);

-	foreach ($chars as $v) {

-		if (trim($v)) {

-			$inf = explode(":", $v);

-			$fontsize = $scale * ($inf[1] / 1.8);

-			$fontheight = $total_y - ($fontsize / 2.7) + 2;

-			imagettftext($im, $fontsize, 0, $space['left'] + ($scale * $inf[0]) + 2, $fontheight, $col_text, $font_loc, $inf[2]);

-		}

-	}

-

-	/* output the image */

-	$mode = strtolower($mode);

-	if ($mode == 'jpg' || $mode == 'jpeg') {

-		header("Content-Type: image/jpeg; name=\"barcode.jpg\"");

-		imagejpeg($im);

-	} elseif ($mode == 'gif') {

-		header("Content-Type: image/gif; name=\"barcode.gif\"");

-		imagegif($im);

-	} elseif (!empty($filebarcode)) {

-		// To wxrite into  afile onto disk

-		imagepng($im, $filebarcode);

-	} else {

-		header("Content-Type: image/png; name=\"barcode.png\"");

-		imagepng($im);

-	}

-}

-

-/**

- * Check if EAN13 code is valid

- *

- * @param string $ean	Code

- * @return bool

- */

-function isAValidEAN13($ean)

-{

-	$sumEvenIndexes = 0;

-	$sumOddIndexes  = 0;

-

-	$eanAsArray = array_map('intval', str_split($ean));

-

-	if (!(count($eanAsArray) === 13)) {

-		return false;

-	};

-

-	$num = (count($eanAsArray) - 1);

-	for ($i = 0; $i < $num; $i++) {

-		if ($i % 2 === 0) {

-			$sumOddIndexes  += $eanAsArray[$i];

-		} else {

-			$sumEvenIndexes += $eanAsArray[$i];

-		}

-	}

-

-	$rest = ($sumOddIndexes + (3 * $sumEvenIndexes)) % 10;

-

-	if ($rest !== 0) {

-		$rest = 10 - $rest;

-	}

-

-	return $rest === $eanAsArray[12];

-}

+    global $bar_color, $bg_color, $text_color;

+    global $font_loc, $filebarcode;

+

+    //print "$text, $bars, $scale, $mode, $total_y, $space, $font_loc, $filebarcode<br>";

+    //var_dump($text);

+    //var_dump($bars);

+    //var_dump($font_loc);

+

+    /* set defaults */

+    if ($scale < 1) $scale = 2;

+    $total_y = (int) $total_y;

+    if ($total_y < 1) $total_y = (int) $scale * 60;

+    if (!$space)

+    $space = array('top'=>2 * $scale, 'bottom'=>2 * $scale, 'left'=>2 * $scale, 'right'=>2 * $scale);

+

+    /* count total width */

+    $xpos = 0;

+    $width = true;

+    $ln = strlen($bars);

+    for ($i = 0; $i < $ln; $i++)

+    {

+        $val = strtolower($bars[$i]);

+        if ($width)

+        {

+            $xpos += $val * $scale;

+            $width = false;

+            continue;

+        }

+        if (preg_match("/[a-z]/", $val))

+        {

+            /* tall bar */

+            $val = ord($val) - ord('a') + 1;

+        }

+        $xpos += $val * $scale;

+        $width = true;

+    }

+

+    /* allocate the image */

+    $total_x = ($xpos) + $space['right'] + $space['right'];

+    $xpos = $space['left'];

+    if (!function_exists("imagecreate"))

+    {

+        print "You don't have the gd2 extension enabled<br>\n";

+        return "";

+    }

+    $im = imagecreate($total_x, $total_y);

+    /* create two images */

+    $col_bg = ImageColorAllocate($im, $bg_color[0], $bg_color[1], $bg_color[2]);

+    $col_bar = ImageColorAllocate($im, $bar_color[0], $bar_color[1], $bar_color[2]);

+    $col_text = ImageColorAllocate($im, $text_color[0], $text_color[1], $text_color[2]);

+    $height = round($total_y - ($scale * 10));

+    $height2 = round($total_y - $space['bottom']);

+

+    /* paint the bars */

+    $width = true;

+    $ln = strlen($bars);

+    for ($i = 0; $i < $ln; $i++)

+    {

+        $val = strtolower($bars[$i]);

+        if ($width)

+        {

+            $xpos += $val * $scale;

+            $width = false;

+            continue;

+        }

+        if (preg_match("/[a-z]/", $val))

+        {

+            /* tall bar */

+            $val = ord($val) - ord('a') + 1;

+            $h = $height2;

+        } else $h = $height;

+        imagefilledrectangle($im, $xpos, $space['top'], $xpos + ($val * $scale) - 1, $h, $col_bar);

+        $xpos += $val * $scale;

+        $width = true;

+    }

+

+    $chars = explode(" ", $text);

+    reset($chars);

+    while (list($n, $v) = each($chars))

+    {

+        if (trim($v))

+        {

+            $inf = explode(":", $v);

+            $fontsize = $scale * ($inf[1] / 1.8);

+            $fontheight = $total_y - ($fontsize / 2.7) + 2;

+            imagettftext($im, $fontsize, 0, $space['left'] + ($scale * $inf[0]) + 2, $fontheight, $col_text, $font_loc, $inf[2]);

+        }

+    }

+

+    /* output the image */

+    $mode = strtolower($mode);

+    if ($mode == 'jpg' || $mode == 'jpeg')

+    {

+        header("Content-Type: image/jpeg; name=\"barcode.jpg\"");

+        imagejpeg($im);

+    }

+    elseif ($mode == 'gif')

+    {

+        header("Content-Type: image/gif; name=\"barcode.gif\"");

+        imagegif($im);

+    }

+    elseif (!empty($filebarcode))    // To wxrite into  afile onto disk

+    {

+        imagepng($im, $filebarcode);

+    }

+    else

+    {

+        header("Content-Type: image/png; name=\"barcode.png\"");

+        imagepng($im);

+    }

+}

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_company.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_company.lib.php
@@ -10 +10 @@
- * Copyright (C) 2015-2021  Frédéric France         <frederic.france@netlogic.fr>

+ * Copyright (C) 2015-2019  Frédéric France         <frederic.france@netlogic.fr>

@@ -44,42 +44,24 @@
-	global $db, $langs, $conf, $user;

-	global $hookmanager;

-

-	$h = 0;

-	$head = array();

-

-	$head[$h][0] = DOL_URL_ROOT.'/societe/card.php?socid='.$object->id;

-	$head[$h][1] = $langs->trans("ThirdParty");

-	$head[$h][2] = 'card';

-	$h++;

-

-	if (!getDolGlobalString('MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES')) {

-		if (!getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB') && $user->hasRight('societe', 'contact', 'lire')) {

-			//$nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));

-			$nbContact = 0;

-			// Enable caching of thirdrparty count Contacts

-			require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';

-			$cachekey = 'count_contacts_thirdparty_'.$object->id;

-			$dataretrieved = dol_getcache($cachekey);

-

-			if (!is_null($dataretrieved)) {

-				$nbContact = $dataretrieved;

-			} else {

-				$sql = "SELECT COUNT(p.rowid) as nb";

-				$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as p";

-				// Add table from hooks

-				$parameters = array('contacttab' => true);

-				$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook

-				$sql .= $hookmanager->resPrint;

-				$sql .= " WHERE p.fk_soc = ".((int) $object->id);

-				$sql .= " AND p.entity IN (".getEntity($object->element).")";

-				// Add where from hooks

-				$parameters = array('contacttab' => true);

-				$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook

-				$sql .= $hookmanager->resPrint;

-				$resql = $db->query($sql);

-				if ($resql) {

-					$obj = $db->fetch_object($resql);

-					$nbContact = $obj->nb;

-				}

-

-				dol_setcache($cachekey, $nbContact, 120);	// If setting cache fails, this is not a problem, so we do not test result.

+    global $db, $langs, $conf, $user;

+    $h = 0;

+    $head = array();

+

+    $head[$h][0] = DOL_URL_ROOT.'/societe/card.php?socid='.$object->id;

+    $head[$h][1] = $langs->trans("ThirdParty");

+    $head[$h][2] = 'card';

+    $h++;

+

+    if (empty($conf->global->MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES))

+    {

+	    if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->societe->contact->lire)

+		{

+		    //$nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));

+			$nbContact = 0; // TODO

+

+			$sql = "SELECT COUNT(p.rowid) as nb";

+			$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as p";

+			$sql .= " WHERE p.fk_soc = ".$object->id;

+			$resql = $db->query($sql);

+			if ($resql)

+			{

+				$obj = $db->fetch_object($resql);

+				if ($obj) $nbContact = $obj->nb;

@@ -88,7 +70,5 @@
-			$head[$h][0] = DOL_URL_ROOT.'/societe/contact.php?socid='.$object->id;

-			$head[$h][1] = $langs->trans('ContactsAddresses');

-			if ($nbContact > 0) {

-				$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';

-			}

-			$head[$h][2] = 'contact';

-			$h++;

+		    $head[$h][0] = DOL_URL_ROOT.'/societe/contact.php?socid='.$object->id;

+		    $head[$h][1] = $langs->trans('ContactsAddresses');

+		    if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';

+		    $head[$h][2] = 'contact';

+		    $h++;

@@ -96 +76,3 @@
-	} else {

+    }

+    else

+	{

@@ -100,3 +82 @@
-		if ($nbContact > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';

-		}

+		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';

@@ -107,69 +87,62 @@
-	if ($object->client == 1 || $object->client == 2 || $object->client == 3) {

-		$head[$h][0] = DOL_URL_ROOT.'/comm/card.php?socid='.$object->id;

-		$head[$h][1] = '';

-		if (!getDolGlobalString('SOCIETE_DISABLE_PROSPECTS') && ($object->client == 2 || $object->client == 3)) {

-			$head[$h][1] .= $langs->trans("Prospect");

-		}

-		if (!getDolGlobalString('SOCIETE_DISABLE_PROSPECTS') && !getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS') && $object->client == 3) {

-			$head[$h][1] .= ' | ';

-		}

-		if (!getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS') && ($object->client == 1 || $object->client == 3)) {

-			$head[$h][1] .= $langs->trans("Customer");

-		}

-		$head[$h][2] = 'customer';

-		$h++;

-

-		if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {

-			$langs->load("products");

-			// price

-			$head[$h][0] = DOL_URL_ROOT.'/societe/price.php?socid='.$object->id;

-			$head[$h][1] = $langs->trans("CustomerPrices");

-			$head[$h][2] = 'price';

-			$h++;

-		}

-	}

-	$supplier_module_enabled = 0;

-	if (isModEnabled('supplier_proposal') || isModEnabled("supplier_order") || isModEnabled("supplier_invoice")) {

-		$supplier_module_enabled = 1;

-	}

-	if ($supplier_module_enabled == 1 && $object->fournisseur && $user->hasRight('fournisseur', 'lire')) {

-		$head[$h][0] = DOL_URL_ROOT.'/fourn/card.php?socid='.$object->id;

-		$head[$h][1] = $langs->trans("Supplier");

-		$head[$h][2] = 'supplier';

-		$h++;

-	}

-

-	if (isModEnabled('project') && ($user->hasRight('projet', 'lire'))) {

-		$nbProject = 0;

-		// Enable caching of thirdrparty count projects

-		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';

-		$cachekey = 'count_projects_thirdparty_'.$object->id;

-		$dataretrieved = dol_getcache($cachekey);

-

-		if (!is_null($dataretrieved)) {

-			$nbProject = $dataretrieved;

-		} else {

-			$sql = "SELECT COUNT(n.rowid) as nb";

-			$sql .= " FROM ".MAIN_DB_PREFIX."projet as n";

-			$sql .= " WHERE fk_soc = ".((int) $object->id);

-			$sql .= " AND entity IN (".getEntity('project').")";

-			$resql = $db->query($sql);

-			if ($resql) {

-				$obj = $db->fetch_object($resql);

-				$nbProject = $obj->nb;

-			} else {

-				dol_print_error($db);

-			}

-			dol_setcache($cachekey, $nbProject, 120);	// If setting cache fails, this is not a problem, so we do not test result.

-		}

-		$head[$h][0] = DOL_URL_ROOT.'/societe/project.php?socid='.$object->id;

-		$head[$h][1] = $langs->trans("Projects");

-		if ($nbProject > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbProject.'</span>';

-		}

-		$head[$h][2] = 'project';

-		$h++;

-	}

-

-	// Tab to link resources

-	if (isModEnabled('resource') && getDolGlobalString('RESOURCE_ON_THIRDPARTIES')) {

+    if ($object->client == 1 || $object->client == 2 || $object->client == 3)

+    {

+        $head[$h][0] = DOL_URL_ROOT.'/comm/card.php?socid='.$object->id;

+        $head[$h][1] = '';

+        if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && ($object->client == 2 || $object->client == 3)) $head[$h][1] .= $langs->trans("Prospect");

+        if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && $object->client == 3) $head[$h][1] .= ' | ';

+        if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && ($object->client == 1 || $object->client == 3)) $head[$h][1] .= $langs->trans("Customer");

+        $head[$h][2] = 'customer';

+        $h++;

+

+        if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))

+        {

+            $langs->load("products");

+            // price

+            $head[$h][0] = DOL_URL_ROOT.'/societe/price.php?socid='.$object->id;

+            $head[$h][1] = $langs->trans("CustomerPrices");

+            $head[$h][2] = 'price';

+            $h++;

+        }

+    }

+    $supplier_module_enabled = 0;

+    if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_proposal->enabled) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) $supplier_module_enabled = 1;

+    if ($supplier_module_enabled == 1 && $object->fournisseur && !empty($user->rights->fournisseur->lire))

+    {

+        $head[$h][0] = DOL_URL_ROOT.'/fourn/card.php?socid='.$object->id;

+        $head[$h][1] = $langs->trans("Supplier");

+        $head[$h][2] = 'supplier';

+        $h++;

+    }

+

+    if (!empty($conf->projet->enabled) && (!empty($user->rights->projet->lire)))

+    {

+    	$head[$h][0] = DOL_URL_ROOT.'/societe/project.php?socid='.$object->id;

+    	$head[$h][1] = $langs->trans("Projects");

+    	$nbNote = 0;

+    	$sql = "SELECT COUNT(n.rowid) as nb";

+    	$sql .= " FROM ".MAIN_DB_PREFIX."projet as n";

+    	$sql .= " WHERE fk_soc = ".$object->id;

+    	$sql .= " AND entity IN (".getEntity('project').")";

+    	$resql = $db->query($sql);

+    	if ($resql)

+    	{

+    		$num = $db->num_rows($resql);

+    		$i = 0;

+    		while ($i < $num)

+    		{

+    			$obj = $db->fetch_object($resql);

+    			$nbNote = $obj->nb;

+    			$i++;

+    		}

+    	}

+    	else {

+    		dol_print_error($db);

+    	}

+		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

+    	$head[$h][2] = 'project';

+    	$h++;

+    }

+

+    // Tab to link resources

+	if (!empty($conf->resource->enabled) && !empty($conf->global->RESOURCE_ON_THIRDPARTIES))

+	{

@@ -181,0 +155,21 @@
+	if (!empty($conf->global->ACCOUNTING_ENABLE_LETTERING))

+	{

+		// Tab to accountancy

+		if (!empty($conf->accounting->enabled) && $object->client > 0)

+		{

+			$head[$h][0] = DOL_URL_ROOT.'/accountancy/bookkeeping/thirdparty_lettering_customer.php?socid='.$object->id;

+			$head[$h][1] = $langs->trans("TabLetteringCustomer");

+			$head[$h][2] = 'lettering_customer';

+			$h++;

+		}

+

+		// Tab to accountancy

+		if (!empty($conf->accounting->enabled) && $object->fournisseur > 0)

+		{

+			$head[$h][0] = DOL_URL_ROOT.'/accountancy/bookkeeping/thirdparty_lettering_supplier.php?socid='.$object->id;

+			$head[$h][1] = $langs->trans("TabLetteringSupplier");

+			$head[$h][2] = 'lettering_supplier';

+			$h++;

+		}

+	}

+

@@ -183,11 +177,13 @@
-	if ((isModEnabled('commande') || isModEnabled('propal') || isModEnabled('facture') || isModEnabled('ficheinter') || isModEnabled("supplier_proposal") || isModEnabled("supplier_order") || isModEnabled("supplier_invoice"))

-		&& !getDolGlobalString('THIRDPARTIES_DISABLE_RELATED_OBJECT_TAB')) {

-		$head[$h][0] = DOL_URL_ROOT.'/societe/consumption.php?socid='.$object->id;

-		$head[$h][1] = $langs->trans("Referers");

-		$head[$h][2] = 'consumption';

-		$h++;

-	}

-

-	// Bank accounts

-	if (!getDolGlobalInt('SOCIETE_DISABLE_BANKACCOUNT')) {

-		$nbBankAccount = 0;

+    if ((!empty($conf->commande->enabled) || !empty($conf->propal->enabled) || !empty($conf->facture->enabled) || !empty($conf->ficheinter->enabled) || !empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))

+        && empty($conf->global->THIRPARTIES_DISABLE_RELATED_OBJECT_TAB))

+    {

+        $head[$h][0] = DOL_URL_ROOT.'/societe/consumption.php?socid='.$object->id;

+        $head[$h][1] = $langs->trans("Referers");

+        $head[$h][2] = 'consumption';

+        $h++;

+    }

+

+    // Bank accounts

+    if (empty($conf->global->SOCIETE_DISABLE_BANKACCOUNT))

+    {

+    	$nbBankAccount = 0;

@@ -195,5 +191,7 @@
-		$langs->load("bills");

-

-		$title = $langs->trans("PaymentModes");

-

-		if (isModEnabled('stripe')) {

+    	$langs->load("banks");

+

+        //$title = $langs->trans("BankAccounts");

+    	$title = $langs->trans("PaymentInformation");

+

+		if (!empty($conf->stripe->enabled))

+		{

@@ -204,3 +202 @@
-			if (getDolGlobalString('STRIPE_LIVE') && !GETPOST('forcesandbox', 'alpha')) {

-				$servicestatus = 1;

-			}

+			if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha')) $servicestatus = 1;

@@ -211,3 +207 @@
-			if ($stripecu) {

-				$foundonexternalonlinesystem++;

-			}

+			if ($stripecu) $foundonexternalonlinesystem++;

@@ -216,4 +210,4 @@
-		$sql = "SELECT COUNT(n.rowid) as nb";

-		$sql .= " FROM ".MAIN_DB_PREFIX."societe_rib as n";

-		$sql .= " WHERE n.fk_soc = ".((int) $object->id);

-		if (!isModEnabled('stripe')) {

+        $sql = "SELECT COUNT(n.rowid) as nb";

+        $sql .= " FROM ".MAIN_DB_PREFIX."societe_rib as n";

+        $sql .= " WHERE n.fk_soc = ".$object->id;

+        if (empty($conf->stripe->enabled)) {

@@ -222 +216 @@
-			$sql .= " AND (n.stripe_card_ref IS NULL OR (n.stripe_card_ref IS NOT NULL AND n.status = ".((int) $servicestatus)."))";

+			$sql .= " AND (n.stripe_card_ref IS NULL OR (n.stripe_card_ref IS NOT NULL AND n.status = ".$servicestatus."))";

@@ -225,85 +219,53 @@
-		$resql = $db->query($sql);

-		if ($resql) {

-			$obj = $db->fetch_object($resql);

-			$nbBankAccount = $obj->nb;

-		} else {

-			dol_print_error($db);

-		}

-

-		//if (isModEnabled('stripe') && $nbBankAccount > 0) $nbBankAccount = '...';	// No way to know exact number

-

-		$head[$h][0] = DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.urlencode($object->id);

-		$head[$h][1] = $title;

-		if ($foundonexternalonlinesystem) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">...</span>';

-		} elseif ($nbBankAccount > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbBankAccount.'</span>';

-		}

-		$head[$h][2] = 'rib';

-		$h++;

-	}

-

-	if (

-		((isModEnabled('website') && getDolGlobalString('WEBSITE_USE_WEBSITE_ACCOUNTS')) || isModEnabled('webportal'))

-		&& $user->hasRight('societe', 'lire')

-	) {

-		$site_filter_list = array();

-		if (isModEnabled('website')) {

-			$site_filter_list[] = 'dolibarr_website';

-		}

-		if (isModEnabled('webportal')) {

-			$site_filter_list[] = 'dolibarr_portal';

-		}

-

-		$head[$h][0] = DOL_URL_ROOT.'/societe/website.php?id='.urlencode($object->id);

-		$head[$h][1] = $langs->trans("WebSiteAccounts");

-		$nbNote = 0;

-		$sql = "SELECT COUNT(n.rowid) as nb";

-		$sql .= " FROM ".MAIN_DB_PREFIX."societe_account as n";

-		$sql .= " WHERE fk_soc = ".((int) $object->id);

-		$sql .= " AND entity IN (".getEntity('thirdpartyaccount').")";

-		if (!empty($site_filter_list)) {

-			$sql .= " AND n.site IN (".$db->sanitize("'".implode("','", $site_filter_list)."'", 1).")";

-		}

-		$resql = $db->query($sql);

-		if ($resql) {

-			$obj = $db->fetch_object($resql);

-			$nbNote = $obj->nb;

-		} else {

-			dol_print_error($db);

-		}

-		if ($nbNote > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

-		}

-		$head[$h][2] = 'website';

-		$h++;

-	}

-

-	if (getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR', 'thirdparty') == 'thirdparty') {

-		if ($user->hasRight('partnership', 'read')) {

-			$langs->load("partnership");

-			$nbPartnership = is_array($object->partnerships) ? count($object->partnerships) : 0;

-			$head[$h][0] = DOL_URL_ROOT.'/partnership/partnership_list.php?socid='.$object->id;

-			$head[$h][1] = $langs->trans("Partnerships");

-			$nbNote = 0;

-			$sql = "SELECT COUNT(n.rowid) as nb";

-			$sql .= " FROM ".MAIN_DB_PREFIX."partnership as n";

-			$sql .= " WHERE fk_soc = ".((int) $object->id);

-			$sql .= " AND entity IN (".getEntity('partnership').")";

-			$resql = $db->query($sql);

-			if ($resql) {

-				$obj = $db->fetch_object($resql);

-				$nbNote = $obj->nb;

-			} else {

-				dol_print_error($db);

-			}

-			if ($nbNote > 0) {

-				$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

-			}

-			$head[$h][2] = 'partnerships';

-			if ($nbPartnership > 0) {

-				$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbPartnership.'</span>';

-			}

-			$h++;

-		}

-	}

+        $resql = $db->query($sql);

+        if ($resql)

+        {

+            $num = $db->num_rows($resql);

+            $i = 0;

+            while ($i < $num)

+            {

+                $obj = $db->fetch_object($resql);

+                $nbBankAccount = $obj->nb;

+                $i++;

+            }

+        }

+        else {

+            dol_print_error($db);

+        }

+

+        //if (! empty($conf->stripe->enabled) && $nbBankAccount > 0) $nbBankAccount = '...';	// No way to know exact number

+

+        $head[$h][0] = DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;

+        $head[$h][1] = $title;

+        if ($foundonexternalonlinesystem) $head[$h][1] .= '<span class="badge marginleftonlyshort">...</span>';

+       	elseif ($nbBankAccount > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbBankAccount.'</span>';

+        $head[$h][2] = 'rib';

+        $h++;

+    }

+

+    if (!empty($conf->website->enabled) && (!empty($conf->global->WEBSITE_USE_WEBSITE_ACCOUNTS)) && (!empty($user->rights->societe->lire)))

+    {

+    	$head[$h][0] = DOL_URL_ROOT.'/societe/website.php?id='.$object->id;

+    	$head[$h][1] = $langs->trans("WebSiteAccounts");

+    	$nbNote = 0;

+    	$sql = "SELECT COUNT(n.rowid) as nb";

+    	$sql .= " FROM ".MAIN_DB_PREFIX."societe_account as n";

+    	$sql .= " WHERE fk_soc = ".$object->id.' AND fk_website > 0';

+    	$resql = $db->query($sql);

+    	if ($resql)

+    	{

+    		$num = $db->num_rows($resql);

+    		$i = 0;

+    		while ($i < $num)

+    		{

+    			$obj = $db->fetch_object($resql);

+    			$nbNote = $obj->nb;

+    			$i++;

+    		}

+    	}

+    	else {

+    		dol_print_error($db);

+    	}

+    	if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

+    	$head[$h][2] = 'website';

+    	$h++;

+    }

@@ -312,37 +274,36 @@
-	// Entries must be declared in modules descriptor with line

-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'thirdparty', 'add', 'core');

-

-	if ($user->socid == 0) {

-		// Notifications

-		if (isModEnabled('notification')) {

-			$nbNotif = 0;

-			// Enable caching of thirdparty count notifications

-			require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';

-			$cachekey = 'count_notifications_thirdparty_'.$object->id;

-			$dataretrieved = dol_getcache($cachekey);

-			if (!is_null($dataretrieved)) {

-				$nbNotif = $dataretrieved;

-			} else {

-				$sql = "SELECT COUNT(n.rowid) as nb";

-				$sql .= " FROM ".MAIN_DB_PREFIX."notify_def as n";

-				$sql .= " WHERE fk_soc = ".((int) $object->id);

-				$resql = $db->query($sql);

-				if ($resql) {

-					$obj = $db->fetch_object($resql);

-					$nbNotif = $obj->nb;

-				} else {

-					dol_print_error($db);

-				}

-				dol_setcache($cachekey, $nbNotif, 120);		// If setting cache fails, this is not a problem, so we do not test result.

-			}

-

-			$head[$h][0] = DOL_URL_ROOT.'/societe/notify/card.php?socid='.urlencode($object->id);

-			$head[$h][1] = $langs->trans("Notifications");

-			if ($nbNotif > 0) {

-				$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNotif.'</span>';

-			}

-			$head[$h][2] = 'notify';

-			$h++;

-		}

+    // Entries must be declared in modules descriptor with line

+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

+    // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'thirdparty');

+

+    if ($user->socid == 0)

+    {

+        // Notifications

+        if (!empty($conf->notification->enabled))

+        {

+        	$nbNote = 0;

+        	$sql = "SELECT COUNT(n.rowid) as nb";

+        	$sql .= " FROM ".MAIN_DB_PREFIX."notify_def as n";

+        	$sql .= " WHERE fk_soc = ".$object->id;

+        	$resql = $db->query($sql);

+        	if ($resql)

+        	{

+        		$num = $db->num_rows($resql);

+        		$i = 0;

+        		while ($i < $num)

+        		{

+        			$obj = $db->fetch_object($resql);

+        			$nbNote = $obj->nb;

+        			$i++;

+        		}

+        	}

+        	else {

+        		dol_print_error($db);

+        	}

+

+        	$head[$h][0] = DOL_URL_ROOT.'/societe/notify/card.php?socid='.$object->id;

+        	$head[$h][1] = $langs->trans("Notifications");

+			if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

+        	$head[$h][2] = 'notify';

+        	$h++;

+        }

@@ -351,85 +312,42 @@
-		$nbNote = 0;

-		if (!empty($object->note_private)) {

-			$nbNote++;

-		}

-		if (!empty($object->note_public)) {

-			$nbNote++;

-		}

-		$head[$h][0] = DOL_URL_ROOT.'/societe/note.php?id='.urlencode($object->id);

-		$head[$h][1] = $langs->trans("Notes");

-		if ($nbNote > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

-		}

-		$head[$h][2] = 'note';

-		$h++;

-

-		// Attached files and Links

-		$totalAttached = 0;

-		// Enable caching of thirdrparty count attached files and links

-		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';

-		$cachekey = 'count_attached_thirdparty_'.$object->id;

-		$dataretrieved = dol_getcache($cachekey);

-		if (!is_null($dataretrieved)) {

-			$totalAttached = $dataretrieved;

-		} else {

-			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

-			require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

-			$upload_dir = $conf->societe->multidir_output[$object->entity]."/".$object->id;

-			$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));

-			$nbLinks = Link::count($db, $object->element, $object->id);

-			$totalAttached = $nbFiles + $nbLinks;

-			dol_setcache($cachekey, $totalAttached, 120);		// If setting cache fails, this is not a problem, so we do not test result.

-		}

-

-		$head[$h][0] = DOL_URL_ROOT.'/societe/document.php?socid='.$object->id;

-		$head[$h][1] = $langs->trans("Documents");

-		if (($totalAttached) > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($totalAttached).'</span>';

-		}

-		$head[$h][2] = 'document';

-		$h++;

-	}

-

-	$head[$h][0] = DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id;

-	$head[$h][1] = $langs->trans("Events");

-	if (isModEnabled('agenda')&& ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {

-		$nbEvent = 0;

-		// Enable caching of thirdparty count actioncomm

-		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';

-		$cachekey = 'count_events_thirdparty_'.$object->id;

-		$dataretrieved = dol_getcache($cachekey);

-		if (!is_null($dataretrieved)) {

-			$nbEvent = $dataretrieved;

-		} else {

-			$sql = "SELECT COUNT(id) as nb";

-			$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm";

-			$sql .= " WHERE fk_soc = ".((int) $object->id);

-			$sql .= " AND entity IN (".getEntity('agenda').")";

-			$resql = $db->query($sql);

-			if ($resql) {

-				$obj = $db->fetch_object($resql);

-				$nbEvent = $obj->nb;

-			} else {

-				dol_syslog('Failed to count actioncomm '.$db->lasterror(), LOG_ERR);

-			}

-			dol_setcache($cachekey, $nbEvent, 120);		// If setting cache fails, this is not a problem, so we do not test result.

-		}

-

-		$head[$h][1] .= '/';

-		$head[$h][1] .= $langs->trans("Agenda");

-		if ($nbEvent > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbEvent.'</span>';

-		}

-	}

-	$head[$h][2] = 'agenda';

-	$h++;

-

-	// Show more tabs from modules

-	// Entries must be declared in modules descriptor with line

-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'thirdparty', 'add', 'external');

-

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'thirdparty', 'remove');

-

-	return $head;

+        $nbNote = 0;

+        if (!empty($object->note_private)) $nbNote++;

+		if (!empty($object->note_public)) $nbNote++;

+        $head[$h][0] = DOL_URL_ROOT.'/societe/note.php?id='.$object->id;

+        $head[$h][1] = $langs->trans("Notes");

+		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

+        $head[$h][2] = 'note';

+        $h++;

+

+        // Attached files

+        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

+        require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

+        $upload_dir = $conf->societe->multidir_output[$object->entity]."/".$object->id;

+        $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));

+        $nbLinks = Link::count($db, $object->element, $object->id);

+

+        $head[$h][0] = DOL_URL_ROOT.'/societe/document.php?socid='.$object->id;

+        $head[$h][1] = $langs->trans("Documents");

+		if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

+        $head[$h][2] = 'document';

+        $h++;

+    }

+

+    $head[$h][0] = DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id;

+    $head[$h][1] .= $langs->trans("Events");

+    if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))

+    {

+        $head[$h][1] .= '/';

+        $head[$h][1] .= $langs->trans("Agenda");

+    }

+    $head[$h][2] = 'agenda';

+    $h++;

+

+    // Log

+    /*$head[$h][0] = DOL_URL_ROOT.'/societe/info.php?socid='.$object->id;

+    $head[$h][1] = $langs->trans("Info");

+    $head[$h][2] = 'info';

+    $h++;*/

+

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'thirdparty', 'remove');

+

+    return $head;

@@ -447,15 +365,15 @@
-	global $langs;

-	$h = 0;

-	$head = array();

-

-	$head[$h][0] = DOL_URL_ROOT.'/societe/card.php?socid='.$object->id;

-	$head[$h][1] = $langs->trans("ThirdParty");

-	$head[$h][2] = 'company';

-	$h++;

-

-	$head[$h][0] = 'commerciaux.php?socid='.$object->id;

-	$head[$h][1] = $langs->trans("SalesRepresentative");

-	$head[$h][2] = 'salesrepresentative';

-	$h++;

-

-	return $head;

+    global $langs, $conf, $user;

+    $h = 0;

+    $head = array();

+

+    $head[$h][0] = DOL_URL_ROOT.'/societe/card.php?socid='.$object->id;

+    $head[$h][1] = $langs->trans("ThirdParty");

+    $head[$h][2] = 'company';

+    $h++;

+

+    $head[$h][0] = 'commerciaux.php?socid='.$object->id;

+    $head[$h][1] = $langs->trans("SalesRepresentative");

+    $head[$h][2] = 'salesrepresentative';

+    $h++;

+

+    return $head;

@@ -473,41 +391,29 @@
-	global $langs, $conf, $db;

-

-	$extrafields = new ExtraFields($db);

-	$extrafields->fetch_name_optionals_label('societe');

-	$extrafields->fetch_name_optionals_label('socpeople');

-

-	$h = 0;

-	$head = array();

-

-	$head[$h][0] = DOL_URL_ROOT.'/societe/admin/societe.php';

-	$head[$h][1] = $langs->trans("Miscellaneous");

-	$head[$h][2] = 'general';

-	$h++;

-

-	// Show more tabs from modules

-	// Entries must be declared in modules descriptor with line

-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab

-	complete_head_from_modules($conf, $langs, null, $head, $h, 'company_admin');

-

-	$head[$h][0] = DOL_URL_ROOT.'/societe/admin/societe_extrafields.php';

-	$head[$h][1] = $langs->trans("ExtraFieldsThirdParties");

-	$nbExtrafields = $extrafields->attributes['societe']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

-	$head[$h][2] = 'attributes';

-	$h++;

-

-	$head[$h][0] = DOL_URL_ROOT.'/societe/admin/contact_extrafields.php';

-	$head[$h][1] = $langs->trans("ExtraFieldsContacts");

-	$nbExtrafields = $extrafields->attributes['socpeople']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

-	$head[$h][2] = 'attributes_contacts';

-	$h++;

-

-	complete_head_from_modules($conf, $langs, null, $head, $h, 'company_admin', 'remove');

-

-	return $head;

+    global $langs, $conf, $user;

+

+    $h = 0;

+    $head = array();

+

+    $head[$h][0] = DOL_URL_ROOT.'/societe/admin/societe.php';

+    $head[$h][1] = $langs->trans("Miscellaneous");

+    $head[$h][2] = 'general';

+    $h++;

+

+    // Show more tabs from modules

+    // Entries must be declared in modules descriptor with line

+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

+    // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab

+    complete_head_from_modules($conf, $langs, null, $head, $h, 'company_admin');

+

+    $head[$h][0] = DOL_URL_ROOT.'/societe/admin/societe_extrafields.php';

+    $head[$h][1] = $langs->trans("ExtraFieldsThirdParties");

+    $head[$h][2] = 'attributes';

+    $h++;

+

+    $head[$h][0] = DOL_URL_ROOT.'/societe/admin/contact_extrafields.php';

+    $head[$h][1] = $langs->trans("ExtraFieldsContacts");

+    $head[$h][2] = 'attributes_contacts';

+    $h++;

+

+    complete_head_from_modules($conf, $langs, null, $head, $h, 'company_admin', 'remove');

+

+    return $head;

@@ -535,61 +441,46 @@
-	global $db, $langs;

-

-	$result = '';

-

-	// Check parameters

-	if (empty($searchkey) && empty($searchlabel)) {

-		if ($withcode === 'all') {

-			return array('id'=>'', 'code'=>'', 'label'=>'');

-		} else {

-			return '';

-		}

-	}

-	if (!is_object($dbtouse)) {

-		$dbtouse = $db;

-	}

-	if (!is_object($outputlangs)) {

-		$outputlangs = $langs;

-	}

-

-	$sql = "SELECT rowid, code, label FROM ".MAIN_DB_PREFIX."c_country";

-	if (is_numeric($searchkey)) {

-		$sql .= " WHERE rowid = ".((int) $searchkey);

-	} elseif (!empty($searchkey)) {

-		$sql .= " WHERE code = '".$db->escape($searchkey)."'";

-	} else {

-		$sql .= " WHERE label = '".$db->escape($searchlabel)."'";

-	}

-

-	$resql = $dbtouse->query($sql);

-	if ($resql) {

-		$obj = $dbtouse->fetch_object($resql);

-		if ($obj) {

-			$label = ((!empty($obj->label) && $obj->label != '-') ? $obj->label : '');

-			if (is_object($outputlangs)) {

-				$outputlangs->load("dict");

-				if ($entconv) {

-					$label = ($obj->code && ($outputlangs->trans("Country".$obj->code) != "Country".$obj->code)) ? $outputlangs->trans("Country".$obj->code) : $label;

-				} else {

-					$label = ($obj->code && ($outputlangs->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code)) ? $outputlangs->transnoentitiesnoconv("Country".$obj->code) : $label;

-				}

-			}

-			if ($withcode == 1) {

-				$result = $label ? "$obj->code - $label" : "$obj->code";

-			} elseif ($withcode == 2) {

-				$result = $obj->code;

-			} elseif ($withcode == 3) {

-				$result = $obj->rowid;

-			} elseif ($withcode === 'all') {

-				$result = array('id'=>$obj->rowid, 'code'=>$obj->code, 'label'=>$label);

-			} else {

-				$result = $label;

-			}

-		} else {

-			$result = 'NotDefined';

-		}

-		$dbtouse->free($resql);

-		return $result;

-	} else {

-		dol_print_error($dbtouse, '');

-	}

-	return 'Error';

+    global $db, $langs;

+

+    $result = '';

+

+    // Check parameters

+    if (empty($searchkey) && empty($searchlabel))

+    {

+    	if ($withcode === 'all') return array('id'=>'', 'code'=>'', 'label'=>'');

+    	else return '';

+    }

+    if (!is_object($dbtouse)) $dbtouse = $db;

+    if (!is_object($outputlangs)) $outputlangs = $langs;

+

+    $sql = "SELECT rowid, code, label FROM ".MAIN_DB_PREFIX."c_country";

+    if (is_numeric($searchkey)) $sql .= " WHERE rowid=".$searchkey;

+    elseif (!empty($searchkey)) $sql .= " WHERE code='".$db->escape($searchkey)."'";

+    else $sql .= " WHERE label='".$db->escape($searchlabel)."'";

+

+    $resql = $dbtouse->query($sql);

+    if ($resql)

+    {

+        $obj = $dbtouse->fetch_object($resql);

+        if ($obj)

+        {

+            $label = ((!empty($obj->label) && $obj->label != '-') ? $obj->label : '');

+            if (is_object($outputlangs))

+            {

+                $outputlangs->load("dict");

+                if ($entconv) $label = ($obj->code && ($outputlangs->trans("Country".$obj->code) != "Country".$obj->code)) ? $outputlangs->trans("Country".$obj->code) : $label;

+                else $label = ($obj->code && ($outputlangs->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code)) ? $outputlangs->transnoentitiesnoconv("Country".$obj->code) : $label;

+            }

+            if ($withcode == 1) $result = $label ? "$obj->code - $label" : "$obj->code";

+            elseif ($withcode == 2) $result = $obj->code;

+            elseif ($withcode == 3) $result = $obj->rowid;

+            elseif ($withcode === 'all') $result = array('id'=>$obj->rowid, 'code'=>$obj->code, 'label'=>$label);

+            else $result = $label;

+        }

+        else

+        {

+            $result = 'NotDefined';

+        }

+        $dbtouse->free($resql);

+        return $result;

+    }

+    else dol_print_error($dbtouse, '');

+    return 'Error';

@@ -615,60 +506,64 @@
-	global $db, $langs;

-

-	if (!is_object($dbtouse)) {

-		$dbtouse = $db;

-	}

-

-	$sql = "SELECT d.rowid as id, d.code_departement as code, d.nom as name, d.active, c.label as country, c.code as country_code, r.code_region as region_code, r.nom as region_name FROM";

-	$sql .= " ".MAIN_DB_PREFIX."c_departements as d, ".MAIN_DB_PREFIX."c_regions as r,".MAIN_DB_PREFIX."c_country as c";

-	$sql .= " WHERE d.fk_region=r.code_region and r.fk_pays=c.rowid and d.rowid=".((int) $id);

-	$sql .= " AND d.active = 1 AND r.active = 1 AND c.active = 1";

-	$sql .= " ORDER BY c.code, d.code_departement";

-

-	dol_syslog("Company.lib::getState", LOG_DEBUG);

-	$resql = $dbtouse->query($sql);

-	if ($resql) {

-		$obj = $dbtouse->fetch_object($resql);

-		if ($obj) {

-			$label = ((!empty($obj->name) && $obj->name != '-') ? $obj->name : '');

-			if (is_object($outputlangs)) {

-				$outputlangs->load("dict");

-				if ($entconv) {

-					$label = ($obj->code && ($outputlangs->trans("State".$obj->code) != "State".$obj->code)) ? $outputlangs->trans("State".$obj->code) : $label;

-				} else {

-					$label = ($obj->code && ($outputlangs->transnoentitiesnoconv("State".$obj->code) != "State".$obj->code)) ? $outputlangs->transnoentitiesnoconv("State".$obj->code) : $label;

-				}

-			}

-

-			if ($withcode == 1) {

-				if ($withregion == 1) {

-					return $label = $obj->region_name.' - '.$obj->code.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));

-				} else {

-					return $label = $obj->code.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));

-				}

-			} elseif ($withcode == 2) {

-				if ($withregion == 1) {

-					return $label = $obj->region_name.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));

-				} else {

-					return $label = ($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));

-				}

-			} elseif ($withcode === 'all') {

-				if ($withregion == 1) {

-					return array('id'=>$obj->id, 'code'=>$obj->code, 'label'=>$label, 'region_code'=>$obj->region_code, 'region'=>$obj->region_name);

-				} else {

-					return array('id'=>$obj->id, 'code'=>$obj->code, 'label'=>$label);

-				}

-			} else {

-				if ($withregion == 1) {

-					return $label = $obj->region_name.' - '.$label;

-				} else {

-					return $label;

-				}

-			}

-		} else {

-			return $langs->transnoentitiesnoconv("NotDefined");

-		}

-	} else {

-		dol_print_error($dbtouse, '');

-	}

-

-	return '';

+    global $db, $langs;

+

+    if (!is_object($dbtouse)) $dbtouse = $db;

+

+    $sql = "SELECT d.rowid as id, d.code_departement as code, d.nom as name, d.active, c.label as country, c.code as country_code, r.code_region as region_code, r.nom as region_name FROM";

+    $sql .= " ".MAIN_DB_PREFIX."c_departements as d, ".MAIN_DB_PREFIX."c_regions as r,".MAIN_DB_PREFIX."c_country as c";

+    $sql .= " WHERE d.fk_region=r.code_region and r.fk_pays=c.rowid and d.rowid=".$id;

+    $sql .= " AND d.active = 1 AND r.active = 1 AND c.active = 1";

+    $sql .= " ORDER BY c.code, d.code_departement";

+

+    dol_syslog("Company.lib::getState", LOG_DEBUG);

+    $resql = $dbtouse->query($sql);

+    if ($resql)

+    {

+        $obj = $dbtouse->fetch_object($resql);

+        if ($obj)

+        {

+            $label = ((!empty($obj->name) && $obj->name != '-') ? $obj->name : '');

+            if (is_object($outputlangs))

+            {

+                $outputlangs->load("dict");

+                if ($entconv) $label = ($obj->code && ($outputlangs->trans("State".$obj->code) != "State".$obj->code)) ? $outputlangs->trans("State".$obj->code) : $label;

+                else $label = ($obj->code && ($outputlangs->transnoentitiesnoconv("State".$obj->code) != "State".$obj->code)) ? $outputlangs->transnoentitiesnoconv("State".$obj->code) : $label;

+            }

+

+            if ($withcode == 1) {

+                if ($withregion == 1) {

+                    return $label = $obj->region_name.' - '.$obj->code.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));

+                }

+                else {

+                    return $label = $obj->code.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));

+                }

+            }

+            elseif ($withcode == 2) {

+                if ($withregion == 1) {

+                    return $label = $obj->region_name.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));

+                }

+                else {

+                    return $label = ($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));

+                }

+            }

+            elseif ($withcode === 'all') {

+                if ($withregion == 1) {

+                    return array('id'=>$obj->id, 'code'=>$obj->code, 'label'=>$label, 'region_code'=>$obj->region_code, 'region'=>$obj->region_name);

+                }

+                else {

+                    return array('id'=>$obj->id, 'code'=>$obj->code, 'label'=>$label);

+                }

+            }

+            else {

+                if ($withregion == 1) {

+                    return $label = $obj->region_name.' - '.$label;

+                }

+                else {

+                    return $label;

+                }

+            }

+        }

+        else

+        {

+            return $langs->transnoentitiesnoconv("NotDefined");

+        }

+    }

+    else dol_print_error($dbtouse, '');

@@ -687,34 +582,34 @@
-	global $langs, $db;

-

-	if (empty($outputlangs)) {

-		$outputlangs = $langs;

-	}

-

-	$outputlangs->load("dict");

-

-	// If there is a translation, we can send immediatly the label

-	if ($outputlangs->trans("Currency".$code_iso) != "Currency".$code_iso) {

-		return ($withcode ? $code_iso.' - ' : '').$outputlangs->trans("Currency".$code_iso);

-	}

-

-	// If no translation, we read table to get label by default

-	$sql = "SELECT label FROM ".MAIN_DB_PREFIX."c_currencies";

-	$sql .= " WHERE code_iso='".$db->escape($code_iso)."'";

-

-	$resql = $db->query($sql);

-	if ($resql) {

-		$num = $db->num_rows($resql);

-

-		if ($num) {

-			$obj = $db->fetch_object($resql);

-			$label = ($obj->label != '-' ? $obj->label : '');

-			if ($withcode) {

-				return ($label == $code_iso) ? "$code_iso" : "$code_iso - $label";

-			} else {

-				return $label;

-			}

-		} else {

-			return $code_iso;

-		}

-	}

-	return 'ErrorWhenReadingCurrencyLabel';

+    global $langs, $db;

+

+    if (empty($outputlangs)) $outputlangs = $langs;

+

+    $outputlangs->load("dict");

+

+    // If there is a translation, we can send immediatly the label

+    if ($outputlangs->trans("Currency".$code_iso) != "Currency".$code_iso)

+    {

+        return ($withcode ? $code_iso.' - ' : '').$outputlangs->trans("Currency".$code_iso);

+    }

+

+    // If no translation, we read table to get label by default

+    $sql = "SELECT label FROM ".MAIN_DB_PREFIX."c_currencies";

+    $sql .= " WHERE code_iso='".$code_iso."'";

+

+    $resql = $db->query($sql);

+    if ($resql)

+    {

+        $num = $db->num_rows($resql);

+

+        if ($num)

+        {

+            $obj = $db->fetch_object($resql);

+            $label = ($obj->label != '-' ? $obj->label : '');

+            if ($withcode) return ($label == $code_iso) ? "$code_iso" : "$code_iso - $label";

+            else return $label;

+        }

+        else

+        {

+            return $code_iso;

+        }

+    }

+    return 'ErrorWhenReadingCurrencyLabel';

@@ -724 +619 @@
- *    Return the name translated of juridical status

+ *    Retourne le nom traduit de la forme juridique

@@ -726,2 +621,2 @@
- *    @param      string	$code       Code of juridical status

- *    @return     string     			Value of the juridical status

+ *    @param      string	$code       Code de la forme juridique

+ *    @return     string     			Nom traduit du pays

@@ -731,26 +626,24 @@
-	global $db, $langs;

-

-	if (!$code) {

-		return '';

-	}

-

-	$sql = "SELECT libelle as label FROM ".MAIN_DB_PREFIX."c_forme_juridique";

-	$sql .= " WHERE code = '".$db->escape($code)."'";

-

-	dol_syslog("Company.lib::getFormeJuridiqueLabel", LOG_DEBUG);

-

-	$resql = $db->query($sql);

-	if ($resql) {

-		$num = $db->num_rows($resql);

-		if ($num) {

-			$obj = $db->fetch_object($resql);

-

-			$label = ($obj->label != '-' ? $obj->label : '');

-

-			return $langs->trans($label);

-		} else {

-			return $langs->trans("NotDefined");

-		}

-	} else {

-		return 'Error '.$db->lasterror();

-	}

+    global $db, $langs;

+

+    if (!$code) return '';

+

+    $sql = "SELECT libelle FROM ".MAIN_DB_PREFIX."c_forme_juridique";

+    $sql .= " WHERE code='$code'";

+

+    dol_syslog("Company.lib::getFormeJuridiqueLabel", LOG_DEBUG);

+    $resql = $db->query($sql);

+    if ($resql)

+    {

+        $num = $db->num_rows($resql);

+

+        if ($num)

+        {

+            $obj = $db->fetch_object($resql);

+            $label = ($obj->libelle != '-' ? $obj->libelle : '');

+            return $label;

+        }

+        else

+        {

+            return $langs->trans("NotDefined");

+        }

+    }

@@ -767,0 +661,2 @@
+	global $conf;

+

@@ -769,24 +664,41 @@
-	// List found on https://ec.europa.eu/taxation_customs/territorial-status-eu-countries-and-certain-territories_en

-	global $conf, $db;

-	$country_code_in_EEC = array();

-

-	if (!empty($conf->cache['country_code_in_EEC'])) {

-		// Use of cache to reduce number of database requests

-		$country_code_in_EEC = $conf->cache['country_code_in_EEC'];

-	} else {

-		$sql = "SELECT cc.code FROM ".MAIN_DB_PREFIX."c_country as cc";

-		$sql .= " WHERE cc.eec = 1";

-

-		$resql = $db->query($sql);

-		if ($resql) {

-			$num = $db->num_rows($resql);

-			$i = 0;

-			while ($i < $num) {

-				$objp = $db->fetch_object($resql);

-				$country_code_in_EEC[] = $objp->code;

-				$i++;

-			}

-		} else {

-			dol_print_error($db);

-		}

-		$conf->cache['country_code_in_EEC'] = $country_code_in_EEC;

+	// List found on http://ec.europa.eu/taxation_customs/common/faq/faq_1179_en.htm#9

+	$country_code_in_EEC = array(

+		'AT', // Austria

+		'BE', // Belgium

+		'BG', // Bulgaria

+		'CY', // Cyprus

+		'CZ', // Czech republic

+		'DE', // Germany

+		'DK', // Danemark

+		'EE', // Estonia

+		'ES', // Spain

+		'FI', // Finland

+		'FR', // France

+		'GB', // United Kingdom

+		'GR', // Greece

+		'HR', // Croatia

+		'NL', // Holland

+		'HU', // Hungary

+		'IE', // Ireland

+		'IM', // Isle of Man - Included in UK

+		'IT', // Italy

+		'LT', // Lithuania

+		'LU', // Luxembourg

+		'LV', // Latvia

+		'MC', // Monaco - Included in France

+		'MT', // Malta

+		//'NO',	// Norway

+		'PL', // Poland

+		'PT', // Portugal

+		'RO', // Romania

+		'SE', // Sweden

+		'SK', // Slovakia

+		'SI', // Slovenia

+		'UK', // United Kingdom

+		//'CH',	// Switzerland - No. Swizerland in not in EEC

+	);

+

+	if (!empty($conf->global->MAIN_COUNTRIES_IN_EEC))

+	{

+		// For example MAIN_COUNTRIES_IN_EEC = 'AT,BE,BG,CY,CZ,DE,DK,EE,ES,FI,FR,GB,GR,HR,NL,HU,IE,IM,IT,LT,LU,LV,MC,MT,PL,PT,RO,SE,SK,SI,UK'

+		$country_code_in_EEC = explode(',', $conf->global->MAIN_COUNTRIES_IN_EEC);

@@ -793,0 +706 @@
+

@@ -805,8 +718,6 @@
-	if (empty($object->country_code)) {

-		return false;

-	}

-

-	$country_code_in_EEC = getCountriesInEEC();		// This make a database call but there is a cache done into $conf->cache['country_code_in_EEC']

-

-	//print "dd".$object->country_code;

-	return in_array($object->country_code, $country_code_in_EEC);

+	if (empty($object->country_code)) return false;

+

+	$country_code_in_EEC = getCountriesInEEC();

+

+    //print "dd".$this->country_code;

+    return in_array($object->country_code, $country_code_in_EEC);

@@ -830,148 +741,114 @@
-	global $user, $action, $hookmanager, $form, $massactionbutton, $massaction, $arrayofselected, $arrayofmassactions;

-

-	$i = -1;

-

-	if (isModEnabled('project') && $user->hasRight('projet', 'lire')) {

-		$langs->load("projects");

-

-		$newcardbutton = '';

-		if (isModEnabled('project') && $user->hasRight('projet', 'creer') && empty($nocreatelink)) {

-			$newcardbutton .= dolGetButtonTitle($langs->trans('AddProject'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/projet/card.php?socid='.$object->id.'&amp;action=create&amp;backtopage='.urlencode($backtopage));

-		}

-

-		print "\n";

-		print load_fiche_titre($langs->trans("ProjectsDedicatedToThisThirdParty"), $newcardbutton.$morehtmlright, '');

-

-		print '<div class="div-table-responsive">'."\n";

-		print '<table class="noborder centpercent">';

-

-		$sql  = "SELECT p.rowid as id, p.entity, p.title, p.ref, p.public, p.dateo as do, p.datee as de, p.fk_statut as status, p.fk_opp_status, p.opp_amount, p.opp_percent, p.tms as date_update, p.budget_amount";

-		$sql .= ", cls.code as opp_status_code";

-		$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";

-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_lead_status as cls on p.fk_opp_status = cls.rowid";

-		$sql .= " WHERE p.fk_soc = ".((int) $object->id);

-		$sql .= " AND p.entity IN (".getEntity('project').")";

-		$sql .= " ORDER BY p.dateo DESC";

-

-		$result = $db->query($sql);

-		if ($result) {

-			$num = $db->num_rows($result);

-

-			print '<tr class="liste_titre">';

-			if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {

-				print '<td class="center">';

-				$selectedfields = (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');

-				print $selectedfields;

-				print '</td>';

-			}

-			print '<td>'.$langs->trans("Ref").'</td>';

-			print '<td>'.$langs->trans("Name").'</td>';

-			print '<td class="center">'.$langs->trans("DateStart").'</td>';

-			print '<td class="center">'.$langs->trans("DateEnd").'</td>';

-			print '<td class="right">'.$langs->trans("OpportunityAmountShort").'</td>';

-			print '<td class="center">'.$langs->trans("OpportunityStatusShort").'</td>';

-			print '<td class="right">'.$langs->trans("OpportunityProbabilityShort").'</td>';

-			print '<td class="right">'.$langs->trans("Status").'</td>';

-			if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {

-				print '<td class="center">';

-				$selectedfields = (is_array($arrayofmassactions) && count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');

-				print $selectedfields;

-				print '</td>';

-			}

-			print '</tr>';

-

-			if ($num > 0) {

-				require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';

-

-				$projecttmp = new Project($db);

-

-				$i = 0;

-

-				while ($i < $num) {

-					$obj = $db->fetch_object($result);

-					$projecttmp->fetch($obj->id);

-

-					// To verify role of users

-					$userAccess = $projecttmp->restrictedProjectArea($user);

-

-					if ($user->hasRight('projet', 'lire') && $userAccess > 0) {

-						print '<tr class="oddeven">';

-

-						if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {

-							print '<td class="nowrap center actioncolumn">';

-							if ($massactionbutton || $massaction) {

-								$selected = 0;

-								if (in_array($obj->id, $arrayofselected)) {

-									$selected = 1;

-								}

-								print '<input id="cb'.$obj->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->id.'"'.($selected ? ' checked="checked"' : '').'>';

-							}

-							print '</td>';

-						}

-						// Ref

-						print '<td class="nowraponall">';

-						print $projecttmp->getNomUrl(1, '', 0, '', '-', 0, 1, '', 'project:'.$_SERVER["PHP_SELF"].'?socid=__SOCID__');

-						print '</td>';

-

-						// Label

-						print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($obj->title).'">'.dol_escape_htmltag($obj->title).'</td>';

-						// Date start

-						print '<td class="center">'.dol_print_date($db->jdate($obj->do), "day").'</td>';

-						// Date end

-						print '<td class="center">'.dol_print_date($db->jdate($obj->de), "day").'</td>';

-						// Opp amount

-						print '<td class="right">';

-						if ($obj->opp_status_code) {

-							print '<span class="amount">'.price($obj->opp_amount, 1, '', 1, -1, -1, '').'</span>';

-						}

-						print '</td>';

-						// Opp status

-						print '<td class="center">';

-						if ($obj->opp_status_code) {

-							print $langs->trans("OppStatus".$obj->opp_status_code);

-						}

-						print '</td>';

-						// Opp percent

-						print '<td class="right">';

-						if ($obj->opp_percent) {

-							print price($obj->opp_percent, 1, '', 1, 0).'%';

-						}

-						print '</td>';

-						// Status

-						print '<td class="right">'.$projecttmp->getLibStatut(5).'</td>';

-

-						// Action column

-						if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {

-							print '<td class="nowrap center actioncolumn">';

-							if ($massactionbutton || $massaction) {

-								$selected = 0;

-								if (in_array($obj->id, $arrayofselected)) {

-									$selected = 1;

-								}

-								print '<input id="cb'.$obj->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->id.'"'.($selected ? ' checked="checked"' : '').'>';

-							}

-							print '</td>';

-						}

-						print '</tr>';

-					}

-					$i++;

-				}

-			} else {

-				print '<tr class="oddeven"><td colspan="8"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';

-			}

-			$db->free($result);

-		} else {

-			dol_print_error($db);

-		}

-

-		$parameters = array('sql'=>$sql, 'function'=>'show_projects');

-		$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook

-		print $hookmanager->resPrint;

-

-		print "</table>";

-		print '</div>';

-

-		print "<br>\n";

-	}

-

-	return $i;

+    global $user;

+

+    $i = -1;

+

+    if (!empty($conf->projet->enabled) && $user->rights->projet->lire)

+    {

+        $langs->load("projects");

+

+        $newcardbutton = '';

+        if (!empty($conf->projet->enabled) && $user->rights->projet->creer && empty($nocreatelink))

+        {

+            $newcardbutton .= dolGetButtonTitle($langs->trans('AddProject'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/projet/card.php?socid='.$object->id.'&amp;action=create&amp;backtopage='.urlencode($backtopage));

+        }

+

+        print "\n";

+        print load_fiche_titre($langs->trans("ProjectsDedicatedToThisThirdParty"), $newcardbutton.$morehtmlright, '');

+        print '<div class="div-table-responsive">';

+        print "\n".'<table class="noborder" width=100%>';

+

+        $sql  = "SELECT p.rowid as id, p.entity, p.title, p.ref, p.public, p.dateo as do, p.datee as de, p.fk_statut as status, p.fk_opp_status, p.opp_amount, p.opp_percent, p.tms as date_update, p.budget_amount";

+        $sql .= ", cls.code as opp_status_code";

+        $sql .= " FROM ".MAIN_DB_PREFIX."projet as p";

+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_lead_status as cls on p.fk_opp_status = cls.rowid";

+        $sql .= " WHERE p.fk_soc = ".$object->id;

+        $sql .= " AND p.entity IN (".getEntity('project').")";

+        $sql .= " ORDER BY p.dateo DESC";

+

+        $result = $db->query($sql);

+        if ($result)

+        {

+            $num = $db->num_rows($result);

+

+            print '<tr class="liste_titre">';

+            print '<td>'.$langs->trans("Ref").'</td>';

+            print '<td>'.$langs->trans("Name").'</td>';

+            print '<td class="center">'.$langs->trans("DateStart").'</td>';

+            print '<td class="center">'.$langs->trans("DateEnd").'</td>';

+            print '<td class="right">'.$langs->trans("OpportunityAmountShort").'</td>';

+            print '<td class="center">'.$langs->trans("OpportunityStatusShort").'</td>';

+            print '<td class="right">'.$langs->trans("OpportunityProbabilityShort").'</td>';

+            print '<td class="right">'.$langs->trans("Status").'</td>';

+            print '</tr>';

+

+            if ($num > 0)

+            {

+                require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';

+

+                $projecttmp = new Project($db);

+

+                $i = 0;

+

+                while ($i < $num)

+                {

+                    $obj = $db->fetch_object($result);

+                    $projecttmp->fetch($obj->id);

+

+                    // To verify role of users

+                    $userAccess = $projecttmp->restrictedProjectArea($user);

+

+                    if ($user->rights->projet->lire && $userAccess > 0)

+                    {

+                        print '<tr class="oddeven">';

+

+                        // Ref

+                        print '<td>';

+                        print $projecttmp->getNomUrl(1);

+                        print '</td>';

+

+                        // Label

+                        print '<td>'.$obj->title.'</td>';

+                        // Date start

+                        print '<td class="center">'.dol_print_date($db->jdate($obj->do), "day").'</td>';

+                        // Date end

+                        print '<td class="center">'.dol_print_date($db->jdate($obj->de), "day").'</td>';

+                        // Opp amount

+                        print '<td class="right">';

+                        if ($obj->opp_status_code)

+                        {

+                            print price($obj->opp_amount, 1, '', 1, -1, -1, '');

+                        }

+                        print '</td>';

+                        // Opp status

+                        print '<td class="center">';

+            			if ($obj->opp_status_code) print $langs->trans("OppStatus".$obj->opp_status_code);

+            			print '</td>';

+			            // Opp percent

+            			print '<td class="right">';

+            			if ($obj->opp_percent) print price($obj->opp_percent, 1, '', 1, 0).'%';

+            			print '</td>';

+                        // Status

+                        print '<td class="right">'.$projecttmp->getLibStatut(5).'</td>';

+

+                        print '</tr>';

+                    }

+                    $i++;

+                }

+            }

+            else

+			{

+            	print '<tr class="oddeven"><td colspan="8" class="opacitymedium">'.$langs->trans("None").'</td></tr>';

+            }

+            $db->free($result);

+        }

+        else

+        {

+            dol_print_error($db);

+        }

+        print "</table>";

+        print '</div>';

+

+        print "<br>\n";

+    }

+

+    return $i;

@@ -984,6 +861,5 @@
- *		@param	Conf		$conf			Object conf

- * 		@param	Translate	$langs			Object langs

- * 		@param	DoliDB		$db				Database handler

- * 		@param	Societe		$object			Third party object

- *      @param  string		$backtopage		Url to go once contact is created

- *      @param	int			$showuserlogin 	1=Show also user login if it exists

+ *		@param	Conf		$conf		Object conf

+ * 		@param	Translate	$langs		Object langs

+ * 		@param	DoliDB		$db			Database handler

+ * 		@param	Societe		$object		Third party object

+ *      @param  string		$backtopage	Url to go once contact is created

@@ -992 +868 @@
-function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserlogin = 0)

+function show_contacts($conf, $langs, $db, $object, $backtopage = '')

@@ -999,17 +875,13 @@
-	$form = new Form($db);

-

-	$optioncss = GETPOST('optioncss', 'alpha');

-	$sortfield = GETPOST('sortfield', 'aZ09comma');

-	$sortorder = GETPOST('sortorder', 'aZ09comma');

-	$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');

-

-	$search_status = GETPOST("search_status", 'int');

-	if ($search_status == '') {

-		$search_status = 1; // always display active customer first

-	}

-

-	$search_rowid   = GETPOST("search_rowid", 'int');

-	$search_name    = GETPOST("search_name", 'alpha');

-	$search_address = GETPOST("search_address", 'alpha');

-	$search_poste   = GETPOST("search_poste", 'alpha');

-	$search_note_private = GETPOST('search_note_private', 'alphanohtml');

+    $form = new Form($db);

+

+    $optioncss = GETPOST('optioncss', 'alpha');

+    $sortfield = GETPOST("sortfield", 'alpha');

+    $sortorder = GETPOST("sortorder", 'alpha');

+    $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');

+

+    $search_status = GETPOST("search_status", 'int');

+    if ($search_status == '') $search_status = 1; // always display active customer first

+

+    $search_name    = GETPOST("search_name", 'alpha');

+    $search_address = GETPOST("search_address", 'alpha');

+    $search_poste   = GETPOST("search_poste", 'alpha');

@@ -1017,75 +889,63 @@
-	$search_birthday_dtstart = GETPOST("search_birthday_dtstart", 'alpha');

-	$search_birthday_dtend = GETPOST("search_birthday_dtend", 'alpha');

-

-	if ($search_birthday_dtstart != '' || $search_birthday_dtend != '') {

-		$search_birthday_dtstart = dol_mktime(0, 0, 0, GETPOST('search_birthday_dtstartmonth', 'int'), GETPOST('search_birthday_dtstartday', 'int'), GETPOST('search_birthday_dtstartyear', 'int'));

-		$search_birthday_dtend = dol_mktime(23, 59, 59, GETPOST('search_birthday_dtendmonth', 'int'), GETPOST('search_birthday_dtendday', 'int'), GETPOST('search_birthday_dtendyear', 'int'));

-	}

-	$socialnetworks = getArrayOfSocialNetworks();

-

-	$searchAddressPhoneDBFields = array(

-		//Address

-		't.address',

-		't.zip',

-		't.town',

-

-		//Phone

-		't.phone',

-		't.phone_perso',

-		't.phone_mobile',

-

-		//Fax

-		't.fax',

-

-		//E-mail

-		't.email',

-	);

-	//Social media

-	//    foreach ($socialnetworks as $key => $value) {

-	//        if ($value['active']) {

-	//            $searchAddressPhoneDBFields['t.'.$key] = "t.socialnetworks->'$.".$key."'";

-	//        }

-	//    }

-

-	if (!$sortorder) {

-		$sortorder = "ASC";

-	}

-	if (!$sortfield) {

-		$sortfield = "t.lastname";

-	}

-

-	if (isModEnabled('clicktodial')) {

-		$user->fetch_clicktodial(); // lecture des infos de clicktodial du user

-	}

-

-

-	$contactstatic = new Contact($db);

-

-	$extrafields->fetch_name_optionals_label($contactstatic->table_element);

-

-	$contactstatic->fields = array(

-		'rowid'     =>array('type'=>'integer', 'label'=>"TechnicalID", 'enabled'=>(getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') ? 1 : 0), 'visible'=>(getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') ? 1 : 0), 'position'=>1),

-		'name'      =>array('type'=>'varchar(128)', 'label'=>'Name', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1),

-		'poste'     =>array('type'=>'varchar(128)', 'label'=>'PostOrFunction', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>2, 'index'=>1, 'position'=>20),

-		'address'   =>array('type'=>'varchar(128)', 'label'=>'Address', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>3, 'index'=>1, 'position'=>30),

-		'note_private' =>array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>(!getDolGlobalInt('MAIN_LIST_HIDE_PRIVATE_NOTES')), 'visible'=>3, 'position'=>35),

-		'role'      =>array('type'=>'checkbox', 'label'=>'Role', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>4, 'index'=>1, 'position'=>40),

-		'birthday' 	=>array('type'=>'date', 'label'=>'Birthday', 'enabled'=>1, 'visible'=>-1, 'notnull'=> 0, 'position'=>45),

-		'statut'    =>array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'default'=>0, 'index'=>1, 'position'=>50, 'arrayofkeyval'=>array(0=>$contactstatic->LibStatut(0, 1), 1=>$contactstatic->LibStatut(1, 1))),

-	);

-

-	// Definition of fields for list

-	$arrayfields = array(

-		't.rowid'=>array('label'=>"TechnicalID", 'checked'=>(getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') ? 1 : 0), 'enabled'=>(getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') ? 1 : 0), 'position'=>1),

-		't.name'=>array('label'=>"Name", 'checked'=>1, 'position'=>10),

-		't.poste'=>array('label'=>"PostOrFunction", 'checked'=>1, 'position'=>20),

-		't.address'=>array('label'=>(empty($conf->dol_optimize_smallscreen) ? $langs->trans("Address").' / '.$langs->trans("Phone").' / '.$langs->trans("Email") : $langs->trans("Address")), 'checked'=>1, 'position'=>30),

-		't.note_private' => array('label' => 'NotePrivate', 'checked' => 0, 'position'=>35),

-		'sc.role'=>array('label'=>"ContactByDefaultFor", 'checked'=>1, 'position'=>40),

-		't.birthday'=>array('label'=>"Birthday", 'checked'=>0, 'position'=>45),

-		't.statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>50, 'class'=>'center'),

-	);

-	// Extra fields

-	if (!empty($extrafields->attributes[$contactstatic->table_element]['label']) && is_array($extrafields->attributes[$contactstatic->table_element]['label']) && count($extrafields->attributes[$contactstatic->table_element]['label'])) {

-		foreach ($extrafields->attributes[$contactstatic->table_element]['label'] as $key => $val) {

-			if (!empty($extrafields->attributes[$contactstatic->table_element]['list'][$key])) {

+

+    $socialnetworks = getArrayOfSocialNetworks();

+

+    $searchAddressPhoneDBFields = array(

+        //Address

+        't.address',

+        't.zip',

+        't.town',

+

+        //Phone

+        't.phone',

+        't.phone_perso',

+        't.phone_mobile',

+

+        //Fax

+        't.fax',

+

+        //E-mail

+        't.email',

+    );

+    //Social media

+    foreach ($socialnetworks as $key => $value) {

+        if ($value['active']) {

+            $searchAddressPhoneDBFields['t.'.$key] = "t.socialnetworks->'$.".$key."'";

+        }

+    }

+

+    if (!$sortorder) $sortorder = "ASC";

+    if (!$sortfield) $sortfield = "t.lastname";

+

+    if (!empty($conf->clicktodial->enabled))

+    {

+    	$user->fetch_clicktodial(); // lecture des infos de clicktodial du user

+    }

+

+

+    $contactstatic = new Contact($db);

+

+    $extrafields->fetch_name_optionals_label($contactstatic->table_element);

+

+    $contactstatic->fields = array(

+        'name'      =>array('type'=>'varchar(128)', 'label'=>'Name', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1),

+        'poste'     =>array('type'=>'varchar(128)', 'label'=>'PostOrFunction', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>20),

+        'address'   =>array('type'=>'varchar(128)', 'label'=>'Address', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>30),

+        'role'      =>array('type'=>'checkbox', 'label'=>'Role', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>40),

+        'statut'    =>array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'default'=>0, 'index'=>1, 'position'=>50, 'arrayofkeyval'=>array(0=>$contactstatic->LibStatut(0, 1), 1=>$contactstatic->LibStatut(1, 1))),

+    );

+

+    // Definition of fields for list

+    $arrayfields = array(

+	    't.rowid'=>array('label'=>"TechnicalID", 'checked'=>($conf->global->MAIN_SHOW_TECHNICAL_ID ? 1 : 0), 'enabled'=>($conf->global->MAIN_SHOW_TECHNICAL_ID ? 1 : 0), 'position'=>1),

+	    't.name'=>array('label'=>"Name", 'checked'=>1, 'position'=>10),

+	    't.poste'=>array('label'=>"PostOrFunction", 'checked'=>1, 'position'=>20),

+	    't.address'=>array('label'=>(empty($conf->dol_optimize_smallscreen) ? $langs->trans("Address").' / '.$langs->trans("Phone").' / '.$langs->trans("Email") : $langs->trans("Address")), 'checked'=>1, 'position'=>30),

+	    'sc.role'=>array('label'=>"ContactByDefaultFor", 'checked'=>1, 'position'=>40),

+	    't.statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>50, 'class'=>'center'),

+    );

+    // Extra fields

+    if (is_array($extrafields->attributes[$contactstatic->table_element]['label']) && count($extrafields->attributes[$contactstatic->table_element]['label']))

+    {

+    	foreach ($extrafields->attributes[$contactstatic->table_element]['label'] as $key => $val)

+    	{

+    		if (!empty($extrafields->attributes[$contactstatic->table_element]['list'][$key])) {

@@ -1094 +954 @@
-					'checked'=>((dol_eval($extrafields->attributes[$contactstatic->table_element]['list'][$key], 1, 1, '1') < 0) ? 0 : 1),

+					'checked'=>(($extrafields->attributes[$contactstatic->table_element]['list'][$key] < 0) ? 0 : 1),

@@ -1096,2 +956 @@
-					'enabled' => (abs((int) dol_eval($extrafields->attributes[$contactstatic->table_element]['list'][$key], 1)) != 3 && dol_eval($extrafields->attributes[$contactstatic->table_element]['perms'][$key], 1, 1, '1'))

-				);

+					'enabled'=>(abs($extrafields->attributes[$contactstatic->table_element]['list'][$key]) != 3 && $extrafields->attributes[$contactstatic->table_element]['perms'][$key]));

@@ -1099,60 +958,57 @@
-		}

-	}

-

-	// Initialize array of search criterias

-	$search = array();

-	foreach ($arrayfields as $key => $val) {

-		$queryName = 'search_'.substr($key, 2);

-		if (GETPOST($queryName, 'alpha')) {

-			$search[substr($key, 2)] = GETPOST($queryName, 'alpha');

-		}

-	}

-	$search_array_options = $extrafields->getOptionalsFromPost($contactstatic->table_element, '', 'search_');

-

-	// Purge search criteria

-	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers

-		$search_rowid = '';

-		$search_status = '';

-		$search_name = '';

-		$search_roles = array();

-		$search_address = '';

-		$search_poste = '';

-		$search_note_private = '';

-		$search_birthday_dtstart = '';

-		$search_birthday_dtend = '';

-		$search = array();

-		$search_array_options = array();

-

-		foreach ($contactstatic->fields as $key => $val) {

-			$search[$key] = '';

-		}

-	}

-

-	$contactstatic->fields = dol_sort_array($contactstatic->fields, 'position');

-	$arrayfields = dol_sort_array($arrayfields, 'position');

-

-	$newcardbutton = '';

-	if ($user->hasRight('societe', 'contact', 'creer')) {

-		$addcontact = (getDolGlobalString('SOCIETE_ADDRESSES_MANAGEMENT') ? $langs->trans("AddContact") : $langs->trans("AddContactAddress"));

-		$newcardbutton .= dolGetButtonTitle($addcontact, '', 'fa fa-plus-circle', DOL_URL_ROOT.'/contact/card.php?socid='.$object->id.'&amp;action=create&amp;backtopage='.urlencode($backtopage));

-	}

-

-	print "\n";

-

-	$title = (getDolGlobalString('SOCIETE_ADDRESSES_MANAGEMENT') ? $langs->trans("ContactsForCompany") : $langs->trans("ContactsAddressesForCompany"));

-	print load_fiche_titre($title, $newcardbutton, '');

-

-	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';

-	print '<input type="hidden" name="token" value="'.newToken().'">';

-	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';

-	print '<input type="hidden" name="socid" value="'.$object->id.'">';

-	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';

-	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';

-	print '<input type="hidden" name="page" value="'.$page.'">';

-

-	$arrayofmassactions = array();

-	$mode = 'view';

-

-	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;

-	$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields

-	$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');

+    	}

+    }

+

+    // Initialize array of search criterias

+    $search = array();

+    foreach ($arrayfields as $key => $val)

+    {

+        $queryName = 'search_'.substr($key, 2);

+    	if (GETPOST($queryName, 'alpha')) {

+            $search[substr($key, 2)] = GETPOST($queryName, 'alpha');

+        }

+    }

+    $search_array_options = $extrafields->getOptionalsFromPost($contactstatic->table_element, '', 'search_');

+

+    // Purge search criteria

+    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers

+    {

+    	$search_status = '';

+    	$search_name         = '';

+    	$search_roles        = array();

+        $search_address = '';

+        $search_poste = '';

+        $search = array();

+    	$search_array_options = array();

+

+    	foreach ($contactstatic->fields as $key => $val)

+   		{

+   			$search[$key] = '';

+   		}

+    }

+

+    $contactstatic->fields = dol_sort_array($contactstatic->fields, 'position');

+    $arrayfields = dol_sort_array($arrayfields, 'position');

+

+    $newcardbutton = '';

+    if ($user->rights->societe->contact->creer)

+    {

+    	$addcontact = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("AddContact") : $langs->trans("AddContactAddress"));

+        $newcardbutton .= dolGetButtonTitle($addcontact, '', 'fa fa-plus-circle', DOL_URL_ROOT.'/contact/card.php?socid='.$object->id.'&amp;action=create&amp;backtopage='.urlencode($backtopage));

+    }

+

+    print "\n";

+

+    $title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ContactsForCompany") : $langs->trans("ContactsAddressesForCompany"));

+    print load_fiche_titre($title, $newcardbutton, '');

+

+    print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';

+    print '<input type="hidden" name="token" value="'.newToken().'">';

+    print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';

+    print '<input type="hidden" name="socid" value="'.$object->id.'">';

+    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';

+    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';

+    print '<input type="hidden" name="page" value="'.$page.'">';

+

+    $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;

+    $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields

+    //if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);

@@ -1161,8 +1017,24 @@
-	print "\n".'<table class="tagtable liste">'."\n";

-

-	$param = "socid=".urlencode($object->id);

-	if ($search_rowid != '') {

-		$param .= '&search_rowid='.urlencode($search_rowid);

-	}

-	if ($search_status != '') {

-		$param .= '&search_status='.urlencode($search_status);

+    print "\n".'<table class="tagtable liste">'."\n";

+

+    $param = "socid=".urlencode($object->id);

+    if ($search_status != '') $param .= '&search_status='.urlencode($search_status);

+    if (count($search_roles) > 0) $param .= implode('&search_roles[]=', $search_roles);

+    if ($search_name != '')   $param .= '&search_name='.urlencode($search_name);

+    if ($search_poste != '')     $param .= '&search_poste='.urlencode($search_poste);

+    if ($search_address != '')     $param .= '&search_address='.urlencode($search_address);

+    if ($optioncss != '')     $param .= '&optioncss='.urlencode($optioncss);

+

+    // Add $param from extra fields

+    $extrafieldsobjectkey = $contactstatic->table_element;

+    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';

+

+    $sql = "SELECT t.rowid, t.lastname, t.firstname, t.fk_pays as country_id, t.civility, t.poste, t.phone as phone_pro, t.phone_mobile, t.phone_perso, t.fax, t.email, t.socialnetworks, t.statut, t.photo,";

+    $sql .= " t.civility as civility_id, t.address, t.zip, t.town";

+    $sql .= " FROM ".MAIN_DB_PREFIX."socpeople as t";

+    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople_extrafields as ef on (t.rowid = ef.fk_object)";

+    $sql .= " WHERE t.fk_soc = ".$object->id;

+    if ($search_status != '' && $search_status != '-1') $sql .= " AND t.statut = ".$db->escape($search_status);

+    if ($search_name)    $sql .= natural_search(array('t.lastname', 't.firstname'), $search_name);

+    if ($search_poste)   $sql .= natural_search('t.poste', $search_poste);

+    if ($search_address) {

+		$sql .= natural_search($searchAddressPhoneDBFields, $search_address);

@@ -1171 +1043 @@
-		$param .= implode('&search_roles[]=', $search_roles);

+		$sql .= " AND t.rowid IN (SELECT sc.fk_socpeople FROM ".MAIN_DB_PREFIX."societe_contacts as sc WHERE sc.fk_c_type_contact IN (".implode(',', $search_roles)."))";

@@ -1173,177 +1045,68 @@
-	if ($search_name != '') {

-		$param .= '&search_name='.urlencode($search_name);

-	}

-	if ($search_poste != '') {

-		$param .= '&search_poste='.urlencode($search_poste);

-	}

-	if ($search_address != '') {

-		$param .= '&search_address='.urlencode($search_address);

-	}

-	if ($search_note_private != '') {

-		$param .= '&search_note_private='.urlencode($search_note_private);

-	}

-	if ($search_birthday_dtstart != '') {

-		$param .= '&search_birthday_dtstart='.urlencode($search_birthday_dtstart);

-	}

-	if ($search_birthday_dtend != '') {

-		$param .= '&search_birthday_dtend='.urlencode($search_birthday_dtend);

-	}

-	if ($optioncss != '') {

-		$param .= '&optioncss='.urlencode($optioncss);

-	}

-

-	// Add $param from extra fields

-	$extrafieldsobjectkey = $contactstatic->table_element;

-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';

-

-	$sql = "SELECT t.rowid, t.entity, t.lastname, t.firstname, t.fk_pays as country_id, t.civility, t.poste,";

-	$sql .= " t.phone as phone_pro, t.phone_mobile, t.phone_perso, t.fax, t.email, t.socialnetworks, t.statut, t.photo, t.fk_soc,";

-	$sql .= " t.civility as civility_id, t.address, t.zip, t.town, t.birthday,";

-	$sql .= " t.note_private";

-	$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as t";

-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople_extrafields as ef on (t.rowid = ef.fk_object)";

-	$sql .= " WHERE t.fk_soc = ".((int) $object->id);

-	$sql .= " AND t.entity IN (" .getEntity('socpeople') .")";

-	$sql .= " AND ((t.fk_user_creat = ".((int) $user->id)." AND t.priv = 1) OR t.priv = 0)";

-	if ($search_rowid) {

-		$sql .= natural_search('t.rowid', $search_rowid);

-	}

-	if ($search_status != '' && $search_status != '-1') {

-		$sql .= " AND t.statut = ".((int) $search_status);

-	}

-	if ($search_name) {

-		$sql .= natural_search(array('t.lastname', 't.firstname'), $search_name);

-	}

-	if ($search_poste) {

-		$sql .= natural_search('t.poste', $search_poste);

-	}

-	if ($search_address) {

-		$sql .= natural_search($searchAddressPhoneDBFields, $search_address);

-	}

-	if ($search_note_private) {

-		$sql .= natural_search('t.note_private', $search_note_private);

-	}

-	if ($search_birthday_dtstart != '') {

-		$sql .= " AND t.birthday >= '".$db->idate($search_birthday_dtstart)."'";

-	}

-	if ($search_birthday_dtend != '') {

-		$sql .= " AND t.birthday <= '".$db->idate($search_birthday_dtend)."'";

-	}

-	if (count($search_roles) > 0) {

-		$sql .= " AND t.rowid IN (SELECT sc.fk_socpeople FROM ".MAIN_DB_PREFIX."societe_contacts as sc WHERE sc.fk_c_type_contact IN (".$db->sanitize(implode(',', $search_roles))."))";

-	}

-	// Add where from extra fields

-	$extrafieldsobjectkey = $contactstatic->table_element;

-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';

-	// Add where from hooks

-	$parameters = array('socid' => $object->id);

-	$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook

-	$sql .= $hookmanager->resPrint;

-	if ($sortfield == "t.name") {

-		$sql .= " ORDER BY t.lastname $sortorder, t.firstname $sortorder";

-	} else {

-		$sql .= " ORDER BY $sortfield $sortorder";

-	}

-

-	dol_syslog('core/lib/company.lib.php :: show_contacts', LOG_DEBUG);

-	$result = $db->query($sql);

-	if (!$result) {

-		dol_print_error($db);

-	}

-

-	$num = $db->num_rows($result);

-

-	// Fields title search

-	// --------------------------------------------------------------------

-	print '<tr class="liste_titre">';

-	// Action column

-	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {

-		print '<td class="liste_titre" align="right">';

-		print $form->showFilterButtons();

-		print '</td>';

-	}

-	foreach ($contactstatic->fields as $key => $val) {

-		$align = '';

-		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {

-			$align .= ($align ? ' ' : '').'center';

-		}

-		if (in_array($val['type'], array('timestamp'))) {

-			$align .= ($align ? ' ' : '').'nowrap';

-		}

-		if ($key == 'status' || $key == 'statut') {

-			$align .= ($align ? ' ' : '').'center';

-		}

-		if (!empty($arrayfields['t.'.$key]['checked']) || !empty($arrayfields['sc.'.$key]['checked'])) {

-			print '<td class="liste_titre'.($align ? ' '.$align : '').'">';

-			if (in_array($key, array('statut'))) {

-				print $form->selectarray('search_status', array('-1'=>'', '0'=>$contactstatic->LibStatut(0, 1), '1'=>$contactstatic->LibStatut(1, 1)), $search_status, 0, 0, 0, '', 0, 0, 0, '', 'onrightofpage');

-			} elseif (in_array($key, array('role'))) {

-				print $formcompany->showRoles("search_roles", $contactstatic, 'edit', $search_roles, 'minwidth200 maxwidth300');

-			} elseif (in_array($key, array('birthday'))) {

-				print '<div class="nowrap">';

-				print $form->selectDate($search_birthday_dtstart ? $search_birthday_dtstart : '', "search_birthday_dtstart", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));

-				print '</div>';

-				print '<div class="nowrap">';

-				print $form->selectDate($search_birthday_dtend ? $search_birthday_dtend : '', "search_birthday_dtend", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));

-				print '</div>';

-			} else {

-				print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.(!empty($search[$key]) ? dol_escape_htmltag($search[$key]) : '').'">';

-			}

-			print '</td>';

-		}

-	}

-	if ($showuserlogin) {

-		print '<td class="liste_titre"></td>';

-	}

-	// Extra fields

-	$extrafieldsobjectkey = $contactstatic->table_element;

-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';

-

-	// Fields from hook

-	$parameters = array('arrayfields'=>$arrayfields);

-	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $contactstatic); // Note that $action and $object may have been modified by hook

-	print $hookmanager->resPrint;

-	// Action column

-	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {

-		print '<td class="liste_titre" align="right">';

-		print $form->showFilterButtons();

-		print '</td>';

-	}

-	print '</tr>'."\n";

-

-

-	// Fields title label

-	// --------------------------------------------------------------------

-	print '<tr class="liste_titre">';

-	// Action column

-	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {

-		print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'maxwidthsearch center ')."\n";

-	}

-	foreach ($contactstatic->fields as $key => $val) {

-		$align = '';

-		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {

-			$align .= ($align ? ' ' : '').'center';

-		}

-		if (in_array($val['type'], array('timestamp'))) {

-			$align .= ($align ? ' ' : '').'nowrap';

-		}

-		if ($key == 'status' || $key == 'statut') {

-			$align .= ($align ? ' ' : '').'center';

-		}

-		if (!empty($arrayfields['t.'.$key]['checked'])) {

-			print getTitleFieldOfList($val['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align ? 'class="'.$align.'"' : ''), $sortfield, $sortorder, $align.' ')."\n";

-		}

-		if ($key == 'role') {

-			$align .= ($align ? ' ' : '').'left';

-		}

-		if (!empty($arrayfields['sc.'.$key]['checked'])) {

-			print getTitleFieldOfList($arrayfields['sc.'.$key]['label'], 0, $_SERVER['PHP_SELF'], '', '', $param, ($align ? 'class="'.$align.'"' : ''), $sortfield, $sortorder, $align.' ')."\n";

-		}

-	}

-	if ($showuserlogin) {

-		print '<th class="wrapcolumntitle liste_titre">'.$langs->trans("DolibarrLogin").'</th>';

-	}

-	// Extra fields

-	$extrafieldsobjectkey = $contactstatic->table_element;

-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';

-	// Hook fields

+    // Add where from extra fields

+    $extrafieldsobjectkey = $contactstatic->table_element;

+    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';

+    if ($sortfield == "t.name") $sql .= " ORDER BY t.lastname $sortorder, t.firstname $sortorder";

+    else $sql .= " ORDER BY $sortfield $sortorder";

+

+    dol_syslog('core/lib/company.lib.php :: show_contacts', LOG_DEBUG);

+    $result = $db->query($sql);

+    if (!$result) dol_print_error($db);

+

+    $num = $db->num_rows($result);

+

+    // Fields title search

+    // --------------------------------------------------------------------

+    print '<tr class="liste_titre">';

+    foreach ($contactstatic->fields as $key => $val)

+    {

+    	$align = '';

+    	if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $align .= ($align ? ' ' : '').'center';

+    	if (in_array($val['type'], array('timestamp'))) $align .= ($align ? ' ' : '').'nowrap';

+    	if ($key == 'status' || $key == 'statut') $align .= ($align ? ' ' : '').'center';

+    	if (!empty($arrayfields['t.'.$key]['checked']) || !empty($arrayfields['sc.'.$key]['checked']))

+    	{

+    		print '<td class="liste_titre'.($align ? ' '.$align : '').'">';

+    		if (in_array($key, array('statut'))) {

+                print $form->selectarray('search_status', array('-1'=>'', '0'=>$contactstatic->LibStatut(0, 1), '1'=>$contactstatic->LibStatut(1, 1)), $search_status);

+            } elseif (in_array($key, array('role'))) {

+			    print $formcompany->showRoles("search_roles", $contactstatic, 'edit', $search_roles);

+		    } else {

+                print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';

+            }

+    		print '</td>';

+    	}

+    }

+    // Extra fields

+    $extrafieldsobjectkey = $contactstatic->table_element;

+    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';

+

+    // Fields from hook

+    $parameters = array('arrayfields'=>$arrayfields);

+    $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $contactstatic); // Note that $action and $object may have been modified by hook

+    print $hookmanager->resPrint;

+    // Action column

+    print '<td class="liste_titre" align="right">';

+    print $form->showFilterButtons();

+    print '</td>';

+    print '</tr>'."\n";

+

+

+    // Fields title label

+    // --------------------------------------------------------------------

+    print '<tr class="liste_titre">';

+    foreach ($contactstatic->fields as $key => $val)

+    {

+    	$align = '';

+    	if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $align .= ($align ? ' ' : '').'center';

+    	if (in_array($val['type'], array('timestamp'))) $align .= ($align ? ' ' : '').'nowrap';

+    	if ($key == 'status' || $key == 'statut') $align .= ($align ? ' ' : '').'center';

+    	if (!empty($arrayfields['t.'.$key]['checked'])) print getTitleFieldOfList($val['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align ? 'class="'.$align.'"' : ''), $sortfield, $sortorder, $align.' ')."\n";

+    	if ($key == 'role') $align .= ($align ? ' ' : '').'left';

+    	if (!empty($arrayfields['sc.'.$key]['checked'])) {

+    		print getTitleFieldOfList($arrayfields['sc.'.$key]['label'], 0, $_SERVER['PHP_SELF'], '', '', $param, ($align ? 'class="'.$align.'"' : ''), $sortfield, $sortorder, $align.' ')."\n";

+	    }

+    }

+    // Extra fields

+    $extrafieldsobjectkey = $contactstatic->table_element;

+    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';

+    // Hook fields

@@ -1351,82 +1114,62 @@
-	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook

-	print $hookmanager->resPrint;

-	// Action column

-	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {

-		print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'maxwidthsearch center ')."\n";

-	}

-	print '</tr>'."\n";

-

-	$i = -1;

-

-	if ($num || (GETPOST('button_search') || GETPOST('button_search.x') || GETPOST('button_search_x'))) {

-		$i = 0;

-

-		while ($i < $num) {

-			$obj = $db->fetch_object($result);

-

-			$contactstatic->id = $obj->rowid;

-			$contactstatic->ref = $obj->rowid;

-			$contactstatic->statut = $obj->statut;

-			$contactstatic->lastname = $obj->lastname;

-			$contactstatic->firstname = $obj->firstname;

-			$contactstatic->civility_id = $obj->civility_id;

-			$contactstatic->civility_code = $obj->civility_id;

-			$contactstatic->poste = $obj->poste;

-			$contactstatic->address = $obj->address;

-			$contactstatic->zip = $obj->zip;

-			$contactstatic->town = $obj->town;

-			$contactstatic->phone_pro = $obj->phone_pro;

-			$contactstatic->phone_mobile = $obj->phone_mobile;

-			$contactstatic->phone_perso = $obj->phone_perso;

-			$contactstatic->email = $obj->email;

-			$contactstatic->socialnetworks = $obj->socialnetworks;

-			$contactstatic->photo = $obj->photo;

-			$contactstatic->fk_soc = $obj->fk_soc;

-			$contactstatic->entity = $obj->entity;

-

-			$country_code = getCountry($obj->country_id, 2);

-			$contactstatic->country_code = $country_code;

-

-			$contactstatic->setGenderFromCivility();

-			$contactstatic->fetch_optionals();

-

-			$resultRole = $contactstatic->fetchRoles();

-			if ($resultRole < 0) {

-				setEventMessages(null, $contactstatic->errors, 'errors');

-			}

-

-			if (is_array($contactstatic->array_options)) {

-				foreach ($contactstatic->array_options as $key => $val) {

-					$obj->$key = $val;

-				}

-			}

-

-			print '<tr class="oddeven">';

-

-			// Actions

-			if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {

-				print '<td class="nowrap center">';

-

-				// Add to agenda

-				if (isModEnabled('agenda')&& $user->hasRight('agenda', 'myactions', 'create')) {

-					print '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&actioncode=&contactid='.$obj->rowid.'&socid='.$object->id.'&backtopage='.urlencode($backtopage).'">';

-					print img_object($langs->trans("Event"), "action");

-					print '</a> &nbsp; ';

-				}

-

-				// Edit

-				if ($user->hasRight('societe', 'contact', 'creer')) {

-					print '<a class="editfielda paddingleft" href="'.DOL_URL_ROOT.'/contact/card.php?action=edit&token='.newToken().'&id='.$obj->rowid.'&backtopage='.urlencode($backtopage).'">';

-					print img_edit();

-					print '</a>';

-				}

-

-				print '</td>';

-			}

-

-			// ID

-			if (!empty($arrayfields['t.rowid']['checked'])) {

-				print '<td>';

-				print $contactstatic->id;

-				print '</td>';

-			}

+    $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook

+    print $hookmanager->resPrint;

+    print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ')."\n";

+    print '</tr>'."\n";

+

+    $i = -1;

+

+	if ($num || (GETPOST('button_search') || GETPOST('button_search.x') || GETPOST('button_search_x')))

+    {

+    	$i = 0;

+

+        while ($i < $num)

+        {

+            $obj = $db->fetch_object($result);

+

+            $contactstatic->id = $obj->rowid;

+            $contactstatic->ref = $obj->ref;

+            $contactstatic->statut = $obj->statut;

+            $contactstatic->lastname = $obj->lastname;

+            $contactstatic->firstname = $obj->firstname;

+            $contactstatic->civility_id = $obj->civility_id;

+            $contactstatic->civility_code = $obj->civility_id;

+            $contactstatic->poste = $obj->poste;

+            $contactstatic->address = $obj->address;

+            $contactstatic->zip = $obj->zip;

+            $contactstatic->town = $obj->town;

+            $contactstatic->phone_pro = $obj->phone_pro;

+            $contactstatic->phone_mobile = $obj->phone_mobile;

+            $contactstatic->phone_perso = $obj->phone_perso;

+            $contactstatic->email = $obj->email;

+            $contactstatic->web = $obj->web;

+            $contactstatic->socialnetworks = $obj->socialnetworks;

+            $contactstatic->photo = $obj->photo;

+

+            $country_code = getCountry($obj->country_id, 2);

+            $contactstatic->country_code = $country_code;

+

+            $contactstatic->setGenderFromCivility();

+            $contactstatic->fetch_optionals();

+

+	        $resultRole = $contactstatic->fetchRoles();

+	        if ($resultRole < 0) {

+	        	setEventMessages(null, $contactstatic->errors, 'errors');

+	        }

+

+            if (is_array($contactstatic->array_options))

+            {

+	            foreach ($contactstatic->array_options as $key => $val)

+	            {

+	            	$obj->$key = $val;

+	            }

+            }

+

+            print '<tr class="oddeven">';

+

+            // ID

+            if (!empty($arrayfields['t.rowid']['checked']))

+            {

+            	print '<td>';

+            	print $contactstatic->id;

+            	print '</td>';

+            }

@@ -1435,3 +1178,4 @@
-			if (!empty($arrayfields['t.name']['checked'])) {

-				print '<td class="tdoverflowmax150">';

-				print $form->showphoto('contact', $contactstatic, 0, 0, 0, 'photorefnoborder valignmiddle marginrightonly', 'small', 1, 0, 1);

+            if (!empty($arrayfields['t.name']['checked']))

+            {

+            	print '<td>';

+            	print $form->showphoto('contact', $contactstatic, 0, 0, 0, 'photorefnoborder valignmiddle marginrightonly', 'small', 1, 0, 1);

@@ -1440 +1184 @@
-			}

+            }

@@ -1443,102 +1187,65 @@
-			if (!empty($arrayfields['t.poste']['checked'])) {

-				print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($obj->poste).'">';

-				if ($obj->poste) {

-					print dol_escape_htmltag($obj->poste);

-				}

-				print '</td>';

-			}

-

-			// Address - Phone - Email

-			if (!empty($arrayfields['t.address']['checked'])) {

-				$addresstoshow = $contactstatic->getBannerAddress('contact', $object);

-				print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag(dol_string_nohtmltag($addresstoshow)).'">';

-				print $addresstoshow;

-				print '</td>';

-			}

-

-			// Note private

-			if (!empty($arrayfields['t.note_private']['checked'])) {

-				print '<td>';

-				if ($obj->note_private) {

-					print dol_string_nohtmltag($obj->note_private);

-				}

-				print '</td>';

-			}

-

-			// Role

-			if (!empty($arrayfields['sc.role']['checked'])) {

-				print '<td class="tdoverflowmax150">';

-				print $formcompany->showRoles("roles", $contactstatic, 'view');

-				print '</td>';

-			}

-

-			// Birthday

-			if (!empty($arrayfields['t.birthday']['checked'])) {

-				print '<td class="nowraponall">';

-				print dol_print_date($db->jdate($obj->birthday));

-				print '</td>';

-			}

-

-			// Status

-			if (!empty($arrayfields['t.statut']['checked'])) {

-				print '<td class="center">'.$contactstatic->getLibStatut(5).'</td>';

-			}

-

-			if ($showuserlogin) {

-				print '<td class="tdoverflowmax125">';

-				$tmpuser= new User($db);

-				$resfetch = $tmpuser->fetch(0, '', '', 0, -1, '', $contactstatic->id);

-				if ($resfetch > 0) {

-					print $tmpuser->getNomUrl(1, '', 0, 0, 24, 1);

-				}

-				print '</td>';

-			}

-

-			// Extra fields

-			$extrafieldsobjectkey = $contactstatic->table_element;

-			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';

-

-			// Actions

-			if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {

-				print '<td class="nowrap center">';

-

-				// Add to agenda

-				if (isModEnabled('agenda')&& $user->hasRight('agenda', 'myactions', 'create')) {

-					print '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&actioncode=&contactid='.$obj->rowid.'&socid='.$object->id.'&backtopage='.urlencode($backtopage).'">';

-					print img_object($langs->trans("Event"), "action");

-					print '</a> &nbsp; ';

-				}

-

-				// Edit

-				if ($user->hasRight('societe', 'contact', 'creer')) {

-					print '<a class="editfielda paddingleft" href="'.DOL_URL_ROOT.'/contact/card.php?action=edit&token='.newToken().'&id='.$obj->rowid.'&backtopage='.urlencode($backtopage).'">';

-					print img_edit();

-					print '</a>';

-				}

-

-				print '</td>';

-			}

-

-			print "</tr>\n";

-			$i++;

-		}

-

-		if ($num == 0) {

-			$colspan = 1 + ($showuserlogin ? 1 : 0);

-			foreach ($arrayfields as $key => $val) {

-				if (!empty($val['checked'])) {

-					$colspan++;

-				}

-			}

-			print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';

-		}

-	} else {

-		$colspan = 1 + ($showuserlogin ? 1 : 0);

-		foreach ($arrayfields as $key => $val) {

-			if (!empty($val['checked'])) {

-				$colspan++;

-			}

-		}

-		print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';

-	}

-	print "\n</table>\n";

+            if (!empty($arrayfields['t.poste']['checked']))

+            {

+            	print '<td>';

+            	if ($obj->poste) print $obj->poste;

+            	print '</td>';

+            }

+

+            // Address - Phone - Email

+            if (!empty($arrayfields['t.address']['checked']))

+            {

+            	print '<td>';

+	            print $contactstatic->getBannerAddress('contact', $object);

+    	        print '</td>';

+            }

+

+            // Role

+            if (!empty($arrayfields['sc.role']['checked']))

+            {

+            	print '<td>';

+	            print $formcompany->showRoles("roles", $contactstatic, 'view');

+    	        print '</td>';

+            }

+

+            // Status

+            if (!empty($arrayfields['t.statut']['checked']))

+            {

+            	print '<td class="center">'.$contactstatic->getLibStatut(5).'</td>';

+            }

+

+            // Extra fields

+            $extrafieldsobjectkey = $contactstatic->table_element;

+            include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';

+

+            // Actions

+			print '<td align="right">';

+

+			// Add to agenda

+            if (!empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)

+            {

+                print '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&actioncode=&contactid='.$obj->rowid.'&socid='.$object->id.'&backtopage='.urlencode($backtopage).'">';

+                print img_object($langs->trans("Event"), "action");

+                print '</a> &nbsp; ';

+            }

+

+            // Edit

+            if ($user->rights->societe->contact->creer)

+            {

+                print '<a class="editfielda paddingleft" href="'.DOL_URL_ROOT.'/contact/card.php?action=edit&id='.$obj->rowid.'&backtopage='.urlencode($backtopage).'">';

+                print img_edit();

+                print '</a>';

+            }

+

+            print '</td>';

+

+            print "</tr>\n";

+            $i++;

+        }

+    }

+    else

+	{

+		$colspan = 1;

+		foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }

+		print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';

+    }

+    print "\n</table>\n";

@@ -1547,3 +1254,3 @@
-	print '</form>'."\n";

-

-	return $i;

+    print '</form>'."\n";

+

+    return $i;

@@ -1567,9 +1274,6 @@
-	global $user, $conf;

-

-	$out = show_actions_done($conf, $langs, $db, $filterobj, $objcon, 1, $actioncode, 'todo');

-

-	if ($noprint) {

-		return $out;

-	} else {

-		print $out;

-	}

+    global $user, $conf;

+

+    $out = show_actions_done($conf, $langs, $db, $filterobj, $objcon, 1, $actioncode, 'todo');

+

+    if ($noprint) return $out;

+    else print $out;

@@ -1585 +1289 @@
- * 		@param	mixed			   $filterobj	   Filter on object Adherent|Societe|Project|Product|CommandeFournisseur|Dolresource|Ticket... to list events linked to an object

+ * 		@param	mixed			   $filterobj	   Filter on object Adherent|Societe|Project|Product|CommandeFournisseur|Dolresource|Ticket|... to list events linked to an object

@@ -1588 +1292 @@
- *      @param  string|string[]    $actioncode     Filter on actioncode

+ *      @param  string		       $actioncode     Filter on actioncode

@@ -1593 +1296,0 @@
- *      @param	string			   $module		   You can add module name here if elementtype in table llx_actioncomm is objectkey@module

@@ -1596 +1299 @@
-function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprint = 0, $actioncode = '', $donetodo = 'done', $filters = array(), $sortfield = 'a.datep,a.id', $sortorder = 'DESC', $module = '')

+function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprint = 0, $actioncode = '', $donetodo = 'done', $filters = array(), $sortfield = 'a.datep,a.id', $sortorder = 'DESC')

@@ -1598,55 +1301,326 @@
-	global $user, $conf, $hookmanager;

-	global $form;

-	global $param, $massactionbutton;

-

-	$start_year = GETPOST('dateevent_startyear', 'int');

-	$start_month = GETPOST('dateevent_startmonth', 'int');

-	$start_day = GETPOST('dateevent_startday', 'int');

-	$end_year = GETPOST('dateevent_endyear', 'int');

-	$end_month = GETPOST('dateevent_endmonth', 'int');

-	$end_day = GETPOST('dateevent_endday', 'int');

-	$tms_start = '';

-	$tms_end = '';

-

-	if (!empty($start_year) && !empty($start_month) && !empty($start_day)) {

-		$tms_start = dol_mktime(0, 0, 0, $start_month, $start_day, $start_year, 'tzuserrel');

-	}

-	if (!empty($end_year) && !empty($end_month) && !empty($end_day)) {

-		$tms_end = dol_mktime(23, 59, 59, $end_month, $end_day, $end_year, 'tzuserrel');

-	}

-	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All test are required to be compatible with all browsers

-		$tms_start = '';

-		$tms_end = '';

-	}

-	dol_include_once('/comm/action/class/actioncomm.class.php');

-

-	// Check parameters

-	if (!is_object($filterobj) && !is_object($objcon)) {

-		dol_print_error('', 'BadParameter');

-	}

-

-	$out = '';

-	$histo = array();

-	$numaction = 0;

-	$now = dol_now('tzuser');

-

-	// Open DSI -- Fix order by -- Begin

-	$sortfield_list = explode(',', $sortfield);

-	$sortfield_label_list = array('a.id' => 'id', 'a.datep' => 'dp', 'a.percent' => 'percent');

-	$sortfield_new_list = array();

-	foreach ($sortfield_list as $sortfield_value) {

-		$sortfield_new_list[] = $sortfield_label_list[trim($sortfield_value)];

-	}

-	$sortfield_new = implode(',', $sortfield_new_list);

-

-	$sql = '';

-

-	if (isModEnabled('agenda')) {

-		// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context

-		$hookmanager->initHooks(array('agendadao'));

-

-		// Recherche histo sur actioncomm

-		if (is_object($objcon) && $objcon->id > 0) {

-			$sql = "SELECT DISTINCT a.id, a.label as label,";

-		} else {

-			$sql = "SELECT a.id, a.label as label,";

+    global $user, $conf;

+    global $form;

+

+    global $param, $massactionbutton;

+

+    dol_include_once('/comm/action/class/actioncomm.class.php');

+

+    // Check parameters

+    if (!is_object($filterobj) && !is_object($objcon)) dol_print_error('', 'BadParameter');

+

+    $out = '';

+    $histo = array();

+    $numaction = 0;

+    $now = dol_now('tzuser');

+

+    // Open DSI -- Fix order by -- Begin

+    $sortfield_list = explode(',', $sortfield);

+    $sortfield_label_list = array('a.id' => 'id', 'a.datep' => 'dp', 'a.percent' => 'percent');

+    $sortfield_new_list = array();

+    foreach ($sortfield_list as $sortfield_value) {

+        $sortfield_new_list[] = $sortfield_label_list[trim($sortfield_value)];

+    }

+    $sortfield_new = implode(',', $sortfield_new_list);

+

+    $sql = '';

+

+    if (!empty($conf->agenda->enabled))

+    {

+        // Recherche histo sur actioncomm

+        if (is_object($objcon) && $objcon->id > 0) {

+            $sql = "SELECT DISTINCT a.id, a.label as label,";

+        }

+        else

+        {

+            $sql = "SELECT a.id, a.label as label,";

+        }

+        $sql .= " a.datep as dp,";

+        $sql .= " a.datep2 as dp2,";

+        $sql .= " a.percent as percent, 'action' as type,";

+        $sql .= " a.fk_element, a.elementtype,";

+        $sql .= " a.fk_contact,";

+        $sql .= " c.code as acode, c.libelle as alabel, c.picto as apicto,";

+        $sql .= " u.rowid as user_id, u.login as user_login, u.photo as user_photo, u.firstname as user_firstname, u.lastname as user_lastname";

+        if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur')))      $sql .= ", sp.lastname, sp.firstname";

+        elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') { /* Nothing */ }

+        elseif (is_object($filterobj) && get_class($filterobj) == 'Project') { /* Nothing */ }

+        elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql .= ", m.lastname, m.firstname";

+        elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur')  $sql .= ", o.ref";

+        elseif (is_object($filterobj) && get_class($filterobj) == 'Product')  $sql .= ", o.ref";

+        elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket')   $sql .= ", o.ref";

+        elseif (is_object($filterobj) && get_class($filterobj) == 'BOM')      $sql .= ", o.ref";

+        elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat')  $sql .= ", o.ref";

+        elseif (is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid']) && is_array($filterobj->fields['ref']) && $filterobj->table_element && $filterobj->element) $sql .= ", o.ref";

+

+        $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a";

+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on u.rowid = a.fk_user_action";

+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_actioncomm as c ON a.fk_action = c.id";

+

+        $force_filter_contact = false;

+        if (is_object($objcon) && $objcon->id > 0) {

+            $force_filter_contact = true;

+            $sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm_resources as r ON a.id = r.fk_actioncomm";

+            $sql .= " AND r.element_type = '".$db->escape($objcon->table_element)."' AND r.fk_element = ".$objcon->id;

+        }

+

+        if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur')))  $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";

+        elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') {

+            $sql .= " INNER JOIN ".MAIN_DB_PREFIX."element_resources as er";

+            $sql .= " ON er.resource_type = 'dolresource'";

+            $sql .= " AND er.element_id = a.id";

+            $sql .= " AND er.resource_id = ".$filterobj->id;

+        }

+        elseif (is_object($filterobj) && get_class($filterobj) == 'Project') { /* Nothing */ }

+        elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql .= ", ".MAIN_DB_PREFIX."adherent as m";

+        elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') $sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as o";

+        elseif (is_object($filterobj) && get_class($filterobj) == 'Product') $sql .= ", ".MAIN_DB_PREFIX."product as o";

+        elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') $sql .= ", ".MAIN_DB_PREFIX."ticket as o";

+        elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') $sql .= ", ".MAIN_DB_PREFIX."bom_bom as o";

+        elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') $sql .= ", ".MAIN_DB_PREFIX."contrat as o";

+        elseif (is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid']) && is_array($filterobj->fields['ref']) && $filterobj->table_element && $filterobj->element) $sql .= ", ".MAIN_DB_PREFIX.$filterobj->table_element." as o";

+

+        $sql .= " WHERE a.entity IN (".getEntity('agenda').")";

+        if ($force_filter_contact === false) {

+            if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur')) && $filterobj->id) $sql .= " AND a.fk_soc = ".$filterobj->id;

+            elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') { /* Nothing */ }

+            elseif (is_object($filterobj) && get_class($filterobj) == 'Project' && $filterobj->id) $sql .= " AND a.fk_project = ".$filterobj->id;

+            elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent')

+            {

+                $sql .= " AND a.fk_element = m.rowid AND a.elementtype = 'member'";

+                if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;

+            }

+            elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur')

+            {

+                $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'order_supplier'";

+                if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;

+            }

+            elseif (is_object($filterobj) && get_class($filterobj) == 'Product')

+            {

+                $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'product'";

+                if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;

+            }

+            elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket')

+            {

+                $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'ticket'";

+                if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;

+            }

+            elseif (is_object($filterobj) && get_class($filterobj) == 'BOM')

+            {

+            	$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'bom'";

+            	if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;

+            }

+            elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat')

+            {

+            	$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'contract'";

+            	if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;

+            }

+            elseif (is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid']) && is_array($filterobj->fields['ref']) && $filterobj->table_element && $filterobj->element)

+            {

+            	$sql .= " AND a.fk_element = o.rowid AND a.elementtype = '".$db->escape($filterobj->element)."'";

+            	if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;

+            }

+        }

+

+        // Condition on actioncode

+        if (!empty($actioncode))

+        {

+            if (empty($conf->global->AGENDA_USE_EVENT_TYPE))

+            {

+                if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'";

+                elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'";

+                else

+                {

+                    if ($actioncode == 'AC_OTH') $sql .= " AND c.type != 'systemauto'";

+                    elseif ($actioncode == 'AC_OTH_AUTO') $sql .= " AND c.type = 'systemauto'";

+                }

+            }

+            else

+            {

+                if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'";

+                elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'";

+                else $sql .= " AND c.code = '".$db->escape($actioncode)."'";

+            }

+        }

+        if ($donetodo == 'todo') $sql .= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))";

+        elseif ($donetodo == 'done') $sql .= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))";

+        if (is_array($filters) && $filters['search_agenda_label']) $sql .= natural_search('a.label', $filters['search_agenda_label']);

+    }

+

+    // Add also event from emailings. TODO This should be replaced by an automatic event ? May be it's too much for very large emailing.

+    if (!empty($conf->mailing->enabled) && !empty($objcon->email)

+        && (empty($actioncode) || $actioncode == 'AC_OTH_AUTO' || $actioncode == 'AC_EMAILING'))

+    {

+        $langs->load("mails");

+

+        $sql2 = "SELECT m.rowid as id, m.titre as label, mc.date_envoi as dp, mc.date_envoi as dp2, '100' as percent, 'mailing' as type";

+        $sql2 .= ", null as fk_element, '' as elementtype, null as contact_id";

+        $sql2 .= ", 'AC_EMAILING' as acode, '' as alabel, '' as apicto";

+        $sql2 .= ", u.rowid as user_id, u.login as user_login, u.photo as user_photo, u.firstname as user_firstname, u.lastname as user_lastname"; // User that valid action

+        if (is_object($filterobj) && get_class($filterobj) == 'Societe')      $sql2 .= ", '' as lastname, '' as firstname";

+        elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql2 .= ", '' as lastname, '' as firstname";

+        elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur')  $sql2 .= ", '' as ref";

+        elseif (is_object($filterobj) && get_class($filterobj) == 'Product')  $sql2 .= ", '' as ref";

+        elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket')   $sql2 .= ", '' as ref";

+        $sql2 .= " FROM ".MAIN_DB_PREFIX."mailing as m, ".MAIN_DB_PREFIX."mailing_cibles as mc, ".MAIN_DB_PREFIX."user as u";

+        $sql2 .= " WHERE mc.email = '".$db->escape($objcon->email)."'"; // Search is done on email.

+        $sql2 .= " AND mc.statut = 1";

+        $sql2 .= " AND u.rowid = m.fk_user_valid";

+        $sql2 .= " AND mc.fk_mailing = m.rowid";

+    }

+

+    if (!empty($sql) && !empty($sql2)) {

+        $sql = $sql." UNION ".$sql2;

+    } elseif (empty($sql) && !empty($sql2)) {

+        $sql = $sql2;

+    }

+

+    //TODO Add limit in nb of results

+    if ($sql)

+    {

+    	$sql .= $db->order($sortfield_new, $sortorder);

+	    dol_syslog("company.lib::show_actions_done", LOG_DEBUG);

+	    $resql = $db->query($sql);

+	    if ($resql)

+	    {

+	        $i = 0;

+	        $num = $db->num_rows($resql);

+

+	        while ($i < $num)

+	        {

+	            $obj = $db->fetch_object($resql);

+

+	            if ($obj->type == 'action') {

+	                $contactaction = new ActionComm($db);

+	                $contactaction->id = $obj->id;

+	                $result = $contactaction->fetchResources();

+	                if ($result < 0) {

+	                    dol_print_error($db);

+	                    setEventMessage("company.lib::show_actions_done Error fetch ressource", 'errors');

+	                }

+

+	                //if ($donetodo == 'todo') $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))";

+	                //elseif ($donetodo == 'done') $sql.= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))";

+	                $tododone = '';

+	                if (($obj->percent >= 0 and $obj->percent < 100) || ($obj->percent == -1 && $obj->datep > $now)) $tododone = 'todo';

+

+	                $histo[$numaction] = array(

+	                    'type'=>$obj->type,

+	                    'tododone'=>$tododone,

+	                    'id'=>$obj->id,

+	                    'datestart'=>$db->jdate($obj->dp),

+	                    'dateend'=>$db->jdate($obj->dp2),

+	                    'note'=>$obj->label,

+	                    'percent'=>$obj->percent,

+

+	                    'userid'=>$obj->user_id,

+	                    'login'=>$obj->user_login,

+	                    'userfirstname'=>$obj->user_firstname,

+	                    'userlastname'=>$obj->user_lastname,

+	                    'userphoto'=>$obj->user_photo,

+

+	                    'contact_id'=>$obj->fk_contact,

+	                    'socpeopleassigned' => $contactaction->socpeopleassigned,

+	                    'lastname'=>$obj->lastname,

+	                    'firstname'=>$obj->firstname,

+	                    'fk_element'=>$obj->fk_element,

+	                    'elementtype'=>$obj->elementtype,

+	                    // Type of event

+	                    'acode'=>$obj->acode,

+	                    'alabel'=>$obj->alabel,

+	                    'libelle'=>$obj->alabel, // deprecated

+	                    'apicto'=>$obj->apicto

+	                );

+	            } else {

+	                $histo[$numaction] = array(

+	                    'type'=>$obj->type,

+	                    'tododone'=>'done',

+	                    'id'=>$obj->id,

+	                    'datestart'=>$db->jdate($obj->dp),

+	                    'dateend'=>$db->jdate($obj->dp2),

+	                    'note'=>$obj->label,

+	                    'percent'=>$obj->percent,

+	                    'acode'=>$obj->acode,

+

+	                    'userid'=>$obj->user_id,

+	                    'login'=>$obj->user_login,

+	                    'userfirstname'=>$obj->user_firstname,

+	                    'userlastname'=>$obj->user_lastname,

+	                    'userphoto'=>$obj->user_photo

+	                );

+	            }

+

+	            $numaction++;

+	            $i++;

+	        }

+	    }

+	    else

+	    {

+	        dol_print_error($db);

+	    }

+    }

+

+    if (!empty($conf->agenda->enabled) || (!empty($conf->mailing->enabled) && !empty($objcon->email)))

+    {

+        $delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO * 24 * 60 * 60;

+

+        require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';

+        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';

+	    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';

+	    require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';

+

+        $formactions = new FormActions($db);

+

+        $actionstatic = new ActionComm($db);

+        $userstatic = new User($db);

+        $contactstatic = new Contact($db);

+

+        $out .= '<form name="listactionsfilter" class="listactionsfilter" action="'.$_SERVER["PHP_SELF"].'" method="POST">';

+        if ($objcon && get_class($objcon) == 'Contact' &&

+            (is_null($filterobj) || get_class($filterobj) == 'Societe'))

+        {

+            $out .= '<input type="hidden" name="id" value="'.$objcon->id.'" />';

+        }

+        else

+        {

+            $out .= '<input type="hidden" name="id" value="'.$filterobj->id.'" />';

+        }

+        if ($filterobj && get_class($filterobj) == 'Societe') $out .= '<input type="hidden" name="socid" value="'.$filterobj->id.'" />';

+

+        $out .= "\n";

+

+        $out .= '<div class="div-table-responsive-no-min">';

+        $out .= '<table class="noborder centpercent">';

+

+        $out .= '<tr class="liste_titre">';

+        if ($donetodo)

+        {

+            $out .= '<td class="liste_titre"></td>';

+        }

+        $out .= '<td class="liste_titre"></td>';

+        $out .= '<td class="liste_titre"></td>';

+        $out .= '<td class="liste_titre">';

+        $out .= $formactions->select_type_actions($actioncode, "actioncode", '', empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : -1, 0, 0, 1);

+        $out .= '</td>';

+        $out .= '<td class="liste_titre maxwidth100onsmartphone"><input type="text" class="maxwidth100onsmartphone" name="search_agenda_label" value="'.$filters['search_agenda_label'].'"></td>';

+        $out .= '<td class="liste_titre"></td>';

+        $out .= '<td class="liste_titre"></td>';

+        $out .= '<td class="liste_titre"></td>';

+        $out .= '<td class="liste_titre"></td>';

+        // Action column

+        $out .= '<td class="liste_titre" align="middle">';

+        $searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1);

+        $out .= $searchpicto;

+        $out .= '</td>';

+        $out .= '</tr>';

+

+        $out .= '<tr class="liste_titre">';

+		if ($donetodo)

+		{

+            $tmp = '';

+            if (get_class($filterobj) == 'Societe') $tmp .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php?socid='.$filterobj->id.'&amp;status=done">';

+            $tmp .= ($donetodo != 'done' ? $langs->trans("ActionsToDoShort") : '');

+            $tmp .= ($donetodo != 'done' && $donetodo != 'todo' ? ' / ' : '');

+            $tmp .= ($donetodo != 'todo' ? $langs->trans("ActionsDoneShort") : '');

+            //$out.=$langs->trans("ActionsToDoShort").' / '.$langs->trans("ActionsDoneShort");

+            if (get_class($filterobj) == 'Societe') $tmp .= '</a>';

+            $out .= getTitleFieldOfList($tmp);

@@ -1654,385 +1628,9 @@
-		$sql .= " a.datep as dp,";

-		$sql .= " a.datep2 as dp2,";

-		$sql .= " a.percent as percent, 'action' as type,";

-		$sql .= " a.fk_element, a.elementtype,";

-		$sql .= " a.fk_contact,";

-		$sql .= " c.code as acode, c.libelle as alabel, c.picto as apicto,";

-		$sql .= " u.rowid as user_id, u.login as user_login, u.photo as user_photo, u.firstname as user_firstname, u.lastname as user_lastname";

-		if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur'))) {

-			$sql .= ", sp.lastname, sp.firstname";

-		} elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') {

-			/* Nothing */

-		} elseif (is_object($filterobj) && get_class($filterobj) == 'Project') {

-			/* Nothing */

-		} elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') {

-			$sql .= ", m.lastname, m.firstname";

-		} elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') {

-			$sql .= ", o.ref";

-		} elseif (is_object($filterobj) && get_class($filterobj) == 'Product') {

-			$sql .= ", o.ref";

-		} elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') {

-			$sql .= ", o.ref";

-		} elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') {

-			$sql .= ", o.ref";

-		} elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') {

-			$sql .= ", o.ref";

-		} elseif (is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid']) && $filterobj->table_element && $filterobj->element) {

-			if (!empty($filterobj->fields['ref'])) {

-				$sql .= ", o.ref";

-			} elseif (!empty($filterobj->fields['label'])) {

-				$sql .= ", o.label";

-			}

-		}

-

-		// Fields from hook

-		$parameters = array('sql' => &$sql, 'filterobj' => $filterobj, 'objcon' => $objcon);

-		$reshook = $hookmanager->executeHooks('showActionsDoneListSelect', $parameters);    // Note that $action and $object may have been modified by hook

-		if (!empty($hookmanager->resPrint)) {

-			$sql.= $hookmanager->resPrint;

-		}

-

-		$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a";

-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on u.rowid = a.fk_user_action";

-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_actioncomm as c ON a.fk_action = c.id";

-

-		$force_filter_contact = false;

-		if (is_object($objcon) && $objcon->id > 0) {

-			$force_filter_contact = true;

-			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm_resources as r ON a.id = r.fk_actioncomm";

-			$sql .= " AND r.element_type = '".$db->escape($objcon->table_element)."' AND r.fk_element = ".((int) $objcon->id);

-		}

-

-		// Fields from hook

-		$parameters = array('sql' => &$sql, 'filterobj' => $filterobj, 'objcon' => $objcon);

-		$reshook = $hookmanager->executeHooks('showActionsDoneListFrom', $parameters);    // Note that $action and $object may have been modified by hook

-		if (!empty($hookmanager->resPrint)) {

-			$sql.= $hookmanager->resPrint;

-		}

-

-		if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur'))) {

-			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";

-		} elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') {

-			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."element_resources as er";

-			$sql .= " ON er.resource_type = 'dolresource'";

-			$sql .= " AND er.element_id = a.id";

-			$sql .= " AND er.resource_id = ".((int) $filterobj->id);

-		} elseif (is_object($filterobj) && get_class($filterobj) == 'Project') {

-			/* Nothing */

-		} elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') {

-			$sql .= ", ".MAIN_DB_PREFIX."adherent as m";

-		} elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') {

-			$sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as o";

-		} elseif (is_object($filterobj) && get_class($filterobj) == 'Product') {

-			$sql .= ", ".MAIN_DB_PREFIX."product as o";

-		} elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') {

-			$sql .= ", ".MAIN_DB_PREFIX."ticket as o";

-		} elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') {

-			$sql .= ", ".MAIN_DB_PREFIX."bom_bom as o";

-		} elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') {

-			$sql .= ", ".MAIN_DB_PREFIX."contrat as o";

-		} elseif (is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid'])

-			&& ((!empty($filterobj->fields['ref']) && is_array($filterobj->fields['ref'])) || (!empty($filterobj->fields['label']) && is_array($filterobj->fields['label'])) || (!empty($filterobj->fields['titre']) && is_array($filterobj->fields['titre'])))

-			&& $filterobj->table_element && $filterobj->element) {

-			$sql .= ", ".MAIN_DB_PREFIX.$filterobj->table_element." as o";

-		} elseif (is_object($filterobj)) {

-			return 'Bad value for $filterobj';

-		}

-

-		$sql .= " WHERE a.entity IN (".getEntity('agenda').")";

-		if ($force_filter_contact === false) {

-			if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur')) && $filterobj->id) {

-				$sql .= " AND a.fk_soc = ".((int) $filterobj->id);

-			} elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') {

-				/* Nothing */

-			} elseif (is_object($filterobj) && get_class($filterobj) == 'Project' && $filterobj->id) {

-				$sql .= " AND a.fk_project = ".((int) $filterobj->id);

-			} elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') {

-				$sql .= " AND a.fk_element = m.rowid AND a.elementtype = 'member'";

-				if ($filterobj->id) {

-					$sql .= " AND a.fk_element = ".((int) $filterobj->id);

-				}

-			} elseif (is_object($filterobj) && get_class($filterobj) == 'Commande') {

-				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'order'";

-				if ($filterobj->id) {

-					$sql .= " AND a.fk_element = ".((int) $filterobj->id);

-				}

-			} elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') {

-				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'order_supplier'";

-				if ($filterobj->id) {

-					$sql .= " AND a.fk_element = ".((int) $filterobj->id);

-				}

-			} elseif (is_object($filterobj) && get_class($filterobj) == 'Facture') {

-				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'invoice'";

-				if ($filterobj->id) {

-					$sql .= " AND a.fk_element = ".((int) $filterobj->id);

-				}

-			} elseif (is_object($filterobj) && get_class($filterobj) == 'Product') {

-				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'product'";

-				if ($filterobj->id) {

-					$sql .= " AND a.fk_element = ".((int) $filterobj->id);

-				}

-			} elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') {

-				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'ticket'";

-				if ($filterobj->id) {

-					$sql .= " AND a.fk_element = ".((int) $filterobj->id);

-				}

-			} elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') {

-				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'bom'";

-				if ($filterobj->id) {

-					$sql .= " AND a.fk_element = ".((int) $filterobj->id);

-				}

-			} elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') {

-				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'contract'";

-				if ($filterobj->id) {

-					$sql .= " AND a.fk_element = ".((int) $filterobj->id);

-				}

-			} elseif (is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid'])

-				&& ((!empty($filterobj->fields['ref']) && is_array($filterobj->fields['ref'])) || (!empty($filterobj->fields['label']) && is_array($filterobj->fields['label'])) || (!empty($filterobj->fields['titre']) && is_array($filterobj->fields['titre'])))

-				&& $filterobj->table_element && $filterobj->element) {

-				// Generic case (if there is a $filterobj and a field rowid and (ref or label) exists.

-				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = '".$db->escape($filterobj->element).($module ? "@".$module : "")."'";

-				if ($filterobj->id) {

-					$sql .= " AND a.fk_element = ".((int) $filterobj->id);

-				}

-			} elseif (is_object($filterobj)) {

-				return 'Bad value for $filterobj';

-			}

-		}

-

-		if (!empty($tms_start) && !empty($tms_end)) {

-			$sql .= " AND ((a.datep BETWEEN '".$db->idate($tms_start)."' AND '".$db->idate($tms_end)."') OR (a.datep2 BETWEEN '".$db->idate($tms_start)."' AND '".$db->idate($tms_end)."'))";

-		} elseif (empty($tms_start) && !empty($tms_end)) {

-			$sql .= " AND ((a.datep <= '".$db->idate($tms_end)."') OR (a.datep2 <= '".$db->idate($tms_end)."'))";

-		} elseif (!empty($tms_start) && empty($tms_end)) {

-			$sql .= " AND ((a.datep >= '".$db->idate($tms_start)."') OR (a.datep2 >= '".$db->idate($tms_start)."'))";

-		}

-

-		if (is_array($actioncode) && !empty($actioncode)) {

-			$sql .= ' AND (';

-			foreach ($actioncode as $key => $code) {

-				if ($key != 0) {

-					$sql .= " OR ";

-				}

-				if (!empty($code)) {

-					addEventTypeSQL($sql, $code, "");

-				}

-			}

-			$sql .= ')';

-		} elseif (!empty($actioncode)) {

-			addEventTypeSQL($sql, $actioncode);

-		}

-

-		addOtherFilterSQL($sql, $donetodo, $now, $filters);

-

-		// Fields from hook

-		$parameters = array('sql' => &$sql, 'filterobj' => $filterobj, 'objcon' => $objcon, 'module' => $module);

-		$reshook = $hookmanager->executeHooks('showActionsDoneListWhere', $parameters);    // Note that $action and $object may have been modified by hook

-		if (!empty($hookmanager->resPrint)) {

-			$sql.= $hookmanager->resPrint;

-		}

-

-		if (is_array($actioncode)) {

-			foreach ($actioncode as $code) {

-				$sql2 = addMailingEventTypeSQL($code, $objcon, $filterobj);

-				if (!empty($sql2)) {

-					if (!empty($sql)) {

-						$sql = $sql." UNION ".$sql2;

-					} elseif (empty($sql)) {

-						$sql = $sql2;

-					}

-					break;

-				}

-			}

-		} else {

-			$sql2 = addMailingEventTypeSQL($actioncode, $objcon, $filterobj);

-			if (!empty($sql) && !empty($sql2)) {

-				$sql = $sql." UNION ".$sql2;

-			} elseif (empty($sql) && !empty($sql2)) {

-				$sql = $sql2;

-			}

-		}

-	}

-

-	//TODO Add limit in nb of results

-	if ($sql) {

-		$sql .= $db->order($sortfield_new, $sortorder);

-

-		dol_syslog("company.lib::show_actions_done", LOG_DEBUG);

-

-		$resql = $db->query($sql);

-		if ($resql) {

-			$i = 0;

-			$num = $db->num_rows($resql);

-

-			while ($i < $num) {

-				$obj = $db->fetch_object($resql);

-

-				if ($obj->type == 'action') {

-					$contactaction = new ActionComm($db);

-					$contactaction->id = $obj->id;

-					$result = $contactaction->fetchResources();

-					if ($result < 0) {

-						dol_print_error($db);

-						setEventMessage("company.lib::show_actions_done Error fetch ressource", 'errors');

-					}

-

-					//if ($donetodo == 'todo') $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))";

-					//elseif ($donetodo == 'done') $sql.= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))";

-					$tododone = '';

-					if (($obj->percent >= 0 and $obj->percent < 100) || ($obj->percent == -1 && (!empty($obj->datep) && $obj->datep > $now))) {

-						$tododone = 'todo';

-					}

-

-					$histo[$numaction] = array(

-						'type'=>$obj->type,

-						'tododone'=>$tododone,

-						'id'=>$obj->id,

-						'datestart'=>$db->jdate($obj->dp),

-						'dateend'=>$db->jdate($obj->dp2),

-						'note'=>$obj->label,

-						'percent'=>$obj->percent,

-

-						'userid'=>$obj->user_id,

-						'login'=>$obj->user_login,

-						'userfirstname'=>$obj->user_firstname,

-						'userlastname'=>$obj->user_lastname,

-						'userphoto'=>$obj->user_photo,

-

-						'contact_id'=>$obj->fk_contact,

-						'socpeopleassigned' => $contactaction->socpeopleassigned,

-						'lastname' => empty($obj->lastname) ? '' : $obj->lastname,

-						'firstname' => empty($obj->firstname) ? '' : $obj->firstname,

-						'fk_element'=>$obj->fk_element,

-						'elementtype'=>$obj->elementtype,

-						// Type of event

-						'acode'=>$obj->acode,

-						'alabel'=>$obj->alabel,

-						'libelle'=>$obj->alabel, // deprecated

-						'apicto'=>$obj->apicto

-					);

-				} else {

-					$histo[$numaction] = array(

-						'type'=>$obj->type,

-						'tododone'=>'done',

-						'id'=>$obj->id,

-						'datestart'=>$db->jdate($obj->dp),

-						'dateend'=>$db->jdate($obj->dp2),

-						'note'=>$obj->label,

-						'percent'=>$obj->percent,

-						'acode'=>$obj->acode,

-

-						'userid'=>$obj->user_id,

-						'login'=>$obj->user_login,

-						'userfirstname'=>$obj->user_firstname,

-						'userlastname'=>$obj->user_lastname,

-						'userphoto'=>$obj->user_photo

-					);

-				}

-

-				$numaction++;

-				$i++;

-			}

-		} else {

-			dol_print_error($db);

-		}

-	}

-

-	if (isModEnabled('agenda')|| (isModEnabled('mailing') && !empty($objcon->email))) {

-		$delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO * 24 * 60 * 60;

-

-		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';

-		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';

-		require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';

-		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';

-

-		$formactions = new FormActions($db);

-

-		$actionstatic = new ActionComm($db);

-		$userstatic = new User($db);

-		$userlinkcache = array();

-		$contactstatic = new Contact($db);

-		$elementlinkcache = array();

-

-		$out .= '<form name="listactionsfilter" class="listactionsfilter" action="'.$_SERVER["PHP_SELF"].'" method="POST">';

-		$out .= '<input type="hidden" name="token" value="'.newToken().'">';

-		if ($objcon && get_class($objcon) == 'Contact' &&

-			(is_null($filterobj) || get_class($filterobj) == 'Societe')) {

-			$out .= '<input type="hidden" name="id" value="'.$objcon->id.'" />';

-		} else {

-			$out .= '<input type="hidden" name="id" value="'.$filterobj->id.'" />';

-		}

-		if ($filterobj && get_class($filterobj) == 'Societe') {

-			$out .= '<input type="hidden" name="socid" value="'.$filterobj->id.'" />';

-		}

-

-		$out .= "\n";

-

-		$out .= '<div class="div-table-responsive-no-min">';

-		$out .= '<table class="noborder centpercent">';

-

-		$out .= '<tr class="liste_titre">';

-

-		// Action column

-		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {

-			$out .= '<th class="liste_titre width50 middle">';

-			$searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1);

-			$out .= $searchpicto;

-			$out .= '</th>';

-		}

-

-		if ($donetodo) {

-			$out .= '<td class="liste_titre"></td>';

-		}

-

-		$out .= '<td class="liste_titre"><input type="text" class="width50" name="search_rowid" value="'.(isset($filters['search_rowid']) ? $filters['search_rowid'] : '').'"></td>';

-		$out .= '<td class="liste_titre"></td>';

-		$out .= '<td class="liste_titre">';

-		$out .= $formactions->select_type_actions($actioncode, "actioncode", '', !getDolGlobalString('AGENDA_USE_EVENT_TYPE') ? 1 : -1, 0, (!getDolGlobalString('AGENDA_USE_MULTISELECT_TYPE') ? 0 : 1), 1, 'minwidth100 maxwidth150');

-		$out .= '</td>';

-		$out .= '<td class="liste_titre maxwidth100onsmartphone"><input type="text" class="maxwidth100onsmartphone" name="search_agenda_label" value="'.$filters['search_agenda_label'].'"></td>';

-		$out .= '<td class="liste_titre center">';

-		$out .= $form->selectDateToDate($tms_start, $tms_end, 'dateevent', 1);

-		$out .= '</td>';

-		$out .= '<td class="liste_titre"></td>';

-		$out .= '<td class="liste_titre"></td>';

-		$out .= '<td class="liste_titre"></td>';

-		// Action column

-		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {

-			$out .= '<td class="liste_titre" align="middle">';

-			$searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1);

-			$out .= $searchpicto;

-			$out .= '</td>';

-		}

-		$out .= '</tr>';

-

-		$out .= '<tr class="liste_titre">';

-		// Action column

-		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {

-			$out .= getTitleFieldOfList('', 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'maxwidthsearch ');

-		}

-		if ($donetodo) {

-			$tmp = '';

-			if (get_class($filterobj) == 'Societe') {

-				$tmp .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php?mode=show_list&socid='.$filterobj->id.'&status=done">';

-			}

-			$tmp .= ($donetodo != 'done' ? $langs->trans("ActionsToDoShort") : '');

-			$tmp .= ($donetodo != 'done' && $donetodo != 'todo' ? ' / ' : '');

-			$tmp .= ($donetodo != 'todo' ? $langs->trans("ActionsDoneShort") : '');

-			//$out.=$langs->trans("ActionsToDoShort").' / '.$langs->trans("ActionsDoneShort");

-			if (get_class($filterobj) == 'Societe') {

-				$tmp .= '</a>';

-			}

-			$out .= getTitleFieldOfList($tmp);

-		}

-		$out .= getTitleFieldOfList("Ref", 0, $_SERVER["PHP_SELF"], 'a.id', '', $param, '', $sortfield, $sortorder);

-		$out .= getTitleFieldOfList("Owner");

-		$out .= getTitleFieldOfList("Type");

-		$out .= getTitleFieldOfList("Label", 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);

-		$out .= getTitleFieldOfList("Date", 0, $_SERVER["PHP_SELF"], 'a.datep,a.id', '', $param, '', $sortfield, $sortorder, 'center ');

-		$out .= getTitleFieldOfList("RelatedObjects", 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);

-		$out .= getTitleFieldOfList("ActionOnContact", 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'tdoverflowmax125 ', 0, '', 0);

-		$out .= getTitleFieldOfList("Status", 0, $_SERVER["PHP_SELF"], 'a.percent', '', $param, '', $sortfield, $sortorder, 'center ');

-		// Action column

-		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {

-			$out .= getTitleFieldOfList('', 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'maxwidthsearch ');

-		}

+		$out .= getTitleFieldOfList($langs->trans("Ref"), 0, $_SERVER["PHP_SELF"], 'a.id', '', $param, '', $sortfield, $sortorder);

+		$out .= getTitleFieldOfList($langs->trans("Owner"));

+        $out .= getTitleFieldOfList($langs->trans("Type"));

+		$out .= getTitleFieldOfList($langs->trans("Label"), 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);

+        $out .= getTitleFieldOfList($langs->trans("Date"), 0, $_SERVER["PHP_SELF"], 'a.datep,a.id', '', $param, 'align="center"', $sortfield, $sortorder);

+        $out .= getTitleFieldOfList($langs->trans("RelatedObjects"), 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);

+		$out .= getTitleFieldOfList($langs->trans("ActionOnContact"), 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);

+		$out .= getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], 'a.percent', '', $param, 'align="center"', $sortfield, $sortorder);

+		$out .= getTitleFieldOfList('', 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'maxwidthsearch ');

@@ -2043,3 +1641,4 @@
-		$arraylist = $caction->liste_array(1, 'code', '', (!getDolGlobalString('AGENDA_USE_EVENT_TYPE') ? 1 : 0), '', 1);

-

-		foreach ($histo as $key => $value) {

+		$arraylist = $caction->liste_array(1, 'code', '', (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : 0), '', 1);

+

+        foreach ($histo as $key => $value)

+        {

@@ -2051,128 +1650,111 @@
-			$out .= '<tr class="oddeven">';

-

-			// Action column

-			if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {

-				$out .= '<td></td>';

-			}

-

-			// Done or todo

-			if ($donetodo) {

-				$out .= '<td class="nowrap">';

-				$out .= '</td>';

-			}

-

-			// Ref

-			$out .= '<td class="nowraponall">';

-			if (isset($histo[$key]['type']) && $histo[$key]['type'] == 'mailing') {

-				$out .= '<a href="'.DOL_URL_ROOT.'/comm/mailing/card.php?id='.$histo[$key]['id'].'">'.img_object($langs->trans("ShowEMailing"), "email").' ';

-				$out .= $histo[$key]['id'];

-				$out .= '</a>';

-			} else {

-				$out .= $actionstatic->getNomUrl(1, -1);

-			}

-			$out .= '</td>';

-

-			// Author of event

-			$out .= '<td class="tdoverflowmax125">';

-			if ($histo[$key]['userid'] > 0) {

-				if (isset($userlinkcache[$histo[$key]['userid']])) {

-					$link = $userlinkcache[$histo[$key]['userid']];

-				} else {

-					$userstatic->fetch($histo[$key]['userid']);

-					$link = $userstatic->getNomUrl(-1, '', 0, 0, 16, 0, 'firstelselast', '');

-					$userlinkcache[$histo[$key]['userid']] = $link;

-				}

-				$out .= $link;

-			}

-			$out .= '</td>';

-

-			// Type

-			$labeltype = $actionstatic->type_code;

-			if (!getDolGlobalString('AGENDA_USE_EVENT_TYPE') && empty($arraylist[$labeltype])) {

-				$labeltype = 'AC_OTH';

-			}

-			if (!empty($actionstatic->code) && preg_match('/^TICKET_MSG/', $actionstatic->code)) {

-				$labeltype = $langs->trans("Message");

-			} else {

-				if (!empty($arraylist[$labeltype])) {

-					$labeltype = $arraylist[$labeltype];

-				}

-				if ($actionstatic->type_code == 'AC_OTH_AUTO' && ($actionstatic->type_code != $actionstatic->code) && $labeltype && !empty($arraylist[$actionstatic->code])) {

-					$labeltype .= ' - '.$arraylist[$actionstatic->code]; // Use code in priority on type_code

-				}

-			}

-			$out .= '<td class="tdoverflowmax125" title="'.$labeltype.'">';

-			$out .= $actionstatic->getTypePicto();

-			//if (empty($conf->dol_optimize_smallscreen)) {

-			$out .= $labeltype;

-			//}

-			$out .= '</td>';

-

-			// Title/Label of event

-			$out .= '<td class="tdoverflowmax300"';

-			if (isset($histo[$key]['type']) && $histo[$key]['type'] == 'action') {

-				$transcode = $langs->trans("Action".$histo[$key]['acode']);

-				//$libelle = ($transcode != "Action".$histo[$key]['acode'] ? $transcode : $histo[$key]['alabel']);

-				$libelle = $histo[$key]['note'];

-				$actionstatic->id = $histo[$key]['id'];

-				$out .= ' title="'.dol_escape_htmltag($libelle).'">';

-				$out .= dol_trunc($libelle, 120);

-			}

-			if (isset($histo[$key]['type']) && $histo[$key]['type'] == 'mailing') {

-				$out .= '<a href="'.DOL_URL_ROOT.'/comm/mailing/card.php?id='.$histo[$key]['id'].'">'.img_object($langs->trans("ShowEMailing"), "email").' ';

-				$transcode = $langs->trans("Action".$histo[$key]['acode']);

-				$libelle = ($transcode != "Action".$histo[$key]['acode'] ? $transcode : 'Send mass mailing');

-				$out .= ' title="'.dol_escape_htmltag($libelle).'">';

-				$out .= dol_trunc($libelle, 120);

-			}

-			$out .= '</td>';

-

-			// Date

-			$out .= '<td class="center nowraponall">';

-			$out .= dol_print_date($histo[$key]['datestart'], 'dayhour', 'tzuserrel');

-			if ($histo[$key]['dateend'] && $histo[$key]['dateend'] != $histo[$key]['datestart']) {

-				$tmpa = dol_getdate($histo[$key]['datestart'], true);

-				$tmpb = dol_getdate($histo[$key]['dateend'], true);

-				if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) {

-					$out .= '-'.dol_print_date($histo[$key]['dateend'], 'hour', 'tzuserrel');

-				} else {

-					$out .= '-'.dol_print_date($histo[$key]['dateend'], 'dayhour', 'tzuserrel');

-				}

-			}

-			$late = 0;

-			if ($histo[$key]['percent'] == 0 && $histo[$key]['datestart'] && $histo[$key]['datestart'] < ($now - $delay_warning)) {

-				$late = 1;

-			}

-			if ($histo[$key]['percent'] == 0 && !$histo[$key]['datestart'] && $histo[$key]['dateend'] && $histo[$key]['datestart'] < ($now - $delay_warning)) {

-				$late = 1;

-			}

-			if ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100 && $histo[$key]['dateend'] && $histo[$key]['dateend'] < ($now - $delay_warning)) {

-				$late = 1;

-			}

-			if ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100 && !$histo[$key]['dateend'] && $histo[$key]['datestart'] && $histo[$key]['datestart'] < ($now - $delay_warning)) {

-				$late = 1;

-			}

-			if ($late) {

-				$out .= img_warning($langs->trans("Late")).' ';

-			}

-			$out .= "</td>\n";

-

-			// Linked object

-			$out .= '<td class="nowraponall">';

-			if (isset($histo[$key]['elementtype']) && !empty($histo[$key]['fk_element'])) {

-				if (isset($elementlinkcache[$histo[$key]['elementtype']]) && isset($elementlinkcache[$histo[$key]['elementtype']][$histo[$key]['fk_element']])) {

-					$link = $elementlinkcache[$histo[$key]['elementtype']][$histo[$key]['fk_element']];

-				} else {

-					if (!isset($elementlinkcache[$histo[$key]['elementtype']])) {

-						$elementlinkcache[$histo[$key]['elementtype']] = array();

-					}

-					$link = dolGetElementUrl($histo[$key]['fk_element'], $histo[$key]['elementtype'], 1);

-					$elementlinkcache[$histo[$key]['elementtype']][$histo[$key]['fk_element']] = $link;

-				}

-				$out .= $link;

-			}

-			$out .= '</td>';

-

-			// Contact(s) for action

-			if (isset($histo[$key]['socpeopleassigned']) && is_array($histo[$key]['socpeopleassigned']) && count($histo[$key]['socpeopleassigned']) > 0) {

-				$out .= '<td class="valignmiddle">';

+            $out .= '<tr class="oddeven">';

+

+            // Done or todo

+            if ($donetodo)

+            {

+                $out .= '<td class="nowrap">';

+                $out .= '</td>';

+            }

+

+            // Ref

+            $out .= '<td class="nowraponall">';

+            if (isset($histo[$key]['type']) && $histo[$key]['type'] == 'mailing') {

+                $out .= '<a href="'.DOL_URL_ROOT.'/comm/mailing/card.php?id='.$histo[$key]['id'].'">'.img_object($langs->trans("ShowEMailing"), "email").' ';

+                $out .= $histo[$key]['id'];

+                $out .= '</a>';

+            } else {

+                $out .= $actionstatic->getNomUrl(1, -1);

+            }

+            $out .= '</td>';

+

+            // Author of event

+            $out .= '<td class="tdoverflowmax200">';

+            //$userstatic->id=$histo[$key]['userid'];

+            //$userstatic->login=$histo[$key]['login'];

+            //$out.=$userstatic->getLoginUrl(1);

+            if ($histo[$key]['userid'] > 0)

+            {

+            	$userstatic->fetch($histo[$key]['userid']); // TODO Introduce a cache on users fetched

+            	$out .= $userstatic->getNomUrl(-1, '', 0, 0, 16, 0, 'firstelselast', '');

+            }

+            $out .= '</td>';

+

+            // Type

+            $out .= '<td>';

+            if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))

+            {

+            	if ($actionstatic->type_picto) print img_picto('', $actionstatic->type_picto);

+            	else {

+            		if ($actionstatic->type_code == 'AC_RDV')       $out .= img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright').' ';

+            		elseif ($actionstatic->type_code == 'AC_TEL')   $out .= img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright').' ';

+            		elseif ($actionstatic->type_code == 'AC_FAX')   $out .= img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright').' ';

+            		elseif ($actionstatic->type_code == 'AC_EMAIL') $out .= img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright').' ';

+            		elseif ($actionstatic->type_code == 'AC_INT')   $out .= img_picto('', 'object_intervention', '', false, 0, 0, '', 'paddingright').' ';

+            		elseif (!preg_match('/_AUTO/', $actionstatic->type_code)) $out .= img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').' ';

+            	}

+            }

+            $labeltype = $actionstatic->type_code;

+            if (empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($arraylist[$labeltype])) $labeltype = 'AC_OTH';

+            if (!empty($arraylist[$labeltype])) $labeltype = $arraylist[$labeltype];

+            $out .= dol_trunc($labeltype, 28);

+            $out .= '</td>';

+

+            // Title

+            $out .= '<td>';

+            if (isset($histo[$key]['type']) && $histo[$key]['type'] == 'action')

+            {

+                $transcode = $langs->trans("Action".$histo[$key]['acode']);

+                $libelle = ($transcode != "Action".$histo[$key]['acode'] ? $transcode : $histo[$key]['alabel']);

+                //$actionstatic->libelle=$libelle;

+                $libelle = $histo[$key]['note'];

+                $actionstatic->id = $histo[$key]['id'];

+                $out .= dol_trunc($libelle, 120);

+            }

+            if (isset($histo[$key]['type']) && $histo[$key]['type'] == 'mailing')

+            {

+                $out .= '<a href="'.DOL_URL_ROOT.'/comm/mailing/card.php?id='.$histo[$key]['id'].'">'.img_object($langs->trans("ShowEMailing"), "email").' ';

+                $transcode = $langs->trans("Action".$histo[$key]['acode']);

+                $libelle = ($transcode != "Action".$histo[$key]['acode'] ? $transcode : 'Send mass mailing');

+                $out .= dol_trunc($libelle, 120);

+            }

+            $out .= '</td>';

+

+            // Date

+            $out .= '<td class="center nowrap">';

+            $out .= dol_print_date($histo[$key]['datestart'], 'dayhour', 'tzuserrel');

+            if ($histo[$key]['dateend'] && $histo[$key]['dateend'] != $histo[$key]['datestart'])

+            {

+                $tmpa = dol_getdate($histo[$key]['datestart'], true);

+                $tmpb = dol_getdate($histo[$key]['dateend'], true);

+                if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $out .= '-'.dol_print_date($histo[$key]['dateend'], 'hour', 'tzuserrel');

+                else $out .= '-'.dol_print_date($histo[$key]['dateend'], 'dayhour', 'tzuserrel');

+            }

+            $late = 0;

+            if ($histo[$key]['percent'] == 0 && $histo[$key]['datestart'] && $histo[$key]['datestart'] < ($now - $delay_warning)) $late = 1;

+            if ($histo[$key]['percent'] == 0 && !$histo[$key]['datestart'] && $histo[$key]['dateend'] && $histo[$key]['datestart'] < ($now - $delay_warning)) $late = 1;

+            if ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100 && $histo[$key]['dateend'] && $histo[$key]['dateend'] < ($now - $delay_warning)) $late = 1;

+            if ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100 && !$histo[$key]['dateend'] && $histo[$key]['datestart'] && $histo[$key]['datestart'] < ($now - $delay_warning)) $late = 1;

+            if ($late) $out .= img_warning($langs->trans("Late")).' ';

+            $out .= "</td>\n";

+

+            // Title of event

+            //$out.='<td>'.dol_trunc($histo[$key]['note'], 40).'</td>';

+

+            // Linked object

+            $out .= '<td class="nowraponall">';

+            if (isset($histo[$key]['elementtype']) && !empty($histo[$key]['fk_element']))

+            {

+            	$out .= dolGetElementUrl($histo[$key]['fk_element'], $histo[$key]['elementtype'], 1);

+            }

+            else $out .= '&nbsp;';

+            $out .= '</td>';

+

+            // Contact(s) for action

+            if (empty($objcon->id) && isset($histo[$key]['contact_id']) && $histo[$key]['contact_id'] > 0)

+            {

+                $contactstatic->lastname = $histo[$key]['lastname'];

+                $contactstatic->firstname = $histo[$key]['firstname'];

+                $contactstatic->id = $histo[$key]['contact_id'];

+                $out .= '<td width="120">'.$contactstatic->getNomUrl(1, '', 10).'</td>';

+            } elseif (isset($histo[$key]['socpeopleassigned']) && is_array($histo[$key]['socpeopleassigned']) && count($histo[$key]['socpeopleassigned']) > 0) {

+				$out .= '<td>';

@@ -2180 +1762 @@
-				foreach ($histo[$key]['socpeopleassigned'] as $cid => $cvalue) {

+				foreach ($histo[$key]['socpeopleassigned'] as $cid => $value) {

@@ -2183 +1765 @@
-					if ($result < 0) {

+					if ($result < 0)

@@ -2185 +1766,0 @@
-					}

@@ -2188 +1769 @@
-						$out .= $contact->getNomUrl(-3, '', 10, '', -1, 0, 'paddingright');

+						$out .= $contact->getNomUrl(1, '', 16);

@@ -2190 +1771 @@
-							if (!empty($contact->phone_pro)) {

+							if (!empty($contact->phone_pro))

@@ -2192 +1772,0 @@
-							}

@@ -2198,8 +1777,0 @@
-			} elseif (empty($objcon->id) && isset($histo[$key]['contact_id']) && $histo[$key]['contact_id'] > 0) {

-				$contactstatic->lastname = $histo[$key]['lastname'];

-				$contactstatic->firstname = $histo[$key]['firstname'];

-				$contactstatic->id = $histo[$key]['contact_id'];

-				$contactstatic->photo = $histo[$key]['contact_photo'];

-				$out .= '<td width="120">'.$contactstatic->getNomUrl(-1, '', 10).'</td>';

-			} else {

-				$out .= '<td>&nbsp;</td>';

@@ -2207,28 +1779,21 @@
-

-			// Status

-			$out .= '<td class="nowrap center">'.$actionstatic->LibStatut($histo[$key]['percent'], 2, 0, $histo[$key]['datestart']).'</td>';

-

-			// Action column

-			if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {

-				$out .= '<td></td>';

-			}

-

-			$out .= "</tr>\n";

-			$i++;

-		}

-		if (empty($histo)) {

-			$colspan = 9;

-			$out .= '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';

-		}

-

-		$out .= "</table>\n";

-		$out .= "</div>\n";

-

-		$out .= '</form>';

-	}

-

-	if ($noprint) {

-		return $out;

-	} else {

-		print $out;

-	}

+            else {

+            	$out .= '<td>&nbsp;</td>';

+            }

+

+            // Status

+            $out .= '<td class="nowrap center">'.$actionstatic->LibStatut($histo[$key]['percent'], 3, 0, $histo[$key]['datestart']).'</td>';

+

+            // Actions

+            $out .= '<td></td>';

+

+            $out .= "</tr>\n";

+            $i++;

+        }

+        $out .= "</table>\n";

+        $out .= "</div>\n";

+

+        $out .= '</form>';

+    }

+

+    if ($noprint) return $out;

+    else print $out;

@@ -2254 +1819 @@
-	$sql .= " WHERE s.parent = ".((int) $object->id);

+	$sql .= " WHERE s.parent = ".$object->id;

@@ -2261 +1826,2 @@
-	if ($num) {

+	if ($num)

+	{

@@ -2265,3 +1831 @@
-

-		print "\n".'<div class="div-table-responsive-no-min">'."\n";

-		print '<table class="noborder centpercent">'."\n";

+		print "\n".'<table class="noborder centpercent">'."\n";

@@ -2277 +1841,2 @@
-		while ($i < $num) {

+		while ($i < $num)

+		{

@@ -2285 +1850 @@
-			$socstatic->code_fournisseur = $obj->code_fournisseur;

+			$socstatic->code_fournisseur = $obj->code_client;

@@ -2295 +1860 @@
-			print '<td class="tdoverflowmax150">';

+			print '<td>';

@@ -2299,4 +1864,4 @@
-			print '<td class="tdoverflowmax400" title="'.dol_escape_htmltag($obj->address).'">'.dol_escape_htmltag($obj->address).'</td>';

-			print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($obj->zip).'">'.$obj->zip.'</td>';

-			print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($obj->town).'">'.$obj->town.'</td>';

-			print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($obj->code_client).'">'.$obj->code_client.'</td>';

+			print '<td>'.$obj->address.'</td>';

+			print '<td>'.$obj->zip.'</td>';

+			print '<td>'.$obj->town.'</td>';

+			print '<td>'.$obj->code_client.'</td>';

@@ -2305 +1870 @@
-			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/societe/card.php?socid='.((int) $obj->rowid).'&action=edit&token='.newToken().'">';

+			print '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$obj->rowid.'&amp;action=edit">';

@@ -2313 +1877,0 @@
-		print '</div>'."\n";

@@ -2320,213 +1883,0 @@
-/**

- * 		Add Event Type SQL

- *

- *		@param	string		$sql		    $sql modified

- * 		@param	string	    $actioncode		Action code

- * 		@param	string		$sqlANDOR		"AND", "OR" or "" sql condition

- * 		@return	string      sql request

- */

-function addEventTypeSQL(&$sql, $actioncode, $sqlANDOR = "AND")

-{

-	global $conf, $db;

-	// Condition on actioncode

-

-	if (!getDolGlobalString('AGENDA_USE_EVENT_TYPE')) {

-		if ($actioncode == 'AC_NON_AUTO') {

-			$sql .= " $sqlANDOR c.type <> 'systemauto'";

-		} elseif ($actioncode == 'AC_ALL_AUTO') {

-			$sql .= " $sqlANDOR c.type = 'systemauto'";

-		} else {

-			if ($actioncode == 'AC_OTH') {

-				$sql .= " $sqlANDOR c.type <> 'systemauto'";

-			} elseif ($actioncode == 'AC_OTH_AUTO') {

-				$sql .= " $sqlANDOR c.type = 'systemauto'";

-			}

-		}

-	} else {

-		if ($actioncode == 'AC_NON_AUTO') {

-			$sql .= " $sqlANDOR c.type <> 'systemauto'";

-		} elseif ($actioncode == 'AC_ALL_AUTO') {

-			$sql .= " $sqlANDOR c.type = 'systemauto'";

-		} else {

-			$sql .= " $sqlANDOR c.code = '".$db->escape($actioncode)."'";

-		}

-	}

-

-	return $sql;

-}

-

-/**

- * 		Add Event Type SQL

- *

- *		@param	string		$sql		    $sql modified

- * 		@param	string		$donetodo		donetodo

- * 		@param	string		$now		    now

- * 		@param	string		$filters		array

- * 		@return	string      sql request

- */

-function addOtherFilterSQL(&$sql, $donetodo, $now, $filters)

-{

-	global $db;

-

-	if ($donetodo == 'todo') {

-		$sql .= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))";

-	} elseif ($donetodo == 'done') {

-		$sql .= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))";

-	}

-	if (is_array($filters) && !empty($filters['search_agenda_label'])) {

-		$sql .= natural_search('a.label', $filters['search_agenda_label']);

-	}

-	if (is_array($filters) && !empty($filters['search_rowid'])) {

-		$sql .= natural_search('a.id', $filters['search_rowid'], 1);

-	}

-

-	return $sql;

-}

-

-/**

- *  Add Mailing Event Type SQL

- *

- *  @param	string	    $actioncode		Action code

- *  @param	Object		$objcon		    objcon

- *  @param	Object		$filterobj      filterobj

- *  @return	string

- */

-function addMailingEventTypeSQL($actioncode, $objcon, $filterobj)

-{

-	global $db;

-

-	// Add also event from emailings. TODO This should be replaced by an automatic event ? May be it's too much for very large emailing.

-	if (isModEnabled('mailing') && !empty($objcon->email) && (empty($actioncode) || $actioncode == 'AC_OTH_AUTO' || $actioncode == 'AC_EMAILING')) {

-		$sql2 = "SELECT m.rowid as id, m.titre as label, mc.date_envoi as dp, mc.date_envoi as dp2, '100' as percent, 'mailing' as type";

-		$sql2 .= ", null as fk_element, '' as elementtype, null as contact_id";

-		$sql2 .= ", 'AC_EMAILING' as acode, '' as alabel, '' as apicto";

-		$sql2 .= ", u.rowid as user_id, u.login as user_login, u.photo as user_photo, u.firstname as user_firstname, u.lastname as user_lastname"; // User that valid action

-		if (is_object($filterobj) && get_class($filterobj) == 'Societe') {

-			$sql2 .= ", '' as lastname, '' as firstname";

-		} elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') {

-			$sql2 .= ", '' as lastname, '' as firstname";

-		} elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') {

-			$sql2 .= ", '' as ref";

-		} elseif (is_object($filterobj) && get_class($filterobj) == 'Product') {

-			$sql2 .= ", '' as ref";

-		} elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') {

-			$sql2 .= ", '' as ref";

-		}

-		$sql2 .= " FROM ".MAIN_DB_PREFIX."mailing as m, ".MAIN_DB_PREFIX."mailing_cibles as mc, ".MAIN_DB_PREFIX."user as u";

-		$sql2 .= " WHERE mc.email = '".$db->escape($objcon->email)."'"; // Search is done on email.

-		$sql2 .= " AND mc.statut = 1";

-		$sql2 .= " AND u.rowid = m.fk_user_valid";

-		$sql2 .= " AND mc.fk_mailing=m.rowid";

-

-		return $sql2;

-	} else {

-		return '';

-	}

-}

-

-

-

-/**

- * Show footer of company in HTML pages

- *

- * @param   Societe		$fromcompany	Third party

- * @param   Translate	$langs			Output language

- * @param	int			$addformmessage	Add the payment form message

- * @param	string		$suffix			Suffix to use on constants

- * @param	Object		$object			Object related to payment

- * @return	void

- */

-function htmlPrintOnlineFooter($fromcompany, $langs, $addformmessage = 0, $suffix = '', $object = null)

-{

-	global $conf;

-

-	$reg = array();

-

-	// Juridical status

-	$line1 = "";

-	if ($fromcompany->forme_juridique_code) {

-		$line1 .= ($line1 ? " - " : "").getFormeJuridiqueLabel($fromcompany->forme_juridique_code);

-	}

-	// Capital

-	if ($fromcompany->capital) {

-		$line1 .= ($line1 ? " - " : "").$langs->transnoentities("CapitalOf", $fromcompany->capital)." ".$langs->transnoentities("Currency".$conf->currency);

-	}

-	// Prof Id 1

-	if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || !$fromcompany->idprof2)) {

-		$field = $langs->transcountrynoentities("ProfId1", $fromcompany->country_code);

-		if (preg_match('/\((.*)\)/i', $field, $reg)) {

-			$field = $reg[1];

-		}

-		$line1 .= ($line1 ? " - " : "").$field.": ".$fromcompany->idprof1;

-	}

-	// Prof Id 2

-	if ($fromcompany->idprof2) {

-		$field = $langs->transcountrynoentities("ProfId2", $fromcompany->country_code);

-		if (preg_match('/\((.*)\)/i', $field, $reg)) {

-			$field = $reg[1];

-		}

-		$line1 .= ($line1 ? " - " : "").$field.": ".$fromcompany->idprof2;

-	}

-

-	// Second line of company infos

-	$line2 = "";

-	// Prof Id 3

-	if ($fromcompany->idprof3) {

-		$field = $langs->transcountrynoentities("ProfId3", $fromcompany->country_code);

-		if (preg_match('/\((.*)\)/i', $field, $reg)) {

-			$field = $reg[1];

-		}

-		$line2 .= ($line2 ? " - " : "").$field.": ".$fromcompany->idprof3;

-	}

-	// Prof Id 4

-	if ($fromcompany->idprof4) {

-		$field = $langs->transcountrynoentities("ProfId4", $fromcompany->country_code);

-		if (preg_match('/\((.*)\)/i', $field, $reg)) {

-			$field = $reg[1];

-		}

-		$line2 .= ($line2 ? " - " : "").$field.": ".$fromcompany->idprof4;

-	}

-	// IntraCommunautary VAT

-	if ($fromcompany->tva_intra != '') {

-		$line2 .= ($line2 ? " - " : "").$langs->transnoentities("VATIntraShort").": ".$fromcompany->tva_intra;

-	}

-

-	print '<!-- htmlPrintOnlineFooter -->'."\n";

-

-	// css centpercent has been removed from class="..." because not compatible with paddingleft/right and there is an horizontal scroll appearring on payment page for example.

-	print '<footer class="center paddingleft paddingright opacitymedium">'."\n";

-	print '<br>';

-	if ($addformmessage) {

-		print '<!-- object = '.(empty($object) ? 'undefined' : $object->element).' -->';

-		print '<br>';

-

-		$parammessageform = 'ONLINE_PAYMENT_MESSAGE_FORM_'.$suffix;

-		if (getDolGlobalString($parammessageform) !== '') {

-			print $langs->transnoentities(getDolGlobalString($parammessageform));

-		} elseif (getDolGlobalString('ONLINE_PAYMENT_MESSAGE_FORM')  !== '') {

-			print $langs->transnoentities(getDolGlobalString('ONLINE_PAYMENT_MESSAGE_FORM'));

-		}

-

-		// Add other message if VAT exists

-		if (!empty($object->total_vat) || !empty($object->total_tva)) {

-			$parammessageform = 'ONLINE_PAYMENT_MESSAGE_FORMIFVAT_'.$suffix;

-			if (getDolGlobalString($parammessageform)  !== '') {

-				print $langs->transnoentities(getDolGlobalString($parammessageform));

-			} elseif (getDolGlobalString('ONLINE_PAYMENT_MESSAGE_FORMIFVAT') !== '') {

-				print $langs->transnoentities(getDolGlobalString('ONLINE_PAYMENT_MESSAGE_FORMIFVAT'));

-			}

-		}

-	}

-

-	print '<span style="font-size: 10px;"><br><hr>'."\n";

-	print $fromcompany->name.'<br>';

-	print $line1;

-	if (strlen($line1.$line2) > 50) {

-		print '<br>';

-	} else {

-		print ' - ';

-	}

-	print $line2;

-	print '</span>';

-	print '</footer>'."\n";

-}

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_contact.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_contact.lib.php
@@ -4 +4 @@
- * Copyright (C) 2015-2021  Frederic France     <frederic.france@netlogic.fr>

+ * Copyright (C) 2015       Frederic France     <frederic.france@free.fr>

@@ -45,2 +45,3 @@
-	if ((!empty($conf->ldap->enabled) && getDolGlobalString('LDAP_CONTACT_ACTIVE'))

-		&& (!getDolGlobalString('MAIN_DISABLE_LDAP_TAB') || !empty($user->admin))) {

+	if ((!empty($conf->ldap->enabled) && !empty($conf->global->LDAP_CONTACT_ACTIVE))

+		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || !empty($user->admin)))

+	{

@@ -60,6 +61,8 @@
-	if (isModEnabled('project') && $user->hasRight('project', 'lire')) {

-		$nbProject = 0;

-		// Enable caching of thirdrparty count projects

-		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';

-		$cachekey = 'count_projects_contact_'.$object->id;

-		$dataretrieved = dol_getcache($cachekey);

+	// Related items

+    if (! empty($conf->commande->enabled) || ! empty($conf->propal->enabled) || ! empty($conf->facture->enabled) || ! empty($conf->ficheinter->enabled) || !empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))

+    {

+        $head[$tab][0] = DOL_URL_ROOT.'/contact/consumption.php?id='.$object->id;

+        $head[$tab][1] = $langs->trans("Referers");

+        $head[$tab][2] = 'consumption';

+        $tab++;

+    }

@@ -67,9 +70,5 @@
-		if (!is_null($dataretrieved)) {

-			$nbProject = $dataretrieved;

-		} else {

-			$sql = 'SELECT COUNT(n.rowid) as nb';

-			$sql .= ' FROM '.MAIN_DB_PREFIX.'projet as n';

-			$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact as cc ON (n.rowid = cc.element_id)';

-			$sql .= " WHERE cc.fk_socpeople = ".((int) $object->id);

-			$sql .= " AND cc.fk_c_type_contact IN (SELECT rowid FROM ".MAIN_DB_PREFIX."c_type_contact WHERE element='project' AND source='external')";

-			$sql .= " AND n.entity IN (".getEntity('project').")";

+    // Show more tabs from modules

+    // Entries must be declared in modules descriptor with line

+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

+    // $this->tabs = array('entity:-tabname);   												to remove a tab

+    complete_head_from_modules($conf, $langs, $object, $head, $tab, 'contact');

@@ -77,17 +76,9 @@
-			$resql = $db->query($sql);

-			if ($resql) {

-				$obj = $db->fetch_object($resql);

-				$nbProject = $obj->nb;

-			} else {

-				dol_print_error($db);

-			}

-			dol_setcache($cachekey, $nbProject, 120);	// If setting cache fails, this is not a problem, so we do not test result.

-		}

-		$head[$tab][0] = DOL_URL_ROOT.'/contact/project.php?id='.$object->id;

-		$head[$tab][1] = $langs->trans("Projects");

-		if ($nbProject > 0) {

-			$head[$tab][1] .= '<span class="badge marginleftonlyshort">'.$nbProject.'</span>';

-		}

-		$head[$tab][2] = 'project';

-		$tab++;

-	}

+    // Notes

+    if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {

+        $nbNote = (empty($object->note_private) ? 0 : 1) + (empty($object->note_public) ? 0 : 1);

+        $head[$tab][0] = DOL_URL_ROOT.'/contact/note.php?id='.$object->id;

+        $head[$tab][1] = $langs->trans("Note");

+        if ($nbNote > 0) $head[$tab][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

+        $head[$tab][2] = 'note';

+        $tab++;

+    }

@@ -95,7 +86,10 @@
-	// Related items

-	if (isModEnabled('commande') || isModEnabled("propal") || isModEnabled('facture') || isModEnabled('ficheinter') || isModEnabled("supplier_proposal") || isModEnabled("supplier_order") || isModEnabled("supplier_invoice")) {

-		$head[$tab][0] = DOL_URL_ROOT.'/contact/consumption.php?id='.$object->id;

-		$head[$tab][1] = $langs->trans("Referers");

-		$head[$tab][2] = 'consumption';

-		$tab++;

-	}

+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

+    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

+    $upload_dir = $conf->societe->dir_output."/contact/".dol_sanitizeFileName($object->ref);

+    $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));

+    $nbLinks = Link::count($db, $object->element, $object->id);

+    $head[$tab][0] = DOL_URL_ROOT.'/contact/document.php?id='.$object->id;

+    $head[$tab][1] = $langs->trans("Documents");

+    if (($nbFiles + $nbLinks) > 0) $head[$tab][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

+    $head[$tab][2] = 'documents';

+    $tab++;

@@ -103,5 +97,10 @@
-	// Show more tabs from modules

-	// Entries must be declared in modules descriptor with line

-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname);   												to remove a tab

-	complete_head_from_modules($conf, $langs, $object, $head, $tab, 'contact', 'add', 'core');

+    // Agenda / Events

+    $head[$tab][0] = DOL_URL_ROOT.'/contact/agenda.php?id='.$object->id;

+    $head[$tab][1] .= $langs->trans("Events");

+    if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))

+    {

+        $head[$tab][1] .= '/';

+        $head[$tab][1] .= $langs->trans("Agenda");

+    }

+    $head[$tab][2] = 'agenda';

+    $tab++;

@@ -109,38 +108,3 @@
-	// Notes

-	if (!getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {

-		$nbNote = (empty($object->note_private) ? 0 : 1) + (empty($object->note_public) ? 0 : 1);

-		$head[$tab][0] = DOL_URL_ROOT.'/contact/note.php?id='.$object->id;

-		$head[$tab][1] = $langs->trans("Note");

-		if ($nbNote > 0) {

-			$head[$tab][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

-		}

-		$head[$tab][2] = 'note';

-		$tab++;

-	}

-

-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

-	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

-	$upload_dir = $conf->societe->dir_output."/contact/".dol_sanitizeFileName($object->ref);

-	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));

-	$nbLinks = Link::count($db, $object->element, $object->id);

-	$head[$tab][0] = DOL_URL_ROOT.'/contact/document.php?id='.$object->id;

-	$head[$tab][1] = $langs->trans("Documents");

-	if (($nbFiles + $nbLinks) > 0) {

-		$head[$tab][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

-	}

-	$head[$tab][2] = 'documents';

-	$tab++;

-

-	// Agenda / Events

-	$head[$tab][0] = DOL_URL_ROOT.'/contact/agenda.php?id='.$object->id;

-	$head[$tab][1] = $langs->trans("Events");

-	if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {

-		$head[$tab][1] .= '/';

-		$head[$tab][1] .= $langs->trans("Agenda");

-	}

-	$head[$tab][2] = 'agenda';

-	$tab++;

-

-	// Log

-	/*

-	$head[$tab][0] = DOL_URL_ROOT.'/contact/info.php?id='.$object->id;

+    // Log

+    /*

+    $head[$tab][0] = DOL_URL_ROOT.'/contact/info.php?id='.$object->id;

@@ -150,2 +113,0 @@
-

-	complete_head_from_modules($conf, $langs, $object, $head, $tab, 'contact', 'add', 'external');

@@ -157,128 +118,0 @@
-

-/**

- * 		Show html area for list of projects

- *

- *		@param	Conf		$conf			Object conf

- * 		@param	Translate	$langs			Object langs

- * 		@param	DoliDB		$db				Database handler

- * 		@param	Object		$object			Third party object

- *      @param  string		$backtopage		Url to go once contact is created

- *      @param  int         $nocreatelink   1=Hide create project link

- *      @param	string		$morehtmlright	More html on right of title

- *      @return	int

- */

-function show_contacts_projects($conf, $langs, $db, $object, $backtopage = '', $nocreatelink = 0, $morehtmlright = '')

-{

-	global $user;

-

-	$i = -1;

-

-	if (isModEnabled('project') && $user->hasRight('projet', 'lire')) {

-		$langs->load("projects");

-

-		$newcardbutton = '';

-		if (isModEnabled('project') && $user->hasRight('projet', 'creer') && empty($nocreatelink)) {

-			$newcardbutton .= dolGetButtonTitle($langs->trans('AddProject'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/projet/card.php?socid='.$object->id.'&amp;action=create&amp;backtopage='.urlencode($backtopage));

-		}

-

-		print "\n";

-		print load_fiche_titre($langs->trans("ProjectsHavingThisContact"), $newcardbutton.$morehtmlright, '');

-		print '<div class="div-table-responsive">';

-		print "\n".'<table class="noborder" width=100%>';

-

-		$sql  = 'SELECT p.rowid as id, p.entity, p.title, p.ref, p.public, p.dateo as do, p.datee as de, p.fk_statut as status, p.fk_opp_status, p.opp_amount, p.opp_percent, p.tms as date_update, p.budget_amount';

-		$sql .= ', cls.code as opp_status_code, ctc.libelle as type_label';

-		$sql .= ' FROM '.MAIN_DB_PREFIX.'projet as p';

-		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_lead_status as cls on p.fk_opp_status = cls.rowid';

-		$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact as cc ON (p.rowid = cc.element_id)';

-		$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'c_type_contact as ctc ON (ctc.rowid = cc.fk_c_type_contact)';

-		$sql .= " WHERE cc.fk_socpeople = ".((int) $object->id);

-		$sql .= " AND ctc.element='project' AND ctc.source='external'";

-		$sql .= " AND p.entity IN (".getEntity('project').")";

-		$sql .= " ORDER BY p.dateo DESC";

-

-		$result = $db->query($sql);

-		if ($result) {

-			$num = $db->num_rows($result);

-

-			print '<tr class="liste_titre">';

-			print '<td>'.$langs->trans("Ref").'</td>';

-			print '<td>'.$langs->trans("Name").'</td>';

-			print '<td>'.$langs->trans("ContactType").'</td>';

-			print '<td class="center">'.$langs->trans("DateStart").'</td>';

-			print '<td class="center">'.$langs->trans("DateEnd").'</td>';

-			print '<td class="right">'.$langs->trans("OpportunityAmountShort").'</td>';

-			print '<td class="center">'.$langs->trans("OpportunityStatusShort").'</td>';

-			print '<td class="right">'.$langs->trans("OpportunityProbabilityShort").'</td>';

-			print '<td class="right">'.$langs->trans("Status").'</td>';

-			print '</tr>';

-

-			if ($num > 0) {

-				require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';

-

-				$projecttmp = new Project($db);

-

-				$i = 0;

-

-				while ($i < $num) {

-					$obj = $db->fetch_object($result);

-					$projecttmp->fetch($obj->id);

-

-					// To verify role of users

-					$userAccess = $projecttmp->restrictedProjectArea($user);

-

-					if ($user->hasRight('projet', 'lire') && $userAccess > 0) {

-						print '<tr class="oddeven">';

-

-						// Ref

-						print '<td>';

-						print $projecttmp->getNomUrl(1);

-						print '</td>';

-

-						// Label

-						print '<td>'.dol_escape_htmltag($obj->title).'</td>';

-						print '<td>'.dol_escape_htmltag($obj->type_label).'</td>';

-						// Date start

-						print '<td class="center">'.dol_print_date($db->jdate($obj->do), "day").'</td>';

-						// Date end

-						print '<td class="center">'.dol_print_date($db->jdate($obj->de), "day").'</td>';

-						// Opp amount

-						print '<td class="right">';

-						if ($obj->opp_status_code) {

-							print price($obj->opp_amount, 1, '', 1, -1, -1, '');

-						}

-						print '</td>';

-						// Opp status

-						print '<td class="center">';

-						if ($obj->opp_status_code) {

-							print $langs->trans("OppStatus".$obj->opp_status_code);

-						}

-						print '</td>';

-						// Opp percent

-						print '<td class="right">';

-						if ($obj->opp_percent) {

-							print price($obj->opp_percent, 1, '', 1, 0).'%';

-						}

-						print '</td>';

-						// Status

-						print '<td class="right">'.$projecttmp->getLibStatut(5).'</td>';

-

-						print '</tr>';

-					}

-					$i++;

-				}

-			} else {

-				print '<tr class="oddeven"><td colspan="8"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';

-			}

-			$db->free($result);

-		} else {

-			dol_print_error($db);

-		}

-		print "</table>";

-		print '</div>';

-

-		print "<br>\n";

-	}

-

-	return $i;

-}

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_contract.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_contract.lib.php
@@ -4 +3,0 @@
- * Copyright (C) 2023		Charlene BENKE		<charlene@patas-monkey.com>

@@ -44,3 +43,4 @@
-	if (!getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB')) {

-		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));

-		$head[$h][0] = DOL_URL_ROOT.'/contrat/contact.php?id='.$object->id;

+	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))

+	{

+	    $nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));

+	    $head[$h][0] = DOL_URL_ROOT.'/contrat/contact.php?id='.$object->id;

@@ -48,3 +48 @@
-		if ($nbContact > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';

-		}

+		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';

@@ -55,7 +53,5 @@
-	/* deprecated. Contracts and tickets are already linked with the generic "Link to" feature */

-	if (isModEnabled('ticket') && getDolGlobalString('TICKET_LINK_TO_CONTRACT_WITH_HARDLINK')) {

-		$head[$h][0] = DOL_URL_ROOT.'/contrat/ticket.php?id='.$object->id;

-		$head[$h][1] = $langs->trans("Tickets");

-		$head[$h][2] = 'ticket';

-		$h++;

-	}

+    // Show more tabs from modules

+    // Entries must be declared in modules descriptor with line

+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

+    // $this->tabs = array('entity:-tabname);   												to remove a tab

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'contract');

@@ -63,22 +59,11 @@
-	// Show more tabs from modules

-	// Entries must be declared in modules descriptor with line

-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname);   												to remove a tab

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'contract', 'add', 'core');

-

-	if (!getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {

-		$nbNote = 0;

-		if (!empty($object->note_private)) {

-			$nbNote++;

-		}

-		if (!empty($object->note_public)) {

-			$nbNote++;

-		}

-		$head[$h][0] = DOL_URL_ROOT.'/contrat/note.php?id='.$object->id;

-		$head[$h][1] = $langs->trans("Notes");

-		if ($nbNote > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

-		}

-		$head[$h][2] = 'note';

-		$h++;

-	}

+    if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))

+    {

+    	$nbNote = 0;

+        if (!empty($object->note_private)) $nbNote++;

+		if (!empty($object->note_public)) $nbNote++;

+    	$head[$h][0] = DOL_URL_ROOT.'/contrat/note.php?id='.$object->id;

+    	$head[$h][1] = $langs->trans("Notes");

+		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

+    	$head[$h][2] = 'note';

+    	$h++;

+    }

@@ -87,2 +72,2 @@
-	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

-	$upload_dir = $conf->contrat->multidir_output[$object->entity]."/".dol_sanitizeFileName($object->ref);

+    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

+	$upload_dir = $conf->contrat->dir_output."/".dol_sanitizeFileName($object->ref);

@@ -90 +75 @@
-	$nbLinks = Link::count($db, $object->element, $object->id);

+    $nbLinks = Link::count($db, $object->element, $object->id);

@@ -93,3 +78 @@
-	if (($nbFiles + $nbLinks) > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

-	}

+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

@@ -99 +81,0 @@
-

@@ -101,24 +83,3 @@
-	$head[$h][1] = $langs->trans("Events");

-	if (isModEnabled('agenda')&& ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {

-		$nbEvent = 0;

-		// Enable caching of thirdparty count actioncomm

-		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';

-		$cachekey = 'count_events_contract_'.$object->id;

-		$dataretrieved = dol_getcache($cachekey);

-		if (!is_null($dataretrieved)) {

-			$nbEvent = $dataretrieved;

-		} else {

-			$sql = "SELECT COUNT(id) as nb";

-			$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm";

-			$sql .= " WHERE fk_element = ".((int) $object->id);

-			$sql .= " AND elementtype = 'contract'";

-			$resql = $db->query($sql);

-			if ($resql) {

-				$obj = $db->fetch_object($resql);

-				$nbEvent = $obj->nb;

-			} else {

-				dol_syslog('Failed to count actioncomm '.$db->lasterror(), LOG_ERR);

-			}

-			dol_setcache($cachekey, $nbEvent, 120);		// If setting cache fails, this is not a problem, so we do not test result.

-		}

-

+	$head[$h][1] .= $langs->trans("Events");

+	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))

+	{

@@ -127,3 +87,0 @@
-		if ($nbEvent > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbEvent.'</span>';

-		}

@@ -134,3 +92 @@
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'contract', 'add', 'external');

-

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'contract', 'remove');

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'contract', 'remove');

@@ -148,5 +104 @@
-	global $langs, $conf, $db;

-

-	$extrafields = new ExtraFields($db);

-	$extrafields->fetch_name_optionals_label('contrat');

-	$extrafields->fetch_name_optionals_label('contratdet');

+	global $langs, $conf;

@@ -166 +118 @@
-	complete_head_from_modules($conf, $langs, null, $head, $h, 'contract_admin', 'add', 'core');

+	complete_head_from_modules($conf, $langs, null, $head, $h, 'contract_admin');

@@ -170,6 +122,2 @@
-	$nbExtrafields = $extrafields->attributes['contrat']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

-	$head[$h][2] = 'attributes';

-	$h++;

+    $head[$h][2] = 'attributes';

+    $h++;

@@ -177,10 +125,4 @@
-	$head[$h][0] = DOL_URL_ROOT.'/contrat/admin/contractdet_extrafields.php';

-	$head[$h][1] = $langs->trans("ExtraFieldsLines");

-	$nbExtrafields = $extrafields->attributes['contratdet']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

-	$head[$h][2] = 'attributeslines';

-	$h++;

-

-	complete_head_from_modules($conf, $langs, null, $head, $h, 'contract_admin', 'add', 'external');

+    $head[$h][0] = DOL_URL_ROOT.'/contrat/admin/contractdet_extrafields.php';

+    $head[$h][1] = $langs->trans("ExtraFieldsLines");

+    $head[$h][2] = 'attributeslines';

+    $h++;

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_cron.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_cron.lib.php
@@ -33,3 +33,3 @@
-	global $langs, $conf, $user;

-	$h = 0;

-	$head = array();

+    global $langs, $conf, $user;

+    $h = 0;

+    $head = array();

@@ -37,4 +37,4 @@
-	$head[$h][0] = DOL_URL_ROOT.'/cron/admin/cron.php';

-	$head[$h][1] = $langs->trans("Miscellaneous");

-	$head[$h][2] = 'setup';

-	$h++;

+    $head[$h][0] = dol_buildpath('/cron/admin/cron.php', 1);

+    $head[$h][1] = $langs->trans("Miscellaneous");

+    $head[$h][2] = 'setup';

+    $h++;

@@ -42,4 +42 @@
-	$head[$h][0] = DOL_URL_ROOT.'/cron/list.php?mode=modulesetup';

-	$head[$h][1] = $langs->trans("Module2300Name");

-	$head[$h][2] = 'jobs';

-	$h++;

+    complete_head_from_modules($conf, $langs, null, $head, $h, 'cronadmin');

@@ -47,3 +44 @@
-	complete_head_from_modules($conf, $langs, null, $head, $h, 'cronadmin');

-

-	complete_head_from_modules($conf, $langs, null, $head, $h, 'cronadmin', 'remove');

+    complete_head_from_modules($conf, $langs, null, $head, $h, 'cronadmin', 'remove');

@@ -52 +47 @@
-	return $head;

+    return $head;

@@ -67 +62 @@
-	$head[$h][0] = DOL_URL_ROOT.'/cron/card.php?id='.$object->id;

+	$head[$h][0] = dol_buildpath('/cron/card.php', 1).'?id='.$object->id;

@@ -72 +67 @@
-	$head[$h][0] = DOL_URL_ROOT.'/cron/info.php?id='.$object->id;

+	$head[$h][0] = dol_buildpath('/cron/info.php', 1).'?id='.$object->id;

@@ -102,16 +97,7 @@
-	$url = $urlwithroot.'/public/cron/cron_run_jobs_by_url.php?'.(!getDolGlobalString('CRON_KEY') ? '' : 'securitykey=' . getDolGlobalString('CRON_KEY').'&').'userlogin='.$user->login;

-	print '<div class="urllink">';

-	print '<input type="text" id="publicurlmember" class="quatrevingtpercentminusx" value="'.$url.'">';

-	print ' <a href="'.$url.'" target="_blank" rel="noopener noreferrer">'.img_picto('', 'globe')."</a>\n";

-	print '</div>';

-	print '<br> '.$langs->trans("OrToLaunchASpecificJob").'<br>';

-	$url = $urlwithroot.'/public/cron/cron_run_jobs_by_url.php?'.(!getDolGlobalString('CRON_KEY') ? '' : 'securitykey=' . getDolGlobalString('CRON_KEY').'&').'userlogin='.$user->login.'&id=cronjobid';

-	print '<div class="urllink">';

-	print '<input type="text" id="publicurlmemberall" class="quatrevingtpercentminusx" value="'.$url.'">';

-	print ' <a href="'.$url.'" target="_blank" rel="noopener noreferrer">'.img_picto('', 'globe')."</a>\n";

-	print '</div>';

-	print '</div>';

-	print '<br>';

-

-	print ajax_autoselect("publicurlmember");

-	print ajax_autoselect("publicurlmemberall");

+	$url = $urlwithroot.'/public/cron/cron_run_jobs.php?'.(empty($conf->global->CRON_KEY) ? '' : 'securitykey='.$conf->global->CRON_KEY.'&').'userlogin='.$user->login;

+	print img_picto('', 'globe').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";

+	print ' '.$langs->trans("OrToLaunchASpecificJob").'<br>';

+	$url = $urlwithroot.'/public/cron/cron_run_jobs.php?'.(empty($conf->global->CRON_KEY) ? '' : 'securitykey='.$conf->global->CRON_KEY.'&').'userlogin='.$user->login.'&id=cronjobid';

+	print img_picto('', 'globe').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";

+    print '</div>';

+    print '<br>';

@@ -120,3 +106 @@
-	if ($user->admin) {

-		$logintouse = $user->login;

-	}

+	if ($user->admin) $logintouse = $user->login;

@@ -126,7 +110,2 @@
-	$pathtoscript = '/pathtoscript';

-	if (getDolGlobalString('MAIN_DOL_SCRIPTS_ROOT')) {

-		$pathtoscript = $conf->global->MAIN_DOL_SCRIPTS_ROOT;

-	}

-

-	$file = $pathtoscript.'/scripts/cron/cron_run_jobs.php '.(!getDolGlobalString('CRON_KEY') ? 'securitykey' : '' . getDolGlobalString('CRON_KEY')).' '.$logintouse.' [cronjobid]';

-	print '<textarea class="quatrevingtpercent">'.$file."</textarea><br>\n";

+	$file = '/scripts/cron/cron_run_jobs.php '.(empty($conf->global->CRON_KEY) ? 'securitykey' : ''.$conf->global->CRON_KEY.'').' '.$logintouse.' [cronjobid]';

+	print '<textarea class="quatrevingtpercent">..'.$file."</textarea><br>\n";

@@ -136,16 +115,16 @@
-	if (!getDolGlobalString('CRON_DISABLE_TUTORIAL_CRON')) {

-		$linuxlike = 1;

-		if (preg_match('/^win/i', PHP_OS)) {

-			$linuxlike = 0;

-		}

-		if (preg_match('/^mac/i', PHP_OS)) {

-			$linuxlike = 0;

-		}

-		print $langs->trans("Note").': ';

-		if ($linuxlike) {

-			print $langs->trans("CronExplainHowToRunUnix");

-			print '<br>';

-			print '<textarea class="quatrevingtpercent">*/5 * * * * '.$pathtoscript.'/scripts/cron/cron_run_jobs.php '.(!getDolGlobalString('CRON_KEY') ? 'securitykey' : '' . getDolGlobalString('CRON_KEY')).' '.$logintouse.' &gt; '.DOL_DATA_ROOT.'/cron_run_jobs.php.log</textarea><br>';

-		} else {

-			print $langs->trans("CronExplainHowToRunWin");

-		}

+	if (empty($conf->global->CRON_DISABLE_TUTORIAL_CRON))

+	{

+    	$linuxlike = 1;

+    	if (preg_match('/^win/i', PHP_OS)) $linuxlike = 0;

+    	if (preg_match('/^mac/i', PHP_OS)) $linuxlike = 0;

+    	print $langs->trans("Note").': ';

+    	if ($linuxlike)

+    	{

+    		print $langs->trans("CronExplainHowToRunUnix");

+    		print '<br>';

+    		print '<textarea class="quatrevingtpercent">*/5 * * * * pathtoscript/scripts/cron/cron_run_jobs.php '.(empty($conf->global->CRON_KEY) ? 'securitykey' : ''.$conf->global->CRON_KEY.'').' '.$logintouse.' &gt; '.DOL_DATA_ROOT.'/cron_run_jobs.php.log</textarea><br>';

+    	}

+    	else

+    	{

+    		print $langs->trans("CronExplainHowToRunWin");

+    	}

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_date.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_date.lib.php
@@ -6,4 +6,2 @@
- * Copyright (C) 2018-2024 Charlene Benke       <charlene@patas-monkey.com>

- * Copyright (C) 2024	     MDW					        <mdeweerd@users.noreply.github.com>

- * Copyright (C) 2024      Frédéric France      <frederic.france@free.fr>

- *

+ * Copyright (C) 2018      Charlene Benke       <charlie@patas-monkey.com>

+*

@@ -38,28 +36,28 @@
-	$tzarray = array(

-		-11=>"Pacific/Midway",

-		-10=>"Pacific/Fakaofo",

-		-9=>"America/Anchorage",

-		-8=>"America/Los_Angeles",

-		-7=>"America/Dawson_Creek",

-		-6=>"America/Chicago",

-		-5=>"America/Bogota",

-		-4=>"America/Anguilla",

-		-3=>"America/Araguaina",

-		-2=>"America/Noronha",

-		-1=>"Atlantic/Azores",

-		0=>"Africa/Abidjan",

-		1=>"Europe/Paris",

-		2=>"Europe/Helsinki",

-		3=>"Europe/Moscow",

-		4=>"Asia/Dubai",

-		5=>"Asia/Karachi",

-		6=>"Indian/Chagos",

-		7=>"Asia/Jakarta",

-		8=>"Asia/Hong_Kong",

-		9=>"Asia/Tokyo",

-		10=>"Australia/Sydney",

-		11=>"Pacific/Noumea",

-		12=>"Pacific/Auckland",

-		13=>"Pacific/Enderbury"

-	);

-	return $tzarray;

+    $tzarray = array(

+        -11=>"Pacific/Midway",

+        -10=>"Pacific/Fakaofo",

+        -9=>"America/Anchorage",

+        -8=>"America/Los_Angeles",

+        -7=>"America/Dawson_Creek",

+        -6=>"America/Chicago",

+        -5=>"America/Bogota",

+        -4=>"America/Anguilla",

+        -3=>"America/Araguaina",

+        -2=>"America/Noronha",

+        -1=>"Atlantic/Azores",

+        0=>"Africa/Abidjan",

+        1=>"Europe/Paris",

+        2=>"Europe/Helsinki",

+        3=>"Europe/Moscow",

+        4=>"Asia/Dubai",

+        5=>"Asia/Karachi",

+        6=>"Indian/Chagos",

+        7=>"Asia/Jakarta",

+        8=>"Asia/Hong_Kong",

+        9=>"Asia/Tokyo",

+        10=>"Australia/Sydney",

+        11=>"Pacific/Noumea",

+        12=>"Pacific/Auckland",

+        13=>"Pacific/Enderbury"

+    );

+    return $tzarray;

@@ -76 +74 @@
-	return @date_default_timezone_get();

+    return @date_default_timezone_get();

@@ -83 +81 @@
- * @return 	float					An offset in hour (+1 for Europe/Paris on winter and +2 for Europe/Paris on summer). Note some countries use half and even quarter hours.

+ * @return 	int						An offset in hour (+1 for Europe/Paris on winter and +2 for Europe/Paris on summer)

@@ -87,24 +85,20 @@
-	if (method_exists('DateTimeZone', 'getOffset')) {

-		// Method 1 (include daylight)

-		$gmtnow = dol_now('gmt');

-		$yearref = dol_print_date($gmtnow, '%Y');

-		$monthref = dol_print_date($gmtnow, '%m');

-		$dayref = dol_print_date($gmtnow, '%d');

-		if ($refgmtdate == 'now') {

-			$newrefgmtdate = $yearref.'-'.$monthref.'-'.$dayref;

-		} elseif ($refgmtdate == 'summer') {

-			$newrefgmtdate = $yearref.'-08-01';

-		} else {

-			$newrefgmtdate = $yearref.'-01-01';

-		}

-		$newrefgmtdate .= 'T00:00:00+00:00';

-		$localtz = new DateTimeZone(getServerTimeZoneString());

-		$localdt = new DateTime($newrefgmtdate, $localtz);

-		$tmp = -1 * $localtz->getOffset($localdt);

-		//print $refgmtdate.'='.$tmp;

-	} else {

-		$tmp = 0;

-		dol_print_error('', 'PHP version must be 5.3+');

-	}

-	$tz = round(($tmp < 0 ? 1 : -1) * abs($tmp / 3600));

-	return $tz;

+    if (method_exists('DateTimeZone', 'getOffset'))

+    {

+        // Method 1 (include daylight)

+        $gmtnow = dol_now('gmt'); $yearref = dol_print_date($gmtnow, '%Y'); $monthref = dol_print_date($gmtnow, '%m'); $dayref = dol_print_date($gmtnow, '%d');

+        if ($refgmtdate == 'now') $newrefgmtdate = $yearref.'-'.$monthref.'-'.$dayref;

+        elseif ($refgmtdate == 'summer') $newrefgmtdate = $yearref.'-08-01';

+        else $newrefgmtdate = $yearref.'-01-01';

+        $newrefgmtdate .= 'T00:00:00+00:00';

+        $localtz = new DateTimeZone(getServerTimeZoneString());

+        $localdt = new DateTime($newrefgmtdate, $localtz);

+        $tmp = -1 * $localtz->getOffset($localdt);

+        //print $refgmtdate.'='.$tmp;

+    }

+    else

+    {

+    	$tmp = 0;

+    	dol_print_error('', 'PHP version must be 5.3+');

+    }

+    $tz = round(($tmp < 0 ? 1 : -1) * abs($tmp / 3600));

+    return $tz;

@@ -119,2 +113 @@
- *  @param      int			$duration_unit      Unit of added delay (d, m, y, w, h, i)

- *  @param      int         $ruleforendofmonth  Change the behavior of PHP over data-interval, 0 or 1

+ *  @param      int			$duration_unit      Unit of added delay (d, m, y, w, h)

@@ -122,3 +115,2 @@
- *  @see convertSecondToTime(), convertTimeToSeconds()

- */

-function dol_time_plus_duree($time, $duration_value, $duration_unit, $ruleforendofmonth = 0)

+ */

+function dol_time_plus_duree($time, $duration_value, $duration_unit)

@@ -127,15 +119,4 @@
-	if (empty($duration_value)) {

-		return $time;

-	}

-	if ($duration_unit == 's') {

-		return $time + ($duration_value);

-	}

-	if ($duration_unit == 'i') {

-		return $time + (60 * $duration_value);

-	}

-	if ($duration_unit == 'h') {

-		return $time + (3600 * $duration_value);

-	}

-	if ($duration_unit == 'w') {

-		return $time + (3600 * 24 * 7 * $duration_value);

-	}

+

+	if ($duration_value == 0)  return $time;

+	if ($duration_unit == 'h') return $time + (3600 * $duration_value);

+	if ($duration_unit == 'w') return $time + (3600 * 24 * 7 * $duration_value);

@@ -145,17 +126,5 @@
-	if ($duration_value > 0) {

-		$deltastring .= abs($duration_value);

-		$sub = false;

-	}

-	if ($duration_value < 0) {

-		$deltastring .= abs($duration_value);

-		$sub = true;

-	}

-	if ($duration_unit == 'd') {

-		$deltastring .= "D";

-	}

-	if ($duration_unit == 'm') {

-		$deltastring .= "M";

-	}

-	if ($duration_unit == 'y') {

-		$deltastring .= "Y";

-	}

+	if ($duration_value > 0) { $deltastring .= abs($duration_value); $sub = false; }

+	if ($duration_value < 0) { $deltastring .= abs($duration_value); $sub = true; }

+	if ($duration_unit == 'd') { $deltastring .= "D"; }

+	if ($duration_unit == 'm') { $deltastring .= "M"; }

+	if ($duration_unit == 'y') { $deltastring .= "Y"; }

@@ -164,3 +133 @@
-	if (getDolGlobalString('MAIN_DATE_IN_MEMORY_ARE_GMT')) {

-		$date->setTimezone(new DateTimeZone('UTC'));

-	}

+	if (!empty($conf->global->MAIN_DATE_IN_MEMORY_ARE_GMT)) $date->setTimezone(new DateTimeZone('UTC'));

@@ -170,30 +137,3 @@
-	if ($sub) {

-		$date->sub($interval);

-	} else {

-		$date->add($interval);

-	}

-	//Change the behavior of PHP over data-interval when the result of this function is Feb 29 (non-leap years), 30 or Feb 31 (so php returns March 1, 2 or 3 respectively)

-	if ($ruleforendofmonth == 1 && $duration_unit == 'm') {

-		$timeyear = dol_print_date($time, '%Y');

-		$timemonth = dol_print_date($time, '%m');

-		$timetotalmonths = (($timeyear * 12) + $timemonth);

-

-		$monthsexpected = ($timetotalmonths + $duration_value);

-

-		$newtime = $date->getTimestamp();

-

-		$newtimeyear = dol_print_date($newtime, '%Y');

-		$newtimemonth = dol_print_date($newtime, '%m');

-		$newtimetotalmonths = (($newtimeyear * 12) + $newtimemonth);

-

-		if ($monthsexpected < $newtimetotalmonths) {

-			$newtimehours = dol_print_date($newtime, '%H');

-			$newtimemins = dol_print_date($newtime, '%M');

-			$newtimesecs = dol_print_date($newtime, '%S');

-

-			$datelim = dol_mktime($newtimehours, $newtimemins, $newtimesecs, $newtimemonth, 1, $newtimeyear);

-			$datelim -= (3600 * 24);

-

-			$date->setTimestamp($datelim);

-		}

-	}

+	if ($sub) $date->sub($interval);

+	else $date->add($interval);

+

@@ -215 +155 @@
-	$iResult = ((int) $iHours * 3600) + ((int) $iMinutes * 60) + (int) $iSeconds;

+	$iResult = ($iHours * 3600) + ($iMinutes * 60) + $iSeconds;

@@ -224,2 +164 @@
- *    	@param      string	$format		    Output format

- *    										- 'all': total delay days hour:min like "2 days 12:30",

+ *    	@param      string	$format		    Output format ('all': total delay days hour:min like "2 days 12:30",

@@ -246,19 +185,15 @@
-	if (empty($lengthOfDay)) {

-		$lengthOfDay = 86400; // 1 day = 24 hours

-	}

-	if (empty($lengthOfWeek)) {

-		$lengthOfWeek = 7; // 1 week = 7 days

-	}

-	$nbHbyDay = $lengthOfDay / 3600;

-

-	if ($format == 'all' || $format == 'allwithouthour' || $format == 'allhour' || $format == 'allhourmin' || $format == 'allhourminsec') {

-		if ((int) $iSecond === 0) {

-			return '0'; // This is to avoid having 0 return a 12:00 AM for en_US

-		}

-

-		$sTime = '';

-		$sDay = 0;

-		$sWeek = 0;

-

-		if ($iSecond >= $lengthOfDay) {

-			for ($i = $iSecond; $i >= $lengthOfDay; $i -= $lengthOfDay) {

+	if (empty($lengthOfDay))  $lengthOfDay = 86400; // 1 day = 24 hours

+    if (empty($lengthOfWeek)) $lengthOfWeek = 7; // 1 week = 7 days

+

+    if ($format == 'all' || $format == 'allwithouthour' || $format == 'allhour' || $format == 'allhourmin' || $format == 'allhourminsec')

+	{

+		if ((int) $iSecond === 0) return '0'; // This is to avoid having 0 return a 12:00 AM for en_US

+

+        $sTime = '';

+        $sDay = 0;

+        $sWeek = 0;

+

+		if ($iSecond >= $lengthOfDay)

+		{

+			for ($i = $iSecond; $i >= $lengthOfDay; $i -= $lengthOfDay)

+			{

@@ -269,19 +204,19 @@
-			if ($iSecond >= ($lengthOfDay * 2)) {

-				$dayTranslate = $langs->trans("Days");

-			}

-		}

-

-		if ($lengthOfWeek < 7) {

-			if ($sDay) {

-				if ($sDay >= $lengthOfWeek) {

-					$sWeek = (int) (($sDay - $sDay % $lengthOfWeek) / $lengthOfWeek);

-					$sDay = $sDay % $lengthOfWeek;

-					$weekTranslate = $langs->trans("DurationWeek");

-					if ($sWeek >= 2) {

-						$weekTranslate = $langs->trans("DurationWeeks");

-					}

-					$sTime .= $sWeek.' '.$weekTranslate.' ';

-				}

-			}

-		}

-		if ($sDay > 0) {

+			if ($iSecond >= ($lengthOfDay * 2)) $dayTranslate = $langs->trans("Days");

+		}

+

+		if ($lengthOfWeek < 7)

+		{

+        	if ($sDay)

+            {

+                if ($sDay >= $lengthOfWeek)

+                {

+                    $sWeek = (int) (($sDay - $sDay % $lengthOfWeek) / $lengthOfWeek);

+                    $sDay = $sDay % $lengthOfWeek;

+                    $weekTranslate = $langs->trans("DurationWeek");

+                    if ($sWeek >= 2) $weekTranslate = $langs->trans("DurationWeeks");

+                    $sTime .= $sWeek.' '.$weekTranslate.' ';

+                }

+            }

+		}

+		if ($sDay > 0)

+		{

@@ -289,8 +224,8 @@
-			if ($sDay > 1) {

-				$dayTranslate = $langs->trans("Days");

-			}

-			$sTime .= $sDay.' '.$langs->trans("d").' ';

-		}

-

-		if ($format == 'all') {

-			if ($iSecond || empty($sDay)) {

+			if ($sDay > 1) $dayTranslate = $langs->trans("Days");

+			$sTime .= $sDay.' '.$dayTranslate.' ';

+		}

+

+		if ($format == 'all')

+		{

+			if ($iSecond || empty($sDay))

+			{

@@ -299,8 +234,16 @@
-		} elseif ($format == 'allhourminsec') {

-			return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond/3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60))).':'.sprintf("%02d", ((int) ($iSecond % 60)));

-		} elseif ($format == 'allhourmin') {

-			return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond/3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600)/60)));

-		} elseif ($format == 'allhour') {

-			return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond/3600)));

-		}

-	} elseif ($format == 'hour') {	// only hour part

+		}

+		elseif ($format == 'allhourminsec')

+		{

+		    return sprintf("%02d", ($sWeek * $lengthOfWeek * 24 + $sDay * 24 + (int) floor($iSecond / 3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60))).':'.sprintf("%02d", ((int) ($iSecond % 60)));

+		}

+		elseif ($format == 'allhourmin')

+		{

+		    return sprintf("%02d", ($sWeek * $lengthOfWeek * 24 + $sDay * 24 + (int) floor($iSecond / 3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60)));

+		}

+		elseif ($format == 'allhour')

+		{

+			return sprintf("%02d", ($sWeek * $lengthOfWeek * 24 + $sDay * 24 + (int) floor($iSecond / 3600)));

+		}

+	}

+	elseif ($format == 'hour')	// only hour part

+	{

@@ -308 +251,3 @@
-	} elseif ($format == 'fullhour') {

+	}

+	elseif ($format == 'fullhour')

+	{

@@ -311 +256,2 @@
-		} else {

+		}

+		else {

@@ -315 +261,3 @@
-	} elseif ($format == 'min') {	// only min part

+	}

+	elseif ($format == 'min')	// only min part

+	{

@@ -317,60 +265,28 @@
-	} elseif ($format == 'sec') {	// only sec part

-		$sTime = dol_print_date($iSecond, '%S', true);

-	} elseif ($format == 'month') {	// only month part

-		$sTime = dol_print_date($iSecond, '%m', true);

-	} elseif ($format == 'year') {	// only year part

-		$sTime = dol_print_date($iSecond, '%Y', true);

-	}

-	return trim($sTime);

-}

-

-

-/**	  	Convert duration to hour

- *

- *    	@param      int		$duration_value		Duration value

- *    	@param      int		$duration_unit		Duration unit

- *      @return     int $result

- */

-function convertDurationtoHour($duration_value, $duration_unit)

-{

-	$result = 0;

-

-	if ($duration_unit == 's') {

-		$result = $duration_value / 3600;

-	}

-	if ($duration_unit == 'i') {

-		$result = $duration_value / 60;

-	}

-	if ($duration_unit == 'h') {

-		$result = $duration_value;

-	}

-	if ($duration_unit == 'd') {

-		$result = $duration_value * 24;

-	}

-	if ($duration_unit == 'w') {

-		$result = $duration_value * 24 * 7;

-	}

-	if ($duration_unit == 'm') {

-		$result = $duration_value * 730.484;

-	}

-	if ($duration_unit == 'y') {

-		$result = $duration_value * 365 * 24;

-	}

-

-	return $result;

-}

-

-/**

- * Generate a SQL string to make a filter into a range (for second of date until last second of date).

- * This method allows to maje SQL request that will deal correctly the timezone of server.

- *

- * @param      string		$datefield			Name of SQL field where apply sql date filter

- * @param      int|string	$day_date			Day date (Can be 0 or '' for filter on a month)

- * @param      int|string	$month_date			Month date (Can be 0 or '' for filter on a year)

- * @param      int|string	$year_date			Year date

- * @param	   int      	$excludefirstand	Exclude first and

- * @param	   mixed		$gm					False or 0 or 'tzserver' = Input date fields are date info in the server TZ. True or 1 or 'gmt' = Input are date info in GMT TZ.

- * 												Note: In database, dates are always fot the server TZ.

- * @return     string		$sqldate			String with SQL filter

- */

-function dolSqlDateFilter($datefield, $day_date, $month_date, $year_date, $excludefirstand = 0, $gm = false)

+	}

+    elseif ($format == 'sec')	// only sec part

+    {

+        $sTime = dol_print_date($iSecond, '%S', true);

+    }

+    elseif ($format == 'month')	// only month part

+    {

+        $sTime = dol_print_date($iSecond, '%m', true);

+    }

+    elseif ($format == 'year')	// only year part

+    {

+        $sTime = dol_print_date($iSecond, '%Y', true);

+    }

+    return trim($sTime);

+}

+

+

+/**

+ * Generate a SQL string to make a filter into a range (for second of date until last second of date)

+ *

+ * @param      string	$datefield			Name of SQL field where apply sql date filter

+ * @param      int		$day_date			Day date

+ * @param      int		$month_date			Month date

+ * @param      int		$year_date			Year date

+ * @param	   int      $excludefirstand	Exclude first and

+ * @return     string	$sqldate			String with SQL filter

+ */

+function dolSqlDateFilter($datefield, $day_date, $month_date, $year_date, $excludefirstand = 0)

@@ -379,6 +295 @@
-	$sqldate = '';

-

-	$day_date = intval($day_date);

-	$month_date = intval($month_date);

-	$year_date = intval($year_date);

-

+	$sqldate = "";

@@ -386,3 +296,0 @@
-		if ($month_date > 12) {	// protection for bad value of month

-			return " AND 1 = 2";

-		}

@@ -390,2 +298,2 @@
-			$sqldate .= ($excludefirstand ? "" : " AND ").$datefield." BETWEEN '".$db->idate(dol_get_first_day($year_date, $month_date, $gm));

-			$sqldate .= "' AND '".$db->idate(dol_get_last_day($year_date, $month_date, $gm))."'";

+			$sqldate .= ($excludefirstand ? "" : " AND ").$datefield." BETWEEN '".$db->idate(dol_get_first_day($year_date, $month_date, false));

+			$sqldate .= "' AND '".$db->idate(dol_get_last_day($year_date, $month_date, false))."'";

@@ -393,4 +301,3 @@
-			$sqldate .= ($excludefirstand ? "" : " AND ").$datefield." BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month_date, $day_date, $year_date, $gm));

-			$sqldate .= "' AND '".$db->idate(dol_mktime(23, 59, 59, $month_date, $day_date, $year_date, $gm))."'";

-		} else {

-			// This case is not reliable on TZ, but we should not need it.

+			$sqldate .= ($excludefirstand ? "" : " AND ").$datefield." BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month_date, $day_date, $year_date));

+			$sqldate .= "' AND '".$db->idate(dol_mktime(23, 59, 59, $month_date, $day_date, $year_date))."'";

+		} else

@@ -398 +304,0 @@
-		}

@@ -400,2 +306,2 @@
-		$sqldate .= ($excludefirstand ? "" : " AND ").$datefield." BETWEEN '".$db->idate(dol_get_first_day($year_date, 1, $gm));

-		$sqldate .= "' AND '".$db->idate(dol_get_last_day($year_date, 12, $gm))."'";

+		$sqldate .= ($excludefirstand ? "" : " AND ").$datefield." BETWEEN '".$db->idate(dol_get_first_day($year_date, 1, false));

+		$sqldate .= "' AND '".$db->idate(dol_get_last_day($year_date, 12, false))."'";

@@ -410,12 +316,12 @@
- *	@param	string		$string		Date in a string

- *				     		        YYYYMMDD

- *	                 				YYYYMMDDHHMMSS

- *									YYYYMMDDTHHMMSSZ

- *									YYYY-MM-DDTHH:MM:SSZ (RFC3339)

- *		                			DD/MM/YY or DD/MM/YYYY (deprecated)

- *		                			DD/MM/YY HH:MM:SS or DD/MM/YYYY HH:MM:SS (deprecated)

- *  @param	int|string	$gm         'gmt' or 1 =Input date is GM date,

- *                          	    'tzserver' or 0 =Input date is date using PHP server timezone

- *  @return	int						Date as a timestamp

- *		                			19700101020000 -> 7200 with gm=1

- *									19700101000000 -> 0 with gm=1

+ *	@param	string	$string		Date in a string

+ *				     	        YYYYMMDD

+ *	                 			YYYYMMDDHHMMSS

+ *								YYYYMMDDTHHMMSSZ

+ *								YYYY-MM-DDTHH:MM:SSZ (RFC3339)

+ *		                		DD/MM/YY or DD/MM/YYYY (deprecated)

+ *		                		DD/MM/YY HH:MM:SS or DD/MM/YYYY HH:MM:SS (deprecated)

+ *  @param	int		$gm         1 =Input date is GM date,

+ *                              0 =Input date is local date using PHP server timezone

+ *  @return	int					Date as a timestamp

+ *		                		19700101020000 -> 7200 with gm=1

+ *								19700101000000 -> 0 with gm=1

@@ -428,47 +334,39 @@
-	// Convert date with format DD/MM/YYY HH:MM:SS. This part of code should not be used.

-	if (preg_match('/^([0-9]+)\/([0-9]+)\/([0-9]+)\s?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i', $string, $reg)) {

-		dol_syslog("dol_stringtotime call to function with deprecated parameter format", LOG_WARNING);

-		// Date est au format 'DD/MM/YY' ou 'DD/MM/YY HH:MM:SS'

-		// Date est au format 'DD/MM/YYYY' ou 'DD/MM/YYYY HH:MM:SS'

-		$sday = $reg[1];

-		$smonth = $reg[2];

-		$syear = $reg[3];

-		$shour = $reg[4];

-		$smin = $reg[5];

-		$ssec = $reg[6];

-		if ($syear < 50) {

-			$syear += 1900;

-		}

-		if ($syear >= 50 && $syear < 100) {

-			$syear += 2000;

-		}

-		$string = sprintf("%04d%02d%02d%02d%02d%02d", $syear, $smonth, $sday, $shour, $smin, $ssec);

-	} elseif (preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})Z$/i', $string, $reg)	// Convert date with format YYYY-MM-DDTHH:MM:SSZ (RFC3339)

-		|| preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})$/i', $string, $reg)	// Convert date with format YYYY-MM-DD HH:MM:SS

-		|| preg_match('/^([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2})([0-9]{2})([0-9]{2})Z$/i', $string, $reg)		// Convert date with format YYYYMMDDTHHMMSSZ

-	) {

-		$syear = $reg[1];

-		$smonth = $reg[2];

-		$sday = $reg[3];

-		$shour = $reg[4];

-		$smin = $reg[5];

-		$ssec = $reg[6];

-		$string = sprintf("%04d%02d%02d%02d%02d%02d", $syear, $smonth, $sday, $shour, $smin, $ssec);

-	}

-

-	$string = preg_replace('/([^0-9])/i', '', $string);

-	$tmp = $string.'000000';

-	// Clean $gm

-	if ($gm === 1) {

-		$gm = 'gmt';

-	} elseif (empty($gm) || $gm === 'tzserver') {

-		$gm = 'tzserver';

-	}

-

-	$date = dol_mktime(substr($tmp, 8, 2), substr($tmp, 10, 2), substr($tmp, 12, 2), substr($tmp, 4, 2), substr($tmp, 6, 2), substr($tmp, 0, 4), $gm);

-	return $date;

-}

-

-

-/**

- *  Return previous day

+    // Convert date with format DD/MM/YYY HH:MM:SS. This part of code should not be used.

+    if (preg_match('/^([0-9]+)\/([0-9]+)\/([0-9]+)\s?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i', $string, $reg))

+    {

+        dol_syslog("dol_stringtotime call to function with deprecated parameter format", LOG_WARNING);

+        // Date est au format 'DD/MM/YY' ou 'DD/MM/YY HH:MM:SS'

+        // Date est au format 'DD/MM/YYYY' ou 'DD/MM/YYYY HH:MM:SS'

+        $sday = $reg[1];

+        $smonth = $reg[2];

+        $syear = $reg[3];

+        $shour = $reg[4];

+        $smin = $reg[5];

+        $ssec = $reg[6];

+        if ($syear < 50) $syear += 1900;

+        if ($syear >= 50 && $syear < 100) $syear += 2000;

+        $string = sprintf("%04d%02d%02d%02d%02d%02d", $syear, $smonth, $sday, $shour, $smin, $ssec);

+    }

+    elseif (

+    	   preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})Z$/i', $string, $reg)	// Convert date with format YYYY-MM-DDTHH:MM:SSZ (RFC3339)

+    	|| preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})$/i', $string, $reg)	// Convert date with format YYYY-MM-DD HH:MM:SS

+   		|| preg_match('/^([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2})([0-9]{2})([0-9]{2})Z$/i', $string, $reg)		// Convert date with format YYYYMMDDTHHMMSSZ

+    )

+    {

+        $syear = $reg[1];

+        $smonth = $reg[2];

+        $sday = $reg[3];

+        $shour = $reg[4];

+        $smin = $reg[5];

+        $ssec = $reg[6];

+        $string = sprintf("%04d%02d%02d%02d%02d%02d", $syear, $smonth, $sday, $shour, $smin, $ssec);

+    }

+

+    $string = preg_replace('/([^0-9])/i', '', $string);

+    $tmp = $string.'000000';

+    $date = dol_mktime(substr($tmp, 8, 2), substr($tmp, 10, 2), substr($tmp, 12, 2), substr($tmp, 4, 2), substr($tmp, 6, 2), substr($tmp, 0, 4), ($gm ? 1 : 0));

+    return $date;

+}

+

+

+/** Return previous day

@@ -489,2 +387 @@
-/**

- *  Return next day

+/** Return next day

@@ -505,2 +402 @@
-/**

- *  Return previous month

+/**	Return previous month

@@ -514 +410,2 @@
-	if ($month == 1) {

+	if ($month == 1)

+	{

@@ -517 +414,3 @@
-	} else {

+	}

+	else

+	{

@@ -524,2 +423 @@
-/**

- *  Return next month

+/**	Return next month

@@ -533 +431,2 @@
-	if ($month == 12) {

+	if ($month == 12)

+	{

@@ -536 +435,3 @@
-	} else {

+	}

+	else

+	{

@@ -543,2 +444 @@
-/**

- *  Return previous week

+/**	Return previous week

@@ -562,2 +462 @@
-/**

- *  Return next week

+/**	Return next week

@@ -582,2 +481 @@
-/**

- *  Return GMT time for first day of a month or year

+/**	Return GMT time for first day of a month or year

@@ -587,4 +485,3 @@
- * 	@param		mixed		$gm			False or 0 or 'tzserver' = Return date to compare with server TZ,

- * 										True or 1 or 'gmt' to compare with GMT date.

- *                          			Example: dol_get_first_day(1970,1,false) will return -3600 with TZ+1, a dol_print_date on it will return 1970-01-01 00:00:00

- *                          			Example: dol_get_first_day(1970,1,true) will return 0 whatever is TZ, a dol_print_date on it will return 1970-01-01 00:00:00

+ * 	@param		mixed		$gm			False or 0 or 'server' = Return date to compare with server TZ, True or 1 to compare with GM date.

+ *                          			Exemple: dol_get_first_day(1970,1,false) will return -3600 with TZ+1, after a dol_print_date will return 1970-01-01 00:00:00

+ *                          			Exemple: dol_get_first_day(1970,1,true) will return 0 whatever is TZ, after a dol_print_date will return 1970-01-01 00:00:00

@@ -595,3 +492 @@
-	if ($year > 9999) {

-		return '';

-	}

+	if ($year > 9999) return '';

@@ -602,3 +497 @@
-/**

- * Return GMT time for last day of a month or year.

- * Note: The timestamp contains last day and last hours (23:59:59)

+/**	Return GMT time for last day of a month or year

@@ -608,2 +501 @@
- * 	@param		mixed		$gm			False or 0 or 'tzserver' = Return date to compare with server TZ,

- * 										True or 1 or 'gmt' to compare with GMT date.

+ * 	@param		boolean		$gm			False or 0 or 'server' = Return date to compare with server TZ, True or 1 to compare with GM date.

@@ -614,4 +506,3 @@
-	if ($year > 9999) {

-		return '';

-	}

-	if ($month == 12) {

+	if ($year > 9999) return '';

+	if ($month == 12)

+	{

@@ -620 +511,3 @@
-	} else {

+	}

+	else

+	{

@@ -631,28 +523,0 @@
-/**

- *  Return GMT time for last hour of a given GMT date (it replaces hours, min and second part to 23:59:59)

- *

- *	@param		int			$date		Date GMT

- * 	@param		mixed		$gm			False or 0 or 'tzserver' = Return date to compare with server TZ,

- * 										'gmt' to compare with GMT date.

- *  @return		int						Date for last hour of a given date

- */

-function dol_get_last_hour($date, $gm = 'tzserver')

-{

-	$tmparray = dol_getdate($date, false, ($gm == 'gmt' ? 'gmt' : ''));

-	return dol_mktime(23, 59, 59, $tmparray['mon'], $tmparray['mday'], $tmparray['year'], $gm);

-}

-

-/**

- *  Return GMT time for first hour of a given GMT date (it removes hours, min and second part)

- *

- *	@param		int			$date		Date GMT

- * 	@param		mixed		$gm			False or 0 or 'tzserver' = Return date to compare with server TZ,

- * 										'gmt' to compare with GMT date.

- *  @return		int						Date for last hour of a given date

- */

-function dol_get_first_hour($date, $gm = 'tzserver')

-{

-	$tmparray = dol_getdate($date, false, ($gm == 'gmt' ? 'gmt' : ''));

-	return dol_mktime(0, 0, 0, $tmparray['mon'], $tmparray['mday'], $tmparray['year'], $gm);

-}

-

@@ -664,2 +529 @@
- * 	@param		mixed	$gm			False or 0 or 'tzserver' = Return date to compare with server TZ,

- * 									True or 1 or 'gmt' to compare with GMT date.

+ * 	@param		int		$gm			False or 0 or 'server' = Return date to compare with server TZ, True or 1 to compare with GM date.

@@ -682,5 +546,3 @@
-	if ($days >= 1) {

-		$days = 7 - $days;

-	}

-	$days = abs($days);

-	$seconds = $days * 24 * 60 * 60;

+ 	if ($days >= 1) $days = 7 - $days;

+ 	$days = abs($days);

+    $seconds = $days * 24 * 60 * 60;

@@ -689,2 +551,2 @@
-	//Get first day of week

-	$tmpdaytms = date($tmparray[0]) - $seconds; // $tmparray[0] is day of parameters

+    //Get first day of week

+    $tmpdaytms = date($tmparray[0]) - $seconds; // $tmparray[0] is day of parameters

@@ -694,2 +556,3 @@
-	if ($tmpday > $day) {

-		$prev_month = $month - 1;

+	if ($tmpday > $day)

+    {

+    	$prev_month = $month - 1;

@@ -698,6 +561,9 @@
-		if ($prev_month == 0) {

-			$prev_month = 12;

-			$prev_year  = $year - 1;

-		}

-	} else {

-		$prev_month = $month;

+    	if ($prev_month == 0)

+    	{

+    		$prev_month = 12;

+    		$prev_year  = $year - 1;

+    	}

+    }

+    else

+    {

+    	$prev_month = $month;

@@ -705 +571 @@
-	}

+    }

@@ -713,5 +579,6 @@
-	$prev_day = $tmparray['mday'];

-

-	//Check prev day of week is in same month than first day or not

-	if ($prev_day > $tmpday) {

-		$prev_month = $month - 1;

+    $prev_day = $tmparray['mday'];

+

+    //Check prev day of week is in same month than first day or not

+	if ($prev_day > $tmpday)

+    {

+    	$prev_month = $month - 1;

@@ -720,7 +587,8 @@
-		if ($prev_month == 0) {

-			$prev_month = 12;

-			$prev_year  = $year - 1;

-		}

-	}

-

-	$week = date("W", dol_mktime(0, 0, 0, $tmpmonth, $tmpday, $tmpyear, $gm));

+    	if ($prev_month == 0)

+    	{

+    		$prev_month = 12;

+    		$prev_year  = $year - 1;

+    	}

+    }

+

+    $week = date("W", dol_mktime(0, 0, 0, $tmpmonth, $tmpday, $tmpyear, $gm));

@@ -732,28 +600,11 @@
- *	Return the easter day in GMT time.

- *  This function replaces easter_date() that returns a date in local TZ.

- *

- *	@param	    int			$year     			Year

- *	@return   	int								GMT Date of easter day

- */

-function getGMTEasterDatetime($year)

-{

-	$base = new DateTime("$year-03-21", new DateTimeZone("UTC"));

-	$days = easter_days($year); // Return number of days between 21 march and easter day.

-	$tmp = $base->add(new DateInterval("P{$days}D"));

-	return $tmp->getTimestamp();

-}

-

-/**

- *  Return the number of non working days including Friday, Saturday and Sunday (or not) between 2 dates in timestamp.

- *  Dates must be UTC with hour, min, sec to 0.

- *  Called by function num_open_day()

- *

- *  @param	int			$timestampStart		Timestamp start (UTC with hour, min, sec = 0)

- *  @param	int			$timestampEnd		Timestamp end (UTC with hour, min, sec = 0)

- *  @param	string		$country_code		Country code

- *  @param	int			$lastday			Last day is included, 0: no, 1:yes

- *  @param	int			$includesaturday	Include saturday as non working day (-1=use setup, 0=no, 1=yes)

- *  @param	int			$includesunday		Include sunday as non working day (-1=use setup, 0=no, 1=yes)

- *  @param	int			$includefriday		Include friday as non working day (-1=use setup, 0=no, 1=yes)

- *  @param	int			$includemonday		Include monday as non working day (-1=use setup, 0=no, 1=yes)

- *  @return	int|string						Number of non working days or error message string if error

+ *	Return the number of non working days including saturday and sunday (or not) between 2 dates in timestamp.

+ *  Dates must be UTC with hour, day, min to 0.

+ *	Called by function num_open_day

+ *

+ *	@param	    int			$timestampStart     Timestamp de debut

+ *	@param	    int			$timestampEnd       Timestamp de fin

+ *  @param      string		$country_code       Country code

+ *	@param      int			$lastday            Last day is included, 0: no, 1:yes

+ *  @param		int			$includesaturday	Include saturday as non working day (-1=use setup, 0=no, 1=yes)

+ *  @param		int			$includesunday		Include sunday as non working day (-1=use setup, 0=no, 1=yes)

+ *	@return   	int|string						Number of non working days or error message string if error

@@ -762 +613 @@
-function num_public_holiday($timestampStart, $timestampEnd, $country_code = '', $lastday = 0, $includesaturday = -1, $includesunday = -1, $includefriday = -1, $includemonday = -1)

+function num_public_holiday($timestampStart, $timestampEnd, $country_code = '', $lastday = 0, $includesaturday = -1, $includesunday = -1)

@@ -766,0 +618 @@
+	$specialdayrule = array();

@@ -769,21 +621,7 @@
-	if (($timestampEnd - $timestampStart) % 86400 != 0) {

-		return 'Error Dates must use same hours and must be GMT dates';

-	}

-

-	if (empty($country_code)) {

-		$country_code = $mysoc->country_code;

-	}

-	if ($includemonday < 0) {

-		$includemonday = (isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_MONDAY) ? $conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_MONDAY : 0);

-	}

-	if ($includefriday < 0) {

-		$includefriday = (isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_FRIDAY) ? $conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_FRIDAY : 0);

-	}

-	if ($includesaturday < 0) {

-		$includesaturday = (isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY) ? $conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY : 1);

-	}

-	if ($includesunday < 0) {

-		$includesunday = (isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY) ? $conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY : 1);

-	}

-

-	$country_id = dol_getIdFromCode($db, $country_code, 'c_country', 'code', 'rowid');

+	if ((($timestampEnd - $timestampStart) % 86400) != 0) return 'ErrorDates must use same hours and must be GMT dates';

+

+	if (empty($country_code)) $country_code = $mysoc->country_code;

+

+	if ($includesaturday < 0) $includesaturday = (isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY) ? $conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY : 1);

+	if ($includesunday < 0)   $includesunday   = (isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY) ? $conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY : 1);

+

@@ -793 +631,2 @@
-		&& ($i < 50000)) {		// Loop end when equals (Test on i is a security loop to avoid infinite loop)

+	    && ($i < 50000))		// Loop end when equals (Test on i is a security loop to avoid infinite loop)

+	{

@@ -795,10 +634,27 @@
-		$specialdayrule = array();

-

-		$jour  = gmdate("d", $timestampStart);

-		$mois  = gmdate("m", $timestampStart);

-		$annee = gmdate("Y", $timestampStart);

-

-		//print "jour=".$jour." month=".$mois." year=".$annee." includesaturday=".$includesaturday." includesunday=".$includesunday."\n";

-

-		// Loop on public holiday defined into hrm_public_holiday for the day, month and year analyzed

-		// TODO Execute this request first and store results into an array, then reuse this array.

+

+		$jour  = date("d", $timestampStart);

+		$mois  = date("m", $timestampStart);

+		$annee = date("Y", $timestampStart);

+

+		// Check into var $conf->global->HOLIDAY_MORE_DAYS   MM-DD,YYYY-MM-DD, ...

+		// Do not use this anymore, use instead the dictionary of public holidays.

+		if (!empty($conf->global->HOLIDAY_MORE_PUBLIC_HOLIDAYS))

+		{

+			$arrayofdaystring = explode(',', $conf->global->HOLIDAY_MORE_PUBLIC_HOLIDAYS);

+			foreach ($arrayofdaystring as $daystring)

+			{

+				$tmp = explode('-', $daystring);

+				if ($tmp[2])

+				{

+					if ($tmp[0] == $annee && $tmp[1] == $mois && $tmp[2] == $jour) $ferie = true;

+				}

+				else

+				{

+					if ($tmp[0] == $mois && $tmp[1] == $jour) $ferie = true;

+				}

+			}

+		}

+

+		$country_id = dol_getIdFromCode($db, $country_code, 'c_country', 'code', 'rowid');

+

+		// Loop on public holiday defined into hrm_public_holiday

@@ -808 +663,0 @@
-		$sql .= " AND entity IN (0," .getEntity('holiday') .")";

@@ -811 +666,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -814 +670,2 @@
-			while ($i < $num_rows) {

+			while ($i < $num_rows)

+			{

@@ -817 +674,2 @@
-				if (!empty($obj->dayrule) && $obj->dayrule != 'date') {		// For example 'easter', '...'

+				if (!empty($obj->dayrule) && $obj->dayrule != 'date')		// For example 'easter', '...'

+				{

@@ -819 +677,3 @@
-				} else {

+				}

+				else

+				{

@@ -821,13 +681,5 @@
-					if (!empty($obj->year) && $obj->year != $annee) {

-						$match = 0;

-					}

-					if ($obj->month != $mois) {

-						$match = 0;

-					}

-					if ($obj->day != $jour) {

-						$match = 0;

-					}

-

-					if ($match) {

-						$ferie = true;

-					}

+					if (!empty($obj->year) && $obj->year != $annee) $match = 0;

+					if ($obj->month != $mois) $match = 0;

+					if ($obj->day != $jour) $match = 0;

+

+					if ($match) $ferie = true;

@@ -838 +690,3 @@
-		} else {

+		}

+		else

+		{

@@ -842,14 +696,127 @@
-		//var_dump($specialdayrule)."\n";

-		//print "ferie=".$ferie."\n";

-

-		if (!$ferie) {

-			// Special dayrules

-			if (in_array('easter', $specialdayrule)) {

-				// Calculation for easter date

-				$date_paques = getGMTEasterDatetime($annee);

-				$jour_paques = gmdate("d", $date_paques);

-				$mois_paques = gmdate("m", $date_paques);

-				if ($jour_paques == $jour && $mois_paques == $mois) {

-					$ferie = true;

-				}

-				// Easter (sunday)

+

+		// Special dayrules

+		if (in_array('easter', $specialdayrule))

+		{

+			// Calculation for easter date

+			$date_paques = easter_date($annee);

+			$jour_paques = date("d", $date_paques);

+			$mois_paques = date("m", $date_paques);

+			if ($jour_paques == $jour && $mois_paques == $mois) $ferie = true;

+			// Easter (sunday)

+		}

+

+		if (in_array('eastermonday', $specialdayrule))

+		{

+			// Calculation for the monday of easter date

+			$date_paques = easter_date($annee);

+			$date_lundi_paques = mktime(

+                date("H", $date_paques),

+                date("i", $date_paques),

+                date("s", $date_paques),

+                date("m", $date_paques),

+                date("d", $date_paques) + 1,

+                date("Y", $date_paques)

+            );

+			$jour_lundi_ascension = date("d", $date_lundi_paques);

+			$mois_lundi_ascension = date("m", $date_lundi_paques);

+			if ($jour_lundi_ascension == $jour && $mois_lundi_ascension == $mois) $ferie = true;

+			// Easter (monday)

+		}

+

+		if (in_array('ascension', $specialdayrule))

+		{

+			// Calcul du jour de l'ascension (39 days after easter day)

+			$date_paques = easter_date($annee);

+			$date_ascension = mktime(

+                date("H", $date_paques),

+                date("i", $date_paques),

+                date("s", $date_paques),

+                date("m", $date_paques),

+                date("d", $date_paques) + 39,

+                date("Y", $date_paques)

+            );

+			$jour_ascension = date("d", $date_ascension);

+			$mois_ascension = date("m", $date_ascension);

+			if ($jour_ascension == $jour && $mois_ascension == $mois) $ferie = true;

+			// Ascension (thursday)

+		}

+

+		if (in_array('pentecote', $specialdayrule))

+		{

+			// Calculation of "Pentecote" (49 days after easter day)

+			$date_paques = easter_date($annee);

+			$date_pentecote = mktime(

+                date("H", $date_paques),

+                date("i", $date_paques),

+                date("s", $date_paques),

+                date("m", $date_paques),

+                date("d", $date_paques) + 49,

+                date("Y", $date_paques)

+            );

+			$jour_pentecote = date("d", $date_pentecote);

+			$mois_pentecote = date("m", $date_pentecote);

+			if ($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie = true;

+			// "Pentecote" (sunday)

+		}

+		if (in_array('pentecotemonday', $specialdayrule))

+		{

+			// Calculation of "Pentecote" (49 days after easter day)

+			$date_paques = easter_date($annee);

+			$date_pentecote = mktime(

+				date("H", $date_paques),

+				date("i", $date_paques),

+				date("s", $date_paques),

+				date("m", $date_paques),

+				date("d", $date_paques) + 50,

+				date("Y", $date_paques)

+				);

+			$jour_pentecote = date("d", $date_pentecote);

+			$mois_pentecote = date("m", $date_pentecote);

+			if ($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie = true;

+			// "Pentecote" (monday)

+		}

+

+		if (in_array('viernessanto', $specialdayrule))

+		{

+			// Viernes Santo

+			$date_paques = easter_date($annee);

+			$date_viernes = mktime(

+                date("H", $date_paques),

+                date("i", $date_paques),

+                date("s", $date_paques),

+                date("m", $date_paques),

+                date("d", $date_paques) - 2,

+                date("Y", $date_paques)

+            );

+			$jour_viernes = date("d", $date_viernes);

+			$mois_viernes = date("m", $date_viernes);

+			if ($jour_viernes == $jour && $mois_viernes == $mois) $ferie = true;

+			//Viernes Santo

+		}

+

+		if (in_array('fronleichnam', $specialdayrule))

+		{

+		    // Fronleichnam (60 days after easter sunday)

+			$date_paques = easter_date($annee);

+			$date_fronleichnam = mktime(

+		        date("H", $date_paques),

+		        date("i", $date_paques),

+		        date("s", $date_paques),

+		        date("m", $date_paques),

+		        date("d", $date_paques) + 60,

+		        date("Y", $date_paques)

+		        );

+		    $jour_fronleichnam = date("d", $date_fronleichnam);

+		    $mois_fronleichnam = date("m", $date_fronleichnam);

+		    if ($jour_fronleichnam == $jour && $mois_fronleichnam == $mois) $ferie = true;

+		    // Fronleichnam

+		}

+

+		// If we have to include saturday and sunday

+		if ($includesaturday || $includesunday)

+		{

+			$jour_julien = unixtojd($timestampStart);

+			$jour_semaine = jddayofweek($jour_julien, 0);

+			if ($includesaturday)					//Saturday (6) and Sunday (0)

+			{

+				if ($jour_semaine == 6) $ferie = true;

@@ -857,13 +824,3 @@
-

-			if (in_array('eastermonday', $specialdayrule)) {

-				// Calculation for the monday of easter date

-				$date_paques = getGMTEasterDatetime($annee);

-				//print 'PPP'.$date_paques.' '.dol_print_date($date_paques, 'dayhour', 'gmt')." ";

-				$date_lundi_paques = $date_paques + (3600 * 24);

-				$jour_lundi_paques = gmdate("d", $date_lundi_paques);

-				$mois_lundi_paques = gmdate("m", $date_lundi_paques);

-				if ($jour_lundi_paques == $jour && $mois_lundi_paques == $mois) {

-					$ferie = true;

-				}

-				// Easter (monday)

-				//print 'annee='.$annee.' $jour='.$jour.' $mois='.$mois.' $jour_lundi_paques='.$jour_lundi_paques.' $mois_lundi_paques='.$mois_lundi_paques."\n";

+			if ($includesunday)						//Saturday (6) and Sunday (0)

+			{

+				if ($jour_semaine == 0) $ferie = true;

@@ -871,111 +828 @@
-

-			//Good Friday

-			if (in_array('goodfriday', $specialdayrule)) {

-				// Pulls the date of Easter

-				$easter = getGMTEasterDatetime($annee);

-

-				// Calculates the date of Good Friday based on Easter

-				$date_good_friday  = $easter - (2 * 3600 * 24);

-				$dom_good_friday   = gmdate("d", $date_good_friday);

-				$month_good_friday = gmdate("m", $date_good_friday);

-

-				if ($dom_good_friday == $jour && $month_good_friday == $mois) {

-					$ferie = true;

-				}

-			}

-

-			if (in_array('ascension', $specialdayrule)) {

-				// Calcul du jour de l'ascension (39 days after easter day)

-				$date_paques = getGMTEasterDatetime($annee);

-				$date_ascension = $date_paques + (3600 * 24 * 39);

-				$jour_ascension = gmdate("d", $date_ascension);

-				$mois_ascension = gmdate("m", $date_ascension);

-				if ($jour_ascension == $jour && $mois_ascension == $mois) {

-					$ferie = true;

-				}

-				// Ascension (thursday)

-			}

-

-			if (in_array('pentecost', $specialdayrule)) {

-				// Calculation of "Pentecote" (49 days after easter day)

-				$date_paques = getGMTEasterDatetime($annee);

-				$date_pentecote = $date_paques + (3600 * 24 * 49);

-				$jour_pentecote = gmdate("d", $date_pentecote);

-				$mois_pentecote = gmdate("m", $date_pentecote);

-				if ($jour_pentecote == $jour && $mois_pentecote == $mois) {

-					$ferie = true;

-				}

-				// "Pentecote" (sunday)

-			}

-			if (in_array('pentecotemonday', $specialdayrule)) {

-				// Calculation of "Pentecote" (49 days after easter day)

-				$date_paques = getGMTEasterDatetime($annee);

-				$date_pentecote = $date_paques + (3600 * 24 * 50);

-				$jour_pentecote = gmdate("d", $date_pentecote);

-				$mois_pentecote = gmdate("m", $date_pentecote);

-				if ($jour_pentecote == $jour && $mois_pentecote == $mois) {

-					$ferie = true;

-				}

-				// "Pentecote" (monday)

-			}

-

-			if (in_array('viernessanto', $specialdayrule)) {

-				// Viernes Santo

-				$date_paques = getGMTEasterDatetime($annee);

-				$date_viernes = $date_paques - (3600 * 24 * 2);

-				$jour_viernes = gmdate("d", $date_viernes);

-				$mois_viernes = gmdate("m", $date_viernes);

-				if ($jour_viernes == $jour && $mois_viernes == $mois) {

-					$ferie = true;

-				}

-				//Viernes Santo

-			}

-

-			if (in_array('fronleichnam', $specialdayrule)) {

-				// Fronleichnam (60 days after easter sunday)

-				$date_paques = getGMTEasterDatetime($annee);

-				$date_fronleichnam = $date_paques + (3600 * 24 * 60);

-				$jour_fronleichnam = gmdate("d", $date_fronleichnam);

-				$mois_fronleichnam = gmdate("m", $date_fronleichnam);

-				if ($jour_fronleichnam == $jour && $mois_fronleichnam == $mois) {

-					$ferie = true;

-				}

-				// Fronleichnam

-			}

-

-			if (in_array('genevafast', $specialdayrule)) {

-				// Geneva fast in Switzerland (Thursday after the first sunday in September)

-				$date_1sunsept = strtotime('next thursday', strtotime('next sunday', mktime(0, 0, 0, 9, 1, $annee)));

-				$jour_1sunsept = date("d", $date_1sunsept);

-				$mois_1sunsept = date("m", $date_1sunsept);

-				if ($jour_1sunsept == $jour && $mois_1sunsept == $mois) {

-					$ferie=true;

-				}

-				// Geneva fast in Switzerland

-			}

-		}

-		//print "ferie=".$ferie."\n";

-

-		// If we have to include Friday, Saturday and Sunday

-		if (!$ferie) {

-			if ($includefriday || $includesaturday || $includesunday) {

-				$jour_julien = unixtojd($timestampStart);

-				$jour_semaine = jddayofweek($jour_julien, 0);

-				if ($includefriday) {					//Friday (5), Saturday (6) and Sunday (0)

-					if ($jour_semaine == 5) {

-						$ferie = true;

-					}

-				}

-				if ($includesaturday) {					//Friday (5), Saturday (6) and Sunday (0)

-					if ($jour_semaine == 6) {

-						$ferie = true;

-					}

-				}

-				if ($includesunday) {					//Friday (5), Saturday (6) and Sunday (0)

-					if ($jour_semaine == 0) {

-						$ferie = true;

-					}

-				}

-			}

-		}

-		//print "ferie=".$ferie."\n";

+		}

@@ -984,3 +831 @@
-		if ($ferie) {

-			$nbFerie++;

-		}

+		if ($ferie) $nbFerie++;

@@ -995 +839,0 @@
-	//print "nbFerie=".$nbFerie."\n";

@@ -1011,2 +855,4 @@
-	if ($timestampStart < $timestampEnd) {

-		if ($lastday == 1) {

+	if ($timestampStart < $timestampEnd)

+	{

+		if ($lastday == 1)

+		{

@@ -1014 +860,3 @@
-		} else {

+		}

+		else

+		{

@@ -1039,3 +887 @@
-	if (empty($country_code)) {

-		$country_code = $mysoc->country_code;

-	}

+	if (empty($country_code)) $country_code = $mysoc->country_code;

@@ -1046,6 +892,2 @@
-	if (!is_int($timestampStart) && !is_float($timestampStart)) {

-		return 'ErrorBadParameter_num_open_day';

-	}

-	if (!is_int($timestampEnd) && !is_float($timestampEnd)) {

-		return 'ErrorBadParameter_num_open_day';

-	}

+	if (!is_int($timestampStart) && !is_float($timestampStart)) return 'ErrorBadParameter_num_open_day';

+	if (!is_int($timestampEnd) && !is_float($timestampEnd)) return 'ErrorBadParameter_num_open_day';

@@ -1054 +896,2 @@
-	if ($timestampStart < $timestampEnd) {

+	if ($timestampStart < $timestampEnd)

+	{

@@ -1059,3 +902 @@
-		if ($inhour == 1 && $nbOpenDay <= 3) {

-			$nbOpenDay = ($nbOpenDay * 24);

-		}

+		if ($inhour == 1 && $nbOpenDay <= 3) $nbOpenDay = ($nbOpenDay * 24);

@@ -1063 +904,3 @@
-	} elseif ($timestampStart == $timestampEnd) {

+	}

+	elseif ($timestampStart == $timestampEnd)

+	{

@@ -1067,10 +910,6 @@
-			if ($numholidays == 1) {

-				return 0;

-			}

-		}

-

-		$nbOpenDay = $lastday;

-

-		if ($inhour == 1) {

-			$nbOpenDay = ($nbOpenDay * 24);

-		}

+			if ($numholidays == 1) return 0;

+		}

+

+		$nbOpenDay=$lastday;

+

+		if ($inhour == 1) $nbOpenDay = ($nbOpenDay * 24);

@@ -1078 +917,3 @@
-	} else {

+	}

+	else

+	{

@@ -1096,15 +937,16 @@
-		1  => $outputlangs->trans("Month01"),

-		2  => $outputlangs->trans("Month02"),

-		3  => $outputlangs->trans("Month03"),

-		4  => $outputlangs->trans("Month04"),

-		5  => $outputlangs->trans("Month05"),

-		6  => $outputlangs->trans("Month06"),

-		7  => $outputlangs->trans("Month07"),

-		8  => $outputlangs->trans("Month08"),

-		9  => $outputlangs->trans("Month09"),

-		10 => $outputlangs->trans("Month10"),

-		11 => $outputlangs->trans("Month11"),

-		12 => $outputlangs->trans("Month12")

-	);

-

-	if (!empty($short)) {

+	    1  => $outputlangs->trans("Month01"),

+	    2  => $outputlangs->trans("Month02"),

+	    3  => $outputlangs->trans("Month03"),

+	    4  => $outputlangs->trans("Month04"),

+	    5  => $outputlangs->trans("Month05"),

+	    6  => $outputlangs->trans("Month06"),

+	    7  => $outputlangs->trans("Month07"),

+	    8  => $outputlangs->trans("Month08"),

+	    9  => $outputlangs->trans("Month09"),

+	    10 => $outputlangs->trans("Month10"),

+	    11 => $outputlangs->trans("Month11"),

+	    12 => $outputlangs->trans("Month12")

+    );

+

+	if (!empty($short))

+	{

@@ -1112,12 +954,12 @@
-			1  => $outputlangs->trans("MonthShort01"),

-			2  => $outputlangs->trans("MonthShort02"),

-			3  => $outputlangs->trans("MonthShort03"),

-			4  => $outputlangs->trans("MonthShort04"),

-			5  => $outputlangs->trans("MonthShort05"),

-			6  => $outputlangs->trans("MonthShort06"),

-			7  => $outputlangs->trans("MonthShort07"),

-			8  => $outputlangs->trans("MonthShort08"),

-			9  => $outputlangs->trans("MonthShort09"),

-			10 => $outputlangs->trans("MonthShort10"),

-			11 => $outputlangs->trans("MonthShort11"),

-			12 => $outputlangs->trans("MonthShort12")

+		    1  => $outputlangs->trans("MonthShort01"),

+		    2  => $outputlangs->trans("MonthShort02"),

+		    3  => $outputlangs->trans("MonthShort03"),

+		    4  => $outputlangs->trans("MonthShort04"),

+		    5  => $outputlangs->trans("MonthShort05"),

+		    6  => $outputlangs->trans("MonthShort06"),

+		    7  => $outputlangs->trans("MonthShort07"),

+		    8  => $outputlangs->trans("MonthShort08"),

+		    9  => $outputlangs->trans("MonthShort09"),

+		    10 => $outputlangs->trans("MonthShort10"),

+		    11 => $outputlangs->trans("MonthShort11"),

+		    12 => $outputlangs->trans("MonthShort12")

@@ -1130,0 +973 @@
+

@@ -1147,0 +991 @@
+

@@ -1157,3 +1001 @@
-		if (in_array('01', $TWeek) && in_array('52', $TWeek) && $weekNb == '01') {

-			$year++; //Si on a la 1re semaine et la semaine 52 c'est qu'on change d'année

-		}

+		if (in_array('01', $TWeek) && in_array('52', $TWeek) && $weekNb == '01') $year++; //Si on a la 1re semaine et la semaine 52 c'est qu'on change d'année

@@ -1165,0 +1008 @@
+

@@ -1180,0 +1024 @@
+

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_doc.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_doc.lib.php
@@ -51,5 +51,2 @@
-	if ($issupplierline) {

-		$prodser = new ProductFournisseur($db);

-	} else {

-		$prodser = new Product($db);

-	}

+	if ($issupplierline) $prodser = new ProductFournisseur($db);

+	else $prodser = new Product($db);

@@ -57 +54,2 @@
-	if ($idprod) {

+	if ($idprod)

+	{

@@ -60,10 +58,5 @@
-		if (getDolGlobalInt('MAIN_MULTILANGS') && ($outputlangs->defaultlang != $langs->defaultlang)) {

-			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && $label == $prodser->label) {

-				$label = $prodser->multilangs[$outputlangs->defaultlang]["label"];

-			}

-			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && $desc == $prodser->description) {

-				$desc = $prodser->multilangs[$outputlangs->defaultlang]["description"];

-			}

-			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && $note == $prodser->note) {

-				$note = $prodser->multilangs[$outputlangs->defaultlang]["note"];

-			}

+		if (!empty($conf->global->MAIN_MULTILANGS) && ($outputlangs->defaultlang != $langs->defaultlang))

+		{

+			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && $label == $prodser->label)     $label = $prodser->multilangs[$outputlangs->defaultlang]["label"];

+			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && $desc == $prodser->description) $desc = $prodser->multilangs[$outputlangs->defaultlang]["description"];

+			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && $note == $prodser->note)        $note = $prodser->multilangs[$outputlangs->defaultlang]["note"];

@@ -77,2 +70,4 @@
-	if ($desc && ($desc != $label)) {

-		if ($desc == '(CREDIT_NOTE)' && $line->fk_remise_except) {

+	if ($desc && ($desc != $label))

+	{

+		if ($desc == '(CREDIT_NOTE)' && $line->fk_remise_except)

+		{

@@ -81 +76 @@
-			$sourceref = !empty($discount->discount_type) ? $discount->ref_invoice_supplier_source : $discount->ref_facture_source;

+			$sourceref = !empty($discount->discount_type) ? $discount->ref_invoive_supplier_source : $discount->ref_facture_source;

@@ -83 +78,3 @@
-		} elseif ($desc == '(DEPOSIT)' && $line->fk_remise_except) {

+		}

+		elseif ($desc == '(DEPOSIT)' && $line->fk_remise_except)

+		{

@@ -86 +83 @@
-			$sourceref = !empty($discount->discount_type) ? $discount->ref_invoice_supplier_source : $discount->ref_facture_source;

+			$sourceref = !empty($discount->discount_type) ? $discount->ref_invoive_supplier_source : $discount->ref_facture_source;

@@ -89,4 +86,4 @@
-			if (getDolGlobalString('INVOICE_ADD_DEPOSIT_DATE')) {

-				$libelleproduitservice .= ' ('.dol_print_date($discount->datec, 'day', '', $outputlangs).')';

-			}

-		} elseif ($desc == '(EXCESS RECEIVED)' && $line->fk_remise_except) {

+			if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) $libelleproduitservice .= ' ('.dol_print_date($discount->datec, 'day', '', $outputlangs).')';

+		}

+		elseif ($desc == '(EXCESS RECEIVED)' && $line->fk_remise_except)

+		{

@@ -96 +93,3 @@
-		} elseif ($desc == '(EXCESS PAID)' && $line->fk_remise_except) {

+		}

+		elseif ($desc == '(EXCESS PAID)' && $line->fk_remise_except)

+		{

@@ -100,6 +99,9 @@
-		} else {

-			if ($idprod) {

-				if (empty($hidedesc)) {

-					$libelleproduitservice = dol_concatdesc($libelleproduitservice, $desc);

-				}

-			} else {

+		}

+		else

+		{

+			if ($idprod)

+			{

+				if (empty($hidedesc)) $libelleproduitservice = dol_concatdesc($libelleproduitservice, $desc);

+			}

+			else

+			{

@@ -112 +114,2 @@
-	if ($idprod) {

+	if ($idprod)

+	{

@@ -114 +117,2 @@
-		if ($prodser->ref) {

+		if ($prodser->ref)

+		{

@@ -117,2 +121,4 @@
-			if (getDolGlobalString('PRODUCT_ADD_TYPE_IN_DOCUMENTS')) {   // In standard mode, we do not show this

-				if ($prodser->isService()) {

+			if (!empty($conf->global->PRODUCT_ADD_TYPE_IN_DOCUMENTS))   // In standard mode, we do not show this

+			{

+				if ($prodser->isService())

+				{

@@ -120 +126,3 @@
-				} else {

+				}

+				else

+				{

@@ -125,6 +133,6 @@
-			if (empty($hideref)) {

-				if ($issupplierline) {

-					$ref_prodserv = $prodser->ref.' ('.$outputlangs->trans("SupplierRef").' '.$ref_supplier.')'; // Show local ref and supplier ref

-				} else {

-					$ref_prodserv = $prodser->ref; // Show local ref only

-				}

+			if (empty($hideref))

+			{

+				if ($issupplierline) $ref_prodserv = $prodser->ref.' ('.$outputlangs->trans("SupplierRef").' '.$ref_supplier.')'; // Show local ref and supplier ref

+				else $ref_prodserv = $prodser->ref; // Show local ref only

+

+				$ref_prodserv .= " - ";

@@ -133 +141 @@
-			$libelleproduitservice = $prefix_prodserv.$ref_prodserv.($libelleproduitservice ? " - " : "").$libelleproduitservice;

+			$libelleproduitservice = $prefix_prodserv.$ref_prodserv.$libelleproduitservice;

@@ -137 +145,2 @@
-	if (!empty($line->date_start) || !empty($line->date_end)) {

+	if (!empty($line->date_start) || !empty($line->date_end))

+	{

@@ -140 +149,2 @@
-		if ($line->date_start && $line->date_end) {

+		if ($line->date_start && $line->date_end)

+		{

@@ -143 +153,2 @@
-		if ($line->date_start && !$line->date_end) {

+		if ($line->date_start && !$line->date_end)

+		{

@@ -146 +157,2 @@
-		if (!$line->date_start && $line->date_end) {

+		if (!$line->date_start && $line->date_end)

+		{

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_doleditor.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_doleditor.lib.php
@@ -36,2 +36,2 @@
-	global $conf, $langs, $db;

-	global $bc;

+    global $conf, $langs, $db;

+    global $bc;

@@ -41 +41 @@
-	$formother = new FormOther($db);

+    $formother = new FormOther($db);

@@ -43,7 +43,9 @@
-	$dirskins = array('/includes/ckeditor/ckeditor/skins');

-	if (!empty($conf->modules_parts['theme'])) {		// Using this feature slow down application

-		foreach ($conf->modules_parts['theme'] as $reldir) {

-			$dirskins = array_merge($dirskins, (array) ($reldir.'theme'));

-		}

-	}

-	$dirskins = array_unique($dirskins);

+    $dirskins = array('/includes/ckeditor/ckeditor/skins');

+    if (!empty($conf->modules_parts['theme']))		// Using this feature slow down application

+    {

+    	foreach ($conf->modules_parts['theme'] as $reldir)

+    	{

+	    	$dirskins = array_merge($dirskins, (array) ($reldir.'theme'));

+    	}

+    }

+    $dirskins = array_unique($dirskins);

@@ -52 +54,3 @@
-	$selected_theme = getDolGlobalString('FCKEDITOR_SKIN', 'moono-lisa');

+    $selected_theme = '';

+    if (empty($conf->global->FCKEDITOR_SKIN)) $selected_theme = 'moono-lisa';

+    else $selected_theme = $conf->global->FCKEDITOR_SKIN;

@@ -54 +58 @@
-	$colspan = 2;

+    $colspan = 2;

@@ -56,2 +60,2 @@
-	$thumbsbyrow = 6;

-	print '<table class="noborder centpercent">';

+    $thumbsbyrow = 6;

+    print '<table class="noborder centpercent">';

@@ -59 +63 @@
-	$var = false;

+    $var = false;

@@ -61,4 +65,8 @@
-	// Title

-	print '<tr class="liste_titre"><th width="35%">'.$langs->trans("DefaultSkin").'</th>';

-	print '<th class="right">';

-	print '</th></tr>';

+    // Title

+   	print '<tr class="liste_titre"><th width="35%">'.$langs->trans("DefaultSkin").'</th>';

+   	print '<th class="right">';

+   	$url = 'http://ckeditor.com/addons/skins/all';

+   	/*print '<a href="'.$url.'" target="_blank">';

+   	print $langs->trans('DownloadMoreSkins');

+   	print '</a>';*/

+   	print '</th></tr>';

@@ -67,7 +75,8 @@
-	print '<td>'.$langs->trans("ThemeDir").'</td>';

-	print '<td>';

-	foreach ($dirskins as $dirskin) {

-		echo '"'.$dirskin.'" ';

-	}

-	print '</td>';

-	print '</tr>';

+   	print '<td>'.$langs->trans("ThemeDir").'</td>';

+   	print '<td>';

+   	foreach ($dirskins as $dirskin)

+   	{

+   		echo '"'.$dirskin.'" ';

+   	}

+   	print '</td>';

+   	print '</tr>';

@@ -75,2 +84,2 @@
-	//

-	print '<tr class="oddeven"><td colspan="'.$colspan.'">';

+    //

+    print '<tr class="oddeven"><td colspan="'.$colspan.'">';

@@ -78 +87 @@
-	print '<table class="nobordernopadding" width="100%"><tr><td><div class="center">';

+    print '<table class="nobordernopadding" width="100%"><tr><td><div class="center">';

@@ -80,5 +89,6 @@
-	$i = 0;

-	foreach ($dirskins as $dir) {

-		//print $dirroot.$dir;exit;

-		$dirskin = dol_buildpath($dir, 0); // This include loop on $conf->file->dol_document_root

-		$urltheme = dol_buildpath($dir, 1);

+    $i = 0;

+    foreach ($dirskins as $dir)

+    {

+    	//print $dirroot.$dir;exit;

+    	$dirskin = dol_buildpath($dir, 0); // This include loop on $conf->file->dol_document_root

+    	$urltheme = dol_buildpath($dir, 1);

@@ -86,13 +96,13 @@
-		if (is_dir($dirskin)) {

-			$handle = opendir($dirskin);

-			if (is_resource($handle)) {

-				while (($subdir = readdir($handle)) !== false) {

-					if (is_dir($dirskin."/".$subdir) && substr($subdir, 0, 1) != '.'

-							&& substr($subdir, 0, 3) != 'CVS' && !preg_match('/common|phones/i', $subdir)) {

-						// Disable not stable themes (dir ends with _exp or _dev)

-						if (getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2 && preg_match('/_dev$/i', $subdir)) {

-							continue;

-						}

-						if (getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1 && preg_match('/_exp$/i', $subdir)) {

-							continue;

-						}

+    	if (is_dir($dirskin))

+    	{

+    		$handle = opendir($dirskin);

+    		if (is_resource($handle))

+    		{

+    			while (($subdir = readdir($handle)) !== false)

+    			{

+    				if (is_dir($dirskin."/".$subdir) && substr($subdir, 0, 1) <> '.'

+    						&& substr($subdir, 0, 3) <> 'CVS' && !preg_match('/common|phones/i', $subdir))

+    				{

+    					// Disable not stable themes (dir ends with _exp or _dev)

+    					if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i', $subdir)) continue;

+    					if ($conf->global->MAIN_FEATURES_LEVEL < 1 && preg_match('/_exp$/i', $subdir)) continue;

@@ -100,6 +110,9 @@
-						print '<div class="inline-block" style="margin-top: 10px; margin-bottom: 10px; margin-right: 20px; margin-left: 20px;">';

-						if ($subdir == $selected_theme) {

-							print '<input '.($edit ? '' : 'disabled').' type="radio" '.$bc[$var].' style="border: 0px;" checked name="fckeditor_skin" value="'.$subdir.'"> <b>'.$subdir.'</b>';

-						} else {

-							print '<input '.($edit ? '' : 'disabled').' type="radio" '.$bc[$var].' style="border: 0px;" name="fckeditor_skin" value="'.$subdir.'"> '.$subdir;

-						}

+    					print '<div class="inline-block" style="margin-top: 10px; margin-bottom: 10px; margin-right: 20px; margin-left: 20px;">';

+    					if ($subdir == $selected_theme)

+    					{

+    						print '<input '.($edit ? '' : 'disabled').' type="radio" '.$bc[$var].' style="border: 0px;" checked name="fckeditor_skin" value="'.$subdir.'"> <b>'.$subdir.'</b>';

+    					}

+    					else

+    					{

+    						print '<input '.($edit ? '' : 'disabled').' type="radio" '.$bc[$var].' style="border: 0px;" name="fckeditor_skin" value="'.$subdir.'"> '.$subdir;

+    					}

@@ -108,6 +121,6 @@
-						$i++;

-					}

-				}

-			}

-		}

-	}

+    					$i++;

+    				}

+    			}

+    		}

+    	}

+    }

@@ -115 +128 @@
-	print '</div></td></tr></table>';

+    print '</div></td></tr></table>';

@@ -117 +130 @@
-	print '</td></tr>';

+    print '</td></tr>';

@@ -119 +132 @@
-	print '</table>';

+    print '</table>';

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_donation.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_donation.lib.php
@@ -31,4 +31 @@
-	global $langs, $conf, $db;

-

-	$extrafields = new ExtraFields($db);

-	$extrafields->fetch_name_optionals_label('don');

+	global $langs, $conf;

@@ -52,5 +49 @@
-	$nbExtrafields = $extrafields->attributes['don']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

-	$head[$h][2] = 'attributes';

+    $head[$h][2] = 'attributes';

@@ -86 +79 @@
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'donation', 'add', 'core');

+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'donation');

@@ -89 +82 @@
-	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

+    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

@@ -92 +85 @@
-	$nbLinks = Link::count($db, $object->element, $object->id);

+    $nbLinks = Link::count($db, $object->element, $object->id);

@@ -95,3 +88 @@
-	if (($nbFiles + $nbLinks) > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

-	}

+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

@@ -102,6 +93,2 @@
-	if (!empty($object->note_private)) {

-		$nbNote++;

-	}

-	if (!empty($object->note_public)) {

-		$nbNote++;

-	}

+	if (!empty($object->note_private)) $nbNote++;

+	if (!empty($object->note_public)) $nbNote++;

@@ -110,3 +97 @@
-	if ($nbNote > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

-	}

+	if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

@@ -121,2 +105,0 @@
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'donation', 'add', 'external');

-

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_ecm.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_ecm.lib.php
@@ -3 +2,0 @@
- * Copyright (C) 2022       Frédéric France         <frederic.france@netlogic.fr>

@@ -21,3 +20,3 @@
- * \file       htdocs/core/lib/ecm.lib.php

- * \brief      Ensemble de fonctions de base pour le module ecm

- * \ingroup    ecm

+ *  \file       htdocs/core/lib/ecm.lib.php

+ *  \brief      Ensemble de fonctions de base pour le module ecm

+ *  \ingroup    ecm

@@ -35,0 +35 @@
+	global $helptext1, $helptext2;

@@ -39,6 +38,0 @@
-

-	$showmediasection = 0;

-	if (isModEnabled('mailing') || isModEnabled('website')) {

-		$showmediasection = 1;

-	}

-

@@ -46,5 +40 @@
-	$helptext .= $langs->trans("ECMAreaDesc2a").'<br>';

-	$helptext .= $langs->trans("ECMAreaDesc2b");

-	if ($showmediasection) {

-		$helptext .= '<br>'.$langs->trans("ECMAreaDesc3");

-	}

+	$helptext .= $langs->trans("ECMAreaDesc2");

@@ -57 +47,2 @@
-	if (!getDolGlobalString('ECM_AUTO_TREE_HIDEN')) {

+	if (!empty($conf->global->ECM_AUTO_TREE_ENABLED))

+	{

@@ -61,7 +51,0 @@
-		$h++;

-	}

-

-	if ($showmediasection && getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {

-		$head[$h][0] = DOL_URL_ROOT.'/ecm/index_medias.php?file_manager=1';

-		$head[$h][1] = $langs->trans("ECMSectionsMedias").$form->textwithpicto('', $helptext, 1, 'info', '', 0, 3);

-		$head[$h][2] = 'index_medias';

@@ -97 +81,2 @@
-	if ($module == 'ecm') {

+	if ($module == 'ecm')

+	{

@@ -102 +87,3 @@
-	} else {

+	}

+	else

+	{

@@ -127,16 +113,0 @@
-	$h++;

-

-	// Notes

-	$head[$h][0] = DOL_URL_ROOT.'/ecm/file_note.php?section='.$object->section_id.'&urlfile='.urlencode($object->label);

-	$head[$h][1] = $langs->trans("Notes");

-	$nbNote = 0;

-	if (!empty($object->note_private)) {

-		$nbNote++;

-	}

-	if (!empty($object->note_public)) {

-		$nbNote++;

-	}

-	if ($nbNote > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

-	}

-	$head[$h][2] = 'note';

@@ -172,48 +142,0 @@
-

-/**

- *  Return array head with list of tabs to view object informations.

- *

- *  @return	array               head array with tabs

- */

-function ecm_admin_prepare_head()

-{

-	global $langs, $conf, $db;

-

-	$extrafields = new ExtraFields($db);

-	$extrafields->fetch_name_optionals_label('ecm_files');

-	$extrafields->fetch_name_optionals_label('ecm_directories');

-

-	$langs->load("ecm");

-

-	$h = 0;

-	$head = array();

-

-	$head[$h][0] = DOL_URL_ROOT."/admin/ecm.php";

-	$head[$h][1] = $langs->trans("Setup");

-	$head[$h][2] = 'ecm';

-	$h++;

-

-	$head[$h][0] = DOL_URL_ROOT.'/admin/ecm_files_extrafields.php';

-	$head[$h][1] = $langs->trans("ExtraFieldsEcmFiles");

-	$nbExtrafields = $extrafields->attributes['ecm_files']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

-	$head[$h][2] = 'attributes_ecm_files';

-	$h++;

-

-	$head[$h][0] = DOL_URL_ROOT.'/admin/ecm_directories_extrafields.php';

-	$head[$h][1] = $langs->trans("ExtraFieldsEcmDirectories");

-	$nbExtrafields = $extrafields->attributes['ecm_directories']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

-	$head[$h][2] = 'attributes_ecm_directories';

-	$h++;

-

-	complete_head_from_modules($conf, $langs, null, $head, $h, 'ecm_admin');

-

-	complete_head_from_modules($conf, $langs, null, $head, $h, 'ecm_admin', 'remove');

-

-	return $head;

-}

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_emailing.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_emailing.lib.php
@@ -42,8 +42,7 @@
-	if (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('mailing', 'mailing_advance', 'recipient'))) {

-		$head[$h][0] = DOL_URL_ROOT."/comm/mailing/cibles.php?id=".$object->id;

-		$head[$h][1] = $langs->trans("MailRecipients");

-		if ($object->nbemail > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$object->nbemail.'</span>';

-		}

-		$head[$h][2] = 'targets';

-		$h++;

+	if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->mailing->mailing_advance->recipient))

+	{

+    	$head[$h][0] = DOL_URL_ROOT."/comm/mailing/cibles.php?id=".$object->id;

+    	$head[$h][1] = $langs->trans("MailRecipients");

+		if ($object->nbemail > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$object->nbemail.'</span>';

+    	$head[$h][2] = 'targets';

+    	$h++;

@@ -52 +51,2 @@
-	if (getDolGlobalString('EMAILING_USE_ADVANCED_SELECTOR')) {

+	if (!empty($conf->global->EMAILING_USE_ADVANCED_SELECTOR))

+	{

@@ -64,5 +63,0 @@
-	$head[$h][0] = DOL_URL_ROOT."/comm/mailing/note.php?id=".$object->id;

-	$head[$h][1] = $langs->trans("Note");

-	$head[$h][2] = 'note';

-	$h++;

-

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_expedition.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_expedition.lib.php
@@ -38,3 +38 @@
-	if (isModEnabled("expedition")) {

-		$langs->load("sendings");

-	}

+	if (!empty($conf->expedition->enabled)) $langs->load("sendings");

@@ -56,2 +54,3 @@
-	if (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY')) {

-		$head[$h][0] = DOL_URL_ROOT."/admin/delivery.php";

+	if (!empty($conf->global->MAIN_SUBMODULE_LIVRAISON))

+	{

+		$head[$h][0] = DOL_URL_ROOT."/admin/livraison.php";

@@ -62 +60,0 @@
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'order');

@@ -64 +62 @@
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'order', 'remove');

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'order', 'remove');

@@ -66 +64 @@
-	return $head;

+    return $head;

@@ -76 +74 @@
-	global $langs, $conf, $user, $db;

+	global $langs, $conf, $user;

@@ -78,2 +75,0 @@
-

-	$extrafields = new ExtraFields($db);

@@ -84 +79,0 @@
-	/*

@@ -89 +83,0 @@
-	*/

@@ -91,3 +84,0 @@
-	if (getDolGlobalString('MAIN_SUBMODULE_EXPEDITION')) {

-		$extrafields->fetch_name_optionals_label('expedition');

-		$extrafields->fetch_name_optionals_label('expeditiondet');

@@ -94,0 +86,2 @@
+	if (!empty($conf->global->MAIN_SUBMODULE_EXPEDITION))

+	{

@@ -98,0 +92 @@
+	}

@@ -100,8 +93,0 @@
-		$head[$h][0] = DOL_URL_ROOT.'/admin/expedition_extrafields.php';

-		$head[$h][1] = $langs->trans("ExtraFields");

-		$nbExtrafields = $extrafields->attributes['expedition']['count'];

-		if ($nbExtrafields > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-		}

-		$head[$h][2] = 'attributes_shipment';

-		$h++;

@@ -109,7 +95,21 @@
-		$head[$h][0] = DOL_URL_ROOT.'/admin/expeditiondet_extrafields.php';

-		$head[$h][1] = $langs->trans("ExtraFieldsLines");

-		$nbExtrafields = $extrafields->attributes['expeditiondet']['count'];

-		if ($nbExtrafields > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-		}

-		$head[$h][2] = 'attributeslines_shipment';

+	if (!empty($conf->global->MAIN_SUBMODULE_EXPEDITION))

+	{

+	    $head[$h][0] = DOL_URL_ROOT.'/admin/expedition_extrafields.php';

+	    $head[$h][1] = $langs->trans("ExtraFields");

+	    $head[$h][2] = 'attributes_shipment';

+	    $h++;

+	}

+

+	if (!empty($conf->global->MAIN_SUBMODULE_EXPEDITION))

+	{

+	    $head[$h][0] = DOL_URL_ROOT.'/admin/expeditiondet_extrafields.php';

+	    $head[$h][1] = $langs->trans("ExtraFieldsLines");

+	    $head[$h][2] = 'attributeslines_shipment';

+	    $h++;

+	}

+

+	if (!empty($conf->global->MAIN_SUBMODULE_LIVRAISON))

+	{

+		$head[$h][0] = DOL_URL_ROOT."/admin/livraison.php";

+		$head[$h][1] = $langs->trans("Receivings");

+		$head[$h][2] = 'receivings';

@@ -119,10 +119,3 @@
-	$head[$h][0] = DOL_URL_ROOT."/admin/delivery.php";

-	$head[$h][1] = $langs->trans("Receivings");

-	$head[$h][2] = 'receivings';

-	$h++;

-

-	if (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY')) {

-		$extrafields->fetch_name_optionals_label('delivery');

-		$extrafields->fetch_name_optionals_label('deliverydet');

-

-		$head[$h][0] = DOL_URL_ROOT.'/admin/delivery_extrafields.php';

+	if (!empty($conf->global->MAIN_SUBMODULE_LIVRAISON))

+	{

+		$head[$h][0] = DOL_URL_ROOT.'/admin/livraison_extrafields.php';

@@ -130,4 +122,0 @@
-		$nbExtrafields = $extrafields->attributes['delivery']['count'];

-		if ($nbExtrafields > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-		}

@@ -135,0 +125 @@
+	}

@@ -137 +127,3 @@
-		$head[$h][0] = DOL_URL_ROOT.'/admin/deliverydet_extrafields.php';

+	if (!empty($conf->global->MAIN_SUBMODULE_LIVRAISON))

+	{

+		$head[$h][0] = DOL_URL_ROOT.'/admin/livraisondet_extrafields.php';

@@ -139,4 +130,0 @@
-		$nbExtrafields = $extrafields->attributes['deliverydet']['count'];

-		if ($nbExtrafields > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-		}

@@ -147 +135 @@
-	complete_head_from_modules($conf, $langs, null, $head, $h, 'expedition_admin');

+

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_expensereport.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_expensereport.lib.php
@@ -3 +2,0 @@
- * Copyright (C) 2022       Frédéric France         <frederic.france@netlogic.fr>

@@ -45,3 +44,3 @@
-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname);   												to remove a tab

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'expensereport', 'add', 'core');

+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

+    // $this->tabs = array('entity:-tabname);   												to remove a tab

+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'expensereport');

@@ -50 +49 @@
-	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

+    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

@@ -53 +52 @@
-	$nbLinks = Link::count($db, $object->element, $object->id);

+    $nbLinks = Link::count($db, $object->element, $object->id);

@@ -56,3 +55 @@
-	if (($nbFiles + $nbLinks) > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

-	}

+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

@@ -62,15 +59,10 @@
-	if (!getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {

-		$nbNote = 0;

-		if (!empty($object->note_private)) {

-			$nbNote++;

-		}

-		if (!empty($object->note_public)) {

-			$nbNote++;

-		}

-		$head[$h][0] = DOL_URL_ROOT.'/expensereport/note.php?id='.$object->id;

-		$head[$h][1] = $langs->trans('Notes');

-		if ($nbNote > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

-		}

-		$head[$h][2] = 'note';

-		$h++;

+	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))

+	{

+	    $nbNote = 0;

+	    if (!empty($object->note_private)) $nbNote++;

+	    if (!empty($object->note_public)) $nbNote++;

+	    $head[$h][0] = DOL_URL_ROOT.'/expensereport/note.php?id='.$object->id;

+	    $head[$h][1] = $langs->trans('Notes');

+	    if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

+	    $head[$h][2] = 'note';

+	    $h++;

@@ -83,2 +74,0 @@
-

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'expensereport', 'add', 'external');

@@ -95,2 +85,2 @@
- * @param	PaymentExpenseReport	$object		Current payment object

- * @return	array								Tabs for the payment section

+ * @param	Paiement	$object		Current payment object

+ * @return	array					Tabs for the payment section

@@ -99,0 +90 @@
+

@@ -106 +97 @@
-	$head[$h][1] = $langs->trans("ExpenseReportPayment");

+	$head[$h][1] = $langs->trans("ExpenseReport");

@@ -110,5 +101,5 @@
-	// Show more tabs from modules

-	// Entries must be declared in modules descriptor with line

-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname);   												to remove a tab

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment_expensereport');

+    // Show more tabs from modules

+    // Entries must be declared in modules descriptor with line

+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

+    // $this->tabs = array('entity:-tabname);   												to remove a tab

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment_expensereport');

@@ -133 +124 @@
-	global $langs, $conf, $user, $db;

+	global $langs, $conf, $user;

@@ -137,3 +127,0 @@
-

-	$extrafields = new ExtraFields($db);

-	$extrafields->fetch_name_optionals_label('expensereport');

@@ -148,6 +136,2 @@
-	$head[$h][0] = DOL_URL_ROOT."/admin/expensereport_rules.php";

-	$head[$h][1] = $langs->trans("ExpenseReportsRules");

-	$head[$h][2] = 'expenserules';

-	$h++;

-

-	if (getDolGlobalString('MAIN_USE_EXPENSE_IK')) {

+	if (!empty($conf->global->MAIN_USE_EXPENSE_IK))

+	{

@@ -156,0 +141,8 @@
+		$h++;

+	}

+

+	if (!empty($conf->global->MAIN_USE_EXPENSE_RULE))

+	{

+		$head[$h][0] = DOL_URL_ROOT."/admin/expensereport_rules.php";

+		$head[$h][1] = $langs->trans("ExpenseReportsRules");

+		$head[$h][2] = 'expenserules';

@@ -168,6 +160,2 @@
-	$nbExtrafields = $extrafields->attributes['expensereport']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

-	$head[$h][2] = 'attributes';

-	$h++;

+    $head[$h][2] = 'attributes';

+    $h++;

@@ -175 +163 @@
-	/*

+    /*

@@ -178,2 +166,2 @@
-	$head[$h][2] = 'attributesdet';

-	$h++;

+    $head[$h][2] = 'attributesdet';

+    $h++;

@@ -184 +172 @@
-	return $head;

+    return $head;

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_fichinter.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_fichinter.lib.php
@@ -49,3 +49,4 @@
-	if (!getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB')) {

-		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));

-		$head[$h][0] = DOL_URL_ROOT.'/fichinter/contact.php?id='.$object->id;

+	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))

+	{

+	    $nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));

+	    $head[$h][0] = DOL_URL_ROOT.'/fichinter/contact.php?id='.$object->id;

@@ -53,3 +54 @@
-		if ($nbContact > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';

-		}

+		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';

@@ -60,5 +59,5 @@
-	// Show more tabs from modules

-	// Entries must be declared in modules descriptor with line

-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname);   												to remove a tab

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'intervention', 'add', 'core');

+    // Show more tabs from modules

+    // Entries must be declared in modules descriptor with line

+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

+    // $this->tabs = array('entity:-tabname);   												to remove a tab

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'intervention');

@@ -67 +66,2 @@
-	if (isModEnabled('resource')) {

+	if ($conf->resource->enabled)

+	{

@@ -71 +71 @@
-		$nbResource = (is_array($linked_resources) ? count($linked_resources) : 0);

+		$nbResource = (is_array($linked_resources) ?count($linked_resources) : 0);

@@ -74 +74 @@
-		// 	foreach ($objectres->available_resources as $modresources => $resources)

+	 	// 	foreach ($objectres->available_resources as $modresources => $resources)

@@ -84 +84 @@
-		$head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=fichinter&element_id='.$object->id;

+   		$head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=fichinter&element_id='.$object->id;

@@ -86,3 +86 @@
-		if ($nbResource > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbResource.'</span>';

-		}

+		if ($nbResource > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbResource.'</span>';

@@ -93,16 +91,11 @@
-	if (!getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {

-		$nbNote = 0;

-		if (!empty($object->note_private)) {

-			$nbNote++;

-		}

-		if (!empty($object->note_public)) {

-			$nbNote++;

-		}

-		$head[$h][0] = DOL_URL_ROOT.'/fichinter/note.php?id='.$object->id;

-		$head[$h][1] = $langs->trans('Notes');

-		if ($nbNote > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

-		}

-		$head[$h][2] = 'note';

-		$h++;

-	}

+    if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))

+    {

+    	$nbNote = 0;

+        if (!empty($object->note_private)) $nbNote++;

+		if (!empty($object->note_public)) $nbNote++;

+    	$head[$h][0] = DOL_URL_ROOT.'/fichinter/note.php?id='.$object->id;

+    	$head[$h][1] = $langs->trans('Notes');

+		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

+    	$head[$h][2] = 'note';

+    	$h++;

+    }

@@ -111 +104 @@
-	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

+    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

@@ -114 +107 @@
-	$nbLinks = Link::count($db, $object->element, $object->id);

+    $nbLinks = Link::count($db, $object->element, $object->id);

@@ -117,3 +110 @@
-	if (($nbFiles + $nbLinks) > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

-	}

+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

@@ -123,32 +114,3 @@
-	$head[$h][0] = DOL_URL_ROOT.'/fichinter/agenda.php?id='.$object->id;

-	$head[$h][1] = $langs->trans('Events');

-	if (isModEnabled('agenda')&& ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {

-		$nbEvent = 0;

-		// Enable caching of thirdparty count actioncomm

-		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';

-		$cachekey = 'count_events_fichinter_'.$object->id;

-		$dataretrieved = dol_getcache($cachekey);

-		if (!is_null($dataretrieved)) {

-			$nbEvent = $dataretrieved;

-		} else {

-			$sql = "SELECT COUNT(id) as nb";

-			$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm";

-			$sql .= " WHERE fk_element = ".((int) $object->id);

-			$sql .= " AND elementtype = 'fichinter'";

-			$resql = $db->query($sql);

-			if ($resql) {

-				$obj = $db->fetch_object($resql);

-				$nbEvent = $obj->nb;

-			} else {

-				dol_syslog('Failed to count actioncomm '.$db->lasterror(), LOG_ERR);

-			}

-			dol_setcache($cachekey, $nbEvent, 120);		// If setting cache fails, this is not a problem, so we do not test result.

-		}

-

-		$head[$h][1] .= '/';

-		$head[$h][1] .= $langs->trans("Agenda");

-		if ($nbEvent > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbEvent.'</span>';

-		}

-	}

-	$head[$h][2] = 'agenda';

+    $head[$h][0] = DOL_URL_ROOT.'/fichinter/info.php?id='.$object->id;

+	$head[$h][1] = $langs->trans('Info');

+	$head[$h][2] = 'info';

@@ -157 +119 @@
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'intervention', 'add', 'external');

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'intervention', 'remove');

@@ -159,3 +121 @@
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'intervention', 'remove');

-

-	return $head;

+    return $head;

@@ -171,5 +131 @@
-	global $langs, $conf, $user, $db;

-

-	$extrafields = new ExtraFields($db);

-	$extrafields->fetch_name_optionals_label('fichinter');

-	$extrafields->fetch_name_optionals_label('fichinterdet');

+	global $langs, $conf, $user;

@@ -195,6 +151,2 @@
-	$nbExtrafields = $extrafields->attributes['fichinter']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

-	$head[$h][2] = 'attributes';

-	$h++;

+    $head[$h][2] = 'attributes';

+    $h++;

@@ -204,6 +156,4 @@
-	$nbExtrafields = $extrafields->attributes['fichinterdet']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

-	$head[$h][2] = 'attributesdet';

-	$h++;

+    $head[$h][2] = 'attributesdet';

+    $h++;

+

+

@@ -213 +163 @@
-	return $head;

+		return $head;

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_files.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_files.lib.php
@@ -3 +3 @@
- * Copyright (C) 2012-2021  Regis Houssin       <regis.houssin@inodbox.com>

+ * Copyright (C) 2012-2015  Regis Houssin       <regis.houssin@inodbox.com>

@@ -7,2 +7 @@
- * Copyright (C) 2019-2024  Frédéric France     <frederic.france@netlogic.fr>

- * Copyright (C) 2023       Lenin Rivas         <lenin.rivas777@gmail.com>

+ * Copyright (C) 2019       Frédéric France     <frederic.france@netlogic.fr>

@@ -54 +53 @@
- *	@param	int			$mode			0=Return array minimum keys loaded (faster), 1=Force all keys like date and size to be loaded (slower), 2=Force load of date only, 3=Force load of size only, 4=Force load of perm

+ *	@param	int			$mode			0=Return array minimum keys loaded (faster), 1=Force all keys like date and size to be loaded (slower), 2=Force load of date only, 3=Force load of size only

@@ -58 +56,0 @@
- *  @param	string		$nbsecondsold	Only files older than $nbsecondsold

@@ -62 +60 @@
-function dol_dir_list($path, $types = "all", $recursive = 0, $filter = "", $excludefilter = null, $sortcriteria = "name", $sortorder = SORT_ASC, $mode = 0, $nohook = 0, $relativename = "", $donotfollowsymlinks = 0, $nbsecondsold = 0)

+function dol_dir_list($path, $types = "all", $recursive = 0, $filter = "", $excludefilter = null, $sortcriteria = "name", $sortorder = SORT_ASC, $mode = 0, $nohook = 0, $relativename = "", $donotfollowsymlinks = 0)

@@ -67,8 +65,5 @@
-	if ($recursive <= 1) {	// Avoid too verbose log

-		dol_syslog("files.lib.php::dol_dir_list path=".$path." types=".$types." recursive=".$recursive." filter=".$filter." excludefilter=".json_encode($excludefilter));

-		//print 'xxx'."files.lib.php::dol_dir_list path=".$path." types=".$types." recursive=".$recursive." filter=".$filter." excludefilter=".json_encode($excludefilter);

-	}

-

-	$loaddate = ($mode == 1 || $mode == 2 || $nbsecondsold) ? true : false;

-	$loadsize = ($mode == 1 || $mode == 3) ? true : false;

-	$loadperm = ($mode == 1 || $mode == 4) ? true : false;

+	dol_syslog("files.lib.php::dol_dir_list path=".$path." types=".$types." recursive=".$recursive." filter=".$filter." excludefilter=".json_encode($excludefilter));

+	//print 'xxx'."files.lib.php::dol_dir_list path=".$path." types=".$types." recursive=".$recursive." filter=".$filter." excludefilter=".json_encode($excludefilter);

+

+	$loaddate = ($mode == 1 || $mode == 2) ?true:false;

+	$loadsize = ($mode == 1 || $mode == 3) ?true:false;

@@ -79 +73,0 @@
-	$now = dol_now();

@@ -84 +78,2 @@
-	if (is_object($hookmanager) && !$nohook) {

+	if (is_object($hookmanager) && !$nohook)

+	{

@@ -105,6 +100,6 @@
-	if (empty($reshook)) {

-		if (!is_dir($newpath)) {

-			return array();

-		}

-

-		if ($dir = opendir($newpath)) {

+	if (empty($reshook))

+	{

+		if (!is_dir($newpath)) return array();

+

+		if ($dir = opendir($newpath))

+		{

@@ -113,5 +108,4 @@
-			$fileperm = '';

-			while (false !== ($file = readdir($dir))) {        // $file is always a basename (into directory $newpath)

-				if (!utf8_check($file)) {

-					$file = mb_convert_encoding($file, 'UTF-8', 'ISO-8859-1'); // To be sure data is stored in utf8 in memory

-				}

+

+			while (false !== ($file = readdir($dir)))        // $file is always a basename (into directory $newpath)

+			{

+				if (!utf8_check($file)) $file = utf8_encode($file); // To be sure data is stored in utf8 in memory

@@ -124 +118,2 @@
-				if (is_array($excludefilter)) {

+				if (is_array($excludefilter))

+				{

@@ -126,2 +120,0 @@
-				} elseif ($excludefilter) {

-					$excludefilterarray[] = $excludefilter;

@@ -128,0 +122 @@
+				elseif ($excludefilter) $excludefilterarray[] = $excludefilter;

@@ -130 +124,2 @@
-				foreach ($excludefilterarray as $filt) {

+				foreach ($excludefilterarray as $filt)

+				{

@@ -132,2 +127 @@
-						$qualified = 0;

-						break;

+						$qualified = 0; break;

@@ -138 +132,2 @@
-				if ($qualified) {

+				if ($qualified)

+				{

@@ -141 +136,2 @@
-					if ($isdir && (($types == "directories") || ($types == "all") || $recursive > 0)) {

+					if ($isdir && (($types == "directories") || ($types == "all") || $recursive))

+					{

@@ -143,13 +139,7 @@
-						if (($types == "directories") || ($types == "all")) {

-							if ($loaddate || $sortcriteria == 'date') {

-								$filedate = dol_filemtime($path."/".$file);

-							}

-							if ($loadsize || $sortcriteria == 'size') {

-								$filesize = dol_filesize($path."/".$file);

-							}

-							if ($loadperm || $sortcriteria == 'perm') {

-								$fileperm = dol_fileperm($path."/".$file);

-							}

-

-							if (!$filter || preg_match('/'.$filter.'/i', $file)) {	// We do not search key $filter into all $path, only into $file part

-								$reg = array();

+						if (($types == "directories") || ($types == "all"))

+						{

+							if ($loaddate || $sortcriteria == 'date') $filedate = dol_filemtime($path."/".$file);

+							if ($loadsize || $sortcriteria == 'size') $filesize = dol_filesize($path."/".$file);

+

+							if (!$filter || preg_match('/'.$filter.'/i', $file))	// We do not search key $filter into all $path, only into $file part

+							{

@@ -166 +155,0 @@
-									"perm" => $fileperm,

@@ -173,2 +162,4 @@
-						if ($recursive > 0) {

-							if (empty($donotfollowsymlinks) || !is_link($path."/".$file)) {

+						if ($recursive)

+						{

+							if (empty($donotfollowsymlinks) || !is_link($path."/".$file))

+							{

@@ -176,26 +167 @@
-								$file_list = array_merge($file_list, dol_dir_list($path."/".$file, $types, $recursive + 1, $filter, $excludefilter, $sortcriteria, $sortorder, $mode, $nohook, ($relativename != '' ? $relativename.'/' : '').$file, $donotfollowsymlinks, $nbsecondsold));

-							}

-						}

-					} elseif (!$isdir && (($types == "files") || ($types == "all"))) {

-						// Add file into file_list array

-						if ($loaddate || $sortcriteria == 'date') {

-							$filedate = dol_filemtime($path."/".$file);

-						}

-						if ($loadsize || $sortcriteria == 'size') {

-							$filesize = dol_filesize($path."/".$file);

-						}

-

-						if (!$filter || preg_match('/'.$filter.'/i', $file)) {	// We do not search key $filter into $path, only into $file

-							if (empty($nbsecondsold) || $filedate <= ($now - $nbsecondsold)) {

-								preg_match('/([^\/]+)\/[^\/]+$/', $path.'/'.$file, $reg);

-								$level1name = (isset($reg[1]) ? $reg[1] : '');

-								$file_list[] = array(

-									"name" => $file,

-									"path" => $path,

-									"level1name" => $level1name,

-									"relativename" => ($relativename ? $relativename.'/' : '').$file,

-									"fullname" => $path.'/'.$file,

-									"date" => $filedate,

-									"size" => $filesize,

-									"type" => 'file'

-								);

+								$file_list = array_merge($file_list, dol_dir_list($path."/".$file, $types, $recursive, $filter, $excludefilter, $sortcriteria, $sortorder, $mode, $nohook, ($relativename != '' ? $relativename.'/' : '').$file, $donotfollowsymlinks));

@@ -204,0 +171,22 @@
+					elseif (!$isdir && (($types == "files") || ($types == "all")))

+					{

+						// Add file into file_list array

+						if ($loaddate || $sortcriteria == 'date') $filedate = dol_filemtime($path."/".$file);

+						if ($loadsize || $sortcriteria == 'size') $filesize = dol_filesize($path."/".$file);

+

+						if (!$filter || preg_match('/'.$filter.'/i', $file))	// We do not search key $filter into $path, only into $file

+						{

+							preg_match('/([^\/]+)\/[^\/]+$/', $path.'/'.$file, $reg);

+							$level1name = (isset($reg[1]) ? $reg[1] : '');

+							$file_list[] = array(

+								"name" => $file,

+								"path" => $path,

+								"level1name" => $level1name,

+								"relativename" => ($relativename ? $relativename.'/' : '').$file,

+								"fullname" => $path.'/'.$file,

+								"date" => $filedate,

+								"size" => $filesize,

+								"type" => 'file'

+							);

+						}

+					}

@@ -210 +198,2 @@
-			if (!empty($sortcriteria) && $sortorder) {

+			if (!empty($sortcriteria) && $sortorder)

+			{

@@ -216,3 +205 @@
-	if (is_object($hookmanager) && is_array($hookmanager->resArray)) {

-		$file_list = array_merge($file_list, $hookmanager->resArray);

-	}

+	if (is_object($hookmanager) && is_array($hookmanager->resArray)) $file_list = array_merge($file_list, $hookmanager->resArray);

@@ -241,5 +228,3 @@
-	$sql = " SELECT rowid, label, entity, filename, filepath, fullpath_orig, keywords, cover, gen_or_uploaded, extraparams,";

-	$sql .= " date_c, tms as date_m, fk_user_c, fk_user_m, acl, position, share";

-	if ($mode) {

-		$sql .= ", description";

-	}

+	$sql = " SELECT rowid, label, entity, filename, filepath, fullpath_orig, keywords, cover, gen_or_uploaded, extraparams, date_c, date_m, fk_user_c, fk_user_m,";

+	$sql .= " acl, position, share";

+	if ($mode) $sql .= ", description";

@@ -247,6 +232,2 @@
-	$sql .= " WHERE entity = ".$conf->entity;

-	if (preg_match('/%$/', $path)) {

-		$sql .= " AND filepath LIKE '".$db->escape($path)."'";

-	} else {

-		$sql .= " AND filepath = '".$db->escape($path)."'";

-	}

+	$sql .= " WHERE filepath = '".$db->escape($path)."'";

+	$sql .= " AND entity = ".$conf->entity;

@@ -255 +236,2 @@
-	if ($resql) {

+	if ($resql)

+	{

@@ -259 +241,2 @@
-		while ($i < $num) {

+		while ($i < $num)

+		{

@@ -261,2 +244,2 @@
-			if ($obj) {

-				$reg = array();

+			if ($obj)

+			{

@@ -280,2 +263 @@
-					"share" => $obj->share,

-					"description" => ($mode ? $obj->description : '')

+					"share" => $obj->share

@@ -288 +270,2 @@
-		if (!empty($sortcriteria)) {

+		if (!empty($sortcriteria))

+		{

@@ -290 +273,2 @@
-			foreach ($file_list as $key => $row) {

+			foreach ($file_list as $key => $row)

+			{

@@ -294,3 +278 @@
-			if ($sortorder) {

-				array_multisort($myarray, $sortorder, SORT_REGULAR, $file_list);

-			}

+			if ($sortorder) array_multisort($myarray, $sortorder, $file_list);

@@ -300 +282,3 @@
-	} else {

+	}

+	else

+	{

@@ -311 +295 @@
- * @param	array	$filearray			Array of files obtained using dol_dir_list

+ * @param	array	$filearray			Array of files get using dol_dir_list

@@ -323 +307 @@
-	if ($modulepart == 'produit' && getDolGlobalInt('PRODUCT_USE_OLD_PATH_FOR_PHOTO')) {

+	if ($modulepart == 'produit' && !empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {

@@ -325,6 +309,4 @@
-		if (!empty($object->id)) {

-			if (isModEnabled("product")) {

-				$upload_dirold = $conf->product->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2), 1, 1).'/'.substr(substr("000".$object->id, -2), 0, 1).'/'.$object->id."/photos";

-			} else {

-				$upload_dirold = $conf->service->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2), 1, 1).'/'.substr(substr("000".$object->id, -2), 0, 1).'/'.$object->id."/photos";

-			}

+		if (!empty($object->id))

+		{

+			if (!empty($conf->product->enabled)) $upload_dirold = $conf->product->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2), 1, 1).'/'.substr(substr("000".$object->id, -2), 0, 1).'/'.$object->id."/photos";

+			else $upload_dirold = $conf->service->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2), 1, 1).'/'.substr(substr("000".$object->id, -2), 0, 1).'/'.$object->id."/photos";

@@ -339 +320,0 @@
-	//var_dump($relativedir);

@@ -344 +325,2 @@
-	foreach ($filearray as $key => $val) {

+	foreach ($filearray as $key => $val)

+	{

@@ -345,0 +328 @@
+

@@ -348,2 +331,4 @@
-		foreach ($filearrayindatabase as $key2 => $val2) {

-			if (($filearrayindatabase[$key2]['path'] == $filearray[$key]['path']) && ($filearrayindatabase[$key2]['name'] == $tmpfilename)) {

+		foreach ($filearrayindatabase as $key2 => $val2)

+		{

+			if ($filearrayindatabase[$key2]['name'] == $tmpfilename)

+			{

@@ -353 +337,0 @@
-				$filearray[$key]['keywords'] = $filearrayindatabase[$key2]['keywords'];

@@ -363 +347,2 @@
-		if (!$found) {    // This happen in transition toward version 6, or if files were added manually into os dir.

+		if (!$found)    // This happen in transition toward version 6, or if files were added manually into os dir.

+		{

@@ -367 +351,0 @@
-			$filearray[$key]['share'] = 0;

@@ -370,2 +354,2 @@
-

-			if (!preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filename)) {     // If not a tmp file

+			if (!preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filename))     // If not a tmp file

+			{

@@ -388 +372 @@
-				$ecmfile->keywords = ''; // keyword content

+				$ecmfile->keyword = ''; // keyword content

@@ -390 +374,2 @@
-				if ($result < 0) {

+				if ($result < 0)

+				{

@@ -392 +377,3 @@
-				} else {

+				}

+				else

+				{

@@ -395 +382,3 @@
-			} else {

+			}

+			else

+			{

@@ -400 +389,2 @@
-	//var_dump($filearray); var_dump($relativedir.' - tmpfilename='.$tmpfilename.' - found='.$found);

+

+	/*var_dump($filearray);*/

@@ -407,2 +397,2 @@
- * @param	object 	$a		File 1

- * @param 	object	$b		File 2

+ * @param	string 	$a		File 1

+ * @param 	string	$b		File 2

@@ -413 +403,2 @@
-	global $sortorder, $sortfield;

+	global $sortorder;

+	global $sortfield;

@@ -417,12 +408,6 @@
-	if ($sortorder == 'ASC') {

-		$retup = -1;

-		$retdown = 1;

-	} else {

-		$retup = 1;

-		$retdown = -1;

-	}

-

-	if ($sortfield == 'name') {

-		if ($a->name == $b->name) {

-			return 0;

-		}

+	if ($sortorder == 'ASC') { $retup = -1; $retdown = 1; }

+	else { $retup = 1; $retdown = -1; }

+

+	if ($sortfield == 'name')

+	{

+		if ($a->name == $b->name) return 0;

@@ -431,4 +416,3 @@
-	if ($sortfield == 'date') {

-		if ($a->date == $b->date) {

-			return 0;

-		}

+	if ($sortfield == 'date')

+	{

+		if ($a->date == $b->date) return 0;

@@ -437,4 +421,3 @@
-	if ($sortfield == 'size') {

-		if ($a->size == $b->size) {

-			return 0;

-		}

+	if ($sortfield == 'size')

+	{

+		if ($a->size == $b->size) return 0;

@@ -443,2 +425,0 @@
-

-	return 0;

@@ -457,5 +438,2 @@
-	if (is_dir($newfolder)) {

-		return true;

-	} else {

-		return false;

-	}

+	if (is_dir($newfolder)) return true;

+	else return false;

@@ -472,3 +450 @@
-	if (!is_readable($dir)) {

-		return false;

-	}

+	if (!is_readable($dir)) return false;

@@ -511,4 +487,3 @@
-	foreach ($tmpprot as $prot) {

-		if (preg_match('/^'.$prot.':/i', $url)) {

-			return true;

-		}

+	foreach ($tmpprot as $prot)

+	{

+		if (preg_match('/^'.$prot.':/i', $url)) return true;

@@ -528 +503,2 @@
-	if (is_dir($newfolder)) {

+	if (is_dir($newfolder))

+	{

@@ -531 +507,2 @@
-		while ((gettype($name = readdir($handle)) != "boolean")) {

+		while ((gettype($name = readdir($handle)) != "boolean"))

+		{

@@ -534,3 +511 @@
-		foreach ($name_array as $temp) {

-			$folder_content .= $temp;

-		}

+		foreach ($name_array as $temp) $folder_content .= $temp;

@@ -540,6 +515,4 @@
-		if ($folder_content == "...") {

-			return true;

-		} else {

-			return false;

-		}

-	} else {

+		if ($folder_content == "...") return true;

+		else return false;

+	}

+	else

@@ -547 +519,0 @@
-	}

@@ -554 +526 @@
- * 	@return int					Return integer <0 if KO, Number of lines in files if OK

+ * 	@return int					<0 if KO, Number of lines in files if OK

@@ -564,2 +536,4 @@
-	if ($fp) {

-		while (!feof($fp)) {

+	if ($fp)

+	{

+		while (!feof($fp))

+		{

@@ -568,3 +542 @@
-			if (!$line === false) {

-				$nb++;

-			}

+			if (!$line === false) $nb++;

@@ -573 +545,3 @@
-	} else {

+	}

+	else

+	{

@@ -604,12 +577,0 @@
-}

-

-/**

- * Return permissions of a file

- *

- * @param 	string		$pathoffile		Path of file

- * @return 	integer						File permissions

- */

-function dol_fileperm($pathoffile)

-{

-	$newpathoffile = dol_osencode($pathoffile);

-	return fileperms($newpathoffile);

@@ -626,2 +588,2 @@
- * @param   int     $arrayreplacementisregex   1=Array of replacement is already an array with key that is a regex. Warning: the key must be escaped with preg_quote for '/'

- * @return	int							       Return integer <0 if error, 0 if nothing done (dest file already exists), >0 if OK

+ * @param   int     $arrayreplacementisregex   1=Array of replacement is regex

+ * @return	int							       <0 if error, 0 if nothing done (dest file already exists), >0 if OK

@@ -636,6 +598,2 @@
-	if (empty($srcfile)) {

-		return -1;

-	}

-	if (empty($destfile)) {

-		$destfile = $srcfile;

-	}

+	if (empty($srcfile)) return -1;

+	if (empty($destfile)) $destfile = $srcfile;

@@ -644,9 +602 @@
-	if (($destfile != $srcfile) && $destexists) {

-		return 0;

-	}

-

-	$srcexists = dol_is_file($srcfile);

-	if (!$srcexists) {

-		dol_syslog("files.lib.php::dolReplaceInFile failed to read src file", LOG_WARNING);

-		return -3;

-	}

+	if (($destfile != $srcfile) && $destexists) return 0;

@@ -661 +611,2 @@
-	if ($destexists && !is_writable($newpathofdestfile)) {

+	if ($destexists && !is_writable($newpathofdestfile))

+	{

@@ -665 +616,2 @@
-	if (!is_writable($newdirdestfile)) {

+	if (!is_writable($newdirdestfile))

+	{

@@ -675 +627,2 @@
-	if (empty($arrayreplacementisregex)) {

+	if (empty($arrayreplacementisregex))

+	{

@@ -677,2 +630,5 @@
-	} else {

-		foreach ($arrayreplacement as $key => $value) {

+	}

+	else

+	{

+		foreach ($arrayreplacement as $key => $value)

+		{

@@ -684 +640 @@
-	dolChmod($newpathoftmpdestfile, $newmask);

+	@chmod($newpathoftmpdestfile, octdec($newmask));

@@ -688 +644,2 @@
-	if (!$result) {

+	if (!$result)

+	{

@@ -692,4 +649,3 @@
-	if (empty($newmask) && getDolGlobalString('MAIN_UMASK')) {

-		$newmask = $conf->global->MAIN_UMASK;

-	}

-	if (empty($newmask)) {	// This should no happen

+	if (empty($newmask) && !empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;

+	if (empty($newmask))	// This should no happen

+	{

@@ -700 +656 @@
-	dolChmod($newpathofdestfile, $newmask);

+	@chmod($newpathofdestfile, octdec($newmask));

@@ -713,3 +669 @@
- * @param   int     $testvirus          Do an antivirus test. Move is canceled if a virus is found.

- * @param	int		$indexdatabase		Index new file into database.

- * @return	int							Return integer <0 if error, 0 if nothing done (dest file already exists and overwriteifexists=0), >0 if OK

+ * @return	int							<0 if error, 0 if nothing done (dest file already exists and overwriteifexists=0), >0 if OK

@@ -718,3 +672,3 @@
-function dol_copy($srcfile, $destfile, $newmask = 0, $overwriteifexists = 1, $testvirus = 0, $indexdatabase = 0)

-{

-	global $conf, $db, $user;

+function dol_copy($srcfile, $destfile, $newmask = 0, $overwriteifexists = 1)

+{

+	global $conf;

@@ -724,3 +678 @@
-	if (empty($srcfile) || empty($destfile)) {

-		return -1;

-	}

+	if (empty($srcfile) || empty($destfile)) return -1;

@@ -729,3 +681 @@
-	if (!$overwriteifexists && $destexists) {

-		return 0;

-	}

+	if (!$overwriteifexists && $destexists) return 0;

@@ -737 +687,2 @@
-	if ($destexists && !is_writable($newpathofdestfile)) {

+	if ($destexists && !is_writable($newpathofdestfile))

+	{

@@ -741 +692,2 @@
-	if (!is_writable($newdirdestfile)) {

+	if (!is_writable($newdirdestfile))

+	{

@@ -745,11 +696,0 @@
-

-	// Check virus

-	$testvirusarray = array();

-	if ($testvirus) {

-		$testvirusarray = dolCheckVirus($srcfile);

-		if (count($testvirusarray)) {

-			dol_syslog("files.lib.php::dol_copy canceled because a virus was found into source file. we ignore the copy request.", LOG_WARNING);

-			return -3;

-		}

-	}

-

@@ -759 +700,2 @@
-	if (!$result) {

+	if (!$result)

+	{

@@ -763,4 +705,3 @@
-	if (empty($newmask) && getDolGlobalString('MAIN_UMASK')) {

-		$newmask = $conf->global->MAIN_UMASK;

-	}

-	if (empty($newmask)) {	// This should no happen

+	if (empty($newmask) && !empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;

+	if (empty($newmask))	// This should no happen

+	{

@@ -771,60 +712,3 @@
-	dolChmod($newpathofdestfile, $newmask);

-

-	if ($result && $indexdatabase) {

-		// Add entry into ecm database

-		$rel_filetocopyafter = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $newpathofdestfile);

-		if (!preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetocopyafter)) {     // If not a tmp file

-			$rel_filetocopyafter = preg_replace('/^[\\/]/', '', $rel_filetocopyafter);

-			//var_dump($rel_filetorenamebefore.' - '.$rel_filetocopyafter);exit;

-

-			dol_syslog("Try to copy also entries in database for: ".$rel_filetocopyafter, LOG_DEBUG);

-			include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';

-

-			$ecmfiletarget = new EcmFiles($db);

-			$resultecmtarget = $ecmfiletarget->fetch(0, '', $rel_filetocopyafter);

-			if ($resultecmtarget > 0) {   // An entry for target name already exists for target, we delete it, a new one will be created.

-				dol_syslog("ECM dest file found, remove it", LOG_DEBUG);

-				$ecmfiletarget->delete($user);

-			} else {

-				dol_syslog("ECM dest file not found, create it", LOG_DEBUG);

-			}

-

-			$ecmSrcfile = new EcmFiles($db);

-			$resultecm  = $ecmSrcfile->fetch(0, '', $srcfile);

-			if ($resultecm) {

-				dol_syslog("Fetch src file ok", LOG_DEBUG);

-			} else {

-				dol_syslog("Fetch src file error", LOG_DEBUG);

-			}

-

-			$ecmfile = new EcmFiles($db);

-			$filename = basename($rel_filetocopyafter);

-			$rel_dir = dirname($rel_filetocopyafter);

-			$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);

-			$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);

-

-			$ecmfile->filepath = $rel_dir;

-			$ecmfile->filename = $filename;

-			$ecmfile->label = md5_file(dol_osencode($destfile)); // $destfile is a full path to file

-			$ecmfile->fullpath_orig = $srcfile;

-			$ecmfile->gen_or_uploaded = 'copy';

-			$ecmfile->description = $ecmSrcfile->description;

-			$ecmfile->keywords = $ecmSrcfile->keywords;

-			$resultecm = $ecmfile->create($user);

-			if ($resultecm < 0) {

-				dol_syslog("Create ECM file ok", LOG_DEBUG);

-				setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');

-			} else {

-				dol_syslog("Create ECM file error", LOG_DEBUG);

-				setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');

-			}

-

-			if ($resultecm > 0) {

-				$result = 1;

-			} else {

-				$result = -1;

-			}

-		}

-	}

-

-	return $result;

+	@chmod($newpathofdestfile, octdec($newmask));

+

+	return 1;

@@ -842,2 +726 @@
- * @param	array	$excludefileext		Exclude some file extensions

- * @return	int							Return integer <0 if error, 0 if nothing done (all files already exists and overwriteifexists=0), >0 if OK

+ * @return	int							<0 if error, 0 if nothing done (all files already exists and overwriteifexists=0), >0 if OK

@@ -846 +729 @@
-function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayreplacement = null, $excludesubdir = 0, $excludefileext = null)

+function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayreplacement = null, $excludesubdir = 0)

@@ -854,3 +737 @@
-	if (empty($srcfile) || empty($destfile)) {

-		return -1;

-	}

+	if (empty($srcfile) || empty($destfile)) return -1;

@@ -861 +742,2 @@
-	if (!$destexists) {

+	if (!$destexists)

+	{

@@ -865,3 +747 @@
-		if (empty($newmask) && getDolGlobalString('MAIN_UMASK')) {

-			$dirmaskdec = octdec($conf->global->MAIN_UMASK);

-		}

+		if (empty($newmask) && !empty($conf->global->MAIN_UMASK)) $dirmaskdec = octdec($conf->global->MAIN_UMASK);

@@ -876 +756,2 @@
-	if (is_dir($ossrcfile)) {

+	if (is_dir($ossrcfile))

+	{

@@ -878,3 +759,6 @@
-		while ($file = readdir($dir_handle)) {

-			if ($file != "." && $file != ".." && !is_link($ossrcfile."/".$file)) {

-				if (is_dir($ossrcfile."/".$file)) {

+		while ($file = readdir($dir_handle))

+		{

+			if ($file != "." && $file != ".." && !is_link($ossrcfile."/".$file))

+			{

+				if (is_dir($ossrcfile."/".$file))

+				{

@@ -884,2 +768,4 @@
-						if (is_array($arrayreplacement)) {

-							foreach ($arrayreplacement as $key => $val) {

+						if (is_array($arrayreplacement))

+						{

+							foreach ($arrayreplacement as $key => $val)

+							{

@@ -890 +776 @@
-						$tmpresult = dolCopyDir($srcfile."/".$file, $destfile."/".$newfile, $newmask, $overwriteifexists, $arrayreplacement, $excludesubdir, $excludefileext);

+						$tmpresult = dolCopyDir($srcfile."/".$file, $destfile."/".$newfile, $newmask, $overwriteifexists, $arrayreplacement, $excludesubdir);

@@ -892 +778,3 @@
-				} else {

+				}

+				else

+				{

@@ -894,9 +781,0 @@
-

-					if (is_array($excludefileext)) {

-						$extension = pathinfo($file, PATHINFO_EXTENSION);

-						if (in_array($extension, $excludefileext)) {

-							//print "We exclude the file ".$file." because its extension is inside list ".join(', ', $excludefileext); exit;

-							continue;

-						}

-					}

-

@@ -904,2 +783,4 @@
-					if (is_array($arrayreplacement)) {

-						foreach ($arrayreplacement as $key => $val) {

+					if (is_array($arrayreplacement))

+					{

+						foreach ($arrayreplacement as $key => $val)

+						{

@@ -912 +793,2 @@
-				if ($result > 0 && $tmpresult >= 0) {

+				if ($result > 0 && $tmpresult >= 0)

+				{

@@ -914 +796,3 @@
-				} else {

+				}

+				else

+				{

@@ -917,3 +801 @@
-				if ($result < 0) {

-					break;

-				}

+				if ($result < 0) break;

@@ -923 +805,3 @@
-	} else {

+	}

+	else

+	{

@@ -945 +828,0 @@
- * @param	int		$moreinfo			Array with more information

@@ -949 +832 @@
-function dol_move($srcfile, $destfile, $newmask = 0, $overwriteifexists = 1, $testvirus = 0, $indexdatabase = 1, $moreinfo = array())

+function dol_move($srcfile, $destfile, $newmask = 0, $overwriteifexists = 1, $testvirus = 0, $indexdatabase = 1)

@@ -958 +841,2 @@
-	if (!$srcexists) {

+	if (!$srcexists)

+	{

@@ -963 +847,2 @@
-	if ($overwriteifexists || !$destexists) {

+	if ($overwriteifexists || !$destexists)

+	{

@@ -969 +854,2 @@
-		if ($testvirus) {

+		if ($testvirus)

+		{

@@ -971 +857,2 @@
-			if (count($testvirusarray)) {

+			if (count($testvirusarray))

+			{

@@ -977,12 +863,0 @@
-		global $dolibarr_main_restrict_os_commands;

-		if (!empty($dolibarr_main_restrict_os_commands)) {

-			$arrayofallowedcommand = explode(',', $dolibarr_main_restrict_os_commands);

-			$arrayofallowedcommand = array_map('trim', $arrayofallowedcommand);

-			if (in_array(basename($destfile), $arrayofallowedcommand)) {

-				//$langs->load("errors"); // key must be loaded because we can't rely on loading during output, we need var substitution to be done now.

-				//setEventMessages($langs->trans("ErrorFilenameReserved", basename($destfile)), null, 'errors');

-				dol_syslog("files.lib.php::dol_move canceled because target filename ".basename($destfile)." is using a reserved command name. we ignore the move request.", LOG_WARNING);

-				return false;

-			}

-		}

-

@@ -990,2 +865,4 @@
-		if (!$result) {

-			if ($destexists) {

+		if (!$result)

+		{

+			if ($destexists)

+			{

@@ -996,3 +873,2 @@
-			} else {

-				dol_syslog("files.lib.php::dol_move Failed.", LOG_WARNING);

-			}

+			}

+			else dol_syslog("files.lib.php::dol_move Failed.", LOG_WARNING);

@@ -1002 +878,2 @@
-		if ($result && $indexdatabase) {

+		if ($result && $indexdatabase)

+		{

@@ -1006 +883,2 @@
-			if (!preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter)) {     // If not a tmp file

+			if (!preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter))     // If not a tmp file

+			{

@@ -1016 +894,2 @@
-				if ($resultecmtarget > 0) {   // An entry for target name already exists for target, we delete it, a new one will be created.

+				if ($resultecmtarget > 0)   // An entry for target name already exists for target, we delete it, a new one will be created.

+				{

@@ -1022 +901,2 @@
-				if ($resultecm > 0) {   // If an entry was found for src file, we use it to move entry

+				if ($resultecm > 0)   // If an entry was found for src file, we use it to move entry

+				{

@@ -1032 +912,3 @@
-				} elseif ($resultecm == 0) {   // If no entry were found for src files, create/update target file

+				}

+				elseif ($resultecm == 0)   // If no entry were found for src files, create/update target file

+				{

@@ -1041,25 +923,4 @@
-					$ecmfile->fullpath_orig = basename($srcfile);

-					$ecmfile->gen_or_uploaded = 'uploaded';

-					if (!empty($moreinfo) && !empty($moreinfo['description'])) {

-						$ecmfile->description = $moreinfo['description']; // indexed content

-					} else {

-						$ecmfile->description = ''; // indexed content

-					}

-					if (!empty($moreinfo) && !empty($moreinfo['keywords'])) {

-						$ecmfile->keywords = $moreinfo['keywords']; // indexed content

-					} else {

-						$ecmfile->keywords = ''; // keyword content

-					}

-					if (!empty($moreinfo) && !empty($moreinfo['note_private'])) {

-						$ecmfile->note_private = $moreinfo['note_private'];

-					}

-					if (!empty($moreinfo) && !empty($moreinfo['note_public'])) {

-						$ecmfile->note_public = $moreinfo['note_public'];

-					}

-					if (!empty($moreinfo) && !empty($moreinfo['src_object_type'])) {

-						$ecmfile->src_object_type = $moreinfo['src_object_type'];

-					}

-					if (!empty($moreinfo) && !empty($moreinfo['src_object_id'])) {

-						$ecmfile->src_object_id = $moreinfo['src_object_id'];

-					}

-

+					$ecmfile->fullpath_orig = $srcfile;

+					$ecmfile->gen_or_uploaded = 'unknown';

+					$ecmfile->description = ''; // indexed content

+					$ecmfile->keyword = ''; // keyword content

@@ -1067 +928,2 @@
-					if ($resultecm < 0) {

+					if ($resultecm < 0)

+					{

@@ -1070 +932,3 @@
-				} elseif ($resultecm < 0) {

+				}

+				elseif ($resultecm < 0)

+				{

@@ -1074,12 +938,7 @@
-				if ($resultecm > 0) {

-					$result = true;

-				} else {

-					$result = false;

-				}

-			}

-		}

-

-		if (empty($newmask)) {

-			$newmask = !getDolGlobalString('MAIN_UMASK') ? '0755' : $conf->global->MAIN_UMASK;

-		}

-

+				if ($resultecm > 0) $result = true;

+				else $result = false;

+			}

+		}

+

+		if (empty($newmask)) $newmask = empty($conf->global->MAIN_UMASK) ? '0755' : $conf->global->MAIN_UMASK;

+		$newmaskdec = octdec($newmask);

@@ -1089,67 +948,3 @@
-		dolChmod($newpathofdestfile, $newmask);

-	}

-

-	return $result;

-}

-

-/**

- * Move a directory into another name.

- *

- * @param	string	$srcdir 			Source directory

- * @param	string 	$destdir			Destination directory

- * @param	int		$overwriteifexists	Overwrite directory if exists (1 by default)

- * @param	int		$indexdatabase		Index new name of files into database.

- * @param	int		$renamedircontent	Also rename contents inside srcdir after the move to match new destination name.

- *

- * @return boolean 	True if OK, false if KO

-*/

-function dol_move_dir($srcdir, $destdir, $overwriteifexists = 1, $indexdatabase = 1, $renamedircontent = 1)

-{

-	$result = false;

-

-	dol_syslog("files.lib.php::dol_move_dir srcdir=".$srcdir." destdir=".$destdir." overwritifexists=".$overwriteifexists." indexdatabase=".$indexdatabase." renamedircontent=".$renamedircontent);

-	$srcexists = dol_is_dir($srcdir);

-	$srcbasename = basename($srcdir);

-	$destexists = dol_is_dir($destdir);

-

-	if (!$srcexists) {

-		dol_syslog("files.lib.php::dol_move_dir srcdir does not exists. we ignore the move request.");

-		return false;

-	}

-

-	if ($overwriteifexists || !$destexists) {

-		$newpathofsrcdir = dol_osencode($srcdir);

-		$newpathofdestdir = dol_osencode($destdir);

-

-		$result = @rename($newpathofsrcdir, $newpathofdestdir);

-

-		// Now we rename also contents inside dir after the move to match new destination name

-		if ($result && $renamedircontent) {

-			if (file_exists($newpathofdestdir)) {

-				$destbasename = basename($newpathofdestdir);

-				$files = dol_dir_list($newpathofdestdir);

-				if (!empty($files) && is_array($files)) {

-					foreach ($files as $key => $file) {

-						if (!file_exists($file["fullname"])) {

-							continue;

-						}

-						$filepath = $file["path"];

-						$oldname = $file["name"];

-

-						$newname = str_replace($srcbasename, $destbasename, $oldname);

-						if (!empty($newname) && $newname !== $oldname) {

-							if ($file["type"] == "dir") {

-								$res = dol_move_dir($filepath.'/'.$oldname, $filepath.'/'.$newname, $overwriteifexists, $indexdatabase, $renamedircontent);

-							} else {

-								$res = dol_move($filepath.'/'.$oldname, $filepath.'/'.$newname, 0, $overwriteifexists, 0, $indexdatabase);

-							}

-							if (!$res) {

-								return $result;

-							}

-						}

-					}

-					$result = true;

-				}

-			}

-		}

-	}

+		@chmod($newpathofdestfile, $newmaskdec);

+	}

+

@@ -1183,3 +978,4 @@
-	global $conf, $db;

-

-	if (getDolGlobalString('MAIN_ANTIVIRUS_COMMAND')) {

+	global $conf;

+

+	if (!empty($conf->global->MAIN_ANTIVIRUS_COMMAND))

+	{

@@ -1189 +985 @@
-		$antivir = new AntiVir($db);

+		$antivir=new AntiVir($db);

@@ -1191,2 +987,3 @@
-		if ($result < 0) {	// If virus or error, we stop here

-			$reterrors = $antivir->errors;

+		if ($result < 0)	// If virus or error, we stop here

+		{

+			$reterrors=$antivir->errors;

@@ -1229 +1026,2 @@
-	if (empty($nohook)) {

+	if (empty($nohook))

+	{

@@ -1236 +1034,2 @@
-	if (empty($reshook)) {

+	if (empty($reshook))

+	{

@@ -1238,2 +1037,4 @@
-		if ($uploaderrorcode) {

-			switch ($uploaderrorcode) {

+		if ($uploaderrorcode)

+		{

+			switch ($uploaderrorcode)

+			{

@@ -1257 +1057,0 @@
-		// Security:

@@ -1259 +1059,2 @@
-		if (empty($disablevirusscan) && file_exists($src_file)) {

+		if (empty($disablevirusscan) && file_exists($src_file))

+		{

@@ -1261 +1062,2 @@
-			if (count($checkvirusarray)) {

+			if (count($checkvirusarray))

+			{

@@ -1270 +1072,2 @@
-		if (isAFileWithExecutableContent($dest_file) && !getDolGlobalString('MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED')) {

+		if (isAFileWithExecutableContent($dest_file) && empty($conf->global->MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED))

+		{

@@ -1273,5 +1076,3 @@
-			if (!preg_match('/\/$/', $publicmediasdirwithslash)) {

-				$publicmediasdirwithslash .= '/';

-			}

-

-			if (strpos($upload_dir, $publicmediasdirwithslash) !== 0 || !getDolGlobalInt("MAIN_DOCUMENT_DISABLE_NOEXE_IN_MEDIAS_DIR")) {	// We never add .noexe on files into media directory

+			if (! preg_match('/\/$/', $publicmediasdirwithslash)) $publicmediasdirwithslash.='/';

+

+			if (strpos($upload_dir, $publicmediasdirwithslash) !== 0) {	// We never add .noexe on files into media directory

@@ -1285 +1086,2 @@
-		if (preg_match('/^\./', basename($src_file)) || preg_match('/\.\./', $src_file) || preg_match('/[<>|]/', $src_file)) {

+		if (preg_match('/^\./', basename($src_file)) || preg_match('/\.\./', $src_file) || preg_match('/[<>|]/', $src_file))

+		{

@@ -1292 +1094,2 @@
-		if (preg_match('/^\./', basename($dest_file)) || preg_match('/\.\./', $dest_file) || preg_match('/[<>|]/', $dest_file)) {

+		if (preg_match('/^\./', basename($dest_file)) || preg_match('/\.\./', $dest_file) || preg_match('/[<>|]/', $dest_file))

+		{

@@ -1298 +1101,2 @@
-	if ($reshook < 0) {	// At least one blocking error returned by one hook

+	if ($reshook < 0)	// At least one blocking error returned by one hook

+	{

@@ -1300,3 +1104 @@
-		if (empty($errmsg)) {

-			$errmsg = 'ErrorReturnedBySomeHooks'; // Should not occurs. Added if hook is bugged and does not set ->errors when there is error.

-		}

+		if (empty($errmsg)) $errmsg = 'ErrorReturnedBySomeHooks'; // Should not occurs. Added if hook is bugged and does not set ->errors when there is error.

@@ -1304 +1106,3 @@
-	} elseif (empty($reshook)) {

+	}

+	elseif (empty($reshook))

+	{

@@ -1310 +1114,2 @@
-		if (!is_writable(dirname($file_name_osencoded))) {

+		if (!is_writable(dirname($file_name_osencoded)))

+		{

@@ -1316,2 +1121,4 @@
-		if (!$allowoverwrite) {

-			if (file_exists($file_name_osencoded)) {

+		if (!$allowoverwrite)

+		{

+			if (file_exists($file_name_osencoded))

+			{

@@ -1321,5 +1127,0 @@
-		} else {	// We are allowed to erase

-			if (is_dir($file_name_osencoded)) {	// If there is a directory with name of file to create

-				dol_syslog("Files.lib::dol_move_uploaded_file A directory with name ".$file_name." already exists. Return 'ErrorDirWithFileNameAlreadyExists'", LOG_WARNING);

-				return 'ErrorDirWithFileNameAlreadyExists';

-			}

@@ -1330,3 +1132,4 @@
-		if ($return) {

-			dolChmod($file_name_osencoded);

-			dol_syslog("Files.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$file_name." - Umask=" . getDolGlobalString('MAIN_UMASK'), LOG_DEBUG);

+		if ($return)

+		{

+			if (!empty($conf->global->MAIN_UMASK)) @chmod($file_name_osencoded, octdec($conf->global->MAIN_UMASK));

+			dol_syslog("Files.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$file_name." - Umask=".$conf->global->MAIN_UMASK, LOG_DEBUG);

@@ -1334 +1137,3 @@
-		} else {

+		}

+		else

+		{

@@ -1354 +1158,0 @@
- *  @param	int		$nolog			Disable log file

@@ -1358,3 +1162,3 @@
-function dol_delete_file($file, $disableglob = 0, $nophperrors = 0, $nohook = 0, $object = null, $allowdotdot = false, $indexdatabase = 1, $nolog = 0)

-{

-	global $db, $user, $langs;

+function dol_delete_file($file, $disableglob = 0, $nophperrors = 0, $nohook = 0, $object = null, $allowdotdot = false, $indexdatabase = 1)

+{

+	global $db, $conf, $user, $langs;

@@ -1366,3 +1170 @@
-	if (empty($nolog)) {

-		dol_syslog("dol_delete_file file=".$file." disableglob=".$disableglob." nophperrors=".$nophperrors." nohook=".$nohook);

-	}

+	dol_syslog("dol_delete_file file=".$file." disableglob=".$disableglob." nophperrors=".$nophperrors." nohook=".$nohook);

@@ -1372 +1174,2 @@
-	if ((!$allowdotdot && preg_match('/\.\./', $file)) || preg_match('/[<>|]/', $file)) {

+	if ((!$allowdotdot && preg_match('/\.\./', $file)) || preg_match('/[<>|]/', $file))

+	{

@@ -1377,2 +1180,2 @@
-	$reshook = 0;

-	if (empty($nohook) && !empty($hookmanager)) {

+	if (empty($nohook))

+	{

@@ -1381,0 +1185 @@
+			'GET' => $_GET,

@@ -1389,5 +1193,3 @@
-	if (empty($nohook) && $reshook != 0) { // reshook = 0 to do standard actions, 1 = ok and replace, -1 = ko

-		dol_syslog("reshook=".$reshook);

-		if ($reshook < 0) {

-			return false;

-		}

+	if (empty($nohook) && $reshook != 0) // reshook = 0 to do standard actions, 1 = ok, -1 = ko

+	{

+		if ($reshook < 0) return false;

@@ -1395 +1197,4 @@
-	} else {

+	}

+	else

+	{

+		//print "x".$file." ".$disableglob;exit;

@@ -1397 +1202,2 @@
-		if (empty($disableglob) && !empty($file_osencoded)) {

+		if (empty($disableglob) && !empty($file_osencoded))

+		{

@@ -1402,24 +1208,9 @@
-			if (!empty($listofdir) && is_array($listofdir)) {

-				foreach ($listofdir as $filename) {

-					if ($nophperrors) {

-						$ok = @unlink($filename);

-					} else {

-						$ok = unlink($filename);

-					}

-

-					// If it fails and it is because of the missing write permission on parent dir

-					if (!$ok && file_exists(dirname($filename)) && !(fileperms(dirname($filename)) & 0200)) {

-						dol_syslog("Error in deletion, but parent directory exists with no permission to write, we try to change permission on parent directory and retry...", LOG_DEBUG);

-						dolChmod(dirname($filename), decoct(fileperms(dirname($filename)) | 0200));

-						// Now we retry deletion

-						if ($nophperrors) {

-							$ok = @unlink($filename);

-						} else {

-							$ok = unlink($filename);

-						}

-					}

-

-					if ($ok) {

-						if (empty($nolog)) {

-							dol_syslog("Removed file ".$filename, LOG_DEBUG);

-						}

+			if (!empty($listofdir) && is_array($listofdir))

+			{

+				foreach ($listofdir as $filename)

+				{

+					if ($nophperrors) $ok = @unlink($filename);

+					else $ok = unlink($filename);

+					if ($ok)

+					{

+						dol_syslog("Removed file ".$filename, LOG_DEBUG);

@@ -1429,2 +1220,4 @@
-						if (!preg_match('/(\/temp\/|\/thumbs\/|\.meta$)/', $rel_filetodelete)) {     // If not a tmp file

-							if (is_object($db) && $indexdatabase) {		// $db may not be defined when lib is in a context with define('NOREQUIREDB',1)

+						if (!preg_match('/(\/temp\/|\/thumbs\/|\.meta$)/', $rel_filetodelete))     // If not a tmp file

+						{

+							if (is_object($db) && $indexdatabase)		// $db may not be defined when lib is in a context with define('NOREQUIREDB',1)

+							{

@@ -1438 +1231,2 @@
-								if ($result >= 0 && $ecmfile->id > 0) {

+								if ($result >= 0 && $ecmfile->id > 0)

+								{

@@ -1441 +1235,2 @@
-								if ($result < 0) {

+								if ($result < 0)

+								{

@@ -1446 +1241,3 @@
-					} else {

+					}

+					else

+					{

@@ -1452,4 +1249,5 @@
-			} else {

-				dol_syslog("No files to delete found", LOG_DEBUG);

-			}

-		} else {

+			}

+			else dol_syslog("No files to delete found", LOG_DEBUG);

+		}

+		else

+		{

@@ -1457,12 +1255,4 @@
-			if ($nophperrors) {

-				$ok = @unlink($file_osencoded);

-			} else {

-				$ok = unlink($file_osencoded);

-			}

-			if ($ok) {

-				if (empty($nolog)) {

-					dol_syslog("Removed file ".$file_osencoded, LOG_DEBUG);

-				}

-			} else {

-				dol_syslog("Failed to remove file ".$file_osencoded, LOG_WARNING);

-			}

+			if ($nophperrors) $ok = @unlink($file_osencoded);

+			else $ok = unlink($file_osencoded);

+			if ($ok) dol_syslog("Removed file ".$file_osencoded, LOG_DEBUG);

+			else dol_syslog("Failed to remove file ".$file_osencoded, LOG_WARNING);

@@ -1488,2 +1278,3 @@
-	if (preg_match('/\.\./', $dir) || preg_match('/[<>|]/', $dir)) {

-		dol_syslog("Refused to delete dir ".$dir.' (contains invalid char sequence)', LOG_WARNING);

+	if (preg_match('/\.\./', $dir) || preg_match('/[<>|]/', $dir))

+	{

+		dol_syslog("Refused to delete dir ".$dir, LOG_WARNING);

@@ -1505,2 +1295,0 @@
- *  @param	int		$indexdatabase	Try to remove also index entries.

- *  @param	int		$nolog			Disable log files (too verbose when making recursive directories)

@@ -1509,6 +1298,5 @@
-function dol_delete_dir_recursive($dir, $count = 0, $nophperrors = 0, $onlysub = 0, &$countdeleted = 0, $indexdatabase = 1, $nolog = 0)

-{

-	if (empty($nolog)) {

-		dol_syslog("functions.lib:dol_delete_dir_recursive ".$dir, LOG_DEBUG);

-	}

-	if (dol_is_dir($dir)) {

+function dol_delete_dir_recursive($dir, $count = 0, $nophperrors = 0, $onlysub = 0, &$countdeleted = 0)

+{

+	dol_syslog("functions.lib:dol_delete_dir_recursive ".$dir, LOG_DEBUG);

+	if (dol_is_dir($dir))

+	{

@@ -1516,11 +1304,15 @@
-		if ($handle = opendir("$dir_osencoded")) {

-			while (false !== ($item = readdir($handle))) {

-				if (!utf8_check($item)) {

-					$item = mb_convert_encoding($item, 'UTF-8', 'ISO-8859-1'); // should be useless

-				}

-

-				if ($item != "." && $item != "..") {

-					if (is_dir(dol_osencode("$dir/$item")) && !is_link(dol_osencode("$dir/$item"))) {

-						$count = dol_delete_dir_recursive("$dir/$item", $count, $nophperrors, 0, $countdeleted, $indexdatabase, $nolog);

-					} else {

-						$result = dol_delete_file("$dir/$item", 1, $nophperrors, 0, null, false, $indexdatabase, $nolog);

+		if ($handle = opendir("$dir_osencoded"))

+		{

+			while (false !== ($item = readdir($handle)))

+			{

+				if (!utf8_check($item)) $item = utf8_encode($item); // should be useless

+

+				if ($item != "." && $item != "..")

+				{

+					if (is_dir(dol_osencode("$dir/$item")) && !is_link(dol_osencode("$dir/$item")))

+					{

+						$count = dol_delete_dir_recursive("$dir/$item", $count, $nophperrors, 0, $countdeleted);

+					}

+					else

+					{

+						$result = dol_delete_file("$dir/$item", 1, $nophperrors);

@@ -1528,3 +1320 @@
-						if ($result) {

-							$countdeleted++;

-						}

+						if ($result) $countdeleted++;

@@ -1537,2 +1327,2 @@
-			// Delete also the main directory

-			if (empty($onlysub)) {

+			if (empty($onlysub))

+			{

@@ -1541,3 +1331 @@
-				if ($result) {

-					$countdeleted++;

-				}

+				if ($result) $countdeleted++;

@@ -1568,20 +1356,9 @@
-	if ($object->element == 'order_supplier') {

-		$dir = $conf->fournisseur->commande->dir_output;

-	} elseif ($object->element == 'invoice_supplier') {

-		$dir = $conf->fournisseur->facture->dir_output;

-	} elseif ($object->element == 'project') {

-		$dir = $conf->project->dir_output;

-	} elseif ($object->element == 'shipping') {

-		$dir = $conf->expedition->dir_output.'/sending';

-	} elseif ($object->element == 'delivery') {

-		$dir = $conf->expedition->dir_output.'/receipt';

-	} elseif ($object->element == 'fichinter') {

-		$dir = $conf->ficheinter->dir_output;

-	} else {

-		$dir = empty($conf->$element->dir_output) ? '' : $conf->$element->dir_output;

-	}

-

-	if (empty($dir)) {

-		$object->error = $langs->trans('ErrorObjectNoSupportedByFunction');

-		return 0;

-	}

+	if ($object->element == 'order_supplier')		$dir = $conf->fournisseur->commande->dir_output;

+	elseif ($object->element == 'invoice_supplier')	$dir = $conf->fournisseur->facture->dir_output;

+	elseif ($object->element == 'project')			$dir = $conf->projet->dir_output;

+	elseif ($object->element == 'shipping')			$dir = $conf->expedition->dir_output.'/sending';

+	elseif ($object->element == 'delivery')			$dir = $conf->expedition->dir_output.'/receipt';

+	elseif ($object->element == 'fichinter')		$dir = $conf->ficheinter->dir_output;

+	else $dir = empty($conf->$element->dir_output) ? '' : $conf->$element->dir_output;

+

+	if (empty($dir)) return 'ErrorObjectNoSupportedByFunction';

@@ -1596,2 +1373,4 @@
-	if (file_exists($filepreviewnew) && is_writable($filepreviewnew)) {

-		if (!dol_delete_file($filepreviewnew, 1)) {

+	if (file_exists($filepreviewnew) && is_writable($filepreviewnew))

+	{

+		if (!dol_delete_file($filepreviewnew, 1))

+		{

@@ -1602,2 +1381,4 @@
-	if (file_exists($filepreviewnewbis) && is_writable($filepreviewnewbis)) {

-		if (!dol_delete_file($filepreviewnewbis, 1)) {

+	if (file_exists($filepreviewnewbis) && is_writable($filepreviewnewbis))

+	{

+		if (!dol_delete_file($filepreviewnewbis, 1))

+		{

@@ -1609,2 +1390,4 @@
-	if (file_exists($filepreviewold) && is_writable($filepreviewold)) {

-		if (!dol_delete_file($filepreviewold, 1)) {

+	if (file_exists($filepreviewold) && is_writable($filepreviewold))

+	{

+		if (!dol_delete_file($filepreviewold, 1))

+		{

@@ -1614 +1397,3 @@
-	} else {

+	}

+	else

+	{

@@ -1616 +1401,2 @@
-		for ($i = 0; $i < 20; $i++) {

+		for ($i = 0; $i < 20; $i++)

+		{

@@ -1619,2 +1405,4 @@
-			if (file_exists($preview) && is_writable($preview)) {

-				if (!dol_delete_file($preview, 1)) {

+			if (file_exists($preview) && is_writable($preview))

+			{

+				if (!dol_delete_file($preview, 1))

+				{

@@ -1644,3 +1432 @@
-	if (!getDolGlobalString('MAIN_DOC_CREATE_METAFILE')) {

-		return 0; // By default, no metafile.

-	}

+	if (empty($conf->global->MAIN_DOC_CREATE_METAFILE)) return 0; // By default, no metafile.

@@ -1651,17 +1437,10 @@
-	if ($object->element == 'order_supplier') {

-		$dir = $conf->fournisseur->dir_output.'/commande';

-	} elseif ($object->element == 'invoice_supplier') {

-		$dir = $conf->fournisseur->dir_output.'/facture';

-	} elseif ($object->element == 'project') {

-		$dir = $conf->project->dir_output;

-	} elseif ($object->element == 'shipping') {

-		$dir = $conf->expedition->dir_output.'/sending';

-	} elseif ($object->element == 'delivery') {

-		$dir = $conf->expedition->dir_output.'/receipt';

-	} elseif ($object->element == 'fichinter') {

-		$dir = $conf->ficheinter->dir_output;

-	} else {

-		$dir = empty($conf->$element->dir_output) ? '' : $conf->$element->dir_output;

-	}

-

-	if ($dir) {

+	if ($object->element == 'order_supplier')		$dir = $conf->fournisseur->dir_output.'/commande';

+	elseif ($object->element == 'invoice_supplier')	$dir = $conf->fournisseur->dir_output.'/facture';

+	elseif ($object->element == 'project')			$dir = $conf->projet->dir_output;

+	elseif ($object->element == 'shipping')			$dir = $conf->expedition->dir_output.'/sending';

+	elseif ($object->element == 'delivery')			$dir = $conf->expedition->dir_output.'/receipt';

+	elseif ($object->element == 'fichinter')		$dir = $conf->ficheinter->dir_output;

+	else $dir = empty($conf->$element->dir_output) ? '' : $conf->$element->dir_output;

+

+	if ($dir)

+	{

@@ -1674 +1453,2 @@
-		if (!is_dir($dir)) {

+		if (!is_dir($dir))

+		{

@@ -1678,4 +1458,3 @@
-		if (is_dir($dir)) {

-			if (is_countable($object->lines) && count($object->lines) > 0) {

-				$nblines = count($object->lines);

-			}

+		if (is_dir($dir))

+		{

+			$nblines = count($object->lines);

@@ -1690 +1469,2 @@
-			for ($i = 0; $i < $nblines; $i++) {

+			for ($i = 0; $i < $nblines; $i++)

+			{

@@ -1703,5 +1483,7 @@
-

-		dolChmod($file);

-

-		return 1;

-	} else {

+		if (!empty($conf->global->MAIN_UMASK))

+			@chmod($file, octdec($conf->global->MAIN_UMASK));

+

+			return 1;

+	}

+	else

+	{

@@ -1730 +1512,2 @@
-	if ($pathtoscan) {

+	if ($pathtoscan)

+	{

@@ -1732 +1515,2 @@
-		foreach ($listoffiles as $key => $val) {

+		foreach ($listoffiles as $key => $val)

+		{

@@ -1758,5 +1542,3 @@
- * @param   Object  $object                 Object used to set 'src_object_*' fields

- * @return	int                             Return integer <=0 if KO, >0 if OK

- * @see dol_remove_file_process()

- */

-function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesession = 0, $varfiles = 'addedfile', $savingdocmask = '', $link = null, $trackid = '', $generatethumbs = 1, $object = null)

+ * @return	int                             <=0 if KO, >0 if OK

+ */

+function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesession = 0, $varfiles = 'addedfile', $savingdocmask = '', $link = null, $trackid = '', $generatethumbs = 1)

@@ -1768 +1550,2 @@
-	if (!empty($_FILES[$varfiles])) { // For view $_FILES[$varfiles]['error']

+	if (!empty($_FILES[$varfiles])) // For view $_FILES[$varfiles]['error']

+	{

@@ -1770,9 +1553,3 @@
-		$maxfilesinform = getDolGlobalInt("MAIN_SECURITY_MAX_ATTACHMENT_ON_FORMS", 10);

-		if (is_array($_FILES[$varfiles]["name"]) && count($_FILES[$varfiles]["name"]) > $maxfilesinform) {

-			$langs->load("errors"); // key must be loaded because we can't rely on loading during output, we need var substitution to be done now.

-			setEventMessages($langs->trans("ErrorTooMuchFileInForm", $maxfilesinform), null, "errors");

-			return -1;

-		}

-		$result = dol_mkdir($upload_dir);

-		//      var_dump($result);exit;

-		if ($result >= 0) {

+

+		if (dol_mkdir($upload_dir) >= 0)

+		{

@@ -1780,3 +1557,4 @@
-			// Convert value of $TFile

-			if (!is_array($TFile['name'])) {

-				foreach ($TFile as $key => &$val) {

+			if (!is_array($TFile['name']))

+			{

+				foreach ($TFile as $key => &$val)

+				{

@@ -1789,5 +1567,2 @@
-			for ($i = 0; $i < $nbfile; $i++) {

-				if (empty($TFile['name'][$i])) {

-					continue; // For example, when submitting a form with no file name

-				}

-

+			for ($i = 0; $i < $nbfile; $i++)

+			{

@@ -1795,2 +1570,2 @@
-				$destfile = trim($TFile['name'][$i]);

-				$destfull = $upload_dir."/".$destfile;

+				$destfull = $upload_dir."/".$TFile['name'][$i];

+				$destfile = $TFile['name'][$i];

@@ -1799,3 +1574,4 @@
-				if ($savingdocmask && strpos($savingdocmask, $destfilewithoutext) !== 0) {

-					$destfile = trim(preg_replace('/__file__/', $TFile['name'][$i], $savingdocmask));

-					$destfull = $upload_dir."/".$destfile;

+				if ($savingdocmask && strpos($savingdocmask, $destfilewithoutext) !== 0)

+				{

+					$destfull = $upload_dir."/".preg_replace('/__file__/', $TFile['name'][$i], $savingdocmask);

+					$destfile = preg_replace('/__file__/', $TFile['name'][$i], $savingdocmask);

@@ -1809,0 +1586 @@
+

@@ -1813,0 +1591 @@
+

@@ -1817 +1595 @@
-				// this function is also applied when we rename and when we make try to download file (by the GETPOST(filename, 'alphanohtml') call).

+				// this function is also applied when we make try to download file (by the GETPOST(filename, 'alphanohtml') call).

@@ -1821,12 +1598,0 @@
-				// Check that filename is not the one of a reserved allowed CLI command

-				global $dolibarr_main_restrict_os_commands;

-				if (!empty($dolibarr_main_restrict_os_commands)) {

-					$arrayofallowedcommand = explode(',', $dolibarr_main_restrict_os_commands);

-					$arrayofallowedcommand = array_map('trim', $arrayofallowedcommand);

-					if (in_array($destfile, $arrayofallowedcommand)) {

-						$langs->load("errors"); // key must be loaded because we can't rely on loading during output, we need var substitution to be done now.

-						setEventMessages($langs->trans("ErrorFilenameReserved", $destfile), null, 'errors');

-						return -1;

-					}

-				}

-

@@ -1836 +1602,4 @@
-				if (is_numeric($resupload) && $resupload > 0) {   // $resupload can be 'ErrorFileAlreadyExists'

+				if (is_numeric($resupload) && $resupload > 0)   // $resupload can be 'ErrorFileAlreadyExists'

+				{

+					global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini;

+

@@ -1839,8 +1607,0 @@
-					$tmparraysize = getDefaultImageSizes();

-					$maxwidthsmall = $tmparraysize['maxwidthsmall'];

-					$maxheightsmall = $tmparraysize['maxheightsmall'];

-					$maxwidthmini = $tmparraysize['maxwidthmini'];

-					$maxheightmini = $tmparraysize['maxheightmini'];

-					//$quality = $tmparraysize['quality'];

-					$quality = 50;	// For thumbs, we force quality to 50

-

@@ -1848,2 +1609,4 @@
-					if ($generatethumbs) {

-						if (image_format_supported($destfull) == 1) {

+					if ($generatethumbs)

+					{

+						if (image_format_supported($destfull) == 1)

+						{

@@ -1854 +1617 @@
-							$imgThumbSmall = vignette($destfull, $maxwidthsmall, $maxheightsmall, '_small', $quality, "thumbs");

+							$imgThumbSmall = vignette($destfull, $maxwidthsmall, $maxheightsmall, '_small', 50, "thumbs");

@@ -1857 +1620 @@
-							$imgThumbMini = vignette($destfull, $maxwidthmini, $maxheightmini, '_mini', $quality, "thumbs");

+							$imgThumbMini = vignette($destfull, $maxwidthmini, $maxheightmini, '_mini', 50, "thumbs");

@@ -1862 +1625,2 @@
-					if (empty($donotupdatesession)) {

+					if (empty($donotupdatesession))

+					{

@@ -1870,7 +1634,5 @@
-					if ($donotupdatesession == 1) {

-						$sharefile = 0;

-						if ($TFile['type'][$i] == 'application/pdf' && strpos($_SERVER["REQUEST_URI"], 'product') !== false && getDolGlobalString('PRODUCT_ALLOW_EXTERNAL_DOWNLOAD')) {

-							$sharefile = 1;

-						}

-						$result = addFileIntoDatabaseIndex($upload_dir, basename($destfile).($resupload == 2 ? '.noexe' : ''), $TFile['name'][$i], 'uploaded', $sharefile, $object);

-						if ($result < 0) {

+					if ($donotupdatesession == 1)

+					{

+						$result = addFileIntoDatabaseIndex($upload_dir, basename($destfile).($resupload == 2 ? '.noexe' : ''), $TFile['name'][$i], 'uploaded', 0);

+						if ($result < 0)

+						{

@@ -1879,2 +1641,3 @@
-							} else {

-								setEventMessages('WarningFailedToAddFileIntoDatabaseIndex', null, 'warnings');

+							}

+							else {

+								setEventMessages('WarningFailedToAddFileIntoDatabaseIndex', '', 'warnings');

@@ -1886 +1649,3 @@
-				} else {

+				}

+				else

+				{

@@ -1888 +1653,2 @@
-					if ($resupload < 0) {	// Unknown error

+					if ($resupload < 0)	// Unknown error

+					{

@@ -1890 +1656,3 @@
-					} elseif (preg_match('/ErrorFileIsInfectedWithAVirus/', $resupload)) {	// Files infected by a virus

+					}

+					elseif (preg_match('/ErrorFileIsInfectedWithAVirus/', $resupload))	// Files infected by a virus

+					{

@@ -1892 +1660,3 @@
-					} else { // Known error

+					}

+					else	// Known error

+					{

@@ -1897 +1667,2 @@
-			if ($nbok > 0) {

+			if ($nbok > 0)

+			{

@@ -1901,2 +1671,0 @@
-		} else {

-			setEventMessages($langs->trans("ErrorFailedToCreateDir", $upload_dir), null, 'errors');

@@ -1913 +1682 @@
-

+		$langs->load('link');

@@ -1919 +1688,3 @@
-	} else {

+	}

+	else

+	{

@@ -1937 +1707,0 @@
- * @see dol_add_file_process()

@@ -1950,11 +1720,6 @@
-	if (!empty($_SESSION["listofpaths".$keytoavoidconflict])) {

-		$listofpaths = explode(';', $_SESSION["listofpaths".$keytoavoidconflict]);

-	}

-	if (!empty($_SESSION["listofnames".$keytoavoidconflict])) {

-		$listofnames = explode(';', $_SESSION["listofnames".$keytoavoidconflict]);

-	}

-	if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) {

-		$listofmimes = explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);

-	}

-

-	if ($keytodelete >= 0) {

+	if (!empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths = explode(';', $_SESSION["listofpaths".$keytoavoidconflict]);

+	if (!empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames = explode(';', $_SESSION["listofnames".$keytoavoidconflict]);

+	if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes = explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);

+

+	if ($keytodelete >= 0)

+	{

@@ -1963,7 +1728,6 @@
-		if (empty($donotdeletefile)) {

-			$result = dol_delete_file($pathtodelete, 1); // The delete of ecm database is inside the function dol_delete_file

-		} else {

-			$result = 0;

-		}

-		if ($result >= 0) {

-			if (empty($donotdeletefile)) {

+		if (empty($donotdeletefile)) $result = dol_delete_file($pathtodelete, 1); // The delete of ecm database is inside the function dol_delete_file

+		else $result = 0;

+		if ($result >= 0)

+		{

+			if (empty($donotdeletefile))

+			{

@@ -1973 +1737,2 @@
-			if (empty($donotupdatesession)) {

+			if (empty($donotupdatesession))

+			{

@@ -1994,6 +1759,5 @@
- *  @param      Object  $object         Object used to set 'src_object_*' fields

- *	@return		int						Return integer <0 if KO, 0 if nothing done, >0 if OK

- */

-function addFileIntoDatabaseIndex($dir, $file, $fullpathorig = '', $mode = 'uploaded', $setsharekey = 0, $object = null)

-{

-	global $db, $user, $conf;

+ *	@return		int						<0 if KO, 0 if nothing done, >0 if OK

+ */

+function addFileIntoDatabaseIndex($dir, $file, $fullpathorig = '', $mode = 'uploaded', $setsharekey = 0)

+{

+	global $db, $user;

@@ -2005 +1769,2 @@
-	if (!preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir)) {     // If not a tmp dir

+	if (!preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir

+	{

@@ -2018,23 +1783,3 @@
-		$ecmfile->keywords = ''; // keyword content

-

-		if (is_object($object) && $object->id > 0) {

-			$ecmfile->src_object_id = $object->id;

-			if (isset($object->table_element)) {

-				$ecmfile->src_object_type = $object->table_element;

-			} else {

-				dol_syslog('Error: object ' . get_class($object) . ' has no table_element attribute.');

-				return -1;

-			}

-			if (isset($object->src_object_description)) {

-				$ecmfile->description = $object->src_object_description;

-			}

-			if (isset($object->src_object_keywords)) {

-				$ecmfile->keywords = $object->src_object_keywords;

-			}

-		}

-

-		if (getDolGlobalString('MAIN_FORCE_SHARING_ON_ANY_UPLOADED_FILE')) {

-			$setsharekey = 1;

-		}

-

-		if ($setsharekey) {

+		$ecmfile->keyword = ''; // keyword content

+		if ($setsharekey)

+		{

@@ -2046 +1791,2 @@
-		if ($result < 0) {

+		if ($result < 0)

+		{

@@ -2060 +1806 @@
- *	@return		int						Return integer <0 if KO, 0 if nothing done, >0 if OK

+ *	@return		int						<0 if KO, 0 if nothing done, >0 if OK

@@ -2068 +1814,2 @@
-	if (empty($dir)) {

+	if (empty($dir))

+	{

@@ -2081 +1828,2 @@
-	if (!$error) {

+	if (!$error)

+	{

@@ -2085,6 +1833,2 @@
-		if ($file) {

-			$sql .= " AND filename = '".$db->escape($file)."'";

-		}

-		if ($mode) {

-			$sql .= " AND gen_or_uploaded = '".$db->escape($mode)."'";

-		}

+		if ($file) $sql .= " AND filename = '".$db->escape($file)."'";

+		if ($mode) $sql .= " AND gen_or_uploaded = '".$db->escape($mode)."'";

@@ -2093 +1837,2 @@
-		if (!$resql) {

+		if (!$resql)

+		{

@@ -2095 +1840 @@
-			dol_syslog(__FUNCTION__.' '.$db->lasterror(), LOG_ERR);

+			dol_syslog(__METHOD__.' '.$db->lasterror(), LOG_ERR);

@@ -2111,2 +1856,2 @@
- * 	Convert an image file or a PDF into another image format.

- *  This need Imagick php extension. You can use dol_imageResizeOrCrop() for a function that need GD.

+ * 	Convert an image file into another format.

+ *  This need Imagick php extension.

@@ -2118,2 +1863 @@
- *  @return	int					Return integer <0 if KO, 0=Nothing done, >0 if OK

- *  @see dol_imageResizeOrCrop()

+ *  @return	int					<0 if KO, 0=Nothing done, >0 if OK

@@ -2123 +1867,3 @@
-	if (class_exists('Imagick')) {

+	global $langs;

+	if (class_exists('Imagick'))

+	{

@@ -2134 +1880,2 @@
-		if ($ret) {

+		if ($ret)

+		{

@@ -2136,4 +1883,3 @@
-			if ($ret) {

-				if (empty($fileoutput)) {

-					$fileoutput = $fileinput.".".$ext;

-				}

+			if ($ret)

+			{

+				if (empty($fileoutput)) $fileoutput = $fileinput.".".$ext;

@@ -2143 +1889,2 @@
-				if (!dol_is_file($fileoutput) || is_writeable($fileoutput)) {

+				if (!dol_is_file($fileoutput) || is_writeable($fileoutput))

+				{

@@ -2146 +1893,3 @@
-					} catch (Exception $e) {

+					}

+					catch (Exception $e)

+					{

@@ -2149 +1898,3 @@
-				} else {

+				}

+				else

+				{

@@ -2152,6 +1903,5 @@
-				if ($ret) {

-					return $count;

-				} else {

-					return -3;

-				}

-			} else {

+				if ($ret) return $count;

+				else return -3;

+			}

+			else

+			{

@@ -2160 +1910,3 @@
-		} else {

+		}

+		else

+		{

@@ -2163 +1915,3 @@
-	} else {

+	}

+	else

+	{

@@ -2177,2 +1931 @@
- * @return	int						Return integer <0 if KO, >0 if OK

- * @see dol_uncompress(), dol_compress_dir()

+ * @return	int						<0 if KO, >0 if OK

@@ -2186 +1939,2 @@
-	try {

+	try

+	{

@@ -2190,11 +1944,6 @@
-		if ($mode == 'gz' && function_exists('gzencode')) {

-			$foundhandler = 1;

-			$compressdata = gzencode($data, 9);

-		} elseif ($mode == 'bz' && function_exists('bzcompress')) {

-			$foundhandler = 1;

-			$compressdata = bzcompress($data, 9);

-		} elseif ($mode == 'zstd' && function_exists('zstd_compress')) {

-			$foundhandler = 1;

-			$compressdata = zstd_compress($data, 9);

-		} elseif ($mode == 'zip') {

-			if (class_exists('ZipArchive') && getDolGlobalString('MAIN_USE_ZIPARCHIVE_FOR_ZIP_COMPRESS')) {

+		if ($mode == 'gz') { $foundhandler = 1; $compressdata = gzencode($data, 9); }

+		elseif ($mode == 'bz') { $foundhandler = 1; $compressdata = bzcompress($data, 9); }

+		elseif ($mode == 'zip')

+		{

+			if (class_exists('ZipArchive') && !empty($conf->global->MAIN_USE_ZIPARCHIVE_FOR_ZIP_COMPRESS))

+			{

@@ -2206 +1955 @@
-				$zip = new ZipArchive();

+				$zip = new ZipArchive;

@@ -2221 +1970 @@
-					new RecursiveDirectoryIterator($rootPath, FilesystemIterator::UNIX_PATHS),

+					new RecursiveDirectoryIterator($rootPath),

@@ -2223,3 +1972,4 @@
-				);

-

-				foreach ($files as $name => $file) {

+					);

+

+				foreach ($files as $name => $file)

+				{

@@ -2227 +1977,2 @@
-					if (!$file->isDir()) {

+					if (!$file->isDir())

+					{

@@ -2229,6 +1980,2 @@
-						$filePath = $file->getPath();				// the full path with filename using the $inputdir root.

-						$fileName = $file->getFilename();

-						$fileFullRealPath = $file->getRealPath();	// the full path with name and transformed to use real path directory.

-

-						//$relativePath = substr($fileFullRealPath, strlen($rootPath) + 1);

-						$relativePath = substr(($filePath ? $filePath.'/' : '').$fileName, strlen($rootPath) + 1);

+						$filePath = $file->getRealPath();

+						$relativePath = substr($filePath, strlen($rootPath) + 1);

@@ -2237 +1984 @@
-						$zip->addFile($fileFullRealPath, $relativePath);

+						$zip->addFile($filePath, $relativePath);

@@ -2248 +1995,2 @@
-			if (defined('ODTPHP_PATHTOPCLZIP')) {

+			if (defined('ODTPHP_PATHTOPCLZIP'))

+			{

@@ -2255 +2003,2 @@
-				if ($result === 0) {

+				if ($result === 0)

+				{

@@ -2259 +2008,2 @@
-					if ($archive->errorCode() == PCLZIP_ERR_WRITE_OPEN_FAIL) {

+					if ($archive->errorCode() == PCLZIP_ERR_WRITE_OPEN_FAIL)

+					{

@@ -2268 +2018,3 @@
-				} else {

+				}

+				else

+				{

@@ -2275 +2027,2 @@
-		if ($foundhandler) {

+		if ($foundhandler)

+		{

@@ -2280 +2033,3 @@
-		} else {

+		}

+		else

+		{

@@ -2288 +2043,3 @@
-	} catch (Exception $e) {

+	}

+	catch (Exception $e)

+	{

@@ -2305 +2061,0 @@
- * @see dol_compress_file(), dol_compress_dir()

@@ -2309,30 +2065,22 @@
-	global $conf, $langs, $db;

-

-	$fileinfo = pathinfo($inputfile);

-	$fileinfo["extension"] = strtolower($fileinfo["extension"]);

-

-	if ($fileinfo["extension"] == "zip") {

-		if (defined('ODTPHP_PATHTOPCLZIP') && !getDolGlobalString('MAIN_USE_ZIPARCHIVE_FOR_ZIP_UNCOMPRESS')) {

-			dol_syslog("Constant ODTPHP_PATHTOPCLZIP for pclzip library is set to ".ODTPHP_PATHTOPCLZIP.", so we use Pclzip to unzip into ".$outputdir);

-			include_once ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php';

-			$archive = new PclZip($inputfile);

-

-			// We create output dir manually, so it uses the correct permission (When created by the archive->extract, dir is rwx for everybody).

-			dol_mkdir(dol_sanitizePathName($outputdir));

-

-			// Extract into outputdir, but only files that match the regex '/^((?!\.\.).)*$/' that means "does not include .."

-			$result = $archive->extract(PCLZIP_OPT_PATH, $outputdir, PCLZIP_OPT_BY_PREG, '/^((?!\.\.).)*$/');

-

-			if (!is_array($result) && $result <= 0) {

-				return array('error'=>$archive->errorInfo(true));

-			} else {

-				$ok = 1;

-				$errmsg = '';

-				// Loop on each file to check result for unzipping file

-				foreach ($result as $key => $val) {

-					if ($val['status'] == 'path_creation_fail') {

-						$langs->load("errors");

-						$ok = 0;

-						$errmsg = $langs->trans("ErrorFailToCreateDir", $val['filename']);

-						break;

-					}

+	global $conf, $langs;

+

+	if (defined('ODTPHP_PATHTOPCLZIP') && empty($conf->global->MAIN_USE_ZIPARCHIVE_FOR_ZIP_UNCOMPRESS))

+	{

+		dol_syslog("Constant ODTPHP_PATHTOPCLZIP for pclzip library is set to ".ODTPHP_PATHTOPCLZIP.", so we use Pclzip to unzip into ".$outputdir);

+		include_once ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php';

+		$archive = new PclZip($inputfile);

+		$result = $archive->extract(PCLZIP_OPT_PATH, $outputdir);

+		//var_dump($result);

+		if (!is_array($result) && $result <= 0) return array('error'=>$archive->errorInfo(true));

+		else

+		{

+			$ok = 1; $errmsg = '';

+			// Loop on each file to check result for unzipping file

+			foreach ($result as $key => $val)

+			{

+				if ($val['status'] == 'path_creation_fail')

+				{

+					$langs->load("errors");

+					$ok = 0;

+					$errmsg = $langs->trans("ErrorFailToCreateDir", $val['filename']);

+					break;

@@ -2340,78 +2088,25 @@
-

-				if ($ok) {

-					return array();

-				} else {

-					return array('error'=>$errmsg);

-				}

-			}

-		}

-

-		if (class_exists('ZipArchive')) {	// Must install php-zip to have it

-			dol_syslog("Class ZipArchive is set so we unzip using ZipArchive to unzip into ".$outputdir);

-			$zip = new ZipArchive();

-			$res = $zip->open($inputfile);

-			if ($res === true) {

-				//$zip->extractTo($outputdir.'/');

-				// We must extract one file at time so we can check that file name does not contain '..' to avoid transversal path of zip built for example using

-				// python3 path_traversal_archiver.py <Created_file_name> test.zip -l 10 -p tmp/

-				// with -l is the range of dot to go back in path.

-				// and path_traversal_archiver.py found at https://github.com/Alamot/code-snippets/blob/master/path_traversal/path_traversal_archiver.py

-				for ($i = 0; $i < $zip->numFiles; $i++) {

-					if (preg_match('/\.\./', $zip->getNameIndex($i))) {

-						dol_syslog("Warning: Try to unzip a file with a transversal path ".$zip->getNameIndex($i), LOG_WARNING);

-						continue; // Discard the file

-					}

-					$zip->extractTo($outputdir.'/', array($zip->getNameIndex($i)));

-				}

-

-				$zip->close();

-				return array();

-			} else {

-				return array('error'=>'ErrUnzipFails');

-			}

-		}

-

-		return array('error'=>'ErrNoZipEngine');

-	} elseif (in_array($fileinfo["extension"], array('gz', 'bz2', 'zst'))) {

-		include_once DOL_DOCUMENT_ROOT."/core/class/utils.class.php";

-		$utils = new Utils($db);

-

-		dol_mkdir(dol_sanitizePathName($outputdir));

-		$outputfilename = escapeshellcmd(dol_sanitizePathName($outputdir).'/'.dol_sanitizeFileName($fileinfo["filename"]));

-		dol_delete_file($outputfilename.'.tmp');

-		dol_delete_file($outputfilename.'.err');

-

-		$extension = strtolower(pathinfo($fileinfo["filename"], PATHINFO_EXTENSION));

-		if ($extension == "tar") {

-			$cmd = 'tar -C '.escapeshellcmd(dol_sanitizePathName($outputdir)).' -xvf '.escapeshellcmd(dol_sanitizePathName($fileinfo["dirname"]).'/'.dol_sanitizeFileName($fileinfo["basename"]));

-

-			$resarray = $utils->executeCLI($cmd, $outputfilename.'.tmp', 0, $outputfilename.'.err', 0);

-			if ($resarray["result"] != 0) {

-				$resarray["error"] .= file_get_contents($outputfilename.'.err');

-			}

-		} else {

-			$program = "";

-			if ($fileinfo["extension"] == "gz") {

-				$program = 'gzip';

-			} elseif ($fileinfo["extension"] == "bz2") {

-				$program = 'bzip2';

-			} elseif ($fileinfo["extension"] == "zst") {

-				$program = 'zstd';

-			} else {

-				return array('error'=>'ErrorBadFileExtension');

-			}

-			$cmd = $program.' -dc '.escapeshellcmd(dol_sanitizePathName($fileinfo["dirname"]).'/'.dol_sanitizeFileName($fileinfo["basename"]));

-			$cmd .= ' > '.$outputfilename;

-

-			$resarray = $utils->executeCLI($cmd, $outputfilename.'.tmp', 0, null, 1, $outputfilename.'.err');

-			if ($resarray["result"] != 0) {

-				$errfilecontent = @file_get_contents($outputfilename.'.err');

-				if ($errfilecontent) {

-					$resarray["error"] .= " - ".$errfilecontent;

-				}

-			}

-		}

-		return $resarray["result"] != 0 ? array('error' => $resarray["error"]) : array();

-	}

-

-	return array('error'=>'ErrorBadFileExtension');

+			}

+

+			if ($ok) return array();

+			else return array('error'=>$errmsg);

+		}

+	}

+

+	if (class_exists('ZipArchive'))

+	{

+		dol_syslog("Class ZipArchive is set so we unzip using ZipArchive to unzip into ".$outputdir);

+		$zip = new ZipArchive;

+		$res = $zip->open($inputfile);

+		if ($res === true)

+		{

+			$zip->extractTo($outputdir.'/');

+			$zip->close();

+			return array();

+		}

+		else

+		{

+			return array('error'=>'ErrUnzipFails');

+		}

+	}

+

+	return array('error'=>'ErrNoZipEngine');

@@ -2429,8 +2124,4 @@
- * @param	string	$newmask		Mask for new file (0 by default means $conf->global->MAIN_UMASK). Example: '0666'

- * @return	int						Return integer <0 if KO, >0 if OK

- * @see dol_uncompress(), dol_compress_file()

- */

-function dol_compress_dir($inputdir, $outputfile, $mode = "zip", $excludefiles = '', $rootdirinzip = '', $newmask = 0)

-{

-	global $conf;

-

+ * @return	int						<0 if KO, >0 if OK

+ */

+function dol_compress_dir($inputdir, $outputfile, $mode = "zip", $excludefiles = '', $rootdirinzip = '')

+{

@@ -2441 +2132,2 @@
-	if (!dol_is_dir(dirname($outputfile)) || !is_writable(dirname($outputfile))) {

+	if (!dol_is_dir(dirname($outputfile)) || !is_writable(dirname($outputfile)))

+	{

@@ -2448,6 +2140,6 @@
-	try {

-		if ($mode == 'gz') {

-			$foundhandler = 0;

-		} elseif ($mode == 'bz') {

-			$foundhandler = 0;

-		} elseif ($mode == 'zip') {

+	try

+	{

+		if ($mode == 'gz') { $foundhandler = 0; }

+		elseif ($mode == 'bz') { $foundhandler = 0; }

+		elseif ($mode == 'zip')

+		{

@@ -2465,3 +2157,3 @@
-			//if (class_exists('ZipArchive') && !empty($conf->global->MAIN_USE_ZIPARCHIVE_FOR_ZIP_COMPRESS))

-

-			if (class_exists('ZipArchive')) {

+			//if (class_exists('ZipArchive') && ! empty($conf->global->MAIN_USE_ZIPARCHIVE_FOR_ZIP_COMPRESS))

+			if (class_exists('ZipArchive'))

+			{

@@ -2473 +2165,2 @@
-				if ($result !== true) {

+				if (!$result)

+				{

@@ -2476 +2169 @@
-					$errormsg = $langs->trans("ErrorFailedToBuildArchive", $outputfile);

+					$errormsg = $langs->trans("ErrorFailedToWriteInFile", $outputfile);

@@ -2481 +2173,0 @@
-				// This does not return symbolic links

@@ -2484 +2176 @@
-					new RecursiveDirectoryIterator($inputdir, FilesystemIterator::UNIX_PATHS),

+					new RecursiveDirectoryIterator($inputdir),

@@ -2486,4 +2178,4 @@
-				);

-

-				//var_dump($inputdir);

-				foreach ($files as $name => $file) {

+					);

+

+				foreach ($files as $name => $file)

+				{

@@ -2491 +2183,2 @@
-					if (!$file->isDir()) {

+					if (!$file->isDir())

+					{

@@ -2493,9 +2186,5 @@
-						$filePath = $file->getPath();				// the full path with filename using the $inputdir root.

-						$fileName = $file->getFilename();

-						$fileFullRealPath = $file->getRealPath();	// the full path with name and transformed to use real path directory.

-

-						//$relativePath = ($rootdirinzip ? $rootdirinzip.'/' : '').substr($fileFullRealPath, strlen($inputdir) + 1);

-						$relativePath = ($rootdirinzip ? $rootdirinzip.'/' : '').substr(($filePath ? $filePath.'/' : '').$fileName, strlen($inputdir) + 1);

-

-						//var_dump($filePath);var_dump($fileFullRealPath);var_dump($relativePath);

-						if (empty($excludefiles) || !preg_match($excludefiles, $fileFullRealPath)) {

+						$filePath = $file->getRealPath();

+						$relativePath = ($rootdirinzip ? $rootdirinzip.'/' : '').substr($filePath, strlen($inputdir) + 1);

+

+						if (empty($excludefiles) || !preg_match($excludefiles, $filePath))

+						{

@@ -2503 +2192 @@
-							$zip->addFile($fileFullRealPath, $relativePath);

+							$zip->addFile($filePath, $relativePath);

@@ -2511,10 +2199,0 @@
-				if (empty($newmask) && getDolGlobalString('MAIN_UMASK')) {

-					$newmask = $conf->global->MAIN_UMASK;

-				}

-				if (empty($newmask)) {	// This should no happen

-					dol_syslog("Warning: dol_copy called with empty value for newmask and no default value defined", LOG_WARNING);

-					$newmask = '0664';

-				}

-

-				dolChmod($outputfile, $newmask);

-

@@ -2525 +2204,2 @@
-		if (!$foundhandler) {

+		if (!$foundhandler)

+		{

@@ -2528 +2208,3 @@
-		} else {

+		}

+		else

+		{

@@ -2531 +2213,3 @@
-	} catch (Exception $e) {

+	}

+	catch (Exception $e)

+	{

@@ -2536 +2220 @@
-		$errormsg = $langs->trans("ErrorFailedToBuildArchive", $outputfile).' - '.$e->getMessage();

+		$errormsg = $langs->trans("ErrorFailedToWriteInDir", $outputfile);

@@ -2551 +2235 @@
- * @return	array						Array with properties (full path, date, ...) of to most recent file

+ * @return	string						Full path to most recent file

@@ -2556,14 +2240,13 @@
-	return isset($tmparray[0]) ? $tmparray[0] : null;

-}

-

-/**

- * Security check when accessing to a document (used by document.php, viewimage.php and webservices to get documents).

- * TODO Replace code that set $accessallowed by a call to restrictedArea()

- *

- * @param	string		$modulepart			Module of document ('module', 'module_user_temp', 'module_user' or 'module_temp'). Example: 'medias', 'invoice', 'logs', 'tax-vat', ...

- * @param	string		$original_file		Relative path with filename, relative to modulepart.

- * @param	string		$entity				Restrict onto entity (0=no restriction)

- * @param  	User|null	$fuser				User object (forced)

- * @param	string		$refname			Ref of object to check permission for external users (autodetect if not provided by taking the dirname of $original_file) or for hierarchy

- * @param   string  	$mode               Check permission for 'read' or 'write'

- * @return	mixed							Array with access information : 'accessallowed' & 'sqlprotectagainstexternals' & 'original_file' (as a full path name)

+	return $tmparray[0];

+}

+

+/**

+ * Security check when accessing to a document (used by document.php, viewimage.php and webservices)

+ *

+ * @param	string	$modulepart			Module of document ('module', 'module_user_temp', 'module_user' or 'module_temp')

+ * @param	string	$original_file		Relative path with filename, relative to modulepart.

+ * @param	string	$entity				Restrict onto entity (0=no restriction)

+ * @param  	User	$fuser				User object (forced)

+ * @param	string	$refname			Ref of object to check permission for external users (autodetect if not provided)

+ * @param   string  $mode               Check permission for 'read' or 'write'

+ * @return	mixed						Array with access information : 'accessallowed' & 'sqlprotectagainstexternals' & 'original_file' (as a full path name)

@@ -2574 +2257 @@
-	global $conf, $db, $user, $hookmanager;

+	global $conf, $db, $user;

@@ -2576,30 +2259,13 @@
-	global $object;

-

-	if (!is_object($fuser)) {

-		$fuser = $user;

-	}

-

-	if (empty($modulepart)) {

-		return 'ErrorBadParameter';

-	}

-	if (empty($entity)) {

-		if (!isModEnabled('multicompany')) {

-			$entity = 1;

-		} else {

-			$entity = 0;

-		}

-	}

-	// Fix modulepart for backward compatibility

-	if ($modulepart == 'users') {

-		$modulepart = 'user';

-	}

-	if ($modulepart == 'tva') {

-		$modulepart = 'tax-vat';

-	}

-	// Fix modulepart delivery

-	if ($modulepart == 'expedition' && strpos($original_file, 'receipt/') === 0) {

-		$modulepart = 'delivery';

-	}

-

-	//print 'dol_check_secure_access_document modulepart='.$modulepart.' original_file='.$original_file.' entity='.$entity;

-	dol_syslog('dol_check_secure_access_document modulepart='.$modulepart.' original_file='.$original_file.' entity='.$entity);

+

+	if (!is_object($fuser)) $fuser = $user;

+

+	if (empty($modulepart)) return 'ErrorBadParameter';

+	if (empty($entity))

+	{

+		if (empty($conf->multicompany->enabled)) $entity = 1;

+		else $entity = 0;

+	}

+	// Fix modulepart

+	if ($modulepart == 'users') $modulepart = 'user';

+

+	dol_syslog('modulepart='.$modulepart.' original_file='.$original_file.' entity='.$entity);

@@ -2612,8 +2278,2 @@
-	// Find the subdirectory name as the reference. For example original_file='10/myfile.pdf' -> refname='10'

-	if (empty($refname)) {

-		$refname = basename(dirname($original_file)."/");

-		if ($refname == 'thumbs' || $refname == 'temp') {

-			// If we get the thumbs directory, we must go one step higher. For example original_file='10/thumbs/myfile_small.jpg' -> refname='10'

-			$refname = basename(dirname(dirname($original_file))."/");

-		}

-	}

+	// Find the subdirectory name as the reference. For exemple original_file='10/myfile.pdf' -> refname='10'

+	if (empty($refname)) $refname = basename(dirname($original_file)."/");

@@ -2622,7 +2282,4 @@
-	$lire = 'lire';

-	$read = 'read';

-	$download = 'download';

-	if ($mode == 'write') {

-		$lire = 'creer';

-		$read = 'write';

-		$download = 'upload';

+	$lire = 'lire'; $read = 'read'; $download = 'download';

+	if ($mode == 'write')

+	{

+		$lire = 'creer'; $read = 'write'; $download = 'upload';

@@ -2632,4 +2289,3 @@
-	if ($modulepart == 'medias' && !empty($dolibarr_main_data_root)) {

-		if (empty($entity) || empty($conf->medias->multidir_output[$entity])) {

-			return array('accessallowed'=>0, 'error'=>'Value entity must be provided');

-		}

+	if ($modulepart == 'medias' && !empty($dolibarr_main_data_root))

+	{

+		if (empty($entity) || empty($conf->medias->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');

@@ -2638,3 +2294,5 @@
-	} elseif ($modulepart == 'logs' && !empty($dolibarr_main_data_root)) {

-		// Wrapping for *.log files, like when used with url http://.../document.php?modulepart=logs&file=dolibarr.log

-		$accessallowed = ($user->admin && basename($original_file) == $original_file && preg_match('/^dolibarr.*\.(log|json)$/', basename($original_file)));

+	}

+	// Wrapping for *.log files, like when used with url http://.../document.php?modulepart=logs&file=dolibarr.log

+	elseif ($modulepart == 'logs' && !empty($dolibarr_main_data_root))

+	{

+		$accessallowed = ($user->admin && basename($original_file) == $original_file && preg_match('/^dolibarr.*\.log$/', basename($original_file)));

@@ -2642,6 +2300,4 @@
-	} elseif ($modulepart == 'doctemplates' && !empty($dolibarr_main_data_root)) {

-		// Wrapping for doctemplates

-		$accessallowed = $user->admin;

-		$original_file = $dolibarr_main_data_root.'/doctemplates/'.$original_file;

-	} elseif ($modulepart == 'doctemplateswebsite' && !empty($dolibarr_main_data_root)) {

-		// Wrapping for doctemplates of websites

+	}

+	// Wrapping for *.log files, like when used with url http://.../document.php?modulepart=logs&file=dolibarr.log

+	elseif ($modulepart == 'doctemplateswebsite' && !empty($dolibarr_main_data_root))

+	{

@@ -2650,2 +2306,4 @@
-	} elseif ($modulepart == 'packages' && !empty($dolibarr_main_data_root)) {

-		// Wrapping for *.zip package files, like when used with url http://.../document.php?modulepart=packages&file=module_myfile.zip

+	}

+	// Wrapping for *.zip files, like when used with url http://.../document.php?modulepart=packages&file=module_myfile.zip

+	elseif ($modulepart == 'packages' && !empty($dolibarr_main_data_root))

+	{

@@ -2658,2 +2316,4 @@
-	} elseif ($modulepart == 'mycompany' && !empty($conf->mycompany->dir_output)) {

-		// Wrapping for some images

+	}

+	// Wrapping for some images

+	elseif ($modulepart == 'mycompany' && !empty($conf->mycompany->dir_output))

+	{

@@ -2662,6 +2322,5 @@
-	} elseif ($modulepart == 'userphoto' && !empty($conf->user->dir_output)) {

-		// Wrapping for users photos (user photos are allowed to any connected users)

-		$accessallowed = 0;

-		if (preg_match('/^\d+\/photos\//', $original_file)) {

-			$accessallowed = 1;

-		}

+	}

+	// Wrapping for users photos

+	elseif ($modulepart == 'userphoto' && !empty($conf->user->dir_output))

+	{

+		$accessallowed = 1;

@@ -2669,27 +2328,4 @@
-	} elseif ($modulepart == 'userphotopublic' && !empty($conf->user->dir_output)) {

-		// Wrapping for users photos that were set to public (for virtual credit card) by their owner (public user photos can be read

-		// with the public link and securekey)

-		$accessok = false;

-		$reg = array();

-		if (preg_match('/^(\d+)\/photos\//', $original_file, $reg)) {

-			if ($reg[1]) {

-				$tmpobject = new User($db);

-				$tmpobject->fetch($reg[1], '', '', 1);

-				if (getDolUserInt('USER_ENABLE_PUBLIC', 0, $tmpobject)) {

-					$securekey = GETPOST('securekey', 'alpha', 1);

-					// Security check

-					global $dolibarr_main_cookie_cryptkey, $dolibarr_main_instance_unique_id;

-					$valuetouse = $dolibarr_main_instance_unique_id ? $dolibarr_main_instance_unique_id : $dolibarr_main_cookie_cryptkey; // Use $dolibarr_main_instance_unique_id first then $dolibarr_main_cookie_cryptkey

-					$encodedsecurekey = dol_hash($valuetouse.'uservirtualcard'.$tmpobject->id.'-'.$tmpobject->login, 'md5');

-					if ($encodedsecurekey == $securekey) {

-						$accessok = true;

-					}

-				}

-			}

-		}

-		if ($accessok) {

-			$accessallowed = 1;

-		}

-		$original_file = $conf->user->dir_output.'/'.$original_file;

-	} elseif (($modulepart == 'companylogo') && !empty($conf->mycompany->dir_output)) {

-		// Wrapping for company logos (company logos are allowed to anyboby, they are public)

+	}

+	// Wrapping for members photos

+	elseif ($modulepart == 'memberphoto' && !empty($conf->adherent->dir_output))

+	{

@@ -2697,7 +2332,0 @@
-		$original_file = $conf->mycompany->dir_output.'/logos/'.$original_file;

-	} elseif ($modulepart == 'memberphoto' && !empty($conf->adherent->dir_output)) {

-		// Wrapping for members photos

-		$accessallowed = 0;

-		if (preg_match('/^\d+\/photos\//', $original_file)) {

-			$accessallowed = 1;

-		}

@@ -2705,5 +2334,5 @@
-	} elseif ($modulepart == 'apercufacture' && !empty($conf->facture->multidir_output[$entity])) {

-		// Wrapping for invoices (user need permission to read invoices)

-		if ($fuser->hasRight('facture', $lire)) {

-			$accessallowed = 1;

-		}

+	}

+	// Wrapping pour les apercu factures

+	elseif ($modulepart == 'apercufacture' && !empty($conf->facture->multidir_output[$entity]))

+	{

+		if ($fuser->rights->facture->{$lire}) $accessallowed = 1;

@@ -2711,5 +2340,5 @@
-	} elseif ($modulepart == 'apercupropal' && !empty($conf->propal->multidir_output[$entity])) {

-		// Wrapping pour les apercu propal

-		if ($fuser->hasRight('propal', $lire)) {

-			$accessallowed = 1;

-		}

+	}

+	// Wrapping pour les apercu propal

+	elseif ($modulepart == 'apercupropal' && !empty($conf->propal->multidir_output[$entity]))

+	{

+		if ($fuser->rights->propale->{$lire}) $accessallowed = 1;

@@ -2717,5 +2346,5 @@
-	} elseif ($modulepart == 'apercucommande' && !empty($conf->commande->multidir_output[$entity])) {

-		// Wrapping pour les apercu commande

-		if ($fuser->hasRight('commande', $lire)) {

-			$accessallowed = 1;

-		}

+	}

+	// Wrapping pour les apercu commande

+	elseif ($modulepart == 'apercucommande' && !empty($conf->commande->multidir_output[$entity]))

+	{

+		if ($fuser->rights->commande->{$lire}) $accessallowed = 1;

@@ -2723,5 +2352,5 @@
-	} elseif (($modulepart == 'apercufichinter' || $modulepart == 'apercuficheinter') && !empty($conf->ficheinter->dir_output)) {

-		// Wrapping pour les apercu intervention

-		if ($fuser->hasRight('ficheinter', $lire)) {

-			$accessallowed = 1;

-		}

+	}

+	// Wrapping pour les apercu intervention

+	elseif (($modulepart == 'apercufichinter' || $modulepart == 'apercuficheinter') && !empty($conf->ficheinter->dir_output))

+	{

+		if ($fuser->rights->ficheinter->{$lire}) $accessallowed = 1;

@@ -2729,11 +2358,11 @@
-	} elseif (($modulepart == 'apercucontract') && !empty($conf->contrat->multidir_output[$entity])) {

-		// Wrapping pour les apercu contrat

-		if ($fuser->hasRight('contrat', $lire)) {

-			$accessallowed = 1;

-		}

-		$original_file = $conf->contrat->multidir_output[$entity].'/'.$original_file;

-	} elseif (($modulepart == 'apercusupplier_proposal' || $modulepart == 'apercusupplier_proposal') && !empty($conf->supplier_proposal->dir_output)) {

-		// Wrapping pour les apercu supplier proposal

-		if ($fuser->hasRight('supplier_proposal', $lire)) {

-			$accessallowed = 1;

-		}

+	}

+	// Wrapping pour les apercu conat

+	elseif (($modulepart == 'apercucontract') && !empty($conf->contrat->dir_output))

+	{

+		if ($fuser->rights->contrat->{$lire}) $accessallowed = 1;

+		$original_file = $conf->contrat->dir_output.'/'.$original_file;

+	}

+	// Wrapping pour les apercu supplier proposal

+	elseif (($modulepart == 'apercusupplier_proposal' || $modulepart == 'apercusupplier_proposal') && !empty($conf->supplier_proposal->dir_output))

+	{

+		if ($fuser->rights->supplier_proposal->{$lire}) $accessallowed = 1;

@@ -2741,5 +2370,5 @@
-	} elseif (($modulepart == 'apercusupplier_order' || $modulepart == 'apercusupplier_order') && !empty($conf->fournisseur->commande->dir_output)) {

-		// Wrapping pour les apercu supplier order

-		if ($fuser->hasRight('fournisseur', 'commande', $lire)) {

-			$accessallowed = 1;

-		}

+	}

+	// Wrapping pour les apercu supplier order

+	elseif (($modulepart == 'apercusupplier_order' || $modulepart == 'apercusupplier_order') && !empty($conf->fournisseur->commande->dir_output))

+	{

+		if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed = 1;

@@ -2747,5 +2376,5 @@
-	} elseif (($modulepart == 'apercusupplier_invoice' || $modulepart == 'apercusupplier_invoice') && !empty($conf->fournisseur->facture->dir_output)) {

-		// Wrapping pour les apercu supplier invoice

-		if ($fuser->hasRight('fournisseur', $lire)) {

-			$accessallowed = 1;

-		}

+	}

+	// Wrapping pour les apercu supplier invoice

+	elseif (($modulepart == 'apercusupplier_invoice' || $modulepart == 'apercusupplier_invoice') && !empty($conf->fournisseur->facture->dir_output))

+	{

+		if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed = 1;

@@ -2753,23 +2382,5 @@
-	} elseif (($modulepart == 'holiday') && !empty($conf->holiday->dir_output)) {

-		if ($fuser->hasRight('holiday', $read) || $fuser->hasRight('holiday', 'readall') || preg_match('/^specimen/i', $original_file)) {

-			$accessallowed = 1;

-			// If we known $id of holiday, call checkUserAccessToObject to check permission on properties and hierarchy of leave request

-			if ($refname && !$fuser->hasRight('holiday', 'readall') && !preg_match('/^specimen/i', $original_file)) {

-				include_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';

-				$tmpholiday = new Holiday($db);

-				$tmpholiday->fetch('', $refname);

-				$accessallowed = checkUserAccessToObject($user, array('holiday'), $tmpholiday, 'holiday', '', '', 'rowid', '');

-			}

-		}

-		$original_file = $conf->holiday->dir_output.'/'.$original_file;

-	} elseif (($modulepart == 'expensereport') && !empty($conf->expensereport->dir_output)) {

-		if ($fuser->hasRight('expensereport', $lire) || $fuser->hasRight('expensereport', 'readall') || preg_match('/^specimen/i', $original_file)) {

-			$accessallowed = 1;

-			// If we known $id of expensereport, call checkUserAccessToObject to check permission on properties and hierarchy of expense report

-			if ($refname && !$fuser->hasRight('expensereport', 'readall') && !preg_match('/^specimen/i', $original_file)) {

-				include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';

-				$tmpexpensereport = new ExpenseReport($db);

-				$tmpexpensereport->fetch('', $refname);

-				$accessallowed = checkUserAccessToObject($user, array('expensereport'), $tmpexpensereport, 'expensereport', '', '', 'rowid', '');

-			}

-		}

+	}

+	// Wrapping pour les apercu supplier invoice

+	elseif (($modulepart == 'apercuexpensereport') && !empty($conf->expensereport->dir_output))

+	{

+		if ($fuser->rights->expensereport->{$lire}) $accessallowed = 1;

@@ -2777,11 +2388,5 @@
-	} elseif (($modulepart == 'apercuexpensereport') && !empty($conf->expensereport->dir_output)) {

-		// Wrapping pour les apercu expense report

-		if ($fuser->hasRight('expensereport', $lire)) {

-			$accessallowed = 1;

-		}

-		$original_file = $conf->expensereport->dir_output.'/'.$original_file;

-	} elseif ($modulepart == 'propalstats' && !empty($conf->propal->multidir_temp[$entity])) {

-		// Wrapping pour les images des stats propales

-		if ($fuser->hasRight('propal', $lire)) {

-			$accessallowed = 1;

-		}

+	}

+	// Wrapping pour les images des stats propales

+	elseif ($modulepart == 'propalstats' && !empty($conf->propal->multidir_temp[$entity]))

+	{

+		if ($fuser->rights->propale->{$lire}) $accessallowed = 1;

@@ -2789,5 +2394,5 @@
-	} elseif ($modulepart == 'orderstats' && !empty($conf->commande->dir_temp)) {

-		// Wrapping pour les images des stats commandes

-		if ($fuser->hasRight('commande', $lire)) {

-			$accessallowed = 1;

-		}

+	}

+	// Wrapping pour les images des stats commandes

+	elseif ($modulepart == 'orderstats' && !empty($conf->commande->dir_temp))

+	{

+		if ($fuser->rights->commande->{$lire}) $accessallowed = 1;

@@ -2795,4 +2400,4 @@
-	} elseif ($modulepart == 'orderstatssupplier' && !empty($conf->fournisseur->dir_output)) {

-		if ($fuser->hasRight('fournisseur', 'commande', $lire)) {

-			$accessallowed = 1;

-		}

+	}

+	elseif ($modulepart == 'orderstatssupplier' && !empty($conf->fournisseur->dir_output))

+	{

+		if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed = 1;

@@ -2800,5 +2405,5 @@
-	} elseif ($modulepart == 'billstats' && !empty($conf->facture->dir_temp)) {

-		// Wrapping pour les images des stats factures

-		if ($fuser->hasRight('facture', $lire)) {

-			$accessallowed = 1;

-		}

+	}

+	// Wrapping pour les images des stats factures

+	elseif ($modulepart == 'billstats' && !empty($conf->facture->dir_temp))

+	{

+		if ($fuser->rights->facture->{$lire}) $accessallowed = 1;

@@ -2806,4 +2411,4 @@
-	} elseif ($modulepart == 'billstatssupplier' && !empty($conf->fournisseur->dir_output)) {

-		if ($fuser->hasRight('fournisseur', 'facture', $lire)) {

-			$accessallowed = 1;

-		}

+	}

+	elseif ($modulepart == 'billstatssupplier' && !empty($conf->fournisseur->dir_output))

+	{

+		if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed = 1;

@@ -2811,5 +2416,5 @@
-	} elseif ($modulepart == 'expeditionstats' && !empty($conf->expedition->dir_temp)) {

-		// Wrapping pour les images des stats expeditions

-		if ($fuser->hasRight('expedition', $lire)) {

-			$accessallowed = 1;

-		}

+	}

+	// Wrapping pour les images des stats expeditions

+	elseif ($modulepart == 'expeditionstats' && !empty($conf->expedition->dir_temp))

+	{

+		if ($fuser->rights->expedition->{$lire}) $accessallowed = 1;

@@ -2817,5 +2422,5 @@
-	} elseif ($modulepart == 'tripsexpensesstats' && !empty($conf->deplacement->dir_temp)) {

-		// Wrapping pour les images des stats expeditions

-		if ($fuser->hasRight('deplacement', $lire)) {

-			$accessallowed = 1;

-		}

+	}

+	// Wrapping pour les images des stats expeditions

+	elseif ($modulepart == 'tripsexpensesstats' && !empty($conf->deplacement->dir_temp))

+	{

+		if ($fuser->rights->deplacement->{$lire}) $accessallowed = 1;

@@ -2823,5 +2428,5 @@
-	} elseif ($modulepart == 'memberstats' && !empty($conf->adherent->dir_temp)) {

-		// Wrapping pour les images des stats expeditions

-		if ($fuser->hasRight('adherent', $lire)) {

-			$accessallowed = 1;

-		}

+	}

+	// Wrapping pour les images des stats expeditions

+	elseif ($modulepart == 'memberstats' && !empty($conf->adherent->dir_temp))

+	{

+		if ($fuser->rights->adherent->{$lire}) $accessallowed = 1;

@@ -2829,5 +2434,5 @@
-	} elseif (preg_match('/^productstats_/i', $modulepart) && !empty($conf->product->dir_temp)) {

-		// Wrapping pour les images des stats produits

-		if ($fuser->hasRight('produit', $lire) || $fuser->hasRight('service', $lire)) {

-			$accessallowed = 1;

-		}

+	}

+	// Wrapping pour les images des stats produits

+	elseif (preg_match('/^productstats_/i', $modulepart) && !empty($conf->product->dir_temp))

+	{

+		if ($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) $accessallowed = 1;

@@ -2835,5 +2440,5 @@
-	} elseif (in_array($modulepart, array('tax', 'tax-vat', 'tva')) && !empty($conf->tax->dir_output)) {

-		// Wrapping for taxes

-		if ($fuser->hasRight('tax', 'charges', $lire)) {

-			$accessallowed = 1;

-		}

+	}

+	// Wrapping for taxes

+	elseif (in_array($modulepart, array('tax', 'tax-vat')) && !empty($conf->tax->dir_output))

+	{

+		if ($fuser->rights->tax->charges->{$lire}) $accessallowed = 1;

@@ -2842,15 +2447,5 @@
-	} elseif ($modulepart == 'actions' && !empty($conf->agenda->dir_output)) {

-		// Wrapping for events

-		if ($fuser->hasRight('agenda', 'myactions', $read)) {

-			$accessallowed = 1;

-			// If we known $id of project, call checkUserAccessToObject to check permission on the given agenda event on properties and assigned users

-			if ($refname && !preg_match('/^specimen/i', $original_file)) {

-				include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';

-				$tmpobject = new ActionComm($db);

-				$tmpobject->fetch((int) $refname);

-				$accessallowed = checkUserAccessToObject($user, array('agenda'), $tmpobject->id, 'actioncomm&societe', 'myactions|allactions', 'fk_soc', 'id', '');

-				if ($user->socid && $tmpobject->socid) {

-					$accessallowed = checkUserAccessToObject($user, array('societe'), $tmpobject->socid);

-				}

-			}

-		}

+	}

+	// Wrapping for events

+	elseif ($modulepart == 'actions' && !empty($conf->agenda->dir_output))

+	{

+		if ($fuser->rights->agenda->myactions->{$read}) $accessallowed = 1;

@@ -2858,8 +2453,6 @@
-	} elseif ($modulepart == 'category' && !empty($conf->categorie->multidir_output[$entity])) {

-		// Wrapping for categories (categories are allowed if user has permission to read categories or to work on TakePos)

-		if (empty($entity) || empty($conf->categorie->multidir_output[$entity])) {

-			return array('accessallowed'=>0, 'error'=>'Value entity must be provided');

-		}

-		if ($fuser->hasRight("categorie", $lire) || $fuser->hasRight("takepos", "run")) {

-			$accessallowed = 1;

-		}

+	}

+	// Wrapping for categories

+	elseif ($modulepart == 'category' && !empty($conf->categorie->multidir_output[$entity]))

+	{

+		if (empty($entity) || empty($conf->categorie->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');

+		if ($fuser->rights->categorie->{$lire}) $accessallowed = 1;

@@ -2867,5 +2460,5 @@
-	} elseif ($modulepart == 'prelevement' && !empty($conf->prelevement->dir_output)) {

-		// Wrapping pour les prelevements

-		if ($fuser->hasRight('prelevement', 'bons', $lire) || preg_match('/^specimen/i', $original_file)) {

-			$accessallowed = 1;

-		}

+	}

+	// Wrapping pour les prelevements

+	elseif ($modulepart == 'prelevement' && !empty($conf->prelevement->dir_output))

+	{

+		if ($fuser->rights->prelevement->bons->{$lire} || preg_match('/^specimen/i', $original_file)) $accessallowed = 1;

@@ -2873,2 +2466,4 @@
-	} elseif ($modulepart == 'graph_stock' && !empty($conf->stock->dir_temp)) {

-		// Wrapping pour les graph energie

+	}

+	// Wrapping pour les graph energie

+	elseif ($modulepart == 'graph_stock' && !empty($conf->stock->dir_temp))

+	{

@@ -2877,2 +2472,4 @@
-	} elseif ($modulepart == 'graph_fourn' && !empty($conf->fournisseur->dir_temp)) {

-		// Wrapping pour les graph fournisseurs

+	}

+	// Wrapping pour les graph fournisseurs

+	elseif ($modulepart == 'graph_fourn' && !empty($conf->fournisseur->dir_temp))

+	{

@@ -2881,2 +2478,4 @@
-	} elseif ($modulepart == 'graph_product' && !empty($conf->product->dir_temp)) {

-		// Wrapping pour les graph des produits

+	}

+	// Wrapping pour les graph des produits

+	elseif ($modulepart == 'graph_product' && !empty($conf->product->dir_temp))

+	{

@@ -2885,2 +2484,4 @@
-	} elseif ($modulepart == 'barcode') {

-		// Wrapping pour les code barre

+	}

+	// Wrapping pour les code barre

+	elseif ($modulepart == 'barcode')

+	{

@@ -2891,2 +2492,4 @@
-	} elseif ($modulepart == 'iconmailing' && !empty($conf->mailing->dir_temp)) {

-		// Wrapping for icon of background of mailings

+	}

+	// Wrapping pour les icones de background des mailings

+	elseif ($modulepart == 'iconmailing' && !empty($conf->mailing->dir_temp))

+	{

@@ -2895,2 +2498,4 @@
-	} elseif ($modulepart == 'scanner_user_temp' && !empty($conf->scanner->dir_temp)) {

-		// Wrapping pour le scanner

+	}

+	// Wrapping pour le scanner

+	elseif ($modulepart == 'scanner_user_temp' && !empty($conf->scanner->dir_temp))

+	{

@@ -2899,2 +2504,4 @@
-	} elseif ($modulepart == 'fckeditor' && !empty($conf->fckeditor->dir_output)) {

-		// Wrapping pour les images fckeditor

+	}

+	// Wrapping pour les images fckeditor

+	elseif ($modulepart == 'fckeditor' && !empty($conf->fckeditor->dir_output))

+	{

@@ -2903,2 +2510,5 @@
-	} elseif ($modulepart == 'user' && !empty($conf->user->dir_output)) {

-		// Wrapping for users

+	}

+

+	// Wrapping for users

+	elseif ($modulepart == 'user' && !empty($conf->user->dir_output))

+	{

@@ -2906,4 +2516,3 @@
-		if ($fuser->id == (int) $refname) {

-			$canreaduser = 1;

-		} // A user can always read its own card

-		if ($canreaduser || preg_match('/^specimen/i', $original_file)) {

+		if ($fuser->id == (int) $refname) { $canreaduser = 1; } // A user can always read its own card

+		if ($canreaduser || preg_match('/^specimen/i', $original_file))

+		{

@@ -2913,6 +2522,8 @@
-	} elseif (($modulepart == 'company' || $modulepart == 'societe' || $modulepart == 'thirdparty') && !empty($conf->societe->multidir_output[$entity])) {

-		// Wrapping for third parties

-		if (empty($entity) || empty($conf->societe->multidir_output[$entity])) {

-			return array('accessallowed'=>0, 'error'=>'Value entity must be provided');

-		}

-		if ($fuser->hasRight('societe', $lire) || preg_match('/^specimen/i', $original_file)) {

+	}

+

+	// Wrapping for third parties

+	elseif (($modulepart == 'company' || $modulepart == 'societe' || $modulepart == 'thirdparty') && !empty($conf->societe->multidir_output[$entity]))

+	{

+		if (empty($entity) || empty($conf->societe->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');

+		if ($fuser->rights->societe->{$lire} || preg_match('/^specimen/i', $original_file))

+		{

@@ -2923,6 +2534,8 @@
-	} elseif ($modulepart == 'contact' && !empty($conf->societe->multidir_output[$entity])) {

-		// Wrapping for contact

-		if (empty($entity) || empty($conf->societe->multidir_output[$entity])) {

-			return array('accessallowed'=>0, 'error'=>'Value entity must be provided');

-		}

-		if ($fuser->hasRight('societe', $lire)) {

+	}

+

+	// Wrapping for contact

+	elseif ($modulepart == 'contact' && !empty($conf->societe->multidir_output[$entity]))

+	{

+		if (empty($entity) || empty($conf->societe->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');

+		if ($fuser->rights->societe->{$lire})

+		{

@@ -2932,3 +2545,7 @@
-	} elseif (($modulepart == 'facture' || $modulepart == 'invoice') && !empty($conf->facture->multidir_output[$entity])) {

-		// Wrapping for invoices

-		if ($fuser->hasRight('facture', $lire) || preg_match('/^specimen/i', $original_file)) {

+	}

+

+	// Wrapping for invoices

+	elseif (($modulepart == 'facture' || $modulepart == 'invoice') && !empty($conf->facture->multidir_output[$entity]))

+	{

+		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file))

+		{

@@ -2939,3 +2556,6 @@
-	} elseif ($modulepart == 'massfilesarea_proposals' && !empty($conf->propal->multidir_output[$entity])) {

-		// Wrapping for mass actions

-		if ($fuser->hasRight('propal', $lire) || preg_match('/^specimen/i', $original_file)) {

+	}

+	// Wrapping for mass actions

+	elseif ($modulepart == 'massfilesarea_proposals' && !empty($conf->propal->multidir_output[$entity]))

+	{

+		if ($fuser->rights->propal->{$lire} || preg_match('/^specimen/i', $original_file))

+		{

@@ -2945,2 +2565,5 @@
-	} elseif ($modulepart == 'massfilesarea_orders') {

-		if ($fuser->hasRight('commande', $lire) || preg_match('/^specimen/i', $original_file)) {

+	}

+	elseif ($modulepart == 'massfilesarea_orders')

+	{

+		if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i', $original_file))

+		{

@@ -2950,2 +2573,5 @@
-	} elseif ($modulepart == 'massfilesarea_sendings') {

-		if ($fuser->hasRight('expedition', $lire) || preg_match('/^specimen/i', $original_file)) {

+	}

+	elseif ($modulepart == 'massfilesarea_sendings')

+	{

+		if ($fuser->rights->expedition->{$lire} || preg_match('/^specimen/i', $original_file))

+		{

@@ -2955,2 +2581,5 @@
-	} elseif ($modulepart == 'massfilesarea_invoices') {

-		if ($fuser->hasRight('facture', $lire) || preg_match('/^specimen/i', $original_file)) {

+	}

+	elseif ($modulepart == 'massfilesarea_invoices')

+	{

+		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file))

+		{

@@ -2960,2 +2589,5 @@
-	} elseif ($modulepart == 'massfilesarea_expensereport') {

-		if ($fuser->hasRight('facture', $lire) || preg_match('/^specimen/i', $original_file)) {

+	}

+	elseif ($modulepart == 'massfilesarea_expensereport')

+	{

+		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file))

+		{

@@ -2965,2 +2597,5 @@
-	} elseif ($modulepart == 'massfilesarea_interventions') {

-		if ($fuser->hasRight('ficheinter', $lire) || preg_match('/^specimen/i', $original_file)) {

+	}

+	elseif ($modulepart == 'massfilesarea_interventions')

+	{

+		if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i', $original_file))

+		{

@@ -2970,2 +2605,5 @@
-	} elseif ($modulepart == 'massfilesarea_supplier_proposal' && !empty($conf->supplier_proposal->dir_output)) {

-		if ($fuser->hasRight('supplier_proposal', $lire) || preg_match('/^specimen/i', $original_file)) {

+	}

+	elseif ($modulepart == 'massfilesarea_supplier_proposal' && !empty($conf->supplier_proposal->dir_output))

+	{

+		if ($fuser->rights->supplier_proposal->{$lire} || preg_match('/^specimen/i', $original_file))

+		{

@@ -2975,2 +2613,5 @@
-	} elseif ($modulepart == 'massfilesarea_supplier_order') {

-		if ($fuser->hasRight('fournisseur', 'commande', $lire) || preg_match('/^specimen/i', $original_file)) {

+	}

+	elseif ($modulepart == 'massfilesarea_supplier_order')

+	{

+		if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i', $original_file))

+		{

@@ -2980,2 +2621,5 @@
-	} elseif ($modulepart == 'massfilesarea_supplier_invoice') {

-		if ($fuser->hasRight('fournisseur', 'facture', $lire) || preg_match('/^specimen/i', $original_file)) {

+	}

+	elseif ($modulepart == 'massfilesarea_supplier_invoice')

+	{

+		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i', $original_file))

+		{

@@ -2985,2 +2629,5 @@
-	} elseif ($modulepart == 'massfilesarea_contract' && !empty($conf->contrat->dir_output)) {

-		if ($fuser->hasRight('contrat', $lire) || preg_match('/^specimen/i', $original_file)) {

+	}

+	elseif ($modulepart == 'massfilesarea_contract' && !empty($conf->contrat->dir_output))

+	{

+		if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i', $original_file))

+		{

@@ -2990,3 +2637,7 @@
-	} elseif (($modulepart == 'fichinter' || $modulepart == 'ficheinter') && !empty($conf->ficheinter->dir_output)) {

-		// Wrapping for interventions

-		if ($fuser->hasRight('ficheinter', $lire) || preg_match('/^specimen/i', $original_file)) {

+	}

+

+	// Wrapping for interventions

+	elseif (($modulepart == 'fichinter' || $modulepart == 'ficheinter') && !empty($conf->ficheinter->dir_output))

+	{

+		if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i', $original_file))

+		{

@@ -2997,3 +2648,7 @@
-	} elseif ($modulepart == 'deplacement' && !empty($conf->deplacement->dir_output)) {

-		// Wrapping pour les deplacements et notes de frais

-		if ($fuser->hasRight('deplacement', $lire) || preg_match('/^specimen/i', $original_file)) {

+	}

+

+	// Wrapping pour les deplacements et notes de frais

+	elseif ($modulepart == 'deplacement' && !empty($conf->deplacement->dir_output))

+	{

+		if ($fuser->rights->deplacement->{$lire} || preg_match('/^specimen/i', $original_file))

+		{

@@ -3004,3 +2659,6 @@
-	} elseif (($modulepart == 'propal' || $modulepart == 'propale') && isset($conf->propal->multidir_output[$entity])) {

-		// Wrapping pour les propales

-		if ($fuser->hasRight('propal', $lire) || preg_match('/^specimen/i', $original_file)) {

+	}

+	// Wrapping pour les propales

+	elseif (($modulepart == 'propal' || $modulepart == 'propale') && !empty($conf->propal->multidir_output[$entity]))

+	{

+		if ($fuser->rights->propale->{$lire} || preg_match('/^specimen/i', $original_file))

+		{

@@ -3011,3 +2669,7 @@
-	} elseif (($modulepart == 'commande' || $modulepart == 'order') && !empty($conf->commande->multidir_output[$entity])) {

-		// Wrapping pour les commandes

-		if ($fuser->hasRight('commande', $lire) || preg_match('/^specimen/i', $original_file)) {

+	}

+

+	// Wrapping pour les commandes

+	elseif (($modulepart == 'commande' || $modulepart == 'order') && !empty($conf->commande->multidir_output[$entity]))

+	{

+		if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i', $original_file))

+		{

@@ -3018,13 +2680,10 @@
-	} elseif ($modulepart == 'project' && !empty($conf->project->multidir_output[$entity])) {

-		// Wrapping pour les projets

-		if ($fuser->hasRight('projet', $lire) || preg_match('/^specimen/i', $original_file)) {

-			$accessallowed = 1;

-			// If we known $id of project, call checkUserAccessToObject to check permission on properties and contact of project

-			if ($refname && !preg_match('/^specimen/i', $original_file)) {

-				include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';

-				$tmpproject = new Project($db);

-				$tmpproject->fetch('', $refname);

-				$accessallowed = checkUserAccessToObject($user, array('projet'), $tmpproject->id, 'projet&project', '', '', 'rowid', '');

-			}

-		}

-		$original_file = $conf->project->multidir_output[$entity].'/'.$original_file;

+	}

+

+	// Wrapping pour les projets

+	elseif ($modulepart == 'project' && !empty($conf->projet->dir_output))

+	{

+		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i', $original_file))

+		{

+			$accessallowed = 1;

+		}

+		$original_file = $conf->projet->dir_output.'/'.$original_file;

@@ -3032,12 +2691,8 @@
-	} elseif ($modulepart == 'project_task' && !empty($conf->project->multidir_output[$entity])) {

-		if ($fuser->hasRight('projet', $lire) || preg_match('/^specimen/i', $original_file)) {

-			$accessallowed = 1;

-			// If we known $id of project, call checkUserAccessToObject to check permission on properties and contact of project

-			if ($refname && !preg_match('/^specimen/i', $original_file)) {

-				include_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';

-				$tmptask = new Task($db);

-				$tmptask->fetch('', $refname);

-				$accessallowed = checkUserAccessToObject($user, array('projet_task'), $tmptask->id, 'projet_task&project', '', '', 'rowid', '');

-			}

-		}

-		$original_file = $conf->project->multidir_output[$entity].'/'.$original_file;

+	}

+	elseif ($modulepart == 'project_task' && !empty($conf->projet->dir_output))

+	{

+		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i', $original_file))

+		{

+			$accessallowed = 1;

+		}

+		$original_file = $conf->projet->dir_output.'/'.$original_file;

@@ -3045,3 +2700,7 @@
-	} elseif (($modulepart == 'commande_fournisseur' || $modulepart == 'order_supplier') && !empty($conf->fournisseur->commande->dir_output)) {

-		// Wrapping pour les commandes fournisseurs

-		if ($fuser->hasRight('fournisseur', 'commande', $lire) || preg_match('/^specimen/i', $original_file)) {

+	}

+

+	// Wrapping pour les commandes fournisseurs

+	elseif (($modulepart == 'commande_fournisseur' || $modulepart == 'order_supplier') && !empty($conf->fournisseur->commande->dir_output))

+	{

+		if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i', $original_file))

+		{

@@ -3052,3 +2711,7 @@
-	} elseif (($modulepart == 'facture_fournisseur' || $modulepart == 'invoice_supplier') && !empty($conf->fournisseur->facture->dir_output)) {

-		// Wrapping pour les factures fournisseurs

-		if ($fuser->hasRight('fournisseur', 'facture', $lire) || preg_match('/^specimen/i', $original_file)) {

+	}

+

+	// Wrapping pour les factures fournisseurs

+	elseif (($modulepart == 'facture_fournisseur' || $modulepart == 'invoice_supplier') && !empty($conf->fournisseur->facture->dir_output))

+	{

+		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i', $original_file))

+		{

@@ -3059,3 +2722,6 @@
-	} elseif ($modulepart == 'supplier_payment') {

-		// Wrapping pour les rapport de paiements

-		if ($fuser->hasRight('fournisseur', 'facture', $lire) || preg_match('/^specimen/i', $original_file)) {

+	}

+	// Wrapping pour les rapport de paiements

+	elseif ($modulepart == 'supplier_payment')

+	{

+		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i', $original_file))

+		{

@@ -3066,13 +2732,18 @@
-	} elseif ($modulepart == 'facture_paiement' && !empty($conf->facture->dir_output)) {

-		// Wrapping pour les rapport de paiements

-		if ($fuser->hasRight('facture', $lire) || preg_match('/^specimen/i', $original_file)) {

-			$accessallowed = 1;

-		}

-		if ($fuser->socid > 0) {

-			$original_file = $conf->facture->dir_output.'/payments/private/'.$fuser->id.'/'.$original_file;

-		} else {

-			$original_file = $conf->facture->dir_output.'/payments/'.$original_file;

-		}

-	} elseif ($modulepart == 'export_compta' && !empty($conf->accounting->dir_output)) {

-		// Wrapping for accounting exports

-		if ($fuser->hasRight('accounting', 'bind', 'write') || preg_match('/^specimen/i', $original_file)) {

+	}

+

+	// Wrapping pour les rapport de paiements

+	elseif ($modulepart == 'facture_paiement' && !empty($conf->facture->dir_output))

+	{

+		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file))

+		{

+			$accessallowed = 1;

+		}

+		if ($fuser->societe_id > 0) $original_file = $conf->facture->dir_output.'/payments/private/'.$fuser->id.'/'.$original_file;

+		else $original_file = $conf->facture->dir_output.'/payments/'.$original_file;

+	}

+

+	// Wrapping for accounting exports

+	elseif ($modulepart == 'export_compta' && !empty($conf->accounting->dir_output))

+	{

+		if ($fuser->rights->accounting->bind->write || preg_match('/^specimen/i', $original_file))

+		{

@@ -3082,16 +2753,26 @@
-	} elseif (($modulepart == 'expedition' || $modulepart == 'shipment') && !empty($conf->expedition->dir_output)) {

-		// Wrapping pour les expedition

-		if ($fuser->hasRight('expedition', $lire) || preg_match('/^specimen/i', $original_file)) {

-			$accessallowed = 1;

-		}

-		$original_file = $conf->expedition->dir_output."/".(strpos($original_file, 'sending/') === 0 ? '' : 'sending/').$original_file;

-		//$original_file = $conf->expedition->dir_output."/".$original_file;

-	} elseif (($modulepart == 'livraison' || $modulepart == 'delivery') && !empty($conf->expedition->dir_output)) {

-		// Delivery Note Wrapping

-		if ($fuser->hasRight('expedition', 'delivery', $lire) || preg_match('/^specimen/i', $original_file)) {

-			$accessallowed = 1;

-		}

-		$original_file = $conf->expedition->dir_output."/".(strpos($original_file, 'receipt/') === 0 ? '' : 'receipt/').$original_file;

-	} elseif ($modulepart == 'actions' && !empty($conf->agenda->dir_output)) {

-		// Wrapping pour les actions

-		if ($fuser->hasRight('agenda', 'myactions', $read) || preg_match('/^specimen/i', $original_file)) {

+	}

+

+	// Wrapping pour les expedition

+	elseif ($modulepart == 'expedition' && !empty($conf->expedition->dir_output))

+	{

+		if ($fuser->rights->expedition->{$lire} || preg_match('/^specimen/i', $original_file))

+		{

+			$accessallowed = 1;

+		}

+		$original_file = $conf->expedition->dir_output."/sending/".$original_file;

+	}

+	// Wrapping pour les bons de livraison

+	elseif ($modulepart == 'livraison' && !empty($conf->expedition->dir_output))

+	{

+		if ($fuser->rights->expedition->livraison->{$lire} || preg_match('/^specimen/i', $original_file))

+		{

+			$accessallowed = 1;

+		}

+		$original_file = $conf->expedition->dir_output."/receipt/".$original_file;

+	}

+

+	// Wrapping pour les actions

+	elseif ($modulepart == 'actions' && !empty($conf->agenda->dir_output))

+	{

+		if ($fuser->rights->agenda->myactions->{$read} || preg_match('/^specimen/i', $original_file))

+		{

@@ -3101,3 +2782,7 @@
-	} elseif ($modulepart == 'actionsreport' && !empty($conf->agenda->dir_temp)) {

-		// Wrapping pour les actions

-		if ($fuser->hasRight('agenda', 'allactions', $read) || preg_match('/^specimen/i', $original_file)) {

+	}

+

+	// Wrapping pour les actions

+	elseif ($modulepart == 'actionsreport' && !empty($conf->agenda->dir_temp))

+	{

+		if ($fuser->rights->agenda->allactions->{$read} || preg_match('/^specimen/i', $original_file))

+		{

@@ -3107,41 +2792,44 @@
-	} elseif ($modulepart == 'product' || $modulepart == 'produit' || $modulepart == 'service' || $modulepart == 'produit|service') {

-		// Wrapping pour les produits et services

-		if (empty($entity) || (empty($conf->product->multidir_output[$entity]) && empty($conf->service->multidir_output[$entity]))) {

-			return array('accessallowed'=>0, 'error'=>'Value entity must be provided');

-		}

-		if (($fuser->hasRight('produit', $lire) || $fuser->hasRight('service', $lire)) || preg_match('/^specimen/i', $original_file)) {

-			$accessallowed = 1;

-		}

-		if (isModEnabled("product")) {

-			$original_file = $conf->product->multidir_output[$entity].'/'.$original_file;

-		} elseif (isModEnabled("service")) {

-			$original_file = $conf->service->multidir_output[$entity].'/'.$original_file;

-		}

-	} elseif ($modulepart == 'product_batch' || $modulepart == 'produitlot') {

-		// Wrapping pour les lots produits

-		if (empty($entity) || (empty($conf->productbatch->multidir_output[$entity]))) {

-			return array('accessallowed'=>0, 'error'=>'Value entity must be provided');

-		}

-		if (($fuser->hasRight('produit', $lire)) || preg_match('/^specimen/i', $original_file)) {

-			$accessallowed = 1;

-		}

-		if (isModEnabled('productbatch')) {

-			$original_file = $conf->productbatch->multidir_output[$entity].'/'.$original_file;

-		}

-	} elseif ($modulepart == 'movement' || $modulepart == 'mouvement') {

-		// Wrapping for stock movements

-		if (empty($entity) || empty($conf->stock->multidir_output[$entity])) {

-			return array('accessallowed'=>0, 'error'=>'Value entity must be provided');

-		}

-		if (($fuser->hasRight('stock', $lire) || $fuser->hasRight('stock', 'movement', $lire) || $fuser->hasRight('stock', 'mouvement', $lire)) || preg_match('/^specimen/i', $original_file)) {

-			$accessallowed = 1;

-		}

-		if (isModEnabled('stock')) {

-			$original_file = $conf->stock->multidir_output[$entity].'/movement/'.$original_file;

-		}

-	} elseif ($modulepart == 'contract' && !empty($conf->contrat->multidir_output[$entity])) {

-		// Wrapping pour les contrats

-		if ($fuser->hasRight('contrat', $lire) || preg_match('/^specimen/i', $original_file)) {

-			$accessallowed = 1;

-		}

-		$original_file = $conf->contrat->multidir_output[$entity].'/'.$original_file;

+	}

+

+	// Wrapping pour les produits et services

+	elseif ($modulepart == 'product' || $modulepart == 'produit' || $modulepart == 'service' || $modulepart == 'produit|service')

+	{

+		if (empty($entity) || (empty($conf->product->multidir_output[$entity]) && empty($conf->service->multidir_output[$entity]))) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');

+		if (($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) || preg_match('/^specimen/i', $original_file))

+		{

+			$accessallowed = 1;

+		}

+		if (!empty($conf->product->enabled)) $original_file = $conf->product->multidir_output[$entity].'/'.$original_file;

+		elseif (!empty($conf->service->enabled)) $original_file = $conf->service->multidir_output[$entity].'/'.$original_file;

+	}

+

+	// Wrapping pour les lots produits

+	elseif ($modulepart == 'product_batch' || $modulepart == 'produitlot')

+	{

+		if (empty($entity) || (empty($conf->productbatch->multidir_output[$entity]))) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');

+		if (($fuser->rights->produit->{$lire} ) || preg_match('/^specimen/i', $original_file))

+		{

+			$accessallowed = 1;

+		}

+		if (!empty($conf->productbatch->enabled)) $original_file = $conf->productbatch->multidir_output[$entity].'/'.$original_file;

+	}

+

+	// Wrapping for stock movements

+	elseif ($modulepart == 'movement' || $modulepart == 'mouvement')

+	{

+		if (empty($entity) || empty($conf->stock->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');

+		if (($fuser->rights->stock->{$lire} || $fuser->rights->stock->movement->{$lire} || $fuser->rights->stock->mouvement->{$lire}) || preg_match('/^specimen/i', $original_file))

+		{

+			$accessallowed = 1;

+		}

+		if (!empty($conf->stock->enabled)) $original_file = $conf->stock->multidir_output[$entity].'/movement/'.$original_file;

+	}

+

+	// Wrapping pour les contrats

+	elseif ($modulepart == 'contract' && !empty($conf->contrat->dir_output))

+	{

+		if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i', $original_file))

+		{

+			$accessallowed = 1;

+		}

+		$original_file = $conf->contrat->dir_output.'/'.$original_file;

@@ -3149,3 +2837,7 @@
-	} elseif ($modulepart == 'donation' && !empty($conf->don->dir_output)) {

-		// Wrapping pour les dons

-		if ($fuser->hasRight('don', $lire) || preg_match('/^specimen/i', $original_file)) {

+	}

+

+	// Wrapping pour les dons

+	elseif ($modulepart == 'donation' && !empty($conf->don->dir_output))

+	{

+		if ($fuser->rights->don->{$lire} || preg_match('/^specimen/i', $original_file))

+		{

@@ -3155,3 +2847,7 @@
-	} elseif ($modulepart == 'dolresource' && !empty($conf->resource->dir_output)) {

-		// Wrapping pour les dons

-		if ($fuser->hasRight('resource', $read) || preg_match('/^specimen/i', $original_file)) {

+	}

+

+	// Wrapping pour les dons

+	elseif ($modulepart == 'dolresource' && !empty($conf->resource->dir_output))

+	{

+		if ($fuser->rights->resource->{$read} || preg_match('/^specimen/i', $original_file))

+		{

@@ -3161,3 +2857,7 @@
-	} elseif (($modulepart == 'remisecheque' || $modulepart == 'chequereceipt') && !empty($conf->bank->dir_output)) {

-		// Wrapping pour les remises de cheques

-		if ($fuser->hasRight('banque', $lire) || preg_match('/^specimen/i', $original_file)) {

+	}

+

+	// Wrapping pour les remises de cheques

+	elseif ($modulepart == 'remisecheque' && !empty($conf->bank->dir_output))

+	{

+		if ($fuser->rights->banque->{$lire} || preg_match('/^specimen/i', $original_file))

+		{

@@ -3168,3 +2868,7 @@
-	} elseif (($modulepart == 'banque' || $modulepart == 'bank') && !empty($conf->bank->dir_output)) {

-		// Wrapping for bank

-		if ($fuser->hasRight('banque', $lire)) {

+	}

+

+	// Wrapping for bank

+	elseif (($modulepart == 'banque' || $modulepart == 'bank') && !empty($conf->bank->dir_output))

+	{

+		if ($fuser->rights->banque->{$lire})

+		{

@@ -3174,4 +2878,8 @@
-	} elseif ($modulepart == 'export' && !empty($conf->export->dir_temp)) {

-		// Wrapping for export module

-		// Note that a test may not be required because we force the dir of download on the directory of the user that export

-		$accessallowed = $user->rights->export->lire;

+	}

+

+	// Wrapping for export module

+	elseif ($modulepart == 'export' && !empty($conf->export->dir_temp))

+	{

+		// Aucun test necessaire car on force le rep de download sur

+		// le rep export qui est propre a l'utilisateur

+		$accessallowed = 1;

@@ -3179,3 +2887,6 @@
-	} elseif ($modulepart == 'import' && !empty($conf->import->dir_temp)) {

-		// Wrapping for import module

-		$accessallowed = $user->rights->import->run;

+	}

+

+	// Wrapping for import module

+	elseif ($modulepart == 'import' && !empty($conf->import->dir_temp))

+	{

+		$accessallowed = 1;

@@ -3183,6 +2894,5 @@
-	} elseif ($modulepart == 'recruitment' && !empty($conf->recruitment->dir_output)) {

-		// Wrapping for recruitment module

-		$accessallowed = $user->hasRight('recruitment', 'recruitmentjobposition', 'read');

-		$original_file = $conf->recruitment->dir_output.'/'.$original_file;

-	} elseif ($modulepart == 'editor' && !empty($conf->fckeditor->dir_output)) {

-		// Wrapping for wysiwyg editor

+	}

+

+	// Wrapping pour l'editeur wysiwyg

+	elseif ($modulepart == 'editor' && !empty($conf->fckeditor->dir_output))

+	{

@@ -3191,5 +2901,6 @@
-	} elseif ($modulepart == 'systemtools' && !empty($conf->admin->dir_output)) {

-		// Wrapping for backups

-		if ($fuser->admin) {

-			$accessallowed = 1;

-		}

+	}

+

+	// Wrapping for backups

+	elseif ($modulepart == 'systemtools' && !empty($conf->admin->dir_output))

+	{

+		if ($fuser->admin) $accessallowed = 1;

@@ -3197,5 +2908,6 @@
-	} elseif ($modulepart == 'admin_temp' && !empty($conf->admin->dir_temp)) {

-		// Wrapping for upload file test

-		if ($fuser->admin) {

-			$accessallowed = 1;

-		}

+	}

+

+	// Wrapping for upload file test

+	elseif ($modulepart == 'admin_temp' && !empty($conf->admin->dir_temp))

+	{

+		if ($fuser->admin) $accessallowed = 1;

@@ -3203,2 +2915,5 @@
-	} elseif ($modulepart == 'bittorrent' && !empty($conf->bittorrent->dir_output)) {

-		// Wrapping pour BitTorrent

+	}

+

+	// Wrapping pour BitTorrent

+	elseif ($modulepart == 'bittorrent' && !empty($conf->bittorrent->dir_output))

+	{

@@ -3207,3 +2922 @@
-		if (dol_mimetype($original_file) == 'application/x-bittorrent') {

-			$dir = 'torrents';

-		}

+		if (dol_mimetype($original_file) == 'application/x-bittorrent') $dir = 'torrents';

@@ -3211,3 +2924,7 @@
-	} elseif ($modulepart == 'member' && !empty($conf->adherent->dir_output)) {

-		// Wrapping pour Foundation module

-		if ($fuser->hasRight('adherent', $lire) || preg_match('/^specimen/i', $original_file)) {

+	}

+

+	// Wrapping pour Foundation module

+	elseif ($modulepart == 'member' && !empty($conf->adherent->dir_output))

+	{

+		if ($fuser->rights->adherent->{$lire} || preg_match('/^specimen/i', $original_file))

+		{

@@ -3217,2 +2934,5 @@
-	} elseif ($modulepart == 'scanner_user_temp' && !empty($conf->scanner->dir_temp)) {

-		// Wrapping for Scanner

+	}

+

+	// Wrapping for Scanner

+	elseif ($modulepart == 'scanner_user_temp' && !empty($conf->scanner->dir_temp))

+	{

@@ -3221,21 +2941,11 @@
-		// If modulepart=module_user_temp	Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/temp/iduser

-		// If modulepart=module_temp		Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/temp

-		// If modulepart=module_user		Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/iduser

-		// If modulepart=module				Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart

-		// If modulepart=module-abc			Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart

-	} else {

-		// GENERIC Wrapping

-		//var_dump($modulepart);

-		//var_dump($original_file);

-		if (preg_match('/^specimen/i', $original_file)) {

-			$accessallowed = 1; // If link to a file called specimen. Test must be done before changing $original_file int full path.

-		}

-		if ($fuser->admin) {

-			$accessallowed = 1; // If user is admin

-		}

-

-		$tmpmodulepart = explode('-', $modulepart);

-		if (!empty($tmpmodulepart[1])) {

-			$modulepart = $tmpmodulepart[0];

-			$original_file = $tmpmodulepart[1].'/'.$original_file;

-		}

+	}

+

+	// GENERIC Wrapping

+	// If modulepart=module_user_temp	Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/temp/iduser

+	// If modulepart=module_temp		Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/temp

+	// If modulepart=module_user		Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/iduser

+	// If modulepart=module				Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart

+	else

+	{

+		if (preg_match('/^specimen/i', $original_file))	$accessallowed = 1; // If link to a file called specimen. Test must be done before changing $original_file int full path.

+		if ($fuser->admin) $accessallowed = 1; // If user is admin

@@ -3245,3 +2955,4 @@
-		if (preg_match('/^([a-z]+)_user_temp$/i', $modulepart, $reg)) {

-			$tmpmodule = $reg[1];

-			if (empty($conf->$tmpmodule->dir_temp)) {	// modulepart not supported

+		if (preg_match('/^([a-z]+)_user_temp$/i', $modulepart, $reg))

+		{

+			if (empty($conf->{$reg[1]}->dir_temp))	// modulepart not supported

+			{

@@ -3251,3 +2962 @@
-			if ($fuser->hasRight($tmpmodule, $lire) || $fuser->hasRight($tmpmodule, $read) || $fuser->hasRight($tmpmodule, $download)) {

-				$accessallowed = 1;

-			}

+			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed = 1;

@@ -3255,3 +2964,5 @@
-		} elseif (preg_match('/^([a-z]+)_temp$/i', $modulepart, $reg)) {

-			$tmpmodule = $reg[1];

-			if (empty($conf->$tmpmodule->dir_temp)) {	// modulepart not supported

+		}

+		elseif (preg_match('/^([a-z]+)_temp$/i', $modulepart, $reg))

+		{

+			if (empty($conf->{$reg[1]}->dir_temp))	// modulepart not supported

+			{

@@ -3261,7 +2972,7 @@
-			if ($fuser->hasRight($tmpmodule, $lire) || $fuser->hasRight($tmpmodule, $read) || $fuser->hasRight($tmpmodule, $download)) {

-				$accessallowed = 1;

-			}

-			$original_file = $conf->$tmpmodule->dir_temp.'/'.$original_file;

-		} elseif (preg_match('/^([a-z]+)_user$/i', $modulepart, $reg)) {

-			$tmpmodule = $reg[1];

-			if (empty($conf->$tmpmodule->dir_output)) {	// modulepart not supported

+			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed = 1;

+			$original_file = $conf->{$reg[1]}->dir_temp.'/'.$original_file;

+		}

+		elseif (preg_match('/^([a-z]+)_user$/i', $modulepart, $reg))

+		{

+			if (empty($conf->{$reg[1]}->dir_output))	// modulepart not supported

+			{

@@ -3271,7 +2982,7 @@
-			if ($fuser->hasRight($tmpmodule, $lire) || $fuser->hasRight($tmpmodule, $read) || $fuser->hasRight($tmpmodule, $download)) {

-				$accessallowed = 1;

-			}

-			$original_file = $conf->$tmpmodule->dir_output.'/'.$fuser->id.'/'.$original_file;

-		} elseif (preg_match('/^massfilesarea_([a-z]+)$/i', $modulepart, $reg)) {

-			$tmpmodule = $reg[1];

-			if (empty($conf->$tmpmodule->dir_output)) {	// modulepart not supported

+			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed = 1;

+			$original_file = $conf->{$reg[1]}->dir_output.'/'.$fuser->id.'/'.$original_file;

+		}

+		elseif (preg_match('/^massfilesarea_([a-z]+)$/i', $modulepart, $reg))

+		{

+			if (empty($conf->{$reg[1]}->dir_output))	// modulepart not supported

+			{

@@ -3281 +2992,2 @@
-			if ($fuser->hasRight($tmpmodule, $lire) || preg_match('/^specimen/i', $original_file)) {

+			if ($fuser->rights->{$reg[1]}->{$lire} || preg_match('/^specimen/i', $original_file))

+			{

@@ -3284,3 +2996,6 @@
-			$original_file = $conf->$tmpmodule->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;

-		} else {

-			if (empty($conf->$modulepart->dir_output)) {	// modulepart not supported

+			$original_file = $conf->{$reg[1]}->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;

+		}

+		else

+		{

+			if (empty($conf->$modulepart->dir_output))	// modulepart not supported

+			{

@@ -3293,7 +3008,13 @@
-			if (!empty($partsofdirinoriginalfile[1])) {	// If original_file is xxx/filename (xxx is a part we will use)

-				$partofdirinoriginalfile = $partsofdirinoriginalfile[0];

-				if ($partofdirinoriginalfile && ($fuser->hasRight($modulepart, $partofdirinoriginalfile, 'lire') || $fuser->hasRight($modulepart, $partofdirinoriginalfile, 'read'))) {

-					$accessallowed = 1;

-				}

-			}

-			if ($fuser->hasRight($modulepart, $lire) || $fuser->hasRight($modulepart, $read)) {

+			$partofdirinoriginalfile = $partsofdirinoriginalfile[0];

+			if ($partofdirinoriginalfile && ($fuser->rights->$modulepart->$partofdirinoriginalfile->{$lire} || $fuser->rights->$modulepart->$partofdirinoriginalfile->{$read})) $accessallowed = 1;

+			if ($fuser->rights->$modulepart->{$lire} || $fuser->rights->$modulepart->{$read}) $accessallowed = 1;

+			$original_file = $conf->$modulepart->dir_output.'/'.$original_file;

+		}

+

+		// For modules who wants to manage different levels of permissions for documents

+		$subPermCategoryConstName = strtoupper($modulepart).'_SUBPERMCATEGORY_FOR_DOCUMENTS';

+		if (!empty($conf->global->$subPermCategoryConstName))

+		{

+			$subPermCategory = $conf->global->$subPermCategoryConstName;

+			if (!empty($subPermCategory) && (($fuser->rights->$modulepart->$subPermCategory->{$lire}) || ($fuser->rights->$modulepart->$subPermCategory->{$read}) || ($fuser->rights->$modulepart->$subPermCategory->{$download})))

+			{

@@ -3302,27 +3023,8 @@
-

-			if (is_array($conf->$modulepart->multidir_output) && !empty($conf->$modulepart->multidir_output[$entity])) {

-				$original_file = $conf->$modulepart->multidir_output[$entity].'/'.$original_file;

-			} else {

-				$original_file = $conf->$modulepart->dir_output.'/'.$original_file;

-			}

-		}

-

-		$parameters = array(

-			'modulepart' => $modulepart,

-			'original_file' => $original_file,

-			'entity' => $entity,

-			'fuser' => $fuser,

-			'refname' => '',

-			'mode' => $mode

-		);

-		$reshook = $hookmanager->executeHooks('checkSecureAccess', $parameters, $object);

-		if ($reshook > 0) {

-			if (!empty($hookmanager->resArray['original_file'])) {

-				$original_file = $hookmanager->resArray['original_file'];

-			}

-			if (!empty($hookmanager->resArray['accessallowed'])) {

-				$accessallowed = $hookmanager->resArray['accessallowed'];

-			}

-			if (!empty($hookmanager->resArray['sqlprotectagainstexternals'])) {

-				$sqlprotectagainstexternals = $hookmanager->resArray['sqlprotectagainstexternals'];

-			}

+		}

+

+		// Define $sqlprotectagainstexternals for modules who want to protect access using a SQL query.

+		$sqlProtectConstName = strtoupper($modulepart).'_SQLPROTECTAGAINSTEXTERNALS_FOR_DOCUMENTS';

+		if (!empty($conf->global->$sqlProtectConstName))	// If module want to define its own $sqlprotectagainstexternals

+		{

+			// Example: mymodule__SQLPROTECTAGAINSTEXTERNALS_FOR_DOCUMENTS = "SELECT fk_soc FROM ".MAIN_DB_PREFIX.$modulepart." WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;

+			eval('$sqlprotectagainstexternals = "'.$conf->global->$sqlProtectConstName.'";');

@@ -3333,3 +3035,3 @@
-		'accessallowed' => ($accessallowed ? 1 : 0),

-		'sqlprotectagainstexternals' => $sqlprotectagainstexternals,

-		'original_file' => $original_file

+		'accessallowed' => $accessallowed,

+		'sqlprotectagainstexternals'=>$sqlprotectagainstexternals,

+		'original_file'=>$original_file

@@ -3351,3 +3053 @@
-	if (!dol_is_dir($directory)) {

-		dol_mkdir($directory);

-	}

+	if (!dol_is_dir($directory)) dol_mkdir($directory);

@@ -3356 +3056 @@
-	dolChmod($cachefile, '0644');

+	@chmod($cachefile, 0644);

@@ -3378,3 +3078,3 @@
- * @param string $directory 	Directory of cache

- * @param string $filename 		Name of filecache

- * @return mixed 				Unserialise from file

+ * @param string $directory Directory of cache

+ * @param string $filename Name of filecache

+ * @return mixed Unserialise from file

@@ -3387,11 +3086,0 @@
-}

-

-/**

- * Return the relative dirname (relative to DOL_DATA_ROOT) of a full path string.

- *

- * @param 	string $pathfile		Full path of a file

- * @return 	string					Path of file relative to DOL_DATA_ROOT

- */

-function dirbasename($pathfile)

-{

-	return preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'\//', '', $pathfile);

@@ -3418 +3107,2 @@
-	foreach ($dir->md5file as $file) {    // $file is a simpleXMLElement

+	foreach ($dir->md5file as $file)    // $file is a simpleXMLElement

+	{

@@ -3426 +3116,2 @@
-		if (!file_exists($pathref.'/'.$filename)) {

+		if (!file_exists($pathref.'/'.$filename))

+		{

@@ -3428 +3119,3 @@
-		} else {

+		}

+		else

+		{

@@ -3431 +3124,2 @@
-			if ($conffile == '/etc/dolibarr/conf.php' && $filename == '/filefunc.inc.php') {	// For install with deb or rpm, we ignore test on filefunc.inc.php that was modified by package

+			if ($conffile == '/etc/dolibarr/conf.php' && $filename == '/filefunc.inc.php')	// For install with deb or rpm, we ignore test on filefunc.inc.php that was modified by package

+			{

@@ -3433,4 +3127,4 @@
-			} else {

-				if ($md5_local != $expectedmd5) {

-					$file_list['updated'][] = array('filename'=>$filename, 'expectedmd5'=>$expectedmd5, 'expectedsize'=>$expectedsize, 'md5'=>(string) $md5_local);

-				}

+			}

+			else

+			{

+				if ($md5_local != $expectedmd5) $file_list['updated'][] = array('filename'=>$filename, 'expectedmd5'=>$expectedmd5, 'expectedsize'=>$expectedsize, 'md5'=>(string) $md5_local);

@@ -3442 +3136,2 @@
-	foreach ($dir->dir as $subdir) {			// $subdir['name'] is  '' or '/accountancy/admin' for example

+	foreach ($dir->dir as $subdir)			// $subdir['name'] is  '' or '/accountancy/admin' for example

+	{

@@ -3448,115 +3142,0 @@
-

-/**

- * Function to manage the drag and drop of a file.

- * We use global variable $object

- *

- * @param	string	$htmlname	The id of the component where we need to drag and drop

- * @return  string				Js script to display

- */

-function dragAndDropFileUpload($htmlname)

-{

-	global $object, $langs;

-

-	$out = "";

-	$out .= '<div id="'.$htmlname.'Message" class="dragDropAreaMessage hidden"><span>'.img_picto("", 'download').'<br>'.$langs->trans("DropFileToAddItToObject").'</span></div>';

-	$out .= "\n<!-- JS CODE TO ENABLE DRAG AND DROP OF FILE -->\n";

-	$out .= "<script>";

-	$out .= '

-		jQuery(document).ready(function() {

-			var enterTargetDragDrop = null;

-

-			$("#'.$htmlname.'").addClass("cssDragDropArea");

-

-			$(".cssDragDropArea").on("dragenter", function(ev, ui) {

-				var dataTransfer = ev.originalEvent.dataTransfer;

-				var dataTypes = dataTransfer.types;

-				//console.log(dataTransfer);

-				//console.log(dataTypes);

-

-				if (!dataTypes || ($.inArray(\'Files\', dataTypes) === -1)) {

-				    // The element dragged is not a file, so we avoid the "dragenter"

-				    ev.preventDefault();

-    				return false;

-  				}

-

-				// Entering drop area. Highlight area

-				console.log("dragAndDropFileUpload: We add class highlightDragDropArea")

-				enterTargetDragDrop = ev.target;

-				$(this).addClass("highlightDragDropArea");

-				$("#'.$htmlname.'Message").removeClass("hidden");

-				ev.preventDefault();

-			});

-

-			$(".cssDragDropArea").on("dragleave", function(ev) {

-				// Going out of drop area. Remove Highlight

-				if (enterTargetDragDrop == ev.target){

-					console.log("dragAndDropFileUpload: We remove class highlightDragDropArea")

-					$("#'.$htmlname.'Message").addClass("hidden");

-					$(this).removeClass("highlightDragDropArea");

-				}

-			});

-

-			$(".cssDragDropArea").on("dragover", function(ev) {

-				ev.preventDefault();

-				return false;

-			});

-

-			$(".cssDragDropArea").on("drop", function(e) {

-				console.log("Trigger event file dropped. fk_element='.dol_escape_js($object->id).' element='.dol_escape_js($object->element).'");

-				e.preventDefault();

-				fd = new FormData();

-				fd.append("fk_element", "'.dol_escape_js($object->id).'");

-				fd.append("element", "'.dol_escape_js($object->element).'");

-				fd.append("token", "'.currentToken().'");

-				fd.append("action", "linkit");

-

-				var dataTransfer = e.originalEvent.dataTransfer;

-

-				if (dataTransfer.files && dataTransfer.files.length){

-					var droppedFiles = e.originalEvent.dataTransfer.files;

-					$.each(droppedFiles, function(index,file){

-						fd.append("files[]", file,file.name)

-					});

-				}

-				$(".cssDragDropArea").removeClass("highlightDragDropArea");

-				counterdragdrop = 0;

-				$.ajax({

-					url: "'.DOL_URL_ROOT.'/core/ajax/fileupload.php",

-					type: "POST",

-					processData: false,

-					contentType: false,

-					data: fd,

-					success:function() {

-						console.log("Uploaded.", arguments);

-						/* arguments[0] is the json string of files */

-						/* arguments[1] is the value for variable "success", can be 0 or 1 */

-						let listoffiles = JSON.parse(arguments[0]);

-						console.log(listoffiles);

-						let nboferror = 0;

-						for (let i = 0; i < listoffiles.length; i++) {

-							console.log(listoffiles[i].error);

-							if (listoffiles[i].error) {

-								nboferror++;

-							}

-						}

-						console.log(nboferror);

-						if (nboferror > 0) {

-							window.location.href = "'.$_SERVER["PHP_SELF"].'?id='.dol_escape_js($object->id).'&seteventmessages=ErrorOnAtLeastOneFileUpload:warnings";

-						} else {

-							window.location.href = "'.$_SERVER["PHP_SELF"].'?id='.dol_escape_js($object->id).'&seteventmessages=UploadFileDragDropSuccess:mesgs";

-						}

-					},

-					error:function() {

-						console.log("Error Uploading.", arguments)

-						if (arguments[0].status == 403) {

-							window.location.href = "'.$_SERVER["PHP_SELF"].'?id='.dol_escape_js($object->id).'&seteventmessages=ErrorUploadPermissionDenied:errors";

-						}

-						window.location.href = "'.$_SERVER["PHP_SELF"].'?id='.dol_escape_js($object->id).'&seteventmessages=ErrorUploadFileDragDropPermissionDenied:errors";

-					},

-				})

-			});

-		});

-	';

-	$out .= "</script>\n";

-	return $out;

-}

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_fiscalyear.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_fiscalyear.lib.php
@@ -44,2 +44,2 @@
-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname);   												to remove a tab

+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

+    // $this->tabs = array('entity:-tabname);   												to remove a tab

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_format_cards.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_format_cards.lib.php
@@ -37,21 +37,25 @@
-if ($resql) {

-	while ($row = $db->fetch_array($resql)) {

-		$_Avery_Labels[$row['code']]['name'] = $row['name'];

-		$_Avery_Labels[$row['code']]['paper-size'] = $row['paper_size'];

-		$_Avery_Labels[$row['code']]['orientation'] = $row['orientation'];

-		$_Avery_Labels[$row['code']]['metric'] = $row['metric'];

-		$_Avery_Labels[$row['code']]['marginLeft'] = $row['leftmargin'];

-		$_Avery_Labels[$row['code']]['marginTop'] = $row['topmargin'];

-		$_Avery_Labels[$row['code']]['marginTop'] = $row['topmargin'];

-		$_Avery_Labels[$row['code']]['NX'] = $row['nx'];

-		$_Avery_Labels[$row['code']]['NY'] = $row['ny'];

-		$_Avery_Labels[$row['code']]['SpaceX'] = $row['spacex'];

-		$_Avery_Labels[$row['code']]['SpaceY'] = $row['spacey'];

-		$_Avery_Labels[$row['code']]['width'] = $row['width'];

-		$_Avery_Labels[$row['code']]['height'] = $row['height'];

-		$_Avery_Labels[$row['code']]['font-size'] = $row['font_size'];

-		$_Avery_Labels[$row['code']]['custom_x'] = $row['custom_x'];

-		$_Avery_Labels[$row['code']]['custom_y'] = $row['custom_y'];

-	}

-} else {

-	dol_print_error($db);

+if ($resql)

+{

+    while ($row = $db->fetch_array($resql))

+    {

+        $_Avery_Labels[$row['code']]['name'] = $row['name'];

+        $_Avery_Labels[$row['code']]['paper-size'] = $row['paper_size'];

+        $_Avery_Labels[$row['code']]['orientation'] = $row['orientation'];

+        $_Avery_Labels[$row['code']]['metric'] = $row['metric'];

+        $_Avery_Labels[$row['code']]['marginLeft'] = $row['leftmargin'];

+        $_Avery_Labels[$row['code']]['marginTop'] = $row['topmargin'];

+        $_Avery_Labels[$row['code']]['marginTop'] = $row['topmargin'];

+        $_Avery_Labels[$row['code']]['NX'] = $row['nx'];

+        $_Avery_Labels[$row['code']]['NY'] = $row['ny'];

+        $_Avery_Labels[$row['code']]['SpaceX'] = $row['spacex'];

+        $_Avery_Labels[$row['code']]['SpaceY'] = $row['spacey'];

+        $_Avery_Labels[$row['code']]['width'] = $row['width'];

+        $_Avery_Labels[$row['code']]['height'] = $row['height'];

+        $_Avery_Labels[$row['code']]['font-size'] = $row['font_size'];

+        $_Avery_Labels[$row['code']]['custom_x'] = $row['custom_x'];

+        $_Avery_Labels[$row['code']]['custom_y'] = $row['custom_y'];

+    }

+}

+else

+{

+    dol_print_error($db);

@@ -61 +65,2 @@
-foreach ($_Avery_Labels as $key => $val) {

+foreach ($_Avery_Labels as $key => $val)

+{

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_fourn.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_fourn.lib.php
@@ -6,2 +5,0 @@
- * Copyright (C) 2022-2023  Frédéric France         <frederic.france@netlogic.fr>

- * Copyright (C) 2023 	    Nick Fragoulis

@@ -33 +31 @@
- * @param   FactureFournisseur	$object		Object related to tabs

+ * @param   Object	$object		Object related to tabs

@@ -36 +34 @@
-function facturefourn_prepare_head(FactureFournisseur $object)

+function facturefourn_prepare_head($object)

@@ -44 +42 @@
-	$head[$h][1] = $langs->trans('SupplierInvoice');

+	$head[$h][1] = $langs->trans('Card');

@@ -48,3 +46,4 @@
-	if (!getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB')) {

-		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));

-		$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/contact.php?facid='.$object->id;

+	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))

+	{

+	    $nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));

+	    $head[$h][0] = DOL_URL_ROOT.'/fourn/facture/contact.php?facid='.$object->id;

@@ -52,3 +51 @@
-		if ($nbContact > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';

-		}

+		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';

@@ -60 +57,2 @@
-	if (isModEnabled('paymentbybanktransfer')) {

+	if (!empty($conf->paymentbybanktransfer->enabled))

+	{

@@ -63,3 +61,3 @@
-		$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_demande as pfd";

-		$sql .= " WHERE pfd.fk_facture_fourn = ".((int) $object->id);

-		$sql .= " AND type = 'ban'";

+		$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";

+		$sql .= " WHERE pfd.fk_facture_fourn = ".$object->id;

+		$sql .= " AND pfd.ext_payment_id IS NULL";

@@ -67 +65,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -69,5 +68 @@
-			if ($obj) {

-				$nbStandingOrders = $obj->nb;

-			}

-		} else {

-			dol_print_error($db);

+			if ($obj) $nbStandingOrders = $obj->nb;

@@ -75 +70 @@
-		$langs->load("banks");

+		else dol_print_error($db);

@@ -78,3 +73 @@
-		if ($nbStandingOrders > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbStandingOrders.'</span>';

-		}

+		if ($nbStandingOrders > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbStandingOrders.'</span>';

@@ -85,22 +78,17 @@
-	// Show more tabs from modules

-	// Entries must be declared in modules descriptor with line

-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname);   												to remove a tab

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'supplier_invoice', 'add', 'core');

-

-	if (!getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {

-		$nbNote = 0;

-		if (!empty($object->note_private)) {

-			$nbNote++;

-		}

-		if (!empty($object->note_public)) {

-			$nbNote++;

-		}

-		$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/note.php?facid='.$object->id;

-		$head[$h][1] = $langs->trans('Notes');

-		if ($nbNote > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

-		}

-		$head[$h][2] = 'note';

-		$h++;

-	}

+    // Show more tabs from modules

+    // Entries must be declared in modules descriptor with line

+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

+    // $this->tabs = array('entity:-tabname);   												to remove a tab

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'supplier_invoice');

+

+    if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))

+    {

+    	$nbNote = 0;

+        if (!empty($object->note_private)) $nbNote++;

+		if (!empty($object->note_public)) $nbNote++;

+    	$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/note.php?facid='.$object->id;

+    	$head[$h][1] = $langs->trans('Notes');

+		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

+    	$head[$h][2] = 'note';

+    	$h++;

+    }

@@ -109 +97 @@
-	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

+    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

@@ -112 +100 @@
-	$nbLinks = Link::count($db, $object->element, $object->id);

+    $nbLinks = Link::count($db, $object->element, $object->id);

@@ -115,3 +103 @@
-	if (($nbFiles + $nbLinks) > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

-	}

+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

@@ -126,5 +112,3 @@
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'supplier_invoice', 'add', 'external');

-

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'supplier_invoice', 'remove');

-

-	return $head;

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'supplier_invoice', 'remove');

+

+    return $head;

@@ -137,4 +121,4 @@
- * @param   CommandeFournisseur	$object		Object related to tabs

- * @return  array							Array of tabs to show

- */

-function ordersupplier_prepare_head(CommandeFournisseur $object)

+ * @param   Object	$object		Object related to tabs

+ * @return  array				Array of tabs to show

+ */

+function ordersupplier_prepare_head($object)

@@ -148 +132 @@
-	$head[$h][1] = $langs->trans("SupplierOrder");

+	$head[$h][1] = $langs->trans("OrderCard");

@@ -152,3 +136,4 @@
-	if (!getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB')) {

-		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));

-		$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/contact.php?id='.$object->id;

+	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))

+	{

+	    $nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));

+	    $head[$h][0] = DOL_URL_ROOT.'/fourn/commande/contact.php?id='.$object->id;

@@ -156,3 +141 @@
-		if ($nbContact > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';

-		}

+		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';

@@ -163 +146,2 @@
-	if (isModEnabled('stock') && (getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER') || getDolGlobalString('STOCK_CALCULATE_ON_RECEPTION') || getDolGlobalString('STOCK_CALCULATE_ON_RECEPTION_CLOSE'))) {

+	if (!empty($conf->stock->enabled) && (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)))

+	{

@@ -167,25 +150,0 @@
-

-		//If dispach process running we add the number of item to dispatch into the head

-		if (in_array($object->statut, array($object::STATUS_ORDERSENT, $object::STATUS_RECEIVED_PARTIALLY, $object::STATUS_RECEIVED_COMPLETELY))) {

-			$sumQtyAllreadyDispatched = 0;

-			$sumQtyOrdered = 0;

-

-			if (empty($object->lines)) {

-				$object->fetch_lines();

-			}

-			$nbLinesOrdered = count($object->lines);

-			$dispachedLines = $object->getDispachedLines(1);

-			$nbDispachedLines = count($dispachedLines);

-

-			for ($line = 0 ; $line < $nbDispachedLines; $line++) {

-				$sumQtyAllreadyDispatched = $sumQtyAllreadyDispatched + $dispachedLines[$line]['qty'];

-			}

-			for ($line = 0 ; $line < $nbLinesOrdered; $line++) {

-				//If line is a product of conf to manage stocks for services

-				if ($object->lines[$line]->product_type == 0 || getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {

-					$sumQtyOrdered = $sumQtyOrdered + $object->lines[$line]->qty;

-				}

-			}

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.price2num($sumQtyAllreadyDispatched, 'MS').' / '.price2num($sumQtyOrdered, 'MS').'</span>';

-		}

-

@@ -197,21 +156,16 @@
-	// Entries must be declared in modules descriptor with line

-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'supplier_order', 'add', 'core');

-

-	if (!getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {

-		$nbNote = 0;

-		if (!empty($object->note_private)) {

-			$nbNote++;

-		}

-		if (!empty($object->note_public)) {

-			$nbNote++;

-		}

-		$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/note.php?id='.$object->id;

-		$head[$h][1] = $langs->trans("Notes");

-		if ($nbNote > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

-		}

-		$head[$h][2] = 'note';

-		$h++;

-	}

+    // Entries must be declared in modules descriptor with line

+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

+    // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'supplier_order');

+

+    if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))

+    {

+    	$nbNote = 0;

+        if (!empty($object->note_private)) $nbNote++;

+		if (!empty($object->note_public)) $nbNote++;

+    	$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/note.php?id='.$object->id;

+    	$head[$h][1] = $langs->trans("Notes");

+		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

+    	$head[$h][2] = 'note';

+    	$h++;

+    }

@@ -220 +174 @@
-	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

+    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

@@ -223 +177 @@
-	$nbLinks = Link::count($db, $object->element, $object->id);

+    $nbLinks = Link::count($db, $object->element, $object->id);

@@ -226,3 +180 @@
-	if (($nbFiles + $nbLinks) > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

-	}

+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

@@ -233,4 +185,5 @@
-	$head[$h][1] = $langs->trans("Events");

-	if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {

-		$head[$h][1] .= '/';

-		$head[$h][1] .= $langs->trans("Agenda");

+	$head[$h][1] .= $langs->trans("Events");

+	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))

+	{

+	    $head[$h][1] .= '/';

+	    $head[$h][1] .= $langs->trans("Agenda");

@@ -240,3 +192,0 @@
-

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'supplier_order', 'add', 'external');

-

@@ -244 +193,0 @@
-

@@ -255,9 +204 @@
-	global $langs, $conf, $user, $db;

-

-	$extrafields = new ExtraFields($db);

-	$extrafields->fetch_name_optionals_label('commande_fournisseur');

-	$extrafields->fetch_name_optionals_label('commande_fournisseurdet');

-	$extrafields->fetch_name_optionals_label('facture_fourn');

-	$extrafields->fetch_name_optionals_label('facture_fourn_det');

-	$extrafields->fetch_name_optionals_label('facture_fourn_rec');

-	$extrafields->fetch_name_optionals_label('facture_fourn_det_rec');

+	global $langs, $conf, $user;

@@ -287,4 +227,0 @@
-	$nbExtrafields = $extrafields->attributes['commande_fournisseur']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

@@ -296,4 +232,0 @@
-	$nbExtrafields = $extrafields->attributes['commande_fournisseurdet']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

@@ -305,4 +237,0 @@
-	$nbExtrafields = $extrafields->attributes['facture_fourn']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

@@ -314,4 +242,0 @@
-	$nbExtrafields = $extrafields->attributes['facture_fourn_det']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

@@ -319,18 +243,0 @@
-	$h++;

-

-	$head[$h][0] = DOL_URL_ROOT.'/admin/supplierinvoice_rec_extrafields.php';

-	$head[$h][1] = $langs->trans("ExtraFieldsSupplierInvoicesRec");

-	$nbExtrafields = $extrafields->attributes['facture_fourn_rec']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

-	$head[$h][2] = 'attributesrec';

-	$h++;

-

-	$head[$h][0] = DOL_URL_ROOT.'/admin/supplierinvoicedet_rec_extrafields.php';

-	$head[$h][1] = $langs->trans("ExtraFieldsSupplierInvoicesLinesRec");

-	$nbExtrafields = $extrafields->attributes['facture_fourn_det_rec']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

-	$head[$h][2] = 'attributeslinesrec';

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_functions.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_functions.lib.php
@@ -4 +4 @@
- * Copyright (C) 2004-2022	Laurent Destailleur			<eldy@users.sourceforge.net>

+ * Copyright (C) 2004-2018	Laurent Destailleur			<eldy@users.sourceforge.net>

@@ -12 +12 @@
- * Copyright (C) 2013-2021	Alexandre Spangaro			<aspangaro@open-dsi.fr>

+ * Copyright (C) 2013-2017	Alexandre Spangaro			<aspangaro@open-dsi.fr>

@@ -16,8 +16,2 @@
- * Copyright (C) 2018-2023  Frédéric France             <frederic.france@netlogic.fr>

- * Copyright (C) 2019-2023  Thibault Foucart            <support@ptibogxiv.net>

- * Copyright (C) 2020       Open-Dsi         			<support@open-dsi.fr>

- * Copyright (C) 2021       Gauthier VERDOL         	<gauthier.verdol@atm-consulting.fr>

- * Copyright (C) 2022       Anthony Berton	         	<anthony.berton@bb2a.fr>

- * Copyright (C) 2022       Ferran Marcet           	<fmarcet@2byte.es>

- * Copyright (C) 2022       Charlene Benke           	<charlene@patas-monkey.com>

- * Copyright (C) 2023       Joachim Kueter              <git-jk@bloxera.com>

+ * Copyright (C) 2018-2020  Frédéric France             <frederic.france@netlogic.fr>

+ * Copyright (C) 2019       Thibault Foucart            <support@ptibogxiv.net>

@@ -48,188 +41,0 @@
-// Function for better PHP x compatibility

-if (!function_exists('utf8_encode')) {

-	/**

-	 * Implement utf8_encode for PHP that does not support it.

-	 *

-	 * @param	mixed	$elements		PHP Object to json encode

-	 * @return 	string					Json encoded string

-	 */

-	function utf8_encode($elements)

-	{

-		return mb_convert_encoding($elements, 'UTF-8', 'ISO-8859-1');

-	}

-}

-

-if (!function_exists('utf8_decode')) {

-	/**

-	 * Implement utf8_decode for PHP that does not support it.

-	 *

-	 * @param	mixed	$elements		PHP Object to json encode

-	 * @return 	string					Json encoded string

-	 */

-	function utf8_decode($elements)

-	{

-		return mb_convert_encoding($elements, 'ISO-8859-1', 'UTF-8');

-	}

-}

-if (!function_exists('str_starts_with')) {

-	/**

-	 * str_starts_with

-	 *

-	 * @param string $haystack	haystack

-	 * @param string $needle	needle

-	 * @return boolean

-	 */

-	function str_starts_with($haystack, $needle)

-	{

-		return (string) $needle !== '' && strncmp($haystack, $needle, strlen($needle)) === 0;

-	}

-}

-if (!function_exists('str_ends_with')) {

-	/**

-	 * str_ends_with

-	 *

-	 * @param string $haystack	haystack

-	 * @param string $needle	needle

-	 * @return boolean

-	 */

-	function str_ends_with($haystack, $needle)

-	{

-		return $needle !== '' && substr($haystack, -strlen($needle)) === (string) $needle;

-	}

-}

-if (!function_exists('str_contains')) {

-	/**

-	 * str_contains

-	 *

-	 * @param string $haystack	haystack

-	 * @param string $needle	needle

-	 * @return boolean

-	 */

-	function str_contains($haystack, $needle)

-	{

-		return $needle !== '' && mb_strpos($haystack, $needle) !== false;

-	}

-}

-

-

-/**

- * Return the full path of the directory where a module (or an object of a module) stores its files. Path may depends on the entity if a multicompany module is enabled.

- *

- * @param CommonObject 	$object 	Dolibarr common object

- * @param string 		$module 	Override object element, for example to use 'mycompany' instead of 'societe'

- * @return string|void				The path of the relative directory of the module

- * @since Dolibarr V18

- */

-function getMultidirOutput($object, $module = '')

-{

-	global $conf;

-

-	if (!is_object($object) && empty($module)) {

-		return null;

-	}

-	if (empty($module) && !empty($object->element)) {

-		$module = $object->element;

-	}

-	// Special case for backward compatibility

-	if ($module == 'fichinter') {

-		$module = 'ficheinter';

-	}

-	if (isset($conf->$module) && property_exists($conf->$module, 'multidir_output')) {

-		return $conf->$module->multidir_output[(empty($object->entity) ? $conf->entity : $object->entity)];

-	} else {

-		return 'error-diroutput-not-defined-for-this-object='.$module;

-	}

-}

-

-/**

- * Return dolibarr global constant string value

- *

- * @param string $key 		key to return value, return '' if not set

- * @param string $default 	value to return

- * @return string

- */

-function getDolGlobalString($key, $default = '')

-{

-	global $conf;

-	return (string) (isset($conf->global->$key) ? $conf->global->$key : $default);

-}

-

-/**

- * Return a Dolibarr global constant int value.

- * The constants $conf->global->xxx are loaded by the script master.inc.php included at begin of any PHP page.

- *

- * @param string 	$key 		key to return value, return 0 if not set

- * @param int 		$default 	value to return

- * @return int

- */

-function getDolGlobalInt($key, $default = 0)

-{

-	global $conf;

-	return (int) (isset($conf->global->$key) ? $conf->global->$key : $default);

-}

-

-/**

- * Return Dolibarr user constant string value

- *

- * @param string $key 		key to return value, return '' if not set

- * @param string $default 	value to return

- * @param User   $tmpuser   To get another user than current user

- * @return string

- */

-function getDolUserString($key, $default = '', $tmpuser = null)

-{

-	if (empty($tmpuser)) {

-		global $user;

-		$tmpuser = $user;

-	}

-

-	return (string) (empty($tmpuser->conf->$key) ? $default : $tmpuser->conf->$key);

-}

-

-/**

- * Return Dolibarr user constant int value

- *

- * @param string 	$key 			key to return value, return 0 if not set

- * @param int 		$default 		value to return

- * @param User   	$tmpuser   		To get another user than current user

- * @return int

- */

-function getDolUserInt($key, $default = 0, $tmpuser = null)

-{

-	if (empty($tmpuser)) {

-		global $user;

-		$tmpuser = $user;

-	}

-

-	return (int) (empty($tmpuser->conf->$key) ? $default : $tmpuser->conf->$key);

-}

-

-/**

- * Is Dolibarr module enabled

- *

- * @param 	string 	$module 	Module name to check

- * @return 	boolean				True if module is enabled

- */

-function isModEnabled($module)

-{

-	global $conf;

-

-	// Fix special cases

-	$arrayconv = array(

-		'bank' => 'banque',

-		'category' => 'categorie',

-		'contract' => 'contrat',

-		'project' => 'projet',

-		'delivery_note' => 'expedition'

-	);

-	if (!getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) {

-		$arrayconv['supplier_order'] = 'fournisseur';

-		$arrayconv['supplier_invoice'] = 'fournisseur';

-	}

-	if (!empty($arrayconv[$module])) {

-		$module = $arrayconv[$module];

-	}

-

-	return !empty($conf->modules[$module]);

-	//return !empty($conf->$module->enabled);

-}

@@ -276,26 +82,8 @@
-	global $conf, $mc, $hookmanager, $object, $action, $db;

-

-	if (!is_object($hookmanager)) {

-		include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';

-		$hookmanager = new HookManager($db);

-	}

-

-	// fix different element names (France to English)

-	switch ($element) {

-		case 'projet':

-			$element = 'project';

-			break;

-		case 'contrat':

-			$element = 'contract';

-			break; // "/contrat/class/contrat.class.php"

-		case 'order_supplier':

-			$element = 'supplier_order';

-			break; // "/fourn/class/fournisseur.commande.class.php"

-		case 'invoice_supplier':

-			$element = 'supplier_invoice';

-			break; // "/fourn/class/fournisseur.facture.class.php"

-	}

-

-	if (is_object($mc)) {

-		$out = $mc->getEntity($element, $shared, $currentobject);

-	} else {

+	global $conf, $mc;

+

+	if (is_object($mc))

+	{

+		return $mc->getEntity($element, $shared, $currentobject);

+	}

+	else

+	{

@@ -303,26 +91,5 @@
-		$addzero = array('user', 'usergroup', 'cronjob', 'c_email_templates', 'email_template', 'default_values', 'overwrite_trans');

-		if (in_array($element, $addzero)) {

-			$out .= '0,';

-		}

-		$out .= ((int) $conf->entity);

-	}

-

-	// Manipulate entities to query on the fly

-	$parameters = array(

-		'element' => $element,

-		'shared' => $shared,

-		'object' => $object,

-		'currentobject' => $currentobject,

-		'out' => $out

-	);

-	$reshook = $hookmanager->executeHooks('hookGetEntity', $parameters, $currentobject, $action); // Note that $action and $object may have been modified by some hooks

-

-	if (is_numeric($reshook)) {

-		if ($reshook == 0 && !empty($hookmanager->resPrint)) {

-			$out .= ','.$hookmanager->resPrint; // add

-		} elseif ($reshook == 1) {

-			$out = $hookmanager->resPrint; // replace

-		}

-	}

-

-	return $out;

+		$addzero = array('user', 'usergroup', 'c_email_templates', 'email_template', 'default_values');

+		if (in_array($element, $addzero)) $out .= '0,';

+		$out .= $conf->entity;

+		return $out;

+	}

@@ -341 +108,2 @@
-	if (is_object($mc) && method_exists($mc, 'setEntity')) {

+	if (is_object($mc) && method_exists($mc, 'setEntity'))

+	{

@@ -343 +111,3 @@
-	} else {

+	}

+	else

+	{

@@ -347,27 +116,0 @@
-

-/**

- * 	Return if string has a name dedicated to store a secret

- *

- * 	@param	string	$keyname	Name of key to test

- * 	@return	boolean				True if key is used to store a secret

- */

-function isASecretKey($keyname)

-{

-	return preg_match('/(_pass|password|_pw|_key|securekey|serverkey|secret\d?|p12key|exportkey|_PW_[a-z]+|token)$/i', $keyname);

-}

-

-

-/**

- * Return a numeric value into an Excel like column number. So 0 return 'A', 1 returns 'B'..., 26 return 'AA'

- *

- * @param	int|string		$n		Numeric value

- * @return 	string					Column in Excel format

- */

-function num2Alpha($n)

-{

-	for ($r = ""; $n >= 0; $n = intval($n / 26) - 1) {

-		$r = chr($n % 26 + 0x41) . $r;

-	}

-	return $r;

-}

-

@@ -399,2 +141,0 @@
-

-	$user_agent = substr($user_agent, 0, 512);	// Avoid to process too large user agent

@@ -430,7 +171,3 @@
-	if (preg_match('/linux/i', $user_agent)) {

-		$os = 'linux';

-	} elseif (preg_match('/macintosh/i', $user_agent)) {

-		$os = 'macintosh';

-	} elseif (preg_match('/windows/i', $user_agent)) {

-		$os = 'windows';

-	}

+	if (preg_match('/linux/i', $user_agent)) { $os = 'linux'; }

+	elseif (preg_match('/macintosh/i', $user_agent)) { $os = 'macintosh'; }

+	elseif (preg_match('/windows/i', $user_agent)) { $os = 'windows'; }

@@ -439,36 +176,11 @@
-	$reg = array();

-	if (preg_match('/firefox(\/|\s)([\d\.]*)/i', $user_agent, $reg)) {

-		$name = 'firefox';

-		$version = empty($reg[2]) ? '' : $reg[2];

-	} elseif (preg_match('/edge(\/|\s)([\d\.]*)/i', $user_agent, $reg)) {

-		$name = 'edge';

-		$version = empty($reg[2]) ? '' : $reg[2];

-	} elseif (preg_match('/chrome(\/|\s)([\d\.]+)/i', $user_agent, $reg)) {

-		$name = 'chrome';

-		$version = empty($reg[2]) ? '' : $reg[2];

-	} elseif (preg_match('/chrome/i', $user_agent, $reg)) {

-		// we can have 'chrome (Mozilla...) chrome x.y' in one string

-		$name = 'chrome';

-	} elseif (preg_match('/iceweasel/i', $user_agent)) {

-		$name = 'iceweasel';

-	} elseif (preg_match('/epiphany/i', $user_agent)) {

-		$name = 'epiphany';

-	} elseif (preg_match('/safari(\/|\s)([\d\.]*)/i', $user_agent, $reg)) {

-		$name = 'safari';

-		$version = empty($reg[2]) ? '' : $reg[2];

-	} elseif (preg_match('/opera(\/|\s)([\d\.]*)/i', $user_agent, $reg)) {

-		// Safari is often present in string for mobile but its not.

-		$name = 'opera';

-		$version = empty($reg[2]) ? '' : $reg[2];

-	} elseif (preg_match('/(MSIE\s([0-9]+\.[0-9]))|.*(Trident\/[0-9]+.[0-9];.*rv:([0-9]+\.[0-9]+))/i', $user_agent, $reg)) {

-		$name = 'ie';

-		$version = end($reg);

-	} elseif (preg_match('/(Windows NT\s([0-9]+\.[0-9])).*(Trident\/[0-9]+.[0-9];.*rv:([0-9]+\.[0-9]+))/i', $user_agent, $reg)) {

-		// MS products at end

-		$name = 'ie';

-		$version = end($reg);

-	} elseif (preg_match('/l[iy]n(x|ks)(\(|\/|\s)*([\d\.]+)/i', $user_agent, $reg)) {

-		// MS products at end

-		$name = 'lynxlinks';

-		$version = empty($reg[3]) ? '' : $reg[3];

-	}

+	if (preg_match('/firefox(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'firefox'; $version = $reg[2]; }

+	elseif (preg_match('/edge(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'edge'; $version = $reg[2]; }

+	elseif (preg_match('/chrome(\/|\s)([\d\.]+)/i', $user_agent, $reg)) { $name = 'chrome'; $version = $reg[2]; }    // we can have 'chrome (Mozilla...) chrome x.y' in one string

+	elseif (preg_match('/chrome/i', $user_agent, $reg)) { $name = 'chrome'; }

+	elseif (preg_match('/iceweasel/i', $user_agent)) { $name = 'iceweasel'; }

+	elseif (preg_match('/epiphany/i', $user_agent)) { $name = 'epiphany'; }

+	elseif (preg_match('/safari(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'safari'; $version = $reg[2]; }	// Safari is often present in string for mobile but its not.

+	elseif (preg_match('/opera(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'opera'; $version = $reg[2]; }

+	elseif (preg_match('/(MSIE\s([0-9]+\.[0-9]))|.*(Trident\/[0-9]+.[0-9];.*rv:([0-9]+\.[0-9]+))/i', $user_agent, $reg)) { $name = 'ie'; $version = end($reg); }    // MS products at end

+	elseif (preg_match('/(Windows NT\s([0-9]+\.[0-9])).*(Trident\/[0-9]+.[0-9];.*rv:([0-9]+\.[0-9]+))/i', $user_agent, $reg)) { $name = 'ie'; $version = end($reg); }    // MS products at end

+	elseif (preg_match('/l(i|y)n(x|ks)(\(|\/|\s)*([\d\.]+)/i', $user_agent, $reg)) { $name = 'lynxlinks'; $version = $reg[4]; }

@@ -488,4 +200,3 @@
-		'browserua' => $user_agent,

-		'layout' => $layout,	// tablet, phone, classic

-		'phone' => $phone,		// deprecated

-		'tablet' => $tablet		// deprecated

+		'layout' => $layout,

+		'phone' => $phone,

+		'tablet' => $tablet

@@ -502,15 +213,8 @@
-	global $db;

-	$disconnectdone = false;

-	$depth = 0;

-	if (is_object($db) && !empty($db->connected)) {

-		$depth = $db->transaction_opened;

-		$disconnectdone = $db->close();

-	}

-	dol_syslog("--- End access to ".(empty($_SERVER["PHP_SELF"]) ? 'unknown' : $_SERVER["PHP_SELF"]).(($disconnectdone && $depth) ? ' (Warn: db disconnection forced, transaction depth was '.$depth.')' : ''), (($disconnectdone && $depth) ? LOG_WARNING : LOG_INFO));

-}

-

-/**

- * Return true if we are in a context of submitting the parameter $paramname from a POST of a form.

- * Warning:

- * For action=add, use:     $var = GETPOST('var');		// No GETPOSTISSET, so GETPOST always called and default value is retreived if not a form POST, and value of form is retreived if it is a form POST.

- * For action=update, use:  $var = GETPOSTISSET('var') ? GETPOST('var') : $object->var;

+	global $conf, $user, $langs, $db;

+	$disconnectdone = false; $depth = 0;

+	if (is_object($db) && !empty($db->connected)) { $depth = $db->transaction_opened; $disconnectdone = $db->close(); }

+	dol_syslog("--- End access to ".$_SERVER["PHP_SELF"].(($disconnectdone && $depth) ? ' (Warn: db disconnection forced, transaction depth was '.$depth.')' : ''), (($disconnectdone && $depth) ?LOG_WARNING:LOG_INFO));

+}

+

+/**

+ * Return true if we are in a context of submitting a parameter

@@ -523 +227 @@
-	$isset = false;

+	$isset = 0;

@@ -527,3 +231 @@
-	if (constant('DOL_URL_ROOT')) {

-		$relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'), '/').'/', '', $relativepathstring);

-	}

+	if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'), '/').'/', '', $relativepathstring);

@@ -537,2 +239,4 @@
-	if (!empty($_GET['restore_lastsearch_values'])) {        // Use $_GET here and not GETPOST

-		if (!empty($_SESSION['lastsearch_values_'.$relativepathstring])) {	// If there is saved values

+	if (!empty($_GET['restore_lastsearch_values']))        // Use $_GET here and not GETPOST

+	{

+		if (!empty($_SESSION['lastsearch_values_'.$relativepathstring]))	// If there is saved values

+		{

@@ -540,4 +244,7 @@
-			if (is_array($tmp)) {

-				foreach ($tmp as $key => $val) {

-					if ($key == $paramname) {	// We are on the requested parameter

-						$isset = true;

+			if (is_array($tmp))

+			{

+				foreach ($tmp as $key => $val)

+				{

+					if ($key == $paramname)	// We are on the requested parameter

+					{

+						$isset = 1;

@@ -549,12 +256,16 @@
-		// If there is saved contextpage, limit, page or mode

-		if ($paramname == 'contextpage' && !empty($_SESSION['lastsearch_contextpage_'.$relativepathstring])) {

-			$isset = true;

-		} elseif ($paramname == 'limit' && !empty($_SESSION['lastsearch_limit_'.$relativepathstring])) {

-			$isset = true;

-		} elseif ($paramname == 'page' && !empty($_SESSION['lastsearch_page_'.$relativepathstring])) {

-			$isset = true;

-		} elseif ($paramname == 'mode' && !empty($_SESSION['lastsearch_mode_'.$relativepathstring])) {

-			$isset = true;

-		}

-	} else {

-		$isset = (isset($_POST[$paramname]) || isset($_GET[$paramname])); // We must keep $_POST and $_GET here

+		// If there is saved contextpage, page or limit

+		if ($paramname == 'contextpage' && !empty($_SESSION['lastsearch_contextpage_'.$relativepathstring]))

+		{

+			$isset = 1;

+		}

+		elseif ($paramname == 'page' && !empty($_SESSION['lastsearch_page_'.$relativepathstring]))

+		{

+			$isset = 1;

+		}

+		elseif ($paramname == 'limit' && !empty($_SESSION['lastsearch_limit_'.$relativepathstring]))

+		{

+			$isset = 1;

+		}

+	}

+	else {

+		$isset = (isset($_POST[$paramname]) || isset($_GET[$paramname]));

@@ -567,26 +277,0 @@
- * Return true if the parameter $paramname is submit from a POST OR GET as an array.

- * Can be used before GETPOST to know if the $check param of GETPOST need to check an array or a string

- *

- * @param 	string	$paramname		Name or parameter to test

- * @param	int		$method			Type of method (0 = get then post, 1 = only get, 2 = only post, 3 = post then get)

- * @return 	bool 					True if we have just submit a POST or GET request with the parameter provided (even if param is empty)

- */

-function GETPOSTISARRAY($paramname, $method = 0)

-{

-	// for $method test need return the same $val as GETPOST

-	if (empty($method)) {

-		$val = isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_POST[$paramname]) ? $_POST[$paramname] : '');

-	} elseif ($method == 1) {

-		$val = isset($_GET[$paramname]) ? $_GET[$paramname] : '';

-	} elseif ($method == 2) {

-		$val = isset($_POST[$paramname]) ? $_POST[$paramname] : '';

-	} elseif ($method == 3) {

-		$val = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : '');

-	} else {

-		$val = 'BadFirstParameterForGETPOST';

-	}

-

-	return is_array($val);

-}

-

-/**

@@ -594 +279 @@
- *  Use the property $user->default_values[path]['createform'] and/or $user->default_values[path]['filters'] and/or $user->default_values[path]['sortorder']

+ *  Use the property $user->default_values[path]['creatform'] and/or $user->default_values[path]['filters'] and/or $user->default_values[path]['sortorder']

@@ -600,2 +285 @@
- *                               'none'=no check (only for param that should have very rich content like passwords)

- *                               'array', 'array:restricthtml' or 'array:aZ09' to check it's an array

+ *                               'none'=no check (only for param that should have very rich content)

@@ -604,3 +288 @@
- *                               'alpha'=Same than alphanohtml since v13

- *                               'alphawithlgt'=alpha with lgt

- *                               'alphanohtml'=check there is no html content and no " and no ../

+ *                               'alpha'=check it's text and sign

@@ -609,2 +291 @@
- *                               'aZ09arobase'=check it's a string for an element type

- *                               'aZ09comma'=check it's a string for a sortfield or sortorder

+ *                               'array'=check it's array

@@ -612 +293 @@
- *                               'nohtml'=check there is no html content

+ *                               'nohtml', 'alphanohtml'=check there is no html content

@@ -625,5 +306,4 @@
-	if (empty($paramname)) {

-		return 'BadFirstParameterForGETPOST';

-	}

-	if (empty($check)) {

-		dol_syslog("Deprecated use of GETPOST, called with 1st param = ".$paramname." and a 2nd param that is '', when calling page ".$_SERVER["PHP_SELF"], LOG_WARNING);

+	if (empty($paramname)) return 'BadFirstParameterForGETPOST';

+	if (empty($check))

+	{

+		dol_syslog("Deprecated use of GETPOST, called with 1st param = ".$paramname." and 2nd param is '', when calling page ".$_SERVER["PHP_SELF"], LOG_WARNING);

@@ -634,14 +314,9 @@
-	if (empty($method)) {

-		$out = isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_POST[$paramname]) ? $_POST[$paramname] : '');

-	} elseif ($method == 1) {

-		$out = isset($_GET[$paramname]) ? $_GET[$paramname] : '';

-	} elseif ($method == 2) {

-		$out = isset($_POST[$paramname]) ? $_POST[$paramname] : '';

-	} elseif ($method == 3) {

-		$out = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : '');

-	} else {

-		return 'BadThirdParameterForGETPOST';

-	}

-

-	if (empty($method) || $method == 3 || $method == 4) {

-		$relativepathstring = (empty($_SERVER["PHP_SELF"]) ? '' : $_SERVER["PHP_SELF"]);

+	if (empty($method)) $out = isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_POST[$paramname]) ? $_POST[$paramname] : '');

+	elseif ($method == 1) $out = isset($_GET[$paramname]) ? $_GET[$paramname] : '';

+	elseif ($method == 2) $out = isset($_POST[$paramname]) ? $_POST[$paramname] : '';

+	elseif ($method == 3) $out = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : '');

+	else return 'BadThirdParameterForGETPOST';

+

+	if (empty($method) || $method == 3 || $method == 4)

+	{

+		$relativepathstring = $_SERVER["PHP_SELF"];

@@ -649,3 +324 @@
-		if (constant('DOL_URL_ROOT')) {

-			$relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'), '/').'/', '', $relativepathstring);

-		}

+		if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'), '/').'/', '', $relativepathstring);

@@ -658,3 +331,5 @@
-		// Retrieve saved values if restore_lastsearch_values is set

-		if (!empty($_GET['restore_lastsearch_values'])) {        // Use $_GET here and not GETPOST

-			if (!empty($_SESSION['lastsearch_values_'.$relativepathstring])) {	// If there is saved values

+		// Retrieve values if restore_lastsearch_values

+		if (!empty($_GET['restore_lastsearch_values']))        // Use $_GET here and not GETPOST

+		{

+			if (!empty($_SESSION['lastsearch_values_'.$relativepathstring]))	// If there is saved values

+			{

@@ -662,3 +337,6 @@
-				if (is_array($tmp)) {

-					foreach ($tmp as $key => $val) {

-						if ($key == $paramname) {	// We are on the requested parameter

+				if (is_array($tmp))

+				{

+					foreach ($tmp as $key => $val)

+					{

+						if ($key == $paramname)	// We are on the requested parameter

+						{

@@ -672 +350,2 @@
-			if ($paramname == 'contextpage' && !empty($_SESSION['lastsearch_contextpage_'.$relativepathstring])) {

+			if ($paramname == 'contextpage' && !empty($_SESSION['lastsearch_contextpage_'.$relativepathstring]))

+			{

@@ -674 +353,7 @@
-			} elseif ($paramname == 'limit' && !empty($_SESSION['lastsearch_limit_'.$relativepathstring])) {

+			}

+			elseif ($paramname == 'page' && !empty($_SESSION['lastsearch_page_'.$relativepathstring]))

+			{

+				$out = $_SESSION['lastsearch_page_'.$relativepathstring];

+			}

+			elseif ($paramname == 'limit' && !empty($_SESSION['lastsearch_limit_'.$relativepathstring]))

+			{

@@ -676,9 +361,7 @@
-			} elseif ($paramname == 'page' && !empty($_SESSION['lastsearch_page_'.$relativepathstring])) {

-				$out = $_SESSION['lastsearch_page_'.$relativepathstring];

-			} elseif ($paramname == 'mode' && !empty($_SESSION['lastsearch_mode_'.$relativepathstring])) {

-				$out = $_SESSION['lastsearch_mode_'.$relativepathstring];

-			}

-		} elseif (!isset($_GET['sortfield'])) {

-			// Else, retrieve default values if we are not doing a sort

-			// If we did a click on a field to sort, we do no apply default values. Same if option MAIN_ENABLE_DEFAULT_VALUES is not set

-			if (!empty($_GET['action']) && $_GET['action'] == 'create' && !isset($_GET[$paramname]) && !isset($_POST[$paramname])) {

+			}

+		}

+		// Else, retreive default values if we are not doing a sort

+		elseif (!isset($_GET['sortfield']))	// If we did a click on a field to sort, we do no apply default values. Same if option MAIN_ENABLE_DEFAULT_VALUES is not set

+		{

+			if (!empty($_GET['action']) && $_GET['action'] == 'create' && !isset($_GET[$paramname]) && !isset($_POST[$paramname]))

+			{

@@ -687 +370,2 @@
-				if (is_object($object) && isset($object->fields[$paramname]['default'])) {

+				if (is_object($object) && isset($object->fields[$paramname]['default']))

+				{

@@ -691,2 +375,4 @@
-			if (getDolGlobalString('MAIN_ENABLE_DEFAULT_VALUES')) {

-				if (!empty($_GET['action']) && (preg_match('/^create/', $_GET['action']) || preg_match('/^presend/', $_GET['action'])) && !isset($_GET[$paramname]) && !isset($_POST[$paramname])) {

+			if (!empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES))

+			{

+			    if (!empty($_GET['action']) && (preg_match('/^create/', $_GET['action']) || preg_match('/^presend/', $_GET['action'])) && !isset($_GET[$paramname]) && !isset($_POST[$paramname]))

+				{

@@ -694,3 +380,6 @@
-					if (!empty($user->default_values)) {		// $user->default_values defined from menu 'Setup - Default values'

-						if (isset($user->default_values[$relativepathstring]['createform'])) {

-							foreach ($user->default_values[$relativepathstring]['createform'] as $defkey => $defval) {

+					if (!empty($user->default_values))		// $user->default_values defined from menu 'Setup - Default values'

+					{

+						if (isset($user->default_values[$relativepathstring]['createform']))

+						{

+							foreach ($user->default_values[$relativepathstring]['createform'] as $defkey => $defval)

+							{

@@ -698 +387,2 @@
-								if ($defkey != '_noquery_') {

+								if ($defkey != '_noquery_')

+								{

@@ -702,4 +392,3 @@
-									foreach ($tmpqueryarraytohave as $tmpquerytohave) {

-										if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {

-											$foundintru = 1;

-										}

+									foreach ($tmpqueryarraytohave as $tmpquerytohave)

+									{

+										if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) $foundintru = 1;

@@ -707,3 +396 @@
-									if (!$foundintru) {

-										$qualified = 1;

-									}

+									if (!$foundintru) $qualified = 1;

@@ -711,2 +397,0 @@
-								} else {

-									$qualified = 1;

@@ -714,3 +399,7 @@
-

-								if ($qualified) {

-									if (isset($user->default_values[$relativepathstring]['createform'][$defkey][$paramname])) {

+								else $qualified = 1;

+

+								if ($qualified)

+								{

+									//var_dump($user->default_values[$relativepathstring][$defkey]['createform']);

+									if (isset($user->default_values[$relativepathstring]['createform'][$defkey][$paramname]))

+									{

@@ -724,4 +413,7 @@
-				} elseif (!empty($paramname) && !isset($_GET[$paramname]) && !isset($_POST[$paramname])) {

-					// Management of default search_filters and sort order

-					if (!empty($user->default_values)) {

-						// $user->default_values defined from menu 'Setup - Default values'

+				}

+				// Management of default search_filters and sort order

+				//elseif (preg_match('/list.php$/', $_SERVER["PHP_SELF"]) && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))

+				elseif (!empty($paramname) && !isset($_GET[$paramname]) && !isset($_POST[$paramname]))

+				{

+					if (!empty($user->default_values))		// $user->default_values defined from menu 'Setup - Default values'

+					{

@@ -729,5 +421,6 @@
-						if ($paramname == 'sortfield' || $paramname == 'sortorder') {

-							// Sorted on which fields ? ASC or DESC ?

-							if (isset($user->default_values[$relativepathstring]['sortorder'])) {

-								// Even if paramname is sortfield, data are stored into ['sortorder...']

-								foreach ($user->default_values[$relativepathstring]['sortorder'] as $defkey => $defval) {

+						if ($paramname == 'sortfield' || $paramname == 'sortorder')			// Sorted on which fields ? ASC or DESC ?

+						{

+							if (isset($user->default_values[$relativepathstring]['sortorder']))	// Even if paramname is sortfield, data are stored into ['sortorder...']

+							{

+								foreach ($user->default_values[$relativepathstring]['sortorder'] as $defkey => $defval)

+								{

@@ -735 +428,2 @@
-									if ($defkey != '_noquery_') {

+									if ($defkey != '_noquery_')

+									{

@@ -739,4 +433,3 @@
-										foreach ($tmpqueryarraytohave as $tmpquerytohave) {

-											if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {

-												$foundintru = 1;

-											}

+										foreach ($tmpqueryarraytohave as $tmpquerytohave)

+										{

+											if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) $foundintru = 1;

@@ -744,3 +437 @@
-										if (!$foundintru) {

-											$qualified = 1;

-										}

+										if (!$foundintru) $qualified = 1;

@@ -748,2 +438,0 @@
-									} else {

-										$qualified = 1;

@@ -751,2 +440,4 @@
-

-									if ($qualified) {

+									else $qualified = 1;

+

+									if ($qualified)

+									{

@@ -754,5 +445,5 @@
-										foreach ($user->default_values[$relativepathstring]['sortorder'][$defkey] as $key => $val) {

-											if ($out) {

-												$out .= ', ';

-											}

-											if ($paramname == 'sortfield') {

+										foreach ($user->default_values[$relativepathstring]['sortorder'][$defkey] as $key => $val)

+										{

+											if ($out) $out .= ', ';

+											if ($paramname == 'sortfield')

+											{

@@ -761 +452,2 @@
-											if ($paramname == 'sortorder') {

+											if ($paramname == 'sortorder')

+											{

@@ -769,5 +461,5 @@
-						} elseif (isset($user->default_values[$relativepathstring]['filters'])) {

-							foreach ($user->default_values[$relativepathstring]['filters'] as $defkey => $defval) {	// $defkey is a querystring like 'a=b&c=d', $defval is key of user

-								if (!empty($_GET['disabledefaultvalues'])) {	// If set of default values has been disabled by a request parameter

-									continue;

-								}

+						}

+						elseif (isset($user->default_values[$relativepathstring]['filters']))

+						{

+							foreach ($user->default_values[$relativepathstring]['filters'] as $defkey => $defval)	// $defkey is a querystring like 'a=b&c=d', $defval is key of user

+							{

@@ -775 +467,2 @@
-								if ($defkey != '_noquery_') {

+								if ($defkey != '_noquery_')

+								{

@@ -779,4 +472,3 @@
-									foreach ($tmpqueryarraytohave as $tmpquerytohave) {

-										if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {

-											$foundintru = 1;

-										}

+									foreach ($tmpqueryarraytohave as $tmpquerytohave)

+									{

+										if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) $foundintru = 1;

@@ -784,3 +476 @@
-									if (!$foundintru) {

-										$qualified = 1;

-									}

+									if (!$foundintru) $qualified = 1;

@@ -788,2 +477,0 @@
-								} else {

-									$qualified = 1;

@@ -791,4 +479,6 @@
-

-								if ($qualified && isset($user->default_values[$relativepathstring]['filters'][$defkey][$paramname])) {

-									// We must keep $_POST and $_GET here

-									if (isset($_POST['sall']) || isset($_POST['search_all']) || isset($_GET['sall']) || isset($_GET['search_all'])) {

+								else $qualified = 1;

+

+								if ($qualified)

+								{

+									if (isset($_POST['sall']) || isset($_POST['search_all']) || isset($_GET['sall']) || isset($_GET['search_all']))

+									{

@@ -796 +486,2 @@
-										if (!getDolGlobalString('MAIN_DISABLE_DEFAULT_FILTER_FOR_QUICK_SEARCH')) {

+										if (empty($conf->global->MAIN_DISABLE_DEFAULT_FILTER_FOR_QUICK_SEARCH))

+										{

@@ -800 +491,3 @@
-									} else {

+									}

+									else

+									{

@@ -814 +507 @@
-	// Substitution variables for GETPOST (used to get final url with variable parameters or final default value, when using variable parameters __XXX__ in the GET URL)

+	// Substitution variables for GETPOST (used to get final url with variable parameters or final default value with variable parameters)

@@ -817 +510,2 @@
-	if (!is_array($out) && empty($_POST[$paramname]) && empty($noreplace)) {

+	if (!is_array($out) && empty($_POST[$paramname]) && empty($noreplace))

+	{

@@ -819,38 +513,16 @@
-		$maxloop = 20;

-		$loopnb = 0; // Protection against infinite loop

-		while (preg_match('/__([A-Z0-9]+_?[A-Z0-9]+)__/i', $out, $reg) && ($loopnb < $maxloop)) {    // Detect '__ABCDEF__' as key 'ABCDEF' and '__ABC_DEF__' as key 'ABC_DEF'. Detection is also correct when 2 vars are side by side.

-			$loopnb++;

-			$newout = '';

-

-			if ($reg[1] == 'DAY') {

-				$tmp = dol_getdate(dol_now(), true);

-				$newout = $tmp['mday'];

-			} elseif ($reg[1] == 'MONTH') {

-				$tmp = dol_getdate(dol_now(), true);

-				$newout = $tmp['mon'];

-			} elseif ($reg[1] == 'YEAR') {

-				$tmp = dol_getdate(dol_now(), true);

-				$newout = $tmp['year'];

-			} elseif ($reg[1] == 'PREVIOUS_DAY') {

-				$tmp = dol_getdate(dol_now(), true);

-				$tmp2 = dol_get_prev_day($tmp['mday'], $tmp['mon'], $tmp['year']);

-				$newout = $tmp2['day'];

-			} elseif ($reg[1] == 'PREVIOUS_MONTH') {

-				$tmp = dol_getdate(dol_now(), true);

-				$tmp2 = dol_get_prev_month($tmp['mon'], $tmp['year']);

-				$newout = $tmp2['month'];

-			} elseif ($reg[1] == 'PREVIOUS_YEAR') {

-				$tmp = dol_getdate(dol_now(), true);

-				$newout = ($tmp['year'] - 1);

-			} elseif ($reg[1] == 'NEXT_DAY') {

-				$tmp = dol_getdate(dol_now(), true);

-				$tmp2 = dol_get_next_day($tmp['mday'], $tmp['mon'], $tmp['year']);

-				$newout = $tmp2['day'];

-			} elseif ($reg[1] == 'NEXT_MONTH') {

-				$tmp = dol_getdate(dol_now(), true);

-				$tmp2 = dol_get_next_month($tmp['mon'], $tmp['year']);

-				$newout = $tmp2['month'];

-			} elseif ($reg[1] == 'NEXT_YEAR') {

-				$tmp = dol_getdate(dol_now(), true);

-				$newout = ($tmp['year'] + 1);

-			} elseif ($reg[1] == 'MYCOMPANY_COUNTRY_ID' || $reg[1] == 'MYCOUNTRY_ID' || $reg[1] == 'MYCOUNTRYID') {

+		$maxloop = 20; $loopnb = 0; // Protection against infinite loop

+		while (preg_match('/__([A-Z0-9]+_?[A-Z0-9]+)__/i', $out, $reg) && ($loopnb < $maxloop))    // Detect '__ABCDEF__' as key 'ABCDEF' and '__ABC_DEF__' as key 'ABC_DEF'. Detection is also correct when 2 vars are side by side.

+		{

+			$loopnb++; $newout = '';

+

+			if ($reg[1] == 'DAY') { $tmp = dol_getdate(dol_now(), true); $newout = $tmp['mday']; }

+			elseif ($reg[1] == 'MONTH') { $tmp = dol_getdate(dol_now(), true); $newout = $tmp['mon']; }

+			elseif ($reg[1] == 'YEAR') { $tmp = dol_getdate(dol_now(), true); $newout = $tmp['year']; }

+			elseif ($reg[1] == 'PREVIOUS_DAY') { $tmp = dol_getdate(dol_now(), true); $tmp2 = dol_get_prev_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; }

+			elseif ($reg[1] == 'PREVIOUS_MONTH') { $tmp = dol_getdate(dol_now(), true); $tmp2 = dol_get_prev_month($tmp['mon'], $tmp['year']); $newout = $tmp2['month']; }

+			elseif ($reg[1] == 'PREVIOUS_YEAR') { $tmp = dol_getdate(dol_now(), true); $newout = ($tmp['year'] - 1); }

+			elseif ($reg[1] == 'NEXT_DAY') { $tmp = dol_getdate(dol_now(), true); $tmp2 = dol_get_next_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; }

+			elseif ($reg[1] == 'NEXT_MONTH') { $tmp = dol_getdate(dol_now(), true); $tmp2 = dol_get_next_month($tmp['mon'], $tmp['year']); $newout = $tmp2['month']; }

+			elseif ($reg[1] == 'NEXT_YEAR') { $tmp = dol_getdate(dol_now(), true); $newout = ($tmp['year'] + 1); }

+			elseif ($reg[1] == 'MYCOMPANY_COUNTRY_ID' || $reg[1] == 'MYCOUNTRY_ID' || $reg[1] == 'MYCOUNTRYID')

+			{

@@ -858 +530,3 @@
-			} elseif ($reg[1] == 'USER_ID' || $reg[1] == 'USERID') {

+			}

+			elseif ($reg[1] == 'USER_ID' || $reg[1] == 'USERID')

+			{

@@ -860 +534,3 @@
-			} elseif ($reg[1] == 'USER_SUPERVISOR_ID' || $reg[1] == 'SUPERVISOR_ID' || $reg[1] == 'SUPERVISORID') {

+			}

+			elseif ($reg[1] == 'USER_SUPERVISOR_ID' || $reg[1] == 'SUPERVISOR_ID' || $reg[1] == 'SUPERVISORID')

+			{

@@ -862 +538,3 @@
-			} elseif ($reg[1] == 'ENTITY_ID' || $reg[1] == 'ENTITYID') {

+			}

+			elseif ($reg[1] == 'ENTITY_ID' || $reg[1] == 'ENTITYID')

+			{

@@ -864,3 +542,2 @@
-			} else {

-				$newout = ''; // Key not found, we replace with empty string

-			}

+			}

+			else $newout = ''; // Key not found, we replace with empty string

@@ -872,99 +548,0 @@
-	// Check type of variable and make sanitization according to this

-	if (preg_match('/^array/', $check)) {	// If 'array' or 'array:restricthtml' or 'array:aZ09' or 'array:intcomma'

-		if (!is_array($out) || empty($out)) {

-			$out = array();

-		} else {

-			$tmparray = explode(':', $check);

-			if (!empty($tmparray[1])) {

-				$tmpcheck = $tmparray[1];

-			} else {

-				$tmpcheck = 'alphanohtml';

-			}

-			foreach ($out as $outkey => $outval) {

-				$out[$outkey] = sanitizeVal($outval, $tmpcheck, $filter, $options);

-			}

-		}

-	} else {

-		// If field name is 'search_xxx' then we force the add of space after each < and > (when following char is numeric) because it means

-		// we use the < or > to make a search on a numeric value to do higher or lower so we can add a space to break html tags

-		if (strpos($paramname, 'search_') === 0) {

-			$out = preg_replace('/([<>])([-+]?\d)/', '\1 \2', $out);

-		}

-

-		$out = sanitizeVal($out, $check, $filter, $options);

-	}

-

-	// Sanitizing for special parameters.

-	// Note: There is no reason to allow the backtopage, backtolist or backtourl parameter to contains an external URL. Only relative URLs are allowed.

-	if ($paramname == 'backtopage' || $paramname == 'backtolist' || $paramname == 'backtourl') {

-		$out = str_replace('\\', '/', $out);								// Can be before the loop because only 1 char is replaced. No risk to get it after other replacements.

-		$out = str_replace(array(':', ';', '@', "\t", ' '), '', $out);		// Can be before the loop because only 1 char is replaced. No risk to retreive it after other replacements.

-		do {

-			$oldstringtoclean = $out;

-			$out = str_ireplace(array('javascript', 'vbscript', '&colon', '&#'), '', $out);

-			$out = preg_replace(array('/^[^\?]*%/'), '', $out);				// We remove any % chars before the ?. Example in url: '/product/stock/card.php?action=create&backtopage=%2Fdolibarr_dev%2Fhtdocs%2Fpro%25duct%2Fcard.php%3Fid%3Dabc'

-			$out = preg_replace(array('/^[a-z]*\/\s*\/+/i'), '', $out);		// We remove schema*// to remove external URL

-		} while ($oldstringtoclean != $out);

-	}

-

-	// Code for search criteria persistence.

-	// Save data into session if key start with 'search_' or is 'smonth', 'syear', 'month', 'year'

-	if (empty($method) || $method == 3 || $method == 4) {

-		if (preg_match('/^search_/', $paramname) || in_array($paramname, array('sortorder', 'sortfield'))) {

-			//var_dump($paramname.' - '.$out.' '.$user->default_values[$relativepathstring]['filters'][$paramname]);

-

-			// We save search key only if $out not empty that means:

-			// - posted value not empty, or

-			// - if posted value is empty and a default value exists that is not empty (it means we did a filter to an empty value when default was not).

-

-			if ($out != '' && isset($user)) {// $out = '0' or 'abc', it is a search criteria to keep

-				$user->lastsearch_values_tmp[$relativepathstring][$paramname] = $out;

-			}

-		}

-	}

-

-	return $out;

-}

-

-/**

- *  Return value of a param into GET or POST supervariable.

- *  Use the property $user->default_values[path]['creatform'] and/or $user->default_values[path]['filters'] and/or $user->default_values[path]['sortorder']

- *  Note: The property $user->default_values is loaded by main.php when loading the user.

- *

- *  @param  string  $paramname   Name of parameter to found

- *  @param	int		$method	     Type of method (0 = get then post, 1 = only get, 2 = only post, 3 = post then get)

- *  @return int                  Value found (int)

- */

-function GETPOSTINT($paramname, $method = 0)

-{

-	return (int) GETPOST($paramname, 'int', $method, null, null, 0);

-}

-

-

-/**

- *  Return a sanitized or empty value after checking value against a rule.

- *

- *  @deprecated

- *  @param  string|array  	$out	     Value to check/clear.

- *  @param  string  		$check	     Type of check/sanitizing

- *  @param  int     		$filter      Filter to apply when $check is set to 'custom'. (See http://php.net/manual/en/filter.filters.php for détails)

- *  @param  mixed   		$options     Options to pass to filter_var when $check is set to 'custom'

- *  @return string|array    		     Value sanitized (string or array). It may be '' if format check fails.

- */

-function checkVal($out = '', $check = 'alphanohtml', $filter = null, $options = null)

-{

-	return sanitizeVal($out, $check, $filter, $options);

-}

-

-/**

- *  Return a sanitized or empty value after checking value against a rule.

- *

- *  @param  string|array  	$out	     Value to check/clear.

- *  @param  string  		$check	     Type of check/sanitizing

- *  @param  int     		$filter      Filter to apply when $check is set to 'custom'. (See http://php.net/manual/en/filter.filters.php for détails)

- *  @param  mixed   		$options     Options to pass to filter_var when $check is set to 'custom'

- *  @return string|array    		     Value sanitized (string or array). It may be '' if format check fails.

- */

-function sanitizeVal($out = '', $check = 'alphanohtml', $filter = null, $options = null)

-{

-	// TODO : use class "Validate" to perform tests (and add missing tests) if needed for factorize

@@ -972 +550,2 @@
-	switch ($check) {

+	switch ($check)

+	{

@@ -976,3 +555 @@
-			if (!is_numeric($out)) {

-				$out = '';

-			}

+			if (!is_numeric($out)) { $out = ''; }

@@ -981,5 +558,8 @@
-			if (is_array($out)) {

-				$out = implode(',', $out);

-			}

-			if (preg_match('/[^0-9,-]+/i', $out)) {

-				$out = '';

+			if (preg_match('/[^0-9,-]+/i', $out)) $out = '';

+			break;

+		case 'alpha':

+			if (!is_array($out))

+			{

+				// '"' is dangerous because param in url can close the href= or src= and add javascript functions.

+				// '../' is dangerous because it allows dir transversals

+				$out = str_replace(array('"', '../'), '', trim($out));

@@ -991,3 +570,0 @@
-		case 'email':

-			$out = filter_var($out, FILTER_SANITIZE_EMAIL);

-			break;

@@ -995 +572,2 @@
-			if (!is_array($out)) {

+			if (!is_array($out))

+			{

@@ -997,3 +575 @@
-				if (preg_match('/[^a-z]+/i', $out)) {

-					$out = '';

-				}

+				if (preg_match('/[^a-z]+/i', $out)) $out = '';

@@ -1003 +579,2 @@
-			if (!is_array($out)) {

+			if (!is_array($out))

+			{

@@ -1005,3 +582 @@
-				if (preg_match('/[^a-z0-9_\-\.]+/i', $out)) {

-					$out = '';

-				}

+				if (preg_match('/[^a-z0-9_\-\.]+/i', $out)) $out = '';

@@ -1010,2 +585,3 @@
-		case 'aZ09arobase':		// great to sanitize $objecttype parameter

-			if (!is_array($out)) {

+		case 'aZ09comma':		// great to sanitize sortfield or sortorder params that can be t.abc,t.def_gh

+			if (!is_array($out))

+			{

@@ -1013,3 +589 @@
-				if (preg_match('/[^a-z0-9_\-\.@]+/i', $out)) {

-					$out = '';

-				}

+				if (preg_match('/[^a-z0-9_\-\.,]+/i', $out)) $out = '';

@@ -1018,7 +592,2 @@
-		case 'aZ09comma':		// great to sanitize $sortfield or $sortorder params that can be 't.abc,t.def_gh'

-			if (!is_array($out)) {

-				$out = trim($out);

-				if (preg_match('/[^a-z0-9_\-\.,]+/i', $out)) {

-					$out = '';

-				}

-			}

+		case 'array':

+			if (!is_array($out) || empty($out)) $out = array();

@@ -1026,32 +595 @@
-		case 'alpha':		// No html and no ../ and "

-		case 'alphanohtml':	// Recommended for most scalar parameters and search parameters

-			if (!is_array($out)) {

-				$out = trim($out);

-				do {

-					$oldstringtoclean = $out;

-					// Remove html tags

-					$out = dol_string_nohtmltag($out, 0);

-					// Remove also other dangerous string sequences

-					// '"' is dangerous because param in url can close the href= or src= and add javascript functions.

-					// '../' or '..\' is dangerous because it allows dir transversals

-					// Note &#38, '&#0000038', '&#x26'... is a simple char like '&' alone but there is no reason to accept such way to encode input data.

-					$out = str_ireplace(array('&#38', '&#0000038', '&#x26', '&quot', '&#34', '&#0000034', '&#x22', '"', '&#47', '&#0000047', '&#92', '&#0000092', '&#x2F', '../', '..\\'), '', $out);

-				} while ($oldstringtoclean != $out);

-				// keep lines feed

-			}

-			break;

-		case 'alphawithlgt':		// No " and no ../ but we keep balanced < > tags with no special chars inside. Can be used for email string like "Name <email>". Less secured than 'alphanohtml'

-			if (!is_array($out)) {

-				$out = trim($out);

-				do {

-					$oldstringtoclean = $out;

-					// Remove html tags

-					$out = dol_html_entity_decode($out, ENT_COMPAT | ENT_HTML5, 'UTF-8');

-					// '"' is dangerous because param in url can close the href= or src= and add javascript functions.

-					// '../' or '..\' is dangerous because it allows dir transversals

-					// Note &#38, '&#0000038', '&#x26'... is a simple char like '&' alone but there is no reason to accept such way to encode input data.

-					$out = str_ireplace(array('&#38', '&#0000038', '&#x26', '&quot', '&#34', '&#0000034', '&#x22', '"', '&#47', '&#0000047', '&#92', '&#0000092', '&#x2F', '../', '..\\'), '', $out);

-				} while ($oldstringtoclean != $out);

-			}

-			break;

-		case 'nohtml':		// No html

+		case 'nohtml':

@@ -1060 +598,9 @@
-		case 'restricthtmlnolink':

+		case 'alphanohtml':	// Recommended for most scalar parameters and search parameters

+			if (!is_array($out))

+			{

+				// '"' is dangerous because param in url can close the href= or src= and add javascript functions.

+				// '../' is dangerous because it allows dir transversals

+				$out = str_replace(array('"', '../'), '', trim($out));

+				$out = dol_string_nohtmltag($out, 1);

+			}

+			break;

@@ -1062,3 +608 @@
-		case 'restricthtmlallowclass':

-		case 'restricthtmlallowunvalid':

-			$out = dol_htmlwithnojs($out, 1, $check);

+			$out = dol_string_onlythesehtmltags($out, 0);

@@ -1067,9 +611,2 @@
-			if (!empty($out)) {

-				if (empty($filter)) {

-					return 'BadParameterForGETPOST - Param 3 of sanitizeVal()';

-				}

-				/*if (empty($options)) {

-					return 'BadParameterForGETPOST - Param 4 of sanitizeVal()';

-				}*/

-				$out = filter_var($out, $filter, $options);

-			}

+			if (empty($filter)) return 'BadFourthParameterForGETPOST';

+			$out = filter_var($out, $filter, $options);

@@ -1077,3 +614,19 @@
-		default:

-			dol_syslog("Error, you call sanitizeVal() with a bad value for the check type. Data can't be sanitized.", LOG_ERR);

-			break;

+	}

+

+	// Code for search criteria persistence.

+	// Save data into session if key start with 'search_' or is 'smonth', 'syear', 'month', 'year'

+	if (empty($method) || $method == 3 || $method == 4)

+	{

+		if (preg_match('/^search_/', $paramname) || in_array($paramname, array('sortorder', 'sortfield')))

+		{

+			//var_dump($paramname.' - '.$out.' '.$user->default_values[$relativepathstring]['filters'][$paramname]);

+

+			// We save search key only if $out not empty that means:

+			// - posted value not empty, or

+			// - if posted value is empty and a default value exists that is not empty (it means we did a filter to an empty value when default was not).

+

+			if ($out != '')		// $out = '0' or 'abc', it is a search criteria to keep

+			{

+				$user->lastsearch_values_tmp[$relativepathstring][$paramname] = $out;

+			}

+		}

@@ -1086,36 +639,29 @@
-if (!function_exists('dol_getprefix')) {

-	/**

-	 *  Return a prefix to use for this Dolibarr instance, for session/cookie names or email id.

-	 *  The prefix is unique for instance and avoid conflict between multi-instances, even when having two instances with same root dir

-	 *  or two instances in same virtual servers.

-	 *  This function must not use dol_hash (that is used for password hash) and need to have all context $conf loaded.

-	 *

-	 *  @param  string  $mode                   '' (prefix for session name) or 'email' (prefix for email id)

-	 *  @return	string                          A calculated prefix

-	 */

-	function dol_getprefix($mode = '')

-	{

-		// If prefix is for email (we need to have $conf already loaded for this case)

-		if ($mode == 'email') {

-			global $conf;

-

-			if (getDolGlobalString('MAIL_PREFIX_FOR_EMAIL_ID')) {	// If MAIL_PREFIX_FOR_EMAIL_ID is set

-				if (getDolGlobalString('MAIL_PREFIX_FOR_EMAIL_ID') != 'SERVER_NAME') {

-					return $conf->global->MAIL_PREFIX_FOR_EMAIL_ID;

-				} elseif (isset($_SERVER["SERVER_NAME"])) {	// If MAIL_PREFIX_FOR_EMAIL_ID is set to 'SERVER_NAME'

-					return $_SERVER["SERVER_NAME"];

-				}

-			}

-

-			// The recommended value if MAIL_PREFIX_FOR_EMAIL_ID is not defined (may be not defined for old versions)

-			if (!empty($conf->file->instance_unique_id)) {

-				return sha1('dolibarr'.$conf->file->instance_unique_id);

-			}

-

-			// For backward compatibility when instance_unique_id is not set

-			return sha1(DOL_DOCUMENT_ROOT.DOL_URL_ROOT);

-		}

-

-		// If prefix is for session (no need to have $conf loaded)

-		global $dolibarr_main_instance_unique_id, $dolibarr_main_cookie_cryptkey;	// This is loaded by filefunc.inc.php

-		$tmp_instance_unique_id = empty($dolibarr_main_instance_unique_id) ? (empty($dolibarr_main_cookie_cryptkey) ? '' : $dolibarr_main_cookie_cryptkey) : $dolibarr_main_instance_unique_id; // Unique id of instance

+if (!function_exists('dol_getprefix'))

+{

+    /**

+     *  Return a prefix to use for this Dolibarr instance, for session/cookie names or email id.

+     *  The prefix is unique for instance and avoid conflict between multi-instances, even when having two instances with same root dir

+     *  or two instances in same virtual servers.

+     *

+     *  @param  string  $mode                   '' (prefix for session name) or 'email' (prefix for email id)

+     *  @return	string                          A calculated prefix

+     */

+    function dol_getprefix($mode = '')

+    {

+        global $conf;

+

+		// If prefix is for email

+		if ($mode == 'email')

+		{

+		    if (!empty($conf->global->MAIL_PREFIX_FOR_EMAIL_ID))	// If MAIL_PREFIX_FOR_EMAIL_ID is set (a value initialized with a random value is recommended)

+			{

+				if ($conf->global->MAIL_PREFIX_FOR_EMAIL_ID != 'SERVER_NAME') return $conf->global->MAIL_PREFIX_FOR_EMAIL_ID;

+				elseif (isset($_SERVER["SERVER_NAME"])) return $_SERVER["SERVER_NAME"];

+			}

+

+			// The recommended value (may be not defined for old versions)

+			if (!empty($conf->file->instance_unique_id)) return $conf->file->instance_unique_id;

+

+			// For backward compatibility

+			return dol_hash(DOL_DOCUMENT_ROOT.DOL_URL_ROOT, '3');

+		}

@@ -1124,10 +670,9 @@
-		if (!empty($tmp_instance_unique_id)) {

-			return sha1('dolibarr'.$tmp_instance_unique_id);

-		}

-

-		// For backward compatibility when instance_unique_id is not set

-		if (isset($_SERVER["SERVER_NAME"]) && isset($_SERVER["DOCUMENT_ROOT"])) {

-			return sha1($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"].DOL_DOCUMENT_ROOT.DOL_URL_ROOT);

-		} else {

-			return sha1(DOL_DOCUMENT_ROOT.DOL_URL_ROOT);

-		}

+		if (!empty($conf->file->instance_unique_id)) return $conf->file->instance_unique_id;

+

+		// For backward compatibility

+		if (isset($_SERVER["SERVER_NAME"]) && isset($_SERVER["DOCUMENT_ROOT"]))

+		{

+			return dol_hash($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"].DOL_DOCUMENT_ROOT.DOL_URL_ROOT, '3');

+		}

+

+		return dol_hash(DOL_DOCUMENT_ROOT.DOL_URL_ROOT, '3');

@@ -1149 +694 @@
-	global $conf, $langs, $user, $mysoc; // Do not remove this. They must be defined for files we include. Other globals var must be retrieved with $GLOBALS['var']

+	global $conf, $langs, $user, $mysoc; // Do not remove this. They must be defined for files we include. Other globals var must be retreived with $GLOBALS['var']

@@ -1182 +727,2 @@
-	if (empty($type)) {	// For a filesystem path

+	if (empty($type))	// For a filesystem path

+	{

@@ -1184,3 +730,6 @@
-		if (is_array($conf->file->dol_document_root)) {

-			foreach ($conf->file->dol_document_root as $key => $dirroot) {	// ex: array("main"=>"/home/main/htdocs", "alt0"=>"/home/dirmod/htdocs", ...)

-				if ($key == 'main') {

+		if (is_array($conf->file->dol_document_root))

+		{

+			foreach ($conf->file->dol_document_root as $key => $dirroot)	// ex: array("main"=>"/home/main/htdocs", "alt0"=>"/home/dirmod/htdocs", ...)

+			{

+				if ($key == 'main')

+				{

@@ -1189,2 +738,2 @@
-				// if (@file_exists($dirroot.'/'.$path)) {

-				if (@file_exists($dirroot.'/'.$path)) {	// avoid [php:warn]

+				if (file_exists($dirroot.'/'.$path))

+				{

@@ -1196,8 +745,7 @@
-		if ($returnemptyifnotfound) {

-			// Not found into alternate dir

-			if ($returnemptyifnotfound == 1 || !file_exists($res)) {

-				return '';

-			}

-		}

-	} else {

-		// For an url path

+		if ($returnemptyifnotfound)								// Not found into alternate dir

+		{

+			if ($returnemptyifnotfound == 1 || !file_exists($res)) return '';

+		}

+	}

+	else				// For an url path

+	{

@@ -1209,14 +757,11 @@
-		if ($type == 1) {

-			$res = DOL_URL_ROOT.'/'.$path; // Standard value

-		}

-		if ($type == 2) {

-			$res = DOL_MAIN_URL_ROOT.'/'.$path; // Standard value

-		}

-		if ($type == 3) {

-			$res = DOL_URL_ROOT.'/'.$path;

-		}

-

-		foreach ($conf->file->dol_document_root as $key => $dirroot) {	// ex: array(["main"]=>"/home/main/htdocs", ["alt0"]=>"/home/dirmod/htdocs", ...)

-			if ($key == 'main') {

-				if ($type == 3) {

-					/*global $dolibarr_main_url_root;*/

+		if ($type == 1) $res = DOL_URL_ROOT.'/'.$path; // Standard value

+		if ($type == 2) $res = DOL_MAIN_URL_ROOT.'/'.$path; // Standard value

+		if ($type == 3) $res = DOL_URL_ROOT.'/'.$path;

+

+		foreach ($conf->file->dol_document_root as $key => $dirroot)	// ex: array(["main"]=>"/home/main/htdocs", ["alt0"]=>"/home/dirmod/htdocs", ...)

+		{

+			if ($key == 'main')

+			{

+				if ($type == 3)

+				{

+					global $dolibarr_main_url_root;

@@ -1225 +770 @@
-					$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($conf->file->dol_main_url_root));

+					$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));

@@ -1233 +777,0 @@
-			$regs = array();

@@ -1235 +779,2 @@
-			if (!empty($regs[1])) {

+			if (!empty($regs[1]))

+			{

@@ -1237,3 +782,4 @@
-				//if (file_exists($dirroot.'/'.$regs[1])) {

-				if (@file_exists($dirroot.'/'.$regs[1])) {	// avoid [php:warn]

-					if ($type == 1) {

+				if (file_exists($dirroot.'/'.$regs[1]))

+				{

+					if ($type == 1)

+					{

@@ -1242 +788,2 @@
-					if ($type == 2) {

+					if ($type == 2)

+					{

@@ -1245,2 +792,3 @@
-					if ($type == 3) {

-						/*global $dolibarr_main_url_root;*/

+					if ($type == 3)

+					{

+						global $dolibarr_main_url_root;

@@ -1249 +797 @@
-						$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($conf->file->dol_main_url_root));

+						$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));

@@ -1265,2 +813,2 @@
- *	Create a clone of instance of object (new instance with same value for each properties)

- *  With native = 0: Property that are reference are different memory area in the new object (full isolation clone). This means $this->db of new object may not be valid.

+ *	Create a clone of instance of object (new instance with same value for properties)

+ *  With native = 0: Property that are reference are also new object (full isolation clone). This means $this->db of new object is not valid.

@@ -1268 +815,0 @@
- *  With native = 2: Property that are reference are different memory area in the new object (full isolation clone). Only scalar and array values are cloned. This means method are not availables and $this->db of new object is not valid.

@@ -1271 +818 @@
- *  @param	int		$native		0=Full isolation method, 1=Native PHP method, 2=Full isolation method keeping only scalar and array properties (recommended)

+ *  @param	int		$native		0=Full isolation method, 1=Native PHP method

@@ -1277,27 +824,7 @@
-	if ($native == 0) {

-		// deprecated method, use the method with native = 2 instead

-		$tmpsavdb = null;

-		if (isset($object->db) && isset($object->db->db) && is_object($object->db->db) && get_class($object->db->db) == 'PgSql\Connection') {

-			$tmpsavdb = $object->db;

-			unset($object->db);		// Such property can not be serialized with pgsl (when object->db->db = 'PgSql\Connection')

-		}

-

-		$myclone = unserialize(serialize($object));	// serialize then unserialize is a hack to be sure to have a new object for all fields

-

-		if (!empty($tmpsavdb)) {

-			$object->db = $tmpsavdb;

-		}

-	} elseif ($native == 2) {

-		// recommended method to have a full isolated cloned object

-		$myclone = new stdClass();

-		$tmparray = get_object_vars($object);	// return only public properties

-

-		if (is_array($tmparray)) {

-			foreach ($tmparray as $propertykey => $propertyval) {

-				if (is_scalar($propertyval) || is_array($propertyval)) {

-					$myclone->$propertykey = $propertyval;

-				}

-			}

-		}

-	} else {

-		$myclone = clone $object; // PHP clone is a shallow copy only, not a real clone, so properties of references will keep the reference (refering to the same target/variable)

+	if (empty($native))

+	{

+		$myclone = unserialize(serialize($object));

+	}

+	else

+	{

+		$myclone = clone $object; // PHP clone is a shallow copy only, not a real clone, so properties of references will keep references (refer to the same target/variable)

@@ -1321,40 +848,8 @@
-	if (empty($conf->dol_optimize_smallscreen)) {

-		return $size;

-	}

-	if ($type == 'width' && $size > 250) {

-		return 250;

-	} else {

-		return 10;

-	}

-}

-

-

-/**

- *	Clean a string to use it as a file name.

- *  Replace also '--' and ' -' strings, they are used for parameters separation (Note: ' - ' is allowed).

- *

- *	@param	string	$str            String to clean

- * 	@param	string	$newstr			String to replace bad chars with.

- *  @param	int	    $unaccent		1=Remove also accent (default), 0 do not remove them

- *	@return string          		String cleaned (a-zA-Z_)

- *

- * 	@see        	dol_string_nospecial(), dol_string_unaccent(), dol_sanitizePathName()

- */

-function dol_sanitizeFileName($str, $newstr = '_', $unaccent = 1)

-{

-	// List of special chars for filenames in windows are defined on page https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file

-	// Char '>' '<' '|' '$' and ';' are special chars for shells.

-	// Char '/' and '\' are file delimiters.

-	// Chars '--' can be used into filename to inject special paramaters like --use-compress-program to make command with file as parameter making remote execution of command

-	$filesystem_forbidden_chars = array('<', '>', '/', '\\', '?', '*', '|', '"', ':', '°', '$', ';', '`');

-	$tmp = dol_string_nospecial($unaccent ? dol_string_unaccent($str) : $str, $newstr, $filesystem_forbidden_chars);

-	$tmp = preg_replace('/\-\-+/', '_', $tmp);

-	$tmp = preg_replace('/\s+\-([^\s])/', ' _$1', $tmp);

-	$tmp = preg_replace('/\s+\-$/', '', $tmp);

-	$tmp = str_replace('..', '', $tmp);

-	return $tmp;

-}

-

-/**

- *	Clean a string to use it as a path name. Similare to dol_sanitizeFileName but accept / and \ chars.

- *  Replace also '--' and ' -' strings, they are used for parameters separation (Note: ' - ' is allowed).

+	if (empty($conf->dol_optimize_smallscreen)) return $size;

+	if ($type == 'width' && $size > 250) return 250;

+	else return 10;

+}

+

+

+/**

+ *	Clean a string to use it as a file name

@@ -1367,3 +862,3 @@
- * 	@see        	dol_string_nospecial(), dol_string_unaccent(), dol_sanitizeFileName()

- */

-function dol_sanitizePathName($str, $newstr = '_', $unaccent = 1)

+ * 	@see        	dol_string_nospecial(), dol_string_unaccent(), dol_sanitizePathName()

+ */

+function dol_sanitizeFileName($str, $newstr = '_', $unaccent = 1)

@@ -1373,61 +868,19 @@
-	// Chars '--' can be used into filename to inject special paramaters like --use-compress-program to make command with file as parameter making remote execution of command

-	$filesystem_forbidden_chars = array('<', '>', '?', '*', '|', '"', '°', '$', ';', '`');

-	$tmp = dol_string_nospecial($unaccent ? dol_string_unaccent($str) : $str, $newstr, $filesystem_forbidden_chars);

-	$tmp = preg_replace('/\-\-+/', '_', $tmp);

-	$tmp = preg_replace('/\s+\-([^\s])/', ' _$1', $tmp);

-	$tmp = preg_replace('/\s+\-$/', '', $tmp);

-	$tmp = str_replace('..', '', $tmp);

-	return $tmp;

-}

-

-/**

- *  Clean a string to use it as an URL (into a href or src attribute)

- *

- *  @param      string		$stringtoclean		String to clean

- *  @param		int			$type				0=Accept all Url, 1=Clean external Url (keep only relative Url)

- *  @return     string     		 				Escaped string.

- */

-function dol_sanitizeUrl($stringtoclean, $type = 1)

-{

-	// We clean string because some hacks try to obfuscate evil strings by inserting non printable chars. Example: 'java(ascci09)scr(ascii00)ipt' is processed like 'javascript' (whatever is place of evil ascii char)

-	// We should use dol_string_nounprintableascii but function may not be yet loaded/available

-	$stringtoclean = preg_replace('/[\x00-\x1F\x7F]/u', '', $stringtoclean); // /u operator makes UTF8 valid characters being ignored so are not included into the replace

-	// We clean html comments because some hacks try to obfuscate evil strings by inserting HTML comments. Example: on<!-- -->error=alert(1)

-	$stringtoclean = preg_replace('/<!--[^>]*-->/', '', $stringtoclean);

-

-	$stringtoclean = str_replace('\\', '/', $stringtoclean);

-	if ($type == 1) {

-		// removing : should disable links to external url like http:aaa)

-		// removing ';' should disable "named" html entities encode into an url (we should not have this into an url)

-		$stringtoclean = str_replace(array(':', ';', '@'), '', $stringtoclean);

-	}

-

-	do {

-		$oldstringtoclean = $stringtoclean;

-		// removing '&colon' should disable links to external url like http:aaa)

-		// removing '&#' should disable "numeric" html entities encode into an url (we should not have this into an url)

-		$stringtoclean = str_ireplace(array('javascript', 'vbscript', '&colon', '&#'), '', $stringtoclean);

-	} while ($oldstringtoclean != $stringtoclean);

-

-	if ($type == 1) {

-		// removing '//' should disable links to external url like //aaa or http//)

-		$stringtoclean = preg_replace(array('/^[a-z]*\/\/+/i'), '', $stringtoclean);

-	}

-

-	return $stringtoclean;

-}

-

-/**

- *  Clean a string to use it as an Email.

- *

- *  @param      string		$stringtoclean		String to clean. Example 'abc@mycompany.com <My name>'

- *  @return     string     		 				Escaped string.

- */

-function dol_sanitizeEmail($stringtoclean)

-{

-	do {

-		$oldstringtoclean = $stringtoclean;

-		$stringtoclean = str_ireplace(array('"', ':', '[', ']',"\n", "\r", '\\', '\/'), '', $stringtoclean);

-	} while ($oldstringtoclean != $stringtoclean);

-

-	return $stringtoclean;

+	// Char '/' and '\' are file delimiters.

+	$filesystem_forbidden_chars = array('<', '>', '/', '\\', '?', '*', '|', '"', ':', '°', '$', ';');

+	return dol_string_nospecial($unaccent ?dol_string_unaccent($str) : $str, $newstr, $filesystem_forbidden_chars);

+}

+

+/**

+ *	Clean a string to use it as a path name

+ *

+ *	@param	string	$str            String to clean

+ * 	@param	string	$newstr			String to replace bad chars with

+ *  @param	int	    $unaccent		1=Remove also accent (default), 0 do not remove them

+ *	@return string          		String cleaned (a-zA-Z_)

+ *

+ * 	@see        	dol_string_nospecial(), dol_string_unaccent(), dol_sanitizeFileName()

+ */

+function dol_sanitizePathName($str, $newstr = '_', $unaccent = 1)

+{

+	$filesystem_forbidden_chars = array('<', '>', '?', '*', '|', '"', '°');

+	return dol_string_nospecial($unaccent ? dol_string_unaccent($str) : $str, $newstr, $filesystem_forbidden_chars);

@@ -1446,11 +899,2 @@
-	global $conf;

-

-	if (is_null($str)) {

-		return '';

-	}

-

-	if (utf8_check($str)) {

-		if (extension_loaded('intl') && getDolGlobalString('MAIN_UNACCENT_USE_TRANSLITERATOR')) {

-			$transliterator = Transliterator::createFromRules(':: Any-Latin; :: Latin-ASCII; :: NFD; :: [:Nonspacing Mark:] Remove; :: NFC;', Transliterator::FORWARD);

-			return $transliterator->transliterate($str);

-		}

+	if (utf8_check($str))

+	{

@@ -1461 +904,0 @@
-		'%C3%87' => 'C',

@@ -1464 +906,0 @@
-		'%C3%91' => 'N',

@@ -1466 +907,0 @@
-		'%C5%A0' => 'S',

@@ -1468 +908,0 @@
-		'%C3%9D' => 'Y', '%C5%B8' => 'y',

@@ -1475 +914,0 @@
-		'%C5%A1' => 's',

@@ -1477 +916 @@
-		'%C3%BD' => 'y', '%C3%BF' => 'y'

+		'%C3%BF' => 'y'

@@ -1481 +920,3 @@
-	} else {

+	}

+	else

+	{

@@ -1483 +924 @@
-		$string = strtr(

+        $string = strtr(

@@ -1505,17 +946,12 @@
- *  This is a more complete function than dol_sanitizeFileName().

- *

- *	@param	string			$str            	String to clean

- * 	@param	string			$newstr				String to replace forbidden chars with

- *  @param  array|string	$badcharstoreplace  Array of forbidden characters to replace. Use '' to keep default list.

- *  @param  array|string	$badcharstoremove   Array of forbidden characters to remove. Use '' to keep default list.

- *  @param	int				$keepspaces			1=Do not treat space as a special char to replace or remove

- * 	@return string          					Cleaned string

- *

- * 	@see    		dol_sanitizeFilename(), dol_string_unaccent(), dol_string_nounprintableascii()

- */

-function dol_string_nospecial($str, $newstr = '_', $badcharstoreplace = '', $badcharstoremove = '', $keepspaces = 0)

-{

-	$forbidden_chars_to_replace = array("'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ",", ";", "=", '°', '$', ';'); // more complete than dol_sanitizeFileName

-	if (empty($keepspaces)) {

-		$forbidden_chars_to_replace[] = " ";

-	}

+ *  This is a more complete function than dol_sanitizeFileName.

+ *

+ *	@param	string	$str            	String to clean

+ * 	@param	string	$newstr				String to replace forbidden chars with

+ *  @param  array	$badcharstoreplace  List of forbidden characters

+ * 	@return string          			Cleaned string

+ *

+ * 	@see    		dol_sanitizeFilename(), dol_string_unaccent()

+ */

+function dol_string_nospecial($str, $newstr = '_', $badcharstoreplace = '')

+{

+	$forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ",", ";", "=", '°'); // more complete than dol_sanitizeFileName

@@ -1522,0 +959 @@
+	if (is_array($badcharstoreplace)) $forbidden_chars_to_replace = $badcharstoreplace;

@@ -1525,7 +961,0 @@
-	if (is_array($badcharstoreplace)) {

-		$forbidden_chars_to_replace = $badcharstoreplace;

-	}

-	if (is_array($badcharstoremove)) {

-		$forbidden_chars_to_remove = $badcharstoremove;

-	}

-

@@ -1537,22 +966,0 @@
- *	Clean a string from all non printable ASCII chars (0x00-0x1F and 0x7F). It can also removes also Tab-CR-LF. UTF8 chars remains.

- *  This can be used to sanitize a string and view its real content. Some hacks try to obfuscate attacks by inserting non printable chars.

- *  Note, for information: UTF8 on 1 byte are: \x00-\7F

- *                                 2 bytes are: byte 1 \xc0-\xdf, byte 2 = \x80-\xbf

- *                                 3 bytes are: byte 1 \xe0-\xef, byte 2 = \x80-\xbf, byte 3 = \x80-\xbf

- *                                 4 bytes are: byte 1 \xf0-\xf7, byte 2 = \x80-\xbf, byte 3 = \x80-\xbf, byte 4 = \x80-\xbf

- *	@param	string	$str            	String to clean

- *  @param	int		$removetabcrlf		Remove also CR-LF

- * 	@return string          			Cleaned string

- *

- * 	@see    		dol_sanitizeFilename(), dol_string_unaccent(), dol_string_nospecial()

- */

-function dol_string_nounprintableascii($str, $removetabcrlf = 1)

-{

-	if ($removetabcrlf) {

-		return preg_replace('/[\x00-\x1F\x7F]/u', '', $str); // /u operator makes UTF8 valid characters being ignored so are not included into the replace

-	} else {

-		return preg_replace('/[\x00-\x08\x11-\x12\x14-\x1F\x7F]/u', '', $str); // /u operator should make UTF8 valid characters being ignored so are not included into the replace

-	}

-}

-

-/**

@@ -1561,4 +969,4 @@
- *  @param      string	$stringtoescape			String to escape

- *  @param		int		$mode					0=Escape also ' and " into ', 1=Escape ' but not " for usage into 'string', 2=Escape " but not ' for usage into "string", 3=Escape ' and " with \

- *  @param		int		$noescapebackslashn		0=Escape also \n. 1=Do not escape \n.

- *  @return     string   		 				Escaped string. Both ' and " are escaped into ' if they are escaped.

+ *  @param      string		$stringtoescape		String to escape

+ *  @param		int		$mode				0=Escape also ' and " into ', 1=Escape ' but not " for usage into 'string', 2=Escape " but not ' for usage into "string", 3=Escape ' and " with \

+ *  @param		int		$noescapebackslashn	0=Escape also \n. 1=Do not escape \n.

+ *  @return     string     		 				Escaped string. Both ' and " are escaped into ' if they are escaped.

@@ -1568,4 +975,0 @@
-	if (is_null($stringtoescape)) {

-		return '';

-	}

-

@@ -1575,15 +979,5 @@
-	if (empty($noescapebackslashn)) {

-		$substitjs["\n"] = '\\n';

-		$substitjs['\\'] = '\\\\';

-	}

-	if (empty($mode)) {

-		$substitjs["'"] = "\\'";

-		$substitjs['"'] = "\\'";

-	} elseif ($mode == 1) {

-		$substitjs["'"] = "\\'";

-	} elseif ($mode == 2) {

-		$substitjs['"'] = '\\"';

-	} elseif ($mode == 3) {

-		$substitjs["'"] = "\\'";

-		$substitjs['"'] = "\\\"";

-	}

+	if (empty($noescapebackslashn)) { $substitjs["\n"] = '\\n'; $substitjs['\\'] = '\\\\'; }

+	if (empty($mode)) { $substitjs["'"] = "\\'"; $substitjs['"'] = "\\'"; }

+	elseif ($mode == 1) $substitjs["'"] = "\\'";

+	elseif ($mode == 2) { $substitjs['"'] = '\\"'; }

+	elseif ($mode == 3) { $substitjs["'"] = "\\'"; $substitjs['"'] = "\\\""; }

@@ -1597 +991 @@
- *  @return     string     		 				Escaped string for JSON content.

+ *  @return     string     		 				Escaped string for json content.

@@ -1605,102 +999 @@
- *  Returns text escaped for inclusion into a php string, build with double quotes " or '

- *

- *  @param      string		$stringtoescape		String to escape

- *  @param		int<1,2>	$stringforquotes	2=String for doublequotes, 1=String for simple quotes

- *  @return     string     		 				Escaped string for PHP content.

- */

-function dol_escape_php($stringtoescape, $stringforquotes = 2)

-{

-	if (is_null($stringtoescape)) {

-		return '';

-	}

-

-	if ($stringforquotes == 2) {

-		return str_replace('"', "'", $stringtoescape);

-	}

-	if ($stringforquotes == 1) {

-		return str_replace("'", "\'", str_replace('"', "'", $stringtoescape));

-	}

-

-	return 'Bad parameter for stringforquotes in dol_escape_php';

-}

-

-/**

- *  Returns text escaped for inclusion into a XML string

- *

- *  @param      string		$stringtoescape		String to escape

- *  @return     string     		 				Escaped string for XML content.

- */

-function dol_escape_xml($stringtoescape)

-{

-	return $stringtoescape;

-}

-

-/**

- * Return a string label (so on 1 line only and that should not contains any HTML) ready to be output on HTML page

- * To use text that is not HTML content inside an attribute, use can simply only dol_escape_htmltag(). In doubt, use dolPrintHTMLForAttribute().

- *

- * @param	string	$s		String to print

- * @return	string			String ready for HTML output

- */

-function dolPrintLabel($s)

-{

-	return dol_escape_htmltag(dol_htmlentitiesbr($s));

-}

-

-/**

- * Return a string ready to be output on HTML page

- * To use text inside an attribute, you can simply use dolPrintHTMLForAttribute() or dol_escape_htmltag()

- *

- * @param	string	$s				String to print

- * @param	int		$allowiframe	Allow iframe tags

- * @return	string					String ready for HTML output

- */

-function dolPrintHTML($s, $allowiframe = 0)

-{

-	return dol_escape_htmltag(dol_htmlwithnojs(dol_string_onlythesehtmltags(dol_htmlentitiesbr($s), 1, 1, 1, $allowiframe)), 1, 1, 'common', 0, 1);

-}

-

-/**

- * Return a string ready to be output on an HTML attribute (alt, title, data-html, ...)

- *

- * @param	string	$s		String to print

- * @return	string			String ready for HTML output

- */

-function dolPrintHTMLForAttribute($s)

-{

-	// The dol_htmlentitiesbr will convert simple text into html

-	// The dol_escape_htmltag will escape html chars.

-	return dol_escape_htmltag(dol_string_onlythesehtmltags(dol_htmlentitiesbr($s), 1, 0, 0, 0, array('br', 'b', 'font', 'span')), 1, -1, '', 0, 1);

-}

-

-/**

- * Return a string ready to be output on input textarea

- * To use text inside an attribute, use can use only dol_escape_htmltag()

- *

- * @param	string	$s				String to print

- * @param	int		$allowiframe	Allow iframe tags

- * @return	string					String ready for HTML output into a textarea

- */

-function dolPrintHTMLForTextArea($s, $allowiframe = 0)

-{

-	return dol_escape_htmltag(dol_htmlwithnojs(dol_string_onlythesehtmltags(dol_htmlentitiesbr($s), 1, 1, 1, $allowiframe)), 1, 1, '', 0, 1);

-}

-

-/**

- * Return a string ready to be output on an HTML attribute (alt, title, ...)

- *

- * @param	string	$s		String to print

- * @return	string			String ready for HTML output

- */

-function dolPrintPassword($s)

-{

-	return htmlspecialchars($s, ENT_COMPAT, 'UTF-8');

-}

-

-

-/**

- *  Returns text escaped for inclusion in HTML alt or title or value tags, or into values of HTML input fields.

- *  When we need to output strings on pages, we should use:

- *        - dolPrintHTML... that is dol_escape_htmltag(dol_htmlwithnojs(dol_string_onlythesehtmltags(dol_htmlentitiesbr(), 1, 1, 1)), 1, 1) for notes or descriptions into textarea, add 'common' if into a html content

- *        - dolPrintLabel... that is dol_escape_htmltag(dol_htmlentitiesbr()) for simple labels.

- *        - dolPrintPassword that is abelhtmlspecialchars( , ENT_COMPAT, 'UTF-8') for passwords.

+ *  Returns text escaped for inclusion in HTML alt or title tags, or into values of HTML input fields.

@@ -1709,3 +1002,3 @@
- *  @param		int			$keepb					1=Keep b tags, 0=remove them completely

- *  @param      int         $keepn              	1=Preserve \r\n strings, 0=Replace them with escaped value, -1=Remove them. Set to 1 when escaping for a <textarea>.

- *  @param		string		$noescapetags			'' or 'common' or list of tags to not escape. TODO Does not works yet when there is attributes into tag.

+ *  @param		int			$keepb					1=Preserve b tags (otherwise, remove them)

+ *  @param      int         $keepn              	1=Preserve \r\n strings (otherwise, replace them with escaped value). Set to 1 when escaping for a <textarea>.

+ *  @param		string		$keepmoretags			'' or 'common' or list of tags

@@ -1713 +1005,0 @@
- *  @param		int			$cleanalsojavascript	Clean also javascript. @TODO switch this option to 1 by default.

@@ -1715,12 +1007,6 @@
- *  @see		dol_string_nohtmltag(), dol_string_onlythesehtmltags(), dol_string_nospecial(), dol_string_unaccent(), dol_htmlentitiesbr()

- */

-function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0, $noescapetags = '', $escapeonlyhtmltags = 0, $cleanalsojavascript = 0)

-{

-	if ($noescapetags == 'common') {

-		$noescapetags = 'html,body,a,b,em,hr,i,u,ul,li,br,div,img,font,p,span,strong,table,tr,td,th,tbody,h1,h2,h3,h4,h5,h6,h7,h8,h9';

-		// Add also html5 tags

-		$noescapetags .= ',header,footer,nav,section,menu,menuitem';

-	}

-	if ($cleanalsojavascript) {

-		$stringtoescape = dol_string_onlythesehtmltags($stringtoescape, 0, 0, $cleanalsojavascript, 0, array(), 0);

-	}

+ *  @see		dol_string_nohtmltag(), dol_string_nospecial(), dol_string_unaccent()

+ */

+function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0, $keepmoretags = '', $escapeonlyhtmltags = 0)

+{

+	if ($keepmoretags == 'common') $keepmoretags = 'html,body,a,em,i,u,ul,li,br,div,img,font,p,span,strong,table,tr,td,th,tbody';

+	// TODO Implement $keepmoretags

@@ -1730 +1016 @@
-		$tmp = htmlspecialchars_decode((string) $stringtoescape, ENT_COMPAT);

+		$tmp = htmlspecialchars_decode($stringtoescape, ENT_COMPAT);

@@ -1732,11 +1018,4 @@
-		$tmp = html_entity_decode((string) $stringtoescape, ENT_COMPAT, 'UTF-8');

-	}

-	if (!$keepb) {

-		$tmp = strtr($tmp, array("<b>"=>'', '</b>'=>'', '<strong>'=>'', '</strong>'=>''));

-	}

-	if (!$keepn) {

-		$tmp = strtr($tmp, array("\r"=>'\\r', "\n"=>'\\n'));

-	} elseif ($keepn == -1) {

-		$tmp = strtr($tmp, array("\r"=>'', "\n"=>''));

-	}

-

+		$tmp = html_entity_decode($stringtoescape, ENT_COMPAT, 'UTF-8');

+	}

+	if (!$keepb) $tmp = strtr($tmp, array("<b>"=>'', '</b>'=>''));

+	if (!$keepn) $tmp = strtr($tmp, array("\r"=>'\\r', "\n"=>'\\n'));

@@ -1746,27 +1025,4 @@
-		// Escape tags to keep

-		$tmparrayoftags = array();

-		if ($noescapetags) {

-			$tmparrayoftags = explode(',', $noescapetags);

-		}

-		if (count($tmparrayoftags)) {

-			// TODO Does not works yet when there is attributes into tag

-			foreach ($tmparrayoftags as $tagtoreplace) {

-				$tmp = str_ireplace('<'.$tagtoreplace.'>', '__BEGINTAGTOREPLACE'.$tagtoreplace.'__', $tmp);

-				$tmp = str_ireplace('</'.$tagtoreplace.'>', '__ENDTAGTOREPLACE'.$tagtoreplace.'__', $tmp);

-				$tmp = str_ireplace('<'.$tagtoreplace.' />', '__BEGINENDTAGTOREPLACE'.$tagtoreplace.'__', $tmp);

-			}

-		}

-

-		$result = htmlentities($tmp, ENT_COMPAT, 'UTF-8');

-

-		if (count($tmparrayoftags)) {

-			foreach ($tmparrayoftags as $tagtoreplace) {

-				$result = str_ireplace('__BEGINTAGTOREPLACE'.$tagtoreplace.'__', '<'.$tagtoreplace.'>', $result);

-				$result = str_ireplace('__ENDTAGTOREPLACE'.$tagtoreplace.'__', '</'.$tagtoreplace.'>', $result);

-				$result = str_ireplace('__BEGINENDTAGTOREPLACE'.$tagtoreplace.'__', '<'.$tagtoreplace.' />', $result);

-			}

-		}

-

-		return $result;

-	}

-}

+		return htmlentities($tmp, ENT_COMPAT, 'UTF-8');

+	}

+}

+

@@ -1777,2 +1033 @@
- * @param 	string		$string		        String to encode

- * @param   string      $encoding           Character set encoding

+ * @param 	string		$utf8_string		String to encode

@@ -1781,7 +1036,3 @@
-function dol_strtolower($string, $encoding = "UTF-8")

-{

-	if (function_exists('mb_strtolower')) {

-		return mb_strtolower($string, $encoding);

-	} else {

-		return strtolower($string);

-	}

+function dol_strtolower($utf8_string)

+{

+	return mb_strtolower($utf8_string, "UTF-8");

@@ -1793,2 +1044 @@
- * @param 	string		$string		        String to encode

- * @param   string      $encoding           Character set encoding

+ * @param 	string		$utf8_string		String to encode

@@ -1796,44 +1046,6 @@
- * @see dol_ucfirst(), dol_ucwords()

- */

-function dol_strtoupper($string, $encoding = "UTF-8")

-{

-	if (function_exists('mb_strtoupper')) {

-		return mb_strtoupper($string, $encoding);

-	} else {

-		return strtoupper($string);

-	}

-}

-

-/**

- * Convert first character of the first word of a string to upper. Never use ucfirst because it does not works with UTF8 strings.

- *

- * @param   string      $string         String to encode

- * @param   string      $encoding       Character set encodign

- * @return  string                      String converted

- * @see dol_strtoupper(), dol_ucwords()

- */

-function dol_ucfirst($string, $encoding = "UTF-8")

-{

-	if (function_exists('mb_substr')) {

-		return mb_strtoupper(mb_substr($string, 0, 1, $encoding), $encoding).mb_substr($string, 1, null, $encoding);

-	} else {

-		return ucfirst($string);

-	}

-}

-

-/**

- * Convert first character of all the words of a string to upper.

- *

- * @param   string      $string         String to encode

- * @param   string      $encoding       Character set encodign

- * @return  string                      String converted

- * @see dol_strtoupper(), dol_ucfirst()

- */

-function dol_ucwords($string, $encoding = "UTF-8")

-{

-	if (function_exists('mb_convert_case')) {

-		return mb_convert_case($string, MB_CASE_TITLE, $encoding);

-	} else {

-		return ucwords($string);

-	}

-}

+ */

+function dol_strtoupper($utf8_string)

+{

+	return mb_strtoupper($utf8_string, "UTF-8");

+}

+

@@ -1855,3 +1067,3 @@
- *												On Linux   LOG_ERR=3, LOG_WARNING=4, LOG_NOTICE=5, LOG_INFO=6, LOG_DEBUG=7

- *  @param	int			$ident					1=Increase ident of 1 (after log), -1=Decrease ident of 1 (before log)

- *  @param	string		$suffixinfilename		When output is a file, append this suffix into default log filename. Example '_stripe', '_mail'

+ *												On Linux   LOG_ERR=3, LOG_WARNING=4, LOG_INFO=6, LOG_DEBUG=7

+ *  @param	int			$ident					1=Increase ident of 1, -1=Decrease ident of 1

+ *  @param	string		$suffixinfilename		When output is a file, append this suffix into default log filename.

@@ -1864 +1076 @@
-	global $conf, $user, $debugbar;

+    global $conf, $user, $debugbar;

@@ -1867,3 +1079 @@
-	if (!isModEnabled('syslog')) {

-		return;

-	}

+	if (empty($conf->syslog->enabled)) return;

@@ -1872 +1082 @@
-	if (defined('USEEXTERNALSERVER') && !defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) {

+	if (defined('USEEXTERNALSERVER') && ! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {

@@ -1874,14 +1084,8 @@
-		if (is_object($website) && !empty($website->ref)) {

-			$suffixinfilename .= '_website_'.$website->ref;

-		} elseif (!empty($websitekey)) {

-			$suffixinfilename .= '_website_'.$websitekey;

-		}

-	}

-

-	// Check if we have a forced suffix

-	if (defined('USESUFFIXINLOG')) {

-		$suffixinfilename .= constant('USESUFFIXINLOG');

-	}

-

-	if ($ident < 0) {

-		foreach ($conf->loghandlers as $loghandlerinstance) {

+		if (is_object($website) && ! empty($website->ref)) $suffixinfilename.='_website_'.$website->ref;

+		elseif (! empty($websitekey)) $suffixinfilename.='_website_'.$websitekey;

+	}

+

+	if ($ident < 0)

+	{

+		foreach ($conf->loghandlers as $loghandlerinstance)

+		{

@@ -1892 +1096,2 @@
-	if (!empty($message)) {

+	if (!empty($message))

+	{

@@ -1895 +1100,2 @@
-		if (!array_key_exists($level, $logLevels)) {

+		if (!array_key_exists($level, $logLevels))

+		{

@@ -1898,7 +1104,3 @@
-		if ($level > getDolGlobalInt('SYSLOG_LEVEL')) {

-			return;

-		}

-

-		if (!getDolGlobalString('MAIN_SHOW_PASSWORD_INTO_LOG')) {

-			$message = preg_replace('/password=\'[^\']*\'/', 'password=\'hidden\'', $message); // protection to avoid to have value of password in log

-		}

+		if ($level > $conf->global->SYSLOG_LEVEL) return;

+

+		$message = preg_replace('/password=\'[^\']*\'/', 'password=\'hidden\'', $message); // protection to avoid to have value of password in log

@@ -1907,3 +1109,4 @@
-		if ((!empty($_REQUEST['logtohtml']) && getDolGlobalString('MAIN_ENABLE_LOG_TO_HTML'))

-			|| (is_object($user) && $user->hasRight('debugbar', 'read') && is_object($debugbar))) {

-			$conf->logbuffer[] = dol_print_date(time(), "%Y-%m-%d %H:%M:%S")." ".$logLevels[$level]." ".$message;

+		if ((!empty($_REQUEST['logtohtml']) && !empty($conf->global->MAIN_ENABLE_LOG_TO_HTML))

+		    || (!empty($user->rights->debugbar->read) && is_object($debugbar)))

+		{

+		    $conf->logbuffer[] = dol_print_date(time(), "%Y-%m-%d %H:%M:%S")." ".$logLevels[$level]." ".$message;

@@ -1914 +1117,2 @@
-		if (getDolGlobalString('MAIN_ENABLE_LOG_INLINE_HTML') && !empty($_GET["log"])) {

+		if (!empty($conf->global->MAIN_ENABLE_LOG_INLINE_HTML) && !empty($_GET["log"]))

+		{

@@ -1916 +1120 @@
-			print dol_escape_htmltag($message)."\n";

+			print $message."\n";

@@ -1932,16 +1136,9 @@
-			if (!empty($_SERVER['HTTP_X_FORWARDED_FOR']) && $_SERVER['HTTP_X_FORWARDED_FOR'] != $remoteip) {

-				$data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'].' -> '.$data['ip'];

-			} elseif (!empty($_SERVER['HTTP_CLIENT_IP']) && $_SERVER['HTTP_CLIENT_IP'] != $remoteip) {

-				$data['ip'] = $_SERVER['HTTP_CLIENT_IP'].' -> '.$data['ip'];

-			}

-		} elseif (!empty($_SERVER['SERVER_ADDR'])) {

-			// This is when PHP session is ran inside a web server but not inside a client request (example: init code of apache)

-			$data['ip'] = $_SERVER['SERVER_ADDR'];

-		} elseif (!empty($_SERVER['COMPUTERNAME'])) {

-			// This is when PHP session is ran outside a web server, like from Windows command line (Not always defined, but useful if OS defined it).

-			$data['ip'] = $_SERVER['COMPUTERNAME'].(empty($_SERVER['USERNAME']) ? '' : '@'.$_SERVER['USERNAME']);

-		} elseif (!empty($_SERVER['LOGNAME'])) {

-			// This is when PHP session is ran outside a web server, like from Linux command line (Not always defined, but usefull if OS defined it).

-			$data['ip'] = '???@'.$_SERVER['LOGNAME'];

-		}

-

+			if (!empty($_SERVER['HTTP_X_FORWARDED_FOR']) && $_SERVER['HTTP_X_FORWARDED_FOR'] != $remoteip) $data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'].' -> '.$data['ip'];

+			elseif (!empty($_SERVER['HTTP_CLIENT_IP']) && $_SERVER['HTTP_CLIENT_IP'] != $remoteip) $data['ip'] = $_SERVER['HTTP_CLIENT_IP'].' -> '.$data['ip'];

+		}

+		// This is when PHP session is ran inside a web server but not inside a client request (example: init code of apache)

+		elseif (!empty($_SERVER['SERVER_ADDR'])) $data['ip'] = $_SERVER['SERVER_ADDR'];

+		// This is when PHP session is ran outside a web server, like from Windows command line (Not always defined, but useful if OS defined it).

+		elseif (!empty($_SERVER['COMPUTERNAME'])) $data['ip'] = $_SERVER['COMPUTERNAME'].(empty($_SERVER['USERNAME']) ? '' : '@'.$_SERVER['USERNAME']);

+		// This is when PHP session is ran outside a web server, like from Linux command line (Not always defined, but usefull if OS defined it).

+		elseif (!empty($_SERVER['LOGNAME'])) $data['ip'] = '???@'.$_SERVER['LOGNAME'];

@@ -1949,4 +1146,3 @@
-		foreach ($conf->loghandlers as $loghandlerinstance) {

-			if ($restricttologhandler && $loghandlerinstance->code != $restricttologhandler) {

-				continue;

-			}

+		foreach ($conf->loghandlers as $loghandlerinstance)

+		{

+			if ($restricttologhandler && $loghandlerinstance->code != $restricttologhandler) continue;

@@ -1958,2 +1154,4 @@
-	if ($ident > 0) {

-		foreach ($conf->loghandlers as $loghandlerinstance) {

+	if ($ident > 0)

+	{

+		foreach ($conf->loghandlers as $loghandlerinstance)

+		{

@@ -1965,98 +1162,0 @@
-/**

- *	Return HTML code to output a button to open a dialog popup box.

- *  Such buttons must be included inside a HTML form.

- *

- *	@param	string	$name				A name for the html component

- *	@param	string	$label 	    		Label shown in Popup title top bar

- *	@param  string	$buttonstring  		button string (HTML text we can click on)

- *	@param  string	$url				Relative Url to open. For example '/project/card.php'

- *  @param	string	$disabled			Disabled text

- *  @param	string	$morecss			More CSS

- *  @param	string	$jsonopen			Some JS code to execute on click/open of popup

- *  @param	string	$backtopagejsfields	The back to page must be managed using javascript instead of a redirect.

- *  									Value is 'keyforpopupid:Name_of_html_component_to_set_with id,Name_of_html_component_to_set_with_label'

- *  @param	string	$accesskey			A key to use shortcut

- * 	@return	string						HTML component with button

- */

-function dolButtonToOpenUrlInDialogPopup($name, $label, $buttonstring, $url, $disabled = '', $morecss = 'classlink button bordertransp', $jsonopen = '', $backtopagejsfields = '', $accesskey = '')

-{

-	global $conf;

-

-	if (strpos($url, '?') > 0) {

-		$url .= '&dol_hide_topmenu=1&dol_hide_leftmenu=1&dol_openinpopup='.urlencode($name);

-	} else {

-		$url .= '?dol_hide_topmenu=1&dol_hide_leftmenu=1&dol_openinpopup='.urlencode($name);

-	}

-

-	$out = '';

-

-	$backtopagejsfieldsid = '';

-	$backtopagejsfieldslabel = '';

-	if ($backtopagejsfields) {

-		$tmpbacktopagejsfields = explode(':', $backtopagejsfields);

-		if (empty($tmpbacktopagejsfields[1])) {	// If the part 'keyforpopupid:' is missing, we add $name for it.

-			$backtopagejsfields = $name.":".$backtopagejsfields;

-			$tmp2backtopagejsfields = explode(',', $tmpbacktopagejsfields[0]);

-		} else {

-			$tmp2backtopagejsfields = explode(',', $tmpbacktopagejsfields[1]);

-		}

-		$backtopagejsfieldsid = empty($tmp2backtopagejsfields[0]) ? '' : $tmp2backtopagejsfields[0];

-		$backtopagejsfieldslabel = empty($tmp2backtopagejsfields[1]) ? '' : $tmp2backtopagejsfields[1];

-		$url .= '&backtopagejsfields='.urlencode($backtopagejsfields);

-	}

-

-	//print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("MediaFiles")).'" name="file_manager">';

-	$out .= '<!-- a link for button to open url into a dialog popup with backtopagejsfields = '.$backtopagejsfields.' -->';

-	$out .= '<a '.($accesskey ? ' accesskey="'.$accesskey.'"' : '').' class="cursorpointer reposition button_'.$name.($morecss ? ' '.$morecss : '').'"'.$disabled.' title="'.dol_escape_htmltag($label).'"';

-	if (empty($conf->use_javascript_ajax)) {

-		$out .= ' href="'.DOL_URL_ROOT.$url.'" target="_blank"';

-	} elseif ($jsonopen) {

-		$out .= ' href="#" onclick="'.$jsonopen.'"';

-	} else {

-		$out .= ' href="#"';

-	}

-	$out .= '>'.$buttonstring.'</a>';

-

-	if (!empty($conf->use_javascript_ajax)) {

-		// Add code to open url using the popup. Add also hidden field to retreive the returned variables

-		$out .= '<!-- code to open popup and variables to retreive returned variables -->';

-		$out .= '<div id="idfordialog'.$name.'" class="hidden">div for dialog</div>';

-		$out .= '<div id="varforreturndialogid'.$name.'" class="hidden">div for returned id</div>';

-		$out .= '<div id="varforreturndialoglabel'.$name.'" class="hidden">div for returned label</div>';

-		$out .= '<!-- Add js code to open dialog popup on dialog -->';

-		$out .= '<script nonce="'.getNonce().'" type="text/javascript">

-					jQuery(document).ready(function () {

-						jQuery(".button_'.$name.'").click(function () {

-							console.log(\'Open popup with jQuery(...).dialog() on URL '.dol_escape_js(DOL_URL_ROOT.$url).'\');

-							var $tmpdialog = $(\'#idfordialog'.$name.'\');

-							$tmpdialog.html(\'<iframe class="iframedialog" id="iframedialog'.$name.'" style="border: 0px;" src="'.DOL_URL_ROOT.$url.'" width="100%" height="98%"></iframe>\');

-							$tmpdialog.dialog({

-								autoOpen: false,

-							 	modal: true,

-							 	height: (window.innerHeight - 150),

-							 	width: \'80%\',

-							 	title: \''.dol_escape_js($label).'\',

-								open: function (event, ui) {

-									console.log("open popup name='.$name.', backtopagejsfields='.$backtopagejsfields.'");

-	       						},

-								close: function (event, ui) {

-									var returnedid = jQuery("#varforreturndialogid'.$name.'").text();

-									var returnedlabel = jQuery("#varforreturndialoglabel'.$name.'").text();

-									console.log("popup has been closed. returnedid (js var defined into parent page)="+returnedid+" returnedlabel="+returnedlabel);

-									if (returnedid != "" && returnedid != "div for returned id") {

-										jQuery("#'.(empty($backtopagejsfieldsid) ? "none" : $backtopagejsfieldsid).'").val(returnedid);

-									}

-									if (returnedlabel != "" && returnedlabel != "div for returned label") {

-										jQuery("#'.(empty($backtopagejsfieldslabel) ? "none" : $backtopagejsfieldslabel).'").val(returnedlabel);

-									}

-								}

-							});

-

-							$tmpdialog.dialog(\'open\');

-							return false;

-						});

-					});

-				</script>';

-	}

-	return $out;

-}

@@ -2067 +1167 @@
- *	@param	array	$links				Array of tabs (0=>url, 1=>label, 2=>code, 3=>not used, 4=>text after link, 5=>morecssonlink). Currently initialized by calling a function xxx_admin_prepare_head. Note that label into $links[$i][1] must be already HTML escaped.

+ *	@param	array	$links				Array of tabs. Currently initialized by calling a function xxx_admin_prepare_head

@@ -2070 +1170 @@
- *	@param  int		$notab				-1 or 0=Add tab header, 1=no tab header (if you set this to 1, using print dol_get_fiche_end() to close tab is not required), -2=Add tab header with no sepaaration under tab (to start a tab just after), -3=Add tab header but no footer separation

+ *	@param  int		$notab				-1 or 0=Add tab header, 1=no tab header (if you set this to 1, using dol_fiche_end() to close tab is not required), -2=Add tab header with no seaparation under tab (to start a tab just after)

@@ -2076 +1175,0 @@
- *  @param	string	$moretabssuffix		A suffix to use when you have several dol_get_fiche_head() in same page

@@ -2078,5 +1177,4 @@
- *  @deprecated Use print dol_get_fiche_head() instead

- */

-function dol_fiche_head($links = array(), $active = '0', $title = '', $notab = 0, $picto = '', $pictoisfullpath = 0, $morehtmlright = '', $morecss = '', $limittoshow = 0, $moretabssuffix = '')

-{

-	print dol_get_fiche_head($links, $active, $title, $notab, $picto, $pictoisfullpath, $morehtmlright, $morecss, $limittoshow, $moretabssuffix);

+ */

+function dol_fiche_head($links = array(), $active = '0', $title = '', $notab = 0, $picto = '', $pictoisfullpath = 0, $morehtmlright = '', $morecss = '', $limittoshow = 0)

+{

+	print dol_get_fiche_head($links, $active, $title, $notab, $picto, $pictoisfullpath, $morehtmlright, $morecss, $limittoshow);

@@ -2088 +1186 @@
- *	@param	array	$links				Array of tabs (0=>url, 1=>label, 2=>code, 3=>not used, 4=>text after link, 5=>morecssonlink). Currently initialized by calling a function xxx_admin_prepare_head. Note that label into $links[$i][1] must be already HTML escaped.

+ *	@param	array	$links				Array of tabs

@@ -2091 +1189 @@
- *	@param  int		$notab				-1 or 0=Add tab header, 1=no tab header (if you set this to 1, using print dol_get_fiche_end() to close tab is not required), -2=Add tab header with no seaparation under tab (to start a tab just after), -3=-2+'noborderbottom'

+ *	@param  int		$notab				-1 or 0=Add tab header, 1=no tab header (if you set this to 1, using dol_fiche_end() to close tab is not required), -2=Add tab header with no seaparation under tab (to start a tab just after)

@@ -2095 +1193 @@
- *  @param	string	$morecss			More CSS on the link <a>

+ *  @param	string	$morecss			More Css

@@ -2097,2 +1194,0 @@
- *  @param	string	$moretabssuffix		A suffix to use when you have several dol_get_fiche_head() in same page

- *  @param	int     $dragdropfile       0 (default) or 1. 1 enable a drop zone for file to be upload, 0 disable it

@@ -2101 +1197 @@
-function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab = 0, $picto = '', $pictoisfullpath = 0, $morehtmlright = '', $morecss = '', $limittoshow = 0, $moretabssuffix = '', $dragdropfile = 0)

+function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab = 0, $picto = '', $pictoisfullpath = 0, $morehtmlright = '', $morecss = '', $limittoshow = 0)

@@ -2107,5 +1203,3 @@
-	if (!empty($conf->dol_optimize_smallscreen)) {

-		$showtitle = 0;

-	}

-

-	$out = "\n".'<!-- dol_fiche_head - dol_get_fiche_head -->';

+	if (!empty($conf->dol_optimize_smallscreen)) $showtitle = 0;

+

+	$out = "\n".'<!-- dol_get_fiche_head -->';

@@ -2118,3 +1212 @@
-	if ($morehtmlright) {

-		$out .= '<div class="inline-block floatright tabsElem">'.$morehtmlright.'</div>'; // Output right area first so when space is missing, text is in front of tabs and not under.

-	}

+	if ($morehtmlright) $out .= '<div class="inline-block floatright tabsElem">'.$morehtmlright.'</div>'; // Output right area first so when space is missing, text is in front of tabs and not under.

@@ -2123 +1215,2 @@
-	if (!empty($title) && $showtitle && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {

+	if (!empty($title) && $showtitle)

+	{

@@ -2126,8 +1219,2 @@
-		if ($picto) {

-			$noprefix = $pictoisfullpath;

-			if (strpos($picto, 'fontawesome_') !== false) {

-				$noprefix = 1;

-			}

-			$out .= img_picto($title, ($noprefix ? '' : 'object_').$picto, '', $pictoisfullpath, 0, 0, '', 'imgTabTitle').' ';

-		}

-		$out .= '<span class="tabTitleText">'.dol_escape_htmltag(dol_trunc($title, $limittitle)).'</span>';

+		if ($picto && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $out .= img_picto($title, ($pictoisfullpath ? '' : 'object_').$picto, '', $pictoisfullpath, 0, 0, '', 'imgTabTitle').' ';

+		$out .= '<span class="tabTitleText">'.dol_trunc($title, $limittitle).'</span>';

@@ -2141 +1228,2 @@
-	if (is_array($links) && !empty($links)) {

+	if (is_array($links) && !empty($links))

+	{

@@ -2143,3 +1231 @@
-		if (count($keys)) {

-			$maxkey = max($keys);

-		}

+		if (count($keys)) $maxkey = max($keys);

@@ -2151,5 +1237,3 @@
-		$limittoshow = (!getDolGlobalString('MAIN_MAXTABS_IN_CARD') ? 99 : $conf->global->MAIN_MAXTABS_IN_CARD);

-	}

-	if (!empty($conf->dol_optimize_smallscreen)) {

-		$limittoshow = 2;

-	}

+		$limittoshow = (empty($conf->global->MAIN_MAXTABS_IN_CARD) ? 99 : $conf->global->MAIN_MAXTABS_IN_CARD);

+	}

+	if (!empty($conf->dol_optimize_smallscreen)) $limittoshow = 2;

@@ -2161 +1245,2 @@
-	for ($i = 0; $i <= $maxkey; $i++) {

+	for ($i = 0; $i <= $maxkey; $i++)

+	{

@@ -2164,7 +1249,6 @@
-			if ($i >= $limittoshow) {

-				$limittoshow--;

-			}

-		}

-	}

-

-	for ($i = 0; $i <= $maxkey; $i++) {

+			if ($i >= $limittoshow) $limittoshow--;

+		}

+	}

+

+	for ($i = 0; $i <= $maxkey; $i++)

+	{

@@ -2173 +1257,2 @@
-		} else {

+		}

+		else {

@@ -2177,6 +1262,7 @@
-		if ($i < $limittoshow || $isactive) {

-			// Output entry with a visible tab

-			$out .= '<div class="inline-block tabsElem'.($isactive ? ' tabsElemActive' : '').((!$isactive && getDolGlobalString('MAIN_HIDE_INACTIVETAB_ON_PRINT')) ? ' hideonprint' : '').'"><!-- id tab = '.(empty($links[$i][2]) ? '' : dol_escape_htmltag($links[$i][2])).' -->';

-

-			if (isset($links[$i][2]) && $links[$i][2] == 'image') {

-				if (!empty($links[$i][0])) {

+		if ($i < $limittoshow || $isactive)

+		{

+			$out .= '<div class="inline-block tabsElem'.($isactive ? ' tabsElemActive' : '').((!$isactive && !empty($conf->global->MAIN_HIDE_INACTIVETAB_ON_PRINT)) ? ' hideonprint' : '').'"><!-- id tab = '.(empty($links[$i][2]) ? '' : $links[$i][2]).' -->';

+			if (isset($links[$i][2]) && $links[$i][2] == 'image')

+			{

+				if (!empty($links[$i][0]))

+				{

@@ -2184 +1270,3 @@
-				} else {

+				}

+				else

+				{

@@ -2187 +1275,3 @@
-			} elseif (!empty($links[$i][1])) {

+			}

+			elseif (!empty($links[$i][1]))

+			{

@@ -2189,7 +1279,4 @@
-				$out .= '<div class="tab tab'.($isactive ? 'active' : 'unactive').'" style="margin: 0 !important">';

-				if (!empty($links[$i][0])) {

-					$titletoshow = preg_replace('/<.*$/', '', $links[$i][1]);

-					$out .= '<a'.(!empty($links[$i][2]) ? ' id="'.$links[$i][2].'"' : '').' class="tab inline-block valignmiddle'.($morecss ? ' '.$morecss : '').(!empty($links[$i][5]) ? ' '.$links[$i][5] : '').'" href="'.$links[$i][0].'" title="'.dol_escape_htmltag($titletoshow).'">';

-				}

-				$out .= $links[$i][1];

-				if (!empty($links[$i][0])) {

+				if ($isactive)

+				{

+					$out .= '<a'.(!empty($links[$i][2]) ? ' id="'.$links[$i][2].'"' : '').' class="tabactive tab inline-block'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">';

+					$out .= $links[$i][1];

@@ -2198,4 +1285,7 @@
-				$out .= empty($links[$i][4]) ? '' : $links[$i][4];

-				$out .= '</div>';

-			}

-

+				else

+				{

+					$out .= '<a'.(!empty($links[$i][2]) ? ' id="'.$links[$i][2].'"' : '').' class="tabunactive tab inline-block'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">';

+					$out .= $links[$i][1];

+					$out .= '</a>'."\n";

+				}

+			}

@@ -2203,3 +1293,6 @@
-		} else {

-			// Add entry into the combo popup with the other tabs

-			if (!$popuptab) {

+		}

+		else

+		{

+			// The popup with the other tabs

+			if (!$popuptab)

+			{

@@ -2210,2 +1303,3 @@
-			if (isset($links[$i][2]) && $links[$i][2] == 'image') {

-				if (!empty($links[$i][0])) {

+			if (isset($links[$i][2]) && $links[$i][2] == 'image')

+			{

+				if (!empty($links[$i][0]))

@@ -2213 +1307 @@
-				} else {

+				else

@@ -2215,2 +1309,3 @@
-				}

-			} elseif (!empty($links[$i][1])) {

+			}

+			elseif (!empty($links[$i][1]))

+			{

@@ -2218 +1313 @@
-				$outmore .= preg_replace('/([a-z])\|([a-z])/i', '\\1 | \\2', $links[$i][1]); // Replace x|y with x | y to allow wrap on long composed texts.

+				$outmore .= preg_replace('/([a-z])\/([a-z])/i', '\\1 / \\2', $links[$i][1]); // Replace x/y with x / y to allow wrap on long composed texts.

@@ -2227,5 +1322,4 @@
-	if ($popuptab) {

-		$outmore .= '</div>';

-	}

-

-	if ($popuptab) {	// If there is some tabs not shown

+	if ($popuptab) $outmore .= '</div>';

+

+	if ($popuptab)	// If there is some tabs not shown

+	{

@@ -2234,9 +1328,5 @@
-		$widthofpopup = 200;

-

-		$tabsname = $moretabssuffix;

-		if (empty($tabsname)) {

-			$tabsname = str_replace("@", "", $picto);

-		}

-		$out .= '<div id="moretabs'.$tabsname.'" class="inline-block tabsElem valignmiddle">';

-		$out .= '<div class="tab valignmiddle"><a href="#" class="tab moretab inline-block tabunactive valignmiddle"><span class="hideonsmartphone">'.$langs->trans("More").'</span>... ('.$nbintab.')</a></div>'; // Do not use "reposition" class in the "More".

-		$out .= '<div id="moretabsList'.$tabsname.'" style="width: '.$widthofpopup.'px; position: absolute; '.$left.': -999em; text-align: '.$left.'; margin:0px; padding:2px; z-index:10;">';

+

+		$tabsname = str_replace("@", "", $picto);

+		$out .= '<div id="moretabs'.$tabsname.'" class="inline-block tabsElem">';

+		$out .= '<a href="#" class="tab moretab inline-block tabunactive reposition">'.$langs->trans("More").'... ('.$nbintab.')</a>';

+		$out .= '<div id="moretabsList'.$tabsname.'" style="position: absolute; '.$left.': -999em; text-align: '.$left.'; margin:0px; padding:2px; z-index:10;">';

@@ -2248,10 +1338,2 @@
-		$out .= '<script nonce="'.getNonce().'">';

-		$out .= "$('#moretabs".$tabsname."').mouseenter( function() {

-			var x = this.offsetLeft, y = this.offsetTop;

-			console.log('mouseenter ".$left." x='+x+' y='+y+' window.innerWidth='+window.innerWidth);

-			if ((window.innerWidth - x) < ".($widthofpopup + 10).") {

-				$('#moretabsList".$tabsname."').css('".$right."','8px');

-			}

-			$('#moretabsList".$tabsname."').css('".$left."','auto');

-			});

-		";

+		$out .= "<script>";

+		$out .= "$('#moretabs".$tabsname."').mouseenter( function() { console.log('mouseenter ".$left."'); $('#moretabsList".$tabsname."').css('".$left."','auto');});";

@@ -2266,7 +1348,2 @@
-	if (!$notab || $notab == -1 || $notab == -2 || $notab == -3) {

-		$out .= "\n".'<div id="dragDropAreaTabBar" class="tabBar'.($notab == -1 ? '' : ($notab == -2 ? ' tabBarNoTop' : (($notab == -3 ? ' noborderbottom' : '').' tabBarWithBottom'))).'">'."\n";

-	}

-	if (!empty($dragdropfile)) {

-		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

-		$out .= dragAndDropFileUpload("dragDropAreaTabBar");

-	}

+	if (!$notab || $notab == -1 || $notab == -2) $out .= "\n".'<div class="tabBar'.($notab == -1 ? '' : ($notab == -2 ? ' tabBarNoTop' : ' tabBarWithBottom')).'">'."\n";

+

@@ -2275 +1352,2 @@
-	if ($reshook > 0) {

+	if ($reshook > 0)

+	{

@@ -2287 +1364,0 @@
- *  @deprecated Use print dol_get_fiche_end() instead

@@ -2302,5 +1379,2 @@
-	if (!$notab || $notab == -1) {

-		return "\n</div>\n";

-	} else {

-		return '';

-	}

+	if (!$notab || $notab == -1) return "\n</div>\n";

+	else return '';

@@ -2319 +1393 @@
- *  @param	string	$morehtmlref  	More html to show after the ref (see $morehtmlleft for before)

+ *  @param	string	$morehtmlref  	More html to show after ref

@@ -2322 +1396 @@
- *	@param	string	$morehtmlleft	More html code to show before the ref (see $morehtmlref for after)

+ *	@param	string	$morehtmlleft	More html code to show before ref

@@ -2330 +1404 @@
-	global $conf, $form, $user, $langs, $hookmanager, $action;

+	global $conf, $form, $user, $langs;

@@ -2337,4 +1411,2 @@
-	$showbarcode = empty($conf->barcode->enabled) ? 0 : (empty($object->barcode) ? 0 : 1);

-	if (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !$user->hasRight('barcode', 'lire_advance')) {

-		$showbarcode = 0;

-	}

+	$showbarcode = empty($conf->barcode->enabled) ? 0 : ($object->barcode ? 1 : 0);

+	if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode = 0;

@@ -2343,25 +1415,23 @@
-	if ($object->element == 'societe' || $object->element == 'contact' || $object->element == 'product' || $object->element == 'ticket') {

-		$modulepart = $object->element;

-	} elseif ($object->element == 'member') {

-		$modulepart = 'memberphoto';

-	} elseif ($object->element == 'user') {

-		$modulepart = 'userphoto';

-	}

-

-	if (class_exists("Imagick")) {

-		if ($object->element == 'expensereport' || $object->element == 'propal' || $object->element == 'commande' || $object->element == 'facture' || $object->element == 'supplier_proposal') {

-			$modulepart = $object->element;

-		} elseif ($object->element == 'fichinter') {

-			$modulepart = 'ficheinter';

-		} elseif ($object->element == 'contrat') {

-			$modulepart = 'contract';

-		} elseif ($object->element == 'order_supplier') {

-			$modulepart = 'supplier_order';

-		} elseif ($object->element == 'invoice_supplier') {

-			$modulepart = 'supplier_invoice';

-		}

-	}

-

-	if ($object->element == 'product') {

-		$width = 80;

-		$cssclass = 'photowithmargin photoref';

+	if ($object->element == 'societe')         $modulepart = 'societe';

+	if ($object->element == 'contact')         $modulepart = 'contact';

+	if ($object->element == 'member')          $modulepart = 'memberphoto';

+	if ($object->element == 'user')            $modulepart = 'userphoto';

+	if ($object->element == 'product')         $modulepart = 'product';

+	if ($object->element == 'ticket')          $modulepart = 'ticket';

+

+	if (class_exists("Imagick"))

+	{

+		if ($object->element == 'propal')            $modulepart = 'propal';

+		if ($object->element == 'commande')          $modulepart = 'commande';

+		if ($object->element == 'facture')           $modulepart = 'facture';

+		if ($object->element == 'fichinter')         $modulepart = 'ficheinter';

+		if ($object->element == 'contrat')           $modulepart = 'contract';

+		if ($object->element == 'supplier_proposal') $modulepart = 'supplier_proposal';

+		if ($object->element == 'order_supplier')    $modulepart = 'supplier_order';

+		if ($object->element == 'invoice_supplier')  $modulepart = 'supplier_invoice';

+		if ($object->element == 'expensereport')     $modulepart = 'expensereport';

+	}

+

+	if ($object->element == 'product')

+	{

+		$width = 80; $cssclass = 'photoref';

@@ -2370,7 +1440,5 @@
-		if ($conf->browser->layout == 'phone') {

-			$maxvisiblephotos = 1;

-		}

-		if ($showimage) {

-			$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$object->show_photos('product', $conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, 0, $width, 0, '').'</div>';

-		} else {

-			if (getDolGlobalString('PRODUCT_NODISPLAYIFNOPHOTO')) {

+		if ($conf->browser->layout == 'phone') $maxvisiblephotos = 1;

+		if ($showimage) $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$object->show_photos('product', $conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0).'</div>';

+		else

+		{

+			if (!empty($conf->global->PRODUCT_NODISPLAYIFNOPHOTO)) {

@@ -2379 +1447,2 @@
-			} else {    // Show no photo link

+			}

+			else {    // Show no photo link

@@ -2381,6 +1450,7 @@
-				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" title="'.dol_escape_htmltag($langs->trans("UploadAnImageToSeeAPhotoHere", $langs->transnoentitiesnoconv("Documents"))).'" alt="No photo"'.($width ? ' style="width: '.$width.'px"' : '').' src="'.DOL_URL_ROOT.$nophoto.'"></div>';

-			}

-		}

-	} elseif ($object->element == 'ticket') {

-		$width = 80;

-		$cssclass = 'photoref';

+				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo"'.($width ? ' style="width: '.$width.'px"' : '').' src="'.DOL_URL_ROOT.$nophoto.'"></div>';

+			}

+		}

+	}

+	elseif ($object->element == 'ticket')

+	{

+		$width = 80; $cssclass = 'photoref';

@@ -2389,5 +1459,3 @@
-		if ($conf->browser->layout == 'phone') {

-			$maxvisiblephotos = 1;

-		}

-

-		if ($showimage) {

+		if ($conf->browser->layout == 'phone') $maxvisiblephotos = 1;

+		if ($showimage)

+		{

@@ -2395 +1463,2 @@
-			if ($object->nbphoto > 0) {

+			if ($object->nbphoto > 0)

+			{

@@ -2397 +1466,3 @@
-			} else {

+			}

+			else

+			{

@@ -2401,2 +1472,3 @@
-		if (!$showimage) {

-			if (getDolGlobalString('TICKET_NODISPLAYIFNOPHOTO')) {

+		if (!$showimage)

+		{

+			if (!empty($conf->global->TICKET_NODISPLAYIFNOPHOTO)) {

@@ -2405,11 +1477,13 @@
-			} else {    // Show no photo link

-				$nophoto = img_picto('No photo', 'object_ticket');

-				$morehtmlleft .= '<!-- No photo to show -->';

-				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';

-				$morehtmlleft .= $nophoto;

-				$morehtmlleft .= '</div></div>';

-			}

-		}

-	} else {

-		if ($showimage) {

-			if ($modulepart != 'unknown') {

+			}

+			else {    // Show no photo link

+				$nophoto = '/public/theme/common/nophoto.png';

+				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo" border="0"'.($width ? ' style="width: '.$width.'px"' : '').' src="'.DOL_URL_ROOT.$nophoto.'"></div>';

+			}

+		}

+	}

+	else

+	{

+		if ($showimage)

+		{

+			if ($modulepart != 'unknown')

+			{

@@ -2418 +1492,2 @@
-				if (in_array($modulepart, array('propal', 'commande', 'facture', 'ficheinter', 'contract', 'supplier_order', 'supplier_proposal', 'supplier_invoice', 'expensereport')) && class_exists("Imagick")) {

+				if (in_array($modulepart, array('propal', 'commande', 'facture', 'ficheinter', 'contract', 'supplier_order', 'supplier_proposal', 'supplier_invoice', 'expensereport')) && class_exists("Imagick"))

+				{

@@ -2421 +1496,2 @@
-					if (in_array($modulepart, array('invoice_supplier', 'supplier_invoice'))) {

+					if (in_array($modulepart, array('invoice_supplier', 'supplier_invoice')))

+					{

@@ -2424 +1500,3 @@
-					} else {

+					}

+					else

+					{

@@ -2427,3 +1505 @@
-					if (empty($subdir)) {

-						$subdir = 'errorgettingsubdirofobject'; // Protection to avoid to return empty path

-					}

+					if (empty($subdir)) $subdir = 'errorgettingsubdirofobject'; // Protection to avoid to return empty path

@@ -2443 +1519,2 @@
-					if ($pdfexists) {

+					if ($pdfexists)

+					{

@@ -2445,2 +1522,4 @@
-						if (!file_exists($fileimage) || (filemtime($fileimage) < filemtime($filepdf))) {

-							if (!getDolGlobalString('MAIN_DISABLE_PDF_THUMBS')) {		// If you experience trouble with pdf thumb generation and imagick, you can disable here.

+						if (!file_exists($fileimage) || (filemtime($fileimage) < filemtime($filepdf)))

+						{

+							if (empty($conf->global->MAIN_DISABLE_PDF_THUMBS))		// If you experience trouble with pdf thumb generation and imagick, you can disable here.

+							{

@@ -2449,3 +1528 @@
-								if ($ret < 0) {

-									$error++;

-								}

+								if ($ret < 0) $error++;

@@ -2456,5 +1533,4 @@
-					if ($pdfexists && !$error) {

-						$heightforphotref = 80;

-						if (!empty($conf->dol_optimize_smallscreen)) {

-							$heightforphotref = 60;

-						}

+					if ($pdfexists && !$error)

+					{

+						$heightforphotref = 70;

+						if (!empty($conf->dol_optimize_smallscreen)) $heightforphotref = 60;

@@ -2462,4 +1538,5 @@
-						if (file_exists($fileimage)) {

-							$phototoshow = '<div class="photoref">';

-							$phototoshow .= '<img height="'.$heightforphotref.'" class="photo photowithborder" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($relativepathimage).'">';

-							$phototoshow .= '</div>';

+						if (file_exists($fileimage))

+						{

+							$phototoshow = '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';

+							$phototoshow .= '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($relativepathimage).'">';

+							$phototoshow .= '</div></div>';

@@ -2468,2 +1544,0 @@
-				} elseif (!$phototoshow) { // example if modulepart = 'societe' or 'photo'

-					$phototoshow .= $form->showphoto($modulepart, $object, 0, 0, 0, 'photowithmargin photoref', 'small', 1, 0, $maxvisiblephotos);

@@ -2471,2 +1546,7 @@
-

-				if ($phototoshow) {

+				elseif (!$phototoshow)

+				{

+					$phototoshow .= $form->showphoto($modulepart, $object, 0, 0, 0, 'photoref', 'small', 1, 0, $maxvisiblephotos);

+				}

+

+				if ($phototoshow)

+				{

@@ -2479,2 +1559,5 @@
-			if (empty($phototoshow)) {      // Show No photo link (picto of object)

-				if ($object->element == 'action') {

+			if (!$phototoshow)      // Show No photo link (picto of object)

+			{

+			    $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">';

+				if ($object->element == 'action')

+				{

@@ -2484,3 +1567,4 @@
-				} else {

-					$width = 14;

-					$cssclass = 'photorefcenter';

+				}

+				else

+				{

+					$width = 14; $cssclass = 'photorefcenter';

@@ -2488,8 +1572,2 @@
-					$prefix = 'object_';

-					if ($object->element == 'project' && !$object->public) {

-						$picto = 'project'; // instead of projectpub

-					}

-					if (strpos($picto, 'fontawesome_') !== false) {

-						$prefix = '';

-					}

-					$nophoto = img_picto('No photo', $prefix.$picto);

+					if ($object->element == 'project' && !$object->public) $picto = 'project'; // instead of projectpub

+					$nophoto = img_picto('No photo', 'object_'.$picto);

@@ -2501,13 +1579,15 @@
-			}

-		}

-	}

-

-	// Show barcode

-	if ($showbarcode) {

-		$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$form->showbarcode($object, 100, 'photoref valignmiddle').'</div>';

-	}

-

-	if ($object->element == 'societe') {

-		if (!empty($conf->use_javascript_ajax) && $user->hasRight('societe', 'creer') && getDolGlobalString('MAIN_DIRECT_STATUS_UPDATE')) {

-			$morehtmlstatus .= ajax_object_onoff($object, 'status', 'status', 'InActivity', 'ActivityCeased');

-		} else {

+

+				$morehtmlleft .= '</div>';

+			}

+		}

+	}

+

+	if ($showbarcode) $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$form->showbarcode($object).'</div>';

+

+	if ($object->element == 'societe')

+	{

+		if (!empty($conf->use_javascript_ajax) && $user->rights->societe->creer && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE))

+		{

+		   	$morehtmlstatus .= ajax_object_onoff($object, 'status', 'status', 'InActivity', 'ActivityCeased');

+		}

+		else {

@@ -2516 +1596,3 @@
-	} elseif ($object->element == 'product') {

+	}

+	elseif ($object->element == 'product')

+	{

@@ -2518 +1600 @@
-		if (!empty($conf->use_javascript_ajax) && $user->hasRight('produit', 'creer') && getDolGlobalString('MAIN_DIRECT_STATUS_UPDATE')) {

+		if (!empty($conf->use_javascript_ajax) && $user->rights->produit->creer && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {

@@ -2525 +1607 @@
-		if (!empty($conf->use_javascript_ajax) && $user->hasRight('produit', 'creer') && getDolGlobalString('MAIN_DIRECT_STATUS_UPDATE')) {

+		if (!empty($conf->use_javascript_ajax) && $user->rights->produit->creer && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {

@@ -2530,5 +1612,5 @@
-	} elseif (in_array($object->element, array('salary'))) {

-		$tmptxt = $object->getLibStatut(6, $object->alreadypaid);

-		if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3)) {

-			$tmptxt = $object->getLibStatut(5, $object->alreadypaid);

-		}

+	}

+	elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier', 'chargesociales', 'loan')))

+	{

+		$tmptxt = $object->getLibStatut(6, $object->totalpaye);

+		if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3)) $tmptxt = $object->getLibStatut(5, $object->totalpaye);

@@ -2536,19 +1618,13 @@
-	} elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier', 'chargesociales', 'loan', 'tva'))) {	// TODO Move this to use ->alreadypaid

-		$tmptxt = $object->getLibStatut(6, $object->totalpaid);

-		if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3)) {

-			$tmptxt = $object->getLibStatut(5, $object->totalpaid);

-		}

-		$morehtmlstatus .= $tmptxt;

-	} elseif ($object->element == 'contrat' || $object->element == 'contract') {

-		if ($object->statut == 0) {

-			$morehtmlstatus .= $object->getLibStatut(5);

-		} else {

-			$morehtmlstatus .= $object->getLibStatut(4);

-		}

-	} elseif ($object->element == 'facturerec') {

-		if ($object->frequency == 0) {

-			$morehtmlstatus .= $object->getLibStatut(2);

-		} else {

-			$morehtmlstatus .= $object->getLibStatut(5);

-		}

-	} elseif ($object->element == 'project_task') {

+	}

+	elseif ($object->element == 'contrat' || $object->element == 'contract')

+	{

+		if ($object->statut == 0) $morehtmlstatus .= $object->getLibStatut(5);

+		else $morehtmlstatus .= $object->getLibStatut(4);

+	}

+	elseif ($object->element == 'facturerec')

+	{

+		if ($object->frequency == 0) $morehtmlstatus .= $object->getLibStatut(2);

+		else $morehtmlstatus .= $object->getLibStatut(5);

+	}

+	elseif ($object->element == 'project_task')

+	{

@@ -2556,6 +1632,2 @@
-		if ($object->progress > 0) {

-			$object->fk_statut = 2;

-		}

-		if ($object->progress >= 100) {

-			$object->fk_statut = 3;

-		}

+		if ($object->progress > 0) $object->fk_statut = 2;

+		if ($object->progress >= 100) $object->fk_statut = 3;

@@ -2564 +1636,2 @@
-	} elseif (method_exists($object, 'getLibStatut')) { // Generic case for status

+	}

+	else { // Generic case

@@ -2566,3 +1639 @@
-		if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3)) {

-			$tmptxt = $object->getLibStatut(5);

-		}

+		if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3)) $tmptxt = $object->getLibStatut(5);

@@ -2573,3 +1644,4 @@
-	if (isModEnabled('accounting') && in_array($object->element, array('bank', 'paiementcharge', 'facture', 'invoice', 'invoice_supplier', 'expensereport', 'payment_various'))) {

-		// Note: For 'chargesociales', 'salaries'... this is the payments that are dispatched (so element = 'bank')

-		if (method_exists($object, 'getVentilExportCompta')) {

+	if (!empty($conf->accounting->enabled) && in_array($object->element, array('bank', 'facture', 'invoice', 'invoice_supplier', 'expensereport', 'payment_various')))

+	{

+		if (method_exists($object, 'getVentilExportCompta'))

+		{

@@ -2583,3 +1655 @@
-	if (!empty($object->name_alias)) {

-		$morehtmlref .= '<div class="refidno opacitymedium">'.dol_escape_htmltag($object->name_alias).'</div>';

-	}

+	if (!empty($object->name_alias)) $morehtmlref .= '<div class="refidno">'.$object->name_alias.'</div>';

@@ -2588,9 +1658,8 @@
-	if (in_array($object->element, array('product', 'bank_account', 'project_task'))) {

-		if (!empty($object->label)) {

-			$morehtmlref .= '<div class="refidno opacitymedium">'.$object->label.'</div>';

-		}

-	}

-

-	// Show address and email

-	if (method_exists($object, 'getBannerAddress') && !in_array($object->element, array('product', 'bookmark', 'ecm_directories', 'ecm_files'))) {

-		$moreaddress = $object->getBannerAddress('refaddress', $object);	// address, email, url, social networks

+	if (in_array($object->element, array('product', 'bank_account', 'project_task')))

+	{

+		if (!empty($object->label)) $morehtmlref .= '<div class="refidno">'.$object->label.'</div>';

+	}

+

+	if (method_exists($object, 'getBannerAddress') && !in_array($object->element, array('product', 'bookmark', 'ecm_directories', 'ecm_files')))

+	{

+		$moreaddress = $object->getBannerAddress('refaddress', $object);

@@ -2598 +1667 @@
-			$morehtmlref .= '<div class="refidno refaddress">';

+			$morehtmlref .= '<div class="refidno">';

@@ -2603,4 +1672,4 @@
-	if (getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && (getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') == '1' || preg_match('/'.preg_quote($object->element, '/').'/i', $conf->global->MAIN_SHOW_TECHNICAL_ID)) && !empty($object->id)) {

-		$morehtmlref .= '<div style="clear: both;"></div>';

-		$morehtmlref .= '<div class="refidno opacitymedium">';

-		$morehtmlref .= $langs->trans("TechnicalID").': '.((int) $object->id);

+	if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && ($conf->global->MAIN_SHOW_TECHNICAL_ID == '1' || preg_match('/'.preg_quote($object->element, '/').'/i', $conf->global->MAIN_SHOW_TECHNICAL_ID)) && !empty($object->id))

+	{

+		$morehtmlref .= '<div style="clear: both;"></div><div class="refidno">';

+		$morehtmlref .= $langs->trans("TechnicalID").': '.$object->id;

@@ -2608,10 +1676,0 @@
-	}

-

-	$parameters=array('morehtmlref'=>$morehtmlref);

-	$reshook = $hookmanager->executeHooks('formDolBanner', $parameters, $object, $action);

-	if ($reshook < 0) {

-		setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

-	} elseif (empty($reshook)) {

-		$morehtmlref .= $hookmanager->resPrint;

-	} elseif ($reshook > 0) {

-		$morehtmlref = $hookmanager->resPrint;

@@ -2639,3 +1698 @@
-	if ($fieldrequired) {

-		$ret .= '<span class="fieldrequired">';

-	}

+	if ($fieldrequired) $ret .= '<span class="fieldrequired">';

@@ -2645,3 +1702 @@
-	if ($fieldrequired) {

-		$ret .= '</span>';

-	}

+	if ($fieldrequired) $ret .= '</span>';

@@ -2662,3 +1717 @@
-	if ($moreclass) {

-		$ret = preg_replace('/class=\"/', 'class="'.$moreclass.' ', $ret);

-	}

+	if ($moreclass) $ret = preg_replace('/class=\"/', 'class="'.$moreclass.' ', $ret);

@@ -2674 +1727 @@
- *      @param	string		$sep			Separator to use to separate info when building string

+ *      @param	string		$sep			Separator to use to build string

@@ -2683 +1736 @@
-	global $conf, $langs, $hookmanager;

+	global $conf, $langs;

@@ -2686 +1739 @@
-	$countriesusingstate = array('AU', 'CA', 'US', 'IN', 'GB', 'ES', 'UK', 'TR', 'CN'); // See also MAIN_FORCE_STATE_INTO_ADDRESS

+	$countriesusingstate = array('AU', 'CA', 'US', 'IN', 'GB', 'ES', 'UK', 'TR'); // See also MAIN_FORCE_STATE_INTO_ADDRESS

@@ -2691 +1744 @@
-		$ret .= ($extralangcode ? $object->array_languages['address'][$extralangcode] : (empty($object->address) ? '' : preg_replace('/(\r\n|\r|\n)+/', $sep, $object->address)));

+		$ret .= ($extralangcode ? $object->array_languages['address'][$extralangcode] : $object->address);

@@ -2694,14 +1747,3 @@
-	if (isset($object->country_code) && in_array($object->country_code, array('AU', 'CA', 'US', 'CN')) || getDolGlobalString('MAIN_FORCE_STATE_INTO_ADDRESS')) {

-		// US: title firstname name \n address lines \n town, state, zip \n country

-		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : (empty($object->town) ? '' : $object->town));

-		$ret .= (($ret && $town) ? $sep : '').$town;

-

-		if (!empty($object->state)) {

-			$ret .= ($ret ? ($town ? ", " : $sep) : '').$object->state;

-		}

-		if (!empty($object->zip)) {

-			$ret .= ($ret ? (($town || $object->state) ? ", " : $sep) : '').$object->zip;

-		}

-	} elseif (isset($object->country_code) && in_array($object->country_code, array('GB', 'UK'))) {

-		// UK: title firstname name \n address lines \n town state \n zip \n country

-		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : (empty($object->town) ? '' : $object->town));

+	if (in_array($object->country_code, array('AU', 'CA', 'US')) || !empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS))   	// US: title firstname name \n address lines \n town, state, zip \n country

+	{

+		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);

@@ -2709 +1751,2 @@
-		if (!empty($object->state)) {

+		if ($object->state)

+		{

@@ -2712,5 +1755,14 @@
-		if (!empty($object->zip)) {

-			$ret .= ($ret ? $sep : '').$object->zip;

-		}

-	} elseif (isset($object->country_code) && in_array($object->country_code, array('ES', 'TR'))) {

-		// ES: title firstname name \n address lines \n zip town \n state \n country

+		if ($object->zip) $ret .= ($ret ? ", " : '').$object->zip;

+	}

+	elseif (in_array($object->country_code, array('GB', 'UK'))) // UK: title firstname name \n address lines \n town state \n zip \n country

+	{

+		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);

+		$ret .= ($ret ? $sep : '').$town;

+		if ($object->state)

+		{

+			$ret .= ($ret ? ", " : '').$object->state;

+		}

+		if ($object->zip) $ret .= ($ret ? $sep : '').$object->zip;

+	}

+	elseif (in_array($object->country_code, array('ES', 'TR'))) // ES: title firstname name \n address lines \n zip town \n state \n country

+	{

@@ -2718 +1770 @@
-		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : (empty($object->town) ? '' : $object->town));

+		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);

@@ -2720,10 +1772,7 @@
-		if (!empty($object->state)) {

-			$ret .= $sep.$object->state;

-		}

-	} elseif (isset($object->country_code) && in_array($object->country_code, array('JP'))) {

-		// JP: In romaji, title firstname name\n address lines \n [state,] town zip \n country

-		// See https://www.sljfaq.org/afaq/addresses.html

-		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : (empty($object->town) ? '' : $object->town));

-		$ret .= ($ret ? $sep : '').($object->state ? $object->state.', ' : '').$town.($object->zip ? ' ' : '').$object->zip;

-	} elseif (isset($object->country_code) && in_array($object->country_code, array('IT'))) {

-		// IT: title firstname name\n address lines \n zip town state_code \n country

+		if ($object->state)

+		{

+			$ret .= "\n".$object->state;

+		}

+	}

+	elseif (in_array($object->country_code, array('IT'))) // IT: tile firstname name\n address lines \n zip (Code Departement) \n country

+	{

@@ -2731 +1780 @@
-		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : (empty($object->town) ? '' : $object->town));

+		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);

@@ -2733,5 +1782,6 @@
-		$ret .= (empty($object->state_code) ? '' : (' '.$object->state_code));

-	} else {

-		// Other: title firstname name \n address lines \n zip town[, state] \n country

-		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : (empty($object->town) ? '' : $object->town));

-		$ret .= !empty($object->zip) ? (($ret ? $sep : '').$object->zip) : '';

+		$ret .= ($object->state_code ? (' '.($object->state_code)) : '');

+	}

+	else                                        		// Other: title firstname name \n address lines \n zip town \n country

+	{

+		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);

+		$ret .= $object->zip ? (($ret ? $sep : '').$object->zip) : '';

@@ -2739 +1789,2 @@
-		if (!empty($object->state) && in_array($object->country_code, $countriesusingstate)) {

+		if ($object->state && in_array($object->country_code, $countriesusingstate))

+		{

@@ -2743,5 +1794,3 @@
-

-	if (!is_object($outputlangs)) {

-		$outputlangs = $langs;

-	}

-	if ($withcountry) {

+	if (!is_object($outputlangs)) $outputlangs = $langs;

+	if ($withcountry)

+	{

@@ -2749,9 +1798 @@
-		$ret .= (empty($object->country_code) ? '' : ($ret ? $sep : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->country_code)));

-	}

-	if ($hookmanager) {

-		$parameters = array('withcountry' => $withcountry, 'sep' => $sep, 'outputlangs' => $outputlangs,'mode' => $mode, 'extralangcode' => $extralangcode);

-		$reshook = $hookmanager->executeHooks('formatAddress', $parameters, $object);

-		if ($reshook > 0) {

-			$ret = '';

-		}

-		$ret .= $hookmanager->resPrint;

+		$ret .= ($object->country_code ? ($ret ? $sep : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->country_code)) : '');

@@ -2777,3 +1818,2 @@
-	} else {

-		return 'Error date into a not supported range';

-	}

+	}

+	else return 'Error date into a not supported range';

@@ -2792 +1832 @@
- *										"day", "daytext", "dayhour", "dayhourldap", "dayhourtext", "dayrfc", "dayhourrfc", "...inputnoreduce", "...reduceformat"

+ *										"day", "daytext", "dayhour", "dayhourldap", "dayhourtext", "dayrfc", "dayhourrfc", "...reduceformat"

@@ -2796 +1836 @@
- *                                      'tzuserrel' => output string is for user TZ (current browser TZ with dst or not, depending on date position)

+ *                                      'tzuserrel' => output string is for user TZ (current browser TZ with dst or not, depending on date position) (TODO not implemented yet)

@@ -2801,3 +1841,3 @@
- *  @see        dol_mktime(), dol_stringtotime(), dol_getdate(), selectDate()

- */

-function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs = '', $encodetooutput = false)

+ *  @see        dol_mktime(), dol_stringtotime(), dol_getdate()

+ */

+function dol_print_date($time, $format = '', $tzoutput = 'tzserver', $outputlangs = '', $encodetooutput = false)

@@ -2806,9 +1845,0 @@
-

-	// If date undefined or "", we return ""

-	if (dol_strlen($time) == 0) {

-		return ''; // $time=0 allowed (it means 01/01/1970 00:00:00)

-	}

-

-	if ($tzoutput === 'auto') {

-		$tzoutput = (empty($conf) ? 'tzserver' : (isset($conf->tzuserinputkey) ? $conf->tzuserinputkey : 'tzserver'));

-	}

@@ -2819 +1850,2 @@
-	if ($tzoutput) {

+	if ($tzoutput)

+	{

@@ -2821,2 +1853,4 @@
-		if (is_string($tzoutput)) {

-			if ($tzoutput == 'tzserver') {

+		if (is_string($tzoutput))

+		{

+			if ($tzoutput == 'tzserver')

+			{

@@ -2825,3 +1859,5 @@
-				$offsettz = 0;	// Timezone offset with server timezone (because to_gmt is false), so 0

-				$offsetdst = 0;	// Dst offset with server timezone (because to_gmt is false), so 0

-			} elseif ($tzoutput == 'tzuser' || $tzoutput == 'tzuserrel') {

+				$offsettz = 0;

+				$offsetdst = 0;

+			}

+			elseif ($tzoutput == 'tzuser' || $tzoutput == 'tzuserrel')

+			{

@@ -2830,25 +1866,8 @@
-

-				if (class_exists('DateTimeZone')) {

-					$user_date_tz = new DateTimeZone($offsettzstring);

-					$user_dt = new DateTime();

-					$user_dt->setTimezone($user_date_tz);

-					$user_dt->setTimestamp($tzoutput == 'tzuser' ? dol_now() : (int) $time);

-					$offsettz = $user_dt->getOffset();	// should include dst ?

-				} else {	// with old method (The 'tzuser' was processed like the 'tzuserrel')

-					$offsettz = (empty($_SESSION['dol_tz']) ? 0 : $_SESSION['dol_tz']) * 60 * 60; // Will not be used anymore

-					$offsetdst = (empty($_SESSION['dol_dst']) ? 0 : $_SESSION['dol_dst']) * 60 * 60; // Will not be used anymore

-				}

-			}

-		}

-	}

-	if (!is_object($outputlangs)) {

-		$outputlangs = $langs;

-	}

-	if (!$format) {

-		$format = 'daytextshort';

-	}

-

-	// Do we have to reduce the length of date (year on 2 chars) to save space.

-	// Note: dayinputnoreduce is same than day but no reduction of year length will be done

-	$reduceformat = (!empty($conf->dol_optimize_smallscreen) && in_array($format, array('day', 'dayhour', 'dayhoursec'))) ? 1 : 0;	// Test on original $format param.

-	$format = preg_replace('/inputnoreduce/', '', $format);	// so format 'dayinputnoreduce' is processed like day

+				$offsettz = (empty($_SESSION['dol_tz']) ? 0 : $_SESSION['dol_tz']) * 60 * 60; // Will not be used anymore

+				$offsetdst = (empty($_SESSION['dol_dst']) ? 0 : $_SESSION['dol_dst']) * 60 * 60; // Will not be used anymore

+			}

+		}

+	}

+	if (!is_object($outputlangs)) $outputlangs = $langs;

+	if (!$format) $format = 'daytextshort';

+	$reduceformat = (!empty($conf->dol_optimize_smallscreen) && in_array($format, array('day', 'dayhour'))) ? 1 : 0;

@@ -2856,4 +1875 @@
-	if ($formatwithoutreduce != $format) {

-		$format = $formatwithoutreduce;

-		$reduceformat = 1;

-	}  // so format 'dayreduceformat' is processed like day

+	if ($formatwithoutreduce != $format) { $format = $formatwithoutreduce; $reduceformat = 1; }  // so format 'dayreduceformat' is processed like day

@@ -2863,39 +1879,20 @@
-	if ($format == 'day') {

-		$format = ($outputlangs->trans("FormatDateShort") != "FormatDateShort" ? $outputlangs->trans("FormatDateShort") : $conf->format_date_short);

-	} elseif ($format == 'hour') {

-		$format = ($outputlangs->trans("FormatHourShort") != "FormatHourShort" ? $outputlangs->trans("FormatHourShort") : $conf->format_hour_short);

-	} elseif ($format == 'hourduration') {

-		$format = ($outputlangs->trans("FormatHourShortDuration") != "FormatHourShortDuration" ? $outputlangs->trans("FormatHourShortDuration") : $conf->format_hour_short_duration);

-	} elseif ($format == 'daytext') {

-		$format = ($outputlangs->trans("FormatDateText") != "FormatDateText" ? $outputlangs->trans("FormatDateText") : $conf->format_date_text);

-	} elseif ($format == 'daytextshort') {

-		$format = ($outputlangs->trans("FormatDateTextShort") != "FormatDateTextShort" ? $outputlangs->trans("FormatDateTextShort") : $conf->format_date_text_short);

-	} elseif ($format == 'dayhour') {

-		$format = ($outputlangs->trans("FormatDateHourShort") != "FormatDateHourShort" ? $outputlangs->trans("FormatDateHourShort") : $conf->format_date_hour_short);

-	} elseif ($format == 'dayhoursec') {

-		$format = ($outputlangs->trans("FormatDateHourSecShort") != "FormatDateHourSecShort" ? $outputlangs->trans("FormatDateHourSecShort") : $conf->format_date_hour_sec_short);

-	} elseif ($format == 'dayhourtext') {

-		$format = ($outputlangs->trans("FormatDateHourText") != "FormatDateHourText" ? $outputlangs->trans("FormatDateHourText") : $conf->format_date_hour_text);

-	} elseif ($format == 'dayhourtextshort') {

-		$format = ($outputlangs->trans("FormatDateHourTextShort") != "FormatDateHourTextShort" ? $outputlangs->trans("FormatDateHourTextShort") : $conf->format_date_hour_text_short);

-	} elseif ($format == 'dayhourlog') {

-		// Format not sensitive to language

-		$format = '%Y%m%d%H%M%S';

-	} elseif ($format == 'dayhourlogsmall') {

-		// Format not sensitive to language

-		$format = '%y%m%d%H%M';

-	} elseif ($format == 'dayhourldap') {

-		$format = '%Y%m%d%H%M%SZ';

-	} elseif ($format == 'dayhourxcard') {

-		$format = '%Y%m%dT%H%M%SZ';

-	} elseif ($format == 'dayxcard') {

-		$format = '%Y%m%d';

-	} elseif ($format == 'dayrfc') {

-		$format = '%Y-%m-%d'; // DATE_RFC3339

-	} elseif ($format == 'dayhourrfc') {

-		$format = '%Y-%m-%dT%H:%M:%SZ'; // DATETIME RFC3339

-	} elseif ($format == 'standard') {

-		$format = '%Y-%m-%d %H:%M:%S';

-	}

-

-	if ($reduceformat) {

+	if ($format == 'day')				$format = ($outputlangs->trans("FormatDateShort") != "FormatDateShort" ? $outputlangs->trans("FormatDateShort") : $conf->format_date_short);

+	elseif ($format == 'hour')			$format = ($outputlangs->trans("FormatHourShort") != "FormatHourShort" ? $outputlangs->trans("FormatHourShort") : $conf->format_hour_short);

+	elseif ($format == 'hourduration')	$format = ($outputlangs->trans("FormatHourShortDuration") != "FormatHourShortDuration" ? $outputlangs->trans("FormatHourShortDuration") : $conf->format_hour_short_duration);

+	elseif ($format == 'daytext')			 $format = ($outputlangs->trans("FormatDateText") != "FormatDateText" ? $outputlangs->trans("FormatDateText") : $conf->format_date_text);

+	elseif ($format == 'daytextshort')	$format = ($outputlangs->trans("FormatDateTextShort") != "FormatDateTextShort" ? $outputlangs->trans("FormatDateTextShort") : $conf->format_date_text_short);

+	elseif ($format == 'dayhour')			 $format = ($outputlangs->trans("FormatDateHourShort") != "FormatDateHourShort" ? $outputlangs->trans("FormatDateHourShort") : $conf->format_date_hour_short);

+	elseif ($format == 'dayhoursec')		 $format = ($outputlangs->trans("FormatDateHourSecShort") != "FormatDateHourSecShort" ? $outputlangs->trans("FormatDateHourSecShort") : $conf->format_date_hour_sec_short);

+	elseif ($format == 'dayhourtext')		 $format = ($outputlangs->trans("FormatDateHourText") != "FormatDateHourText" ? $outputlangs->trans("FormatDateHourText") : $conf->format_date_hour_text);

+	elseif ($format == 'dayhourtextshort') $format = ($outputlangs->trans("FormatDateHourTextShort") != "FormatDateHourTextShort" ? $outputlangs->trans("FormatDateHourTextShort") : $conf->format_date_hour_text_short);

+	// Format not sensitive to language

+	elseif ($format == 'dayhourlog')		 $format = '%Y%m%d%H%M%S';

+	elseif ($format == 'dayhourldap')		 $format = '%Y%m%d%H%M%SZ';

+	elseif ($format == 'dayhourxcard')	$format = '%Y%m%dT%H%M%SZ';

+	elseif ($format == 'dayxcard')	 	$format = '%Y%m%d';

+	elseif ($format == 'dayrfc')			 $format = '%Y-%m-%d'; // DATE_RFC3339

+	elseif ($format == 'dayhourrfc')		 $format = '%Y-%m-%dT%H:%M:%SZ'; // DATETIME RFC3339

+	elseif ($format == 'standard')		$format = '%Y-%m-%d %H:%M:%S';

+

+	if ($reduceformat)

+	{

@@ -2905,0 +1903,3 @@
+	// If date undefined or "", we return ""

+	if (dol_strlen($time) == 0) return ''; // $time=0 allowed (it means 01/01/1970 00:00:00)

+

@@ -2907 +1907,2 @@
-	if (preg_match('/%b/i', $format)) {		// There is some text to translate

+	if (preg_match('/%b/i', $format))		// There is some text to translate

+	{

@@ -2912 +1913,2 @@
-	if (preg_match('/%a/i', $format)) {		// There is some text to translate

+	if (preg_match('/%a/i', $format))		// There is some text to translate

+	{

@@ -2917,0 +1920 @@
+

@@ -2920,37 +1923,23 @@
-	if (preg_match('/^([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])$/i', $time, $reg)) {	// Deprecated. Ex: 1970-01-01, 1970-01-01 01:00:00, 19700101010000

-		dol_print_error('', "Functions.lib::dol_print_date function called with a bad value from page ".(empty($_SERVER["PHP_SELF"]) ? 'unknown' : $_SERVER["PHP_SELF"]));

-		return '';

-	} elseif (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+) ?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i', $time, $reg)) {    // Still available to solve problems in extrafields of type date

-		// This part of code should not be used anymore.

-		dol_syslog("Functions.lib::dol_print_date function called with a bad value from page ".(empty($_SERVER["PHP_SELF"]) ? 'unknown' : $_SERVER["PHP_SELF"]), LOG_WARNING);

-		//if (function_exists('debug_print_backtrace')) debug_print_backtrace();

-		// Date has format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM:SS'

-		$syear	= (!empty($reg[1]) ? $reg[1] : '');

-		$smonth = (!empty($reg[2]) ? $reg[2] : '');

-		$sday	= (!empty($reg[3]) ? $reg[3] : '');

-		$shour	= (!empty($reg[4]) ? $reg[4] : '');

-		$smin	= (!empty($reg[5]) ? $reg[5] : '');

-		$ssec	= (!empty($reg[6]) ? $reg[6] : '');

-

-		$time = dol_mktime($shour, $smin, $ssec, $smonth, $sday, $syear, true);

-

-		if ($to_gmt) {

-			$tzo = new DateTimeZone('UTC');	// when to_gmt is true, base for offsettz and offsetdst (so timetouse) is UTC

-		} else {

-			$tzo = new DateTimeZone(date_default_timezone_get());	// when to_gmt is false, base for offsettz and offsetdst (so timetouse) is PHP server

-		}

-		$dtts = new DateTime();

-		$dtts->setTimestamp($time);

-		$dtts->setTimezone($tzo);

-		$newformat = str_replace(

-			array('%Y', '%y', '%m', '%d', '%H', '%I', '%M', '%S', '%p', 'T', 'Z', '__a__', '__A__', '__b__', '__B__'),

-			array('Y', 'y', 'm', 'd', 'H', 'h', 'i', 's', 'A', '__£__', '__$__', '__{__', '__}__', '__[__', '__]__'),

-			$format

-		);

-		$ret = $dtts->format($newformat);

-		$ret = str_replace(

-			array('__£__', '__$__', '__{__', '__}__', '__[__', '__]__'),

-			array('T', 'Z', '__a__', '__A__', '__b__', '__B__'),

-			$ret

-		);

-	} else {

+	if (preg_match('/^([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])$/i', $time, $reg))	// Deprecated. Ex: 1970-01-01, 1970-01-01 01:00:00, 19700101010000

+	{

+	    dol_print_error("Functions.lib::dol_print_date function called with a bad value from page ".$_SERVER["PHP_SELF"]);

+	    return '';

+	}

+	elseif (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+) ?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i', $time, $reg))    // Still available to solve problems in extrafields of type date

+	{

+	    // This part of code should not be used.

+	    dol_syslog("Functions.lib::dol_print_date function called with a bad value from page ".$_SERVER["PHP_SELF"], LOG_WARNING);

+	    //if (function_exists('debug_print_backtrace')) debug_print_backtrace();

+	    // Date has format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM:SS'

+	    $syear	= (!empty($reg[1]) ? $reg[1] : '');

+	    $smonth = (!empty($reg[2]) ? $reg[2] : '');

+	    $sday	= (!empty($reg[3]) ? $reg[3] : '');

+	    $shour	= (!empty($reg[4]) ? $reg[4] : '');

+	    $smin	= (!empty($reg[5]) ? $reg[5] : '');

+	    $ssec	= (!empty($reg[6]) ? $reg[6] : '');

+

+	    $time = dol_mktime($shour, $smin, $ssec, $smonth, $sday, $syear, true);

+	    $ret = adodb_strftime($format, $time + $offsettz + $offsetdst, $to_gmt);

+	}

+	else

+	{

@@ -2958,40 +1947,15 @@
-		if ($time < 100000000000) {	// Protection against bad date values

-			$timetouse = $time + $offsettz + $offsetdst; // TODO We could be able to disable use of offsettz and offsetdst to use only offsettzstring.

-

-			if ($to_gmt) {

-				$tzo = new DateTimeZone('UTC');	// when to_gmt is true, base for offsettz and offsetdst (so timetouse) is UTC

-			} else {

-				$tzo = new DateTimeZone(date_default_timezone_get());	// when to_gmt is false, base for offsettz and offsetdst (so timetouse) is PHP server

-			}

-			$dtts = new DateTime();

-			$dtts->setTimestamp($timetouse);

-			$dtts->setTimezone($tzo);

-			$newformat = str_replace(

-				array('%Y', '%y', '%m', '%d', '%H', '%I', '%M', '%S', '%p', '%w', 'T', 'Z', '__a__', '__A__', '__b__', '__B__'),

-				array('Y', 'y', 'm', 'd', 'H', 'h', 'i', 's', 'A', 'w', '__£__', '__$__', '__{__', '__}__', '__[__', '__]__'),

-				$format

-			);

-			$ret = $dtts->format($newformat);

-			$ret = str_replace(

-				array('__£__', '__$__', '__{__', '__}__', '__[__', '__]__'),

-				array('T', 'Z', '__a__', '__A__', '__b__', '__B__'),

-				$ret

-			);

-			//var_dump($ret);exit;

-		} else {

-			$ret = 'Bad value '.$time.' for date';

-		}

-	}

-

-	if (preg_match('/__b__/i', $format)) {

-		$timetouse = $time + $offsettz + $offsetdst; // TODO We could be able to disable use of offsettz and offsetdst to use only offsettzstring.

-

-		if ($to_gmt) {

-			$tzo = new DateTimeZone('UTC');	// when to_gmt is true, base for offsettz and offsetdst (so timetouse) is UTC

-		} else {

-			$tzo = new DateTimeZone(date_default_timezone_get());	// when to_gmt is false, base for offsettz and offsetdst (so timetouse) is PHP server

-		}

-		$dtts = new DateTime();

-		$dtts->setTimestamp($timetouse);

-		$dtts->setTimezone($tzo);

-		$month = $dtts->format("m");

+		if ($time < 100000000000)	// Protection against bad date values

+		{

+			$timetouse = $time + $offsettz + $offsetdst; // TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.

+

+			$ret = adodb_strftime($format, $timetouse, $to_gmt);

+		}

+		else $ret = 'Bad value '.$time.' for date';

+	}

+

+	if (preg_match('/__b__/i', $format))

+	{

+		$timetouse = $time + $offsettz + $offsetdst; // TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.

+

+		// Here ret is string in PHP setup language (strftime was used). Now we convert to $outputlangs.

+		$month = adodb_strftime('%m', $timetouse);

@@ -2999 +1963,2 @@
-		if ($encodetooutput) {

+		if ($encodetooutput)

+		{

@@ -3002 +1967,3 @@
-		} else {

+		}

+		else

+		{

@@ -3012,2 +1979,2 @@
-	if (preg_match('/__a__/i', $format)) {

-		//print "time=$time offsettz=$offsettz offsetdst=$offsetdst offsettzstring=$offsettzstring";

+	if (preg_match('/__a__/i', $format))

+	{

@@ -3016,9 +1983 @@
-		if ($to_gmt) {

-			$tzo = new DateTimeZone('UTC');

-		} else {

-			$tzo = new DateTimeZone(date_default_timezone_get());

-		}

-		$dtts = new DateTime();

-		$dtts->setTimestamp($timetouse);

-		$dtts->setTimezone($tzo);

-		$w = $dtts->format("w");

+		$w = adodb_strftime('%w', $timetouse); // TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.

@@ -3026 +1984,0 @@
-

@@ -3037,2 +1995,4 @@
- *  WARNING: This function use PHP server timezone by default to return locale informations.

- *  Be aware to add the third parameter to "UTC" if you need to work on UTC.

+ *  PHP getdate is restricted to the years 1901-2038 on Unix and 1970-2038 on Windows

+ *  WARNING: This function always use PHP server timezone to return locale informations !!!

+ *  Usage must be avoid.

+ *  FIXME: Replace this with PHP date function and a parameter $gm

@@ -3041,2 +2001 @@
- *	@param	boolean		$fast           Fast mode. deprecated.

- *  @param	string		$forcetimezone	'' to use the PHP server timezone. Or use a form like 'gmt', 'Europe/Paris' or '+0200' to force timezone.

+ *	@param	boolean		$fast           Fast mode

@@ -3043,0 +2003 @@
+ *										If no fast mode:

@@ -3051,2 +2011,13 @@
- *										'yday' => floor($secsInYear/$_day_power)

- *										'0' => original timestamp

+ *										'yday' => floor($secsInYear/$_day_power),

+ *										'weekday' => gmdate('l',$_day_power*(3+$dow)),

+ *										'month' => gmdate('F',mktime(0,0,0,$month,2,1971)),

+ *										If fast mode:

+ *										'seconds' => $secs,

+ *										'minutes' => $min,

+ *										'hours' => $hour,

+ *										'mday' => $day,

+ *										'mon' => $month,

+ *										'year' => $year,

+ *										'yday' => floor($secsInYear/$_day_power),

+ *										'leap' => $leaf,

+ *										'ndays' => $ndays

@@ -3055,22 +2026,16 @@
-function dol_getdate($timestamp, $fast = false, $forcetimezone = '')

-{

-	if ($timestamp === '') {

-		return array();

-	}

-

-	$datetimeobj = new DateTime();

-	$datetimeobj->setTimestamp($timestamp); // Use local PHP server timezone

-	if ($forcetimezone) {

-		$datetimeobj->setTimezone(new DateTimeZone($forcetimezone == 'gmt' ? 'UTC' : $forcetimezone)); //  (add timezone relative to the date entered)

-	}

-	$arrayinfo = array(

-		'year'=>((int) date_format($datetimeobj, 'Y')),

-		'mon'=>((int) date_format($datetimeobj, 'm')),

-		'mday'=>((int) date_format($datetimeobj, 'd')),

-		'wday'=>((int) date_format($datetimeobj, 'w')),

-		'yday'=>((int) date_format($datetimeobj, 'z')),

-		'hours'=>((int) date_format($datetimeobj, 'H')),

-		'minutes'=>((int) date_format($datetimeobj, 'i')),

-		'seconds'=>((int) date_format($datetimeobj, 's')),

-		'0'=>$timestamp

-	);

+function dol_getdate($timestamp, $fast = false)

+{

+	global $conf;

+

+	$usealternatemethod = false;

+	if ($timestamp <= 0) $usealternatemethod = true; // <= 1970

+	if ($timestamp >= 2145913200) $usealternatemethod = true; // >= 2038

+

+	if ($usealternatemethod)

+	{

+		$arrayinfo = adodb_getdate($timestamp, $fast);

+	}

+	else

+	{

+		$arrayinfo = getdate($timestamp);

+	}

@@ -3093,4 +2058,2 @@
- *										False or 0 or 'tzserver' = local to server TZ

- *										'auto'

- *										'tzuser' = local to user TZ taking dst into account at the current date. Not yet implemented.

- *										'tzuserrel' = local to user TZ taking dst into account at the given date. Use this one to convert date input from user into a GMT date.

+ *										False or 0 or 'server' = local to server TZ

+ *										'user' = local to user TZ

@@ -3102 +2065 @@
-function dol_mktime($hour, $minute, $second, $month, $day, $year, $gm = 'auto', $check = 1)

+function dol_mktime($hour, $minute, $second, $month, $day, $year, $gm = false, $check = 1)

@@ -3107,5 +2069,0 @@
-	if ($gm === 'auto') {

-		$gm = (empty($conf) ? 'tzserver' : $conf->tzuserinputkey);

-	}

-	//print 'gm:'.$gm.' gm === auto:'.($gm === 'auto').'<br>';exit;

-

@@ -3113,9 +2071,3 @@
-	if ($hour == -1 || empty($hour)) {

-		$hour = 0;

-	}

-	if ($minute == -1 || empty($minute)) {

-		$minute = 0;

-	}

-	if ($second == -1 || empty($second)) {

-		$second = 0;

-	}

+	if ($hour == -1 || empty($hour)) $hour = 0;

+	if ($minute == -1 || empty($minute)) $minute = 0;

+	if ($second == -1 || empty($second)) $second = 0;

@@ -3124,22 +2076,12 @@
-	if ($check) {

-		if (!$month || !$day) {

-			return '';

-		}

-		if ($day > 31) {

-			return '';

-		}

-		if ($month > 12) {

-			return '';

-		}

-		if ($hour < 0 || $hour > 24) {

-			return '';

-		}

-		if ($minute < 0 || $minute > 60) {

-			return '';

-		}

-		if ($second < 0 || $second > 60) {

-			return '';

-		}

-	}

-

-	if (empty($gm) || ($gm === 'server' || $gm === 'tzserver')) {

+	if ($check)

+	{

+		if (!$month || !$day)  return '';

+		if ($day > 31) return '';

+		if ($month > 12) return '';

+		if ($hour < 0 || $hour > 24) return '';

+		if ($minute < 0 || $minute > 60) return '';

+		if ($second < 0 || $second > 60) return '';

+	}

+

+	if (empty($gm) || $gm === 'server')

+	{

@@ -3148 +2090,3 @@
-	} elseif ($gm === 'user' || $gm === 'tzuser' || $gm === 'tzuserrel') {

+	}

+	elseif ($gm === 'user')

+	{

@@ -3153 +2097,3 @@
-		} catch (Exception $e) {

+		}

+		catch (Exception $e)

+		{

@@ -3157 +2103,3 @@
-	} elseif (strrpos($gm, "tz,") !== false) {

+	}

+	elseif (strrpos($gm, "tz,") !== false)

+	{

@@ -3159 +2107,2 @@
-		try {

+		try

+		{

@@ -3161 +2110,3 @@
-		} catch (Exception $e) {

+		}

+		catch (Exception $e)

+		{

@@ -3171 +2122 @@
-	$dt = new DateTime('now', $localtz);

+	$dt = new DateTime(null, $localtz);

@@ -3183,2 +2134 @@
- *  @param	string		$mode	'auto' => for backward compatibility (avoid this),

- *  							'gmt' => we return GMT timestamp,

+ *  @param	string		$mode	'gmt' => we return GMT timestamp,

@@ -3186,2 +2136,2 @@
- *  							'tzref' => we add the company timezone. Not implemented.

- * 								'tzuser' or 'tzuserrel' => we add the user timezone

+ *  							'tzref' => we add the company timezone

+ * 								'tzuser' => we add the user timezone

@@ -3190 +2140 @@
-function dol_now($mode = 'auto')

+function dol_now($mode = 'gmt')

@@ -3194,7 +2144,3 @@
-	if ($mode === 'auto') {

-		$mode = 'gmt';

-	}

-

-	if ($mode == 'gmt') {

-		$ret = time(); // Time for now at greenwich.

-	} elseif ($mode == 'tzserver') {		// Time for now with PHP server timezone added

+	if ($mode == 'gmt') $ret = time(); // Time for now at greenwich.

+	elseif ($mode == 'tzserver')		// Time for now with PHP server timezone added

+	{

@@ -3204,7 +2150,9 @@
-		//} elseif ($mode == 'tzref') {// Time for now with parent company timezone is added

-		//	require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';

-		//	$tzsecond=getParentCompanyTimeZoneInt();    // Contains tz+dayling saving time

-		//	$ret=dol_now('gmt')+($tzsecond*3600);

-		//}

-	} elseif ($mode == 'tzuser' || $mode == 'tzuserrel') {

-		// Time for now with user timezone added

+	}

+	/*elseif ($mode == 'tzref')				// Time for now with parent company timezone is added

+	{

+		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';

+		$tzsecond=getParentCompanyTimeZoneInt();    // Contains tz+dayling saving time

+		$ret=dol_now('gmt')+($tzsecond*3600);

+	}*/

+	elseif ($mode == 'tzuser')				// Time for now with user timezone added

+	{

@@ -3234,3 +2182 @@
-	if (!empty($conf->dol_optimize_smallscreen)) {

-		$shortunit = 1;

-	}

+	if (!empty($conf->dol_optimize_smallscreen)) $shortunit = 1;

@@ -3239 +2185,2 @@
-	if (empty($shortvalue) || $size < ($level * 10)) {

+	if (empty($shortvalue) || $size < ($level * 10))

+	{

@@ -3243 +2190,3 @@
-	} else {

+	}

+	else

+	{

@@ -3249,5 +2198,2 @@
-	if (empty($shortunit)) {

-		$ret .= ' '.$textunitlong;

-	} else {

-		$ret .= ' '.$textunitshort;

-	}

+	if (empty($shortunit)) { $ret .= ' '.$textunitlong; }

+	else { $ret .= ' '.$textunitshort; }

@@ -3265 +2210,0 @@
- * @param	string		$morecss	More CSS

@@ -3268 +2213 @@
-function dol_print_url($url, $target = '_blank', $max = 32, $withpicto = 0, $morecss = '')

+function dol_print_url($url, $target = '_blank', $max = 32, $withpicto = 0)

@@ -3272,20 +2217,9 @@
-	if (empty($url)) {

-		return '';

-	}

-

-	$linkstart = '<a href="';

-	if (!preg_match('/^http/i', $url)) {

-		$linkstart .= 'http://';

-	}

-	$linkstart .= $url;

-	$linkstart .= '"';

-	if ($target) {

-		$linkstart .= ' target="'.$target.'"';

-	}

-	$linkstart .= ' title="'.$langs->trans("URL").': '.$url.'"';

-	$linkstart .= '>';

-

-	$link = '';

-	if (!preg_match('/^http/i', $url)) {

-		$link .= 'http://';

-	}

+	if (empty($url)) return '';

+

+	$link = '<a href="';

+	if (!preg_match('/^http/i', $url)) $link .= 'http://';

+	$link .= $url;

+	$link .= '"';

+	if ($target) $link .= ' target="'.$target.'"';

+	$link .= '>';

+	if (!preg_match('/^http/i', $url)) $link .= 'http://';

@@ -3293,12 +2227,6 @@
-

-	$linkend = '</a>';

-

-	if ($morecss == 'float') {	// deprecated

-		return '<div class="nospan'.($morecss ? ' '.$morecss : '').'" style="margin-right: 10px">'.($withpicto ? img_picto($langs->trans("Url"), 'globe', 'class="paddingrightonly"') : '').$link.'</div>';

-	} else {

-		return $linkstart.'<span class="nospan'.($morecss ? ' '.$morecss : '').'" style="margin-right: 10px">'.($withpicto ? img_picto('', 'globe', 'class="paddingrightonly"') : '').$link.'</span>'.$linkend;

-	}

-}

-

-/**

- * Show EMail link formatted for HTML output.

+	$link .= '</a>';

+	return '<div class="nospan float" style="margin-right: 10px">'.($withpicto ?img_picto($langs->trans("Url"), 'globe').' ' : '').$link.'</div>';

+}

+

+/**

+ * Show EMail link

@@ -3312 +2240 @@
- * @param	int|string	$withpicto		Show picto

+ * @param	int			$withpicto		Show picto

@@ -3317,20 +2245,12 @@
-	global $user, $langs, $hookmanager;

-

-	//global $conf; $conf->global->AGENDA_ADDACTIONFOREMAIL = 1;

-	//$showinvalid = 1; $email = 'rrrrr';

-

-	$newemail = dol_escape_htmltag($email);

-

-	if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') && $withpicto) {

-		$withpicto = 0;

-	}

-

-	if (empty($email)) {

-		return '&nbsp;';

-	}

-

-	if (!empty($addlink)) {

-		$newemail = '<a class="paddingrightonly" style="text-overflow: ellipsis;" href="';

-		if (!preg_match('/^mailto:/i', $email)) {

-			$newemail .= 'mailto:';

-		}

+	global $conf, $user, $langs, $hookmanager;

+

+	$newemail = $email;

+

+	if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $withpicto) $withpicto = 0;

+

+	if (empty($email)) return '&nbsp;';

+

+	if (!empty($addlink))

+	{

+		$newemail = '<a style="text-overflow: ellipsis;" href="';

+		if (!preg_match('/^mailto:/i', $email)) $newemail .= 'mailto:';

@@ -3339,3 +2258,0 @@
-

-		$newemail .= ($withpicto ? img_picto($langs->trans("EMail").' : '.$email, (is_numeric($withpicto) ? 'email' : $withpicto), 'class="paddingrightonly"') : '');

-

@@ -3344,19 +2261,2 @@
-		if ($showinvalid && !isValidEmail($email)) {

-			$langs->load("errors");

-			$newemail .= img_warning($langs->trans("ErrorBadEMail", $email), '', 'paddingrightonly');

-		}

-

-		if (($cid || $socid) && isModEnabled('agenda') && $user->hasRight("agenda", "myactions", "create")) {

-			$type = 'AC_EMAIL';

-			$linktoaddaction = '';

-			if (getDolGlobalString('AGENDA_ADDACTIONFOREMAIL')) {

-				$linktoaddaction = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.urlencode($type).'&amp;contactid='.((int) $cid).'&amp;socid='.((int) $socid).'">'.img_object($langs->trans("AddAction"), "calendar").'</a>';

-			}

-			if ($linktoaddaction) {

-				$newemail = '<div>'.$newemail.' '.$linktoaddaction.'</div>';

-			}

-		}

-	} else {

-		$newemail = ($withpicto ? img_picto($langs->trans("EMail").' : '.$email, (is_numeric($withpicto) ? 'email' : $withpicto), 'class="paddingrightonly"') : '').$newemail;

-

-		if ($showinvalid && !isValidEmail($email)) {

+		if ($showinvalid && !isValidEmail($email))

+		{

@@ -3365,0 +2266,15 @@
+

+		if (($cid || $socid) && !empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)

+		{

+			$type = 'AC_EMAIL'; $link = '';

+			if (!empty($conf->global->AGENDA_ADDACTIONFOREMAIL)) $link = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"), "calendar").'</a>';

+			if ($link) $newemail = '<div>'.$newemail.' '.$link.'</div>';

+		}

+	}

+	else

+	{

+		if ($showinvalid && !isValidEmail($email))

+		{

+			$langs->load("errors");

+			$newemail .= img_warning($langs->trans("ErrorBadEMail", $email));

+		}

@@ -3369 +2284 @@
-	//$rep = ($withpicto ? img_picto($langs->trans("EMail").' : '.$email, (is_numeric($withpicto) ? 'email' : $withpicto), 'class="paddingrightonly"') : '').$newemail;

+	$rep = ($withpicto ? img_picto($langs->trans("EMail").' : '.$email, 'object_email.png').' ' : '').$newemail;

@@ -3371,2 +2285,0 @@
-	$rep = $newemail;

-

@@ -3375 +2287,0 @@
-

@@ -3393,28 +2305,17 @@
-	global $conf, $db;

-

-	$socialnetworks = array();

-	// Enable caching of array

-	require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';

-	$cachekey = 'socialnetworks_' . $conf->entity;

-	$dataretrieved = dol_getcache($cachekey);

-	if (!is_null($dataretrieved)) {

-		$socialnetworks = $dataretrieved;

-	} else {

-		$sql = "SELECT rowid, code, label, url, icon, active FROM ".MAIN_DB_PREFIX."c_socialnetworks";

-		$sql .= " WHERE entity=".$conf->entity;

-		$resql = $db->query($sql);

-		if ($resql) {

-			while ($obj = $db->fetch_object($resql)) {

-				$socialnetworks[$obj->code] = array(

-					'rowid' => $obj->rowid,

-					'label' => $obj->label,

-					'url' => $obj->url,

-					'icon' => $obj->icon,

-					'active' => $obj->active,

-				);

-			}

-		}

-		dol_setcache($cachekey, $socialnetworks); // If setting cache fails, this is not a problem, so we do not test result.

-	}

-

-	return $socialnetworks;

+    global $conf, $db;

+    $sql = "SELECT rowid, code, label, url, icon, active FROM ".MAIN_DB_PREFIX."c_socialnetworks";

+    $sql .= " WHERE entity=".$conf->entity;

+    $socialnetworks = array();

+    $resql = $db->query($sql);

+    if ($resql) {

+        while ($obj = $db->fetch_object($resql)) {

+            $socialnetworks[$obj->code] = array(

+                'rowid' => $obj->rowid,

+                'label' => $obj->label,

+                'url' => $obj->url,

+                'icon' => $obj->icon,

+                'active' => $obj->active,

+            );

+        }

+    }

+    return $socialnetworks;

@@ -3426,8 +2327,7 @@
- * @param	string		$value				Social network ID to show (only skype, without 'Name of recipient' before)

- * @param	int 		$cid 				Id of contact if known

- * @param	int 		$socid 				Id of third party if known

- * @param	string 		$type				'skype','facebook',...

- * @param	array		$dictsocialnetworks List of socialnetworks availables

- * @return	string							HTML Link

- */

-function dol_print_socialnetworks($value, $cid, $socid, $type, $dictsocialnetworks = array())

+ * @param	string		$value			Skype to show (only skype, without 'Name of recipient' before)

+ * @param	int 		$cid 			Id of contact if known

+ * @param	int 		$socid 			Id of third party if known

+ * @param	string 		$type			'skype','facebook',...

+ * @return	string						HTML Link

+ */

+function dol_print_socialnetworks($value, $cid, $socid, $type)

@@ -3439,5 +2339,4 @@
-	if (empty($value)) {

-		return '&nbsp;';

-	}

-

-	if (!empty($type)) {

+	if (empty($value)) return '&nbsp;';

+

+	if (!empty($type))

+	{

@@ -3445,7 +2344,8 @@
-		// Use dictionary definition for picto $dictsocialnetworks[$type]['icon']

-		$htmllink .= '<span class="fab pictofixedwidth '.($dictsocialnetworks[$type]['icon'] ? $dictsocialnetworks[$type]['icon'] : 'fa-link').'"></span>';

-		if ($type == 'skype') {

-			$htmllink .= dol_escape_htmltag($value);

-			$htmllink .= '&nbsp; <a href="skype:';

-			$htmllink .= dol_string_nospecial($value, '_', '', array('@'));

-			$htmllink .= '?call" alt="'.$langs->trans("Call").'&nbsp;'.$value.'" title="'.dol_escape_htmltag($langs->trans("Call").' '.$value).'">';

+		$htmllink .= img_picto($langs->trans(strtoupper($type)), $type.'.png', '', false, 0, 0, '', 'paddingright', 0);

+		$htmllink .= $value;

+		if ($type == 'skype')

+		{

+			$htmllink .= '&nbsp;';

+			$htmllink .= '<a href="skype:';

+			$htmllink .= $value;

+			$htmllink .= '?call" alt="'.$langs->trans("Call").'&nbsp;'.$value.'" title="'.$langs->trans("Call").'&nbsp;'.$value.'">';

@@ -3454,2 +2354,2 @@
-			$htmllink .= dol_string_nospecial($value, '_', '', array('@'));

-			$htmllink .= '?chat" alt="'.$langs->trans("Chat").'&nbsp;'.$value.'" title="'.dol_escape_htmltag($langs->trans("Chat").' '.$value).'">';

+			$htmllink .= $value;

+			$htmllink .= '?chat" alt="'.$langs->trans("Chat").'&nbsp;'.$value.'" title="'.$langs->trans("Chat").'&nbsp;'.$value.'">';

@@ -3458,44 +2358,7 @@
-			if (($cid || $socid) && isModEnabled('agenda') && $user->hasRight('agenda', 'myactions', 'create')) {

-				$addlink = 'AC_SKYPE';

-				$link = '';

-				if (getDolGlobalString('AGENDA_ADDACTIONFORSKYPE')) {

-					$link = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$addlink.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"), "calendar").'</a>';

-				}

-				$htmllink .= ($link ? ' '.$link : '');

-			}

-		} else {

-			$networkconstname = 'MAIN_INFO_SOCIETE_'.strtoupper($type).'_URL';

-			if (getDolGlobalString($networkconstname)) {

-				$link = str_replace('{socialid}', $value, getDolGlobalString($networkconstname));

-				if (preg_match('/^https?:\/\//i', $link)) {

-					$htmllink .= '<a href="'.dol_sanitizeUrl($link, 0).'" target="_blank" rel="noopener noreferrer">'.dol_escape_htmltag($value).'</a>';

-				} else {

-					$htmllink .= '<a href="'.dol_sanitizeUrl($link, 1).'" target="_blank" rel="noopener noreferrer">'.dol_escape_htmltag($value).'</a>';

-				}

-			} elseif (!empty($dictsocialnetworks[$type]['url'])) {

-				$tmpvirginurl = preg_replace('/\/?{socialid}/', '', $dictsocialnetworks[$type]['url']);

-				if ($tmpvirginurl) {

-					$value = preg_replace('/^www\.'.preg_quote($tmpvirginurl, '/').'\/?/', '', $value);

-					$value = preg_replace('/^'.preg_quote($tmpvirginurl, '/').'\/?/', '', $value);

-

-					$tmpvirginurl3 = preg_replace('/^https:\/\//i', 'https://www.', $tmpvirginurl);

-					if ($tmpvirginurl3) {

-						$value = preg_replace('/^www\.'.preg_quote($tmpvirginurl3, '/').'\/?/', '', $value);

-						$value = preg_replace('/^'.preg_quote($tmpvirginurl3, '/').'\/?/', '', $value);

-					}

-

-					$tmpvirginurl2 = preg_replace('/^https?:\/\//i', '', $tmpvirginurl);

-					if ($tmpvirginurl2) {

-						$value = preg_replace('/^www\.'.preg_quote($tmpvirginurl2, '/').'\/?/', '', $value);

-						$value = preg_replace('/^'.preg_quote($tmpvirginurl2, '/').'\/?/', '', $value);

-					}

-				}

-				$link = str_replace('{socialid}', $value, $dictsocialnetworks[$type]['url']);

-				if (preg_match('/^https?:\/\//i', $link)) {

-					$htmllink .= '<a href="'.dol_sanitizeUrl($link, 0).'" target="_blank" rel="noopener noreferrer">'.dol_escape_htmltag($value).'</a>';

-				} else {

-					$htmllink .= '<a href="'.dol_sanitizeUrl($link, 1).'" target="_blank" rel="noopener noreferrer">'.dol_escape_htmltag($value).'</a>';

-				}

-			} else {

-				$htmllink .= dol_escape_htmltag($value);

-			}

+		}

+		if (($cid || $socid) && !empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create && $type == 'skype')

+		{

+			$addlink = 'AC_SKYPE';

+			$link = '';

+			if (!empty($conf->global->AGENDA_ADDACTIONFORSKYPE)) $link = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$addlink.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"), "calendar").'</a>';

+			$htmllink .= ($link ? ' '.$link : '');

@@ -3504 +2367,3 @@
-	} else {

+	}

+	else

+	{

@@ -3509,51 +2373,0 @@
-}

-

-/**

- *	Format professional IDs according to their country

- *

- *	@param	string	$profID			Value of profID to format

- *	@param	string	$profIDtype		Type of profID to format ('1', '2', '3', '4', '5', '6' or 'VAT')

- *	@param	string	$countrycode	Country code to use for formatting

- *	@param	int		$addcpButton	Add button to copy to clipboard (1 => show only on hoover ; 2 => always display )

- *	@return string					Formated profID

- */

-function dol_print_profids($profID, $profIDtype, $countrycode = '', $addcpButton = 1)

-{

-	global $mysoc;

-

-	if (empty($profID) || empty($profIDtype)) {

-		return '';

-	}

-	if (empty($countrycode)) {

-		$countrycode = $mysoc->country_code;

-	}

-	$newProfID = $profID;

-	$id = substr($profIDtype, -1);

-	$ret = '';

-	if (strtoupper($countrycode) == 'FR') {

-		// France

-		// (see https://www.economie.gouv.fr/entreprises/numeros-identification-entreprise)

-

-		if ($id == 1 && dol_strlen($newProfID) == 9) {

-			// SIREN (ex: 123 123 123)

-			$newProfID = substr($newProfID, 0, 3).' '.substr($newProfID, 3, 3).' '.substr($newProfID, 6, 3);

-		}

-		if ($id == 2 && dol_strlen($newProfID) == 14) {

-			// SIRET (ex: 123 123 123 12345)

-			$newProfID = substr($newProfID, 0, 3).' '.substr($newProfID, 3, 3).' '.substr($newProfID, 6, 3).' '.substr($newProfID, 9, 5);

-		}

-		if ($id == 3 && dol_strlen($newProfID) == 5) {

-			// NAF/APE (ex: 69.20Z)

-			$newProfID = substr($newProfID, 0, 2).'.'.substr($newProfID, 2, 3);

-		}

-		if ($profIDtype === 'VAT' && dol_strlen($newProfID) == 13) {

-			// TVA intracommunautaire (ex: FR12 123 123 123)

-			$newProfID = substr($newProfID, 0, 4).' '.substr($newProfID, 4, 3).' '.substr($newProfID, 7, 3).' '.substr($newProfID, 10, 3);

-		}

-	}

-	if (!empty($addcpButton)) {

-		$ret = showValueWithClipboardCPButton(dol_escape_htmltag($profID), ($addcpButton == 1 ? 1 : 0), $newProfID);

-	} else {

-		$ret = $newProfID;

-	}

-	return $ret;

@@ -3569,3 +2383,3 @@
- * 	@param 	string	$addlink	    ''=no link to create action, 'AC_TEL'=add link to clicktodial (if module enabled) and add link to create event (if conf->global->AGENDA_ADDACTIONFORPHONE set), 'tel'=Force "tel:..." link

- * 	@param 	string	$separ 		    Separation between numbers for a better visibility example : xx.xx.xx.xx.xx. You can also use 'hidenum' to hide the number, keep only the picto.

- *  @param	string  $withpicto      Show picto ('fax', 'phone', 'mobile')

+ * 	@param 	string	$addlink	    ''=no link to create action, 'AC_TEL'=add link to clicktodial (if module enabled) and add link to create event (if conf->global->AGENDA_ADDACTIONFORPHONE set)

+ * 	@param 	string	$separ 		    Separation between numbers for a better visibility example : xx.xx.xx.xx.xx

+ *  @param	string  $withpicto      Show picto

@@ -3581,10 +2395,4 @@
-	$phone = is_null($phone) ? '' : preg_replace("/[\s.-]/", "", trim($phone));

-	if (empty($phone)) {

-		return '';

-	}

-	if (getDolGlobalString('MAIN_PHONE_SEPAR')) {

-		$separ = $conf->global->MAIN_PHONE_SEPAR;

-	}

-	if (empty($countrycode) && is_object($mysoc)) {

-		$countrycode = $mysoc->country_code;

-	}

+	$phone = preg_replace("/[\s.-]/", "", trim($phone));

+	if (empty($phone)) { return ''; }

+	if ($conf->global->MAIN_PHONE_SEPAR) $separ = $conf->global->MAIN_PHONE_SEPAR;

+	if (empty($countrycode)) $countrycode = $mysoc->country_code;

@@ -3593,3 +2401 @@
-	if ($conf->dol_optimize_smallscreen) {

-		$separ = '';

-	}

+	if ($conf->dol_optimize_smallscreen) $separ = '';

@@ -3598 +2404,2 @@
-	if (strtoupper($countrycode) == "FR") {

+	if (strtoupper($countrycode) == "FR")

+	{

@@ -3602 +2409,3 @@
-		} elseif (dol_strlen($phone) == 7) {

+		}

+		elseif (dol_strlen($phone) == 7)

+		{

@@ -3604 +2413,3 @@
-		} elseif (dol_strlen($phone) == 9) {

+		}

+		elseif (dol_strlen($phone) == 9)

+		{

@@ -3606 +2417,3 @@
-		} elseif (dol_strlen($phone) == 11) {

+		}

+		elseif (dol_strlen($phone) == 11)

+		{

@@ -3608,6 +2421,9 @@
-		} elseif (dol_strlen($phone) == 12) {

-			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 1).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

-		} elseif (dol_strlen($phone) == 13) {

-			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 3).$separ.substr($newphone, 11, 2);

-		}

-	} elseif (strtoupper($countrycode) == "CA") {

+		}

+		elseif (dol_strlen($phone) == 12)

+		{

+			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

+		}

+	}

+

+	elseif (strtoupper($countrycode) == "CA")

+	{

@@ -3617,2 +2433,5 @@
-	} elseif (strtoupper($countrycode) == "PT") {//Portugal

-		if (dol_strlen($phone) == 13) {//ex: +351_ABC_DEF_GHI

+	}

+	elseif (strtoupper($countrycode) == "PT")

+	{//Portugal

+		if (dol_strlen($phone) == 13)

+		{//ex: +351_ABC_DEF_GHI

@@ -3621,2 +2440,5 @@
-	} elseif (strtoupper($countrycode) == "SR") {//Suriname

-		if (dol_strlen($phone) == 10) {//ex: +597_ABC_DEF

+	}

+	elseif (strtoupper($countrycode) == "SR")

+	{//Suriname

+		if (dol_strlen($phone) == 10)

+		{//ex: +597_ABC_DEF

@@ -3624 +2446,3 @@
-		} elseif (dol_strlen($phone) == 11) {//ex: +597_ABC_DEFG

+		}

+		elseif (dol_strlen($phone) == 11)

+		{//ex: +597_ABC_DEFG

@@ -3627,2 +2451,5 @@
-	} elseif (strtoupper($countrycode) == "DE") {//Allemagne

-		if (dol_strlen($phone) == 14) {//ex:  +49_ABCD_EFGH_IJK

+	}

+	elseif (strtoupper($countrycode) == "DE")

+	{//Allemagne

+		if (dol_strlen($phone) == 14)

+		{//ex:  +49_ABCD_EFGH_IJK

@@ -3630 +2457,3 @@
-		} elseif (dol_strlen($phone) == 13) {//ex: +49_ABC_DEFG_HIJ

+		}

+		elseif (dol_strlen($phone) == 13)

+		{//ex: +49_ABC_DEFG_HIJ

@@ -3633,2 +2462,5 @@
-	} elseif (strtoupper($countrycode) == "ES") {//Espagne

-		if (dol_strlen($phone) == 12) {//ex:  +34_ABC_DEF_GHI

+	}

+	elseif (strtoupper($countrycode) == "ES")

+	{//Espagne

+		if (dol_strlen($phone) == 12)

+		{//ex:  +34_ABC_DEF_GHI

@@ -3637,2 +2469,5 @@
-	} elseif (strtoupper($countrycode) == "BF") {// Burkina Faso

-		if (dol_strlen($phone) == 12) {//ex :  +22 A BC_DE_FG_HI

+	}

+	elseif (strtoupper($countrycode) == "BF")

+	{// Burkina Faso

+		if (dol_strlen($phone) == 12)

+		{//ex :  +22 A BC_DE_FG_HI

@@ -3641,2 +2476,5 @@
-	} elseif (strtoupper($countrycode) == "RO") {// Roumanie

-		if (dol_strlen($phone) == 12) {//ex :  +40 AB_CDE_FG_HI

+	}

+	elseif (strtoupper($countrycode) == "RO")

+	{// Roumanie

+		if (dol_strlen($phone) == 12)

+		{//ex :  +40 AB_CDE_FG_HI

@@ -3645,2 +2483,5 @@
-	} elseif (strtoupper($countrycode) == "TR") {//Turquie

-		if (dol_strlen($phone) == 13) {//ex :  +90 ABC_DEF_GHIJ

+	}

+	elseif (strtoupper($countrycode) == "TR")

+	{//Turquie

+		if (dol_strlen($phone) == 13)

+		{//ex :  +90 ABC_DEF_GHIJ

@@ -3649,2 +2490,5 @@
-	} elseif (strtoupper($countrycode) == "US") {//Etat-Unis

-		if (dol_strlen($phone) == 12) {//ex: +1 ABC_DEF_GHIJ

+	}

+	elseif (strtoupper($countrycode) == "US")

+	{//Etat-Unis

+		if (dol_strlen($phone) == 12)

+		{//ex: +1 ABC_DEF_GHIJ

@@ -3653,2 +2497,5 @@
-	} elseif (strtoupper($countrycode) == "MX") {//Mexique

-		if (dol_strlen($phone) == 12) {//ex: +52 ABCD_EFG_HI

+	}

+	elseif (strtoupper($countrycode) == "MX")

+	{//Mexique

+		if (dol_strlen($phone) == 12)

+		{//ex: +52 ABCD_EFG_HI

@@ -3656 +2503,3 @@
-		} elseif (dol_strlen($phone) == 11) {//ex: +52 AB_CD_EF_GH

+		}

+		elseif (dol_strlen($phone) == 11)

+		{//ex: +52 AB_CD_EF_GH

@@ -3658 +2507,3 @@
-		} elseif (dol_strlen($phone) == 13) {//ex: +52 ABC_DEF_GHIJ

+		}

+		elseif (dol_strlen($phone) == 13)

+		{//ex: +52 ABC_DEF_GHIJ

@@ -3661,2 +2512,5 @@
-	} elseif (strtoupper($countrycode) == "ML") {//Mali

-		if (dol_strlen($phone) == 12) {//ex: +223 AB_CD_EF_GH

+	}

+	elseif (strtoupper($countrycode) == "ML")

+	{//Mali

+		if (dol_strlen($phone) == 12)

+		{//ex: +223 AB_CD_EF_GH

@@ -3665,2 +2519,5 @@
-	} elseif (strtoupper($countrycode) == "TH") {//Thaïlande

-		if (dol_strlen($phone) == 11) {//ex: +66_ABC_DE_FGH

+	}

+	elseif (strtoupper($countrycode) == "TH")

+	{//Thaïlande

+		if (dol_strlen($phone) == 11)

+		{//ex: +66_ABC_DE_FGH

@@ -3668 +2525,3 @@
-		} elseif (dol_strlen($phone) == 12) {//ex: +66_A_BCD_EF_GHI

+		}

+		elseif (dol_strlen($phone) == 12)

+		{//ex: +66_A_BCD_EF_GHI

@@ -3671,3 +2530,6 @@
-	} elseif (strtoupper($countrycode) == "MU") {

-		//Maurice

-		if (dol_strlen($phone) == 11) {//ex: +230_ABC_DE_FG

+	}

+	elseif (strtoupper($countrycode) == "MU")

+	{

+        //Maurice

+		if (dol_strlen($phone) == 11)

+		{//ex: +230_ABC_DE_FG

@@ -3675 +2537,3 @@
-		} elseif (dol_strlen($phone) == 12) {//ex: +230_ABCD_EF_GH

+		}

+		elseif (dol_strlen($phone) == 12)

+		{//ex: +230_ABCD_EF_GH

@@ -3678,2 +2542,5 @@
-	} elseif (strtoupper($countrycode) == "ZA") {//Afrique du sud

-		if (dol_strlen($phone) == 12) {//ex: +27_AB_CDE_FG_HI

+	}

+	elseif (strtoupper($countrycode) == "ZA")

+	{//Afrique du sud

+		if (dol_strlen($phone) == 12)

+		{//ex: +27_AB_CDE_FG_HI

@@ -3682,2 +2549,5 @@
-	} elseif (strtoupper($countrycode) == "SY") {//Syrie

-		if (dol_strlen($phone) == 12) {//ex: +963_AB_CD_EF_GH

+	}

+	elseif (strtoupper($countrycode) == "SY")

+	{//Syrie

+		if (dol_strlen($phone) == 12)

+		{//ex: +963_AB_CD_EF_GH

@@ -3685 +2555,3 @@
-		} elseif (dol_strlen($phone) == 13) {//ex: +963_AB_CD_EF_GHI

+		}

+		elseif (dol_strlen($phone) == 13)

+		{//ex: +963_AB_CD_EF_GHI

@@ -3688,2 +2560,5 @@
-	} elseif (strtoupper($countrycode) == "AE") {//Emirats Arabes Unis

-		if (dol_strlen($phone) == 12) {//ex: +971_ABC_DEF_GH

+	}

+	elseif (strtoupper($countrycode) == "AE")

+	{//Emirats Arabes Unis

+		if (dol_strlen($phone) == 12)

+		{//ex: +971_ABC_DEF_GH

@@ -3691 +2566,3 @@
-		} elseif (dol_strlen($phone) == 13) {//ex: +971_ABC_DEF_GHI

+		}

+		elseif (dol_strlen($phone) == 13)

+		{//ex: +971_ABC_DEF_GHI

@@ -3693 +2570,3 @@
-		} elseif (dol_strlen($phone) == 14) {//ex: +971_ABC_DEF_GHIK

+		}

+		elseif (dol_strlen($phone) == 14)

+		{//ex: +971_ABC_DEF_GHIK

@@ -3696,2 +2575,5 @@
-	} elseif (strtoupper($countrycode) == "DZ") {//Algérie

-		if (dol_strlen($phone) == 13) {//ex: +213_ABC_DEF_GHI

+	}

+	elseif (strtoupper($countrycode) == "DZ")

+	{//Algérie

+		if (dol_strlen($phone) == 13)

+		{//ex: +213_ABC_DEF_GHI

@@ -3700,2 +2582,5 @@
-	} elseif (strtoupper($countrycode) == "BE") {//Belgique

-		if (dol_strlen($phone) == 11) {//ex: +32_ABC_DE_FGH

+	}

+	elseif (strtoupper($countrycode) == "BE")

+	{//Belgique

+		if (dol_strlen($phone) == 11)

+		{//ex: +32_ABC_DE_FGH

@@ -3703 +2588,3 @@
-		} elseif (dol_strlen($phone) == 12) {//ex: +32_ABC_DEF_GHI

+		}

+		elseif (dol_strlen($phone) == 12)

+		{//ex: +32_ABC_DEF_GHI

@@ -3706,2 +2593,5 @@
-	} elseif (strtoupper($countrycode) == "PF") {//Polynésie française

-		if (dol_strlen($phone) == 12) {//ex: +689_AB_CD_EF_GH

+	}

+	elseif (strtoupper($countrycode) == "PF")

+	{//Polynésie française

+		if (dol_strlen($phone) == 12)

+		{//ex: +689_AB_CD_EF_GH

@@ -3710,2 +2600,5 @@
-	} elseif (strtoupper($countrycode) == "CO") {//Colombie

-		if (dol_strlen($phone) == 13) {//ex: +57_ABC_DEF_GH_IJ

+	}

+	elseif (strtoupper($countrycode) == "CO")

+	{//Colombie

+		if (dol_strlen($phone) == 13)

+		{//ex: +57_ABC_DEF_GH_IJ

@@ -3714,2 +2607,5 @@
-	} elseif (strtoupper($countrycode) == "JO") {//Jordanie

-		if (dol_strlen($phone) == 12) {//ex: +962_A_BCD_EF_GH

+	}

+	elseif (strtoupper($countrycode) == "JO")

+	{//Jordanie

+		if (dol_strlen($phone) == 12)

+		{//ex: +962_A_BCD_EF_GH

@@ -3718,2 +2614,5 @@
-	} elseif (strtoupper($countrycode) == "JM") {//Jamaïque

-		if (dol_strlen($newphone) == 12) {//ex: +1867_ABC_DEFG

+	}

+	elseif (strtoupper($countrycode) == "JM")

+	{//Jamaïque

+		if (dol_strlen($newphone) == 12)

+		{//ex: +1867_ABC_DEFG

@@ -3722,6 +2621,12 @@
-	} elseif (strtoupper($countrycode) == "MG") {//Madagascar

-		if (dol_strlen($phone) == 13) {//ex: +261_AB_CD_EFG_HI

-			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 3).$separ.substr($newphone, 11, 2);

-		}

-	} elseif (strtoupper($countrycode) == "GB") {//Royaume uni

-		if (dol_strlen($phone) == 13) {//ex: +44_ABCD_EFG_HIJ

+	}

+	elseif (strtoupper($countrycode) == "MG")

+	{//Madagascar

+		if (dol_strlen($phone) == 13)

+		{//ex: +261_AB_CD_EF_GHI

+			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 3);

+		}

+	}

+	elseif (strtoupper($countrycode) == "GB")

+	{//Royaume uni

+		if (dol_strlen($phone) == 13)

+		{//ex: +44_ABCD_EFG_HIJ

@@ -3730,2 +2635,5 @@
-	} elseif (strtoupper($countrycode) == "CH") {//Suisse

-		if (dol_strlen($phone) == 12) {//ex: +41_AB_CDE_FG_HI

+	}

+	elseif (strtoupper($countrycode) == "CH")

+	{//Suisse

+		if (dol_strlen($phone) == 12)

+		{//ex: +41_AB_CDE_FG_HI

@@ -3733 +2641,3 @@
-		} elseif (dol_strlen($phone) == 15) {// +41_AB_CDE_FGH_IJKL

+		}

+		elseif (dol_strlen($phone) == 15)

+		{// +41_AB_CDE_FGH_IJKL

@@ -3736,2 +2646,5 @@
-	} elseif (strtoupper($countrycode) == "TN") {//Tunisie

-		if (dol_strlen($phone) == 12) {//ex: +216_AB_CDE_FGH

+	}

+	elseif (strtoupper($countrycode) == "TN")

+	{//Tunisie

+		if (dol_strlen($phone) == 12)

+		{//ex: +216_AB_CDE_FGH

@@ -3740,2 +2653,5 @@
-	} elseif (strtoupper($countrycode) == "GF") {//Guyane francaise

-		if (dol_strlen($phone) == 13) {//ex: +594_ABC_DE_FG_HI  (ABC=594 de nouveau)

+	}

+	elseif (strtoupper($countrycode) == "GF")

+	{//Guyane francaise

+		if (dol_strlen($phone) == 13)

+		{//ex: +594_ABC_DE_FG_HI  (ABC=594 de nouveau)

@@ -3744,2 +2660,5 @@
-	} elseif (strtoupper($countrycode) == "GP") {//Guadeloupe

-		if (dol_strlen($phone) == 13) {//ex: +590_ABC_DE_FG_HI  (ABC=590 de nouveau)

+	}

+	elseif (strtoupper($countrycode) == "GP")

+	{//Guadeloupe

+		if (dol_strlen($phone) == 13)

+		{//ex: +590_ABC_DE_FG_HI  (ABC=590 de nouveau)

@@ -3748,2 +2667,5 @@
-	} elseif (strtoupper($countrycode) == "MQ") {//Martinique

-		if (dol_strlen($phone) == 13) {//ex: +596_ABC_DE_FG_HI  (ABC=596 de nouveau)

+	}

+	elseif (strtoupper($countrycode) == "MQ")

+	{//Martinique

+		if (dol_strlen($phone) == 13)

+		{//ex: +596_ABC_DE_FG_HI  (ABC=596 de nouveau)

@@ -3752,2 +2674,5 @@
-	} elseif (strtoupper($countrycode) == "IT") {//Italie

-		if (dol_strlen($phone) == 12) {//ex: +39_ABC_DEF_GHI

+	}

+	elseif (strtoupper($countrycode) == "IT")

+	{//Italie

+		if (dol_strlen($phone) == 12)

+		{//ex: +39_ABC_DEF_GHI

@@ -3755 +2680,3 @@
-		} elseif (dol_strlen($phone) == 13) {//ex: +39_ABC_DEF_GH_IJ

+		}

+		elseif (dol_strlen($phone) == 13)

+		{//ex: +39_ABC_DEF_GH_IJ

@@ -3758,4 +2685,7 @@
-	} elseif (strtoupper($countrycode) == "AU") {

-		//Australie

-		if (dol_strlen($phone) == 12) {

-			//ex: +61_A_BCDE_FGHI

+	}

+	elseif (strtoupper($countrycode) == "AU")

+	{

+        //Australie

+		if (dol_strlen($phone) == 12)

+		{

+            //ex: +61_A_BCDE_FGHI

@@ -3764,22 +2694,12 @@
-	} elseif (strtoupper($countrycode) == "LU") {

-		// Luxembourg

-		if (dol_strlen($phone) == 10) {// fixe 6 chiffres +352_AA_BB_CC

-			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2);

-		} elseif (dol_strlen($phone) == 11) {// fixe 7 chiffres +352_AA_BB_CC_D

-			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 1);

-		} elseif (dol_strlen($phone) == 12) {// fixe 8 chiffres +352_AA_BB_CC_DD

-			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

-		} elseif (dol_strlen($phone) == 13) {// mobile +352_AAA_BB_CC_DD

-			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);

-		}

-	}

-

-	$newphoneastart = $newphoneaend = '';

-	if (!empty($addlink)) {	// Link on phone number (+ link to add action if conf->global->AGENDA_ADDACTIONFORPHONE set)

-		if ($addlink == 'tel' || $conf->browser->layout == 'phone' || (isModEnabled('clicktodial') && getDolGlobalString('CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS'))) {	// If phone or option for, we use link of phone

-			$newphoneastart = '<a href="tel:'.$phone.'">';

-			$newphoneaend .= '</a>';

-		} elseif (isModEnabled('clicktodial') && $addlink == 'AC_TEL') {		// If click to dial, we use click to dial url

-			if (empty($user->clicktodial_loaded)) {

-				$user->fetch_clicktodial();

-			}

+	}

+	if (!empty($addlink))	// Link on phone number (+ link to add action if conf->global->AGENDA_ADDACTIONFORPHONE set)

+	{

+		if ($conf->browser->layout == 'phone' || (!empty($conf->clicktodial->enabled) && !empty($conf->global->CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS)))	// If phone or option for, we use link of phone

+		{

+			$newphoneform = $newphone;

+			$newphone = '<a href="tel:'.$phone.'"';

+			$newphone .= '>'.$newphoneform.'</a>';

+		}

+		elseif (!empty($conf->clicktodial->enabled) && $addlink == 'AC_TEL')		// If click to dial, we use click to dial url

+		{

+			if (empty($user->clicktodial_loaded)) $user->fetch_clicktodial();

@@ -3788,8 +2708,7 @@
-			$urlmask = getDolGlobalString('CLICKTODIAL_URL', 'ErrorClickToDialModuleNotConfigured');

-			if (!empty($user->clicktodial_url)) {

-				$urlmask = $user->clicktodial_url;

-			}

-

-			$clicktodial_poste = (!empty($user->clicktodial_poste) ? urlencode($user->clicktodial_poste) : '');

-			$clicktodial_login = (!empty($user->clicktodial_login) ? urlencode($user->clicktodial_login) : '');

-			$clicktodial_password = (!empty($user->clicktodial_password) ? urlencode($user->clicktodial_password) : '');

+			$urlmask = 'ErrorClickToDialModuleNotConfigured';

+			if (!empty($conf->global->CLICKTODIAL_URL)) $urlmask = $conf->global->CLICKTODIAL_URL;

+			if (!empty($user->clicktodial_url)) $urlmask = $user->clicktodial_url;

+

+			$clicktodial_poste = (!empty($user->clicktodial_poste) ?urlencode($user->clicktodial_poste) : '');

+			$clicktodial_login = (!empty($user->clicktodial_login) ?urlencode($user->clicktodial_login) : '');

+			$clicktodial_password = (!empty($user->clicktodial_password) ?urlencode($user->clicktodial_password) : '');

@@ -3804,32 +2723,18 @@
-			if (!getDolGlobalString('CLICKTODIAL_DO_NOT_USE_AJAX_CALL')) {

-				// Default and recommended: New method using ajax without submiting a page making a javascript history.go(-1) back

-				$newphoneastart = '<a href="'.$url.'" class="cssforclicktodial">';	// Call of ajax is handled by the lib_foot.js.php on class 'cssforclicktodial'

-				$newphoneaend = '</a>';

-			} else {

-				// Old method

-				$newphoneastart = '<a href="'.$url.'"';

-				if (getDolGlobalString('CLICKTODIAL_FORCENEWTARGET')) {

-					$newphoneastart .= ' target="_blank" rel="noopener noreferrer"';

-				}

-				$newphoneastart .= '>';

-				$newphoneaend .= '</a>';

-			}

-		}

-

-		//if (($cid || $socid) && isModEnabled('agenda') && $user->hasRight('agenda', 'myactions', 'create'))

-		if (isModEnabled('agenda') && $user->hasRight("agenda", "myactions", "create")) {

-			$type = 'AC_TEL';

-			$addlinktoagenda = '';

-			if ($addlink == 'AC_FAX') {

-				$type = 'AC_FAX';

-			}

-			if (getDolGlobalString('AGENDA_ADDACTIONFORPHONE')) {

-				$addlinktoagenda = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage='. urlencode($_SERVER['REQUEST_URI']) .'&amp;actioncode='.$type.($cid ? '&amp;contactid='.$cid : '').($socid ? '&amp;socid='.$socid : '').'">'.img_object($langs->trans("AddAction"), "calendar").'</a>';

-			}

-			if ($addlinktoagenda) {

-				$newphone = '<span>'.$newphone.' '.$addlinktoagenda.'</span>';

-			}

-		}

-	}

-

-	if (empty($titlealt)) {

+			$newphonesav = $newphone;

+			$newphone = '<a href="'.$url.'"';

+			if (!empty($conf->global->CLICKTODIAL_FORCENEWTARGET)) $newphone .= ' target="_blank"';

+			$newphone .= '>'.$newphonesav.'</a>';

+		}

+

+		//if (($cid || $socid) && ! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)

+		if (!empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)

+		{

+			$type = 'AC_TEL'; $link = '';

+			if ($addlink == 'AC_FAX') $type = 'AC_FAX';

+			if (!empty($conf->global->AGENDA_ADDACTIONFORPHONE)) $link = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.($cid ? '&amp;contactid='.$cid : '').($socid ? '&amp;socid='.$socid : '').'">'.img_object($langs->trans("AddAction"), "calendar").'</a>';

+			if ($link) $newphone = '<div>'.$newphone.' '.$link.'</div>';

+		}

+	}

+

+	if (empty($titlealt))

+	{

@@ -3845 +2750,2 @@
-	if (empty($reshook)) {

+	if (empty($reshook))

+	{

@@ -3850 +2756 @@
-			} elseif ($withpicto == 'phone') {

+			}elseif ($withpicto == 'phone') {

@@ -3852 +2758 @@
-			} elseif ($withpicto == 'mobile') {

+			}elseif ($withpicto == 'mobile') {

@@ -3858,18 +2764,5 @@
-		if ($adddivfloat == 1) {

-			$rep .= '<div class="nospan float" style="margin-right: 10px">';

-		} elseif (empty($adddivfloat)) {

-			$rep .= '<span style="margin-right: 10px;">';

-		}

-

-		$rep .= $newphoneastart;

-		$rep .= ($withpicto ? img_picto($titlealt, 'object_'.$picto.'.png') : '');

-		if ($separ != 'hidenum') {

-			$rep .= ($withpicto ? ' ' : '').$newphone;

-		}

-		$rep .= $newphoneaend;

-

-		if ($adddivfloat == 1) {

-			$rep .= '</div>';

-		} elseif (empty($adddivfloat)) {

-			$rep .= '</span>';

-		}

+		if ($adddivfloat) $rep .= '<div class="nospan float" style="margin-right: 10px">';

+		else $rep .= '<span style="margin-right: 10px;">';

+		$rep .= ($withpicto ?img_picto($titlealt, 'object_'.$picto.'.png').' ' : '').$newphone;

+		if ($adddivfloat) $rep .= '</div>';

+		else $rep .= '</span>';

@@ -3890 +2783 @@
-	global $langs;

+	global $conf, $langs;

@@ -3894,5 +2787,4 @@
-	if (empty($mode)) {

-		$ret .= $ip;

-	}

-

-	if ($mode != 2) {

+	if (empty($mode)) $ret .= $ip;

+

+	if ($mode != 2)

+	{

@@ -3900,2 +2792,4 @@
-		if ($countrycode) {	// If success, countrycode is us, fr, ...

-			if (file_exists(DOL_DOCUMENT_ROOT.'/theme/common/flags/'.$countrycode.'.png')) {

+		if ($countrycode)	// If success, countrycode is us, fr, ...

+		{

+			if (file_exists(DOL_DOCUMENT_ROOT.'/theme/common/flags/'.$countrycode.'.png'))

+			{

@@ -3903,4 +2797,5 @@
-			} else {

-				$ret .= ' ('.$countrycode.')';

-			}

-		} else {

+			}

+			else $ret .= ' ('.$countrycode.')';

+		}

+		else

+		{

@@ -3924,13 +2819 @@
-	if (empty($_SERVER['HTTP_X_FORWARDED_FOR']) || preg_match('/[^0-9\.\:,\[\]]/', $_SERVER['HTTP_X_FORWARDED_FOR'])) {

-		if (empty($_SERVER['HTTP_CLIENT_IP']) || preg_match('/[^0-9\.\:,\[\]]/', $_SERVER['HTTP_CLIENT_IP'])) {

-			if (empty($_SERVER["HTTP_CF_CONNECTING_IP"])) {

-				$ip = (empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR']);	// value may have been the IP of the proxy and not the client

-			} else {

-				$ip = $_SERVER["HTTP_CF_CONNECTING_IP"];	// value here may have been forged by client

-			}

-		} else {

-			$ip = $_SERVER['HTTP_CLIENT_IP']; // value is clean here but may have been forged by proxy

-		}

-	} else {

-		$ip = $_SERVER['HTTP_X_FORWARDED_FOR']; // value is clean here but may have been forged by proxy

-	}

+	$ip = empty($_SERVER['HTTP_X_FORWARDED_FOR']) ? (empty($_SERVER['HTTP_CLIENT_IP']) ? (empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR']) : $_SERVER['HTTP_CLIENT_IP']) : $_SERVER['HTTP_X_FORWARDED_FOR'];

@@ -3938,19 +2820,0 @@
-}

-

-/**

- * Return if we are using a HTTPS connexion

- * Check HTTPS (no way to be modified by user but may be empty or wrong if user is using a proxy)

- * Take HTTP_X_FORWARDED_PROTO (defined when using proxy)

- * Then HTTP_X_FORWARDED_SSL

- *

- * @return	boolean		True if user is using HTTPS

- */

-function isHTTPS()

-{

-	$isSecure = false;

-	if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {

-		$isSecure = true;

-	} elseif (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || !empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') {

-		$isSecure = true;

-	}

-	return $isSecure;

@@ -3971,2 +2835,3 @@
-	if (!empty($conf->geoipmaxmind->enabled)) {

-		$datafile = getDolGlobalString('GEOIPMAXMIND_COUNTRY_DATAFILE');

+	if (!empty($conf->geoipmaxmind->enabled))

+	{

+		$datafile = $conf->global->GEOIPMAXMIND_COUNTRY_DATAFILE;

@@ -3997 +2862,2 @@
-	if (!empty($conf->geoipmaxmind->enabled)) {

+	if (!empty($conf->geoipmaxmind->enabled))

+	{

@@ -3999 +2865 @@
-		$datafile = getDolGlobalString('GEOIPMAXMIND_COUNTRY_DATAFILE');

+		$datafile = $conf->global->GEOIPMAXMIND_COUNTRY_DATAFILE;

@@ -4028 +2894,2 @@
-	if ($address) {

+	if ($address)

+	{

@@ -4034,6 +2901,4 @@
-		if (empty($reshook)) {

-			if (empty($charfornl)) {

-				$out .= nl2br($address);

-			} else {

-				$out .= preg_replace('/[\r\n]+/', $charfornl, $address);

-			}

+		if (empty($reshook))

+		{

+			if (empty($charfornl)) $out .= nl2br($address);

+			else $out .= preg_replace('/[\r\n]+/', $charfornl, $address);

@@ -4043,25 +2908,8 @@
-			if (($element == 'thirdparty' || $element == 'societe') && isModEnabled('google') && getDolGlobalString('GOOGLE_ENABLE_GMAPS')) {

-				$showgmap = 1;

-			}

-			if ($element == 'contact' && isModEnabled('google') && getDolGlobalString('GOOGLE_ENABLE_GMAPS_CONTACTS')) {

-				$showgmap = 1;

-			}

-			if ($element == 'member' && isModEnabled('google') && getDolGlobalString('GOOGLE_ENABLE_GMAPS_MEMBERS')) {

-				$showgmap = 1;

-			}

-			if ($element == 'user' && isModEnabled('google') && getDolGlobalString('GOOGLE_ENABLE_GMAPS_USERS')) {

-				$showgmap = 1;

-			}

-			if (($element == 'thirdparty' || $element == 'societe') && isModEnabled('openstreetmap') && getDolGlobalString('OPENSTREETMAP_ENABLE_MAPS')) {

-				$showomap = 1;

-			}

-			if ($element == 'contact' && isModEnabled('openstreetmap') && getDolGlobalString('OPENSTREETMAP_ENABLE_MAPS_CONTACTS')) {

-				$showomap = 1;

-			}

-			if ($element == 'member' && isModEnabled('openstreetmap') && getDolGlobalString('OPENSTREETMAP_ENABLE_MAPS_MEMBERS')) {

-				$showomap = 1;

-			}

-			if ($element == 'user' && isModEnabled('openstreetmap') && getDolGlobalString('OPENSTREETMAP_ENABLE_MAPS_USERS')) {

-				$showomap = 1;

-			}

-			if ($showgmap) {

+			if (($element == 'thirdparty' || $element == 'societe') && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS)) $showgmap = 1;

+			if ($element == 'contact' && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS_CONTACTS)) $showgmap = 1;

+			if ($element == 'member' && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS_MEMBERS)) $showgmap = 1;

+			if (($element == 'thirdparty' || $element == 'societe') && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS)) $showomap = 1;

+			if ($element == 'contact' && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_CONTACTS)) $showomap = 1;

+			if ($element == 'member' && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_MEMBERS)) $showomap = 1;

+			if ($showgmap)

+			{

@@ -4071 +2919,2 @@
-			if ($showomap) {

+			if ($showomap)

+			{

@@ -4077,12 +2926,9 @@
-	if ($noprint) {

-		return $out;

-	} else {

-		print $out;

-	}

-}

-

-

-/**

- *	Return true if email syntax is ok.

- *

- *	@param	    string		$address    			email (Ex: "toto@examle.com". Long form "John Do <johndo@example.com>" will be false)

+	if ($noprint) return $out;

+	else print $out;

+}

+

+

+/**

+ *	Return true if email syntax is ok

+ *

+ *	@param	    string		$address    			email (Ex: "toto@examle.com", "John Do <johndo@example.com>")

@@ -4090 +2935,0 @@
- *  @param		int			$acceptuserkey			If 1, the special string '__USER_EMAIL__' is also accepted as valid

@@ -4092,13 +2937,5 @@
- *  @see isValidMXRecord()

- */

-function isValidEmail($address, $acceptsupervisorkey = 0, $acceptuserkey = 0)

-{

-	if ($acceptsupervisorkey && $address == '__SUPERVISOREMAIL__') {

-		return true;

-	}

-	if ($acceptuserkey && $address == '__USER_EMAIL__') {

-		return true;

-	}

-	if (filter_var($address, FILTER_VALIDATE_EMAIL)) {

-		return true;

-	}

+ */

+function isValidEmail($address, $acceptsupervisorkey = 0)

+{

+	if ($acceptsupervisorkey && $address == '__SUPERVISOREMAIL__') return true;

+	if (filter_var($address, FILTER_VALIDATE_EMAIL)) return true;

@@ -4115 +2951,0 @@
- *  @see isValidEmail()

@@ -4119,2 +2955,4 @@
-	if (function_exists('idn_to_ascii') && function_exists('checkdnsrr')) {

-		if (!checkdnsrr(idn_to_ascii($domain), 'MX')) {

+	if (function_exists('idn_to_ascii') && function_exists('checkdnsrr'))

+	{

+		if (!checkdnsrr(idn_to_ascii($domain), 'MX'))

+		{

@@ -4123 +2961,2 @@
-		if (function_exists('getmxrr')) {

+		if (function_exists('getmxrr'))

+		{

@@ -4127,6 +2966,2 @@
-			if (count($mxhosts) > 1) {

-				return 1;

-			}

-			if (count($mxhosts) == 1 && !empty($mxhosts[0])) {

-				return 1;

-			}

+			if (count($mxhosts) > 1) return 1;

+			if (count($mxhosts) == 1 && !empty($mxhosts[0])) return 1;

@@ -4137,2 +2971,0 @@
-

-	// function idn_to_ascii or checkdnsrr or getmxrr does not exists

@@ -4152,21 +2984,0 @@
-}

-

-

-/**

- * Return first letters of a strings.

- * Example with nbofchar=1: 'ghi' will return 'g' but 'abc def' will return 'ad'

- * Example with nbofchar=2: 'ghi' will return 'gh' but 'abc def' will return 'abde'

- *

- * @param	string	$s				String to truncate

- * @param 	int		$nbofchar		Nb of characters to keep

- * @return	string					Return first chars.

- */

-function dolGetFirstLetters($s, $nbofchar = 1)

-{

-	$ret = '';

-	$tmparray = explode(' ', $s);

-	foreach ($tmparray as $tmps) {

-		$ret .= dol_substr($tmps, 0, $nbofchar);

-	}

-

-	return $ret;

@@ -4185,9 +2997,2 @@
-	if (is_null($string)) {

-		return 0;

-	}

-

-	if (function_exists('mb_strlen')) {

-		return mb_strlen($string, $stringencoding);

-	} else {

-		return strlen($string);

-	}

+	if (function_exists('mb_strlen')) return mb_strlen($string, $stringencoding);

+	else return strlen($string);

@@ -4199,8 +3004,8 @@
- * @param	string		$string				String to scan

- * @param	string		$start				Start position

- * @param	int|null	$length				Length (in nb of characters or nb of bytes depending on trunconbytes param)

- * @param   string		$stringencoding		Page code used for input string encoding

- * @param	int			$trunconbytes		1=Length is max of bytes instead of max of characters

- * @return  string							substring

- */

-function dol_substr($string, $start, $length = null, $stringencoding = '', $trunconbytes = 0)

+ * @param	string	$string				String to scan

+ * @param	string	$start				Start position

+ * @param	int		$length				Length (in nb of characters or nb of bytes depending on trunconbytes param)

+ * @param   string	$stringencoding		Page code used for input string encoding

+ * @param	int		$trunconbytes		1=Length is max of bytes instead of max of characters

+ * @return  string						substring

+ */

+function dol_substr($string, $start, $length, $stringencoding = '', $trunconbytes = 0)

@@ -4210,3 +3015 @@
-	if (empty($stringencoding)) {

-		$stringencoding = $langs->charset_output;

-	}

+	if (empty($stringencoding)) $stringencoding = $langs->charset_output;

@@ -4215,2 +3018,4 @@
-	if (empty($trunconbytes)) {

-		if (function_exists('mb_substr')) {

+	if (empty($trunconbytes))

+	{

+		if (function_exists('mb_substr'))

+		{

@@ -4218 +3023,3 @@
-		} else {

+		}

+		else

+		{

@@ -4221,2 +3028,5 @@
-	} else {

-		if (function_exists('mb_strcut')) {

+	}

+	else

+	{

+		if (function_exists('mb_strcut'))

+		{

@@ -4224 +3034,3 @@
-		} else {

+		}

+		else

+		{

@@ -4233,2 +3045,2 @@
- *	Truncate a string to a particular length adding '…' if string larger than length.

- * 	If length = max length+1, we do no truncate to avoid having just 1 char replaced with '…'.

+ *	Truncate a string to a particular length adding '...' if string larger than length.

+ * 	If length = max length+1, we do no truncate to avoid having just 1 char replaced with '...'.

@@ -4238,2 +3050,2 @@
- *	@param  int		$size				Max string size visible (excluding …). 0 for no limit. WARNING: Final string size can have 3 more chars (if we added …, or if size was max+1 so it does not worse to replace with ...)

- *	@param	string	$trunc				Where to trunc: 'right', 'left', 'middle' (size must be a 2 power), 'wrap'

+ *	@param  int		$size				Max string size visible (excluding ...). 0 for no limit. WARNING: Final string size can have 3 more chars (if we added ..., or if size was max+1 or max+2 or max+3 so it does not worse to replace with ...)

+ *	@param	string	$trunc				Where to trunc: right, left, middle (size must be a 2 power), wrap

@@ -4241 +3053 @@
- *  @param	int		$nodot				Truncation do not add … after truncation. So it's an exact truncation.

+ *  @param	int		$nodot				Truncation do not add ... after truncation. So it's an exact truncation.

@@ -4249 +3061,14 @@
-	if (empty($size) || getDolGlobalString('MAIN_DISABLE_TRUNC')) {

+	if ($size == 0 || !empty($conf->global->MAIN_DISABLE_TRUNC)) return $string;

+

+	if (empty($stringencoding)) $stringencoding = 'UTF-8';

+	// reduce for small screen

+	if ($conf->dol_optimize_smallscreen == 1 && $display == 1) $size = round($size / 3);

+

+	// We go always here

+	if ($trunc == 'right')

+	{

+		$newstring = dol_textishtml($string) ?dol_string_nohtmltag($string, 1) : $string;

+		if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...

+		return dol_substr($newstring, 0, $size, $stringencoding).($nodot ? '' : '...');

+		else

+		//return 'u'.$size.'-'.$newstring.'-'.dol_strlen($newstring,$stringencoding).'-'.$string;

@@ -4252,22 +3077,5 @@
-

-	if (empty($stringencoding)) {

-		$stringencoding = 'UTF-8';

-	}

-	// reduce for small screen

-	if ($conf->dol_optimize_smallscreen == 1 && $display == 1) {

-		$size = round($size / 3);

-	}

-

-	// We go always here

-	if ($trunc == 'right') {

-		$newstring = dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;

-		if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 1))) {

-			// If nodot is 0 and size is 1 chars more, we don't trunc and don't add …

-			return dol_substr($newstring, 0, $size, $stringencoding).($nodot ? '' : '…');

-		} else {

-			//return 'u'.$size.'-'.$newstring.'-'.dol_strlen($newstring,$stringencoding).'-'.$string;

-			return $string;

-		}

-	} elseif ($trunc == 'middle') {

-		$newstring = dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;

-		if (dol_strlen($newstring, $stringencoding) > 2 && dol_strlen($newstring, $stringencoding) > ($size + 1)) {

+	elseif ($trunc == 'middle')

+	{

+		$newstring = dol_textishtml($string) ?dol_string_nohtmltag($string, 1) : $string;

+		if (dol_strlen($newstring, $stringencoding) > 2 && dol_strlen($newstring, $stringencoding) > ($size + 1))

+		{

@@ -4276,65 +3084,23 @@
-			return dol_substr($newstring, 0, $size1, $stringencoding).'…'.dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size2, $size2, $stringencoding);

-		} else {

-			return $string;

-		}

-	} elseif ($trunc == 'left') {

-		$newstring = dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;

-		if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 1))) {

-			// If nodot is 0 and size is 1 chars more, we don't trunc and don't add …

-			return '…'.dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size, $size, $stringencoding);

-		} else {

-			return $string;

-		}

-	} elseif ($trunc == 'wrap') {

-		$newstring = dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;

-		if (dol_strlen($newstring, $stringencoding) > ($size + 1)) {

-			return dol_substr($newstring, 0, $size, $stringencoding)."\n".dol_trunc(dol_substr($newstring, $size, dol_strlen($newstring, $stringencoding) - $size, $stringencoding), $size, $trunc);

-		} else {

-			return $string;

-		}

-	} else {

-		return 'BadParam3CallingDolTrunc';

-	}

-}

-

-/**

- * Return the picto for a data type

- *

- * @param 	string		$key		Key

- * @return 	string					Pïcto for the key

- */

-function getPictoForType($key)

-{

-	// Set array with type -> picto

-	$type2picto = array(

-		'varchar'=>'font',

-		'text'=>'font',

-		'html'=>'code',

-		'int'=>'sort-numeric-down',

-		'double'=>'sort-numeric-down',

-		'price'=>'currency',

-		'pricecy'=>'multicurrency',

-		'password' => 'key',

-		'boolean'=>'check-square',

-		'date'=>'calendar',

-		'datetime'=>'calendar',

-		'phone'=> 'phone',

-		'mail'=> 'email',

-		'url'=> 'url',

-		'ip'=> 'country',

-		'select' => 'list',

-		'sellist' => 'list',

-		'radio' => 'check-circle',

-		'checkbox' => 'check-square',

-		'chkbxlst' => 'check-square',

-		'link' => 'link',

-		'separate'=> 'minus'

-	);

-

-	if (!empty($type2picto[$key])) {

-		return img_picto('', $type2picto[$key], 'class="pictofixedwidth"');

-	}

-

-	return img_picto('', 'generic', 'class="pictofixedwidth"');

-}

-

+			return dol_substr($newstring, 0, $size1, $stringencoding).'...'.dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size2, $size2, $stringencoding);

+		}

+		else

+		return $string;

+	}

+	elseif ($trunc == 'left')

+	{

+		$newstring = dol_textishtml($string) ?dol_string_nohtmltag($string, 1) : $string;

+		if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...

+		return '...'.dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size, $size, $stringencoding);

+		else

+		return $string;

+	}

+	elseif ($trunc == 'wrap')

+	{

+		$newstring = dol_textishtml($string) ?dol_string_nohtmltag($string, 1) : $string;

+		if (dol_strlen($newstring, $stringencoding) > ($size + 1))

+		return dol_substr($newstring, 0, $size, $stringencoding)."\n".dol_trunc(dol_substr($newstring, $size, dol_strlen($newstring, $stringencoding) - $size, $stringencoding), $size, $trunc);

+		else

+		return $string;

+	}

+	else return 'BadParam3CallingDolTrunc';

+}

@@ -4346,3 +3112,2 @@
- *	@param      string		$picto       			Name of image file to show ('filenew', ...).

- *													For font awesome icon (example 'user'), you can use picto_nocolor to not have the color of picto forced.

- *													If no extension provided and it is not a font awesome icon, we use '.png'. Image must be stored into theme/xxx/img directory.

+ *	@param      string		$picto       			Name of image file to show ('filenew', ...)

+ *													If no extension provided, we use '.png'. Image must be stored into theme/xxx/img directory.

@@ -4352,2 +3117 @@
- *                                                  Example: fontawesome_envelope-open-text_fas_red_1em if you want to use fontaweseome icons: fontawesome_<icon-name>_<style>_<color>_<size> (only icon-name is mandatory)

- *	@param		string		$moreatt				Add more attribute on img tag (For example 'class="pictofixedwidth"')

+ *	@param		string		$moreatt				Add more attribute on img tag (For example 'style="float: right"')

@@ -4369 +3133 @@
-	$theme = isset($conf->theme) ? $conf->theme : null;

+	$theme = $conf->theme;

@@ -4371,3 +3134,0 @@
-	if (empty($picto)) {

-		$picto = 'generic';

-	}

@@ -4384,2 +3145,2 @@
-			$morecss .= ($morecss ? ' ' : '').$reg[1];

-			$moreatt = str_replace('class="'.$reg[1].'"', '', $moreatt);

+		    $morecss .= ($morecss ? ' ' : '').$reg[1];

+		    $moreatt = str_replace('class="'.$reg[1].'"', '', $moreatt);

@@ -4388,88 +3149,31 @@
-		$pictowithouttext = preg_replace('/(\.png|\.gif|\.svg)$/', '', (is_null($picto) ? '' : $picto));

-		$pictowithouttext = str_replace('object_', '', $pictowithouttext);

-		$pictowithouttext = str_replace('_nocolor', '', $pictowithouttext);

-

-		if (strpos($pictowithouttext, 'fontawesome_') === 0 || strpos($pictowithouttext, 'fa-') === 0) {

-			// This is a font awesome image 'fontawesome_xxx' or 'fa-xxx'

-			$pictowithouttext = str_replace('fontawesome_', '', $pictowithouttext);

-			$pictowithouttext = str_replace('fa-', '', $pictowithouttext);

-

-			// Compatibility with old fontawesome versions

-			if ($pictowithouttext == 'file-o') {

-				$pictowithouttext = 'file';

-			}

-

-			$pictowithouttextarray = explode('_', $pictowithouttext);

-			$marginleftonlyshort = 0;

-

-			if (!empty($pictowithouttextarray[1])) {

-				// Syntax is 'fontawesome_fakey_faprefix_facolor_fasize' or 'fa-fakey_faprefix_facolor_fasize'

-				$fakey      = 'fa-'.$pictowithouttextarray[0];

-				$faprefix   = empty($pictowithouttextarray[1]) ? 'fas' : $pictowithouttextarray[1];

-				$facolor    = empty($pictowithouttextarray[2]) ? '' : $pictowithouttextarray[2];

-				$fasize     = empty($pictowithouttextarray[3]) ? '' : $pictowithouttextarray[3];

-			} else {

-				$fakey      = 'fa-'.$pictowithouttext;

-				$faprefix   = 'fas';

-				$facolor    = '';

-				$fasize     = '';

-			}

-

-			// This snippet only needed since function img_edit accepts only one additional parameter: no separate one for css only.

-			// class/style need to be extracted to avoid duplicate class/style validation errors when $moreatt is added to the end of the attributes.

-			$morestyle = '';

-			$reg = array();

-			if (preg_match('/class="([^"]+)"/', $moreatt, $reg)) {

-				$morecss .= ($morecss ? ' ' : '').$reg[1];

-				$moreatt = str_replace('class="'.$reg[1].'"', '', $moreatt);

-			}

-			if (preg_match('/style="([^"]+)"/', $moreatt, $reg)) {

-				$morestyle = $reg[1];

-				$moreatt = str_replace('style="'.$reg[1].'"', '', $moreatt);

-			}

-			$moreatt = trim($moreatt);

-

-			$enabledisablehtml = '<span class="'.$faprefix.' '.$fakey.($marginleftonlyshort ? ($marginleftonlyshort == 1 ? ' marginleftonlyshort' : ' marginleftonly') : '');

-			$enabledisablehtml .= ($morecss ? ' '.$morecss : '').'" style="'.($fasize ? ('font-size: '.$fasize.';') : '').($facolor ? (' color: '.$facolor.';') : '').($morestyle ? ' '.$morestyle : '').'"'.(($notitle || empty($titlealt)) ? '' : ' title="'.dol_escape_htmltag($titlealt).'"').($moreatt ? ' '.$moreatt : '').'>';

-			/*if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {

-				$enabledisablehtml .= $titlealt;

-			}*/

-			$enabledisablehtml .= '</span>';

-

-			return $enabledisablehtml;

-		}

-

-		if (empty($srconly) && in_array($pictowithouttext, array(

-				'1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected',

-				'accountancy', 'accounting_account', 'account', 'accountline', 'action', 'add', 'address', 'angle-double-down', 'angle-double-up', 'asset',

-				'bank_account', 'barcode', 'bank', 'bell', 'bill', 'billa', 'billr', 'billd', 'birthday-cake', 'bookmark', 'bom', 'briefcase-medical', 'bug', 'building',

-				'card', 'calendarlist', 'calendar', 'calendarmonth', 'calendarweek', 'calendarday', 'calendarperuser', 'calendarpertype',

-				'cash-register', 'category', 'chart', 'check', 'clock', 'clone', 'close_title', 'code', 'cog', 'collab', 'company', 'contact', 'country', 'contract', 'conversation', 'cron', 'cross', 'cubes',

-				'check-circle', 'check-square', 'currency', 'multicurrency',

-				'chevron-left', 'chevron-right', 'chevron-down', 'chevron-top', 'commercial', 'companies',

-				'delete', 'dolly', 'dollyrevert', 'donation', 'download', 'dynamicprice',

-				'edit', 'ellipsis-h', 'email', 'entity', 'envelope', 'eraser', 'establishment', 'expensereport', 'external-link-alt', 'external-link-square-alt', 'eye',

-				'filter', 'file', 'file-o', 'file-code', 'file-export', 'file-import', 'file-upload', 'autofill', 'folder', 'folder-open', 'folder-plus', 'font',

-				'gears', 'generate', 'generic', 'globe', 'globe-americas', 'graph', 'grip', 'grip_title', 'group',

-				'hands-helping', 'help', 'holiday',

-				'id-card', 'images', 'incoterm', 'info', 'intervention', 'inventory', 'intracommreport', 'jobprofile',

-				'key', 'knowledgemanagement',

-				'label', 'language', 'line', 'link', 'list', 'list-alt', 'listlight', 'loan', 'lock', 'lot', 'long-arrow-alt-right',

-				'margin', 'map-marker-alt', 'member', 'meeting', 'minus', 'money-bill-alt', 'movement', 'mrp', 'note', 'next',

-				'off', 'on', 'order',

-				'paiment', 'paragraph', 'play', 'pdf', 'phone', 'phoning', 'phoning_mobile', 'phoning_fax', 'playdisabled', 'previous', 'poll', 'pos', 'printer', 'product', 'propal', 'proposal', 'puce',

-				'stock', 'resize', 'service', 'stats',

-				'security', 'setup', 'share-alt', 'sign-out', 'split', 'stripe', 'stripe-s', 'switch_off', 'switch_on', 'switch_on_warning', 'switch_on_red', 'tools', 'unlink', 'uparrow', 'user', 'user-tie', 'vcard', 'wrench',

-				'github', 'google', 'jabber', 'microsoft', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp',

-				'generic', 'home', 'hrm', 'members', 'products', 'invoicing',

-				'partnership', 'payment', 'payment_vat', 'pencil-ruler', 'pictoconfirm', 'preview', 'project', 'projectpub', 'projecttask', 'question', 'refresh', 'region',

-				'salary', 'shipment', 'state', 'supplier_invoice', 'supplier_invoicea', 'supplier_invoicer', 'supplier_invoiced',

-				'technic', 'ticket',

-				'error', 'warning',

-				'recent', 'reception', 'recruitmentcandidature', 'recruitmentjobposition', 'replacement', 'resource', 'recurring','rss',

-				'shapes', 'skill', 'square', 'sort-numeric-down', 'stop-circle', 'supplier', 'supplier_proposal', 'supplier_order', 'supplier_invoice',

-				'tick', 'timespent', 'title_setup', 'title_accountancy', 'title_bank', 'title_hrm', 'title_agenda',

-				'uncheck', 'url', 'user-cog', 'user-injured', 'user-md', 'vat', 'website', 'workstation', 'webhook', 'world', 'private',

-				'conferenceorbooth', 'eventorganization',

-				'stamp', 'signature'

-			))) {

+		$pictowithouttext = preg_replace('/(\.png|\.gif|\.svg)$/', '', $picto);

+

+        if (empty($srconly) && in_array($pictowithouttext, array(

+        		'1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected',

+        		'accountancy', 'address', 'bank_account', 'barcode', 'bank', 'bill', 'bookmark', 'bom', 'building',

+        		'cash-register', 'category', 'check', 'close_title', 'company', 'contact', 'contract', 'cubes',

+        		'delete', 'dolly', 'dollyrevert', 'edit', 'ellipsis-h', 'external-link-alt', 'external-link-square-alt',

+        		'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'folder', 'folder-open', 'globe', 'globe-americas', 'grip', 'grip_title', 'help',

+        		'intervention', 'label', 'language', 'list', 'listlight', 'lot',

+        		'map-marker-alt', 'money-bill-alt', 'mrp', 'note',

+        		'object_accounting', 'object_action', 'object_account', 'object_barcode', 'object_bill', 'object_billa', 'object_billd', 'object_bom',

+	        	'object_category', 'object_conversation', 'object_bookmark', 'object_bug', 'object_dolly', 'object_dollyrevert', 'object_generic', 'object_folder',

+        		'object_list-alt', 'object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser',

+        		'object_cash-register', 'object_company', 'object_contact', 'object_contract', 'object_donation', 'object_dynamicprice',

+        		'object_globe', 'object_holiday', 'object_hrm', 'object_invoice', 'object_intervention', 'object_label',

+        		'object_margin', 'object_money-bill-alt', 'object_multicurrency', 'object_order', 'object_payment',

+        		'object_lot', 'object_mrp', 'object_payment', 'object_product', 'object_propal',

+        		'object_other', 'object_paragraph', 'object_poll', 'object_printer', 'object_project', 'object_projectpub', 'object_propal', 'object_resource', 'object_rss', 'object_projecttask',

+        		'object_shipment', 'object_supplier_invoice', 'object_supplier_invoicea', 'object_supplier_invoiced', 'object_supplier_order', 'object_supplier_proposal', 'object_service', 'object_stock',

+        		'object_technic', 'object_ticket', 'object_trip', 'object_user', 'object_group', 'object_member',

+        		'object_phoning', 'object_phoning_mobile', 'object_phoning_fax', 'object_email', 'object_website',

+        		'off', 'on', 'order',

+        		'paiment', 'play', 'playdisabled', 'poll', 'printer', 'product', 'propal', 'projecttask', 'stock', 'resize', 'service', 'stats', 'trip',

+				'setup', 'sign-out', 'split', 'stripe-s', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'vcard', 'wrench',

+				'jabber', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp',

+				'chevron-left', 'chevron-right', 'chevron-down', 'chevron-top',

+				'home', 'companies', 'products', 'commercial', 'invoicing', 'preview', 'project', 'projectpub', 'supplier_invoice', 'hrm', 'members', 'ticket', 'generic',

+        		'error', 'warning', 'supplier_proposal', 'supplier_order', 'supplier_invoice',

+        		'title_setup', 'title_accountancy', 'title_bank', 'title_hrm', 'title_agenda'

+			)

+		)) {

@@ -4477,4 +3181,3 @@
-			$facolor = '';

-			$fasize = '';

-			$fa = getDolGlobalString('MAIN_FONTAWESOME_ICON_STYLE', 'fas');

-			if (in_array($pictowithouttext, array('card', 'bell', 'clock', 'establishment', 'file', 'file-o', 'generic', 'minus-square', 'object_generic', 'pdf', 'plus-square', 'timespent', 'note', 'off', 'on', 'object_bookmark', 'bookmark', 'vcard'))) {

+			$facolor = ''; $fasize = '';

+			$fa = 'fas';

+			if (in_array($pictowithouttext, array('object_generic', 'note', 'off', 'on', 'object_bookmark', 'bookmark', 'vcard'))) {

@@ -4483 +3186 @@
-			if (in_array($pictowithouttext, array('black-tie', 'github', 'google', 'microsoft', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'stripe', 'stripe-s', 'youtube', 'google-plus-g', 'whatsapp'))) {

+			if (in_array($pictowithouttext, array('skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'stripe-s', 'youtube', 'google-plus-g', 'whatsapp'))) {

@@ -4487,29 +3190,21 @@
-			$arrayconvpictotofa = array(

-				'account'=>'university', 'accounting_account'=>'clipboard-list', 'accountline'=>'receipt', 'accountancy'=>'search-dollar', 'action'=>'calendar-alt', 'add'=>'plus-circle', 'address'=> 'address-book', 'asset'=>'money-check-alt', 'autofill'=>'fill',

-				'bank_account'=>'university',

-				'bill'=>'file-invoice-dollar', 'billa'=>'file-excel', 'billr'=>'file-invoice-dollar', 'billd'=>'file-medical',

-				'supplier_invoice'=>'file-invoice-dollar', 'supplier_invoicea'=>'file-excel', 'supplier_invoicer'=>'file-invoice-dollar', 'supplier_invoiced'=>'file-medical',

-				'bom'=>'shapes',

-				'card'=>'address-card', 'chart'=>'chart-line', 'company'=>'building', 'contact'=>'address-book', 'contract'=>'suitcase', 'collab'=>'people-arrows', 'conversation'=>'comments', 'country'=>'globe-americas', 'cron'=>'business-time', 'cross'=>'times',

-				'donation'=>'file-alt', 'dynamicprice'=>'hand-holding-usd',

-				'setup'=>'cog', 'companies'=>'building', 'products'=>'cube', 'commercial'=>'suitcase', 'invoicing'=>'coins',

-				'accounting'=>'search-dollar', 'category'=>'tag', 'dollyrevert'=>'dolly',

-				'file-o'=>'file', 'generate'=>'plus-square', 'hrm'=>'user-tie', 'incoterm'=>'truck-loading',

-				'margin'=>'calculator', 'members'=>'user-friends', 'ticket'=>'ticket-alt', 'globe'=>'external-link-alt', 'lot'=>'barcode',

-				'email'=>'at', 'establishment'=>'building', 'edit'=>'pencil-alt', 'entity'=>'globe',

-				'graph'=>'chart-line', 'grip_title'=>'arrows-alt', 'grip'=>'arrows-alt', 'help'=>'question-circle',

-				'generic'=>'file', 'holiday'=>'umbrella-beach',

-				'info'=>'info-circle', 'inventory'=>'boxes', 'intracommreport'=>'globe-europe', 'jobprofile'=>'cogs',

-				'knowledgemanagement'=>'ticket-alt', 'label'=>'layer-group', 'line'=>'bars', 'loan'=>'money-bill-alt',

-				'member'=>'user-alt', 'meeting'=>'chalkboard-teacher', 'mrp'=>'cubes', 'next'=>'arrow-alt-circle-right',

-				'trip'=>'wallet', 'expensereport'=>'wallet', 'group'=>'users', 'movement'=>'people-carry',

-				'sign-out'=>'sign-out-alt',

-				'switch_off'=>'toggle-off', 'switch_on'=>'toggle-on',  'switch_on_warning'=>'toggle-on', 'switch_on_red'=>'toggle-on', 'check'=>'check', 'bookmark'=>'star',

-				'bank'=>'university', 'close_title'=>'times', 'delete'=>'trash', 'filter'=>'filter',

-				'list-alt'=>'list-alt', 'calendarlist'=>'bars', 'calendar'=>'calendar-alt', 'calendarmonth'=>'calendar-alt', 'calendarweek'=>'calendar-week', 'calendarday'=>'calendar-day', 'calendarperuser'=>'table',

-				'intervention'=>'ambulance', 'invoice'=>'file-invoice-dollar', 'order'=>'file-invoice',

-				'error'=>'exclamation-triangle', 'warning'=>'exclamation-triangle',

-				'other'=>'square',

-				'playdisabled'=>'play', 'pdf'=>'file-pdf', 'poll'=>'check-double', 'pos'=>'cash-register', 'preview'=>'binoculars', 'project'=>'project-diagram', 'projectpub'=>'project-diagram', 'projecttask'=>'tasks', 'propal'=>'file-signature', 'proposal'=>'file-signature',

-				'partnership'=>'handshake', 'payment'=>'money-check-alt', 'payment_vat'=>'money-check-alt', 'pictoconfirm'=>'check-square', 'phoning'=>'phone', 'phoning_mobile'=>'mobile-alt', 'phoning_fax'=>'fax', 'previous'=>'arrow-alt-circle-left', 'printer'=>'print', 'product'=>'cube', 'puce'=>'angle-right',

-				'recent' => 'check-square', 'reception'=>'dolly', 'recruitmentjobposition'=>'id-card-alt', 'recruitmentcandidature'=>'id-badge',

+			$pictowithouttext = str_replace('object_', '', $pictowithouttext);

+

+		    $arrayconvpictotofa = array(

+		    	'account'=>'university', 'accountancy'=>'money-check-alt', 'action'=>'calendar-alt', 'address'=> 'address-book',

+		    	'bank_account'=>'university', 'bill'=>'file-invoice-dollar', 'billa'=>'file-excel', 'supplier_invoicea'=>'file-excel', 'billd'=>'file-medical', 'supplier_invoiced'=>'file-medical', 'bom'=>'cubes',

+		    	'company'=>'building', 'contact'=>'address-book', 'contract'=>'suitcase', 'conversation'=>'comments', 'donation'=>'file-alt', 'dynamicprice'=>'hand-holding-usd',

+		    	'setup'=>'cog', 'companies'=>'building', 'products'=>'cube', 'commercial'=>'suitcase', 'invoicing'=>'coins',

+		    	'accounting'=>'chart-line', 'category'=>'tag', 'dollyrevert'=>'dolly',

+		    	'hrm'=>'umbrella-beach', 'margin'=>'calculator', 'members'=>'users', 'ticket'=>'ticket-alt', 'globe'=>'external-link-alt', 'lot'=>'barcode',

+		    	'email'=>'at',

+		    	'edit'=>'pencil-alt', 'grip_title'=>'arrows-alt', 'grip'=>'arrows-alt', 'help'=>'info-circle',

+		    	'generic'=>'file', 'holiday'=>'umbrella-beach', 'label'=>'layer-group',

+		    	'member'=>'users', 'mrp'=>'cubes', 'trip'=>'wallet', 'group'=>'users',

+		    	'sign-out'=>'sign-out-alt',

+		    	'switch_off'=>'toggle-off', 'switch_on'=>'toggle-on', 'check'=>'check', 'bookmark'=>'star', 'bookmark'=>'star',

+		    	'bank'=>'university', 'close_title'=>'window-close', 'delete'=>'trash', 'edit'=>'pencil-alt', 'filter'=>'filter',

+		    	'list-alt'=>'list-alt', 'calendar'=>'calendar-alt', 'calendarweek'=>'calendar-week', 'calendarmonth'=>'calendar-alt', 'calendarday'=>'calendar-day', 'calendarperuser'=>'table',

+		    	'intervention'=>'ambulance', 'invoice'=>'file-invoice-dollar', 'multicurrency'=>'dollar-sign', 'order'=>'file-invoice',

+		    	'error'=>'exclamation-triangle', 'warning'=>'exclamation-triangle',

+		    	'other'=>'square',

+		    	'playdisabled'=>'play', 'poll'=>'check-double', 'preview'=>'binoculars', 'project'=>'sitemap', 'projectpub'=>'sitemap', 'projecttask'=>'tasks', 'propal'=>'file-signature',

@@ -4517,18 +3212,9 @@
-				'refresh'=>'redo', 'region'=>'map-marked', 'replacement'=>'exchange-alt', 'resource'=>'laptop-house', 'recurring'=>'history',

-				'service'=>'concierge-bell',

-				'skill'=>'shapes', 'state'=>'map-marked-alt', 'security'=>'key', 'salary'=>'wallet', 'shipment'=>'dolly', 'stock'=>'box-open', 'stats' => 'chart-bar', 'split'=>'code-branch', 'stripe'=>'stripe-s',

-				'supplier'=>'building', 'technic'=>'cogs',

-				'timespent'=>'clock', 'tick' => 'check', 'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'university', 'title_hrm'=>'umbrella-beach',

-				'title_agenda'=>'calendar-alt',

-				'uncheck'=>'times', 'uparrow'=>'share', 'url'=>'external-link-alt', 'vat'=>'money-check-alt', 'vcard'=>'arrow-alt-circle-down',

-				'jabber'=>'comment-o',

-				'website'=>'globe-americas', 'workstation'=>'pallet', 'webhook'=>'bullseye', 'world'=>'globe', 'private'=>'user-lock',

-				'conferenceorbooth'=>'chalkboard-teacher', 'eventorganization'=>'project-diagram'

-			);

-			if ($conf->currency == 'EUR') {

-				$arrayconvpictotofa['currency'] = 'euro-sign';

-				$arrayconvpictotofa['multicurrency'] = 'dollar-sign';

-			} else {

-				$arrayconvpictotofa['currency'] = 'dollar-sign';

-				$arrayconvpictotofa['multicurrency'] = 'euro-sign';

-			}

+		    	'payment'=>'money-check-alt', 'phoning'=>'phone', 'phoning_mobile'=>'mobile-alt', 'phoning_fax'=>'fax', 'printer'=>'print', 'product'=>'cube', 'service'=>'concierge-bell',

+		    	'resource'=>'laptop-house',

+		    	'shipment'=>'dolly', 'stock'=>'box-open', 'stats' => 'chart-bar', 'split'=>'code-branch', 'supplier_invoice'=>'file-invoice-dollar', 'technic'=>'cogs', 'ticket'=>'ticket-alt',

+		    	'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'university', 'title_hrm'=>'umbrella-beach',

+		    	'title_agenda'=>'calendar-alt',

+		    	'uparrow'=>'mail-forward', 'vcard'=>'address-card',

+		    	'jabber'=>'comment-o',

+		    	'website'=>'globe-americas'

+		    );

@@ -4536 +3222 @@
-				$fakey = 'fa-square';

+			    $fakey = 'fa-square';

@@ -4538,2 +3224,3 @@
-			} elseif ($pictowithouttext == 'on') {

-				$fakey = 'fa-check-square';

+			}

+			elseif ($pictowithouttext == 'on') {

+			    $fakey = 'fa-check-square';

@@ -4541 +3228,2 @@
-			} elseif ($pictowithouttext == 'listlight') {

+			}

+			elseif ($pictowithouttext == 'listlight') {

@@ -4544 +3232,2 @@
-			} elseif ($pictowithouttext == 'printer') {

+			}

+			elseif ($pictowithouttext == 'printer') {

@@ -4547,2 +3236,3 @@
-			} elseif ($pictowithouttext == 'note') {

-				$fakey = 'fa-sticky-note';

+			}

+			elseif ($pictowithouttext == 'note') {

+			    $fakey = 'fa-sticky-note';

@@ -4550,6 +3240,5 @@
-			} elseif (in_array($pictowithouttext, array('1uparrow', '1downarrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected'))) {

-				$convertarray = array('1uparrow'=>'caret-up', '1downarrow'=>'caret-down', '1leftarrow'=>'caret-left', '1rightarrow'=>'caret-right', '1uparrow_selected'=>'caret-up', '1downarrow_selected'=>'caret-down', '1leftarrow_selected'=>'caret-left', '1rightarrow_selected'=>'caret-right');

-				$fakey = 'fa-'.$convertarray[$pictowithouttext];

-				if (preg_match('/selected/', $pictowithouttext)) {

-					$facolor = '#888';

-				}

+			}

+			elseif (in_array($pictowithouttext, array('1uparrow', '1downarrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected'))) {

+			    $convertarray = array('1uparrow'=>'caret-up', '1downarrow'=>'caret-down', '1leftarrow'=>'caret-left', '1rightarrow'=>'caret-right', '1uparrow_selected'=>'caret-up', '1downarrow_selected'=>'caret-down', '1leftarrow_selected'=>'caret-left', '1rightarrow_selected'=>'caret-right');

+			    $fakey = 'fa-'.$convertarray[$pictowithouttext];

+			    if (preg_match('/selected/', $pictowithouttext)) $facolor = '#888';

@@ -4557 +3246,3 @@
-			} elseif (!empty($arrayconvpictotofa[$pictowithouttext])) {

+			}

+			elseif (!empty($arrayconvpictotofa[$pictowithouttext]))

+			{

@@ -4559 +3250,2 @@
-			} else {

+			}

+			else {

@@ -4561,10 +3252,0 @@
-			}

-

-			if (in_array($pictowithouttext, array('dollyrevert', 'member', 'members', 'contract', 'group', 'resource', 'shipment'))) {

-				$morecss .= ' em092';

-			}

-			if (in_array($pictowithouttext, array('conferenceorbooth', 'collab', 'eventorganization', 'holiday', 'info', 'project', 'workstation'))) {

-				$morecss .= ' em088';

-			}

-			if (in_array($pictowithouttext, array('asset', 'intervention', 'payment', 'loan', 'partnership', 'stock', 'technic'))) {

-				$morecss .= ' em080';

@@ -4576 +3258 @@
-				'grip_title', 'grip', 'listlight', 'note', 'on', 'off', 'playdisabled', 'printer', 'resize', 'sign-out', 'stats', 'switch_on', 'switch_on_red', 'switch_off',

+				'grip_title', 'grip', 'listlight', 'note', 'on', 'off', 'playdisabled', 'printer', 'resize', 'sign-out', 'stats', 'switch_on', 'switch_off',

@@ -4585,7 +3267,5 @@
-				'action'=>'infobox-action', 'account'=>'infobox-bank_account', 'accounting_account'=>'infobox-bank_account', 'accountline'=>'infobox-bank_account', 'accountancy'=>'infobox-bank_account', 'asset'=>'infobox-bank_account',

-				'bank_account'=>'infobox-bank_account',

-				'bill'=>'infobox-commande', 'billa'=>'infobox-commande', 'billr'=>'infobox-commande', 'billd'=>'infobox-commande',

-				'margin'=>'infobox-bank_account', 'conferenceorbooth'=>'infobox-project',

-				'cash-register'=>'infobox-bank_account', 'contract'=>'infobox-contrat', 'check'=>'font-status4', 'collab'=>'infobox-action', 'conversation'=>'infobox-contrat',

-				'donation'=>'infobox-commande', 'dolly'=>'infobox-commande',  'dollyrevert'=>'flip infobox-order_supplier',

-				'ecm'=>'infobox-action', 'eventorganization'=>'infobox-project',

+				'action'=>'infobox-action', 'account'=>'infobox-bank_account', 'accountancy'=>'infobox-bank_account',

+				'bank_account'=>'bg-infobox-bank_account',

+				'bill'=>'infobox-commande', 'billa'=>'infobox-commande', 'billd'=>'infobox-commande',

+				'cash-register'=>'infobox-bank_account', 'contract'=>'infobox-contrat', 'check'=>'font-status4', 'conversation'=>'infobox-contrat',

+				'donation'=>'infobox-commande', 'dollyrevert'=>'flip', 'ecm'=>'infobox-action',

@@ -4593,2 +3273 @@
-				'incoterm'=>'infobox-supplier_proposal',

-				'currency'=>'infobox-bank_account', 'multicurrency'=>'infobox-bank_account',

+				'multicurrency'=>'infobox-bank_account',

@@ -4598,6 +3277,3 @@
-				'error'=>'pictoerror', 'warning'=>'pictowarning', 'switch_on'=>'font-status4', 'switch_on_warning'=>'font-status4 warning', 'switch_on_red'=>'font-status8',

-				'holiday'=>'infobox-holiday', 'info'=>'opacityhigh', 'invoice'=>'infobox-commande',

-				'knowledgemanagement'=>'infobox-contrat rotate90', 'loan'=>'infobox-bank_account',

-				'payment'=>'infobox-bank_account', 'payment_vat'=>'infobox-bank_account', 'poll'=>'infobox-adherent', 'pos'=>'infobox-bank_account', 'project'=>'infobox-project', 'projecttask'=>'infobox-project',

-				'propal'=>'infobox-propal', 'proposal'=>'infobox-propal','private'=>'infobox-project',

-				'reception'=>'flip', 'recruitmentjobposition'=>'infobox-adherent', 'recruitmentcandidature'=>'infobox-adherent',

+				'error'=>'pictoerror', 'warning'=>'pictowarning', 'switch_on'=>'font-status4',

+				'holiday'=>'infobox-holiday', 'invoice'=>'infobox-commande',

+				'payment'=>'infobox-bank_account', 'poll'=>'infobox-adherent', 'project'=>'infobox-project', 'projecttask'=>'infobox-project', 'propal'=>'infobox-propal',

@@ -4605,4 +3281,3 @@
-				'salary'=>'infobox-bank_account', 'shapes'=>'infobox-adherent', 'shipment'=>'infobox-commande', 'supplier_invoice'=>'infobox-order_supplier', 'supplier_invoicea'=>'infobox-order_supplier', 'supplier_invoiced'=>'infobox-order_supplier',

-				'supplier'=>'infobox-order_supplier', 'supplier_order'=>'infobox-order_supplier', 'supplier_proposal'=>'infobox-supplier_proposal',

-				'ticket'=>'infobox-contrat', 'title_accountancy'=>'infobox-bank_account', 'title_hrm'=>'infobox-holiday', 'expensereport'=>'infobox-expensereport', 'trip'=>'infobox-expensereport', 'title_agenda'=>'infobox-action',

-				'vat'=>'infobox-bank_account',

+				'supplier_invoice'=>'infobox-order_supplier', 'supplier_invoicea'=>'infobox-order_supplier', 'supplier_invoiced'=>'infobox-order_supplier',

+				'supplier_order'=>'infobox-order_supplier', 'supplier_proposal'=>'infobox-supplier_proposal',

+				'ticket'=>'infobox-contrat', 'title_accountancy'=>'infobox-bank_account', 'title_hrm'=>'infobox-holiday', 'trip'=>'infobox-expensereport', 'title_agenda'=>'infobox-action',

@@ -4612 +3287 @@
-			if (!empty($arrayconvpictotomorcess[$pictowithouttext]) && strpos($picto, '_nocolor') === false) {

+			if (!empty($arrayconvpictotomorcess[$pictowithouttext])) {

@@ -4618,14 +3293,9 @@
-				'address'=>'#6c6aa8', 'building'=>'#6c6aa8', 'bom'=>'#a69944',

-				'clone'=>'#999', 'cog'=>'#999', 'companies'=>'#6c6aa8', 'company'=>'#6c6aa8', 'contact'=>'#6c6aa8', 'cron'=>'#555',

-				'dynamicprice'=>'#a69944',

-				'edit'=>'#444', 'note'=>'#999', 'error'=>'', 'help'=>'#bbb', 'listlight'=>'#999', 'language'=>'#555',

-				//'dolly'=>'#a69944', 'dollyrevert'=>'#a69944',

-				'lock'=>'#ddd', 'lot'=>'#a69944',

-				'map-marker-alt'=>'#aaa', 'mrp'=>'#a69944', 'product'=>'#a69944', 'service'=>'#a69944', 'inventory'=>'#a69944', 'stock'=>'#a69944', 'movement'=>'#a69944',

-				'other'=>'#ddd', 'world'=>'#986c6a',

-				'partnership'=>'#6c6aa8', 'playdisabled'=>'#ccc', 'printer'=>'#444', 'projectpub'=>'#986c6a', 'reception'=>'#a69944', 'resize'=>'#444', 'rss'=>'#cba',

-				//'shipment'=>'#a69944',

-				'security'=>'#999', 'square'=>'#888', 'stop-circle'=>'#888', 'stats'=>'#444', 'switch_off'=>'#999',

-				'technic' => '#999', 'tick' => '#282', 'timespent' => '#555',

-				'uncheck'=>'#800', 'uparrow'=>'#555', 'user-cog'=>'#999', 'country'=>'#aaa', 'globe-americas'=>'#aaa', 'region'=>'#aaa', 'state'=>'#aaa',

-				'website'=>'#304', 'workstation'=>'#a69944'

+				'address'=>'#37a', 'building'=>'#37a', 'bom'=>'#a69944',

+				'companies'=>'#37a', 'company'=>'#37a', 'contact'=>'#37a', 'dynamicprice'=>'#a69944',

+				'edit'=>'#444', 'note'=>'#999', 'error'=>'', 'listlight'=>'#999',

+				'dolly'=>'#a69944', 'dollyrevert'=>'#a69944', 'lot'=>'#a69944',

+				'map-marker-alt'=>'#aaa', 'mrp'=>'#a69944', 'product'=>'#a69944', 'service'=>'#a69944', 'stock'=>'#a69944',

+				'other'=>'#ddd',

+				'playdisabled'=>'#ccc', 'printer'=>'#444', 'projectpub'=>'#986c6a', 'resize'=>'#444', 'rss'=>'#cba',

+				'shipment'=>'#a69944', 'stats'=>'#444', 'switch_off'=>'#999', 'uparrow'=>'#555', 'globe-americas'=>'#aaa',

+				'website'=>'#304'

@@ -4633 +3303 @@
-			if (isset($arrayconvpictotocolor[$pictowithouttext]) && strpos($picto, '_nocolor') === false) {

+			if (isset($arrayconvpictotocolor[$pictowithouttext])) {

@@ -4638,3 +3308,2 @@
-			// class/style need to be extracted to avoid duplicate class/style validation errors when $moreatt is added to the end of the attributes.

-			$morestyle = '';

-			$reg = array();

+            // class/style need to be extracted to avoid duplicate class/style validation errors when $moreatt is added to the end of the attributes.

+            $reg = array();

@@ -4642,12 +3311,12 @@
-				$morecss .= ($morecss ? ' ' : '').$reg[1];

-				$moreatt = str_replace('class="'.$reg[1].'"', '', $moreatt);

-			}

-			if (preg_match('/style="([^"]+)"/', $moreatt, $reg)) {

-				$morestyle = $reg[1];

-				$moreatt = str_replace('style="'.$reg[1].'"', '', $moreatt);

-			}

-			$moreatt = trim($moreatt);

-

-			$enabledisablehtml = '<span class="'.$fa.' '.$fakey.($marginleftonlyshort ? ($marginleftonlyshort == 1 ? ' marginleftonlyshort' : ' marginleftonly') : '');

-			$enabledisablehtml .= ($morecss ? ' '.$morecss : '').'" style="'.($fasize ? ('font-size: '.$fasize.';') : '').($facolor ? (' color: '.$facolor.';') : '').($morestyle ? ' '.$morestyle : '').'"'.(($notitle || empty($titlealt)) ? '' : ' title="'.dol_escape_htmltag($titlealt).'"').($moreatt ? ' '.$moreatt : '').'>';

-			/*if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {

+                $morecss .= ($morecss ? ' ' : '').$reg[1];

+                $moreatt = str_replace('class="'.$reg[1].'"', '', $moreatt);

+            }

+            if (preg_match('/style="([^"]+)"/', $moreatt, $reg)) {

+                $morestyle = ' '.$reg[1];

+                $moreatt = str_replace('style="'.$reg[1].'"', '', $moreatt);

+            }

+            $moreatt = trim($moreatt);

+

+            $enabledisablehtml = '<span class="'.$fa.' '.$fakey.($marginleftonlyshort ? ($marginleftonlyshort == 1 ? ' marginleftonlyshort' : ' marginleftonly') : '');

+            $enabledisablehtml .= ($morecss ? ' '.$morecss : '').'" style="'.($fasize ? ('font-size: '.$fasize.';') : '').($facolor ? (' color: '.$facolor.';') : '').($morestyle ? ' '.$morestyle : '').'"'.(($notitle || empty($titlealt)) ? '' : ' title="'.dol_escape_htmltag($titlealt).'"').($moreatt ? ' '.$moreatt : '').'>';

+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {

@@ -4655 +3324 @@
-			}*/

+			}

@@ -4661,5 +3330,7 @@
-		if (getDolGlobalString('MAIN_OVERWRITE_THEME_PATH')) {

-			$path = getDolGlobalString('MAIN_OVERWRITE_THEME_PATH') . '/theme/'.$theme; // If the theme does not have the same name as the module

-		} elseif (getDolGlobalString('MAIN_OVERWRITE_THEME_RES')) {

-			$path = getDolGlobalString('MAIN_OVERWRITE_THEME_RES') . '/theme/' . getDolGlobalString('MAIN_OVERWRITE_THEME_RES'); // To allow an external module to overwrite image resources whatever is activated theme

-		} elseif (!empty($conf->modules_parts['theme']) && array_key_exists($theme, $conf->modules_parts['theme'])) {

+		if (!empty($conf->global->MAIN_OVERWRITE_THEME_PATH)) {

+			$path = $conf->global->MAIN_OVERWRITE_THEME_PATH.'/theme/'.$theme; // If the theme does not have the same name as the module

+		}

+		elseif (!empty($conf->global->MAIN_OVERWRITE_THEME_RES)) {

+			$path = $conf->global->MAIN_OVERWRITE_THEME_RES.'/theme/'.$conf->global->MAIN_OVERWRITE_THEME_RES; // To allow an external module to overwrite image resources whatever is activated theme

+		}

+		elseif (!empty($conf->modules_parts['theme']) && array_key_exists($theme, $conf->modules_parts['theme'])) {

@@ -4700,3 +3371,2 @@
-

-	// tag title is used for tooltip on <a>, tag alt can be used with very simple text on image for blind people

-	return '<img src="'.$fullpathpicto.'"'.($notitle ? '' : ' alt="'.dol_escape_htmltag($alt).'"').(($notitle || empty($titlealt)) ? '' : ' title="'.dol_escape_htmltag($titlealt).'"').($moreatt ? ' '.$moreatt.($morecss ? ' class="'.$morecss.'"' : '') : ' class="inline-block'.($morecss ? ' '.$morecss : '').'"').'>'; // Alt is used for accessibility, title for popup

+		// tag title is used for tooltip on <a>, tag alt can be used with very simple text on image for blind people

+    return '<img src="'.$fullpathpicto.'" alt="'.dol_escape_htmltag($alt).'"'.(($notitle || empty($titlealt)) ? '' : ' title="'.dol_escape_htmltag($titlealt).'"').($moreatt ? ' '.$moreatt.($morecss ? ' class="'.$morecss.'"' : '') : ' class="inline-block'.($morecss ? ' '.$morecss : '').'"').'>'; // Alt is used for accessibility, title for popup

@@ -4720,5 +3390,2 @@
-	if (strpos($picto, '^') === 0) {

-		return img_picto($titlealt, str_replace('^', '', $picto), $moreatt, $pictoisfullpath, $srconly, $notitle);

-	} else {

-		return img_picto($titlealt, 'object_'.$picto, $moreatt, $pictoisfullpath, $srconly, $notitle);

-	}

+	if (strpos($picto, '^') === 0) return img_picto($titlealt, str_replace('^', '', $picto), $moreatt, $pictoisfullpath, $srconly, $notitle);

+	else return img_picto($titlealt, 'object_'.$picto, $moreatt, $pictoisfullpath, $srconly, $notitle);

@@ -4742,7 +3409,7 @@
-	if (is_numeric($picto)) {

-		//$leveltopicto = array(0=>'weather-clear.png', 1=>'weather-few-clouds.png', 2=>'weather-clouds.png', 3=>'weather-many-clouds.png', 4=>'weather-storm.png');

-		//$picto = $leveltopicto[$picto];

-		return '<i class="fa fa-weather-level'.$picto.'"></i>';

-	} elseif (!preg_match('/(\.png|\.gif)$/i', $picto)) {

-		$picto .= '.png';

-	}

+	if (is_numeric($picto))

+	{

+		$leveltopicto = array(0=>'weather-clear.png', 1=>'weather-few-clouds.png', 2=>'weather-clouds.png', 3=>'weather-many-clouds.png', 4=>'weather-storm.png');

+		//return '<i class="fa fa-weather-level'.$picto.'"></i>';

+		$picto = $leveltopicto[$picto];

+	}

+	elseif (!preg_match('/(\.png|\.gif)$/i', $picto)) $picto .= '.png';

@@ -4762 +3428,0 @@
- *  @param		int			$notitle			1=Disable tag title. Use it if you add js tooltip, to avoid duplicate tooltip.

@@ -4766 +3432 @@
-function img_picto_common($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0, $notitle = 0)

+function img_picto_common($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0)

@@ -4770,7 +3436,5 @@
-	if (!preg_match('/(\.png|\.gif)$/i', $picto)) {

-		$picto .= '.png';

-	}

-

-	if ($pictoisfullpath) {

-		$path = $picto;

-	} else {

+	if (!preg_match('/(\.png|\.gif)$/i', $picto)) $picto .= '.png';

+

+	if ($pictoisfullpath) $path = $picto;

+	else

+	{

@@ -4779 +3443,2 @@
-		if (getDolGlobalInt('MAIN_MODULE_CAN_OVERWRITE_COMMONICONS')) {

+		if (!empty($conf->global->MAIN_MODULE_CAN_OVERWRITE_COMMONICONS))

+		{

@@ -4782,7 +3447,5 @@
-			if (file_exists($themepath)) {

-				$path = $themepath;

-			}

-		}

-	}

-

-	return img_picto($titlealt, $path, $moreatt, 1, 0, $notitle);

+			if (file_exists($themepath)) $path = $themepath;

+		}

+	}

+

+	return img_picto($titlealt, $path, $moreatt, 1);

@@ -4796,6 +3458,0 @@
- *	@param 	string		$picto      	Name of image file to show ('filenew', ...)

- *                                      If no extension provided, we use '.png'. Image must be stored into theme/xxx/img directory.

- *                                      Example: picto.png                  if picto.png is stored into htdocs/theme/mytheme/img

- *                                      Example: picto.png@mymodule         if picto.png is stored into htdocs/mymodule/img

- *                                      Example: /mydir/mysubdir/picto.png  if picto.png is stored into htdocs/mydir/mysubdir (pictoisfullpath must be set to 1)

- *  @param	string		$moreatt		More attributes

@@ -4804 +3461 @@
-function img_action($titlealt, $numaction, $picto = '', $moreatt = '')

+function img_action($titlealt, $numaction)

@@ -4808,26 +3465,12 @@
-	if (empty($titlealt) || $titlealt == 'default') {

-		if ($numaction == '-1' || $numaction == 'ST_NO') {

-			$numaction = -1;

-			$titlealt = $langs->transnoentitiesnoconv('ChangeDoNotContact');

-		} elseif ($numaction == '0' || $numaction == 'ST_NEVER') {

-			$numaction = 0;

-			$titlealt = $langs->transnoentitiesnoconv('ChangeNeverContacted');

-		} elseif ($numaction == '1' || $numaction == 'ST_TODO') {

-			$numaction = 1;

-			$titlealt = $langs->transnoentitiesnoconv('ChangeToContact');

-		} elseif ($numaction == '2' || $numaction == 'ST_PEND') {

-			$numaction = 2;

-			$titlealt = $langs->transnoentitiesnoconv('ChangeContactInProcess');

-		} elseif ($numaction == '3' || $numaction == 'ST_DONE') {

-			$numaction = 3;

-			$titlealt = $langs->transnoentitiesnoconv('ChangeContactDone');

-		} else {

-			$titlealt = $langs->transnoentitiesnoconv('ChangeStatus '.$numaction);

-			$numaction = 0;

-		}

-	}

-	if (!is_numeric($numaction)) {

-		$numaction = 0;

-	}

-

-	return img_picto($titlealt, (empty($picto) ? 'stcomm'.$numaction.'.png' : $picto), $moreatt);

+	if (empty($titlealt) || $titlealt == 'default')

+	{

+		if ($numaction == '-1' || $numaction == 'ST_NO') { $numaction = -1; $titlealt = $langs->transnoentitiesnoconv('ChangeDoNotContact'); }

+		elseif ($numaction == '0' || $numaction == 'ST_NEVER') { $numaction = 0; $titlealt = $langs->transnoentitiesnoconv('ChangeNeverContacted'); }

+		elseif ($numaction == '1' || $numaction == 'ST_TODO') { $numaction = 1; $titlealt = $langs->transnoentitiesnoconv('ChangeToContact'); }

+		elseif ($numaction == '2' || $numaction == 'ST_PEND') { $numaction = 2; $titlealt = $langs->transnoentitiesnoconv('ChangeContactInProcess'); }

+		elseif ($numaction == '3' || $numaction == 'ST_DONE') { $numaction = 3; $titlealt = $langs->transnoentitiesnoconv('ChangeContactDone'); }

+		else { $titlealt = $langs->transnoentitiesnoconv('ChangeStatus '.$numaction); $numaction = 0; }

+	}

+	if (!is_numeric($numaction)) $numaction = 0;

+

+	return img_picto($titlealt, 'stcomm'.$numaction.'.png');

@@ -4847,3 +3490 @@
-	if ($titlealt == 'default') {

-		$titlealt = $langs->trans('Show');

-	}

+	if ($titlealt == 'default') $titlealt = $langs->trans('Show');

@@ -4865,3 +3506 @@
-	if ($titlealt == 'default') {

-		$titlealt = $langs->trans('Add');

-	}

+	if ($titlealt == 'default') $titlealt = $langs->trans('Add');

@@ -4882,3 +3521 @@
-	if ($titlealt == 'default') {

-		$titlealt = $langs->trans('Remove');

-	}

+	if ($titlealt == 'default') $titlealt = $langs->trans('Remove');

@@ -4901,3 +3538 @@
-	if ($titlealt == 'default') {

-		$titlealt = $langs->trans('Modify');

-	}

+	if ($titlealt == 'default') $titlealt = $langs->trans('Modify');

@@ -4916 +3551 @@
-function img_view($titlealt = 'default', $float = 0, $other = 'class="valignmiddle"')

+function img_view($titlealt = 'default', $float = 0, $other = '')

@@ -4920,3 +3555 @@
-	if ($titlealt == 'default') {

-		$titlealt = $langs->trans('View');

-	}

+	if ($titlealt == 'default') $titlealt = $langs->trans('View');

@@ -4926 +3559 @@
-	return img_picto($titlealt, 'eye', $moreatt);

+	return img_picto($titlealt, 'view.png', $moreatt);

@@ -4941,3 +3574 @@
-	if ($titlealt == 'default') {

-		$titlealt = $langs->trans('Delete');

-	}

+	if ($titlealt == 'default') $titlealt = $langs->trans('Delete');

@@ -4958,3 +3589 @@
-	if ($titlealt == "default") {

-		$titlealt = $langs->trans("Print");

-	}

+	if ($titlealt == "default") $titlealt = $langs->trans("Print");

@@ -4975,3 +3604 @@
-	if ($titlealt == 'default') {

-		$titlealt = $langs->trans('Split');

-	}

+	if ($titlealt == 'default') $titlealt = $langs->trans('Split');

@@ -4993,6 +3620,4 @@
-	if ($usealttitle) {

-		if (is_string($usealttitle)) {

-			$usealttitle = dol_escape_htmltag($usealttitle);

-		} else {

-			$usealttitle = $langs->trans('Info');

-		}

+	if ($usealttitle)

+	{

+		if (is_string($usealttitle)) $usealttitle = dol_escape_htmltag($usealttitle);

+		else $usealttitle = $langs->trans('Info');

@@ -5014,3 +3639 @@
-	if ($titlealt == 'default') {

-		$titlealt = $langs->trans('Informations');

-	}

+	if ($titlealt == 'default') $titlealt = $langs->trans('Informations');

@@ -5033,3 +3656 @@
-	if ($titlealt == 'default') {

-		$titlealt = $langs->trans('Warning');

-	}

+	if ($titlealt == 'default') $titlealt = $langs->trans('Warning');

@@ -5051,3 +3672 @@
-	if ($titlealt == 'default') {

-		$titlealt = $langs->trans('Error');

-	}

+	if ($titlealt == 'default') $titlealt = $langs->trans('Error');

@@ -5069,3 +3688 @@
-	if ($titlealt == 'default') {

-		$titlealt = $langs->trans('Next');

-	}

+	if ($titlealt == 'default') $titlealt = $langs->trans('Next');

@@ -5088,3 +3705 @@
-	if ($titlealt == 'default') {

-		$titlealt = $langs->trans('Previous');

-	}

+	if ($titlealt == 'default') $titlealt = $langs->trans('Previous');

@@ -5108,3 +3723 @@
-	if ($titlealt == 'default') {

-		$titlealt = $langs->trans('Down');

-	}

+	if ($titlealt == 'default') $titlealt = $langs->trans('Down');

@@ -5127,3 +3740 @@
-	if ($titlealt == 'default') {

-		$titlealt = $langs->trans('Up');

-	}

+	if ($titlealt == 'default') $titlealt = $langs->trans('Up');

@@ -5146,3 +3757 @@
-	if ($titlealt == 'default') {

-		$titlealt = $langs->trans('Left');

-	}

+	if ($titlealt == 'default') $titlealt = $langs->trans('Left');

@@ -5165,3 +3774 @@
-	if ($titlealt == 'default') {

-		$titlealt = $langs->trans('Right');

-	}

+	if ($titlealt == 'default') $titlealt = $langs->trans('Right');

@@ -5183,7 +3790,3 @@
-	if ($titlealt == 'default') {

-		$titlealt = $langs->trans('Active');

-	}

-

-	if ($allow == 1) {

-		return img_picto($titlealt, 'tick.png');

-	}

+	if ($titlealt == 'default') $titlealt = $langs->trans('Active');

+

+	if ($allow == 1) return img_picto($titlealt, 'tick.png');

@@ -5197,2 +3800,2 @@
- *	@param  string	$brand		Brand name of credit card

- *  @param  string	$morecss	More CSS

+ *	@param	string	$brand		Brand name of credit card

+ *  @param	string	$morecss	More CSS

@@ -5203,19 +3806,9 @@
-	if (is_null($morecss)) {

-		$morecss = 'fa-2x';

-	}

-

-	if ($brand == 'visa' || $brand == 'Visa') {

-		$brand = 'cc-visa';

-	} elseif ($brand == 'mastercard' || $brand == 'MasterCard') {

-		$brand = 'cc-mastercard';

-	} elseif ($brand == 'amex' || $brand == 'American Express') {

-		$brand = 'cc-amex';

-	} elseif ($brand == 'discover' || $brand == 'Discover') {

-		$brand = 'cc-discover';

-	} elseif ($brand == 'jcb' || $brand == 'JCB') {

-		$brand = 'cc-jcb';

-	} elseif ($brand == 'diners' || $brand == 'Diners club') {

-		$brand = 'cc-diners-club';

-	} elseif (!in_array($brand, array('cc-visa', 'cc-mastercard', 'cc-amex', 'cc-discover', 'cc-jcb', 'cc-diners-club'))) {

-		$brand = 'credit-card';

-	}

+	if (is_null($morecss)) $morecss = 'fa-2x';

+

+	if ($brand == 'visa' || $brand == 'Visa') {$brand = 'cc-visa'; }

+	elseif ($brand == 'mastercard' || $brand == 'MasterCard') {$brand = 'cc-mastercard'; }

+	elseif ($brand == 'amex' || $brand == 'American Express') {$brand = 'cc-amex'; }

+	elseif ($brand == 'discover' || $brand == 'Discover') {$brand = 'cc-discover'; }

+	elseif ($brand == 'jcb' || $brand == 'JCB') {$brand = 'cc-jcb'; }

+	elseif ($brand == 'diners' || $brand == 'Diners club') {$brand = 'cc-diners-club'; }

+	elseif (!in_array($brand, array('cc-visa', 'cc-mastercard', 'cc-amex', 'cc-discover', 'cc-jcb', 'cc-diners-club'))) {$brand = 'credit-card'; }

@@ -5242,3 +3835 @@
-	if (empty($titlealt)) {

-		$titlealt = 'Mime type: '.$mimetype;

-	}

+	if (empty($titlealt)) $titlealt = 'Mime type: '.$mimetype;

@@ -5247 +3838 @@
-	return '<i class="fa fa-'.$mimefa.' paddingright'.($morecss ? ' '.$morecss : '').'"'.($titlealt ? ' title="'.$titlealt.'"' : '').'></i>';

+	return '<i class="fa fa-'.$mimefa.' paddingright"'.($titlealt ? ' title="'.$titlealt.'"' : '').'></i>';

@@ -5262,3 +3853 @@
-	if ($titlealt == 'default') {

-		$titlealt = $langs->trans('Search');

-	}

+	if ($titlealt == 'default') $titlealt = $langs->trans('Search');

@@ -5285,3 +3874 @@
-	if ($titlealt == 'default') {

-		$titlealt = $langs->trans('Search');

-	}

+	if ($titlealt == 'default') $titlealt = $langs->trans('Search');

@@ -5303 +3890 @@
- *  @param  string  $admin      	    '1'=Info for admin users. '0'=Info for standard users (change only the look), 'error', 'warning', 'xxx'=Other

+ *  @param  string  $admin      	    '1'=Info for admin users. '0'=Info for standard users (change only the look), 'error','xxx'=Other

@@ -5308 +3895 @@
-function info_admin($text, $infoonimgalt = 0, $nodiv = 0, $admin = '1', $morecss = 'hideonsmartphone', $textfordropdown = '')

+function info_admin($text, $infoonimgalt = 0, $nodiv = 0, $admin = '1', $morecss = '', $textfordropdown = '')

@@ -5312,6 +3899,6 @@
-	if ($infoonimgalt) {

-		$result = img_picto($text, 'info', 'class="'.($morecss ? ' '.$morecss : '').'"');

-	} else {

-		if (empty($conf->use_javascript_ajax)) {

-			$textfordropdown = '';

-		}

+	if ($infoonimgalt)

+	{

+		$result = img_picto($text, 'info', 'class="hideonsmartphone'.($morecss ? ' '.$morecss : '').'"');

+	}

+	else {

+		if (empty($conf->use_javascript_ajax)) $textfordropdown = '';

@@ -5320 +3907 @@
-		$result = ($nodiv ? '' : '<div class="'.$class.($morecss ? ' '.$morecss : '').($textfordropdown ? ' hidden' : '').'">').'<span class="fa fa-info-circle" title="'.dol_escape_htmltag($admin ? $langs->trans('InfoAdmin') : $langs->trans('Note')).'"></span> '.$text.($nodiv ? '' : '</div>');

+		$result = ($nodiv ? '' : '<div class="'.$class.' hideonsmartphone'.($morecss ? ' '.$morecss : '').($textfordropdown ? ' hidden' : '').'">').'<span class="fa fa-info-circle" title="'.dol_escape_htmltag($admin ? $langs->trans('InfoAdmin') : $langs->trans('Note')).'"></span> '.$text.($nodiv ? '' : '</div>');

@@ -5323,2 +3910,2 @@
-			$tmpresult = '<span class="'.$class.'text opacitymedium cursorpointer">'.$langs->trans($textfordropdown).' '.img_picto($langs->trans($textfordropdown), '1downarrow').'</span>';

-			$tmpresult .= '<script nonce="'.getNonce().'" type="text/javascript">

+			$tmpresult .= '<span class="'.$class.'text opacitymedium">'.$langs->trans($textfordropdown).' '.img_picto($langs->trans($textfordropdown), '1downarrow').'</span>';

+			$tmpresult .= '<script type="text/javascript" language="javascript">

@@ -5346,3 +3933,3 @@
- *	@param	 	DoliDB|string   $db      	Database handler

- *	@param  	string|string[] $error		String or array of errors strings to show

- *  @param		array           $errors		Array of errors

+ *	@param	 	DoliDB	$db      	Database handler

+ *	@param  	mixed	$error		String or array of errors strings to show

+ *  @param		array	$errors		Array of errors

@@ -5360,2 +3947,3 @@
-	// If error occurs before the $lang object was loaded

-	if (!$langs) {

+	// Si erreur intervenue avant chargement langue

+	if (!$langs)

+	{

@@ -5366,5 +3954,5 @@
-

-	// Load translation files required by the error messages

-	$langs->loadLangs(array('main', 'errors'));

-

-	if ($_SERVER['DOCUMENT_ROOT']) {    // Mode web

+	// Load translation files required by the page

+    $langs->loadLangs(array('main', 'errors'));

+

+	if ($_SERVER['DOCUMENT_ROOT'])    // Mode web

+	{

@@ -5372,3 +3960 @@
-		if (getDolGlobalInt('MAIN_FEATURES_LEVEL') > 0) {

-			$out .= "You use an experimental or develop level of features, so please do NOT report any bugs or vulnerability, except if problem is confirmed after moving option MAIN_FEATURES_LEVEL back to 0.<br>\n";

-		}

+		if (!empty($conf->global->MAIN_FEATURES_LEVEL)) $out .= "You use an experimental or develop level of features, so please do NOT report any bugs, except if problem is confirmed moving option MAIN_FEATURES_LEVEL back to 0.<br>\n";

@@ -5379,4 +3965,3 @@
-		if (isset($conf->global->MAIN_FEATURES_LEVEL)) {

-			$out .= "<b>".$langs->trans("LevelOfFeature").":</b> ".getDolGlobalInt('MAIN_FEATURES_LEVEL')."<br>\n";

-		}

-		if (function_exists("phpversion")) {

+		if (isset($conf->global->MAIN_FEATURES_LEVEL)) $out .= "<b>".$langs->trans("LevelOfFeature").":</b> ".$conf->global->MAIN_FEATURES_LEVEL."<br>\n";

+		if (function_exists("phpversion"))

+		{

@@ -5385,2 +3970,3 @@
-		$out .= "<b>".$langs->trans("Server").":</b> ".(isset($_SERVER["SERVER_SOFTWARE"]) ? dol_htmlentities($_SERVER["SERVER_SOFTWARE"], ENT_COMPAT) : '')."<br>\n";

-		if (function_exists("php_uname")) {

+		$out .= "<b>".$langs->trans("Server").":</b> ".$_SERVER["SERVER_SOFTWARE"]."<br>\n";

+		if (function_exists("php_uname"))

+		{

@@ -5389 +3975 @@
-		$out .= "<b>".$langs->trans("UserAgent").":</b> ".(isset($_SERVER["HTTP_USER_AGENT"]) ? dol_htmlentities($_SERVER["HTTP_USER_AGENT"], ENT_COMPAT) : '')."<br>\n";

+		$out .= "<b>".$langs->trans("UserAgent").":</b> ".$_SERVER["HTTP_USER_AGENT"]."<br>\n";

@@ -5391,3 +3977,3 @@
-		$out .= "<b>".$langs->trans("RequestedUrl").":</b> ".dol_htmlentities($_SERVER["REQUEST_URI"], ENT_COMPAT)."<br>\n";

-		$out .= "<b>".$langs->trans("Referer").":</b> ".(isset($_SERVER["HTTP_REFERER"]) ? dol_htmlentities($_SERVER["HTTP_REFERER"], ENT_COMPAT) : '')."<br>\n";

-		$out .= "<b>".$langs->trans("MenuManager").":</b> ".(isset($conf->standard_menu) ? dol_htmlentities($conf->standard_menu, ENT_COMPAT) : '')."<br>\n";

+		$out .= "<b>".$langs->trans("RequestedUrl").":</b> ".dol_htmlentities($_SERVER["REQUEST_URI"], ENT_COMPAT, 'UTF-8')."<br>\n";

+		$out .= "<b>".$langs->trans("Referer").":</b> ".(isset($_SERVER["HTTP_REFERER"]) ?dol_htmlentities($_SERVER["HTTP_REFERER"], ENT_COMPAT, 'UTF-8') : '')."<br>\n";

+		$out .= "<b>".$langs->trans("MenuManager").":</b> ".(isset($conf->standard_menu) ? $conf->standard_menu : '')."<br>\n";

@@ -5397 +3983,3 @@
-	} else { // Mode CLI

+	}

+	else                              // Mode CLI

+	{

@@ -5402,6 +3990,9 @@
-	if (!empty($conf->modules)) {

-		$out .= "<b>".$langs->trans("Modules").":</b> ".join(', ', $conf->modules)."<br>\n";

-	}

-

-	if (is_object($db)) {

-		if ($_SERVER['DOCUMENT_ROOT']) {  // Mode web

+	if (!empty($conf->modules))

+	{

+	    $out .= "<b>".$langs->trans("Modules").":</b> ".join(', ', $conf->modules)."<br>\n";

+	}

+

+	if (is_object($db))

+	{

+		if ($_SERVER['DOCUMENT_ROOT'])  // Mode web

+		{

@@ -5409,7 +4000,3 @@
-			$lastqueryerror = $db->lastqueryerror();

-			if (!utf8_check($lastqueryerror)) {

-				$lastqueryerror = "SQL error string is not a valid UTF8 string. We can't show it.";

-			}

-			$out .= "<b>".$langs->trans("RequestLastAccessInError").":</b> ".($lastqueryerror ? dol_escape_htmltag($lastqueryerror) : $langs->trans("ErrorNoRequestInError"))."<br>\n";

-			$out .= "<b>".$langs->trans("ReturnCodeLastAccessInError").":</b> ".($db->lasterrno() ? dol_escape_htmltag($db->lasterrno()) : $langs->trans("ErrorNoRequestInError"))."<br>\n";

-			$out .= "<b>".$langs->trans("InformationLastAccessInError").":</b> ".($db->lasterror() ? dol_escape_htmltag($db->lasterror()) : $langs->trans("ErrorNoRequestInError"))."<br>\n";

+			$out .= "<b>".$langs->trans("RequestLastAccessInError").":</b> ".($db->lastqueryerror() ?dol_escape_htmltag($db->lastqueryerror()) : $langs->trans("ErrorNoRequestInError"))."<br>\n";

+			$out .= "<b>".$langs->trans("ReturnCodeLastAccessInError").":</b> ".($db->lasterrno() ?dol_escape_htmltag($db->lasterrno()) : $langs->trans("ErrorNoRequestInError"))."<br>\n";

+			$out .= "<b>".$langs->trans("InformationLastAccessInError").":</b> ".($db->lasterror() ?dol_escape_htmltag($db->lasterror()) : $langs->trans("ErrorNoRequestInError"))."<br>\n";

@@ -5417 +4004,3 @@
-		} else { // Mode CLI

+		}

+		else                            // Mode CLI

+		{

@@ -5428 +4017,2 @@
-	if ($error || $errors) {

+	if ($error || $errors)

+	{

@@ -5432,15 +4022,10 @@
-		if (is_array($error) && is_array($errors)) {

-			$errors = array_merge($error, $errors);

-		} elseif (is_array($error)) {

-			$errors = $error;

-		} elseif (is_array($errors)) {

-			$errors = array_merge(array($error), $errors);

-		} else {

-			$errors = array_merge(array($error), array($errors));

-		}

-

-		foreach ($errors as $msg) {

-			if (empty($msg)) {

-				continue;

-			}

-			if ($_SERVER['DOCUMENT_ROOT']) {  // Mode web

+		if (is_array($error) && is_array($errors)) $errors = array_merge($error, $errors);

+		elseif (is_array($error)) $errors = $error;

+		elseif (is_array($errors)) $errors = array_merge(array($error), $errors);

+		else $errors = array_merge(array($error));

+

+		foreach ($errors as $msg)

+		{

+			if (empty($msg)) continue;

+			if ($_SERVER['DOCUMENT_ROOT'])  // Mode web

+			{

@@ -5448 +4033,3 @@
-			} else { // Mode CLI

+			}

+			else                        // Mode CLI

+			{

@@ -5454 +4041,2 @@
-	if (empty($dolibarr_main_prod) && $_SERVER['DOCUMENT_ROOT'] && function_exists('xdebug_print_function_stack') && function_exists('xdebug_call_file')) {

+	if (empty($dolibarr_main_prod) && $_SERVER['DOCUMENT_ROOT'] && function_exists('xdebug_print_function_stack') && function_exists('xdebug_call_file'))

+	{

@@ -5463,18 +4051,5 @@
-	// Return a http header with error code if possible

-	if (!headers_sent()) {

-		if (function_exists('top_httphead')) {	// In CLI context, the method does not exists

-			top_httphead();

-		}

-		//http_response_code(500);		// If we use 500, message is not ouput with some command line tools

-		http_response_code(202);		// If we use 202, this is not really an error message, but this allow to ouput message on command line tools

-	}

-

-	if (empty($dolibarr_main_prod)) {

-		print $out;

-	} else {

-		if (empty($langs->defaultlang)) {

-			$langs->setDefaultLang();

-		}

-		$langs->loadLangs(array("main", "errors")); // Reload main because language may have been set only on previous line so we have to reload files we need.

-		// This should not happen, except if there is a bug somewhere. Enabled and check log in such case.

-		print 'This website or feature is currently temporarly not available or failed after a technical error.<br><br>This may be due to a maintenance operation. Current status of operation ('.dol_print_date(dol_now(), 'dayhourrfc').') are on next line...<br><br>'."\n";

+	if (empty($dolibarr_main_prod)) print $out;

+	else	// This should not happen, except if there is a bug somewhere. Enabled and check log in such case.

+	{

+		print 'This website or feature is currently temporarly not available.<br><br>This may be due to a maintenance operation. Current status of operation are on next line...<br><br>'."\n";

+		$langs->load("errors");

@@ -5483,5 +4058,3 @@
-		if (!defined("MAIN_CORE_ERROR")) {

-			define("MAIN_CORE_ERROR", 1);

-		}

-	}

-

+		define("MAIN_CORE_ERROR", 1);

+	}

+	//else print 'Sorry, an error occured but the parameter $dolibarr_main_prod is defined in conf file so no message is reported to your browser. Please read the log file for error message.';

@@ -5505,3 +4078 @@
-	if (empty($email)) {

-		$email = $conf->global->MAIN_INFO_SOCIETE_MAIL;

-	}

+	if (empty($email)) $email = $conf->global->MAIN_INFO_SOCIETE_MAIL;

@@ -5513,6 +4084,6 @@
-	print $langs->trans("ErrorContactEMail", $email, $prefixcode.'-'.dol_print_date($now, '%Y%m%d%H%M%S'));

-	if ($errormessage) {

-		print '<br><br>'.$errormessage;

-	}

-	if (is_array($errormessages) && count($errormessages)) {

-		foreach ($errormessages as $mesgtoshow) {

+	print $langs->trans("ErrorContactEMail", $email, $prefixcode.dol_print_date($now, '%Y%m%d%H%M%S'));

+	if ($errormessage) print '<br><br>'.$errormessage;

+	if (is_array($errormessages) && count($errormessages))

+	{

+		foreach ($errormessages as $mesgtoshow)

+		{

@@ -5533 +4104 @@
- *	@param  string	$moreattrib  Options of attribute td ("" by defaut)

+ *	@param  string	$moreattrib  Options of attribute td ("" by defaut, example: 'align="center"')

@@ -5536 +4107 @@
- *  @param	string	$prefix		 Prefix for css. Use space after prefix to add your own CSS tag, for example 'mycss '.

+ *  @param	string	$prefix		 Prefix for css. Use space after prefix to add your own CSS tag.

@@ -5538 +4108,0 @@
- *  @param	string	$forcenowrapcolumntitle		No need for use 'wrapcolumntitle' css style

@@ -5541,3 +4111,3 @@
-function print_liste_field_titre($name, $file = "", $field = "", $begin = "", $moreparam = "", $moreattrib = "", $sortfield = "", $sortorder = "", $prefix = "", $tooltip = "", $forcenowrapcolumntitle = 0)

-{

-	print getTitleFieldOfList($name, 0, $file, $field, $begin, $moreparam, $moreattrib, $sortfield, $sortorder, $prefix, 0, $tooltip, $forcenowrapcolumntitle);

+function print_liste_field_titre($name, $file = "", $field = "", $begin = "", $moreparam = "", $moreattrib = "", $sortfield = "", $sortorder = "", $prefix = "", $tooltip = "")

+{

+	print getTitleFieldOfList($name, 0, $file, $field, $begin, $moreparam, $moreattrib, $sortfield, $sortorder, $prefix, 0, $tooltip);

@@ -5549 +4119 @@
- *	@param	string	$name        		Translation key of field to show or complete HTML string to show

+ *	@param	string	$name        		Translation key of field

@@ -5555 +4125 @@
- *	@param  string	$moreattrib  		Add more attributes on th ("" by defaut). To add more css class, use param $prefix.

+ *	@param  string	$moreattrib  		Add more attributes on th ("" by defaut, example: 'align="center"'). To add more css class, use param $prefix.

@@ -5561 +4130,0 @@
- *  @param	string	$forcenowrapcolumntitle		No need for use 'wrapcolumntitle' css style

@@ -5564 +4133 @@
-function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin = "", $moreparam = "", $moreattrib = "", $sortfield = "", $sortorder = "", $prefix = "", $disablesortlink = 0, $tooltip = '', $forcenowrapcolumntitle = 0)

+function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin = "", $moreparam = "", $moreattrib = "", $sortfield = "", $sortorder = "", $prefix = "", $disablesortlink = 0, $tooltip = '')

@@ -5569,3 +4138 @@
-	if ($moreattrib == 'class="right"') {

-		$prefix .= 'right '; // For backward compatibility

-	}

+	if ($moreattrib == 'class="right"') $prefix .= 'right '; // For backward compatibility

@@ -5578,3 +4145 @@
-	if ($thead == 2) {

-		$tag = 'div';

-	}

+	if ($thead == 2) $tag = 'div';

@@ -5587 +4152 @@
-	if (!getDolGlobalString('MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE') && empty($forcenowrapcolumntitle)) {

+	if (empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE)) {

@@ -5590 +4154,0 @@
-

@@ -5594 +4157,0 @@
-	$liste_titre = 'liste_titre';

@@ -5596,10 +4159,13 @@
-		$liste_titre = 'liste_titre_sel';

-	}

-

-	$tagstart = '<'.$tag.' class="'.$prefix.$liste_titre.'" '.$moreattrib;

-	//$out .= (($field && empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE) && preg_match('/^[a-zA-Z_0-9\s\.\-:&;]*$/', $name)) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : '');

-	$tagstart .= ($name && !getDolGlobalString('MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE') && empty($forcenowrapcolumntitle) && !dol_textishtml($name)) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : '';

-	$tagstart .= '>';

-

-	if (empty($thead) && $field && empty($disablesortlink)) {    // If this is a sort field

-		$options = preg_replace('/sortfield=([a-zA-Z0-9,\s\.]+)/i', '', (is_scalar($moreparam) ? $moreparam : ''));

+		$out .= '<'.$tag.' class="'.$prefix.'liste_titre_sel" '.$moreattrib;

+		$out .= (($field && empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE) && preg_match('/^[a-zA-Z_0-9\s\.\-:]*$/', $name)) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : '');

+		$out .= '>';

+	}

+	else {

+		$out .= '<'.$tag.' class="'.$prefix.'liste_titre" '.$moreattrib;

+		$out .= (($field && empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE) && preg_match('/^[a-zA-Z_0-9\s\.\-:]*$/', $name)) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : '');

+		$out .= '>';

+	}

+

+	if (empty($thead) && $field && empty($disablesortlink))    // If this is a sort field

+	{

+		$options = preg_replace('/sortfield=([a-zA-Z0-9,\s\.]+)/i', '', $moreparam);

@@ -5608,3 +4174 @@
-		if (!preg_match('/^&/', $options)) {

-			$options = '&'.$options;

-		}

+		if (!preg_match('/^&/', $options)) $options = '&'.$options;

@@ -5613,2 +4177,4 @@
-		if ($field1 != $sortfield1) { // We are on another field than current sorted field

-			if (preg_match('/^DESC/i', $sortorder)) {

+		if ($field1 != $sortfield1) // We are on another field than current sorted field

+		{

+			if (preg_match('/^DESC/i', $sortorder))

+			{

@@ -5616 +4182,3 @@
-			} else { // We reverse the var $sortordertouseinlink

+			}

+			else		// We reverse the var $sortordertouseinlink

+			{

@@ -5619,2 +4187,5 @@
-		} else { // We are on field that is the first current sorting criteria

-			if (preg_match('/^ASC/i', $sortorder)) {	// We reverse the var $sortordertouseinlink

+		}

+		else                        // We are on field that is the first current sorting criteria

+		{

+			if (preg_match('/^ASC/i', $sortorder))	// We reverse the var $sortordertouseinlink

+			{

@@ -5622 +4193,3 @@
-			} else {

+			}

+			else

+			{

@@ -5631,13 +4204,6 @@
-	if ($tooltip) {

-		// You can also use 'TranslationString:keyfortooltiponclick' for a tooltip on click.

-		if (preg_match('/:\w+$/', $tooltip)) {

-			$tmptooltip = explode(':', $tooltip);

-		} else {

-			$tmptooltip = array($tooltip);

-		}

-		$out .= $form->textwithpicto($langs->trans($name), $langs->trans($tmptooltip[0]), 1, 'help', '', 0, 3, (empty($tmptooltip[1]) ? '' : 'extra_'.str_replace('.', '_', $field).'_'.$tmptooltip[1]));

-	} else {

-		$out .= $langs->trans($name);

-	}

-

-	if (empty($thead) && $field && empty($disablesortlink)) {    // If this is a sort field

+

+	if ($tooltip) $out .= $form->textwithpicto($langs->trans($name), $langs->trans($tooltip));

+	else $out .= $langs->trans($name);

+

+	if (empty($thead) && $field && empty($disablesortlink))    // If this is a sort field

+	{

@@ -5647,2 +4213,3 @@
-	if (empty($thead) && $field) {    // If this is a sort field

-		$options = preg_replace('/sortfield=([a-zA-Z0-9,\s\.]+)/i', '', (is_scalar($moreparam) ? $moreparam : ''));

+	if (empty($thead) && $field)    // If this is a sort field

+	{

+		$options = preg_replace('/sortfield=([a-zA-Z0-9,\s\.]+)/i', '', $moreparam);

@@ -5651,5 +4218,4 @@
-		if (!preg_match('/^&/', $options)) {

-			$options = '&'.$options;

-		}

-

-		if (!$sortorder || ($field1 != $sortfield1)) {

+		if (!preg_match('/^&/', $options)) $options = '&'.$options;

+

+		if (!$sortorder || $field1 != $sortfield1)

+		{

@@ -5658 +4224,3 @@
-		} else {

+		}

+		else

+		{

@@ -5662 +4230 @@
-				$sortimg .= '<span class="nowrap">'.img_up("Z-A", 0, 'paddingright').'</span>';

+				$sortimg .= '<span class="nowrap">'.img_up("Z-A", 0, 'paddingleft').'</span>';

@@ -5667,8 +4235,8 @@
-				$sortimg .= '<span class="nowrap">'.img_down("A-Z", 0, 'paddingright').'</span>';

-			}

-		}

-	}

-

-	$tagend = '</'.$tag.'>';

-

-	$out = $tagstart.$sortimg.$out.$tagend;

+				$sortimg .= '<span class="nowrap">'.img_down("A-Z", 0, 'paddingleft').'</span>';

+			}

+		}

+	}

+

+	$out .= $sortimg;

+

+	$out .= '</'.$tag.'>';

@@ -5683 +4251 @@
- *  @return	void

+ *	@return	string					Title to show

@@ -5729,3 +4297 @@
-	if ($picto == 'setup') {

-		$picto = 'generic';

-	}

+	if ($picto == 'setup') $picto = 'generic';

@@ -5736,3 +4302 @@
-	if ($picto) {

-		$return .= '<td class="nobordernopadding widthpictotitle valignmiddle col-picto">'.img_picto('', $picto, 'class="valignmiddle widthpictotitle pictotitle"', $pictoisfullpath).'</td>';

-	}

+	if ($picto) $return .= '<td class="nobordernopadding widthpictotitle valignmiddle col-picto">'.img_picto('', $picto, 'class="valignmiddle widthpictotitle pictotitle"', $pictoisfullpath).'</td>';

@@ -5742,5 +4306,7 @@
-	if (dol_strlen($morehtmlcenter)) {

-		$return .= '<td class="nobordernopadding center valignmiddle col-center">'.$morehtmlcenter.'</td>';

-	}

-	if (dol_strlen($morehtmlright)) {

-		$return .= '<td class="nobordernopadding titre_right wordbreakimp right valignmiddle col-right">'.$morehtmlright.'</td>';

+	if (dol_strlen($morehtmlcenter))

+	{

+		$return .= '<td class="nobordernopadding center valignmiddle">'.$morehtmlcenter.'</td>';

+	}

+	if (dol_strlen($morehtmlright))

+	{

+		$return .= '<td class="nobordernopadding titre_right wordbreakimp right valignmiddle">'.$morehtmlright.'</td>';

@@ -5757 +4323 @@
- *	@param	int|null    $page				Numero of page to show in navigation links (required)

+ *	@param	int   	    $page				Numero of page to show in navigation links (required)

@@ -5767 +4333 @@
- *  @param	string	    $morehtmlright		More html to show (after arrows)

+ *  @param	string	    $morehtmlright		More html to show

@@ -5771 +4337 @@
- *  @param  int         $hidenavigation     Force to hide the arrows and page for navigation

+ *  @param  int         $hidenavigation     Force to hide all navigation tools

@@ -5773 +4338,0 @@
- *  @param	string		$morehtmlrightbeforearrow	More html to show (before arrows)

@@ -5776,3 +4341,3 @@
-function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '', $sortorder = '', $morehtmlcenter = '', $num = -1, $totalnboflines = '', $picto = 'generic', $pictoisfullpath = 0, $morehtmlright = '', $morecss = '', $limit = -1, $hideselectlimit = 0, $hidenavigation = 0, $pagenavastextinput = 0, $morehtmlrightbeforearrow = '')

-{

-	global $conf;

+function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '', $sortorder = '', $morehtmlcenter = '', $num = -1, $totalnboflines = '', $picto = 'generic', $pictoisfullpath = 0, $morehtmlright = '', $morecss = '', $limit = -1, $hideselectlimit = 0, $hidenavigation = 0, $pagenavastextinput = 0)

+{

+	global $conf, $langs;

@@ -5782,15 +4347,7 @@
-	$totalnboflines = abs((int) $totalnboflines);

-

-	$page = (int) $page;

-

-	if ($picto == 'setup') {

-		$picto = 'title_setup.png';

-	}

-	if (($conf->browser->name == 'ie') && $picto == 'generic') {

-		$picto = 'title.gif';

-	}

-	if ($limit < 0) {

-		$limit = $conf->liste_limit;

-	}

-

-	if ($savlimit != 0 && (($num > $limit) || ($num == -1) || ($limit == 0))) {

+	$totalnboflines = abs($totalnboflines);

+

+	if ($picto == 'setup') $picto = 'title_setup.png';

+	if (($conf->browser->name == 'ie') && $picto == 'generic') $picto = 'title.gif';

+	if ($limit < 0) $limit = $conf->liste_limit;

+	if ($savlimit != 0 && (($num > $limit) || ($num == -1) || ($limit == 0)))

+	{

@@ -5798 +4355,3 @@
-	} else {

+	}

+	else

+	{

@@ -5801 +4360 @@
-	//print 'totalnboflines='.$totalnboflines.'-savlimit='.$savlimit.'-limit='.$limit.'-num='.$num.'-nextpage='.$nextpage.'-hideselectlimit='.$hideselectlimit.'-hidenavigation='.$hidenavigation;

+	//print 'totalnboflines='.$totalnboflines.'-savlimit='.$savlimit.'-limit='.$limit.'-num='.$num.'-nextpage='.$nextpage;

@@ -5804 +4363 @@
-	print "<!-- Begin title -->\n";

+	print "<!-- Begin title '".$titre."' -->\n";

@@ -5809,4 +4368 @@
-	if ($picto && $titre) {

-		print '<td class="nobordernopadding widthpictotitle valignmiddle col-picto">'.img_picto('', $picto, 'class="valignmiddle pictotitle widthpictotitle"', $pictoisfullpath).'</td>';

-	}

-

+	if ($picto && $titre) print '<td class="nobordernopadding widthpictotitle valignmiddle col-picto">'.img_picto('', $picto, 'class="valignmiddle pictotitle widthpictotitle"', $pictoisfullpath).'</td>';

@@ -5815,3 +4371 @@
-	if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '') {

-		print '<span class="opacitymedium colorblack paddingleft">('.$totalnboflines.')</span>';

-	}

+	if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '') print '<span class="opacitymedium colorblack paddingleft">('.$totalnboflines.')</span>';

@@ -5821,2 +4375,3 @@
-	if ($morehtmlcenter && empty($conf->dol_optimize_smallscreen)) {

-		print '<td class="nobordernopadding center valignmiddle col-center">'.$morehtmlcenter.'</td>';

+	if ($morehtmlcenter)

+	{

+		print '<td class="nobordernopadding center valignmiddle">'.$morehtmlcenter.'</td>';

@@ -5826,8 +4381,3 @@
-	print '<td class="nobordernopadding valignmiddle right col-right">';

-	print '<input type="hidden" name="pageplusoneold" value="'.((int) $page + 1).'">';

-	if ($sortfield) {

-		$options .= "&sortfield=".urlencode($sortfield);

-	}

-	if ($sortorder) {

-		$options .= "&sortorder=".urlencode($sortorder);

-	}

+	print '<td class="nobordernopadding valignmiddle right">';

+	if ($sortfield) $options .= "&sortfield=".urlencode($sortfield);

+	if ($sortorder) $options .= "&sortorder=".urlencode($sortorder);

@@ -5836,2 +4386,4 @@
-	if ($savlimit != 0 && ($page > 0 || $num > $limit)) {

-		if ($totalnboflines) {	// If we know total nb of lines

+	if ($savlimit != 0 && ($page > 0 || $num > $limit))

+	{

+		if ($totalnboflines)	// If we know total nb of lines

+		{

@@ -5841,5 +4393,2 @@
-			if ($limit > 0) {

-				$nbpages = ceil($totalnboflines / $limit);

-			} else {

-				$nbpages = 1;

-			}

+			if ($limit > 0) $nbpages = ceil($totalnboflines / $limit);

+			else $nbpages = 1;

@@ -5847,5 +4396,4 @@
-			if ($cpt < 0) {

-				$cpt = 0;

-			}

-

-			if ($cpt >= 1) {

+			if ($cpt < 0) { $cpt = 0; }

+

+			if ($cpt >= 1)

+			{

@@ -5853,6 +4401,3 @@
-					$pagelist .= '<li class="pagination"><a class="reposition" href="'.$file.'?page=0'.$options.'">1</a></li>';

-					if ($cpt > 2) {

-						$pagelist .= '<li class="pagination"><span class="inactive">...</span></li>';

-					} elseif ($cpt == 2) {

-						$pagelist .= '<li class="pagination"><a class="reposition" href="'.$file.'?page=1'.$options.'">2</a></li>';

-					}

+					$pagelist .= '<li class="pagination"><a href="'.$file.'?page=0'.$options.'">1</a></li>';

+					if ($cpt > 2) $pagelist .= '<li class="pagination"><span class="inactive">...</span></li>';

+					elseif ($cpt == 2) $pagelist .= '<li class="pagination"><a href="'.$file.'?page=1'.$options.'">2</a></li>';

@@ -5862 +4407,2 @@
-			do {

+			do

+			{

@@ -5864,2 +4410,3 @@
-					if ($cpt == $page) {

-						$pagelist .= '<li class="pagination"><input type="text" class="'.($totalnboflines > 100 ? 'width40' : 'width25').' center pageplusone" name="pageplusone" value="'.($page + 1).'"></li>';

+					if ($cpt == $page)

+					{

+						$pagelist .= '<li class="pagination"><input type="text" class="width25 center pageplusone" name="pageplusone" value="'.($page + 1).'"></li>';

@@ -5866,0 +4414 @@
+						//if (($cpt + 1) < $nbpages) $pagelist .= '/';

@@ -5869 +4417,2 @@
-					if ($cpt == $page) {

+					if ($cpt == $page)

+					{

@@ -5871,2 +4420,4 @@
-					} else {

-						$pagelist .= '<li class="pagination"><a class="reposition" href="'.$file.'?page='.$cpt.$options.'">'.($cpt + 1).'</a></li>';

+					}

+					else

+					{

+						$pagelist .= '<li class="pagination"><a href="'.$file.'?page='.$cpt.$options.'">'.($cpt + 1).'</a></li>';

@@ -5876 +4427,2 @@
-			} while ($cpt < $nbpages && $cpt <= ($page + $maxnbofpage));

+			}

+			while ($cpt < $nbpages && $cpt <= ($page + $maxnbofpage));

@@ -5879,7 +4431,5 @@
-				if ($cpt < $nbpages) {

-					if ($cpt < $nbpages - 2) {

-						$pagelist .= '<li class="pagination"><span class="inactive">...</span></li>';

-					} elseif ($cpt == $nbpages - 2) {

-						$pagelist .= '<li class="pagination"><a class="reposition" href="'.$file.'?page='.($nbpages - 2).$options.'">'.($nbpages - 1).'</a></li>';

-					}

-					$pagelist .= '<li class="pagination"><a class="reposition" href="'.$file.'?page='.($nbpages - 1).$options.'">'.$nbpages.'</a></li>';

+				if ($cpt < $nbpages)

+				{

+					if ($cpt < $nbpages - 2) $pagelist .= '<li class="pagination"><span class="inactive">...</span></li>';

+					elseif ($cpt == $nbpages - 2) $pagelist .= '<li class="pagination"><a href="'.$file.'?page='.($nbpages - 2).$options.'">'.($nbpages - 1).'</a></li>';

+					$pagelist .= '<li class="pagination"><a href="'.$file.'?page='.($nbpages - 1).$options.'">'.$nbpages.'</a></li>';

@@ -5889,3 +4439,7 @@
-				$pagelist .= '<li class="pagination paginationlastpage"><a class="reposition" href="'.$file.'?page='.($nbpages - 1).$options.'">'.$nbpages.'</a></li>';

-			}

-		} else {

+				//if (($page + 1) < $nbpages) {

+					$pagelist .= '<li class="pagination"><a href="'.$file.'?page='.($nbpages - 1).$options.'">'.$nbpages.'</a></li>';

+				//}

+			}

+		}

+		else

+		{

@@ -5896,2 +4450,2 @@
-	if ($savlimit || $morehtmlright || $morehtmlrightbeforearrow) {

-		print_fleche_navigation($page, $file, $options, $nextpage, $pagelist, $morehtmlright, $savlimit, $totalnboflines, $hideselectlimit, $morehtmlrightbeforearrow, $hidenavigation); // output the div and ul for previous/last completed with page numbers into $pagelist

+	if ($savlimit || $morehtmlright) {

+		print_fleche_navigation($page, $file, $options, $nextpage, $pagelist, $morehtmlright, $savlimit, $totalnboflines, $hideselectlimit); // output the div and ul for previous/last completed with page numbers into $pagelist

@@ -5906,9 +4460,2 @@
-	print '</tr>';

-

-	print '</table>'."\n";

-

-	// Center

-	if ($morehtmlcenter && !empty($conf->dol_optimize_smallscreen)) {

-		print '<div class="nobordernopadding marginbottomonly center valignmiddle col-center centpercent">'.$morehtmlcenter.'</div>';

-	}

-

+

+	print '</tr></table>'."\n";

@@ -5930,2 +4476,0 @@
- *  @param	string			$beforearrows		HTML content to show before arrows. Must NOT contains '<li> </li>' tags.

- *  @param  int        		$hidenavigation     Force to hide the switch mode view and the navigation tool (hide limit section, html in $betweenarrows and $afterarrows but not $beforearrows)

@@ -5934 +4479 @@
-function print_fleche_navigation($page, $file, $options = '', $nextpage = 0, $betweenarrows = '', $afterarrows = '', $limit = -1, $totalnboflines = 0, $hideselectlimit = 0, $beforearrows = '', $hidenavigation = 0)

+function print_fleche_navigation($page, $file, $options = '', $nextpage = 0, $betweenarrows = '', $afterarrows = '', $limit = -1, $totalnboflines = 0, $hideselectlimit = 0)

@@ -5939,3 +4484,44 @@
-	if ($beforearrows) {

-		print '<li class="paginationbeforearrows">';

-		print $beforearrows;

+	if ((int) $limit > 0 && empty($hideselectlimit))

+	{

+		$pagesizechoices = '10:10,15:15,20:20,30:30,40:40,50:50,100:100,250:250,500:500,1000:1000,5000:5000';

+		//$pagesizechoices.=',0:'.$langs->trans("All");     // Not yet supported

+		//$pagesizechoices.=',2:2';

+		if (!empty($conf->global->MAIN_PAGESIZE_CHOICES)) $pagesizechoices = $conf->global->MAIN_PAGESIZE_CHOICES;

+

+		print '<li class="pagination">';

+		print '<select class="flat selectlimit" name="limit" title="'.dol_escape_htmltag($langs->trans("MaxNbOfRecordPerPage")).'">';

+		$tmpchoice = explode(',', $pagesizechoices);

+		$tmpkey = $limit.':'.$limit;

+		if (!in_array($tmpkey, $tmpchoice)) $tmpchoice[] = $tmpkey;

+		$tmpkey = $conf->liste_limit.':'.$conf->liste_limit;

+		if (!in_array($tmpkey, $tmpchoice)) $tmpchoice[] = $tmpkey;

+		asort($tmpchoice, SORT_NUMERIC);

+		foreach ($tmpchoice as $val)

+		{

+			$selected = '';

+			$tmp = explode(':', $val);

+			$key = $tmp[0];

+			$val = $tmp[1];

+			if ($key != '' && $val != '')

+			{

+				if ((int) $key == (int) $limit)

+				{

+					$selected = ' selected="selected"';

+				}

+				print '<option name="'.$key.'"'.$selected.'>'.dol_escape_htmltag($val).'</option>'."\n";

+			}

+		}

+		print '</select>';

+		if ($conf->use_javascript_ajax)

+		{

+			print '<!-- JS CODE TO ENABLE select limit to launch submit of page -->

+            		<script>

+                	jQuery(document).ready(function () {

+            	  		jQuery(".selectlimit").change(function() {

+                            console.log("Change limit. Send submit");

+                            $(this).parents(\'form:first\').submit();

+            	  		});

+                	});

+            		</script>

+                ';

+		}

@@ -5944,66 +4530,19 @@
-

-	if (empty($hidenavigation)) {

-		if ((int) $limit > 0 && empty($hideselectlimit)) {

-			$pagesizechoices = '10:10,15:15,20:20,30:30,40:40,50:50,100:100,250:250,500:500,1000:1000';

-			$pagesizechoices .= ',5000:5000,10000:10000,20000:20000';

-			//$pagesizechoices.=',0:'.$langs->trans("All");     // Not yet supported

-			//$pagesizechoices.=',2:2';

-			if (getDolGlobalString('MAIN_PAGESIZE_CHOICES')) {

-				$pagesizechoices = $conf->global->MAIN_PAGESIZE_CHOICES;

-			}

-

-			print '<li class="pagination">';

-			print '<select class="flat selectlimit" name="limit" title="'.dol_escape_htmltag($langs->trans("MaxNbOfRecordPerPage")).'">';

-			$tmpchoice = explode(',', $pagesizechoices);

-			$tmpkey = $limit.':'.$limit;

-			if (!in_array($tmpkey, $tmpchoice)) {

-				$tmpchoice[] = $tmpkey;

-			}

-			$tmpkey = $conf->liste_limit.':'.$conf->liste_limit;

-			if (!in_array($tmpkey, $tmpchoice)) {

-				$tmpchoice[] = $tmpkey;

-			}

-			asort($tmpchoice, SORT_NUMERIC);

-			foreach ($tmpchoice as $val) {

-				$selected = '';

-				$tmp = explode(':', $val);

-				$key = $tmp[0];

-				$val = $tmp[1];

-				if ($key != '' && $val != '') {

-					if ((int) $key == (int) $limit) {

-						$selected = ' selected="selected"';

-					}

-					print '<option name="'.$key.'"'.$selected.'>'.dol_escape_htmltag($val).'</option>'."\n";

-				}

-			}

-			print '</select>';

-			if ($conf->use_javascript_ajax) {

-				print '<!-- JS CODE TO ENABLE select limit to launch submit of page -->

-	            		<script>

-	                	jQuery(document).ready(function () {

-	            	  		jQuery(".selectlimit").change(function() {

-	                            console.log("Change limit. Send submit");

-	                            $(this).parents(\'form:first\').submit();

-	            	  		});

-	                	});

-	            		</script>

-	                ';

-			}

-			print '</li>';

-		}

-		if ($page > 0) {

-			print '<li class="pagination paginationpage paginationpageleft"><a class="paginationprevious reposition" href="'.$file.'?page='.($page - 1).$options.'"><i class="fa fa-chevron-left" title="'.dol_escape_htmltag($langs->trans("Previous")).'"></i></a></li>';

-		}

-		if ($betweenarrows) {

-			print '<!--<div class="betweenarrows nowraponall inline-block">-->';

-			print $betweenarrows;

-			print '<!--</div>-->';

-		}

-		if ($nextpage > 0) {

-			print '<li class="pagination paginationpage paginationpageright"><a class="paginationnext reposition" href="'.$file.'?page='.($page + 1).$options.'"><i class="fa fa-chevron-right" title="'.dol_escape_htmltag($langs->trans("Next")).'"></i></a></li>';

-		}

-		if ($afterarrows) {

-			print '<li class="paginationafterarrows">';

-			print $afterarrows;

-			print '</li>';

-		}

+	if ($page > 0)

+	{

+		print '<li class="pagination paginationpage"><a class="paginationprevious" href="'.$file.'?page='.($page - 1).$options.'"><i class="fa fa-chevron-left" title="'.dol_escape_htmltag($langs->trans("Previous")).'"></i></a></li>';

+	}

+	if ($betweenarrows)

+	{

+		print '<!--<div class="betweenarrows nowraponall inline-block">-->';

+		print $betweenarrows;

+		print '<!--</div>-->';

+	}

+	if ($nextpage > 0)

+	{

+		print '<li class="pagination paginationpage"><a class="paginationnext" href="'.$file.'?page='.($page + 1).$options.'"><i class="fa fa-chevron-right" title="'.dol_escape_htmltag($langs->trans("Next")).'"></i></a></li>';

+	}

+	if ($afterarrows)

+	{

+		print '<li class="paginationafterarrows">';

+		print $afterarrows;

+		print '</li>';

@@ -6023 +4561,0 @@
- *  @param	int		$html			Used for html output

@@ -6026 +4564 @@
-function vatrate($rate, $addpercent = false, $info_bits = 0, $usestarfornpr = 0, $html = 0)

+function vatrate($rate, $addpercent = false, $info_bits = 0, $usestarfornpr = 0)

@@ -6030 +4568,2 @@
-	if (preg_match('/%/', $rate)) {

+	if (preg_match('/%/', $rate))

+	{

@@ -6034,2 +4573,2 @@
-	$reg = array();

-	if (preg_match('/\((.*)\)/', $rate, $reg)) {

+	if (preg_match('/\((.*)\)/', $rate, $reg))

+	{

@@ -6038,3 +4577,3 @@
-		$morelabel = ' '.($html ? '<span class="opacitymedium">' : '').'('.$reg[1].')'.($html ? '</span>' : '');

-	}

-	if (preg_match('/\*/', $rate)) {

+	}

+	if (preg_match('/\*/', $rate))

+	{

@@ -6046,3 +4585,3 @@
-	if (!preg_match('/\//', $rate)) {

-		$ret = price($rate, 0, '', 0, 0).($addpercent ? '%' : '');

-	} else {

+	if (!preg_match('/\//', $rate)) $ret = price($rate, 0, '', 0, 0).($addpercent ? '%' : '');

+	else

+	{

@@ -6052,3 +4591 @@
-	if (($info_bits & 1) && $usestarfornpr >= 0) {

-		$ret .= ' *';

-	}

+	if (($info_bits & 1) && $usestarfornpr >= 0) $ret .= ' *';

@@ -6064,10 +4601,10 @@
- *		@param	float				$amount			Amount to format

- *		@param	integer				$form			Type of format, HTML or not (not by default)

- *		@param	Translate|string	$outlangs		Object langs for output. '' use default lang. 'none' use international separators.

- *		@param	int					$trunc			1=Truncate if there is more decimals than MAIN_MAX_DECIMALS_SHOWN (default), 0=Does not truncate. Deprecated because amount are rounded (to unit or total amount accurancy) before beeing inserted into database or after a computation, so this parameter should be useless.

- *		@param	int					$rounding		MINIMUM number of decimal to show: 0=no change, -1=we use min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT)

- *		@param	int|string			$forcerounding	MAXIMUM number of decimal to forcerounding decimal: -1=no change, 'MU' or 'MT' or numeric to round to MU or MT or to a given number of decimal

- *		@param	string				$currency_code	To add currency symbol (''=add nothing, 'auto'=Use default currency, 'XXX'=add currency symbols for XXX currency)

- *		@return	string								String with formated amount

- *

- *		@see	price2num()							Revert function of price

+ *		@param	float		$amount			Amount to format

+ *		@param	integer		$form			Type of format, HTML or not (not by default)

+ *		@param	Translate	$outlangs		Object langs for output

+ *		@param	int			$trunc			1=Truncate if there is more decimals than MAIN_MAX_DECIMALS_SHOWN (default), 0=Does not truncate. Deprecated because amount are rounded (to unit or total amount accurancy) before beeing inserted into database or after a computation, so this parameter should be useless.

+ *		@param	int			$rounding		Minimum number of decimal to show. If 0, no change, if -1, we use min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT)

+ *		@param	int			$forcerounding	Force the number of decimal to forcerounding decimal (-1=do not force)

+ *		@param	string		$currency_code	To add currency symbol (''=add nothing, 'auto'=Use default currency, 'XXX'=add currency symbols for XXX currency)

+ *		@return	string						Chaine avec montant formate

+ *

+ *		@see	price2num()					Revert function of price

@@ -6080,3 +4617 @@
-	if (empty($amount)) {

-		$amount = 0; // To have a numeric value if amount not defined or = ''

-	}

+	if (empty($amount)) $amount = 0; // To have a numeric value if amount not defined or = ''

@@ -6084,3 +4619 @@
-	if ($rounding == -1) {

-		$rounding = min(getDolGlobalString('MAIN_MAX_DECIMALS_UNIT'), getDolGlobalString('MAIN_MAX_DECIMALS_TOT'));

-	}

+	if ($rounding < 0) $rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);

@@ -6089,26 +4622,10 @@
-	if ($outlangs === 'none') {

-		// Use international separators

-		$dec = '.';

-		$thousand = '';

-	} else {

-		// Output separators by default (french)

-		$dec = ',';

-		$thousand = ' ';

-

-		// If $outlangs not forced, we use use language

-		if (!is_object($outlangs)) {

-			$outlangs = $langs;

-		}

-

-		if ($outlangs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal") {

-			$dec = $outlangs->transnoentitiesnoconv("SeparatorDecimal");

-		}

-		if ($outlangs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") {

-			$thousand = $outlangs->transnoentitiesnoconv("SeparatorThousand");

-		}

-		if ($thousand == 'None') {

-			$thousand = '';

-		} elseif ($thousand == 'Space') {

-			$thousand = ' ';

-		}

-	}

+	// Output separators by default (french)

+	$dec = ','; $thousand = ' ';

+

+	// If $outlangs not forced, we use use language

+	if (!is_object($outlangs)) $outlangs = $langs;

+

+	if ($outlangs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal")  $dec = $outlangs->transnoentitiesnoconv("SeparatorDecimal");

+	if ($outlangs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") $thousand = $outlangs->transnoentitiesnoconv("SeparatorThousand");

+	if ($thousand == 'None') $thousand = '';

+	elseif ($thousand == 'Space') $thousand = ' ';

@@ -6127,3 +4644 @@
-	if (dol_strlen($decpart) > $nbdecimal) {

-		$nbdecimal = dol_strlen($decpart);

-	}

+	if (dol_strlen($decpart) > $nbdecimal) $nbdecimal = dol_strlen($decpart);

@@ -6131 +4646,2 @@
-	if ($trunc && $nbdecimal > $conf->global->MAIN_MAX_DECIMALS_SHOWN) {

+	if ($trunc && $nbdecimal > $conf->global->MAIN_MAX_DECIMALS_SHOWN)

+	{

@@ -6133 +4649,2 @@
-		if (preg_match('/\.\.\./i', $conf->global->MAIN_MAX_DECIMALS_SHOWN)) {

+		if (preg_match('/\.\.\./i', $conf->global->MAIN_MAX_DECIMALS_SHOWN))

+		{

@@ -6140,9 +4657 @@
-	if ((string) $forcerounding != '-1') {

-		if ($forcerounding === 'MU') {

-			$nbdecimal = $conf->global->MAIN_MAX_DECIMALS_UNIT;

-		} elseif ($forcerounding === 'MT') {

-			$nbdecimal = $conf->global->MAIN_MAX_DECIMALS_TOT;

-		} elseif ($forcerounding >= 0) {

-			$nbdecimal = $forcerounding;

-		}

-	}

+	if ($forcerounding >= 0) $nbdecimal = $forcerounding;

@@ -6152 +4661,2 @@
-	if ($form) {

+	if ($form)

+	{

@@ -6158,6 +4668,5 @@
-	if ($currency_code && is_object($outlangs)) {

-		if ($currency_code == 'auto') {

-			$currency_code = $conf->currency;

-		}

-

-		$listofcurrenciesbefore = array('AUD', 'CAD', 'CNY', 'COP', 'CLP', 'GBP', 'HKD', 'MXN', 'PEN', 'USD', 'CRC', 'ZAR');

+	if ($currency_code)

+	{

+		if ($currency_code == 'auto') $currency_code = $conf->currency;

+

+		$listofcurrenciesbefore = array('AUD', 'CAD', 'CNY', 'COP', 'CLP', 'GBP', 'HKD', 'MXN', 'PEN', 'USD');

@@ -6165,3 +4674,6 @@
-		if (in_array($currency_code, $listofcurrenciesbefore) || in_array($outlangs->defaultlang, $listoflanguagesbefore)) {

-			$cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code);

-		} else {

+		if (in_array($currency_code, $listofcurrenciesbefore) || in_array($outlangs->defaultlang, $listoflanguagesbefore))

+		{

+		    $cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code);

+		}

+		else

+		{

@@ -6182,20 +4694,15 @@
- *	@param	string|float	$amount			Amount to convert/clean or round

- *	@param	string|int		$rounding		''=No rounding

- * 											'MU'=Round to Max unit price (MAIN_MAX_DECIMALS_UNIT)

- *											'MT'=Round to Max for totals with Tax (MAIN_MAX_DECIMALS_TOT)

- *											'MS'=Round to Max for stock quantity (MAIN_MAX_DECIMALS_STOCK)

- *      		                            'CU'=Round to Max unit price of foreign currency accuracy

- *      		                            'CT'=Round to Max for totals with Tax of foreign currency accuracy

- *											Numeric = Nb of digits for rounding (For example 2 for a percentage)

- * 	@param	int				$option			Put 1 if you know that content is already universal format number (so no correction on decimal will be done)

- * 											Put 2 if you know that number is a user input (so we know we have to fix decimal separator).

- *	@return	string							Amount with universal numeric format (Example: '99.99999').

- *											If conversion fails to return a numeric, it returns:

- *											- text unchanged or partial if ($rounding = ''): price2num('W9ç', '', 0)   => '9ç', price2num('W9ç', '', 1)   => 'W9ç', price2num('W9ç', '', 2)   => '9ç'

- *											- '0' if ($rounding is defined):                 price2num('W9ç', 'MT', 0) => '9',  price2num('W9ç', 'MT', 1) => '0',   price2num('W9ç', 'MT', 2) => '9'

- *											Note: The best way to guarantee a numeric value is to add a cast (float) before the price2num().

- *											If amount is null or '', it returns '' if $rounding = '', it returns '0' if $rounding is defined.

- *

- *	@see    price()							Opposite function of price2num

- */

-function price2num($amount, $rounding = '', $option = 0)

+ *	@param	float	$amount			Amount to convert/clean or round

+ *	@param	string	$rounding		''=No rounding

+ * 									'MU'=Round to Max unit price (MAIN_MAX_DECIMALS_UNIT)

+ *									'MT'=Round to Max for totals with Tax (MAIN_MAX_DECIMALS_TOT)

+ *									'MS'=Round to Max for stock quantity (MAIN_MAX_DECIMALS_STOCK)

+ *                                  'CR'=Currency rate

+ *									Numeric = Nb of digits for rounding

+ * 	@param	int		$alreadysqlnb	Put 1 if you know that content is already universal format number

+ *	@return	string					Amount with universal numeric format (Example: '99.99999').

+ *									If conversion fails, it return text unchanged if $rounding = '' or '0' if $rounding is defined.

+ *									If amount is null or '', it returns '' if $rounding = '' or '0' if $rounding is defined..

+ *

+ *	@see    price()					Opposite function of price2num

+ */

+function price2num($amount, $rounding = '', $alreadysqlnb = 0)

@@ -6204,5 +4710,0 @@
-

-	// Clean parameters

-	if (is_null($amount)) {

-		$amount = '';

-	}

@@ -6213,18 +4715,5 @@
-	$dec = ',';

-	$thousand = ' ';

-	if (is_null($langs)) {	// $langs is not defined, we use english values.

-		$dec = '.';

-		$thousand = ',';

-	} else {

-		if ($langs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal") {

-			$dec = $langs->transnoentitiesnoconv("SeparatorDecimal");

-		}

-		if ($langs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") {

-			$thousand = $langs->transnoentitiesnoconv("SeparatorThousand");

-		}

-	}

-	if ($thousand == 'None') {

-		$thousand = '';

-	} elseif ($thousand == 'Space') {

-		$thousand = ' ';

-	}

+	$dec = ','; $thousand = ' ';

+	if ($langs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal")  $dec = $langs->transnoentitiesnoconv("SeparatorDecimal");

+	if ($langs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") $thousand = $langs->transnoentitiesnoconv("SeparatorThousand");

+	if ($thousand == 'None') $thousand = '';

+	elseif ($thousand == 'Space') $thousand = ' ';

@@ -6234,9 +4723,3 @@
-	if ($option != 1) {	// If not a PHP number or unknown, we change or clean format

-		//print "\n".'PP'.$amount.' - '.$dec.' - '.$thousand.' - '.intval($amount).'<br>';

-		if (!is_numeric($amount)) {

-			$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>\_]/', '', $amount);

-		}

-

-		if ($option == 2 && $thousand == '.' && preg_match('/\.(\d\d\d)$/', (string) $amount)) {	// It means the . is used as a thousand separator and string come from input data, so 1.123 is 1123

-			$amount = str_replace($thousand, '', $amount);

-		}

+	if ($alreadysqlnb != 1)	// If not a PHP number or unknown, we change format

+	{

+		//print 'PP'.$amount.' - '.$dec.' - '.$thousand.' - '.intval($amount).'<br>';

@@ -6246,2 +4729,2 @@
-		// So if number was already a good number, it is converted into local Dolibarr setup.

-		if (is_numeric($amount)) {

+		if (is_numeric($amount))

+		{

@@ -6254 +4737 @@
-		//print "QQ".$amount."<br>\n";

+		//print "QQ".$amount.'<br>';

@@ -6257,4 +4740 @@
-		if ($thousand != ',' && $thousand != '.') {

-			$amount = str_replace(',', '.', $amount); // To accept 2 notations for french users

-		}

-

+		if ($thousand != ',' && $thousand != '.') $amount = str_replace(',', '.', $amount); // To accept 2 notations for french users

@@ -6264,7 +4744,5 @@
-

-		$amount = preg_replace('/[^0-9\-\.]/', '', $amount);	// Clean non numeric chars (so it clean some UTF8 spaces for example.

-	}

-	//print ' XX'.$amount.' '.$rounding;

-

-	// Now, $amount is a real PHP float number. We make a rounding if required.

-	if ($rounding) {

+	}

+

+	// Now, make a rounding if required

+	if ($rounding)

+	{

@@ -6272,21 +4750,9 @@
-		if ($rounding == 'MU') {

-			$nbofdectoround = $conf->global->MAIN_MAX_DECIMALS_UNIT;

-		} elseif ($rounding == 'MT') {

-			$nbofdectoround = $conf->global->MAIN_MAX_DECIMALS_TOT;

-		} elseif ($rounding == 'MS') {

-			$nbofdectoround = isset($conf->global->MAIN_MAX_DECIMALS_STOCK) ? $conf->global->MAIN_MAX_DECIMALS_STOCK : 5;

-		} elseif ($rounding == 'CU') {

-			$nbofdectoround = max(getDolGlobalString('MAIN_MAX_DECIMALS_UNIT'), 8);	// TODO Use param of currency

-		} elseif ($rounding == 'CT') {

-			$nbofdectoround = max(getDolGlobalString('MAIN_MAX_DECIMALS_TOT'), 8);		// TODO Use param of currency

-		} elseif (is_numeric($rounding)) {

-			$nbofdectoround = (int) $rounding;

-		}

-

-		//print " RR".$amount.' - '.$nbofdectoround.'<br>';

-		if (dol_strlen($nbofdectoround)) {

-			$amount = round(is_string($amount) ? (float) $amount : $amount, $nbofdectoround); // $nbofdectoround can be 0.

-		} else {

-			return 'ErrorBadParameterProvidedToFunction';

-		}

-		//print ' SS'.$amount.' - '.$nbofdec.' - '.$dec.' - '.$thousand.' - '.$nbofdectoround.'<br>';

+		if ($rounding == 'MU')     $nbofdectoround = $conf->global->MAIN_MAX_DECIMALS_UNIT;

+		elseif ($rounding == 'MT') $nbofdectoround = $conf->global->MAIN_MAX_DECIMALS_TOT;

+		elseif ($rounding == 'MS') $nbofdectoround = empty($conf->global->MAIN_MAX_DECIMALS_STOCK) ? 5 : $conf->global->MAIN_MAX_DECIMALS_STOCK;

+		elseif ($rounding == 'CR') $nbofdectoround = 8;

+		elseif (is_numeric($rounding))  $nbofdectoround = $rounding;

+		//print "RR".$amount.' - '.$nbofdectoround.'<br>';

+		if (dol_strlen($nbofdectoround)) $amount = round($amount, $nbofdectoround); // $nbofdectoround can be 0.

+		else return 'ErrorBadParameterProvidedToFunction';

+		//print 'SS'.$amount.' - '.$nbofdec.' - '.$dec.' - '.$thousand.' - '.$nbofdectoround.'<br>';

@@ -6296 +4762,2 @@
-		if (is_numeric($amount)) {

+		if (is_numeric($amount))

+		{

@@ -6307,4 +4774 @@
-		if ($thousand != ',' && $thousand != '.') {

-			$amount = str_replace(',', '.', $amount); // To accept 2 notations for french users

-		}

-

+		if ($thousand != ',' && $thousand != '.') $amount = str_replace(',', '.', $amount); // To accept 2 notations for french users

@@ -6314,2 +4777,0 @@
-

-		$amount = preg_replace('/[^0-9\-\.]/', '', $amount);	// Clean non numeric chars (so it clean some UTF8 spaces for example.

@@ -6324,5 +4786,5 @@
- * @param   float       $dimension      	Dimension

- * @param   int         $unit           	Unit scale of dimension (Example: 0=kg, -3=g, -6=mg, 98=ounce, 99=pound, ...)

- * @param   string      $type           	'weight', 'volume', ...

- * @param   Translate   $outputlangs    	Translate language object

- * @param   int         $round          	-1 = non rounding, x = number of decimal

+ * @param   float       $dimension      Dimension

+ * @param   int         $unit           Unit scale of dimension (Example: 0=kg, -3=g, -6=mg, 98=ounce, 99=pound, ...)

+ * @param   string      $type           'weight', 'volume', ...

+ * @param   Translate   $outputlangs    Translate language object

+ * @param   int         $round          -1 = non rounding, x = number of decimal

@@ -6330,4 +4792,3 @@
- * @param	int			$use_short_label	1=Use short label ('g' instead of 'gram'). Short labels are not translated.

- * @return  string                      	String to show dimensions

- */

-function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs, $round = -1, $forceunitoutput = 'no', $use_short_label = 0)

+ * @return  string                      String to show dimensions

+ */

+function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs, $round = -1, $forceunitoutput = 'no')

@@ -6337 +4798,2 @@
-	if (($forceunitoutput == 'no' && $dimension < 1 / 10000 && $unit < 90) || (is_numeric($forceunitoutput) && $forceunitoutput == -6)) {

+	if (($forceunitoutput == 'no' && $dimension < 1 / 10000 && $unit < 90) || (is_numeric($forceunitoutput) && $forceunitoutput == -6))

+	{

@@ -6340 +4802,3 @@
-	} elseif (($forceunitoutput == 'no' && $dimension < 1 / 10 && $unit < 90) || (is_numeric($forceunitoutput) && $forceunitoutput == -3)) {

+	}

+	elseif (($forceunitoutput == 'no' && $dimension < 1 / 10 && $unit < 90) || (is_numeric($forceunitoutput) && $forceunitoutput == -3))

+	{

@@ -6343 +4807,3 @@
-	} elseif (($forceunitoutput == 'no' && $dimension > 100000000 && $unit < 90) || (is_numeric($forceunitoutput) && $forceunitoutput == 6)) {

+	}

+	elseif (($forceunitoutput == 'no' && $dimension > 100000000 && $unit < 90) || (is_numeric($forceunitoutput) && $forceunitoutput == 6))

+	{

@@ -6346 +4812,3 @@
-	} elseif (($forceunitoutput == 'no' && $dimension > 100000 && $unit < 90) || (is_numeric($forceunitoutput) && $forceunitoutput == 3)) {

+	}

+	elseif (($forceunitoutput == 'no' && $dimension > 100000 && $unit < 90) || (is_numeric($forceunitoutput) && $forceunitoutput == 3))

+	{

@@ -6354,2 +4822,2 @@
-		$dimension = // convert dimension from standard unit into ounce or pound

-		$unit = $forceunitoutput;

+	    $dimension = // convert dimension from standard unit into ounce or pound

+	    $unit = $forceunitoutput;

@@ -6359,2 +4827,2 @@
-		$dimension = // convert dimension from standard unit into ounce or pound

-		$unit = $forceunitoutput;

+	    $dimension = // convert dimension from standard unit into ounce or pound

+	    $unit = $forceunitoutput;

@@ -6363,2 +4831 @@
-	$ret = price($dimension, 0, $outputlangs, 0, 0, $round);

-	$ret .= ' '.measuringUnitString(0, $type, $unit, $use_short_label, $outputlangs);

+	$ret = price($dimension, 0, $outputlangs, 0, 0, $round).' '.measuringUnitString(0, $type, $unit);

@@ -6386,3 +4853 @@
-	if (empty($thirdparty_seller) || !is_object($thirdparty_seller)) {

-		$thirdparty_seller = $mysoc;

-	}

+	if (empty($thirdparty_seller) || !is_object($thirdparty_seller)) $thirdparty_seller = $mysoc;

@@ -6394 +4859,2 @@
-	if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg)) {     // If vat is "xx (yy)"

+	if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg))      // If vat is "xx (yy)"

+	{

@@ -6405,17 +4871,17 @@
-	if ($mysoc->country_code == 'ES') { // For spain localtaxes 1 and 2, tax is qualified if buyer use local tax

-		if ($local == 1) {

-			if (!$mysoc->localtax1_assuj || (string) $vatratecleaned == "0") {

-				return 0;

-			}

-			if ($thirdparty_seller->id == $mysoc->id) {

-				if (!$thirdparty_buyer->localtax1_assuj) {

-					return 0;

-				}

-			} else {

-				if (!$thirdparty_seller->localtax1_assuj) {

-					return 0;

-				}

-			}

-		}

-

-		if ($local == 2) {

+	if ($mysoc->country_code == 'ES') // For spain localtaxes 1 and 2, tax is qualified if buyer use local tax

+	{

+		if ($local == 1)

+		{

+			if (!$mysoc->localtax1_assuj || (string) $vatratecleaned == "0") return 0;

+			if ($thirdparty_seller->id == $mysoc->id)

+			{

+				if (!$thirdparty_buyer->localtax1_assuj) return 0;

+			}

+			else

+			{

+				if (!$thirdparty_seller->localtax1_assuj) return 0;

+			}

+		}

+

+		if ($local == 2)

+		{

@@ -6423,20 +4889,15 @@
-			if (!$mysoc->localtax2_assuj) {

-				return 0; // If main vat is 0, IRPF may be different than 0.

-			}

-			if ($thirdparty_seller->id == $mysoc->id) {

-				if (!$thirdparty_buyer->localtax2_assuj) {

-					return 0;

-				}

-			} else {

-				if (!$thirdparty_seller->localtax2_assuj) {

-					return 0;

-				}

-			}

-		}

-	} else {

-		if ($local == 1 && !$thirdparty_seller->localtax1_assuj) {

-			return 0;

-		}

-		if ($local == 2 && !$thirdparty_seller->localtax2_assuj) {

-			return 0;

-		}

+			if (!$mysoc->localtax2_assuj) return 0; // If main vat is 0, IRPF may be different than 0.

+			if ($thirdparty_seller->id == $mysoc->id)

+			{

+				if (!$thirdparty_buyer->localtax2_assuj) return 0;

+			}

+			else

+			{

+				if (!$thirdparty_seller->localtax2_assuj) return 0;

+			}

+		}

+	}

+	else

+	{

+		if ($local == 1 && !$thirdparty_seller->localtax1_assuj) return 0;

+		if ($local == 2 && !$thirdparty_seller->localtax2_assuj) return 0;

@@ -6446 +4907,2 @@
-	if (in_array($mysoc->country_code, array('ES'))) {

+	if (in_array($mysoc->country_code, array('ES')))

+	{

@@ -6451,4 +4913,8 @@
-	if (getDolGlobalString('MAIN_GET_LOCALTAXES_VALUES_FROM_THIRDPARTY')) {

-		if ($local == 1) {

-			if ($thirdparty_seller != $mysoc) {

-				if (!isOnlyOneLocalTax($local)) {  // TODO We should provide $vatrate to search on correct line and not always on line with highest vat rate

+	if (!empty($conf->global->MAIN_GET_LOCALTAXES_VALUES_FROM_THIRDPARTY))

+	{

+		if ($local == 1)

+		{

+			if ($thirdparty_seller != $mysoc)

+			{

+				if (!isOnlyOneLocalTax($local))  // TODO We should provide $vatrate to search on correct line and not always on line with highest vat rate

+				{

@@ -6457,2 +4923,5 @@
-			} else { // i am the seller

-				if (!isOnlyOneLocalTax($local)) { // TODO If seller is me, why not always returning this, even if there is only one locatax vat.

+			}

+			else  // i am the seller

+			{

+				if (!isOnlyOneLocalTax($local))  // TODO If seller is me, why not always returning this, even if there is only one locatax vat.

+				{

@@ -6463,4 +4932,7 @@
-		if ($local == 2) {

-			if ($thirdparty_seller != $mysoc) {

-				if (!isOnlyOneLocalTax($local)) {  // TODO We should provide $vatrate to search on correct line and not always on line with highest vat rate

-					// TODO We should also return value defined on thirdparty only if defined

+		if ($local == 2)

+		{

+			if ($thirdparty_seller != $mysoc)

+			{

+				if (!isOnlyOneLocalTax($local))  // TODO We should provide $vatrate to search on correct line and not always on line with highest vat rate

+				// TODO We should also return value defined on thirdparty only if defined

+				{

@@ -6469,2 +4941,5 @@
-			} else { // i am the seller

-				if (in_array($mysoc->country_code, array('ES'))) {

+			}

+			else  // i am the seller

+			{

+				if (in_array($mysoc->country_code, array('ES')))

+				{

@@ -6472 +4947,3 @@
-				} else {

+				}

+				else

+				{

@@ -6481,21 +4958,13 @@
-	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";

-	$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($thirdparty_seller->country_code)."'";

-	$sql .= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";

-	$sql .= " AND t.entity IN (".getEntity('c_tva').")";

-	if (!empty($vatratecode)) {

-		$sql .= " AND t.code ='".$db->escape($vatratecode)."'"; // If we have the code, we use it in priority

-	} else {

-		$sql .= " AND t.recuperableonly = '".$db->escape($vatnpr)."'";

-	}

-

-	$resql = $db->query($sql);

-

-	if ($resql) {

-		$obj = $db->fetch_object($resql);

-		if ($obj) {

-			if ($local == 1) {

-				return $obj->localtax1;

-			} elseif ($local == 2) {

-				return $obj->localtax2;

-			}

-		}

+   	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";

+   	$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$thirdparty_seller->country_code."'";

+   	$sql .= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";

+   	if ($vatratecode) $sql .= " AND t.code ='".$vatratecode."'"; // If we have the code, we use it in priority

+   	else $sql .= " AND t.recuperableonly ='".$vatnpr."'";

+   	dol_syslog("get_localtax", LOG_DEBUG);

+   	$resql = $db->query($sql);

+

+   	if ($resql)

+   	{

+   		$obj = $db->fetch_object($resql);

+   		if ($local == 1) return $obj->localtax1;

+   		elseif ($local == 2) return $obj->localtax2;

@@ -6522 +4991,2 @@
-	if (count($valors) > 1) {

+	if (count($valors) > 1)

+	{

@@ -6524 +4994,3 @@
-	} else {

+	}

+	else

+	{

@@ -6532,2 +5004,2 @@
- * @param	int				$local 		LocalTax to get

- * @return	string						Values of localtax (Can be '20', '-19:-15:-9') or 'Error'

+ * @param	int		$local 	LocalTax to get

+ * @return	number			Values of localtax

@@ -6538,8 +5010,6 @@
-

-	$sql  = " SELECT t.localtax".$local." as localtax";

-	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t INNER JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = t.fk_pays";

-	$sql .= " WHERE c.code = '".$db->escape($mysoc->country_code)."' AND t.active = 1 AND t.entity IN (".getEntity('c_tva').") AND t.taux = (";

-	$sql .= "SELECT MAX(tt.taux) FROM ".MAIN_DB_PREFIX."c_tva as tt INNER JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = tt.fk_pays";

-	$sql .= " WHERE c.code = '".$db->escape($mysoc->country_code)."' AND t.entity IN (".getEntity('c_tva').") AND tt.active = 1)";

-	$sql .= " AND t.localtax".$local."_type <> '0'";

-	$sql .= " ORDER BY t.rowid DESC";

+	$sql = "SELECT t.localtax1, t.localtax2 ";

+	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t inner join ".MAIN_DB_PREFIX."c_country as c ON c.rowid=t.fk_pays";

+	$sql .= " WHERE c.code = '".$mysoc->country_code."' AND t.active = 1 AND t.taux=(";

+	$sql .= "  SELECT max(tt.taux) FROM ".MAIN_DB_PREFIX."c_tva as tt inner join ".MAIN_DB_PREFIX."c_country as c ON c.rowid=tt.fk_pays";

+	$sql .= "  WHERE c.code = '".$mysoc->country_code."' AND tt.active = 1";

+	$sql .= "  )";

@@ -6548 +5018,2 @@
-	if ($resql) {

+	if ($resql)

+	{

@@ -6550,14 +5021,11 @@
-		if ($obj) {

-			return $obj->localtax;

-		} else {

-			return '0';

-		}

-	}

-

-	return 'Error';

-}

-

-

-/**

- *  Get tax (VAT) main information from Id.

- *  You can also call getLocalTaxesFromRate() after to get only localtax fields.

+		if ($local == 1) return $obj->localtax1;

+		elseif ($local == 2) return $obj->localtax2;

+	}

+

+	return 0;

+}

+

+

+/**

+ *  Get vat main information from Id.

+ *  You can call getLocalTaxesFromRate after to get other fields.

@@ -6579,2 +5047 @@
-	$sql = "SELECT t.rowid, t.code, t.taux as rate, t.recuperableonly as npr, t.accountancy_code_sell, t.accountancy_code_buy,";

-	$sql .= " t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type";

+	$sql = "SELECT t.rowid, t.code, t.taux as rate, t.recuperableonly as npr, t.accountancy_code_sell, t.accountancy_code_buy";

@@ -6582,3 +5049,3 @@
-	if ($firstparamisid) {

-		$sql .= " WHERE t.rowid = ".(int) $vatrate;

-	} else {

+	if ($firstparamisid) $sql .= " WHERE t.rowid = ".(int) $vatrate;

+	else

+	{

@@ -6587,2 +5054,2 @@
-		$reg = array();

-		if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg)) {      // If vat is "xx (yy)"

+		if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg))      // If vat is "xx (yy)"

+		{

@@ -6594,3 +5061,3 @@
-		/*if ($mysoc->country_code == 'ES') $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($buyer->country_code)."'";    // vat in spain use the buyer country ??

-		else $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($seller->country_code)."'";*/

-		$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($seller->country_code)."'";

+		/*if ($mysoc->country_code == 'ES') $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$buyer->country_code."'";    // vat in spain use the buyer country ??

+		else $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'";*/

+		$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'";

@@ -6598,4 +5065 @@
-		$sql .= " AND t.entity IN (".getEntity('c_tva').")";

-		if ($vatratecode) {

-			$sql .= " AND t.code = '".$db->escape($vatratecode)."'";

-		}

+		if ($vatratecode) $sql .= " AND t.code = '".$vatratecode."'";

@@ -6605 +5069,2 @@
-	if ($resql) {

+	if ($resql)

+	{

@@ -6607,19 +5072,4 @@
-		if ($obj) {

-			return array(

-			'rowid'=>$obj->rowid,

-			'code'=>$obj->code,

-			'rate'=>$obj->rate,

-			'localtax1'=>$obj->localtax1,

-			'localtax1_type'=>$obj->localtax1_type,

-			'localtax2'=>$obj->localtax2,

-			'localtax2_type'=>$obj->localtax2_type,

-			'npr'=>$obj->npr,

-			'accountancy_code_sell'=>$obj->accountancy_code_sell,

-			'accountancy_code_buy'=>$obj->accountancy_code_buy

-			);

-		} else {

-			return array();

-		}

-	} else {

-		dol_print_error($db);

-	}

+		if ($obj) return array('rowid'=>$obj->rowid, 'code'=>$obj->code, 'rate'=>$obj->rate, 'npr'=>$obj->npr, 'accountancy_code_sell'=>$obj->accountancy_code_sell, 'accountancy_code_buy'=>$obj->accountancy_code_buy);

+		else return array();

+	}

+	else dol_print_error($db);

@@ -6633,4 +5083,4 @@
- *

- *  TODO This function is ALSO called to retrieve type for building PDF. Such call of function must be removed.

- *  Instead this function must be called when adding a line to get the array of possible values for localtax and type, and then

- *  provide the selected value to the function calcul_price_total.

+ *  TODO

+ *  This function is ALSO called to retrieve type for building PDF. Such call of function must be removed.

+ *  Instead this function must be called when adding a line to get the array of localtax and type, and then

+ *  provide it to the function calcul_price_total.

@@ -6643 +5093 @@
- *  @return	array    	    				array(localtax_type1(1-6 or 0 if not found), rate localtax1, localtax_type2, rate localtax2, accountancycodecust, accountancycodesupp)

+ *  @return	array    	    				array(localtax_type1(1-6/0 if not found), rate localtax1, localtax_type2, rate localtax2, accountancycodecust, accountancycodesupp)

@@ -6655,3 +5105,3 @@
-	if ($firstparamisid) {

-		$sql .= " WHERE t.rowid = ".(int) $vatrate;

-	} else {

+	if ($firstparamisid) $sql .= " WHERE t.rowid = ".(int) $vatrate;

+	else

+	{

@@ -6661 +5111,2 @@
-		if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg)) {     // If vat is "x.x (yy)"

+		if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg))      // If vat is "x.x (yy)"

+		{

@@ -6667,7 +5118,2 @@
-		if (!empty($mysoc) && $mysoc->country_code == 'ES') {

-			$countrycodetouse = ((empty($buyer) || empty($buyer->country_code)) ? $mysoc->country_code : $buyer->country_code);

-			$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($countrycodetouse)."'"; // local tax in spain use the buyer country ??

-		} else {

-			$countrycodetouse = ((empty($seller) || empty($seller->country_code)) ? $mysoc->country_code : $seller->country_code);

-			$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($countrycodetouse)."'";

-		}

+		if ($mysoc->country_code == 'ES') $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$buyer->country_code."'"; // local tax in spain use the buyer country ??

+		else $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'";

@@ -6675,3 +5121 @@
-		if ($vatratecode) {

-			$sql .= " AND t.code = '".$db->escape($vatratecode)."'";

-		}

+		if ($vatratecode) $sql .= " AND t.code = '".$vatratecode."'";

@@ -6681 +5125,2 @@
-	if ($resql) {

+	if ($resql)

+	{

@@ -6684,24 +5129,27 @@
-		if ($obj) {

-			$vateratestring = $obj->rate.($obj->code ? ' ('.$obj->code.')' : '');

-

-			if ($local == 1) {

-				return array($obj->localtax1_type, get_localtax($vateratestring, $local, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);

-			} elseif ($local == 2) {

-				return array($obj->localtax2_type, get_localtax($vateratestring, $local, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);

-			} else {

-				return array($obj->localtax1_type, get_localtax($vateratestring, 1, $buyer, $seller), $obj->localtax2_type, get_localtax($vateratestring, 2, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);

-			}

-		}

-	}

-

-	return array();

-}

-

-/**

- *	Return vat rate of a product in a particular country, or default country vat if product is unknown.

- *  Function called by get_default_tva().

- *

- *  @param	int				$idprod          	Id of product or 0 if not a predefined product

- *  @param  Societe			$thirdpartytouse  	Thirdparty with a ->country_code defined (FR, US, IT, ...)

- *	@param	int				$idprodfournprice	Id product_fournisseur_price (for "supplier" proposal/order/invoice)

- *  @return float|string   					    Vat rate to use with format 5.0 or '5.0 (XXX)'

+		$vateratestring = $obj->rate.($obj->code ? ' ('.$obj->code.')' : '');

+

+		if ($local == 1)

+		{

+			return array($obj->localtax1_type, get_localtax($vateratestring, $local, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);

+		}

+		elseif ($local == 2)

+		{

+			return array($obj->localtax2_type, get_localtax($vateratestring, $local, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);

+		}

+		else

+		{

+			return array($obj->localtax1_type, get_localtax($vateratestring, 1, $buyer, $seller), $obj->localtax2_type, get_localtax($vateratestring, 2, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);

+		}

+	}

+

+	return 0;

+}

+

+/**

+ *	Return vat rate of a product in a particular selling country or default country vat if product is unknown

+ *  Function called by get_default_tva

+ *

+ *  @param	int			$idprod          	Id of product or 0 if not a predefined product

+ *  @param  Societe		$thirdparty_seller  Thirdparty with a ->country_code defined (FR, US, IT, ...)

+ *	@param	int			$idprodfournprice	Id product_fournisseur_price (for "supplier" proposal/order/invoice)

+ *  @return float|string   				    Vat rate to use with format 5.0 or '5.0 (XXX)'

@@ -6710 +5158 @@
-function get_product_vat_for_country($idprod, $thirdpartytouse, $idprodfournprice = 0)

+function get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournprice = 0)

@@ -6719,95 +5167,2 @@
-	if ($idprod > 0) {

-		// Load product

-		$product = new Product($db);

-		$product->fetch($idprod);

-

-		if ($mysoc->country_code == $thirdpartytouse->country_code) {

-			// If country to consider is ours

-			if ($idprodfournprice > 0) {     // We want vat for product for a "supplier" object

-				$result = $product->get_buyprice($idprodfournprice, 0, 0, 0);

-				if ($result > 0) {

-					$ret = $product->vatrate_supplier;

-					if ($product->default_vat_code_supplier) {

-						$ret .= ' ('.$product->default_vat_code_supplier.')';

-					}

-					$found = 1;

-				}

-			}

-			if (!$found) {

-				$ret = $product->tva_tx; 	// Default sales vat of product

-				if ($product->default_vat_code) {

-					$ret .= ' ('.$product->default_vat_code.')';

-				}

-				$found = 1;

-			}

-		} else {

-			// TODO Read default product vat according to product and an other countrycode.

-			// Vat for couple anothercountrycode/product is data that is not managed and store yet, so we will fallback on next rule.

-		}

-	}

-

-	if (!$found) {

-		if (!getDolGlobalString('MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS')) {

-			// If vat of product for the country not found or not defined, we return the first rate found (sorting on use_default, then on higher vat of country).

-			$sql = "SELECT t.taux as vat_rate, t.code as default_vat_code";

-			$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";

-			$sql .= " WHERE t.active = 1 AND t.fk_pays = c.rowid AND c.code = '".$db->escape($thirdpartytouse->country_code)."'";

-			$sql .= " AND t.entity IN (".getEntity('c_tva').")";

-			$sql .= " ORDER BY t.use_default DESC, t.taux DESC, t.code ASC, t.recuperableonly ASC";

-			$sql .= $db->plimit(1);

-

-			$resql = $db->query($sql);

-			if ($resql) {

-				$obj = $db->fetch_object($resql);

-				if ($obj) {

-					$ret = $obj->vat_rate;

-					if ($obj->default_vat_code) {

-						$ret .= ' ('.$obj->default_vat_code.')';

-					}

-				}

-				$db->free($resql);

-			} else {

-				dol_print_error($db);

-			}

-		} else {

-			// Forced value if autodetect fails. MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS can be

-			// '1.23'

-			// or '1.23 (CODE)'

-			$defaulttx = '';

-			if (getDolGlobalString('MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS') != 'none') {

-				$defaulttx = $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS;

-			}

-			/*if (preg_match('/\((.*)\)/', $defaulttx, $reg)) {

-				$defaultcode = $reg[1];

-				$defaulttx = preg_replace('/\s*\(.*\)/', '', $defaulttx);

-			}*/

-

-			$ret = $defaulttx;

-		}

-	}

-

-	dol_syslog("get_product_vat_for_country: ret=".$ret);

-	return $ret;

-}

-

-/**

- *	Return localtax vat rate of a product in a particular country or default country vat if product is unknown

- *

- *  @param	int		$idprod         		Id of product

- *  @param  int		$local          		1 for localtax1, 2 for localtax 2

- *  @param  Societe	$thirdpartytouse    	Thirdparty with a ->country_code defined (FR, US, IT, ...)

- *  @return int             				Return integer <0 if KO, Vat rate if OK

- *  @see get_product_vat_for_country()

- */

-function get_product_localtax_for_country($idprod, $local, $thirdpartytouse)

-{

-	global $db, $mysoc;

-

-	if (!class_exists('Product')) {

-		require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';

-	}

-

-	$ret = 0;

-	$found = 0;

-

-	if ($idprod > 0) {

+	if ($idprod > 0)

+	{

@@ -6818 +5173,81 @@
-		if ($mysoc->country_code == $thirdpartytouse->country_code) { // If selling country is ours

+		if ($mysoc->country_code == $thirdparty_seller->country_code) // If selling country is ours

+		{

+			if ($idprodfournprice > 0)     // We want vat for product for a "supplier" object

+			{

+				$product->get_buyprice($idprodfournprice, 0, 0, 0);

+				$ret = $product->vatrate_supplier;

+				if ($product->default_vat_code) $ret .= ' ('.$product->default_vat_code.')';

+			}

+			else

+			{

+				$ret = $product->tva_tx; // Default vat of product we defined

+				if ($product->default_vat_code) $ret .= ' ('.$product->default_vat_code.')';

+			}

+			$found = 1;

+		}

+		else

+		{

+			// TODO Read default product vat according to countrycode and product. Vat for couple countrycode/product is a feature not implemeted yet.

+			// May be usefull/required if hidden option SERVICE_ARE_ECOMMERCE_200238EC is on

+		}

+	}

+

+	if (!$found)

+	{

+		if (empty($conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS))

+		{

+			// If vat of product for the country not found or not defined, we return the first higher vat of country.

+			$sql = "SELECT t.taux as vat_rate, t.code as default_vat_code";

+			$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";

+			$sql .= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$thirdparty_seller->country_code."'";

+			$sql .= " ORDER BY t.taux DESC, t.code ASC, t.recuperableonly ASC";

+			$sql .= $db->plimit(1);

+

+			$resql = $db->query($sql);

+			if ($resql)

+			{

+				$obj = $db->fetch_object($resql);

+				if ($obj)

+				{

+					$ret = $obj->vat_rate;

+					if ($obj->default_vat_code) $ret .= ' ('.$obj->default_vat_code.')';

+				}

+				$db->free($sql);

+			}

+			else dol_print_error($db);

+		}

+		else $ret = $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS; // Forced value if autodetect fails

+	}

+

+	dol_syslog("get_product_vat_for_country: ret=".$ret);

+	return $ret;

+}

+

+/**

+ *	Return localtax vat rate of a product in a particular selling country or default country vat if product is unknown

+ *

+ *  @param	int		$idprod         		Id of product

+ *  @param  int		$local          		1 for localtax1, 2 for localtax 2

+ *  @param  Societe	$thirdparty_seller    	Thirdparty with a ->country_code defined (FR, US, IT, ...)

+ *  @return int             				<0 if KO, Vat rate if OK

+ *  @see get_product_vat_for_country()

+ */

+function get_product_localtax_for_country($idprod, $local, $thirdparty_seller)

+{

+	global $db, $mysoc;

+

+	if (!class_exists('Product')) {

+		require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';

+	}

+

+	$ret = 0;

+	$found = 0;

+

+	if ($idprod > 0)

+	{

+		// Load product

+		$product = new Product($db);

+		$result = $product->fetch($idprod);

+

+		if ($mysoc->country_code == $thirdparty_seller->country_code) // If selling country is ours

+		{

@@ -6824,7 +5259,9 @@
-		} else {

-			// TODO Read default product vat according to product and another countrycode.

-			// Vat for couple anothercountrycode/product is data that is not managed and store yet, so we will fallback on next rule.

-		}

-	}

-

-	if (!$found) {

+		}

+		else

+		{

+			// TODO Read default product vat according to countrycode and product

+		}

+	}

+

+	if (!$found)

+	{

@@ -6834,2 +5271 @@
-		$sql .= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$db->escape($thirdpartytouse->country_code)."'";

-		$sql .= " AND t.entity IN (".getEntity('c_tva').")";

+		$sql .= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$thirdparty_seller->country_code."'";

@@ -6840 +5276,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -6842,10 +5279,7 @@
-			if ($obj) {

-				if ($local == 1) {

-					$ret = $obj->localtax1;

-				} elseif ($local == 2) {

-					$ret = $obj->localtax2;

-				}

-			}

-		} else {

-			dol_print_error($db);

-		}

+			if ($obj)

+			{

+				if ($local == 1) $ret = $obj->localtax1;

+				elseif ($local == 2) $ret = $obj->localtax2;

+			}

+		}

+		else dol_print_error($db);

@@ -6860,6 +5294,6 @@
- *   VATRULE 1: If seller does not use VAT, default VAT is 0. End of rule.

- *	 VATRULE 2: If the (seller country = buyer country) then the default VAT = VAT of the product sold. End of rule.

- *	 VATRULE 3: If (seller and buyer in the European Community) and (property sold = new means of transport such as car, boat, plane) then VAT by default = 0 (VAT must be paid by the buyer to the tax center of his country and not to the seller). End of rule.

- *	 VATRULE 4: If (seller and buyer in the European Community) and (buyer = individual) then VAT by default = VAT of the product sold. End of rule

- *	 VATRULE 5: If (seller and buyer in European Community) and (buyer = company) then VAT by default=0. End of rule

- *	 VATRULE 6: Otherwise the VAT proposed by default=0. End of rule.

+ *   Si vendeur non assujeti a TVA, TVA par defaut=0. Fin de regle.

+ *	 Si le (pays vendeur = pays acheteur) alors TVA par defaut=TVA du produit vendu. Fin de regle.

+ *	 Si (vendeur et acheteur dans Communaute europeenne) et (bien vendu = moyen de transports neuf comme auto, bateau, avion) alors TVA par defaut=0 (La TVA doit etre paye par acheteur au centre d'impots de son pays et non au vendeur). Fin de regle.

+ *	 Si (vendeur et acheteur dans Communaute europeenne) et (acheteur = particulier ou entreprise sans num TVA intra) alors TVA par defaut=TVA du produit vendu. Fin de regle

+ *	 Si (vendeur et acheteur dans Communaute europeenne) et (acheteur = entreprise avec num TVA) intra alors TVA par defaut=0. Fin de regle

+ *	 Sinon TVA proposee par defaut=0. Fin de regle.

@@ -6889 +5323 @@
-	dol_syslog("get_default_tva: seller use vat=".$seller_use_vat.", seller country=".$seller_country_code.", seller in cee=".$seller_in_cee.", buyer vat number=".$thirdparty_buyer->tva_intra." buyer country=".$buyer_country_code.", buyer in cee=".$buyer_in_cee.", idprod=".$idprod.", idprodfournprice=".$idprodfournprice.", SERVICE_ARE_ECOMMERCE_200238EC=".(getDolGlobalString('SERVICES_ARE_ECOMMERCE_200238EC') ? $conf->global->SERVICES_ARE_ECOMMERCE_200238EC : ''));

+	dol_syslog("get_default_tva: seller use vat=".$seller_use_vat.", seller country=".$seller_country_code.", seller in cee=".$seller_in_cee.", buyer vat number=".$thirdparty_buyer->tva_intra." buyer country=".$buyer_country_code.", buyer in cee=".$buyer_in_cee.", idprod=".$idprod.", idprodfournprice=".$idprodfournprice.", SERVICE_ARE_ECOMMERCE_200238EC=".(!empty($conf->global->SERVICES_ARE_ECOMMERCE_200238EC) ? $conf->global->SERVICES_ARE_ECOMMERCE_200238EC : ''));

@@ -6893,19 +5327,12 @@
-	if (getDolGlobalString('SERVICE_ARE_ECOMMERCE_200238EC')) {

-		if ($seller_in_cee && $buyer_in_cee) {

-			$isacompany = $thirdparty_buyer->isACompany();

-			if ($isacompany && getDolGlobalString('MAIN_USE_VAT_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID_ARE_INDIVIDUAL')) {

-				require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';

-				if (!isValidVATID($thirdparty_buyer)) {

-					$isacompany = 0;

-				}

-			}

-

-			if (!$isacompany) {

-				//print 'VATRULE 0';

-				return get_product_vat_for_country($idprod, $thirdparty_buyer, $idprodfournprice);

-			}

-		}

-	}

-

-	// If seller does not use VAT, default VAT is 0. End of rule.

-	if (!$seller_use_vat) {

+	if (!empty($conf->global->SERVICE_ARE_ECOMMERCE_200238EC))

+	{

+		if ($seller_in_cee && $buyer_in_cee && !$thirdparty_buyer->isACompany())

+		{

+			//print 'VATRULE 0';

+			return get_product_vat_for_country($idprod, $thirdparty_buyer, $idprodfournprice);

+		}

+	}

+

+	// If seller does not use VAT

+	if (!$seller_use_vat)

+	{

@@ -6916 +5343,3 @@
-	// If the (seller country = buyer country) then the default VAT = VAT of the product sold. End of rule.

+	// Le test ci-dessus ne devrait pas etre necessaire. Me signaler l'exemple du cas juridique concerne si le test suivant n'est pas suffisant.

+

+	// Si le (pays vendeur = pays acheteur) alors la TVA par defaut=TVA du produit vendu. Fin de regle.

@@ -6918 +5347,2 @@
-	|| (in_array($seller_country_code, array('FR', 'MC')) && in_array($buyer_country_code, array('FR', 'MC')))) { // Warning ->country_code not always defined

+	|| (in_array($seller_country_code, array('FR,MC')) && in_array($buyer_country_code, array('FR', 'MC')))) // Warning ->country_code not always defined

+	{

@@ -6920,24 +5350,10 @@
-		$tmpvat = get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournprice);

-

-		if ($seller_country_code == 'IN' && getDolGlobalString('MAIN_SALETAX_AUTOSWITCH_I_CS_FOR_INDIA')) {

-			// Special case for india.

-			//print 'VATRULE 2b';

-			$reg = array();

-			if (preg_match('/C+S-(\d+)/', $tmpvat, $reg) && $thirdparty_seller->state_id != $thirdparty_buyer->state_id) {

-				// we must revert the C+S into I

-				$tmpvat = str_replace("C+S", "I", $tmpvat);

-			} elseif (preg_match('/I-(\d+)/', $tmpvat, $reg) && $thirdparty_seller->state_id == $thirdparty_buyer->state_id) {

-				// we must revert the I into C+S

-				$tmpvat = str_replace("I", "C+S", $tmpvat);

-			}

-		}

-

-		return $tmpvat;

-	}

-

-	// If (seller and buyer in the European Community) and (property sold = new means of transport such as car, boat, plane) then VAT by default = 0 (VAT must be paid by the buyer to the tax center of his country and not to the seller). End of rule.

-	// 'VATRULE 3' - Not supported

-

-	// If (seller and buyer in the European Community) and (buyer = individual) then VAT by default = VAT of the product sold. End of rule

-	// If (seller and buyer in European Community) and (buyer = company) then VAT by default=0. End of rule

-	if (($seller_in_cee && $buyer_in_cee)) {

+		return get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournprice);

+	}

+

+	// Si (vendeur et acheteur dans Communaute europeenne) et (bien vendu = moyen de transports neuf comme auto, bateau, avion) alors TVA par defaut=0 (La TVA doit etre paye par l'acheteur au centre d'impots de son pays et non au vendeur). Fin de regle.

+	// Not supported

+

+	// Si (vendeur et acheteur dans Communaute europeenne) et (acheteur = entreprise) alors TVA par defaut=0. Fin de regle

+	// Si (vendeur et acheteur dans Communaute europeenne) et (acheteur = particulier) alors TVA par defaut=TVA du produit vendu. Fin de regle

+	if (($seller_in_cee && $buyer_in_cee))

+	{

@@ -6945,8 +5361,7 @@
-		if ($isacompany && getDolGlobalString('MAIN_USE_VAT_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID_ARE_INDIVIDUAL')) {

-			require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';

-			if (!isValidVATID($thirdparty_buyer)) {

-				$isacompany = 0;

-			}

-		}

-

-		if (!$isacompany) {

+		if ($isacompany)

+		{

+			//print 'VATRULE 3';

+			return 0;

+		}

+		else

+		{

@@ -6955,19 +5370,11 @@
-		} else {

-			//print 'VATRULE 5';

-			return 0;

-		}

-	}

-

-	// If (seller in the European Community and buyer outside the European Community and private buyer) then VAT by default = VAT of the product sold. End of rule

-	// I don't see any use case that need this rule.

-	if (getDolGlobalString('MAIN_USE_VAT_OF_PRODUCT_FOR_INDIVIDUAL_CUSTOMER_OUT_OF_EEC') && empty($buyer_in_cee)) {

-		$isacompany = $thirdparty_buyer->isACompany();

-		if (!$isacompany) {

-			return get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournprice);

-			//print 'VATRULE extra';

-		}

-	}

-

-	// Otherwise the VAT proposed by default=0. End of rule.

-	// Rem: This means that at least one of the 2 is outside the European Community and the country differs

-	//print 'VATRULE 6';

+		}

+	}

+

+	// Si (vendeur en France et acheteur hors Communaute europeenne et acheteur particulier) alors TVA par defaut=TVA du produit vendu. Fin de regle

+	if (!empty($conf->global->MAIN_USE_VAT_OF_PRODUCT_FOR_INDIVIDUAL_CUSTOMER_OUT_OF_EEC) && empty($buyer_in_cee) && !$thirdparty_buyer->isACompany()) {

+		return get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournprice);

+	}

+

+	// Sinon la TVA proposee par defaut=0. Fin de regle.

+	// Rem: Cela signifie qu'au moins un des 2 est hors Communaute europeenne et que le pays differe

+	//print 'VATRULE 5';

@@ -6979 +5386 @@
- *	Function that returns whether VAT must be recoverable collected VAT (e.g.: VAT NPR in France)

+ *	Fonction qui renvoie si tva doit etre tva percue recuperable

@@ -6992 +5399,2 @@
-	if ($idprodfournprice > 0) {

+	if ($idprodfournprice > 0)

+	{

@@ -6999 +5407,3 @@
-	} elseif ($idprod > 0) {

+	}

+	elseif ($idprod > 0)

+	{

@@ -7028,13 +5438,11 @@
-	if (!is_object($thirdparty_seller)) {

-		return -1;

-	}

-	if (!is_object($thirdparty_buyer)) {

-		return -1;

-	}

-

-	if ($local == 1) { // Localtax 1

-		if ($mysoc->country_code == 'ES') {

-			if (is_numeric($thirdparty_buyer->localtax1_assuj) && !$thirdparty_buyer->localtax1_assuj) {

-				return 0;

-			}

-		} else {

+	if (!is_object($thirdparty_seller)) return -1;

+	if (!is_object($thirdparty_buyer)) return -1;

+

+	if ($local == 1) // Localtax 1

+	{

+		if ($mysoc->country_code == 'ES')

+		{

+			if (is_numeric($thirdparty_buyer->localtax1_assuj) && !$thirdparty_buyer->localtax1_assuj) return 0;

+		}

+		else

+		{

@@ -7042,8 +5450,6 @@
-			if (is_numeric($thirdparty_seller->localtax1_assuj) && !$thirdparty_seller->localtax1_assuj) {

-				return 0;

-			}

-			if (!is_numeric($thirdparty_seller->localtax1_assuj) && $thirdparty_seller->localtax1_assuj == 'localtax1off') {

-				return 0;

-			}

-		}

-	} elseif ($local == 2) { //I Localtax 2

+			if (is_numeric($thirdparty_seller->localtax1_assuj) && !$thirdparty_seller->localtax1_assuj) return 0;

+			if (!is_numeric($thirdparty_seller->localtax1_assuj) && $thirdparty_seller->localtax1_assuj == 'localtax1off') return 0;

+		}

+	}

+	elseif ($local == 2) //I Localtax 2

+	{

@@ -7051,9 +5457,6 @@
-		if (is_numeric($thirdparty_seller->localtax2_assuj) && !$thirdparty_seller->localtax2_assuj) {

-			return 0;

-		}

-		if (!is_numeric($thirdparty_seller->localtax2_assuj) && $thirdparty_seller->localtax2_assuj == 'localtax2off') {

-			return 0;

-		}

-	}

-

-	if ($thirdparty_seller->country_code == $thirdparty_buyer->country_code) {

+		if (is_numeric($thirdparty_seller->localtax2_assuj) && !$thirdparty_seller->localtax2_assuj) return 0;

+		if (!is_numeric($thirdparty_seller->localtax2_assuj) && $thirdparty_seller->localtax2_assuj == 'localtax2off') return 0;

+	}

+

+	if ($thirdparty_seller->country_code == $thirdparty_buyer->country_code)

+	{

@@ -7077,4 +5480,3 @@
-

-	$result = 'unknown';

-	$classname = '';

-	if ($yesno == 1 || (isset($yesno) && (strtolower($yesno) == 'yes' || strtolower($yesno) == 'true'))) { 	// A mettre avant test sur no a cause du == 0

+	$result = 'unknown'; $classname = '';

+	if ($yesno == 1 || strtolower($yesno) == 'yes' || strtolower($yesno) == 'true') 	// A mettre avant test sur no a cause du == 0

+	{

@@ -7082,9 +5484,3 @@
-		if ($case == 1 || $case == 3) {

-			$result = $langs->trans("Yes");

-		}

-		if ($case == 2) {

-			$result = '<input type="checkbox" value="1" checked disabled>';

-		}

-		if ($case == 3) {

-			$result = '<input type="checkbox" value="1" checked disabled> '.$result;

-		}

+		if ($case == 1 || $case == 3) $result = $langs->trans("Yes");

+		if ($case == 2) $result = '<input type="checkbox" value="1" checked disabled>';

+		if ($case == 3) $result = '<input type="checkbox" value="1" checked disabled> '.$result;

@@ -7093 +5489,3 @@
-	} elseif ($yesno == 0 || strtolower($yesno) == 'no' || strtolower($yesno) == 'false') {

+	}

+	elseif ($yesno == 0 || strtolower($yesno) == 'no' || strtolower($yesno) == 'false')

+	{

@@ -7095,19 +5493,8 @@
-		if ($case == 1 || $case == 3) {

-			$result = $langs->trans("No");

-		}

-		if ($case == 2) {

-			$result = '<input type="checkbox" value="0" disabled>';

-		}

-		if ($case == 3) {

-			$result = '<input type="checkbox" value="0" disabled> '.$result;

-		}

-

-		if ($color == 2) {

-			$classname = 'ok';

-		} else {

-			$classname = 'error';

-		}

-	}

-	if ($color) {

-		return '<span class="'.$classname.'">'.$result.'</span>';

-	}

+		if ($case == 1 || $case == 3) $result = $langs->trans("No");

+		if ($case == 2) $result = '<input type="checkbox" value="0" disabled>';

+		if ($case == 3) $result = '<input type="checkbox" value="0" disabled> '.$result;

+

+		if ($color == 2) $classname = 'ok';

+		else $classname = 'error';

+	}

+	if ($color) return '<font class="'.$classname.'">'.$result.'</font>';

@@ -7119,14 +5506,14 @@
- *  New usage:       $conf->module->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, '').'/'

- *         or:       $conf->module->dir_output.'/'.get_exdir(0, 0, 0, 0, $object, '')     if multidir_output not defined.

- *  Example out with new usage:       $object is invoice -> 'INYYMM-ABCD'

- *  Example out with old usage:       '015' with level 3->"0/1/5/", '015' with level 1->"5/", 'ABC-1' with level 3 ->"0/0/1/"

- *

- *	@param	string|int	$num            Id of object (deprecated, $object will be used in future)

- *	@param  int			$level		    Level of subdirs to return (1, 2 or 3 levels). (deprecated, global option will be used in future)

- * 	@param	int			$alpha		    0=Keep number only to forge path, 1=Use alpha part afer the - (By default, use 0). (deprecated, global option will be used in future)

- *  @param  int			$withoutslash   0=With slash at end (except if '/', we return ''), 1=without slash at end

- *  @param	Object		$object			Object to use to get ref to forge the path.

- *  @param	string		$modulepart		Type of object ('invoice_supplier, 'donation', 'invoice', ...'). Use '' for autodetect from $object.

- *  @return	string						Dir to use ending. Example '' or '1/' or '1/2/'

- */

-function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart = '')

+ *  New usage:       $conf->module->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, $modulepart)

+ *         or:       $conf->module->dir_output.'/'.get_exdir(0, 0, 0, 1, $object, $modulepart)     if multidir_output not defined.

+ *  Example our with new usage:       $object is invoice -> 'INYYMM-ABCD'

+ *  Example our with old usage:       '015' with level 3->"0/1/5/", '015' with level 1->"5/", 'ABC-1' with level 3 ->"0/0/1/"

+ *

+ *	@param	string	$num            Id of object (deprecated, $object will be used in future)

+ *	@param  int		$level		    Level of subdirs to return (1, 2 or 3 levels). (deprecated, global option will be used in future)

+ * 	@param	int		$alpha		    0=Keep number only to forge path, 1=Use alpha part afer the - (By default, use 0). (deprecated, global option will be used in future)

+ *  @param  int		$withoutslash   0=With slash at end (except if '/', we return ''), 1=without slash at end

+ *  @param	Object	$object			Object

+ *  @param	string	$modulepart		Type of object ('invoice_supplier, 'donation', 'invoice', ...')

+ *  @return	string					Dir to use ending. Example '' or '1/' or '1/2/'

+ */

+function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart)

@@ -7136,4 +5522,0 @@
-	if (empty($modulepart) && !empty($object->module)) {

-		$modulepart = $object->module;

-	}

-

@@ -7142,11 +5525,7 @@
-	$arrayforoldpath = array('cheque', 'category', 'holiday', 'supplier_invoice', 'invoice_supplier', 'mailing', 'supplier_payment');

-	if (getDolGlobalInt('PRODUCT_USE_OLD_PATH_FOR_PHOTO')) {

-		$arrayforoldpath[] = 'product';

-	}

-	if (!empty($level) && in_array($modulepart, $arrayforoldpath)) {

-		// This part should be removed once all code is using "get_exdir" to forge path, with parameter $object and $modulepart provided.

-		if (empty($alpha)) {

-			$num = preg_replace('/([^0-9])/i', '', $num);

-		} else {

-			$num = preg_replace('/^.*\-/i', '', $num);

-		}

+	$arrayforoldpath = array('cheque', 'user', 'category', 'holiday', 'supplier_invoice', 'invoice_supplier', 'mailing', 'supplier_payment');

+	if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) $arrayforoldpath[] = 'product';

+	if (!empty($level) && in_array($modulepart, $arrayforoldpath))

+	{

+		// This part should be removed once all code is using "get_exdir" to forge path, with all parameters provided.

+		if (empty($alpha)) $num = preg_replace('/([^0-9])/i', '', $num);

+		else $num = preg_replace('/^.*\-/i', '', $num);

@@ -7154,13 +5533,9 @@
-		if ($level == 1) {

-			$path = substr($num, 0, 1);

-		}

-		if ($level == 2) {

-			$path = substr($num, 1, 1).'/'.substr($num, 0, 1);

-		}

-		if ($level == 3) {

-			$path = substr($num, 2, 1).'/'.substr($num, 1, 1).'/'.substr($num, 0, 1);

-		}

-	} else {

-		// We will enhance here a common way of forging path for document storage.

-		// In a future, we may distribute directories on several levels depending on setup and object.

-		// Here, $object->id, $object->ref and $modulepart are required.

+		if ($level == 1) $path = substr($num, 0, 1);

+		if ($level == 2) $path = substr($num, 1, 1).'/'.substr($num, 0, 1);

+		if ($level == 3) $path = substr($num, 2, 1).'/'.substr($num, 1, 1).'/'.substr($num, 0, 1);

+	}

+	else

+	{

+		// TODO

+		// We will enhance here a common way of forging path for document storage

+		// Here, object->id, object->ref and modulepart are required.

@@ -7168,6 +5543,8 @@
-		$path = dol_sanitizeFileName(empty($object->ref) ? (string) $object->id : $object->ref);

-	}

-

-	if (empty($withoutslash) && !empty($path)) {

-		$path .= '/';

-	}

+        if (in_array($modulepart, array('thirdparty', 'contact', 'member', 'propal', 'proposal', 'commande', 'order', 'facture', 'invoice',

+			'supplier_order', 'supplier_proposal', 'shipment', 'contract', 'expensereport', 'ficheinter')))

+		{

+			$path = ($object->ref ? $object->ref : $object->id);

+		}

+	}

+

+	if (empty($withoutslash) && !empty($path)) $path .= '/';

@@ -7182,5 +5559,5 @@
- *	@param	string		$dataroot	Data root directory (To avoid having the data root in the loop. Using this will also lost the warning, on first dir, saying PHP has no permission when open_basedir is used)

- *  @param	string		$newmask	Mask for new file (Defaults to $conf->global->MAIN_UMASK or 0755 if unavailable). Example: '0444'

- *	@return int         			Return integer < 0 if KO, 0 = already exists, > 0 if OK

- */

-function dol_mkdir($dir, $dataroot = '', $newmask = '')

+ *	@param	string		$dataroot	Data root directory (To avoid having the data root in the loop. Using this will also lost the warning on first dir PHP has no permission when open_basedir is used)

+ *  @param	string|null	$newmask	Mask for new file (Defaults to $conf->global->MAIN_UMASK or 0755 if unavailable). Example: '0444'

+ *	@return int         			< 0 if KO, 0 = already exists, > 0 if OK

+ */

+function dol_mkdir($dir, $dataroot = '', $newmask = null)

@@ -7193,3 +5570 @@
-	if (@is_dir($dir_osencoded)) {

-		return 0;

-	}

+	if (@is_dir($dir_osencoded)) return 0;

@@ -7209,10 +5584,5 @@
-	for ($i = 0; $i < $num; $i++) {

-		if ($i > 0) {

-			$ccdir .= '/'.$cdir[$i];

-		} else {

-			$ccdir .= $cdir[$i];

-		}

-		$regs = array();

-		if (preg_match("/^.:$/", $ccdir, $regs)) {

-			continue; // Si chemin Windows incomplet, on poursuit par rep suivant

-		}

+	for ($i = 0; $i < $num; $i++)

+	{

+		if ($i > 0) $ccdir .= '/'.$cdir[$i];

+		else $ccdir .= $cdir[$i];

+		if (preg_match("/^.:$/", $ccdir, $regs)) continue; // Si chemin Windows incomplet, on poursuit par rep suivant

@@ -7222 +5592,2 @@
-		if ($ccdir) {

+		if ($ccdir)

+		{

@@ -7224 +5595,2 @@
-			if (!@is_dir($ccdir_osencoded)) {

+			if (!@is_dir($ccdir_osencoded))

+			{

@@ -7228 +5600 @@
-				$dirmaskdec = octdec((string) $newmask);

+				$dirmaskdec = octdec($newmask);

@@ -7230 +5602 @@
-					$dirmaskdec = !getDolGlobalString('MAIN_UMASK') ? octdec('0755') : octdec($conf->global->MAIN_UMASK);

+					$dirmaskdec = empty($conf->global->MAIN_UMASK) ? octdec('0755') : octdec($conf->global->MAIN_UMASK);

@@ -7233 +5605,2 @@
-				if (!@mkdir($ccdir_osencoded, $dirmaskdec)) {

+				if (!@mkdir($ccdir_osencoded, $dirmaskdec))

+				{

@@ -7237 +5610,3 @@
-				} else {

+				}

+				else

+				{

@@ -7242 +5617,3 @@
-			} else {

+			}

+			else

+			{

@@ -7248,19 +5624,0 @@
-}

-

-

-/**

- *	Change mod of a file

- *

- *  @param	string		$filepath		Full file path

- *  @param	string		$newmask		Force new mask. For example '0644'

- *	@return void

- */

-function dolChmod($filepath, $newmask = '')

-{

-	global $conf;

-

-	if (!empty($newmask)) {

-		@chmod($filepath, octdec($newmask));

-	} elseif (getDolGlobalString('MAIN_UMASK')) {

-		@chmod($filepath, octdec($conf->global->MAIN_UMASK));

-	}

@@ -7291,2 +5649 @@
- *  @param	integer	$strip_tags			0=Use internal strip, 1=Use strip_tags() php function (bugged when text contains a < char that is not for a html tag or when tags is not closed like '<img onload=aaa')

- *  @param	integer	$removedoublespaces	Replace double space into one space

+ *  @param	integer	$strip_tags			0=Use internal strip, 1=Use strip_tags() php function (bugged when text contains a < char that is not for a html tag)

@@ -7295,11 +5652,5 @@
- * 	@see	dol_escape_htmltag() strip_tags() dol_string_onlythesehtmltags() dol_string_neverthesehtmltags(), dolStripPhpCode()

- */

-function dol_string_nohtmltag($stringtoclean, $removelinefeed = 1, $pagecodeto = 'UTF-8', $strip_tags = 0, $removedoublespaces = 1)

-{

-	if (is_null($stringtoclean)) {

-		return '';

-	}

-

-	if ($removelinefeed == 2) {

-		$stringtoclean = preg_replace('/<br[^>]*>(\n|\r)+/ims', '<br>', $stringtoclean);

-	}

+ * 	@see	dol_escape_htmltag() strip_tags() dol_string_onlythesehtmltags() dol_string_neverthesehtmltags()

+ */

+function dol_string_nohtmltag($stringtoclean, $removelinefeed = 1, $pagecodeto = 'UTF-8', $strip_tags = 0)

+{

+	if ($removelinefeed == 2) $stringtoclean = preg_replace('/<br[^>]*>(\n|\r)+/ims', '<br>', $stringtoclean);

@@ -7307,5 +5657,0 @@
-

-	// We remove entities BEFORE stripping (in case of an open separator char that is entity encoded and not the closing other, the strip will fails)

-	$temp = dol_html_entity_decode($temp, ENT_COMPAT | ENT_HTML5, $pagecodeto);

-

-	$temp = str_replace('< ', '__ltspace__', $temp);

@@ -7316 +5661,0 @@
-		// Remove '<' into remainging, so remove non closing html tags like '<abc' or '<<abc'. Note: '<123abc' is not a html tag (can be kept), but '<abc123' is (must be removed).

@@ -7318,15 +5663,5 @@
-		// Example of $temp: <a href="/myurl" title="<u>A title</u>">0000-021</a>

-		// pass 1 - $temp after pass 1: <a href="/myurl" title="A title">0000-021

-		// pass 2 - $temp after pass 2: 0000-021

-		$tempbis = $temp;

-		do {

-			$temp = $tempbis;

-			$tempbis = str_replace('<>', '', $temp);	// No reason to have this into a text, except if value is to try bypass the next html cleaning

-			$tempbis = preg_replace($pattern, '', $tempbis);

-			//$idowhile++; print $temp.'-'.$tempbis."\n"; if ($idowhile > 100) break;

-		} while ($tempbis != $temp);

-

-		$temp = $tempbis;

-

-		// Remove '<' into remaining, so remove non closing html tags like '<abc' or '<<abc'. Note: '<123abc' is not a html tag (can be kept), but '<abc123' is (must be removed).

-		$temp = preg_replace('/<+([a-z]+)/i', '\1', $temp);

+		// Exemple of $temp: <a href="/myurl" title="<u>A title</u>">0000-021</a>

+		$temp = preg_replace($pattern, "", $temp); // pass 1

+		// $temp after pass 1: <a href="/myurl" title="A title">0000-021

+		$temp = preg_replace($pattern, "", $temp); // pass 2

+		// $temp after pass 2: 0000-021

@@ -7337,13 +5672,8 @@
-	// Remove also carriage returns

-	if ($removelinefeed == 1) {

-		$temp = str_replace(array("\r\n", "\r", "\n"), " ", $temp);

-	}

-

-	// And double quotes

-	if ($removedoublespaces) {

-		while (strpos($temp, "  ")) {

-			$temp = str_replace("  ", " ", $temp);

-		}

-	}

-

-	$temp = str_replace('__ltspace__', '< ', $temp);

+	// Supprime aussi les retours

+	if ($removelinefeed == 1) $temp = str_replace(array("\r\n", "\r", "\n"), " ", $temp);

+

+	// et les espaces doubles

+	while (strpos($temp, "  "))

+	{

+		$temp = str_replace("  ", " ", $temp);

+	}

@@ -7356 +5685,0 @@
- *  WARNING: This also clean HTML comments (because they can be used to obfuscate tag name).

@@ -7359,6 +5688 @@
- *  @param	int		$cleanalsosomestyles	Remove absolute/fixed positioning from inline styles

- *  @param	int		$removeclassattribute	1=Remove the class attribute from tags

- *  @param	int		$cleanalsojavascript	Remove also occurence of 'javascript:'.

- *  @param	int		$allowiframe			Allow iframe tags.

- *  @param	array	$allowed_tags			List of allowed tags to replace the default list

- *  @param	int		$allowlink				Allow "link" tags.

+ *  @param	string	$cleanalsosomestyles	Clean also some tags

@@ -7367,23 +5691,9 @@
- * 	@see	dol_htmlwithnojs() dol_escape_htmltag() strip_tags() dol_string_nohtmltag() dol_string_neverthesehtmltags()

- */

-function dol_string_onlythesehtmltags($stringtoclean, $cleanalsosomestyles = 1, $removeclassattribute = 1, $cleanalsojavascript = 0, $allowiframe = 0, $allowed_tags = array(), $allowlink = 0)

-{

-	if (empty($allowed_tags)) {

-		$allowed_tags = array(

-			"html", "head", "meta", "body", "article", "a", "abbr", "b", "blockquote", "br", "cite", "div", "dl", "dd", "dt", "em", "font", "img", "ins", "hr", "i", "li",

-			"ol", "p", "q", "s", "span", "strike", "strong", "title", "table", "tr", "th", "td", "u", "ul", "sup", "sub", "blockquote", "pre", "h1", "h2", "h3", "h4", "h5", "h6",

-			"header", "footer", "nav", "section", "menu", "menuitem"	// html5 tags

-		);

-	}

-	$allowed_tags[] = "comment";		// this tags is added to manage comment <!--...--> that are replaced into <comment>...</comment>

-	if ($allowiframe) {

-		if (!in_array('iframe', $allowed_tags)) {

-			$allowed_tags[] = "iframe";

-		}

-	}

-	if ($allowlink) {

-		if (!in_array('link', $allowed_tags)) {

-			$allowed_tags[] = "link";

-		}

-	}

-

+ * 	@see	dol_escape_htmltag() strip_tags() dol_string_nohtmltag() dol_string_neverthesehtmltags()

+ */

+function dol_string_onlythesehtmltags($stringtoclean, $cleanalsosomestyles = 1)

+{

+	$allowed_tags = array(

+		"html", "head", "meta", "body", "article", "a", "abbr", "b", "blockquote", "br", "cite", "div", "dl", "dd", "dt", "em", "font", "img", "ins", "hr", "i", "li", "link",

+		"ol", "p", "q", "s", "section", "span", "strike", "strong", "title",

+		"table", "tr", "th", "td", "u", "ul"

+	);

@@ -7390,0 +5701,2 @@
+	$allowed_tags_string = preg_replace('/^>/', '', $allowed_tags_string);

+	$allowed_tags_string = preg_replace('/<$/', '', $allowed_tags_string);

@@ -7393,29 +5705,5 @@
-	$stringtoclean = str_replace('<!DOCTYPE html>', '__!DOCTYPE_HTML__', $stringtoclean);	// Replace DOCTYPE to avoid to have it removed by the strip_tags

-

-	$stringtoclean = dol_string_nounprintableascii($stringtoclean, 0);

-

-	//$stringtoclean = preg_replace('/<!--[^>]*-->/', '', $stringtoclean);

-	$stringtoclean = preg_replace('/<!--([^>]*)-->/', '<comment>\1</comment>', $stringtoclean);

-

-	$stringtoclean = preg_replace('/&colon;/i', ':', $stringtoclean);

-	$stringtoclean = preg_replace('/&#58;|&#0+58|&#x3A/i', '', $stringtoclean); // refused string ':' encoded (no reason to have a : encoded like this) to disable 'javascript:...'

-

-	$temp = strip_tags($stringtoclean, $allowed_tags_string);	// Warning: This remove also undesired </>, so may changes string obfuscated with </> that pass the injection detection into a harmfull string

-

-	if ($cleanalsosomestyles) {	// Clean for remaining html tags

-		$temp = preg_replace('/position\s*:\s*(absolute|fixed)\s*!\s*important/i', '', $temp); // Note: If hacker try to introduce css comment into string to bypass this regex, the string must also be encoded by the dol_htmlentitiesbr during output so it become harmless

-	}

-	if ($removeclassattribute) {	// Clean for remaining html tags

-		$temp = preg_replace('/(<[^>]+)\s+class=((["\']).*?\\3|\\w*)/i', '\\1', $temp);

-	}

-

-	// Remove 'javascript:' that we should not find into a text with

-	// Warning: This is not reliable to fight against obfuscated javascript, there is a lot of other solution to include js into a common html tag (only filtered by a GETPOST(.., powerfullfilter)).

-	if ($cleanalsojavascript) {

-		$temp = preg_replace('/j\s*a\s*v\s*a\s*s\s*c\s*r\s*i\s*p\s*t\s*:/i', '', $temp);

-	}

-

-	$temp = str_replace('__!DOCTYPE_HTML__', '<!DOCTYPE html>', $temp);	// Restore the DOCTYPE

-

-	$temp = preg_replace('/<comment>([^>]*)<\/comment>/', '<!--\1-->', $temp);	// Restore html comments

-

+	if ($cleanalsosomestyles) {

+		$stringtoclean = preg_replace('/position\s*:\s*(absolute|fixed)\s*!\s*important/', '', $stringtoclean); // Note: If hacker try to introduce css comment into string to bypass this regex, the string must also be encoded by the dol_htmlentitiesbr during output so it become harmless

+	}

+

+	$temp = strip_tags($stringtoclean, $allowed_tags_string);

@@ -7426 +5713,0 @@
-

@@ -7429,77 +5716 @@
- *  Note: Complementary to dol_string_onlythesehtmltags().

- *  This method is used for example by dol_htmlwithnojs() when option MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES is set to 1.

- *

- *	@param	string	$stringtoclean			String to clean

- *  @param	array	$allowed_attributes		Array of tags not allowed

- *	@return string	    					String cleaned

- *

- * 	@see	dol_escape_htmltag() strip_tags() dol_string_nohtmltag() dol_string_onlythesehtmltags() dol_string_neverthesehtmltags()

- */

-function dol_string_onlythesehtmlattributes($stringtoclean, $allowed_attributes = null)

-{

-	if (is_null($allowed_attributes)) {

-		$allowed_attributes = array(

-			"allow", "allowfullscreen", "alt", "class", "contenteditable", "data-html", "frameborder", "height", "href", "id", "name", "src", "style", "target", "title", "width",

-			// HTML5

-			"header", "footer", "nav", "section", "menu", "menuitem"

-		);

-	}

-

-	if (class_exists('DOMDocument') && !empty($stringtoclean)) {

-		$stringtoclean = '<?xml encoding="UTF-8"><html><body>'.$stringtoclean.'</body></html>';

-

-		// Warning: loadHTML does not support HTML5 on old libxml versions.

-		$dom = new DOMDocument(null, 'UTF-8');

-		$dom->loadHTML($stringtoclean, LIBXML_ERR_NONE|LIBXML_HTML_NOIMPLIED|LIBXML_HTML_NODEFDTD|LIBXML_NONET|LIBXML_NOWARNING|LIBXML_NOXMLDECL);

-

-		if (is_object($dom)) {

-			for ($els = $dom->getElementsByTagname('*'), $i = $els->length - 1; $i >= 0; $i--) {

-				for ($attrs = $els->item($i)->attributes, $ii = $attrs->length - 1; $ii >= 0; $ii--) {

-					//var_dump($attrs->item($ii));

-					if (!empty($attrs->item($ii)->name)) {

-						if (! in_array($attrs->item($ii)->name, $allowed_attributes)) {

-							// Delete attribute if not into allowed_attributes

-							$els->item($i)->removeAttribute($attrs->item($ii)->name);

-						} elseif (in_array($attrs->item($ii)->name, array('style'))) {

-							// If attribute is 'style'

-							$valuetoclean = $attrs->item($ii)->value;

-

-							if (isset($valuetoclean)) {

-								do {

-									$oldvaluetoclean = $valuetoclean;

-									$valuetoclean = preg_replace('/\/\*.*\*\//m', '', $valuetoclean);	// clean css comments

-									$valuetoclean = preg_replace('/position\s*:\s*[a-z]+/mi', '', $valuetoclean);

-									if ($els->item($i)->tagName == 'a') {	// more paranoiac cleaning for clickable tags.

-										$valuetoclean = preg_replace('/display\s*:/mi', '', $valuetoclean);

-										$valuetoclean = preg_replace('/z-index\s*:/mi', '', $valuetoclean);

-										$valuetoclean = preg_replace('/\s+(top|left|right|bottom)\s*:/mi', '', $valuetoclean);

-									}

-

-									// We do not allow logout|passwordforgotten.php and action= into the content of a "style" tag

-									$valuetoclean = preg_replace('/(logout|passwordforgotten)\.php/mi', '', $valuetoclean);

-									$valuetoclean = preg_replace('/action=/mi', '', $valuetoclean);

-								} while ($oldvaluetoclean != $valuetoclean);

-							}

-

-							$attrs->item($ii)->value = $valuetoclean;

-						}

-					}

-				}

-			}

-		}

-

-		$return = $dom->saveHTML();	// This may add a LF at end of lines, so we will trim later

-		//$return = '<html><body>aaaa</p>bb<p>ssdd</p>'."\n<p>aaa</p>aa<p>bb</p>";

-

-		$return = preg_replace('/^'.preg_quote('<?xml encoding="UTF-8">', '/').'/', '', $return);

-		$return = preg_replace('/^'.preg_quote('<html><body>', '/').'/', '', $return);

-		$return = preg_replace('/'.preg_quote('</body></html>', '/').'$/', '', $return);

-		return trim($return);

-	} else {

-		return $stringtoclean;

-	}

-}

-

-/**

- *	Clean a string from some undesirable HTML tags.

- *  Note: You should use instead dol_string_onlythesehtmltags() that is more secured if you can.

+ *  Note. Not enough secured as dol_string_onlythesehtmltags().

@@ -7512 +5723 @@
- * 	@see	dol_escape_htmltag() strip_tags() dol_string_nohtmltag() dol_string_onlythesehtmltags() dol_string_onlythesehtmlattributes()

+ * 	@see	dol_escape_htmltag() strip_tags() dol_string_nohtmltag() dol_string_onlythesehtmltags()

@@ -7517 +5728,2 @@
-	foreach ($disallowed_tags as $tagtoremove) {

+	foreach ($disallowed_tags as $tagtoremove)

+	{

@@ -7541,2 +5753,4 @@
-	if ($nboflines == 1) {

-		if (dol_textishtml($text)) {

+	if ($nboflines == 1)

+	{

+		if (dol_textishtml($text))

+		{

@@ -7545,9 +5759,9 @@
-		} else {

-			if (isset($text)) {

-				$firstline = preg_replace('/[\n\r].*/', '', $text);

-			} else {

-				$firstline = '';

-			}

-		}

-		return $firstline.(isset($firstline) && isset($text) && (strlen($firstline) != strlen($text)) ? '...' : '');

-	} else {

+		}

+		else

+		{

+			$firstline = preg_replace('/[\n\r].*/', '', $text);

+		}

+		return $firstline.((strlen($firstline) != strlen($text)) ? '...' : '');

+	}

+	else

+	{

@@ -7555 +5769,2 @@
-		if (dol_textishtml($text)) {

+		if (dol_textishtml($text))

+		{

@@ -7559 +5774,3 @@
-		} else {

+		}

+		else

+		{

@@ -7564,6 +5781,2 @@
-		if ($charset == 'UTF-8') {

-			$pattern = '/(<br[^>]*>)/Uu';

-		} else {

-			// /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support

-			$pattern = '/(<br[^>]*>)/U'; // /U is to have UNGREEDY regex to limit to one html tag.

-		}

+		if ($charset == 'UTF-8') { $pattern = '/(<br[^>]*>)/Uu'; }	// /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support

+		else $pattern = '/(<br[^>]*>)/U'; // /U is to have UNGREEDY regex to limit to one html tag.

@@ -7574,17 +5787,5 @@
-		$countline = 0;

-		$lastaddediscontent = 1;

-		while ($countline < $nboflines && isset($a[$i])) {

-			if (preg_match('/<br[^>]*>/', $a[$i])) {

-				if (array_key_exists($i+1, $a) && !empty($a[$i+1])) {

-					$firstline .= ($ishtml ? "<br>\n" : "\n");

-					// Is it a br for a new line of after a printed line ?

-					if (!$lastaddediscontent) {

-						$countline++;

-					}

-					$lastaddediscontent = 0;

-				}

-			} else {

-				$firstline .= $a[$i];

-				$lastaddediscontent = 1;

-				$countline++;

-			}

+		$nba = count($a); // 2x nb of lines in $a because $a contains also a line for each new line separator

+		while (($i < $nba) && ($i < ($nboflines * 2)))

+		{

+			if ($i % 2 == 0) $firstline .= $a[$i];

+			elseif (($i < (($nboflines * 2) - 1)) && ($i < ($nba - 1))) $firstline .= ($ishtml ? "<br>\n" : "\n");

@@ -7593,6 +5794,2 @@
-

-		$adddots = (isset($a[$i]) && (!preg_match('/<br[^>]*>/', $a[$i]) || (array_key_exists($i+1, $a) && !empty($a[$i+1]))));

-		//unset($a);

-		$ret = $firstline.($adddots ? '...' : '');

-		//exit;

-		return $ret;

+		unset($a);

+		return $firstline.(($i < $nba) ? '...' : '');

@@ -7605,2 +5802 @@
- * WARNING: The content after operation contains some HTML tags (the <br>) so be sure to also have

- *          encoded the special chars of stringtoencode into HTML before with dol_htmlentitiesbr().

+ * WARNING: The content after operation contains some HTML tags (the <br>) so be sure to also have encode the special chars of stringtoencode into HTML before.

@@ -7612 +5808 @@
- * @see dol_htmlentitiesbr(), dol_nboflines(), dolGetFirstLineOfText()

+ * @see dol_nboflines(), dolGetFirstLineOfText()

@@ -7616,4 +5811,0 @@
-	if (is_null($stringtoencode)) {

-		return '';

-	}

-

@@ -7628,164 +5819,0 @@
-/**

- * Sanitize a HTML to remove js, dangerous content and external link.

- * This function is used by dolPrintHTML... function for example.

- *

- * @param	string	$stringtoencode				String to encode

- * @param	int     $nouseofiframesandbox		0=Default, 1=Allow use of option MAIN_SECURITY_USE_SANDBOX_FOR_HTMLWITHNOJS for html sanitizing (not yet working)

- * @param	string	$check						'restricthtmlnolink' or 'restricthtml' or 'restricthtmlallowclass' or 'restricthtmlallowunvalid'

- * @return	string								HTML sanitized

- */

-function dol_htmlwithnojs($stringtoencode, $nouseofiframesandbox = 0, $check = 'restricthtml')

-{

-	if (empty($nouseofiframesandbox) && getDolGlobalString('MAIN_SECURITY_USE_SANDBOX_FOR_HTMLWITHNOJS')) {

-		// TODO using sandbox on inline html content is not possible yet with current browsers

-		//$s = '<iframe class="iframewithsandbox" sandbox><html><body>';

-		//$s .= $stringtoencode;

-		//$s .= '</body></html></iframe>';

-		return $stringtoencode;

-	} else {

-		$out = $stringtoencode;

-

-		do {

-			$oldstringtoclean = $out;

-

-			if (!empty($out) && getDolGlobalString('MAIN_RESTRICTHTML_ONLY_VALID_HTML') && $check != 'restricthtmlallowunvalid') {

-				try {

-					libxml_use_internal_errors(false);	// Avoid to fill memory with xml errors

-					if (LIBXML_VERSION < 20900) {

-						// Avoid load of external entities (security problem).

-						// Required only if LIBXML_VERSION < 20900

-						libxml_disable_entity_loader(true);

-					}

-

-					$dom = new DOMDocument();

-					// Add a trick to solve pb with text without parent tag

-					// like '<h1>Foo</h1><p>bar</p>' that wrongly ends up, without the trick, with '<h1>Foo<p>bar</p></h1>'

-					// like 'abc' that wrongly ends up, without the trick, with '<p>abc</p>'

-

-					if (dol_textishtml($out)) {

-						$out = '<?xml encoding="UTF-8"><div class="tricktoremove">'.$out.'</div>';

-					} else {

-						$out = '<?xml encoding="UTF-8"><div class="tricktoremove">'.dol_nl2br($out).'</div>';

-					}

-					$dom->loadHTML($out, LIBXML_HTML_NODEFDTD | LIBXML_ERR_NONE | LIBXML_HTML_NOIMPLIED | LIBXML_NONET | LIBXML_NOWARNING | LIBXML_NOERROR | LIBXML_NOXMLDECL);

-					$out = trim($dom->saveHTML());

-

-					// Remove the trick added to solve pb with text without parent tag

-					$out = preg_replace('/^<\?xml encoding="UTF-8"><div class="tricktoremove">/', '', $out);

-					$out = preg_replace('/<\/div>$/', '', $out);

-				} catch (Exception $e) {

-					// If error, invalid HTML string with no way to clean it

-					//print $e->getMessage();

-					$out = 'InvalidHTMLStringCantBeCleaned '.$e->getMessage();

-				}

-			}

-

-			if (!empty($out) && getDolGlobalString('MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY') && $check != 'restricthtmlallowunvalid') {

-				try {

-					// Try cleaning using tidy

-					if (extension_loaded('tidy') && class_exists("tidy")) {

-						//print "aaa".$out."\n";

-

-						// See options at https://tidy.sourceforge.net/docs/quickref.html

-						$config = array(

-							'clean' => false,

-							'quote-marks' => false,		// do not replace " that are used for real text content (not a string symbol for html attribute) into &quot;

-							'doctype'     => 'strict',

-							'show-body-only' => true,

-							"indent-attributes" => false,

-							"vertical-space" => false,

-							'ident' => false,

-							"wrap" => 0

-							// HTML5 tags

-							//'new-blocklevel-tags' => 'article aside audio bdi canvas details dialog figcaption figure footer header hgroup main menu menuitem nav section source summary template track video',

-							//'new-blocklevel-tags' => 'footer header section menu menuitem'

-							//'new-empty-tags' => 'command embed keygen source track wbr',

-							//'new-inline-tags' => 'audio command datalist embed keygen mark menuitem meter output progress source time video wbr',

-						);

-

-						// Tidy

-						$tidy = new tidy();

-						$out = $tidy->repairString($out, $config, 'utf8');

-

-						//print "xxx".$out;exit;

-					}

-				} catch (Exception $e) {

-					// If error, invalid HTML string with no way to clean it

-					//print $e->getMessage();

-					$out = 'InvalidHTMLStringCantBeCleaned '.$e->getMessage();

-				}

-			}

-

-			//Clear ZERO WIDTH NO-BREAK SPACE, ZERO WIDTH SPACE, ZERO WIDTH JOINER

-			$out = preg_replace('/[\x{200B}-\x{200D}\x{FEFF}]/u', ' ', $out);

-

-			// Clean some html entities that are useless so text is cleaner

-			$out = preg_replace('/&(tab|newline);/i', ' ', $out);

-

-			// Ckeditor use the numeric entitic for apostrophe so we force it to text entity (all other special chars are

-			// encoded using text entities) so we can then exclude all numeric entities.

-			$out = preg_replace('/&#39;/i', '&apos;', $out);

-

-			// We replace chars from a/A to z/Z encoded with numeric HTML entities with the real char so we won't loose the chars at the next step (preg_replace).

-			// No need to use a loop here, this step is not to sanitize (this is done at next step, this is to try to save chars, even if they are

-			// using a non coventionnel way to be encoded, to not have them sanitized just after)

-			$out = preg_replace_callback('/&#(x?[0-9][0-9a-f]+;?)/i', function ($m) {

-				return realCharForNumericEntities($m);

-			}, $out);

-

-

-			// Now we remove all remaining HTML entities starting with a number. We don't want such entities.

-			$out = preg_replace('/&#x?[0-9]+/i', '', $out);	// For example if we have j&#x61vascript with an entities without the ; to hide the 'a' of 'javascript'.

-

-			// Keep only some html tags and remove also some 'javascript:' strings

-			$out = dol_string_onlythesehtmltags($out, 0, ($check == 'restricthtmlallowclass' ? 0 : 1), 1);

-

-			// Keep only some html attributes and exclude non expected HTML attributes and clean content of some attributes (keep only alt=, title=...).

-			if (getDolGlobalString('MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES')) {

-				$out = dol_string_onlythesehtmlattributes($out);

-			}

-

-			// Restore entity &apos; into &#39; (restricthtml is for html content so we can use html entity)

-			$out = preg_replace('/&apos;/i', "&#39;", $out);

-		} while ($oldstringtoclean != $out);

-

-		// Check the limit of external links that are automatically executed in a Rich text content. We count:

-		// '<img' to avoid <img src="http...">,  we can only accept "<img src="data:..."

-		// 'url(' to avoid inline style like background: url(http...

-		// '<link' to avoid <link href="http...">

-		$reg = array();

-		$tmpout = preg_replace('/<img src="data:/mi', '<__IMG_SRC_DATA__ src="data:', $out);

-		preg_match_all('/(<img|url\(|<link)/i', $tmpout, $reg);

-		$nblinks = count($reg[0]);

-		if ($nblinks > getDolGlobalInt("MAIN_SECURITY_MAX_IMG_IN_HTML_CONTENT", 1000)) {

-			$out = 'ErrorTooManyLinksIntoHTMLString';

-		}

-

-		if (getDolGlobalInt('MAIN_DISALLOW_URL_INTO_DESCRIPTIONS') == 2 || $check == 'restricthtmlnolink') {

-			if ($nblinks > 0) {

-				$out = 'ErrorHTMLLinksNotAllowed';

-			}

-		} elseif (getDolGlobalInt('MAIN_DISALLOW_URL_INTO_DESCRIPTIONS') == 1) {

-			$nblinks = 0;

-			// Loop on each url in src= and url(

-			$pattern = '/src=["\']?(http[^"\']+)|url\(["\']?(http[^\)]+)/';

-

-			$matches = array();

-			if (preg_match_all($pattern, $out, $matches)) {

-				// URLs are into $matches[1]

-				$urls = $matches[1];

-

-				// Affiche les URLs

-				foreach ($urls as $url) {

-					$nblinks++;

-					echo "Found url = ".$url . "\n";

-				}

-				if ($nblinks > 0) {

-					$out = 'ErrorHTMLExternalLinksNotAllowed';

-				}

-			}

-		}

-

-		return $out;

-	}

-}

@@ -7799,7 +5827,4 @@
- *        - writeHTMLCell -> param must be encoded into HTML.

- *        - MultiCell -> param must not be encoded into HTML.

- *        Because writeHTMLCell convert also \n into <br>, if function is used to build PDF, nl2brmode must be 1.

- *  Note: When we output string on pages, we should use

- *        - dolPrintHTML... that is dol_escape_htmltag(dol_htmlwithnojs(dol_string_onlythesehtmltags(dol_htmlentitiesbr(), 1, 1, 1), 1, 1) for notes or descriptions,

- *        - dolPrintLabel... that is dol_escape_htmltag(dol_htmlentitiesbr()) for simple labels.

- *        - dolPrintPassword that is abelhtmlspecialchars( , ENT_COMPAT, 'UTF-8') for passwords.

+ *              - writeHTMLCell -> param must be encoded into HTML.

+ *              - MultiCell -> param must not be encoded into HTML.

+ *              Because writeHTMLCell convert also \n into <br>, if function

+ *              is used to build PDF, nl2brmode must be 1.

@@ -7812 +5836,0 @@
- *  @see dol_escape_htmltag(), dolGetFirstLineOfText(), dol_string_onlythesehtmltags()

@@ -7816,4 +5839,0 @@
-	if (is_null($stringtoencode)) {

-		return '';

-	}

-

@@ -7821 +5841,2 @@
-	if (dol_textishtml($stringtoencode)) {	// Check if text is already HTML or not

+	if (dol_textishtml($stringtoencode))	// Check if text is already HTML or not

+	{

@@ -7823,4 +5844 @@
-		if ($removelasteolbr) {

-			$newstring = preg_replace('/<br>$/i', '', $newstring); // Remove last <br> (remove only last one)

-		}

-		$newstring = preg_replace('/[\x{200B}-\x{200D}\x{FEFF}]/u', ' ', $newstring);

+		if ($removelasteolbr) $newstring = preg_replace('/<br>$/i', '', $newstring); // Remove last <br> (remove only last one)

@@ -7830,4 +5848,4 @@
-	} else {

-		if ($removelasteolbr) {

-			$newstring = preg_replace('/(\r\n|\r|\n)$/i', '', $newstring); // Remove last \n (may remove several)

-		}

+	}

+	else

+	{

+		if ($removelasteolbr) $newstring = preg_replace('/(\r\n|\r|\n)$/i', '', $newstring); // Remove last \n (may remove several)

@@ -7850 +5868 @@
-	$ret = dol_html_entity_decode($stringtodecode, ENT_COMPAT | ENT_HTML5, $pagecodeto);

+	$ret = dol_html_entity_decode($stringtodecode, ENT_COMPAT, $pagecodeto);

@@ -7866,2 +5884 @@
-	$ret = preg_replace('/&nbsp;$/i', "", $stringtodecode);		// Because wysiwyg editor may add a &nbsp; at end of last line

-	$ret = preg_replace('/(<br>|<br(\s[\sa-zA-Z_="]*)?\/?>|'."\n".'|'."\r".')+$/i', "", $ret);

+	$ret = preg_replace('/(<br>|<br(\s[\sa-zA-Z_="]*)?\/?>|'."\n".'|'."\r".')+$/i', "", $stringtodecode);

@@ -7875 +5892 @@
- * @param   string	$b					Operand b (ENT_QUOTES|ENT_HTML5=convert simple, double quotes, colon, e accent, ...)

+ * @param   string	$b					Operand b (ENT_QUOTES=convert simple and double quotes)

@@ -7877 +5894 @@
- * @param	string	$keepsomeentities	Entities but &, <, >, " are not converted.

+ * @param	string	$keepsomeentities	Entities but &amp;, <, >, " are not converted.

@@ -7883,7 +5900,3 @@
-	if ($keepsomeentities) {

-		$newstring = strtr($newstring, array('&amp;'=>'__andamp__', '&lt;'=>'__andlt__', '&gt;'=>'__andgt__', '"'=>'__dquot__'));

-	}

-	$newstring = html_entity_decode((string) $newstring, (int) $b, (string) $c);

-	if ($keepsomeentities) {

-		$newstring = strtr($newstring, array('__andamp__'=>'&amp;', '__andlt__'=>'&lt;', '__andgt__'=>'&gt;', '__dquot__'=>'"'));

-	}

+	if ($keepsomeentities) $newstring = strtr($newstring, array('&amp;'=>'__andamp__', '&lt;'=>'__andlt__', '&gt;'=>'__andgt__', '"'=>'__dquot__'));

+	$newstring = html_entity_decode($newstring, $b, $c);

+	if ($keepsomeentities) $newstring = strtr($newstring, array('__andamp__'=>'&amp;', '__andlt__'=>'&lt;', '__andgt__'=>'&gt;', '__dquot__'=>'"'));

@@ -7902,3 +5915,2 @@
- * @see dol_htmlentitiesbr()

- */

-function dol_htmlentities($string, $flags = ENT_QUOTES|ENT_SUBSTITUTE, $encoding = 'UTF-8', $double_encode = false)

+ */

+function dol_htmlentities($string, $flags = null, $encoding = 'UTF-8', $double_encode = false)

@@ -7911 +5923 @@
- *	If not, it will not be considered as HTML encoded even if it is by FPDF.

+ *	If not, it will we considered not HTML encoded even if it is by FPDF.

@@ -7917,2 +5928,0 @@
- *  @deprecated Duplicate of ascii_check()

- *  @see ascii_check()

@@ -7925 +5935,2 @@
-	for ($scursor = 0; $scursor < $len; $scursor++) {

+	for ($scursor = 0; $scursor < $len; $scursor++)

+	{

@@ -7928,7 +5939,3 @@
-		if ($ordchar < 32 && $ordchar != 13 && $ordchar != 10) {

-			$ok = 0;

-			break;

-		} elseif ($ordchar > 126 && $ordchar < 160) {

-			$ok = 0;

-			break;

-		} elseif ($clean) {

+		if ($ordchar < 32 && $ordchar != 13 && $ordchar != 10) { $ok = 0; break; }

+		elseif ($ordchar > 126 && $ordchar < 160) { $ok = 0; break; }

+		elseif ($clean) {

@@ -7938,3 +5945 @@
-	if ($clean) {

-		return $out;

-	}

+	if ($clean) return $out;

@@ -7954,3 +5959 @@
-	if ($s == '') {

-		return 0;

-	}

+	if ($s == '') return 0;

@@ -7976,3 +5979 @@
-	if (dol_textishtml($text)) {

-		$repTable = array("\t" => " ", "\n" => " ", "\r" => " ", "\0" => " ", "\x0B" => " ");

-	}

+	if (dol_textishtml($text)) $repTable = array("\t" => " ", "\n" => " ", "\r" => " ", "\0" => " ", "\x0B" => " ");

@@ -7981,6 +5982,2 @@
-	if ($charset == 'UTF-8') {

-		$pattern = '/(<br[^>]*>)/Uu';

-	} else {

-		// /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support

-		$pattern = '/(<br[^>]*>)/U'; // /U is to have UNGREEDY regex to limit to one html tag.

-	}

+	if ($charset == 'UTF-8') { $pattern = '/(<br[^>]*>)/Uu'; }	// /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support

+	else $pattern = '/(<br[^>]*>)/U'; // /U is to have UNGREEDY regex to limit to one html tag.

@@ -7991,3 +5988,6 @@
-	if ($maxlinesize) {

-		foreach ($a as $line) {

-			if (dol_strlen($line) > $maxlinesize) {

+	if ($maxlinesize)

+	{

+		foreach ($a as $line)

+		{

+			if (dol_strlen($line) > $maxlinesize)

+			{

@@ -7996 +5996,2 @@
-				if (dol_strlen($line_dec) > $maxlinesize) {

+				if (dol_strlen($line_dec) > $maxlinesize)

+				{

@@ -8018 +6019,6 @@
-	if (is_null($msg)) {

+	if ($option == 1)

+	{

+		if (preg_match('/<html/i', $msg))				return true;

+		elseif (preg_match('/<body/i', $msg))			return true;

+		elseif (preg_match('/<\/textarea/i', $msg))	  return true;

+		elseif (preg_match('/<br/i', $msg))				return true;

@@ -8021,43 +6027,15 @@
-

-	if ($option == 1) {

-		if (preg_match('/<html/i', $msg)) {

-			return true;

-		} elseif (preg_match('/<body/i', $msg)) {

-			return true;

-		} elseif (preg_match('/<\/textarea/i', $msg)) {

-			return true;

-		} elseif (preg_match('/<(b|em|i|u)(\s+[^>]+)?>/i', $msg)) {

-			return true;

-		} elseif (preg_match('/<br/i', $msg)) {

-			return true;

-		}

-		return false;

-	} else {

-		// Remove all urls because 'http://aa?param1=abc&amp;param2=def' must not be used inside detection

-		$msg = preg_replace('/https?:\/\/[^"\'\s]+/i', '', $msg);

-		if (preg_match('/<html/i', $msg)) {

-			return true;

-		} elseif (preg_match('/<body/i', $msg)) {

-			return true;

-		} elseif (preg_match('/<\/textarea/i', $msg)) {

-			return true;

-		} elseif (preg_match('/<(b|em|i|u)(\s+[^>]+)?>/i', $msg)) {

-			return true;

-		} elseif (preg_match('/<(br|hr)\/>/i', $msg)) {

-			return true;

-		} elseif (preg_match('/<(br|hr|div|font|li|p|span|strong|table)>/i', $msg)) {

-			return true;

-		} elseif (preg_match('/<(br|hr|div|font|li|p|span|strong|table)\s+[^<>\/]*\/?>/i', $msg)) {

-			return true;

-		} elseif (preg_match('/<img\s+[^<>]*src[^<>]*>/i', $msg)) {

-			return true; // must accept <img src="http://example.com/aaa.png" />

-		} elseif (preg_match('/<a\s+[^<>]*href[^<>]*>/i', $msg)) {

-			return true; // must accept <a href="http://example.com/aaa.png" />

-		} elseif (preg_match('/<h[0-9]>/i', $msg)) {

-			return true;

-		} elseif (preg_match('/&[A-Z0-9]{1,6};/i', $msg)) {

-			// TODO If content is 'A link https://aaa?param=abc&amp;param2=def', it return true but must be false

-			return true; // Html entities names (http://www.w3schools.com/tags/ref_entities.asp)

-		} elseif (preg_match('/&#[0-9]{2,3};/i', $msg)) {

-			return true; // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)

-		}

+	else

+	{

+		if (preg_match('/<html/i', $msg))				return true;

+		elseif (preg_match('/<body/i', $msg))			return true;

+		elseif (preg_match('/<\/textarea/i', $msg))	  return true;

+		elseif (preg_match('/<(b|em|i|u)>/i', $msg))		return true;

+		elseif (preg_match('/<br\/>/i', $msg))	  return true;

+		elseif (preg_match('/<(br|div|font|li|p|span|strong|table)>/i', $msg)) 	  return true;

+		elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*>/i', $msg)) return true;

+		elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*\/>/i', $msg)) return true;

+		elseif (preg_match('/<img\s+[^<>]*src[^<>]*>/i', $msg)) return true; // must accept <img src="http://example.com/aaa.png" />

+		elseif (preg_match('/<a\s+[^<>]*href[^<>]*>/i', $msg)) return true; // must accept <a href="http://example.com/aaa.png" />

+		elseif (preg_match('/<h[0-9]>/i', $msg))			return true;

+		elseif (preg_match('/&[A-Z0-9]{1,6};/i', $msg))	return true; // Html entities names (http://www.w3schools.com/tags/ref_entities.asp)

+		elseif (preg_match('/&#[0-9]{2,3};/i', $msg))	return true; // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)

@@ -8085,11 +6063,12 @@
-	if (!empty($invert)) {

-		$tmp = $text1;

-		$text1 = $text2;

-		$text2 = $tmp;

-	}

-

-	$ret = '';

-	$ret .= (!dol_textishtml($text1) && dol_textishtml($text2)) ? dol_nl2br(dol_escape_htmltag($text1, 0, 1, '', 1), 0, $forxml) : $text1;

-	$ret .= (!empty($text1) && !empty($text2)) ? ((dol_textishtml($text1) || dol_textishtml($text2)) ? ($forxml ? "<br \>\n" : "<br>\n") : "\n") : "";

-	$ret .= (dol_textishtml($text1) && !dol_textishtml($text2)) ? dol_nl2br(dol_escape_htmltag($text2, 0, 1, '', 1), 0, $forxml) : $text2;

-	return $ret;

+    if (!empty($invert))

+    {

+            $tmp = $text1;

+            $text1 = $text2;

+            $text2 = $tmp;

+    }

+

+    $ret = '';

+    $ret .= (!dol_textishtml($text1) && dol_textishtml($text2)) ? dol_nl2br(dol_escape_htmltag($text1, 0, 1, '', 1), 0, $forxml) : $text1;

+    $ret .= (!empty($text1) && !empty($text2)) ? ((dol_textishtml($text1) || dol_textishtml($text2)) ? ($forxml ? "<br \>\n" : "<br>\n") : "\n") : "";

+    $ret .= (dol_textishtml($text1) && !dol_textishtml($text2)) ? dol_nl2br(dol_escape_htmltag($text2, 0, 1, '', 1), 0, $forxml) : $text2;

+    return $ret;

@@ -8107 +6085,0 @@
- * @param   array       $include        Array of family keys we want to include. For example array('system', 'mycompany', 'object', 'objectamount', 'date', 'user', ...)

@@ -8111 +6089 @@
-function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null, $object = null, $include = null)

+function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null, $object = null)

@@ -8117 +6095,2 @@
-	if ((empty($exclude) || !in_array('user', $exclude)) && (empty($include) || in_array('user', $include))) {

+	if (empty($exclude) || !in_array('user', $exclude))

+	{

@@ -8120,29 +6099,26 @@
-		//var_dump($onlykey);

-		$emailsendersignature = $user->signature; //  dy default, we use the signature of current user. We must complete substitution with signature in c_email_senderprofile of array after calling getCommonSubstitutionArray()

-		$usersignature = $user->signature;

-		$substitutionarray = array_merge($substitutionarray, array(

-			'__SENDEREMAIL_SIGNATURE__' => (string) ((!getDolGlobalString('MAIN_MAIL_DO_NOT_USE_SIGN')) ? ($onlykey == 2 ? dol_trunc('SignatureFromTheSelectedSenderProfile', 30) : $emailsendersignature) : ''),

-			'__USER_SIGNATURE__' => (string) (($usersignature && !getDolGlobalString('MAIN_MAIL_DO_NOT_USE_SIGN')) ? ($onlykey == 2 ? dol_trunc(dol_string_nohtmltag($usersignature), 30) : $usersignature) : '')

-		));

-

-		if (is_object($user)) {

-			$substitutionarray = array_merge($substitutionarray, array(

-				'__USER_ID__' => (string) $user->id,

-				'__USER_LOGIN__' => (string) $user->login,

-				'__USER_EMAIL__' => (string) $user->email,

-				'__USER_PHONE__' => (string) dol_print_phone($user->office_phone, '', 0, 0, '', " ", '', '', -1),

-				'__USER_PHONEPRO__' => (string) dol_print_phone($user->user_mobile, '', 0, 0, '', " ", '', '', -1),

-				'__USER_PHONEMOBILE__' => (string) dol_print_phone($user->personal_mobile, '', 0, 0, '', " ", '', '', -1),

-				'__USER_FAX__' => (string) $user->office_fax,

-				'__USER_LASTNAME__' => (string) $user->lastname,

-				'__USER_FIRSTNAME__' => (string) $user->firstname,

-				'__USER_FULLNAME__' => (string) $user->getFullName($outputlangs),

-				'__USER_SUPERVISOR_ID__' => (string) ($user->fk_user ? $user->fk_user : '0'),

-				'__USER_JOB__' => (string) $user->job,

-				'__USER_REMOTE_IP__' => (string) getUserRemoteIP(),

-				'__USER_VCARD_URL__' => (string) $user->getOnlineVirtualCardUrl('', 'external')

-				));

-		}

-	}

-	if ((empty($exclude) || !in_array('mycompany', $exclude)) && is_object($mysoc) && (empty($include) || in_array('mycompany', $include))) {

-		$substitutionarray = array_merge($substitutionarray, array(

+		$signature = $user->signature;

+        $substitutionarray = array_merge($substitutionarray, array(

+		'__USER_SIGNATURE__' => (string) (($signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? ($onlykey == 2 ? dol_trunc(dol_string_nohtmltag($signature), 30) : $signature) : '')

+		)

+			);

+		// For backward compatibility

+		if ($onlykey != 2)

+		{

+			$substitutionarray['__SIGNATURE__'] = (string) (($signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? ($onlykey == 2 ? dol_trunc(dol_string_nohtmltag($signature), 30) : $signature) : '');

+		}

+

+        $substitutionarray = array_merge($substitutionarray, array(

+		'__USER_ID__' => (string) $user->id,

+		'__USER_LOGIN__' => (string) $user->login,

+        '__USER_EMAIL__' => (string) $user->email,

+        '__USER_LASTNAME__' => (string) $user->lastname,

+		'__USER_FIRSTNAME__' => (string) $user->firstname,

+		'__USER_FULLNAME__' => (string) $user->getFullName($outputlangs),

+		'__USER_SUPERVISOR_ID__' => (string) ($user->fk_user ? $user->fk_user : '0'),

+		'__USER_REMOTE_IP__' => (string) getUserRemoteIP()

+		)

+			);

+	}

+	if ((empty($exclude) || !in_array('mycompany', $exclude)) && is_object($mysoc))

+	{

+        $substitutionarray = array_merge($substitutionarray, array(

@@ -8151,2 +6126,0 @@
-			'__MYCOMPANY_PHONE__'   => dol_print_phone($mysoc->phone, '', 0, 0, '', " ", '', '', -1),

-			'__MYCOMPANY_FAX__'     => dol_print_phone($mysoc->fax, '', 0, 0, '', " ", '', '', -1),

@@ -8160 +6134 @@
-			'__MYCOMPANY_FULLADDRESS__' => (method_exists($mysoc, 'getFullAddress') ? $mysoc->getFullAddress(1, ', ') : ''),	// $mysoc may be stdClass

+			'__MYCOMPANY_FULLADDRESS__' => $mysoc->getFullAddress(1, ', '),

@@ -8166,2 +6140,2 @@
-			'__MYCOMPANY_COUNTRY_CODE__' => $mysoc->country_code,

-			'__MYCOMPANY_CURRENCY_CODE__' => $conf->currency

+        	'__MYCOMPANY_COUNTRY_CODE__' => $mysoc->country_code,

+        	'__MYCOMPANY_CURRENCY_CODE__' => $conf->currency

@@ -8171,2 +6145,4 @@
-	if (($onlykey || is_object($object)) && (empty($exclude) || !in_array('object', $exclude)) && (empty($include) || in_array('object', $include))) {

-		if ($onlykey) {

+	if (($onlykey || is_object($object)) && (empty($exclude) || !in_array('object', $exclude)))

+	{

+		if ($onlykey)

+		{

@@ -8175,2 +6150,0 @@
-			$substitutionarray['__NEWREF__'] = '__NEWREF__';

-			$substitutionarray['__LABEL__'] = '__LABEL__';

@@ -8183 +6157,2 @@
-			if (isModEnabled("societe")) {	// Most objects are concerned

+			if (!empty($conf->societe->enabled))

+			{

@@ -8205 +6180,2 @@
-			if (isModEnabled('adherent') && (!is_object($object) || $object->element == 'adherent') && (empty($exclude) || !in_array('member', $exclude)) && (empty($include) || in_array('member', $include))) {

+			if (!empty($conf->adherent->enabled))

+			{

@@ -8210 +6185,0 @@
-				$substitutionarray['__MEMBER_USER_LOGIN_INFORMATION__'] = 'Login and pass of the external user account';

@@ -8214,19 +6189,2 @@
-			// add variables subtitutions ticket

-			if (isModEnabled('ticket') && (!is_object($object) || $object->element == 'ticket') && (empty($exclude) || !in_array('ticket', $exclude)) && (empty($include) || in_array('ticket', $include))) {

-				$substitutionarray['__TICKET_TRACKID__'] = '__TICKET_TRACKID__';

-				$substitutionarray['__TICKET_SUBJECT__'] = '__TICKET_SUBJECT__';

-				$substitutionarray['__TICKET_TYPE__'] = '__TICKET_TYPE__';

-				$substitutionarray['__TICKET_SEVERITY__'] = '__TICKET_SEVERITY__';

-				$substitutionarray['__TICKET_CATEGORY__'] = '__TICKET_CATEGORY__';

-				$substitutionarray['__TICKET_ANALYTIC_CODE__'] = '__TICKET_ANALYTIC_CODE__';

-				$substitutionarray['__TICKET_MESSAGE__'] = '__TICKET_MESSAGE__';

-				$substitutionarray['__TICKET_PROGRESSION__'] = '__TICKET_PROGRESSION__';

-				$substitutionarray['__TICKET_USER_ASSIGN__'] = '__TICKET_USER_ASSIGN__';

-			}

-

-			if (isModEnabled('recruitment') && (!is_object($object) || $object->element == 'recruitmentcandidature') && (empty($exclude) || !in_array('recruitment', $exclude)) && (empty($include) || in_array('recruitment', $include))) {

-				$substitutionarray['__CANDIDATE_FULLNAME__'] = '__CANDIDATE_FULLNAME__';

-				$substitutionarray['__CANDIDATE_FIRSTNAME__'] = '__CANDIDATE_FIRSTNAME__';

-				$substitutionarray['__CANDIDATE_LASTNAME__'] = '__CANDIDATE_LASTNAME__';

-			}

-			if (isModEnabled('project') && (empty($exclude) || !in_array('project', $exclude)) && (empty($include) || in_array('project', $include))) {		// Most objects

+			if (!empty($conf->projet->enabled))

+			{

@@ -8239 +6197,2 @@
-			if (isModEnabled('contrat') && (!is_object($object) || $object->element == 'contract') && (empty($exclude) || !in_array('contract', $exclude)) && (empty($include) || in_array('contract', $include))) {

+			if (!empty($conf->contrat->enabled))

+			{

@@ -8244,6 +6202,0 @@
-			}

-			if (isModEnabled("propal") && (!is_object($object) || $object->element == 'propal') && (empty($exclude) || !in_array('propal', $exclude)) && (empty($include) || in_array('propal', $include))) {

-				$substitutionarray['__ONLINE_SIGN_URL__'] = 'ToOfferALinkForOnlineSignature';

-			}

-			if (isModEnabled("ficheinter") && (!is_object($object) || $object->element == 'fichinter') && (empty($exclude) || !in_array('intervention', $exclude)) && (empty($include) || in_array('intervention', $include))) {

-				$substitutionarray['__ONLINE_SIGN_FICHINTER_URL__'] = 'ToOfferALinkForOnlineSignature';

@@ -8257 +6210 @@
-			$substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = 'Security key for payment on a service of a contract';

+			$substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = 'Security key for payment on a a service';

@@ -8262,5 +6215,4 @@
-			$substitutionarray['__DIRECTDOWNLOAD_URL_CONTRACT__'] = 'Direct download url of a contract';

-			$substitutionarray['__DIRECTDOWNLOAD_URL_SUPPLIER_PROPOSAL__'] = 'Direct download url of a supplier proposal';

-

-			if (isModEnabled("expedition") && (!is_object($object) || $object->element == 'shipping')) {

-				$substitutionarray['__SHIPPINGTRACKNUM__'] = 'Shipping tracking number';

+

+			if (!empty($conf->expedition->enabled))

+			{

+			    $substitutionarray['__SHIPPINGTRACKNUM__'] = 'Shipping tacking number';

@@ -8268,7 +6220,4 @@
-				$substitutionarray['__SHIPPINGMETHOD__'] = 'Shipping method';

-			}

-			if (isModEnabled("reception") && (!is_object($object) || $object->element == 'reception')) {

-				$substitutionarray['__RECEPTIONTRACKNUM__'] = 'Shippin tracking number of shipment';

-				$substitutionarray['__RECEPTIONTRACKNUMURL__'] = 'Shipping tracking url';

-			}

-		} else {

+			}

+		}

+		else

+		{

@@ -8277,2 +6225,0 @@
-			$substitutionarray['__NEWREF__'] = $object->newref;

-			$substitutionarray['__LABEL__'] = (isset($object->label) ? $object->label : (isset($object->title) ? $object->title : null));

@@ -8283,11 +6230,4 @@
-			$substitutionarray['__DATE_DELIVERY__'] = (isset($object->date_delivery) ? dol_print_date($object->date_delivery, 'day', 0, $outputlangs) : '');

-			$substitutionarray['__DATE_DELIVERY_DAY__'] = (isset($object->date_delivery) ? dol_print_date($object->date_delivery, "%d") : '');

-			$substitutionarray['__DATE_DELIVERY_DAY_TEXT__'] = (isset($object->date_delivery) ? dol_print_date($object->date_delivery, "%A") : '');

-			$substitutionarray['__DATE_DELIVERY_MON__'] = (isset($object->date_delivery) ? dol_print_date($object->date_delivery, "%m") : '');

-			$substitutionarray['__DATE_DELIVERY_MON_TEXT__'] = (isset($object->date_delivery) ? dol_print_date($object->date_delivery, "%b") : '');

-			$substitutionarray['__DATE_DELIVERY_YEAR__'] = (isset($object->date_delivery) ? dol_print_date($object->date_delivery, "%Y") : '');

-			$substitutionarray['__DATE_DELIVERY_HH__'] = (isset($object->date_delivery) ? dol_print_date($object->date_delivery, "%H") : '');

-			$substitutionarray['__DATE_DELIVERY_MM__'] = (isset($object->date_delivery) ? dol_print_date($object->date_delivery, "%M") : '');

-			$substitutionarray['__DATE_DELIVERY_SS__'] = (isset($object->date_delivery) ? dol_print_date($object->date_delivery, "%S") : '');

-

-			// For backward compatibility (deprecated)

+

+			$substitutionarray['__DATE_DELIVERY__'] = (isset($object->date_livraison) ? dol_print_date($object->date_livraison, 'day', 0, $outputlangs) : '');

+

+			// For backward compatibility

@@ -8296,40 +6236,37 @@
-			$substitutionarray['__SUPPLIER_ORDER_DATE_DELIVERY__'] = (isset($object->delivery_date) ? dol_print_date($object->delivery_date, 'day', 0, $outputlangs) : '');

-			$substitutionarray['__SUPPLIER_ORDER_DELAY_DELIVERY__'] = (isset($object->availability_code) ? ($outputlangs->transnoentities("AvailabilityType".$object->availability_code) != 'AvailabilityType'.$object->availability_code ? $outputlangs->transnoentities("AvailabilityType".$object->availability_code) : $outputlangs->convToOutputCharset(isset($object->availability) ? $object->availability : '')) : '');

-			$substitutionarray['__EXPIRATION_DATE__'] = (isset($object->fin_validite) ? dol_print_date($object->fin_validite, 'daytext') : '');

-

-			if (is_object($object) && ($object->element == 'adherent' || $object->element == 'member') && $object->id > 0) {

-				$birthday = (empty($object->birth) ? '' : dol_print_date($object->birth, 'day'));

-

-				$substitutionarray['__MEMBER_ID__'] = (isset($object->id) ? $object->id : '');

-				if (method_exists($object, 'getCivilityLabel')) {

-					$substitutionarray['__MEMBER_CIVILITY__'] = $object->getCivilityLabel();

-				}

-				$substitutionarray['__MEMBER_FIRSTNAME__'] = (isset($object->firstname) ? $object->firstname : '');

-				$substitutionarray['__MEMBER_LASTNAME__'] = (isset($object->lastname) ? $object->lastname : '');

-				$substitutionarray['__MEMBER_USER_LOGIN_INFORMATION__'] = '';

-				if (method_exists($object, 'getFullName')) {

-					$substitutionarray['__MEMBER_FULLNAME__'] = $object->getFullName($outputlangs);

-				}

-				$substitutionarray['__MEMBER_COMPANY__'] = (isset($object->societe) ? $object->societe : '');

-				$substitutionarray['__MEMBER_ADDRESS__'] = (isset($object->address) ? $object->address : '');

-				$substitutionarray['__MEMBER_ZIP__'] = (isset($object->zip) ? $object->zip : '');

-				$substitutionarray['__MEMBER_TOWN__'] = (isset($object->town) ? $object->town : '');

-				$substitutionarray['__MEMBER_COUNTRY__'] = (isset($object->country) ? $object->country : '');

-				$substitutionarray['__MEMBER_EMAIL__'] = (isset($object->email) ? $object->email : '');

-				$substitutionarray['__MEMBER_BIRTH__'] = (isset($birthday) ? $birthday : '');

-				$substitutionarray['__MEMBER_PHOTO__'] = (isset($object->photo) ? $object->photo : '');

-				$substitutionarray['__MEMBER_LOGIN__'] = (isset($object->login) ? $object->login : '');

-				$substitutionarray['__MEMBER_PASSWORD__'] = (isset($object->pass) ? $object->pass : '');

-				$substitutionarray['__MEMBER_PHONE__'] = (isset($object->phone) ? dol_print_phone($object->phone) : '');

-				$substitutionarray['__MEMBER_PHONEPRO__'] = (isset($object->phone_perso) ? dol_print_phone($object->phone_perso) : '');

-				$substitutionarray['__MEMBER_PHONEMOBILE__'] = (isset($object->phone_mobile) ? dol_print_phone($object->phone_mobile) : '');

-				$substitutionarray['__MEMBER_TYPE__'] = (isset($object->type) ? $object->type : '');

-				$substitutionarray['__MEMBER_FIRST_SUBSCRIPTION_DATE__']       = dol_print_date($object->first_subscription_date, 'day');

-				$substitutionarray['__MEMBER_FIRST_SUBSCRIPTION_DATE_START__'] = (isset($object->first_subscription_date_start) ? dol_print_date($object->first_subscription_date_start, 'day') : '');

-				$substitutionarray['__MEMBER_FIRST_SUBSCRIPTION_DATE_END__']   = (isset($object->first_subscription_date_end) ? dol_print_date($object->first_subscription_date_end, 'day') : '');

-				$substitutionarray['__MEMBER_LAST_SUBSCRIPTION_DATE__']        = dol_print_date($object->last_subscription_date, 'day');

-				$substitutionarray['__MEMBER_LAST_SUBSCRIPTION_DATE_START__']  = dol_print_date($object->last_subscription_date_start, 'day');

-				$substitutionarray['__MEMBER_LAST_SUBSCRIPTION_DATE_END__']    = dol_print_date($object->last_subscription_date_end, 'day');

-			}

-

-			if (is_object($object) && $object->element == 'societe') {

+			$substitutionarray['__REFCLIENT__'] = (isset($object->ref_client) ? $object->ref_client : (isset($object->ref_customer) ? $object->ref_customer : null));

+			$substitutionarray['__REFSUPPLIER__'] = (isset($object->ref_supplier) ? $object->ref_supplier : null);

+			$substitutionarray['__SUPPLIER_ORDER_DATE_DELIVERY__'] = (isset($object->date_livraison) ? dol_print_date($object->date_livraison, 'day', 0, $outputlangs) : '');

+			$substitutionarray['__SUPPLIER_ORDER_DELAY_DELIVERY__'] = $outputlangs->transnoentities("AvailabilityType".$object->availability_code) != ('AvailabilityType'.$object->availability_code) ? $outputlangs->transnoentities("AvailabilityType".$object->availability_code) : $outputlangs->convToOutputCharset(isset($object->availability) ? $object->availability : '');

+

+			$birthday = dol_print_date($object->birth, 'day');

+

+			if ($object->id > 0)

+			{

+				$substitutionarray['__MEMBER_ID__'] = $object->id;

+				if (method_exists($object, 'getCivilityLabel')) $substitutionarray['__MEMBER_CIVILITY__'] = $object->getCivilityLabel();

+				$substitutionarray['__MEMBER_FIRSTNAME__'] = $object->firstname;

+				$substitutionarray['__MEMBER_LASTNAME__'] = $object->lastname;

+				if (method_exists($object, 'getFullName')) $substitutionarray['__MEMBER_FULLNAME__'] = $object->getFullName($outputlangs);

+				$substitutionarray['__MEMBER_COMPANY__'] = $object->societe;

+				$substitutionarray['__MEMBER_ADDRESS__'] = $object->address;

+				$substitutionarray['__MEMBER_ZIP__'] = $object->zip;

+				$substitutionarray['__MEMBER_TOWN__'] = $object->town;

+				$substitutionarray['__MEMBER_COUNTRY__'] = $object->country;

+				$substitutionarray['__MEMBER_EMAIL__'] = $object->email;

+				$substitutionarray['__MEMBER_BIRTH__'] = $birthday;

+				$substitutionarray['__MEMBER_PHOTO__'] = $object->photo;

+				$substitutionarray['__MEMBER_LOGIN__'] = $object->login;

+				$substitutionarray['__MEMBER_PASSWORD__'] = $object->pass;

+				$substitutionarray['__MEMBER_PHONE__'] = $object->phone;

+				$substitutionarray['__MEMBER_PHONEPRO__'] = $object->phone_perso;

+				$substitutionarray['__MEMBER_PHONEMOBILE__'] = $object->phone_mobile;

+				$substitutionarray['__MEMBER_FIRST_SUBSCRIPTION_DATE__']       = dol_print_date($object->first_subscription_date, 'dayrfc');

+				$substitutionarray['__MEMBER_FIRST_SUBSCRIPTION_DATE_START__'] = dol_print_date($object->first_subscription_date_start, 'dayrfc');

+				$substitutionarray['__MEMBER_FIRST_SUBSCRIPTION_DATE_END__']   = dol_print_date($object->first_subscription_date_end, 'dayrfc');

+				$substitutionarray['__MEMBER_LAST_SUBSCRIPTION_DATE__']        = dol_print_date($object->last_subscription_date, 'dayrfc');

+				$substitutionarray['__MEMBER_LAST_SUBSCRIPTION_DATE_START__']  = dol_print_date($object->last_subscription_date_start, 'dayrfc');

+				$substitutionarray['__MEMBER_LAST_SUBSCRIPTION_DATE_END__']    = dol_print_date($object->last_subscription_date_end, 'dayrfc');

+			}

+

+			if (is_object($object) && $object->element == 'societe')

+			{

@@ -8342,2 +6279,2 @@
-				$substitutionarray['__THIRDPARTY_PHONE__'] = (is_object($object) ? dol_print_phone($object->phone) : '');

-				$substitutionarray['__THIRDPARTY_FAX__'] = (is_object($object) ? dol_print_phone($object->fax) : '');

+				$substitutionarray['__THIRDPARTY_PHONE__'] = (is_object($object) ? $object->phone : '');

+				$substitutionarray['__THIRDPARTY_FAX__'] = (is_object($object) ? $object->fax : '');

@@ -8356,3 +6293,5 @@
-				$substitutionarray['__THIRDPARTY_NOTE_PUBLIC__'] = (is_object($object) ? dol_htmlentitiesbr($object->note_public) : '');

-				$substitutionarray['__THIRDPARTY_NOTE_PRIVATE__'] = (is_object($object) ? dol_htmlentitiesbr($object->note_private) : '');

-			} elseif (is_object($object->thirdparty)) {

+				$substitutionarray['__THIRDPARTY_NOTE_PUBLIC__'] = (is_object($object) ?dol_htmlentitiesbr($object->note_public) : '');

+				$substitutionarray['__THIRDPARTY_NOTE_PRIVATE__'] = (is_object($object) ?dol_htmlentitiesbr($object->note_private) : '');

+			}

+			elseif (is_object($object->thirdparty) && $object->thirdparty->id > 0)

+			{

@@ -8365,2 +6304,2 @@
-				$substitutionarray['__THIRDPARTY_PHONE__'] = (is_object($object->thirdparty) ? dol_print_phone($object->thirdparty->phone) : '');

-				$substitutionarray['__THIRDPARTY_FAX__'] = (is_object($object->thirdparty) ? dol_print_phone($object->thirdparty->fax) : '');

+				$substitutionarray['__THIRDPARTY_PHONE__'] = (is_object($object->thirdparty) ? $object->thirdparty->phone : '');

+				$substitutionarray['__THIRDPARTY_FAX__'] = (is_object($object->thirdparty) ? $object->thirdparty->fax : '');

@@ -8379,48 +6318,19 @@
-				$substitutionarray['__THIRDPARTY_NOTE_PUBLIC__'] = (is_object($object->thirdparty) ? dol_htmlentitiesbr($object->thirdparty->note_public) : '');

-				$substitutionarray['__THIRDPARTY_NOTE_PRIVATE__'] = (is_object($object->thirdparty) ? dol_htmlentitiesbr($object->thirdparty->note_private) : '');

-			}

-

-			if (is_object($object) && $object->element == 'recruitmentcandidature') {

-				$substitutionarray['__CANDIDATE_FULLNAME__'] = $object->getFullName($outputlangs);

-				$substitutionarray['__CANDIDATE_FIRSTNAME__'] = isset($object->firstname) ? $object->firstname : '';

-				$substitutionarray['__CANDIDATE_LASTNAME__'] = isset($object->lastname) ? $object->lastname : '';

-			}

-			if (is_object($object) && $object->element == 'conferenceorboothattendee') {

-				$substitutionarray['__ATTENDEE_FULLNAME__'] = $object->getFullName($outputlangs);

-				$substitutionarray['__ATTENDEE_FIRSTNAME__'] = isset($object->firstname) ? $object->firstname : '';

-				$substitutionarray['__ATTENDEE_LASTNAME__'] = isset($object->lastname) ? $object->lastname : '';

-			}

-

-			if (is_object($object) && $object->element == 'project') {

-				$substitutionarray['__PROJECT_ID__'] = $object->id;

-				$substitutionarray['__PROJECT_REF__'] = $object->ref;

-				$substitutionarray['__PROJECT_NAME__'] = $object->title;

-			} elseif (is_object($object)) {

-				$project = null;

-				if (!empty($object->project)) {

-					$project = $object->project;

-				} elseif (!empty($object->projet)) { // Deprecated, for backward compatibility

-					$project = $object->projet;

-				}

-				if (!is_null($project) && is_object($project)) {

-					$substitutionarray['__PROJECT_ID__'] = $project->id;

-					$substitutionarray['__PROJECT_REF__'] = $project->ref;

-					$substitutionarray['__PROJECT_NAME__'] = $project->title;

-				} else {

-					// can substitute variables for project : uses lazy load in "make_substitutions" method

-					$project_id = 0;

-					if (!empty($object->fk_project) && $object->fk_project > 0) {

-						$project_id = $object->fk_project;

-					} elseif (!empty($object->fk_projet) && $object->fk_projet > 0) {

-						$project_id = $object->fk_project;

-					}

-					if ($project_id > 0) {

-						// path:class:method:id

-						$substitutionarray['__PROJECT_ID__@lazyload'] = '/projet/class/project.class.php:Project:fetchAndSetSubstitution:' . $project_id;

-						$substitutionarray['__PROJECT_REF__@lazyload'] = '/projet/class/project.class.php:Project:fetchAndSetSubstitution:' . $project_id;

-						$substitutionarray['__PROJECT_NAME__@lazyload'] = '/projet/class/project.class.php:Project:fetchAndSetSubstitution:' . $project_id;

-					}

-				}

-			}

-

-			if (is_object($object) && $object->element == 'shipping') {

+				$substitutionarray['__THIRDPARTY_NOTE_PUBLIC__'] = (is_object($object->thirdparty) ?dol_htmlentitiesbr($object->thirdparty->note_public) : '');

+				$substitutionarray['__THIRDPARTY_NOTE_PRIVATE__'] = (is_object($object->thirdparty) ?dol_htmlentitiesbr($object->thirdparty->note_private) : '');

+			}

+

+			if (is_object($object->project) && $object->project->id > 0)

+			{

+				$substitutionarray['__PROJECT_ID__'] = (is_object($object->project) ? $object->project->id : '');

+				$substitutionarray['__PROJECT_REF__'] = (is_object($object->project) ? $object->project->ref : '');

+				$substitutionarray['__PROJECT_NAME__'] = (is_object($object->project) ? $object->project->title : '');

+			}

+			if (is_object($object->projet) && $object->projet->id > 0)	// Deprecated, for backward compatibility

+			{

+				$substitutionarray['__PROJECT_ID__'] = (is_object($object->projet) ? $object->projet->id : '');

+				$substitutionarray['__PROJECT_REF__'] = (is_object($object->projet) ? $object->projet->ref : '');

+				$substitutionarray['__PROJECT_NAME__'] = (is_object($object->projet) ? $object->projet->title : '');

+			}

+

+			if (is_object($object) && $object->element == 'shipping')

+			{

@@ -8429,13 +6339,12 @@
-				$substitutionarray['__SHIPPINGMETHOD__'] = $object->shipping_method;

-			}

-			if (is_object($object) && $object->element == 'reception') {

-				$substitutionarray['__RECEPTIONTRACKNUM__'] = $object->tracking_number;

-				$substitutionarray['__RECEPTIONTRACKNUMURL__'] = $object->tracking_url;

-			}

-

-			if (is_object($object) && $object->element == 'contrat' && $object->id > 0 && is_array($object->lines)) {

-				$dateplannedstart = '';

-				$datenextexpiration = '';

-				foreach ($object->lines as $line) {

-					if ($line->date_start > $dateplannedstart) {

-						$dateplannedstart = $line->date_start;

+			}

+

+			if (is_object($object) && $object->element == 'contrat' && is_array($object->lines))

+			{

+				if ($object->id > 0)

+				{

+					$dateplannedstart = '';

+					$datenextexpiration = '';

+					foreach ($object->lines as $line)

+					{

+						if ($line->date_ouverture_prevue > $dateplannedstart) $dateplannedstart = $line->date_ouverture_prevue;

+						if ($line->statut == 4 && $line->date_fin_prevue && (!$datenextexpiration || $line->date_fin_prevue < $datenextexpiration)) $datenextexpiration = $line->date_fin_prevue;

@@ -8443,3 +6352,4 @@
-					if ($line->statut == 4 && $line->date_end && (!$datenextexpiration || $line->date_end < $datenextexpiration)) {

-						$datenextexpiration = $line->date_end;

-					}

+					$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATE__'] = dol_print_date($dateplannedstart, 'dayrfc');

+					$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATETIME__'] = dol_print_date($dateplannedstart, 'standard');

+					$substitutionarray['__CONTRACT_LOWEST_EXPIRATION_DATE__'] = dol_print_date($datenextexpiration, 'dayrfc');

+					$substitutionarray['__CONTRACT_LOWEST_EXPIRATION_DATETIME__'] = dol_print_date($datenextexpiration, 'standard');

@@ -8447,26 +6356,0 @@
-				$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATE__'] = dol_print_date($dateplannedstart, 'day');

-				$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATETIME__'] = dol_print_date($dateplannedstart, 'standard');

-				$substitutionarray['__CONTRACT_LOWEST_EXPIRATION_DATE__'] = dol_print_date($datenextexpiration, 'day');

-				$substitutionarray['__CONTRACT_LOWEST_EXPIRATION_DATETIME__'] = dol_print_date($datenextexpiration, 'standard');

-			}

-			// add substition variable for ticket

-			if (is_object($object) && $object->element == 'ticket') {

-				$substitutionarray['__TICKET_TRACKID__'] = $object->track_id;

-				$substitutionarray['__REF__'] = $object->ref;

-				$substitutionarray['__TICKET_SUBJECT__'] = $object->subject;

-				$substitutionarray['__TICKET_TYPE__'] = $object->type_code;

-				$substitutionarray['__TICKET_SEVERITY__'] = $object->severity_code;

-				$substitutionarray['__TICKET_CATEGORY__'] = $object->category_code; // For backward compatibility

-				$substitutionarray['__TICKET_ANALYTIC_CODE__'] = $object->category_code;

-				$substitutionarray['__TICKET_MESSAGE__'] = $object->message;

-				$substitutionarray['__TICKET_PROGRESSION__'] = $object->progress;

-				$userstat = new User($db);

-				if ($object->fk_user_assign > 0) {

-					$userstat->fetch($object->fk_user_assign);

-					$substitutionarray['__TICKET_USER_ASSIGN__'] = dolGetFirstLastname($userstat->firstname, $userstat->lastname);

-				}

-

-				if ($object->fk_user_create > 0) {

-					$userstat->fetch($object->fk_user_create);

-					$substitutionarray['__USER_CREATE__'] = dolGetFirstLastname($userstat->firstname, $userstat->lastname);

-				}

@@ -8476,4 +6360,3 @@
-			if ($object->table_element && $object->id > 0) {

-				if (!is_object($extrafields)) {

-					$extrafields = new ExtraFields($db);

-				}

+			if ($object->table_element && $object->id > 0)

+			{

+				if (!is_object($extrafields)) $extrafields = new ExtraFields($db);

@@ -8482,2 +6365,4 @@
-				if ($object->fetch_optionals() > 0) {

-					if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0) {

+				if ($object->fetch_optionals() > 0)

+				{

+					if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)

+					{

@@ -8485,18 +6370,12 @@
-							if ($extrafields->attributes[$object->table_element]['type'][$key] == 'date') {

-								$substitutionarray['__EXTRAFIELD_'.strtoupper($key).'__'] = dol_print_date($object->array_options['options_'.$key], 'day');

-								$substitutionarray['__EXTRAFIELD_'.strtoupper($key).'_LOCALE__'] = dol_print_date($object->array_options['options_'.$key], 'day', 'tzserver', $outputlangs);

-								$substitutionarray['__EXTRAFIELD_'.strtoupper($key).'_RFC__'] = dol_print_date($object->array_options['options_'.$key], 'dayrfc');

-							} elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'datetime') {

-								$datetime = $object->array_options['options_'.$key];

-								$substitutionarray['__EXTRAFIELD_'.strtoupper($key).'__'] = ($datetime != "0000-00-00 00:00:00" ? dol_print_date($datetime, 'dayhour') : '');

-								$substitutionarray['__EXTRAFIELD_'.strtoupper($key).'_LOCALE__'] = ($datetime != "0000-00-00 00:00:00" ? dol_print_date($datetime, 'dayhour', 'tzserver', $outputlangs) : '');

-								$substitutionarray['__EXTRAFIELD_'.strtoupper($key).'_DAY_LOCALE__'] = ($datetime != "0000-00-00 00:00:00" ? dol_print_date($datetime, 'day', 'tzserver', $outputlangs) : '');

-								$substitutionarray['__EXTRAFIELD_'.strtoupper($key).'_RFC__'] = ($datetime != "0000-00-00 00:00:00" ? dol_print_date($datetime, 'dayhourrfc') : '');

-							} elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'phone') {

-								$substitutionarray['__EXTRAFIELD_'.strtoupper($key).'__'] = dol_print_phone($object->array_options['options_'.$key]);

-							} elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'price') {

-								$substitutionarray['__EXTRAFIELD_'.strtoupper($key).'__'] = $object->array_options['options_'.$key];

-								$substitutionarray['__EXTRAFIELD_'.strtoupper($key).'_FORMATED__'] = price($object->array_options['options_'.$key]);

-							} elseif ($extrafields->attributes[$object->table_element]['type'][$key] != 'separator') {

-								$substitutionarray['__EXTRAFIELD_'.strtoupper($key).'__'] = !empty($object->array_options['options_'.$key]) ? $object->array_options['options_'.$key] : '';

-							}

+							$substitutionarray['__EXTRAFIELD_'.strtoupper($key).'__'] = $object->array_options['options_'.$key];

+                            if ($extrafields->attribute_type[$key] == 'date') {

+                                $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '__'] = dol_print_date($object->array_options['options_' . $key], 'day');

+                                $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '_LOCALE__'] = dol_print_date($object->array_options['options_' . $key], 'day', 'tzserver', $outputlangs);

+                                $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '_RFC__'] = dol_print_date($object->array_options['options_' . $key], 'dayrfc');

+                            } elseif ($extrafields->attribute_type[$key] == 'datetime') {

+                                $datetime = $object->array_options['options_'.$key];

+                                $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '__'] = ($datetime != "0000-00-00 00:00:00" ? dol_print_date($datetime, 'dayhour') : '');

+                                $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '_LOCALE__'] = ($datetime != "0000-00-00 00:00:00" ? dol_print_date($datetime, 'dayhour', 'tzserver', $outputlangs) : '');

+                                $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '_DAY_LOCALE__'] = ($datetime != "0000-00-00 00:00:00" ? dol_print_date($datetime, 'day', 'tzserver', $outputlangs) : '');

+                                $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '_RFC__'] = ($datetime != "0000-00-00 00:00:00" ? dol_print_date($datetime, 'dayhourrfc') : '');

+                            }

@@ -8510 +6389,2 @@
-			if (empty($substitutionarray['__REF__'])) {

+			if (empty($substitutionarray['__REF__']))

+			{

@@ -8512 +6392,3 @@
-			} else {

+			}

+			else

+			{

@@ -8516,2 +6397,0 @@
-

-				$amounttouse = 0;

@@ -8519,2 +6399,15 @@
-				if (is_object($object) && $object->element == 'commande') {

-					$typeforonlinepayment = 'order';

+				if (is_object($object) && $object->element == 'commande') $typeforonlinepayment = 'order';

+				if (is_object($object) && $object->element == 'facture')  $typeforonlinepayment = 'invoice';

+				if (is_object($object) && $object->element == 'member')   $typeforonlinepayment = 'member';

+				$url = getOnlinePaymentUrl(0, $typeforonlinepayment, $substitutionarray['__REF__']);

+				$paymenturl = $url;

+			}

+

+			if ($object->id > 0)

+			{

+				$substitutionarray['__ONLINE_PAYMENT_TEXT_AND_URL__'] = ($paymenturl ?str_replace('\n', "\n", $outputlangs->trans("PredefinedMailContentLink", $paymenturl)) : '');

+				$substitutionarray['__ONLINE_PAYMENT_URL__'] = $paymenturl;

+

+				if (!empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'propal')

+				{

+					$substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = $object->getLastMainDocLink($object->element);

@@ -8522,2 +6415,4 @@
-				if (is_object($object) && $object->element == 'facture') {

-					$typeforonlinepayment = 'invoice';

+				else $substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = '';

+				if (!empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'commande')

+				{

+					$substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = $object->getLastMainDocLink($object->element);

@@ -8525,5 +6420,4 @@
-				if (is_object($object) && $object->element == 'member') {

-					$typeforonlinepayment = 'member';

-					if (!empty($object->last_subscription_amount)) {

-						$amounttouse = $object->last_subscription_amount;

-					}

+				else $substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = '';

+				if (!empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'facture')

+				{

+					$substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = $object->getLastMainDocLink($object->element);

@@ -8531,86 +6425,10 @@
-				if (is_object($object) && $object->element == 'contrat') {

-					$typeforonlinepayment = 'contract';

-				}

-				if (is_object($object) && $object->element == 'fichinter') {

-					$typeforonlinepayment = 'ficheinter';

-				}

-

-				$url = getOnlinePaymentUrl(0, $typeforonlinepayment, $substitutionarray['__REF__'], $amounttouse);

-				$paymenturl = $url;

-			}

-

-			if ($object->id > 0) {

-				$substitutionarray['__ONLINE_PAYMENT_TEXT_AND_URL__'] = ($paymenturl ? str_replace('\n', "\n", $outputlangs->trans("PredefinedMailContentLink", $paymenturl)) : '');

-				$substitutionarray['__ONLINE_PAYMENT_URL__'] = $paymenturl;

-

-				if (getDolGlobalString('PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD') && is_object($object) && $object->element == 'propal') {

-					$substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = $object->getLastMainDocLink($object->element);

-				} else {

-					$substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = '';

-				}

-				if (getDolGlobalString('ORDER_ALLOW_EXTERNAL_DOWNLOAD') && is_object($object) && $object->element == 'commande') {

-					$substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = $object->getLastMainDocLink($object->element);

-				} else {

-					$substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = '';

-				}

-				if (getDolGlobalString('INVOICE_ALLOW_EXTERNAL_DOWNLOAD') && is_object($object) && $object->element == 'facture') {

-					$substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = $object->getLastMainDocLink($object->element);

-				} else {

-					$substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = '';

-				}

-				if (getDolGlobalString('CONTRACT_ALLOW_EXTERNAL_DOWNLOAD') && is_object($object) && $object->element == 'contrat') {

-					$substitutionarray['__DIRECTDOWNLOAD_URL_CONTRACT__'] = $object->getLastMainDocLink($object->element);

-				} else {

-					$substitutionarray['__DIRECTDOWNLOAD_URL_CONTRACT__'] = '';

-				}

-				if (getDolGlobalString('FICHINTER_ALLOW_EXTERNAL_DOWNLOAD') && is_object($object) && $object->element == 'fichinter') {

-					$substitutionarray['__DIRECTDOWNLOAD_URL_FICHINTER__'] = $object->getLastMainDocLink($object->element);

-				} else {

-					$substitutionarray['__DIRECTDOWNLOAD_URL_FICHINTER__'] = '';

-				}

-				if (getDolGlobalString('SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD') && is_object($object) && $object->element == 'supplier_proposal') {

-					$substitutionarray['__DIRECTDOWNLOAD_URL_SUPPLIER_PROPOSAL__'] = $object->getLastMainDocLink($object->element);

-				} else {

-					$substitutionarray['__DIRECTDOWNLOAD_URL_SUPPLIER_PROPOSAL__'] = '';

-				}

-

-				if (is_object($object) && $object->element == 'propal') {

-					$substitutionarray['__URL_PROPOSAL__'] = DOL_MAIN_URL_ROOT."/comm/propal/card.php?id=".$object->id;

-					require_once DOL_DOCUMENT_ROOT.'/core/lib/signature.lib.php';

-					$substitutionarray['__ONLINE_SIGN_URL__'] = getOnlineSignatureUrl(0, 'proposal', $object->ref);

-				}

-				if (is_object($object) && $object->element == 'commande') {

-					$substitutionarray['__URL_ORDER__'] = DOL_MAIN_URL_ROOT."/commande/card.php?id=".$object->id;

-				}

-				if (is_object($object) && $object->element == 'facture') {

-					$substitutionarray['__URL_INVOICE__'] = DOL_MAIN_URL_ROOT."/compta/facture/card.php?id=".$object->id;

-				}

-				if (is_object($object) && $object->element == 'contrat') {

-					$substitutionarray['__URL_CONTRACT__'] = DOL_MAIN_URL_ROOT."/contrat/card.php?id=".$object->id;

-					require_once DOL_DOCUMENT_ROOT.'/core/lib/signature.lib.php';

-					$substitutionarray['__ONLINE_SIGN_URL__'] = getOnlineSignatureUrl(0, 'contract', $object->ref);

-				}

-				if (is_object($object) && $object->element == 'fichinter') {

-					$substitutionarray['__URL_FICHINTER__'] = DOL_MAIN_URL_ROOT."/fichinter/card.php?id=".$object->id;

-					require_once DOL_DOCUMENT_ROOT.'/core/lib/signature.lib.php';

-					$substitutionarray['__ONLINE_SIGN_FICHINTER_URL__'] = getOnlineSignatureUrl(0, 'fichinter', $object->ref);

-				}

-				if (is_object($object) && $object->element == 'supplier_proposal') {

-					$substitutionarray['__URL_SUPPLIER_PROPOSAL__'] = DOL_MAIN_URL_ROOT."/supplier_proposal/card.php?id=".$object->id;

-				}

-				if (is_object($object) && $object->element == 'shipping') {

-					$substitutionarray['__URL_SHIPMENT__'] = DOL_MAIN_URL_ROOT."/expedition/card.php?id=".$object->id;

-				}

-			}

-

-			if (is_object($object) && $object->element == 'action') {

-				$substitutionarray['__EVENT_LABEL__'] = $object->label;

-				$substitutionarray['__EVENT_TYPE__'] = $outputlangs->trans("Action".$object->type_code);

-				$substitutionarray['__EVENT_DATE__'] = dol_print_date($object->datep, 'day', 'auto', $outputlangs);

-				$substitutionarray['__EVENT_TIME__'] = dol_print_date($object->datep, 'hour', 'auto', $outputlangs);

-			}

-		}

-	}

-	if ((empty($exclude) || !in_array('objectamount', $exclude)) && (empty($include) || in_array('objectamount', $include))) {

-		include_once DOL_DOCUMENT_ROOT.'/core/lib/functionsnumtoword.lib.php';

-

+				else $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = '';

+

+				if (is_object($object) && $object->element == 'propal') $substitutionarray['__URL_PROPOSAL__'] = DOL_MAIN_URL_ROOT."/comm/propal/card.php?id=".$object->id;

+				if (is_object($object) && $object->element == 'commande') $substitutionarray['__URL_ORDER__'] = DOL_MAIN_URL_ROOT."/commande/card.php?id=".$object->id;

+				if (is_object($object) && $object->element == 'facture') $substitutionarray['__URL_INVOICE__'] = DOL_MAIN_URL_ROOT."/compta/facture/card.php?id=".$object->id;

+			}

+		}

+	}

+	if (empty($exclude) || !in_array('objectamount', $exclude))

+	{

@@ -8620,5 +6438 @@
-		$already_payed_all = 0;

-		if (is_object($object) && ($object instanceof Facture)) {

-			$already_payed_all = $object->sumpayed + $object->sumdeposit + $object->sumcreditnote;

-		}

-

+		$substitutionarray['__AMOUNT__']          = is_object($object) ? $object->total_ttc : '';

@@ -8626,34 +6440,11 @@
-

-		$substitutionarray['__AMOUNT__']          = is_object($object) ? $object->total_ttc : '';

-		$substitutionarray['__AMOUNT_TEXT__']     = is_object($object) ? dol_convertToWord($object->total_ttc, $outputlangs, '', true) : '';

-		$substitutionarray['__AMOUNT_TEXTCURRENCY__'] = is_object($object) ? dol_convertToWord($object->total_ttc, $outputlangs, $conf->currency, true) : '';

-

-		$substitutionarray['__AMOUNT_REMAIN__'] = is_object($object) ? price2num($object->total_ttc - $already_payed_all, 'MT') : '';

-

-		$substitutionarray['__AMOUNT_VAT__']      = is_object($object) ? (isset($object->total_vat) ? $object->total_vat : $object->total_tva) : '';

-		$substitutionarray['__AMOUNT_VAT_TEXT__']      = is_object($object) ? (isset($object->total_vat) ? dol_convertToWord($object->total_vat, $outputlangs, '', true) : dol_convertToWord($object->total_tva, $outputlangs, '', true)) : '';

-		$substitutionarray['__AMOUNT_VAT_TEXTCURRENCY__']      = is_object($object) ? (isset($object->total_vat) ? dol_convertToWord($object->total_vat, $outputlangs, $conf->currency, true) : dol_convertToWord($object->total_tva, $outputlangs, $conf->currency, true)) : '';

-

-		if ($onlykey != 2 || $mysoc->useLocalTax(1)) {

-			$substitutionarray['__AMOUNT_TAX2__']     = is_object($object) ? $object->total_localtax1 : '';

-		}

-		if ($onlykey != 2 || $mysoc->useLocalTax(2)) {

-			$substitutionarray['__AMOUNT_TAX3__']     = is_object($object) ? $object->total_localtax2 : '';

-		}

-

-		// Amount keys formated in a currency

-		$substitutionarray['__AMOUNT_EXCL_TAX_FORMATED__'] = is_object($object) ? ($object->total_ht ? price($object->total_ht, 0, $outputlangs, 0, -1, -1, $conf->currency) : null) : '';

-		$substitutionarray['__AMOUNT_FORMATED__']          = is_object($object) ? ($object->total_ttc ? price($object->total_ttc, 0, $outputlangs, 0, -1, -1, $conf->currency) : null) : '';

-		$substitutionarray['__AMOUNT_REMAIN_FORMATED__'] = is_object($object) ? ($object->total_ttc ? price($object->total_ttc - $already_payed_all, 0, $outputlangs, 0, -1, -1, $conf->currency) : null) : '';

-		$substitutionarray['__AMOUNT_VAT_FORMATED__']      = is_object($object) ? (isset($object->total_vat) ? price($object->total_vat, 0, $outputlangs, 0, -1, -1, $conf->currency) : ($object->total_tva ? price($object->total_tva, 0, $outputlangs, 0, -1, -1, $conf->currency) : null)) : '';

-		if ($onlykey != 2 || $mysoc->useLocalTax(1)) {

-			$substitutionarray['__AMOUNT_TAX2_FORMATED__']     = is_object($object) ? ($object->total_localtax1 ? price($object->total_localtax1, 0, $outputlangs, 0, -1, -1, $conf->currency) : null) : '';

-		}

-		if ($onlykey != 2 || $mysoc->useLocalTax(2)) {

-			$substitutionarray['__AMOUNT_TAX3_FORMATED__']     = is_object($object) ? ($object->total_localtax2 ? price($object->total_localtax2, 0, $outputlangs, 0, -1, -1, $conf->currency) : null) : '';

-		}

-

-		$substitutionarray['__AMOUNT_MULTICURRENCY__']          = (is_object($object) && isset($object->multicurrency_total_ttc)) ? $object->multicurrency_total_ttc : '';

-		$substitutionarray['__AMOUNT_MULTICURRENCY_TEXT__']     = (is_object($object) && isset($object->multicurrency_total_ttc)) ? dol_convertToWord($object->multicurrency_total_ttc, $outputlangs, '', true) : '';

-		$substitutionarray['__AMOUNT_MULTICURRENCY_TEXTCURRENCY__'] = (is_object($object) && isset($object->multicurrency_total_ttc)) ? dol_convertToWord($object->multicurrency_total_ttc, $outputlangs, $object->multicurrency_code, true) : '';

-		// TODO Add other keys for foreign multicurrency

+		$substitutionarray['__AMOUNT_VAT__']      = is_object($object) ? ($object->total_vat ? $object->total_vat : $object->total_tva) : '';

+		if ($onlykey != 2 || $mysoc->useLocalTax(1)) $substitutionarray['__AMOUNT_TAX2__']     = is_object($object) ? $object->total_localtax1 : '';

+		if ($onlykey != 2 || $mysoc->useLocalTax(2)) $substitutionarray['__AMOUNT_TAX3__']     = is_object($object) ? $object->total_localtax2 : '';

+

+		$substitutionarray['__AMOUNT_FORMATED__']          = is_object($object) ? ($object->total_ttc ? price($object->total_ttc, 0, $outputlangs, 0, 0, -1, $conf->currency) : null) : '';

+		$substitutionarray['__AMOUNT_EXCL_TAX_FORMATED__'] = is_object($object) ? ($object->total_ht ? price($object->total_ht, 0, $outputlangs, 0, 0, -1, $conf->currency) : null) : '';

+		$substitutionarray['__AMOUNT_VAT_FORMATED__']      = is_object($object) ? ($object->total_vat ? price($object->total_vat, 0, $outputlangs, 0, 0, -1, $conf->currency) : ($object->total_tva ? price($object->total_tva, 0, $outputlangs, 0, 0, -1, $conf->currency) : null)) : '';

+		if ($onlykey != 2 || $mysoc->useLocalTax(1)) $substitutionarray['__AMOUNT_TAX2_FORMATED__']     = is_object($object) ? ($object->total_localtax1 ? price($object->total_localtax1, 0, $outputlangs, 0, 0, -1, $conf->currency) : null) : '';

+		if ($onlykey != 2 || $mysoc->useLocalTax(2)) $substitutionarray['__AMOUNT_TAX3_FORMATED__']     = is_object($object) ? ($object->total_localtax2 ? price($object->total_localtax2, 0, $outputlangs, 0, 0, -1, $conf->currency) : null) : '';

+

+		// TODO Add keys for foreign multicurrency

@@ -8662 +6453,2 @@
-		if ($onlykey != 2) {

+		if ($onlykey != 2)

+		{

@@ -8665 +6457 @@
-			$substitutionarray['__TOTAL_VAT__']    = is_object($object) ? (isset($object->total_vat) ? $object->total_vat : $object->total_tva) : '';

+			$substitutionarray['__TOTAL_VAT__']    = is_object($object) ? ($object->total_vat ? $object->total_vat : $object->total_tva) : '';

@@ -8670 +6462,2 @@
-	if ((empty($exclude) || !in_array('date', $exclude)) && (empty($include) || in_array('date', $include))) {

+	if (empty($exclude) || !in_array('date', $exclude))

+	{

@@ -8673,3 +6466 @@
-		$now = dol_now();

-

-		$tmp = dol_getdate($now, true);

+		$tmp = dol_getdate(dol_now(), true);

@@ -8681,5 +6472 @@
-		$daytext = $outputlangs->trans('Day'.$tmp['wday']);

-

-		$substitutionarray = array_merge($substitutionarray, array(

-			'__NOW_TMS__' => (string) $now,		// Must be the string that represent the int

-			'__NOW_TMS_YMD__' => dol_print_date($now, 'day', 'auto', $outputlangs),

+        $substitutionarray = array_merge($substitutionarray, array(

@@ -8687,3 +6474,3 @@
-			'__DAY_TEXT__' => $daytext, // Monday

-			'__DAY_TEXT_SHORT__' => dol_trunc($daytext, 3, 'right', 'UTF-8', 1), // Mon

-			'__DAY_TEXT_MIN__' => dol_trunc($daytext, 1, 'right', 'UTF-8', 1), // M

+			'__DAY_TEXT__' => $outputlangs->trans('Day'.$tmp['wday']), // Monday

+			'__DAY_TEXT_SHORT__' => $outputlangs->trans($tmp['weekday'].'Min'), // Mon

+			'__DAY_TEXT_MIN__' => $outputlangs->trans('Short'.$tmp['weekday']), // M

@@ -8700,3 +6486,0 @@
-			'__NEXT_MONTH_TEXT__' => $outputlangs->trans('Month'.sprintf("%02d", $tmp5['month'])),

-			'__NEXT_MONTH_TEXT_SHORT__' => $outputlangs->trans('MonthShort'.sprintf("%02d", $tmp5['month'])),

-			'__NEXT_MONTH_TEXT_MIN__' => $outputlangs->trans('MonthVeryShort'.sprintf("%02d", $tmp5['month'])),

@@ -8707 +6491,2 @@
-	if (isModEnabled('multicompany')) {

+	if (!empty($conf->multicompany->enabled))

+	{

@@ -8710 +6495,2 @@
-	if ((empty($exclude) || !in_array('system', $exclude)) && (empty($include) || in_array('user', $include))) {

+	if (empty($exclude) || !in_array('system', $exclude))

+	{

@@ -8716,2 +6501,0 @@
-

-	// Note: The lazyload variables are replaced only during the call by make_substitutions, and only if necessary

@@ -8730,6 +6514,4 @@
- *  @param	string		$text	      					Source string in which we must do substitution

- *  @param  array		$substitutionarray				Array with key->val to substitute. Example: array('__MYKEY__' => 'MyVal', ...)

- *  @param	Translate	$outputlangs					Output language

- *  @param	int			$converttextinhtmlifnecessary	0=Convert only value into HTML if text is already in HTML

- *  													1=Will also convert initial $text into HTML if we try to insert one value that is HTML

- * 	@return string  		    						Output string after substitutions

+ *  @param	string		$text	      			Source string in which we must do substitution

+ *  @param  array		$substitutionarray		Array with key->val to substitute. Example: array('__MYKEY__' => 'MyVal', ...)

+ *  @param	Translate	$outputlangs			Output language

+ * 	@return string  		    				Output string after substitutions

@@ -8738,17 +6520,7 @@
-function make_substitutions($text, $substitutionarray, $outputlangs = null, $converttextinhtmlifnecessary = 0)

-{

-	global $conf, $db, $langs;

-

-	if (!is_array($substitutionarray)) {

-		return 'ErrorBadParameterSubstitutionArrayWhenCalling_make_substitutions';

-	}

-

-	if (empty($outputlangs)) {

-		$outputlangs = $langs;

-	}

-

-	// Is initial text HTML or simple text ?

-	$msgishtml = 0;

-	if (dol_textishtml($text, 1)) {

-		$msgishtml = 1;

-	}

+function make_substitutions($text, $substitutionarray, $outputlangs = null)

+{

+	global $conf, $langs;

+

+	if (!is_array($substitutionarray)) return 'ErrorBadParameterSubstitutionArrayWhenCalling_make_substitutions';

+

+	if (empty($outputlangs)) $outputlangs = $langs;

@@ -8757 +6529,2 @@
-	if (is_object($outputlangs)) {

+	if (is_object($outputlangs))

+	{

@@ -8759 +6532,5 @@
-		while (preg_match('/__\(([^\)]+)\)__/', $text, $reg)) {

+		while (preg_match('/__\(([^\)]+)\)__/', $text, $reg))

+		{

+			$msgishtml = 0;

+			if (dol_textishtml($text, 1)) $msgishtml = 1;

+

@@ -8762,24 +6539,3 @@
-			if (!empty($tmp[1])) {

-				$outputlangs->load($tmp[1]);

-			}

-

-			$value = $outputlangs->transnoentitiesnoconv($reg[1]);

-

-			if (empty($converttextinhtmlifnecessary)) {

-				// convert $newval into HTML is necessary

-				$text = preg_replace('/__\('.preg_quote($reg[1], '/').'\)__/', $msgishtml ? dol_htmlentitiesbr($value) : $value, $text);

-			} else {

-				if (! $msgishtml) {

-					$valueishtml = dol_textishtml($value, 1);

-					//var_dump("valueishtml=".$valueishtml);

-

-					if ($valueishtml) {

-						$text = dol_htmlentitiesbr($text);

-						$msgishtml = 1;

-					}

-				} else {

-					$value = dol_nl2br("$value");

-				}

-

-				$text = preg_replace('/__\('.preg_quote($reg[1], '/').'\)__/', $value, $text);

-			}

+			if (!empty($tmp[1])) $outputlangs->load($tmp[1]);

+

+			$text = preg_replace('/__\('.preg_quote($reg[1], '/').'\)__/', $msgishtml ?dol_htmlentitiesbr($outputlangs->transnoentitiesnoconv($reg[1])) : $outputlangs->transnoentitiesnoconv($reg[1]), $text);

@@ -8792 +6548,5 @@
-	while (preg_match('/__\[([^\]]+)\]__/', $text, $reg)) {

+	while (preg_match('/__\[([^\]]+)\]__/', $text, $reg))

+	{

+		$msgishtml = 0;

+		if (dol_textishtml($text, 1)) $msgishtml = 1;

+

@@ -8794,110 +6554,14 @@
-		if (isASecretKey($keyfound)) {

-			$value = '*****forbidden*****';

-		} else {

-			$value = empty($conf->global->$keyfound) ? '' : $conf->global->$keyfound;

-		}

-

-		if (empty($converttextinhtmlifnecessary)) {

-			// convert $newval into HTML is necessary

-			$text = preg_replace('/__\['.preg_quote($keyfound, '/').'\]__/', $msgishtml ? dol_htmlentitiesbr($value) : $value, $text);

-		} else {

-			if (! $msgishtml) {

-				$valueishtml = dol_textishtml($value, 1);

-

-				if ($valueishtml) {

-					$text = dol_htmlentitiesbr($text);

-					$msgishtml = 1;

-				}

-			} else {

-				$value = dol_nl2br("$value");

-			}

-

-			$text = preg_replace('/__\['.preg_quote($keyfound, '/').'\]__/', $value, $text);

-		}

-	}

-

-	// Make substitution for array $substitutionarray

-	foreach ($substitutionarray as $key => $value) {

-		if (!isset($value)) {

-			continue; // If value is null, it same than not having substitution key at all into array, we do not replace.

-		}

-

-		if (($key == '__USER_SIGNATURE__' || $key == '__SENDEREMAIL_SIGNATURE__') && (getDolGlobalString('MAIN_MAIL_DO_NOT_USE_SIGN'))) {

-			$value = ''; // Protection

-		}

-

-		if (empty($converttextinhtmlifnecessary)) {

-			$text = str_replace("$key", "$value", $text); // We must keep the " to work when value is 123.5 for example

-		} else {

-			if (! $msgishtml) {

-				$valueishtml = dol_textishtml($value, 1);

-

-				if ($valueishtml) {

-					$text = dol_htmlentitiesbr($text);

-					$msgishtml = 1;

-				}

-			} else {

-				$value = dol_nl2br("$value");

-			}

-			$text = str_replace("$key", "$value", $text); // We must keep the " to work when value is 123.5 for example

-		}

-	}

-

-	// TODO Implement the lazyload substitution

-	/*

-	add a loop to scan $substitutionarray:

-	For each key ending with '@lazyload', we extract the substitution key 'XXX' and we check inside the $text (the 1st parameter of make_substitutions), if the string XXX exists.

-	If no, we don't need to make replacement, so we do nothing.

-	If yes, we can make the substitution:

-

-	include_once $path;

-	$tmpobj = new $class($db);

-	$valuetouseforsubstitution = $tmpobj->$method($id, '__XXX__');

-	And make the replacement of "__XXX__@lazyload" with $valuetouseforsubstitution

-	*/

-	$memory_object_list = array();

-	foreach ($substitutionarray as $key => $value) {

-		$lazy_load_arr = array();

-		if (preg_match('/(__[A-Z\_]+__)@lazyload$/', $key, $lazy_load_arr)) {

-			if (isset($lazy_load_arr[1]) && !empty($lazy_load_arr[1])) {

-				$key_to_substitute = $lazy_load_arr[1];

-				if (preg_match('/' . preg_quote($key_to_substitute, '/') . '/', $text)) {

-					$param_arr = explode(':', $value);

-					// path:class:method:id

-					if (count($param_arr) == 4) {

-						$path = $param_arr[0];

-						$class = $param_arr[1];

-						$method = $param_arr[2];

-						$id = (int) $param_arr[3];

-

-						// load class file and init object list in memory

-						if (!isset($memory_object_list[$class])) {

-							if (dol_is_file(DOL_DOCUMENT_ROOT . $path)) {

-								require_once DOL_DOCUMENT_ROOT . $path;

-								if (class_exists($class)) {

-									$memory_object_list[$class] = array(

-										'list' => array(),

-									);

-								}

-							}

-						}

-

-						// fetch object and set substitution

-						if (isset($memory_object_list[$class]) && isset($memory_object_list[$class]['list'])) {

-							if (method_exists($class, $method)) {

-								if (!isset($memory_object_list[$class]['list'][$id])) {

-									$tmpobj = new $class($db);

-									$valuetouseforsubstitution = $tmpobj->$method($id, $key_to_substitute);

-									$memory_object_list[$class]['list'][$id] = $tmpobj;

-								} else {

-									$tmpobj = $memory_object_list[$class]['list'][$id];

-									$valuetouseforsubstitution = $tmpobj->$method($id, $key_to_substitute, true);

-								}

-

-								$text = str_replace("$key_to_substitute", "$valuetouseforsubstitution", $text); // We must keep the " to work when value is 123.5 for example

-							}

-						}

-					}

-				}

-			}

-		}

+		if (preg_match('/(_pass|_pw|password|secret|_key|key$)/i', $keyfound)) $newval = '*****forbidden*****';

+		else $newval = empty($conf->global->$keyfound) ? '' : $conf->global->$keyfound;

+		$text = preg_replace('/__\['.preg_quote($keyfound, '/').'\]__/', $msgishtml ?dol_htmlentitiesbr($newval) : $newval, $text);

+	}

+

+	// Make substitition for array $substitutionarray

+	foreach ($substitutionarray as $key => $value)

+	{

+		if (!isset($value)) continue; // If value is null, it same than not having substitution key at all into array, we do not replace.

+

+		if ($key == '__SIGNATURE__' && (!empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) $value = ''; // Protection

+		if ($key == '__USER_SIGNATURE__' && (!empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) $value = ''; // Protection

+

+		$text = str_replace("$key", "$value", $text); // We must keep the " to work when value is 123.5 for example

@@ -8927 +6591,12 @@
-	// Note: substitution key for each extrafields, using key __EXTRA_XXX__ is already available into the getCommonSubstitutionArray used to build the substitution array.

+	// Add a substitution key for each extrafields, using key __EXTRA_XXX__

+	// TODO Remove this. Already available into the getCommonSubstitutionArray used to build the substitution array.

+	/*if (is_object($object) && is_array($object->array_options))

+	{

+		foreach($object->array_options as $key => $val)

+		{

+			$keyshort=preg_replace('/^(options|extra)_/','',$key);

+			$substitutionarray['__EXTRAFIELD_'.$keyshort.'__']=$val;

+			// For backward compatibiliy

+			$substitutionarray['%EXTRA_'.$keyshort.'%']=$val;

+		}

+	}*/

@@ -8932 +6607,2 @@
-	foreach ($dirsubstitutions as $reldir) {

+	foreach ($dirsubstitutions as $reldir)

+	{

@@ -8936,3 +6612 @@
-		if (!dol_is_dir($dir)) {

-			continue;

-		}

+		if (!dol_is_dir($dir)) continue;

@@ -8941,3 +6615,4 @@
-		foreach ($substitfiles as $substitfile) {

-			$reg = array();

-			if (preg_match('/functions_(.*)\.lib\.php/i', $substitfile['name'], $reg)) {

+		foreach ($substitfiles as $substitfile)

+		{

+			if (preg_match('/functions_(.*)\.lib\.php/i', $substitfile['name'], $reg))

+			{

@@ -8951,13 +6626,3 @@
-				if (function_exists($function_name)) {

-					$function_name($substitutionarray, $outputlangs, $object, $parameters);

-				}

-			}

-		}

-	}

-	if (getDolGlobalString('ODT_ENABLE_ALL_TAGS_IN_SUBSTITUTIONS')) {

-		// to list all tags in odt template

-		$tags = '';

-		foreach ($substitutionarray as $key => $value) {

-			$tags .= '{'.$key.'} => '.$value."\n";

-		}

-		$substitutionarray = array_merge($substitutionarray, array('__ALL_TAGS__' => $tags));

+				if (function_exists($function_name)) $function_name($substitutionarray, $outputlangs, $object, $parameters);

+			}

+		}

@@ -8986 +6651 @@
- *    @param    string		$format        		Output date format ('day', 'dayhour', ...)

+ *    @param    string		$format        		Output format

@@ -8988 +6653 @@
- *    @param	integer		$withparenthesis	1=Add parenthesis, 0=no parenthesis

+ *    @param	integer		$withparenthesis	1=Add parenthesis, 0=non parenthesis

@@ -8997,5 +6662,4 @@
-	if (!is_object($outputlangs)) {

-		$outputlangs = $langs;

-	}

-

-	if ($date_start && $date_end) {

+	if (!is_object($outputlangs)) $outputlangs = $langs;

+

+	if ($date_start && $date_end)

+	{

@@ -9004 +6668,2 @@
-	if ($date_start && !$date_end) {

+	if ($date_start && !$date_end)

+	{

@@ -9007 +6672,2 @@
-	if (!$date_start && $date_end) {

+	if (!$date_start && $date_end)

+	{

@@ -9019 +6685 @@
- * @param	int		$nameorder		-1=Auto, 0=Lastname+Firstname, 1=Firstname+Lastname, 2=Firstname, 3=Firstname if defined else lastname, 4=Lastname, 5=Lastname if defined else firstname

+ * @param	int		$nameorder		-1=Auto, 0=Lastname+Firstname, 1=Firstname+Lastname, 2=Firstname, 3=Firstname if defined else lastname

@@ -9028,4 +6694,3 @@
-	if ($nameorder < 0) {

-		$nameorder = (!getDolGlobalString('MAIN_FIRSTNAME_NAME_POSITION') ? 1 : 0);

-	}

-	if ($nameorder == 1) {

+	if ($nameorder < 0) $nameorder = (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION) ? 1 : 0);

+	if ($nameorder && $nameorder != 2 && $nameorder != 3)

+	{

@@ -9033,3 +6698 @@
-		if ($firstname && $lastname) {

-			$ret .= ' ';

-		}

+		if ($firstname && $lastname) $ret .= ' ';

@@ -9037 +6700,13 @@
-	} elseif ($nameorder == 2 || $nameorder == 3) {

+	}

+	elseif ($nameorder == 2 || $nameorder == 3)

+	{

+	    $ret .= $firstname;

+	    if (empty($ret) && $nameorder == 3)

+	    {

+	    	$ret .= $lastname;

+	    }

+	}

+	else

+	{

+		$ret .= $lastname;

+		if ($firstname && $lastname) $ret .= ' ';

@@ -9039,14 +6713,0 @@
-		if (empty($ret) && $nameorder == 3) {

-			$ret .= $lastname;

-		}

-	} else {	// 0, 4 or 5

-		$ret .= $lastname;

-		if (empty($ret) && $nameorder == 5) {

-			$ret .= $firstname;

-		}

-		if ($nameorder == 0) {

-			if ($firstname && $lastname) {

-				$ret .= ' ';

-			}

-			$ret .= $firstname;

-		}

@@ -9063,3 +6724,2 @@
- *	@param	string|string[] $mesgs			Message string or array

- *  @param  string          $style      	Which style to use ('mesgs' by default, 'warnings', 'errors')

- *  @param	int				$noduplicate	1 means we do not add the message if already present in session stack

+ *	@param	mixed	$mesgs			Message string or array

+ *  @param  string	$style      	Which style to use ('mesgs' by default, 'warnings', 'errors')

@@ -9069 +6729 @@
-function setEventMessage($mesgs, $style = 'mesgs', $noduplicate = 0)

+function setEventMessage($mesgs, $style = 'mesgs')

@@ -9072,19 +6732,9 @@
-	if (!is_array($mesgs)) {

-		$mesgs = trim((string) $mesgs);

-		// If mesgs is a not an empty string

-		if ($mesgs) {

-			if (!empty($noduplicate) && isset($_SESSION['dol_events'][$style]) && in_array($mesgs, $_SESSION['dol_events'][$style])) {

-				return;

-			}

-			$_SESSION['dol_events'][$style][] = $mesgs;

-		}

-	} else {

-		// If mesgs is an array

-		foreach ($mesgs as $mesg) {

-			$mesg = trim((string) $mesg);

-			if ($mesg) {

-				if (!empty($noduplicate) && isset($_SESSION['dol_events'][$style]) && in_array($mesg, $_SESSION['dol_events'][$style])) {

-					return;

-				}

-				$_SESSION['dol_events'][$style][] = $mesg;

-			}

+	if (!is_array($mesgs))		// If mesgs is a string

+	{

+		if ($mesgs) $_SESSION['dol_events'][$style][] = $mesgs;

+	}

+	else						// If mesgs is an array

+	{

+		foreach ($mesgs as $mesg)

+		{

+			if ($mesg) $_SESSION['dol_events'][$style][] = $mesg;

@@ -9099,5 +6749,4 @@
- *	@param	string		$mesg			Message string

- *	@param	array|null	$mesgs			Message array

- *  @param  string		$style      	Which style to use ('mesgs' by default, 'warnings', 'errors')

- *  @param	string		$messagekey		A key to be used to allow the feature "Never show this message again"

- *  @param	int			$noduplicate	1 means we do not add the message if already present in session stack

+ *	@param	string	$mesg			Message string

+ *	@param	array	$mesgs			Message array

+ *  @param  string	$style      	Which style to use ('mesgs' by default, 'warnings', 'errors')

+ *  @param	string	$messagekey		A key to be used to allow the feature "Never show this message again"

@@ -9107,6 +6756,10 @@
-function setEventMessages($mesg, $mesgs, $style = 'mesgs', $messagekey = '', $noduplicate = 0)

-{

-	if (empty($mesg) && empty($mesgs)) {

-		dol_syslog("Try to add a message in stack, but value to add is empty message", LOG_WARNING);

-	} else {

-		if ($messagekey) {

+function setEventMessages($mesg, $mesgs, $style = 'mesgs', $messagekey = '')

+{

+	if (empty($mesg) && empty($mesgs))

+	{

+		dol_syslog("Try to add a message in stack with empty message", LOG_WARNING);

+	}

+	else

+	{

+		if ($messagekey)

+		{

@@ -9117,11 +6770,8 @@
-		if (empty($messagekey) || empty($_COOKIE["DOLHIDEMESSAGE".$messagekey])) {

-			if (!in_array((string) $style, array('mesgs', 'warnings', 'errors'))) {

-				dol_print_error('', 'Bad parameter style='.$style.' for setEventMessages');

-			}

-			if (empty($mesgs)) {

-				setEventMessage($mesg, $style, $noduplicate);

-			} else {

-				if (!empty($mesg) && !in_array($mesg, $mesgs)) {

-					setEventMessage($mesg, $style, $noduplicate); // Add message string if not already into array

-				}

-				setEventMessage($mesgs, $style, $noduplicate);

+		if (empty($messagekey) || empty($_COOKIE["DOLHIDEMESSAGE".$messagekey]))

+		{

+			if (!in_array((string) $style, array('mesgs', 'warnings', 'errors'))) dol_print_error('', 'Bad parameter style='.$style.' for setEventMessages');

+			if (empty($mesgs)) setEventMessage($mesg, $style);

+			else

+			{

+				if (!empty($mesg) && !in_array($mesg, $mesgs)) setEventMessage($mesg, $style); // Add message string if not already into array

+				setEventMessage($mesgs, $style);

@@ -9146,3 +6796 @@
-		if (empty($disabledoutputofmessages)) {

-			dol_htmloutput_mesg('', $_SESSION['dol_events']['mesgs']);

-		}

+		if (empty($disabledoutputofmessages)) dol_htmloutput_mesg('', $_SESSION['dol_events']['mesgs']);

@@ -9150,0 +6799 @@
+

@@ -9153,3 +6802 @@
-		if (empty($disabledoutputofmessages)) {

-			dol_htmloutput_mesg('', $_SESSION['dol_events']['errors'], 'error');

-		}

+		if (empty($disabledoutputofmessages)) dol_htmloutput_mesg('', $_SESSION['dol_events']['errors'], 'error');

@@ -9161,3 +6808 @@
-		if (empty($disabledoutputofmessages)) {

-			dol_htmloutput_mesg('', $_SESSION['dol_events']['warnings'], 'warning');

-		}

+		if (empty($disabledoutputofmessages)) dol_htmloutput_mesg('', $_SESSION['dol_events']['warnings'], 'warning');

@@ -9186,2 +6831 @@
-	$ret = 0;

-	$return = '';

+	$ret = 0; $return = '';

@@ -9192 +6836,2 @@
-	if ((empty($conf->use_javascript_ajax) || getDolGlobalString('MAIN_DISABLE_JQUERY_JNOTIFY') || $keepembedded) && !preg_match('/<div class=".*">/i', $out)) {

+	if ((empty($conf->use_javascript_ajax) || !empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) || $keepembedded) && !preg_match('/<div class=".*">/i', $out))

+	{

@@ -9197 +6842,2 @@
-	if ((is_array($mesgarray) && count($mesgarray)) || $mesgstring) {

+	if ((is_array($mesgarray) && count($mesgarray)) || $mesgstring)

+	{

@@ -9200,2 +6846,4 @@
-		if (is_array($mesgarray) && count($mesgarray)) {

-			foreach ($mesgarray as $message) {

+		if (is_array($mesgarray) && count($mesgarray))

+		{

+			foreach ($mesgarray as $message)

+			{

@@ -9204,6 +6852,6 @@
-				if ($ret < count($mesgarray)) {

-					$out .= "<br>\n";

-				}

-			}

-		}

-		if ($mesgstring) {

+				if ($ret < count($mesgarray)) $out .= "<br>\n";

+			}

+		}

+		if ($mesgstring)

+		{

+			$langs->load("errors");

@@ -9216,3 +6864,5 @@
-	if ($out) {

-		if (!empty($conf->use_javascript_ajax) && !getDolGlobalString('MAIN_DISABLE_JQUERY_JNOTIFY') && empty($keepembedded)) {

-			$return = '<script nonce="'.getNonce().'">

+	if ($out)

+	{

+		if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && empty($keepembedded))

+		{

+			$return = '<script>

@@ -9220 +6870 @@
-						var block = '.(getDolGlobalString('MAIN_USE_JQUERY_BLOCKUI') ? "true" : "false").'

+						var block = '.(!empty($conf->global->MAIN_USE_JQUERY_BLOCKUI) ? "true" : "false").'

@@ -9232 +6882,3 @@
-		} else {

+		}

+		else

+		{

@@ -9271,3 +6923 @@
-	if (empty($mesgstring) && (!is_array($mesgarray) || count($mesgarray) == 0)) {

-		return;

-	}

+	if (empty($mesgstring) && (!is_array($mesgarray) || count($mesgarray) == 0)) return;

@@ -9277,24 +6927,15 @@
-	if (is_array($mesgarray)) {

-		foreach ($mesgarray as $val) {

-			if ($val && preg_match('/class="error"/i', $val)) {

-				$iserror++;

-				break;

-			}

-			if ($val && preg_match('/class="warning"/i', $val)) {

-				$iswarning++;

-				break;

-			}

-		}

-	} elseif ($mesgstring && preg_match('/class="error"/i', $mesgstring)) {

-		$iserror++;

-	} elseif ($mesgstring && preg_match('/class="warning"/i', $mesgstring)) {

-		$iswarning++;

-	}

-	if ($style == 'error') {

-		$iserror++;

-	}

-	if ($style == 'warning') {

-		$iswarning++;

-	}

-

-	if ($iserror || $iswarning) {

+	if (is_array($mesgarray))

+	{

+		foreach ($mesgarray as $val)

+		{

+			if ($val && preg_match('/class="error"/i', $val)) { $iserror++; break; }

+			if ($val && preg_match('/class="warning"/i', $val)) { $iswarning++; break; }

+		}

+	}

+	elseif ($mesgstring && preg_match('/class="error"/i', $mesgstring)) $iserror++;

+	elseif ($mesgstring && preg_match('/class="warning"/i', $mesgstring)) $iswarning++;

+	if ($style == 'error') $iserror++;

+	if ($style == 'warning') $iswarning++;

+

+	if ($iserror || $iswarning)

+	{

@@ -9306 +6947,2 @@
-		if (is_array($mesgarray)) {

+		if (is_array($mesgarray))

+		{

@@ -9308,2 +6950,4 @@
-			foreach ($mesgarray as $val) {

-				if (is_string($val)) {

+			foreach ($mesgarray as $val)

+			{

+				if (is_string($val))

+				{

@@ -9314 +6958,3 @@
-				} else {

+				}

+				else

+				{

@@ -9321,3 +6967,2 @@
-	} else {

-		print get_htmloutput_mesg($mesgstring, $mesgarray, 'ok', $keepembedded);

-	}

+	}

+	else print get_htmloutput_mesg($mesgstring, $mesgarray, 'ok', $keepembedded);

@@ -9350,2 +6995 @@
- *  @param      int			$natsort			If values are strings (I said value not type): 0=Use alphabetical order, 1=use "natural" sort (natsort)

- *   											If values are numeric (I said value not type): 0=Use numeric order (even if type is string) so use a "natural" sort, 1=use "natural" sort too (same than 0), -1=Force alphabetical order

+ *  @param      int			$natsort			1=use "natural" sort (natsort), 0=use "standard" sort (asort)

@@ -9361 +7005,2 @@
-	if (is_array($array)) {

+	if (is_array($array))

+	{

@@ -9363 +7008,2 @@
-		if ($sizearray > 0) {

+		if ($sizearray > 0)

+		{

@@ -9365,5 +7011,5 @@
-			foreach (array_keys($array) as $key) {

-				if (is_object($array[$key])) {

-					$temp[$key] = empty($array[$key]->$index) ? 0 : $array[$key]->$index;

-				} else {

-					$temp[$key] = empty($array[$key][$index]) ? 0 : $array[$key][$index];

+			foreach (array_keys($array) as $key)

+			{

+				if (is_object($array[$key]))

+				{

+					$temp[$key] = $array[$key]->$index;

@@ -9371,2 +7017,3 @@
-				if ($natsort == -1) {

-					$temp[$key] = '___'.$temp[$key];        // We add a string at begin of value to force an alpha order when using asort.

+				else

+				{

+					$temp[$key] = $array[$key][$index];

@@ -9376,16 +7023,6 @@
-			if (empty($natsort) || $natsort == -1) {

-				if ($order == 'asc') {

-					asort($temp);

-				} else {

-					arsort($temp);

-				}

-			} else {

-				if ($case_sensitive) {

-					natsort($temp);

-				} else {

-					natcasesort($temp);	// natecasesort is not sensible to case

-				}

-				if ($order != 'asc') {

-					$temp = array_reverse($temp, true);

-				}

-			}

+            if (!$natsort) {

+                ($order == 'asc') ? asort($temp) : arsort($temp);

+            } else {

+                ($case_sensitive) ? natsort($temp) : natcasesort($temp);

+                if ($order != 'asc') $temp = array_reverse($temp, true);

+            }

@@ -9395 +7032,2 @@
-			foreach (array_keys($temp) as $key) {

+			foreach (array_keys($temp) as $key)

+			{

@@ -9407 +7045 @@
- *      Check if a string is in UTF8. Seems similar to utf8_valid() but in pure PHP.

+ *      Check if a string is in UTF8

@@ -9410,2 +7048 @@
- * 		@return	boolean				True if string is UTF8 or ISO compatible with UTF8, False if not (ISO with special non utf8 char or Binary)

- * 		@see utf8_valid()

+ * 		@return	boolean				True if string is UTF8 or ISO compatible with UTF8, False if not (ISO with special char or Binary)

@@ -9415,2 +7051,0 @@
-	$str = (string) $str;	// Sometimes string is an int.

-

@@ -9418,17 +7053,10 @@
-	$strLength = strlen($str);

-	for ($i = 0; $i < $strLength; $i++) {

-		if (ord($str[$i]) < 0x80) {

-			continue; // 0bbbbbbb

-		} elseif ((ord($str[$i]) & 0xE0) == 0xC0) {

-			$n = 1; // 110bbbbb

-		} elseif ((ord($str[$i]) & 0xF0) == 0xE0) {

-			$n = 2; // 1110bbbb

-		} elseif ((ord($str[$i]) & 0xF8) == 0xF0) {

-			$n = 3; // 11110bbb

-		} elseif ((ord($str[$i]) & 0xFC) == 0xF8) {

-			$n = 4; // 111110bb

-		} elseif ((ord($str[$i]) & 0xFE) == 0xFC) {

-			$n = 5; // 1111110b

-		} else {

-			return false; // Does not match any model

-		}

+	$strLength = dol_strlen($str);

+	for ($i = 0; $i < $strLength; $i++)

+	{

+		if (ord($str[$i]) < 0x80) continue; // 0bbbbbbb

+		elseif ((ord($str[$i]) & 0xE0) == 0xC0) $n = 1; // 110bbbbb

+		elseif ((ord($str[$i]) & 0xF0) == 0xE0) $n = 2; // 1110bbbb

+		elseif ((ord($str[$i]) & 0xF8) == 0xF0) $n = 3; // 11110bbb

+		elseif ((ord($str[$i]) & 0xFC) == 0xF8) $n = 4; // 111110bb

+		elseif ((ord($str[$i]) & 0xFE) == 0xFC) $n = 5; // 1111110b

+		else return false; // Does not match any model

@@ -9436,3 +7064,2 @@
-			if ((++$i == strlen($str)) || ((ord($str[$i]) & 0xC0) != 0x80)) {

-				return false;

-			}

+			if ((++$i == strlen($str)) || ((ord($str[$i]) & 0xC0) != 0x80))

+			return false;

@@ -9443,17 +7069,0 @@
-

-/**

- *      Check if a string is in UTF8. Seems similar to utf8_check().

- *

- *      @param	string	$str        String to check

- * 		@return	boolean				True if string is valid UTF8 string, false if corrupted

- * 		@see utf8_check()

- */

-function utf8_valid($str)

-{

-	/* 2 other methods to test if string is utf8

-	 $validUTF8 = mb_check_encoding($messagetext, 'UTF-8');

-	 $validUTF8b = ! (false === mb_detect_encoding($messagetext, 'UTF-8', true));

-	 */

-	return preg_match('//u', $str) ? true : false;

-}

-

@@ -9471,3 +7081 @@
-		if (!mb_check_encoding($str, 'ASCII')) {

-			return false;

-		}

+		if (!mb_check_encoding($str, 'ASCII')) return false;

@@ -9475,3 +7083 @@
-		if (preg_match('/[^\x00-\x7f]/', $str)) {

-			return false; // Contains a byte > 7f

-		}

+		if (preg_match('/[^\x00-\x7f]/', $str)) return false; // Contains a byte > 7f

@@ -9496,13 +7102,5 @@
-	if (empty($tmp) && !empty($_SERVER["WINDIR"])) {

-		$tmp = 'iso-8859-1'; // By default for windows

-	}

-	if (empty($tmp)) {

-		$tmp = 'utf-8'; // By default for other

-	}

-	if (getDolGlobalString('MAIN_FILESYSTEM_ENCODING')) {

-		$tmp = $conf->global->MAIN_FILESYSTEM_ENCODING;

-	}

-

-	if ($tmp == 'iso-8859-1') {

-		return mb_convert_encoding($str, 'ISO-8859-1', 'UTF-8');

-	}

+	if (empty($tmp) && !empty($_SERVER["WINDIR"])) $tmp = 'iso-8859-1'; // By default for windows

+	if (empty($tmp)) $tmp = 'utf-8'; // By default for other

+	if (!empty($conf->global->MAIN_FILESYSTEM_ENCODING)) $tmp = $conf->global->MAIN_FILESYSTEM_ENCODING;

+

+	if ($tmp == 'iso-8859-1') return utf8_decode($str);

@@ -9523,2 +7121 @@
- *      @param	string	$filters		Filters to add. WARNING: string must be escaped for SQL and not coming from user input.

- *      @return int						Return integer <0 if KO, Id of code if OK

+ *      @return int						<0 if KO, Id of code if OK

@@ -9527 +7124 @@
-function dol_getIdFromCode($db, $key, $tablename, $fieldkey = 'code', $fieldid = 'id', $entityfilter = 0, $filters = '')

+function dol_getIdFromCode($db, $key, $tablename, $fieldkey = 'code', $fieldid = 'id', $entityfilter = 0)

@@ -9532,3 +7129 @@
-	if ($key == '') {

-		return '';

-	}

+	if ($key == '') return '';

@@ -9537 +7132,2 @@
-	if (isset($cache_codes[$tablename][$key][$fieldid])) {	// Can be defined to 0 or ''

+	if (isset($cache_codes[$tablename][$key][$fieldid]))	// Can be defined to 0 or ''

+	{

@@ -9546 +7142 @@
-	if (!empty($entityfilter)) {

+	if (!empty($entityfilter))

@@ -9548,4 +7143,0 @@
-	}

-	if ($filters) {

-		$sql .= $filters;

-	}

@@ -9554 +7146,2 @@
-	if ($resql) {

+	if ($resql)

+	{

@@ -9556,5 +7149,2 @@
-		if ($obj) {

-			$cache_codes[$tablename][$key][$fieldid] = $obj->valuetoget;

-		} else {

-			$cache_codes[$tablename][$key][$fieldid] = '';

-		}

+		if ($obj) $cache_codes[$tablename][$key][$fieldid] = $obj->valuetoget;

+		else $cache_codes[$tablename][$key][$fieldid] = '';

@@ -9563 +7153,3 @@
-	} else {

+	}

+	else

+	{

@@ -9569,27 +7160,0 @@
- *	Check if a variable with name $var start with $text.

- *  Can be used to forge dol_eval() conditions.

- *

- *  @param	$var		string		Variable

- *  @param	$regextext	string		Text that must be a valid regex string

- *  @param	$matchrule	int			1=Test if start with, 0=Test if equal

- *  @return	boolean|string			True or False, text if bad use.

- */

-function isStringVarMatching($var, $regextext, $matchrule = 1)

-{

-	if ($matchrule == 1) {

-		if ($var == 'mainmenu') {

-			global $mainmenu;

-			return (preg_match('/^'.$regextext.'/', $mainmenu));

-		} elseif ($var == 'leftmenu') {

-			global $leftmenu;

-			return (preg_match('/^'.$regextext.'/', $leftmenu));

-		} else {

-			return 'This variable is not accessible with dol_eval';

-		}

-	} else {

-		return 'This value for matchrule is not implemented';

-	}

-}

-

-

-/**

@@ -9598,6 +7163,10 @@
- * @param 	string		$strToEvaluate	String with condition to check

- * @return 	boolean						True or False. Note: It returns also True if $strToEvaluate is ''. False if error

- */

-function verifCond($strToEvaluate)

-{

-	//print $strToEvaluate."<br>\n";

+ * @param 	string		$strRights		String with condition to check

+ * @return 	boolean						True or False. Return True if strRights is ''

+ */

+function verifCond($strRights)

+{

+	global $user, $conf, $langs;

+	global $leftmenu;

+	global $rights; // To export to dol_eval function

+

+	//print $strRights."<br>\n";

@@ -9605,6 +7174,4 @@
-	if (isset($strToEvaluate) && $strToEvaluate !== '') {

-		//var_dump($strToEvaluate);

-		//$rep = dol_eval($strToEvaluate, 1, 0, '1'); // to show the error

-		$rep = dol_eval($strToEvaluate, 1, 1, '1'); // The dol_eval() must contains all the "global $xxx;" for all variables $xxx found into the string condition

-		$rights = $rep && (!is_string($rep) || strpos($rep, 'Bad string syntax to evaluate') === false);

-		//var_dump($rights);

+	if ($strRights != '')

+	{

+		$str = 'if(!('.$strRights.')) { $rights = false; }';

+		dol_eval($str); // The dol_eval must contains all the global $xxx used into a condition

@@ -9619,14 +7186,9 @@
- * @param 	string	$s					String to evaluate

- * @param	int		$returnvalue		0=No return (used to execute eval($a=something)). 1=Value of eval is returned (used to eval($something)).

- * @param   int     $hideerrors     	1=Hide errors

- * @param	string	$onlysimplestring	'0' (deprecated, used for computed property of extrafields)=Accept all chars,

- * 										'1' (most common use)=Accept only simple string with char 'a-z0-9\s^$_+-.*>&|=!?():"\',/@';',

- * 										'2' (rarely used)=Accept also '[]'

- * @return	mixed						Nothing or return result of eval

- * @see verifCond()

- */

-function dol_eval($s, $returnvalue = 0, $hideerrors = 1, $onlysimplestring = '1')

-{

-	// Only this global variables can be read by eval function and returned to caller

-	global $conf;	// Read of const is done with getDolGlobalString() but we need $conf->currency for example

-	global $db, $langs, $user, $website, $websitepage;

+ * @param 	string	$s				String to evaluate

+ * @param	int		$returnvalue	0=No return (used to execute eval($a=something)). 1=Value of eval is returned (used to eval($something)).

+ * @param   int     $hideerrors     1=Hide errors

+ * @return	mixed					Nothing or return of eval

+ */

+function dol_eval($s, $returnvalue = 0, $hideerrors = 1)

+{

+	// Only global variables can be changed by eval function and returned to caller

+	global $db, $langs, $user, $conf, $website, $websitepage;

@@ -9633,0 +7196,2 @@
+	global $rights;

+	global $object;

@@ -9635,169 +7199,14 @@
-	global $objectoffield;	// To allow the use of $objectoffield in computed fields

-

-	// Old variables used

-	global $object;

-	global $obj; // To get $obj used into list when dol_eval() is used for computed fields and $obj is not yet $object

-

-	if (!in_array($onlysimplestring, array('0', '1', '2'))) {

-		return "Bad call of dol_eval. Parameter onlysimplestring must be '0' (deprecated), '1' or '2'";

-	}

-

-	try {

-		// Test on dangerous char (used for RCE), we allow only characters to make PHP variable testing

-		if ($onlysimplestring == '1') {

-			// We must accept: '1 && getDolGlobalInt("doesnotexist1") && getDolGlobalString("MAIN_FEATURES_LEVEL")'

-			// We must accept: '$user->hasRight("cabinetmed", "read") && !$object->canvas=="patient@cabinetmed"'

-			$specialcharsallowed = '^$_+-.*>&|=!?():"\',/@';

-			if (getDolGlobalString('MAIN_ALLOW_UNSECURED_SPECIAL_CHARS_IN_DOL_EVAL')) {

-				$specialcharsallowed .= getDolGlobalString('MAIN_ALLOW_UNSECURED_SPECIAL_CHARS_IN_DOL_EVAL');

-			}

-			if (preg_match('/[^a-z0-9\s'.preg_quote($specialcharsallowed, '/').']/i', $s)) {

-				if ($returnvalue) {

-					return 'Bad string syntax to evaluate (found chars that are not chars for simplestring): '.$s;

-				} else {

-					dol_syslog('Bad string syntax to evaluate (found chars that are not chars for simplestring): '.$s);

-					return '';

-				}

-			}

-			$savescheck = '';

-			$scheck = $s;

-			while ($scheck && $savescheck != $scheck) {

-				$savescheck = $scheck;

-				$scheck = preg_replace('/->[a-zA-Z0-9_]+\(/', '->__METHOD__', $scheck);	// accept parenthesis in '...->method(...'

-				$scheck = preg_replace('/^\(/', '__PARENTHESIS__ ', $scheck);	// accept parenthesis in '(...'. Must replace with __PARENTHESIS__ with a space after to allow following substitutions

-				$scheck = preg_replace('/\s\(/', '__PARENTHESIS__ ', $scheck);	// accept parenthesis in '... ('. Must replace with __PARENTHESIS__ with a space after to allow following substitutions

-				$scheck = preg_replace('/^!?[a-zA-Z0-9_]+\(/', '__FUNCTION__', $scheck); // accept parenthesis in 'function(' and '!function('

-				$scheck = preg_replace('/\s!?[a-zA-Z0-9_]+\(/', '__FUNCTION__', $scheck); // accept parenthesis in '... function(' and '... !function('

-				$scheck = preg_replace('/(\^|\')\(/', '__REGEXSTART__', $scheck);	// To allow preg_match('/^(aaa|bbb)/'...  or  isStringVarMatching('leftmenu', '(aaa|bbb)')

-			}

-			//print 'scheck='.$scheck." : ".strpos($scheck, '(')."<br>\n";

-			if (strpos($scheck, '(') !== false) {

-				if ($returnvalue) {

-					return 'Bad string syntax to evaluate (mode 1, found call of a function or method without using the direct name of the function): '.$s;

-				} else {

-					dol_syslog('Bad string syntax to evaluate (mode 1, found call of a function or method without using the direct name of the function): '.$s);

-					return '';

-				}

-			}

-			// TODO

-			// We can exclude $ char that are not: $db, $langs, $leftmenu, $topmenu, $user, $langs, $objectoffield, $object...,

-		} elseif ($onlysimplestring == '2') {

-			// We must accept: (($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : "Parent project not found"

-			$specialcharsallowed = '^$_+-.*>&|=!?():"\',/@[]';

-			if (getDolGlobalString('MAIN_ALLOW_UNSECURED_SPECIAL_CHARS_IN_DOL_EVAL')) {

-				$specialcharsallowed .= getDolGlobalString('MAIN_ALLOW_UNSECURED_SPECIAL_CHARS_IN_DOL_EVAL');

-			}

-			if (preg_match('/[^a-z0-9\s'.preg_quote($specialcharsallowed, '/').']/i', $s)) {

-				if ($returnvalue) {

-					return 'Bad string syntax to evaluate (found chars that are not chars for simplestring): '.$s;

-				} else {

-					dol_syslog('Bad string syntax to evaluate (found chars that are not chars for simplestring): '.$s);

-					return '';

-				}

-			}

-			$savescheck = '';

-			$scheck = $s;

-			while ($scheck && $savescheck != $scheck) {

-				$savescheck = $scheck;

-				$scheck = preg_replace('/->[a-zA-Z0-9_]+\(/', '->__METHOD__', $scheck);	// accept parenthesis in '...->method(...'

-				$scheck = preg_replace('/^\(/', '__PARENTHESIS__ ', $scheck);	// accept parenthesis in '(...'. Must replace with __PARENTHESIS__ with a space after to allow following substitutions

-				$scheck = preg_replace('/\s\(/', '__PARENTHESIS__ ', $scheck);	// accept parenthesis in '... ('. Must replace with __PARENTHESIS__ with a space after to allow following substitutions

-				$scheck = preg_replace('/^!?[a-zA-Z0-9_]+\(/', '__FUNCTION__', $scheck); // accept parenthesis in 'function(' and '!function('

-				$scheck = preg_replace('/\s!?[a-zA-Z0-9_]+\(/', '__FUNCTION__', $scheck); // accept parenthesis in '... function(' and '... !function('

-				$scheck = preg_replace('/(\^|\')\(/', '__REGEXSTART__', $scheck);		// To allow preg_match('/^(aaa|bbb)/'...  or  isStringVarMatching('leftmenu', '(aaa|bbb)')

-			}

-			//print 'scheck='.$scheck." : ".strpos($scheck, '(')."<br>\n";

-			if (strpos($scheck, '(') !== false) {

-				if ($returnvalue) {

-					return 'Bad string syntax to evaluate (mode 2, found call of a function or method without using the direct name of the function): '.$s;

-				} else {

-					dol_syslog('Bad string syntax to evaluate (mode 2, found call of a function or method without using the direct name of the function): '.$s);

-					return '';

-				}

-			}

-			// TODO

-			// We can exclude $ char that are not: $db, $leftmenu, $topmenu, $user, $langs, $object...,

-		}

-		if (is_array($s) || $s === 'Array') {

-			return 'Bad string syntax to evaluate (value is Array) '.var_export($s, true);

-		}

-		if (strpos($s, '::') !== false) {

-			if ($returnvalue) {

-				return 'Bad string syntax to evaluate (double : char is forbidden): '.$s;

-			} else {

-				dol_syslog('Bad string syntax to evaluate (double : char is forbidden): '.$s);

-				return '';

-			}

-		}

-		if (strpos($s, '`') !== false) {

-			if ($returnvalue) {

-				return 'Bad string syntax to evaluate (backtick char is forbidden): '.$s;

-			} else {

-				dol_syslog('Bad string syntax to evaluate (backtick char is forbidden): '.$s);

-				return '';

-			}

-		}

-		if (preg_match('/[^0-9]+\.[^0-9]+/', $s)) {	// We refuse . if not between 2 numbers

-			if ($returnvalue) {

-				return 'Bad string syntax to evaluate (dot char is forbidden): '.$s;

-			} else {

-				dol_syslog('Bad string syntax to evaluate (dot char is forbidden): '.$s);

-				return '';

-			}

-		}

-

-		// We block use of php exec or php file functions

-		$forbiddenphpstrings = array('$$');

-		$forbiddenphpstrings = array_merge($forbiddenphpstrings, array('_ENV', '_SESSION', '_COOKIE', '_GET', '_POST', '_REQUEST', 'ReflectionFunction'));

-

-		$forbiddenphpfunctions = array("exec", "passthru", "shell_exec", "system", "proc_open", "popen");

-		$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("dol_eval", "executeCLI", "verifCond"));	// native dolibarr functions

-		$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("base64_decode", "rawurldecode", "urldecode", "str_rot13", "hex2bin")); // decode string functions used to obfuscated function name

-		$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("fopen", "file_put_contents", "fputs", "fputscsv", "fwrite", "fpassthru", "require", "include", "mkdir", "rmdir", "symlink", "touch", "unlink", "umask"));

-		$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("get_defined_functions", "get_defined_vars", "get_defined_constants", "get_declared_classes"));

-		$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("function", "call_user_func"));

-		$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("require", "include", "require_once", "include_once"));

-		$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("eval", "create_function", "assert", "mb_ereg_replace")); // function with eval capabilities

-

-		$forbiddenphpmethods = array('invoke', 'invokeArgs');	// Method of ReflectionFunction to execute a function

-

-		$forbiddenphpregex = 'global\s+\$|\b('.implode('|', $forbiddenphpfunctions).')\b';

-

-		$forbiddenphpmethodsregex = '->('.implode('|', $forbiddenphpmethods).')';

-

-		do {

-			$oldstringtoclean = $s;

-			$s = str_ireplace($forbiddenphpstrings, '__forbiddenstring__', $s);

-			$s = preg_replace('/'.$forbiddenphpregex.'/i', '__forbiddenstring__', $s);

-			$s = preg_replace('/'.$forbiddenphpmethodsregex.'/i', '__forbiddenstring__', $s);

-			//$s = preg_replace('/\$[a-zA-Z0-9_\->\$]+\(/i', '', $s);	// Remove $function( call and $mycall->mymethod(

-		} while ($oldstringtoclean != $s);

-

-		if (strpos($s, '__forbiddenstring__') !== false) {

-			dol_syslog('Bad string syntax to evaluate: '.$s, LOG_WARNING);

-			if ($returnvalue) {

-				return 'Bad string syntax to evaluate: '.$s;

-			} else {

-				dol_syslog('Bad string syntax to evaluate: '.$s);

-				return '';

-			}

-		}

-

-		//print $s."<br>\n";

-		if ($returnvalue) {

-			if ($hideerrors) {

-				return @eval('return '.$s.';');

-			} else {

-				return eval('return '.$s.';');

-			}

-		} else {

-			if ($hideerrors) {

-				@eval($s);

-			} else {

-				eval($s);

-			}

-		}

-	} catch (Error $e) {

-		$error = 'dol_eval try/catch error : ';

-		$error .= $e->getMessage();

-		dol_syslog($error, LOG_WARNING);

+

+	global $obj; // To get $obj used into list when dol_eval is used for computed fields and $obj is not yet $object

+	global $soc; // For backward compatibility

+

+	//print $s."<br>\n";

+	if ($returnvalue)

+	{

+		if ($hideerrors) return @eval('return '.$s.';');

+		else return eval('return '.$s.';');

+	}

+	else

+	{

+		if ($hideerrors) @eval($s);

+		else eval($s);

@@ -9812 +7220,0 @@
- * @see getElementProperties()

@@ -9820,5 +7228,4 @@
- * 	Return img flag of country for a language code or country code.

- *

- * 	@param	string	$codelang	Language code ('en_IN', 'fr_CA', ...) or ISO Country code on 2 characters in uppercase ('IN', 'FR')

- *  @param	string	$moreatt	Add more attribute on img tag (For example 'style="float: right"' or 'class="saturatemedium"')

- *  @param	int		$notitlealt	No title alt

+ * 	Return img flag of country for a language code or country code

+ *

+ * 	@param	string	$codelang	Language code (en_IN, fr_CA...) or Country code (IN, FR)

+ *  @param	string	$moreatt	Add more attribute on img tag (For example 'style="float: right"')

@@ -9827,8 +7234,9 @@
-function picto_from_langcode($codelang, $moreatt = '', $notitlealt = 0)

-{

-	if (empty($codelang)) {

-		return '';

-	}

-

-	if ($codelang == 'auto') {

-		return '<span class="fa fa-language"></span>';

+function picto_from_langcode($codelang, $moreatt = '')

+{

+	global $langs;

+

+	if (empty($codelang)) return '';

+

+	if ($codelang == 'auto')

+	{

+		return '<span class="fa fa-globe"></span>';

@@ -9842,9 +7250 @@
-		'sv_SV' => 'se',

-		'sw_SW' => 'unknown',

-		'AQ' => 'unknown',

-		'CW' => 'unknown',

-		'IM' => 'unknown',

-		'JE' => 'unknown',

-		'MF' => 'unknown',

-		'BL' => 'unknown',

-		'SX' => 'unknown'

+		'sv_SV' => 'se'

@@ -9853,3 +7253,3 @@
-	if (isset($langtocountryflag[$codelang])) {

-		$flagImage = $langtocountryflag[$codelang];

-	} else {

+	if (isset($langtocountryflag[$codelang])) $flagImage = $langtocountryflag[$codelang];

+	else

+	{

@@ -9860,9 +7260 @@
-	$morecss = '';

-	$reg = array();

-	if (preg_match('/class="([^"]+)"/', $moreatt, $reg)) {

-		$morecss = $reg[1];

-		$moreatt = "";

-	}

-

-	// return img_picto_common($codelang, 'flags/'.strtolower($flagImage).'.png', $moreatt, 0, $notitlealt);

-	return '<span class="flag-sprite '.strtolower($flagImage).($morecss ? ' '.$morecss : '').'"'.($moreatt ? ' '.$moreatt : '').(!$notitlealt ? ' title="'.$codelang.'"' : '').'></span>';

+	return img_picto_common($codelang, 'flags/'.strtolower($flagImage).'.png', $moreatt);

@@ -9875,2 +7267,2 @@
- * @param 	string 	$countrycode	Country code like 'US', 'FR', 'CA', 'ES', 'IN', 'MX', ...

- * @return	string					Value of locale like 'en_US', 'fr_FR', ... or null if not found

+ * @param 	string 	$countrycode	Country code like 'US', 'FR', 'CA', ...

+ * @return	string					Value of locale like 'en_US', 'fr_FR', ...

@@ -9882,20 +7274,8 @@
-	if (empty($countrycode)) {

-		return null;

-	}

-

-	if (strtoupper($countrycode) == 'MQ') {

-		return 'fr_CA';

-	}

-	if (strtoupper($countrycode) == 'SE') {

-		return 'sv_SE'; // se_SE is Sami/Sweden, and we want in priority sv_SE for SE country

-	}

-	if (strtoupper($countrycode) == 'CH') {

-		if ($mysoc->country_code == 'FR') {

-			return 'fr_CH';

-		}

-		if ($mysoc->country_code == 'DE') {

-			return 'de_CH';

-		}

-		if ($mysoc->country_code == 'IT') {

-			return 'it_CH';

-		}

+	if (empty($countrycode)) return null;

+

+	if (strtoupper($countrycode) == 'MQ') return 'fr_CA';

+	if (strtoupper($countrycode) == 'SE') return 'sv_SE'; // se_SE is Sami/Sweden, and we want in priority sv_SE for SE country

+	if (strtoupper($countrycode) == 'CH')

+	{

+		if ($mysoc->country_code == 'FR') return 'fr_CH';

+		if ($mysoc->country_code == 'DE') return 'de_CH';

@@ -9926 +7306 @@
-		//'as-IN',		// Moved after en-IN

+		'as-IN',

@@ -9931 +7311 @@
-		//'bn-IN',		// Moved after en-IN

+		'bn-IN',

@@ -9952,2 +7331,0 @@
-		'as-IN',	// as-IN must be after en-IN (en in priority if country is IN)

-		'bn-IN',	// bn-IN must be after en-IN (en in priority if country is IN)

@@ -10044 +7421,0 @@
-		'ro-MD',

@@ -10082,15 +7459,18 @@
-	if (in_array($buildprimarykeytotest, $locales)) {

-		return strtolower($countrycode).'_'.strtoupper($countrycode);

-	}

-

-	if (function_exists('locale_get_primary_language') && function_exists('locale_get_region')) {    // Need extension php-intl

-		foreach ($locales as $locale) {

-			$locale_language = locale_get_primary_language($locale);

-			$locale_region = locale_get_region($locale);

-			if (strtoupper($countrycode) == $locale_region) {

-				//var_dump($locale.' - '.$locale_language.' - '.$locale_region);

-				return strtolower($locale_language).'_'.strtoupper($locale_region);

-			}

-		}

-	} else {

-		dol_syslog("Warning Exention php-intl is not available", LOG_WARNING);

+	if (in_array($buildprimarykeytotest, $locales)) return strtolower($countrycode).'_'.strtoupper($countrycode);

+

+	if (function_exists('locale_get_primary_language') && function_exists('locale_get_region'))    // Need extension php-intl

+	{

+	    foreach ($locales as $locale)

+    	{

+    		$locale_language = locale_get_primary_language($locale);

+    		$locale_region = locale_get_region($locale);

+    		if (strtoupper($countrycode) == $locale_region)

+    		{

+    			//var_dump($locale.'-'.$locale_language.'-'.$locale_region);

+    			return strtolower($locale_language).'_'.strtoupper($locale_region);

+    		}

+    	}

+	}

+	else

+	{

+        dol_syslog("Warning Exention php-intl is not available", LOG_WARNING);

@@ -10115,4 +7495,4 @@
- *     		                    	     	'supplier_order'   to add a tab in purchase order view

- *          		            	        'supplier_invoice' to add a tab in purchase invoice view

- *                  		    	        'invoice'          to add a tab in sales invoice view

- *                          			    'order'            to add a tab in sales order view

+ *     		                    	     	'supplier_order'   to add a tab in supplier order view

+ *          		            	        'supplier_invoice' to add a tab in supplier invoice view

+ *                  		    	        'invoice'          to add a tab in customer invoice view

+ *                          			    'order'            to add a tab in customer order view

@@ -10129 +7508,0 @@
- *  @param	string		$filterorigmodule	Filter on module origin: 'external' will show only external modules. 'core' only core modules. No filter (default) will add both.

@@ -10132,6 +7511,8 @@
-function complete_head_from_modules($conf, $langs, $object, &$head, &$h, $type, $mode = 'add', $filterorigmodule = '')

-{

-	global $hookmanager, $db;

-

-	if (isset($conf->modules_parts['tabs'][$type]) && is_array($conf->modules_parts['tabs'][$type])) {

-		foreach ($conf->modules_parts['tabs'][$type] as $value) {

+function complete_head_from_modules($conf, $langs, $object, &$head, &$h, $type, $mode = 'add')

+{

+	global $hookmanager;

+

+	if (isset($conf->modules_parts['tabs'][$type]) && is_array($conf->modules_parts['tabs'][$type]))

+	{

+		foreach ($conf->modules_parts['tabs'][$type] as $value)

+		{

@@ -10140,42 +7521,11 @@
-			$reg = array();

-			if ($mode == 'add' && !preg_match('/^\-/', $values[1])) {

-				$newtab = array();

-				$postab = $h;

-				// detect if position set in $values[1] ie : +(2)mytab@mymodule (first tab is 0, second is one, ...)

-				$str = $values[1];

-				$posstart = strpos($str, '(');

-				if ($posstart > 0) {

-					$posend = strpos($str, ')');

-					if ($posstart > 0) {

-						$res1 = substr($str, $posstart + 1, $posend - $posstart -1);

-						if (is_numeric($res1)) {

-							$postab = (int) $res1;

-							$values[1] = '+' . substr($str, $posend + 1);

-						}

-					}

-				}

-				if (count($values) == 6) {

-					// new declaration with permissions:

-					// $value='objecttype:+tabname1:Title1:langfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__'

-					// $value='objecttype:+tabname1:Title1,class,pathfile,method:langfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__'

-					if ($values[0] != $type) {

-						continue;

-					}

-

-					if (verifCond($values[4])) {

-						if ($values[3]) {

-							if ($filterorigmodule) {	// If a filter of module origin has been requested

-								if (strpos($values[3], '@')) {	// This is an external module

-									if ($filterorigmodule != 'external') {

-										continue;

-									}

-								} else {	// This looks a core module

-									if ($filterorigmodule != 'core') {

-										continue;

-									}

-								}

-							}

-							$langs->load($values[3]);

-						}

-						if (preg_match('/SUBSTITUTION_([^_]+)/i', $values[2], $reg)) {

-							// If label is "SUBSTITUION_..."

+			if ($mode == 'add' && !preg_match('/^\-/', $values[1]))

+			{

+				if (count($values) == 6)       // new declaration with permissions:  $value='objecttype:+tabname1:Title1:langfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__'

+				{

+					if ($values[0] != $type) continue;

+

+					if (verifCond($values[4]))

+					{

+						if ($values[3]) $langs->load($values[3]);

+						if (preg_match('/SUBSTITUTION_([^_]+)/i', $values[2], $reg))

+						{

@@ -10185,19 +7534,0 @@
-						} else {

-							// If label is "Label,Class,File,Method", we call the method to show content inside the badge

-							$labeltemp = explode(',', $values[2]);

-							$label = $langs->trans($labeltemp[0]);

-

-							if (!empty($labeltemp[1]) && is_object($object) && !empty($object->id)) {

-								dol_include_once($labeltemp[2]);

-								$classtoload = $labeltemp[1];

-								if (class_exists($classtoload)) {

-									$obj = new $classtoload($db);

-									$function = $labeltemp[3];

-									if ($obj && $function && method_exists($obj, $function)) {

-										$nbrec = $obj->$function($object->id, $obj);

-										if (!empty($nbrec)) {

-											$label .= '<span class="badge marginleftonlyshort">'.$nbrec.'</span>';

-										}

-									}

-								}

-							}

@@ -10205,4 +7536,5 @@
-

-						$newtab[0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]), 1);

-						$newtab[1] = $label;

-						$newtab[2] = str_replace('+', '', $values[1]);

+						else $label = $langs->trans($values[2]);

+

+						$head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]), 1);

+						$head[$h][1] = $label;

+						$head[$h][2] = str_replace('+', '', $values[1]);

@@ -10210,2 +7541,0 @@
-					} else {

-						continue;

@@ -10213 +7543,3 @@
-				} elseif (count($values) == 5) {       // case deprecated

+				}

+				elseif (count($values) == 5)       // deprecated

+				{

@@ -10216,18 +7548,4 @@
-					if ($values[0] != $type) {

-						continue;

-					}

-					if ($values[3]) {

-						if ($filterorigmodule) {	// If a filter of module origin has been requested

-							if (strpos($values[3], '@')) {	// This is an external module

-								if ($filterorigmodule != 'external') {

-									continue;

-								}

-							} else {	// This looks a core module

-								if ($filterorigmodule != 'core') {

-									continue;

-								}

-							}

-						}

-						$langs->load($values[3]);

-					}

-					if (preg_match('/SUBSTITUTION_([^_]+)/i', $values[2], $reg)) {

+					if ($values[0] != $type) continue;

+					if ($values[3]) $langs->load($values[3]);

+					if (preg_match('/SUBSTITUTION_([^_]+)/i', $values[2], $reg))

+					{

@@ -10237,2 +7554,0 @@
-					} else {

-						$label = $langs->trans($values[2]);

@@ -10240,4 +7556,5 @@
-

-					$newtab[0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[4]), 1);

-					$newtab[1] = $label;

-					$newtab[2] = str_replace('+', '', $values[1]);

+					else $label = $langs->trans($values[2]);

+

+					$head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[4]), 1);

+					$head[$h][1] = $label;

+					$head[$h][2] = str_replace('+', '', $values[1]);

@@ -10246,6 +7563,4 @@
-				// set tab at its position

-				$head = array_merge(array_slice($head, 0, $postab), array($newtab), array_slice($head, $postab));

-			} elseif ($mode == 'remove' && preg_match('/^\-/', $values[1])) {

-				if ($values[0] != $type) {

-					continue;

-				}

+			}

+			elseif ($mode == 'remove' && preg_match('/^\-/', $values[1]))

+			{

+				if ($values[0] != $type) continue;

@@ -10253 +7568,2 @@
-				foreach ($head as $key => $val) {

+				foreach ($head as $key => $val)

+				{

@@ -10256 +7572,2 @@
-					if ($head[$key][2] == $tabname && $condition) {

+					if ($head[$key][2] == $tabname && $condition)

+					{

@@ -10266,4 +7583,6 @@
-	if (!empty($hookmanager)) {

-		$parameters = array('object' => $object, 'mode' => $mode, 'head' => &$head, 'filterorigmodule' => $filterorigmodule);

-		$reshook = $hookmanager->executeHooks('completeTabsHead', $parameters, $object);

-		if ($reshook > 0) {		// Hook ask to replace completely the array

+	if (!empty($hookmanager))

+	{

+		$parameters = array('object' => $object, 'mode' => $mode, 'head' => $head);

+		$reshook = $hookmanager->executeHooks('completeTabsHead', $parameters);

+		if ($reshook > 0)

+		{

@@ -10271,4 +7590,2 @@
-		} else {				// Hook

-			$head = array_merge($head, $hookmanager->resArray);

-		}

-		$h = count($head);

+            $h = count($head);

+		}

@@ -10295,5 +7612,2 @@
-	if ($zone == 'private') {

-		print "\n".'<!-- Common footer for private page -->'."\n";

-	} else {

-		print "\n".'<!-- Common footer for public page -->'."\n";

-	}

+	if ($zone == 'private') print "\n".'<!-- Common footer for private page -->'."\n";

+	else print "\n".'<!-- Common footer for public page -->'."\n";

@@ -10303 +7617 @@
-	print '<div id="page_y" style="display: none;">'.(GETPOST('page_y') ? GETPOST('page_y') : '').'</div>'."\n";

+	print '<div id="page_y" style="display: none;">'.$_POST['page_y'].'</div>'."\n";

@@ -10307,4 +7621,3 @@
-	if (empty($reshook)) {

-		if (getDolGlobalString('MAIN_HTML_FOOTER')) {

-			print getDolGlobalString('MAIN_HTML_FOOTER') . "\n";

-		}

+	if (empty($reshook))

+	{

+		if (!empty($conf->global->MAIN_HTML_FOOTER)) print $conf->global->MAIN_HTML_FOOTER."\n";

@@ -10313,2 +7626,2 @@
-		if (!empty($conf->use_javascript_ajax)) {

-			print "\n<!-- A script section to add menuhider handler on backoffice, manage focus and madatory fields, tuning info, ... -->\n";

+		if (!empty($conf->use_javascript_ajax))

+		{

@@ -10318 +7631,2 @@
-			if ($zone == 'private' && empty($conf->dol_use_jmobile)) {

+			if ($zone == 'private' && empty($conf->dol_use_jmobile))

+			{

@@ -10329 +7643,2 @@
-			if ($action == 'create' || $action == 'edit' || (empty($action) && (preg_match('/new\.php/', $_SERVER["PHP_SELF"]))) || ((empty($action) || $action == 'addline') && (preg_match('/card\.php/', $_SERVER["PHP_SELF"])))) {

+			if ($action == 'create' || $action == 'edit' || (empty($action) && (preg_match('/new\.php/', $_SERVER["PHP_SELF"]))))

+			{

@@ -10333,3 +7648 @@
-				if (constant('DOL_URL_ROOT')) {

-					$relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'), '/').'/', '', $relativepathstring);

-				}

+				if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'), '/').'/', '', $relativepathstring);

@@ -10339,2 +7652,4 @@
-				if (!empty($user->default_values[$relativepathstring]['focus'])) {

-					foreach ($user->default_values[$relativepathstring]['focus'] as $defkey => $defval) {

+				if (!empty($user->default_values[$relativepathstring]['focus']))

+				{

+					foreach ($user->default_values[$relativepathstring]['focus'] as $defkey => $defval)

+					{

@@ -10342 +7657,2 @@
-						if ($defkey != '_noquery_') {

+						if ($defkey != '_noquery_')

+						{

@@ -10345 +7661,2 @@
-							foreach ($tmpqueryarraytohave as $tmpquerytohave) {

+							foreach ($tmpqueryarraytohave as $tmpquerytohave)

+							{

@@ -10348,3 +7665 @@
-								if (!GETPOSTISSET($tmpquerytohaveparam[0]) || ($tmpquerytohaveparam[1] != GETPOST($tmpquerytohaveparam[0]))) {

-									$foundintru = 1;

-								}

+								if (!GETPOSTISSET($tmpquerytohaveparam[0]) || ($tmpquerytohaveparam[1] != GETPOST($tmpquerytohaveparam[0]))) $foundintru = 1;

@@ -10352,3 +7667 @@
-							if (!$foundintru) {

-								$qualified = 1;

-							}

+							if (!$foundintru) $qualified = 1;

@@ -10356,2 +7668,0 @@
-						} else {

-							$qualified = 1;

@@ -10359,3 +7670,6 @@
-

-						if ($qualified) {

-							foreach ($defval as $paramkey => $paramval) {

+						else $qualified = 1;

+

+						if ($qualified)

+						{

+							foreach ($defval as $paramkey => $paramval)

+							{

@@ -10370,2 +7684,4 @@
-				if (!empty($user->default_values[$relativepathstring]['mandatory'])) {

-					foreach ($user->default_values[$relativepathstring]['mandatory'] as $defkey => $defval) {

+				if (!empty($user->default_values[$relativepathstring]['mandatory']))

+				{

+					foreach ($user->default_values[$relativepathstring]['mandatory'] as $defkey => $defval)

+					{

@@ -10373 +7689,2 @@
-						if ($defkey != '_noquery_') {

+						if ($defkey != '_noquery_')

+						{

@@ -10376 +7693,2 @@
-							foreach ($tmpqueryarraytohave as $tmpquerytohave) {

+							foreach ($tmpqueryarraytohave as $tmpquerytohave)

+							{

@@ -10379,3 +7697 @@
-								if (!GETPOSTISSET($tmpquerytohaveparam[0]) || ($tmpquerytohaveparam[1] != GETPOST($tmpquerytohaveparam[0]))) {

-									$foundintru = 1;

-								}

+								if (!GETPOSTISSET($tmpquerytohaveparam[0]) || ($tmpquerytohaveparam[1] != GETPOST($tmpquerytohaveparam[0]))) $foundintru = 1;

@@ -10383,3 +7699 @@
-							if (!$foundintru) {

-								$qualified = 1;

-							}

+							if (!$foundintru) $qualified = 1;

@@ -10387,2 +7700,0 @@
-						} else {

-							$qualified = 1;

@@ -10390,3 +7702,6 @@
-

-						if ($qualified) {

-							foreach ($defval as $paramkey => $paramval) {

+						else $qualified = 1;

+

+						if ($qualified)

+						{

+							foreach ($defval as $paramkey => $paramval)

+							{

@@ -10396,7 +7711 @@
-								print '// required on a select works only if key is "", so we add the required attributes but also we reset the key -1 or 0 to an empty string'."\n";

-								print 'jQuery("select[name=\''.$paramkey.'\']").prop(\'required\',true);'."\n";

-								print 'jQuery("select[name=\''.$paramkey.'\'] option[value=\'-1\']").prop(\'value\', \'\');'."\n";

-								print 'jQuery("select[name=\''.$paramkey.'\'] option[value=\'0\']").prop(\'value\', \'\');'."\n";

-

-								// Add 'field required' class on closest td for all input elements : input, textarea and select

-								print 'jQuery(":input[name=\'' . $paramkey . '\']").closest("tr").find("td:first").addClass("fieldrequired");' . "\n";

+								print 'jQuery("select[name=\''.$paramkey.'\']").prop(\'required\',true);'."\n"; // required on a select works only if key is "", this does not happen in Dolibarr

@@ -10404,5 +7712,0 @@
-							// If we submit the cancel button we remove the required attributes

-							print 'jQuery("input[name=\'cancel\']").click(function() {

-								console.log("We click on cancel button so removed all required attribute");

-								jQuery("input, textarea, select").each(function(){this.removeAttribute(\'required\');});

-								});'."\n";

@@ -10417 +7721,2 @@
-			if (!empty($_SERVER['MAIN_SHOW_TUNING_INFO']) || getDolGlobalString('MAIN_SHOW_TUNING_INFO')) {

+			if (!empty($_SERVER['MAIN_SHOW_TUNING_INFO']) || !empty($conf->global->MAIN_SHOW_TUNING_INFO))

+			{

@@ -10421,3 +7726 @@
-				if (getDolGlobalString('MEMCACHED_SERVER')) {

-					print 'MEMCACHED_SERVER=' . getDolGlobalString('MEMCACHED_SERVER').' - ';

-				}

+				if (!empty($conf->global->MEMCACHED_SERVER)) print 'MEMCACHED_SERVER='.$conf->global->MEMCACHED_SERVER.' - ';

@@ -10425 +7728,2 @@
-				if (!empty($micro_start_time)) {   // Works only if MAIN_SHOW_TUNING_INFO is defined at $_SERVER level. Not in global variable.

+				if (!empty($micro_start_time))   // Works only if MAIN_SHOW_TUNING_INFO is defined at $_SERVER level. Not in global variable.

+				{

@@ -10436 +7740,2 @@
-				if (function_exists("zend_loader_file_encoded")) {

+				if (function_exists("zend_loader_file_encoded"))

+				{

@@ -10446,3 +7751,4 @@
-			if (isModEnabled('google') && getDolGlobalString('MAIN_GOOGLE_AN_ID')) {

-				$tmptagarray = explode(',', getDolGlobalString('MAIN_GOOGLE_AN_ID'));

-				foreach ($tmptagarray as $tmptag) {

+			if (!empty($conf->google->enabled) && !empty($conf->global->MAIN_GOOGLE_AN_ID))

+			{

+				$tmptagarray = explode(',', $conf->global->MAIN_GOOGLE_AN_ID);

+				foreach($tmptagarray as $tmptag) {

@@ -10451 +7757 @@
-					print '

+					print "

@@ -10453 +7759 @@
-					<script nonce="'.getNonce().'" async src="https://www.googletagmanager.com/gtag/js?id='.trim($tmptag).'"></script>

+					<script async src=\"https://www.googletagmanager.com/gtag/js?id=".trim($tmptag)."\"></script>

@@ -10457,4 +7763,4 @@
-					gtag(\'js\', new Date());

-

-					gtag(\'config\', \''.trim($tmptag).'\');

-					</script>';

+					gtag('js', new Date());

+

+					gtag('config', '".trim($tmptag)."');

+					</script>";

@@ -10467,2 +7773,3 @@
-		if (defined('XDEBUGCOVERAGE')) {

-			print_r(xdebug_get_code_coverage());

+		if (defined('XDEBUGCOVERAGE'))

+		{

+		    print_r(xdebug_get_code_coverage());

@@ -10472,6 +7779,8 @@
-		if ($user->hasRight('debugbar', 'read') && is_object($debugbar)) {

-			$debugbar['time']->stopMeasure('pageaftermaster');

-			print '<!-- Output debugbar data -->'."\n";

-			$renderer = $debugbar->getRenderer();

-			print $debugbar->getRenderer()->render();

-		} elseif (count($conf->logbuffer)) {    // If there is some logs in buffer to show

+	    if (!empty($user->rights->debugbar->read) && is_object($debugbar))

+	    {

+	        $debugbar['time']->stopMeasure('pageaftermaster');

+	        print '<!-- Output debugbar data -->'."\n";

+		    print $debugbar->getRenderer()->render();

+		}

+		elseif (count($conf->logbuffer))    // If there is some logs in buffer to show

+		{

@@ -10481 +7790,2 @@
-			foreach ($conf->logbuffer as $logline) {

+			foreach ($conf->logbuffer as $logline)

+			{

@@ -10494,4 +7804,4 @@
- * @param 	string|null	$string		String to explode

- * @param 	string		$delimiter	Delimiter between each couple of data. Example: ';' or '[\n;]+' or '(\n\r|\r|\n|;)'

- * @param 	string		$kv			Delimiter between key and value

- * @return	array					Array of data exploded

+ * @param 	string	$string		String to explode

+ * @param 	string	$delimiter	Delimiter between each couple of data

+ * @param 	string	$kv			Delimiter between key and value

+ * @return	array				Array of data exploded

@@ -10501,13 +7811,2 @@
-	if (is_null($string)) {

-		return array();

-	}

-

-	if (preg_match('/^\[.*\]$/sm', $delimiter) || preg_match('/^\(.*\)$/sm', $delimiter)) {

-		// This is a regex string

-		$newdelimiter = $delimiter;

-	} else {

-		// This is a simple string

-		$newdelimiter = preg_quote($delimiter, '/');

-	}

-

-	if ($a = preg_split('/'.$newdelimiter.'/', $string)) {

+	if ($a = explode($delimiter, $string))

+	{

@@ -10526 +7824,0 @@
-

@@ -10535 +7833 @@
- * @return	void

+ * @return	string				HTML code to set focus

@@ -10540 +7838 @@
-	print '<script nonce="'.getNonce().'">jQuery(document).ready(function() { jQuery("'.dol_escape_js($selector).'").focus(); });</script>'."\n";

+	print '<script>jQuery(document).ready(function() { jQuery("'.dol_escape_js($selector).'").focus(); });</script>'."\n";

@@ -10547 +7845 @@
- * and sometimes we can't redeclare function.

+ * and sometimes we can't redeclare function

@@ -10554 +7852 @@
-		return mt_rand(99900000, 99965535);

+		return mt_rand(1, 32768);

@@ -10556 +7854 @@
-		return getmypid();	// May be a number on 64 bits (depending on OS)

+		return getmypid();

@@ -10569,5 +7867,5 @@
- *                             			If param $mode is 1, can contains an operator <, > or = like "<10" or ">=100.5 < -1000"

- *                             			If param $mode is 2 or -2, can contains a list of int id separated by comma like "1,3,4"

- *                             			If param $mode is 3 or -3, can contains a list of string separated by comma like "a,b,c".

- * @param	integer			$mode		0=value is list of keyword strings, 1=value is a numeric test (Example ">5.5 <10"), 2=value is a list of ID separated with comma (Example '1,3,4'), -2 is for exclude list,

- * 										3=value is list of string separated with comma (Example 'text 1,text 2'), -3 if for exclude list, 4=value is a list of ID separated with comma (Example '2,7') to be used to search into a multiselect string '1,2,3,4'

+ *                             			If param $mode is 1, can contains an operator <, > or = like "<10" or ">=100.5 < 1000"

+ *                             			If param $mode is 2, can contains a list of int id separated by comma like "1,3,4"

+ *                             			If param $mode is 3, can contains a list of string separated by comma like "a,b,c"

+ * @param	integer			$mode		0=value is list of keyword strings, 1=value is a numeric test (Example ">5.5 <10"), 2=value is a list of ID separated with comma (Example '1,3,4')

+ * 										3=value is list of string separated with comma (Example 'text 1,text 2'), 4=value is a list of ID separated with comma (Example '1,3,4') for search into a multiselect string ('1,2')

@@ -10576 +7873,0 @@
- * @see dolSqlDateFilter()

@@ -10584 +7881,2 @@
-	if ($mode == 0) {

+	if ($mode == 0)

+	{

@@ -10587,2 +7885,3 @@
-	if ($mode == 1) {

-		$value = preg_replace('/([!<>=]+)\s+([0-9'.preg_quote($langs->trans("DecimalSeparator"), '/').'\-])/', '\1\2', $value); // Clean string '< 10' into '<10' so we can then explode on space to get all tests to do

+	if ($mode == 1)

+	{

+		$value = preg_replace('/([<>=]+)\s+([0-9'.preg_quote($langs->trans("DecimalSeparator"), '/').'\-])/', '\1\2', $value); // Clean string '< 10' into '<10' so we can the explode on space to get all tests to do

@@ -10595,8 +7894,8 @@
-	if (!is_array($fields)) {

-		$fields = array($fields);

-	}

-

-	$i1 = 0;	// count the nb of and criteria added (all fields / criterias)

-	foreach ($crits as $crit) {		// Loop on each AND criteria

-		$crit = trim($crit);

-		$i2 = 0;	// count the nb of valid criteria added for this this first criteria

+	if (!is_array($fields)) $fields = array($fields);

+

+	$nboffields = count($fields);

+	$end2 = count($crits);

+	$j = 0;

+	foreach ($crits as $crit)

+	{

+		$i = 0; $i2 = 0;

@@ -10604,7 +7903,19 @@
-		foreach ($fields as $field) {

-			if ($mode == 1) {

-				$tmpcrits = explode('|', $crit);

-				$i3 = 0;	// count the nb of valid criteria added for this current field

-				foreach ($tmpcrits as $tmpcrit) {

-					if ($tmpcrit !== '0' && empty($tmpcrit)) {

-						continue;

+		foreach ($fields as $field)

+		{

+			if ($mode == 1)

+			{

+				$operator = '=';

+				$newcrit = preg_replace('/([<>=]+)/', '', trim($crit));

+

+				$reg = array();

+				preg_match('/([<>=]+)/', trim($crit), $reg);

+				if ($reg[1])

+				{

+					$operator = $reg[1];

+				}

+				if ($newcrit != '')

+				{

+					$numnewcrit = price2num($newcrit);

+					if (is_numeric($numnewcrit))

+					{

+						$newres .= ($i2 > 0 ? ' OR ' : '').$field.' '.$operator.' '.$numnewcrit;

@@ -10612,11 +7923,3 @@
-					$tmpcrit = trim($tmpcrit);

-

-					$newres .= (($i2 > 0 || $i3 > 0) ? ' OR ' : '');

-

-					$operator = '=';

-					$newcrit = preg_replace('/([!<>=]+)/', '', $tmpcrit);

-

-					$reg = array();

-					preg_match('/([!<>=]+)/', $tmpcrit, $reg);

-					if (!empty($reg[1])) {

-						$operator = $reg[1];

+					else

+					{

+						$newres .= ($i2 > 0 ? ' OR ' : '').'1 = 2'; // force false

@@ -10624,9 +7927 @@
-					if ($newcrit != '') {

-						$numnewcrit = price2num($newcrit);

-						if (is_numeric($numnewcrit)) {

-							$newres .= $field.' '.$operator.' '.((float) $numnewcrit); // should be a numeric

-						} else {

-							$newres .= '1 = 2'; // force false, we received a corrupted data

-						}

-						$i3++; // a criteria was added to string

-					}

+					$i2++; // a criteria was added to string

@@ -10634,12 +7929,12 @@
-				$i2++; // a criteria for 1 more field was added to string

-			} elseif ($mode == 2 || $mode == -2) {

-				$crit = preg_replace('/[^0-9,]/', '', $crit); // ID are always integer

-				$newres .= ($i2 > 0 ? ' OR ' : '').$field." ".($mode == -2 ? 'NOT ' : '');

-				$newres .= $crit ? "IN (".$db->sanitize($db->escape($crit)).")" : "IN (0)";

-				if ($mode == -2) {

-					$newres .= ' OR '.$field.' IS NULL';

-				}

-				$i2++; // a criteria for 1 more field was added to string

-			} elseif ($mode == 3 || $mode == -3) {

-				$tmparray = explode(',', $crit);

-				if (count($tmparray)) {

+			}

+			elseif ($mode == 2 || $mode == -2)

+			{

+				$newres .= ($i2 > 0 ? ' OR ' : '').$field." ".($mode == -2 ? 'NOT ' : '')."IN (".$db->escape(trim($crit)).")";

+				if ($mode == -2) $newres .= ' OR '.$field.' IS NULL';

+				$i2++; // a criteria was added to string

+			}

+			elseif ($mode == 3 || $mode == -3)

+			{

+				$tmparray = explode(',', trim($crit));

+				if (count($tmparray))

+				{

@@ -10647,3 +7942,4 @@
-					foreach ($tmparray as $val) {

-						$val = trim($val);

-						if ($val) {

+					foreach ($tmparray as $val)

+					{

+						if ($val)

+						{

@@ -10651 +7947 @@
-							$listofcodes .= "'".$db->escape($val)."'";

+							$listofcodes .= "'".$db->escape(trim($val))."'";

@@ -10654,2 +7950,2 @@
-					$newres .= ($i2 > 0 ? ' OR ' : '').$field." ".($mode == -3 ? 'NOT ' : '')."IN (".$db->sanitize($listofcodes, 1).")";

-					$i2++; // a criteria for 1 more field was added to string

+					$newres .= ($i2 > 0 ? ' OR ' : '').$field." ".($mode == -3 ? 'NOT ' : '')."IN (".$listofcodes.")";

+					$i2++; // a criteria was added to string

@@ -10657,17 +7953,35 @@
-				if ($mode == -3) {

-					$newres .= ' OR '.$field.' IS NULL';

-				}

-			} elseif ($mode == 4) {

-				$tmparray = explode(',', $crit);

-				if (count($tmparray)) {

-					$listofcodes = '';

-					foreach ($tmparray as $val) {

-						$val = trim($val);

-						if ($val) {

-							$newres .= ($i2 > 0 ? " OR (" : "(").$field." LIKE '".$db->escape($val).",%'";

-							$newres .= ' OR '.$field." = '".$db->escape($val)."'";

-							$newres .= ' OR '.$field." LIKE '%,".$db->escape($val)."'";

-							$newres .= ' OR '.$field." LIKE '%,".$db->escape($val).",%'";

-							$newres .= ')';

-							$i2++; // a criteria for 1 more field was added to string (we can add several citeria for the same field as it is a multiselect search criteria)

-						}

+				if ($mode == -3) $newres .= ' OR '.$field.' IS NULL';

+			}

+			elseif ($mode == 4)

+			{

+			    $tmparray = explode(',', trim($crit));

+			    if (count($tmparray))

+			    {

+			        $listofcodes = '';

+			        foreach ($tmparray as $val)

+			        {

+			            if ($val)

+			            {

+			                $newres .= ($i2 > 0 ? ' OR (' : '(').$field.' LIKE \''.$db->escape(trim($val)).',%\'';

+			                $newres .= ' OR '.$field.' = \''.$db->escape(trim($val)).'\'';

+			                $newres .= ' OR '.$field.' LIKE \'%,'.$db->escape(trim($val)).'\'';

+			                $newres .= ' OR '.$field.' LIKE \'%,'.$db->escape(trim($val)).',%\'';

+			                $newres .= ')';

+			                $i2++;

+			            }

+			        }

+			    }

+			}

+			else    // $mode=0

+			{

+				$tmpcrits = explode('|', $crit);

+				$i3 = 0;

+				foreach ($tmpcrits as $tmpcrit)

+				{

+                    if ($tmpcrit !== '0' && empty($tmpcrit)) continue;

+

+					$newres .= (($i2 > 0 || $i3 > 0) ? ' OR ' : '');

+

+					if (preg_match('/\.(id|rowid)$/', $field))	// Special case for rowid that is sometimes a ref so used as a search field

+					{

+						$newres .= $field." = ".(is_numeric(trim($tmpcrit)) ?trim($tmpcrit) : '0');

@@ -10675,19 +7989,5 @@
-				}

-			} else { // $mode=0

-				$tmpcrits = explode('|', $crit);

-				$i3 = 0;	// count the nb of valid criteria added for the current couple criteria/field

-				foreach ($tmpcrits as $tmpcrit) {	// loop on each OR criteria

-					if ($tmpcrit !== '0' && empty($tmpcrit)) {

-						continue;

-					}

-					$tmpcrit = trim($tmpcrit);

-

-					if ($tmpcrit == '^$' || strpos($crit, '!') === 0) {	// If we search empty, we must combined different OR fields with AND

-						$newres .= (($i2 > 0 || $i3 > 0) ? ' AND ' : '');

-					} else {

-						$newres .= (($i2 > 0 || $i3 > 0) ? ' OR ' : '');

-					}

-

-					if (preg_match('/\.(id|rowid)$/', $field)) {	// Special case for rowid that is sometimes a ref so used as a search field

-						$newres .= $field." = ".(is_numeric($tmpcrit) ? ((float) $tmpcrit) : '0');

-					} else {

+					else

+					{

+						$newres .= $field." LIKE '";

+

+						$tmpcrit = trim($tmpcrit);

@@ -10695,13 +7995,3 @@
-						$tmpbefore = '%';

-						$tmpafter = '%';

-						$tmps = '';

-

-						if (preg_match('/^!/', $tmpcrit)) {

-							$tmps .= $field." NOT LIKE "; // ! as exclude character

-							$tmpcrit2 = preg_replace('/^!/', '', $tmpcrit2);

-						} else {

-							$tmps .= $field." LIKE ";

-						}

-						$tmps .= "'";

-

-						if (preg_match('/^[\^\$]/', $tmpcrit)) {

+						$tmpbefore = '%'; $tmpafter = '%';

+						if (preg_match('/^[\^\$]/', $tmpcrit))

+						{

@@ -10711 +8001,2 @@
-						if (preg_match('/[\^\$]$/', $tmpcrit)) {

+						if (preg_match('/[\^\$]$/', $tmpcrit))

+						{

@@ -10715,5 +8005,0 @@
-

-						if ($tmpcrit2 == '' || preg_match('/^!/', $tmpcrit)) {

-							$tmps = "(".$tmps;

-						}

-						$newres .= $tmps;

@@ -10724,2 +8010,3 @@
-						if ($tmpcrit2 == '' || preg_match('/^!/', $tmpcrit)) {

-							$newres .= " OR ".$field." IS NULL)";

+						if ($tmpcrit2 == '')

+						{

+							$newres .= ' OR '.$field." IS NULL";

@@ -10731,9 +8018,6 @@
-

-				$i2++; // a criteria for 1 more field was added to string

-			}

-		}

-

-		if ($newres) {

-			$res = $res.($res ? ' AND ' : '').($i2 > 1 ? '(' : '').$newres.($i2 > 1 ? ')' : '');

-		}

-		$i1++;

+				$i2++; // a criteria was added to string

+			}

+			$i++;

+		}

+		if ($newres) $res = $res.($res ? ' AND ' : '').($i2 > 1 ? '(' : '').$newres.($i2 > 1 ? ')' : '');

+		$j++;

@@ -10742 +8026 @@
-

+	//print 'xx'.$res.'yy';

@@ -10759,3 +8043,4 @@
-	$out .= img_picto($langs->trans("PublicDownloadLinkDesc"), 'globe').' <span class="opacitymedium">'.$langs->trans("DirectDownloadLink").'</span><br>';

-	if ($url) {

-		$out .= '<div class="urllink"><input type="text" id="directdownloadlink" class="quatrevingtpercent" value="'.$url.'"></div>';

+	if ($url)

+	{

+		$out .= img_picto('', 'globe').' '.$langs->trans("DirectDownloadLink").'<br>';

+		$out .= '<input type="text" id="directdownloadlink" class="quatrevingtpercent" value="'.$url.'">';

@@ -10763,4 +8048 @@
-	} else {

-		$out .= '<div class="urllink">'.$langs->trans("FileNotShared").'</div>';

-	}

-

+	}

@@ -10776 +8058 @@
- * @return  string                  New file name (full or relative path, including the thumbs/). May be the original path if no thumb can exists.

+ * @return  string                  New file name (full or relative path, including the thumbs/)

@@ -10781,3 +8063 @@
-	if ($dirName == '.') {

-		$dirName = '';

-	}

+	if ($dirName == '.') $dirName = '';

@@ -10788,22 +8068,8 @@
-	if (empty($extImgTarget)) {

-		$extImgTarget = (preg_match('/\.jpg$/i', $file) ? '.jpg' : '');

-	}

-	if (empty($extImgTarget)) {

-		$extImgTarget = (preg_match('/\.jpeg$/i', $file) ? '.jpeg' : '');

-	}

-	if (empty($extImgTarget)) {

-		$extImgTarget = (preg_match('/\.gif$/i', $file) ? '.gif' : '');

-	}

-	if (empty($extImgTarget)) {

-		$extImgTarget = (preg_match('/\.png$/i', $file) ? '.png' : '');

-	}

-	if (empty($extImgTarget)) {

-		$extImgTarget = (preg_match('/\.bmp$/i', $file) ? '.bmp' : '');

-	}

-	if (empty($extImgTarget)) {

-		$extImgTarget = (preg_match('/\.webp$/i', $file) ? '.webp' : '');

-	}

-

-	if (!$extImgTarget) {

-		return $file;

-	}

+	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.jpg$/i', $file) ? '.jpg' : '');

+	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.jpeg$/i', $file) ? '.jpeg' : '');

+	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.gif$/i', $file) ? '.gif' : '');

+	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.png$/i', $file) ? '.png' : '');

+	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.bmp$/i', $file) ? '.bmp' : '');

+	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.webp$/i', $file) ? '.webp' : '');

+

+	if (!$extImgTarget) return $file;

@@ -10812,3 +8078 @@
-	if ($extName) {

-		$subdir = 'thumbs/';

-	}

+	if ($extName) $subdir = 'thumbs/';

@@ -10833,27 +8097,16 @@
-	if (empty($conf->use_javascript_ajax)) {

-		return '';

-	}

-

-	$isAllowedForPreview = dolIsAllowedForPreview($relativepath);

-

-	if ($alldata == 1) {

-		if ($isAllowedForPreview) {

-			return array('target'=>'_blank', 'css'=>'documentpreview', 'url'=>DOL_URL_ROOT.'/document.php?modulepart='.urlencode($modulepart).'&attachment=0&file='.urlencode($relativepath).($param ? '&'.$param : ''), 'mime'=>dol_mimetype($relativepath));

-		} else {

-			return array();

-		}

-	}

-

-	// old behavior, return a string

-	if ($isAllowedForPreview) {

-		$tmpurl = DOL_URL_ROOT.'/document.php?modulepart='.urlencode($modulepart).'&attachment=0&file='.urlencode($relativepath).($param ? '&'.$param : '');

-		$title = $langs->trans("Preview");

-		//$title = '%27-alert(document.domain)-%27';

-		//$tmpurl = 'file='.urlencode("'-alert(document.domain)-'_small.jpg");

-

-		// We need to urlencode the parameter after the dol_escape_js($tmpurl) because  $tmpurl may contain n url with param file=abc%27def if file has a ' inside.

-		// and when we click on href with this javascript string, a urlcode is done by browser, converted the %27 of file param

-		return 'javascript:document_preview(\''.urlencode(dol_escape_js($tmpurl)).'\', \''.urlencode(dol_mimetype($relativepath)).'\', \''.urlencode(dol_escape_js($title)).'\')';

-	} else {

-		return '';

-	}

+	if (empty($conf->use_javascript_ajax)) return '';

+

+	$mime_preview = array('bmp', 'jpeg', 'png', 'gif', 'tiff', 'pdf', 'plain', 'css', 'svg+xml', 'webp');

+	//$mime_preview[]='vnd.oasis.opendocument.presentation';

+	//$mime_preview[]='archive';

+	$num_mime = array_search(dol_mimetype($relativepath, '', 1), $mime_preview);

+

+	if ($alldata == 1)

+	{

+		if ($num_mime !== false) return array('target'=>'_blank', 'css'=>'documentpreview', 'url'=>DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&attachment=0&file='.urlencode($relativepath).($param ? '&'.$param : ''), 'mime'=>dol_mimetype($relativepath),);

+		else return array();

+	}

+

+	// old behavior

+	if ($num_mime !== false) return 'javascript:document_preview(\''.dol_escape_js(DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&attachment=0&file='.urlencode($relativepath).($param ? '&'.$param : '')).'\', \''.dol_mimetype($relativepath).'\', \''.dol_escape_js($langs->trans('Preview')).'\')';

+	else return '';

@@ -10866,3 +8119,2 @@
- * @param string	$htmlname		Id of html object ('#idvalue' or '.classvalue')

- * @param string	$addlink		Add a 'link to' after

- * @param string	$textonlink		Text to show on link or 'image'

+ * @param string	$htmlname	Id of html object ('#idvalue' or '.classvalue')

+ * @param string	$addlink	Add a 'link to' after

@@ -10871 +8123 @@
-function ajax_autoselect($htmlname, $addlink = '', $textonlink = 'Link')

+function ajax_autoselect($htmlname, $addlink = '')

@@ -10874 +8126 @@
-	$out = '<script nonce="'.getNonce().'">

+	$out = '<script>

@@ -10879,7 +8131 @@
-	if ($addlink) {

-		if ($textonlink === 'image') {

-			$out .= ' <a href="'.$addlink.'" target="_blank" rel="noopener noreferrer">'.img_picto('', 'globe').'</a>';

-		} else {

-			$out .= ' <a href="'.$addlink.'" target="_blank" rel="noopener noreferrer">'.$langs->trans("Link").'</a>';

-		}

-	}

+	if ($addlink) $out .= ' <a href="'.$addlink.'" target="_blank">'.$langs->trans("Link").'</a>';

@@ -10889,35 +8135,3 @@
-/**

- *	Return if a file is qualified for preview

- *

- *	@param	string	$file		Filename we looking for information

- *	@return int					1 If allowed, 0 otherwise

- *  @see    dol_mimetype(), image_format_supported() from images.lib.php

- */

-function dolIsAllowedForPreview($file)

-{

-	global $conf;

-

-	// Check .noexe extension in filename

-	if (preg_match('/\.noexe$/i', $file)) {

-		return 0;

-	}

-

-	// Check mime types

-	$mime_preview = array('bmp', 'jpeg', 'png', 'gif', 'tiff', 'pdf', 'plain', 'css', 'webp');

-	if (getDolGlobalString('MAIN_ALLOW_SVG_FILES_AS_IMAGES')) {

-		$mime_preview[] = 'svg+xml';

-	}

-	//$mime_preview[]='vnd.oasis.opendocument.presentation';

-	//$mime_preview[]='archive';

-	$num_mime = array_search(dol_mimetype($file, '', 1), $mime_preview);

-	if ($num_mime !== false) {

-		return 1;

-	}

-

-	// By default, not allowed for preview

-	return 0;

-}

-

-

-/**

- *	Return MIME type of a file from its name with extension.

+

+/**

+ *	Return mime type of a file

@@ -10929 +8143 @@
- *  @see    dolIsAllowedForPreview(), image_format_supported() from images.lib.php

+ *  @see    image_format_supported() from images.lib.php

@@ -10941,292 +8155,96 @@
-	if (preg_match('/\.txt$/i', $tmpfile)) {

-		$mime = 'text/plain';

-		$imgmime = 'text.png';

-		$famime = 'file-alt';

-	} elseif (preg_match('/\.rtx$/i', $tmpfile)) {

-		$mime = 'text/richtext';

-		$imgmime = 'text.png';

-		$famime = 'file-alt';

-	} elseif (preg_match('/\.csv$/i', $tmpfile)) {

-		$mime = 'text/csv';

-		$imgmime = 'text.png';

-		$famime = 'file-csv';

-	} elseif (preg_match('/\.tsv$/i', $tmpfile)) {

-		$mime = 'text/tab-separated-values';

-		$imgmime = 'text.png';

-		$famime = 'file-alt';

-	} elseif (preg_match('/\.(cf|conf|log)$/i', $tmpfile)) {

-		$mime = 'text/plain';

-		$imgmime = 'text.png';

-		$famime = 'file-alt';

-	} elseif (preg_match('/\.ini$/i', $tmpfile)) {

-		$mime = 'text/plain';

-		$imgmime = 'text.png';

-		$srclang = 'ini';

-		$famime = 'file-alt';

-	} elseif (preg_match('/\.md$/i', $tmpfile)) {

-		$mime = 'text/plain';

-		$imgmime = 'text.png';

-		$srclang = 'md';

-		$famime = 'file-alt';

-	} elseif (preg_match('/\.css$/i', $tmpfile)) {

-		$mime = 'text/css';

-		$imgmime = 'css.png';

-		$srclang = 'css';

-		$famime = 'file-alt';

-	} elseif (preg_match('/\.lang$/i', $tmpfile)) {

-		$mime = 'text/plain';

-		$imgmime = 'text.png';

-		$srclang = 'lang';

-		$famime = 'file-alt';

-	} elseif (preg_match('/\.(crt|cer|key|pub)$/i', $tmpfile)) {	// Certificate files

-		$mime = 'text/plain';

-		$imgmime = 'text.png';

-		$famime = 'file-alt';

-	} elseif (preg_match('/\.(html|htm|shtml)$/i', $tmpfile)) {		// XML based (HTML/XML/XAML)

-		$mime = 'text/html';

-		$imgmime = 'html.png';

-		$srclang = 'html';

-		$famime = 'file-alt';

-	} elseif (preg_match('/\.(xml|xhtml)$/i', $tmpfile)) {

-		$mime = 'text/xml';

-		$imgmime = 'other.png';

-		$srclang = 'xml';

-		$famime = 'file-alt';

-	} elseif (preg_match('/\.xaml$/i', $tmpfile)) {

-		$mime = 'text/xml';

-		$imgmime = 'other.png';

-		$srclang = 'xaml';

-		$famime = 'file-alt';

-	} elseif (preg_match('/\.bas$/i', $tmpfile)) {					// Languages

-		$mime = 'text/plain';

-		$imgmime = 'text.png';

-		$srclang = 'bas';

-		$famime = 'file-code';

-	} elseif (preg_match('/\.(c)$/i', $tmpfile)) {

-		$mime = 'text/plain';

-		$imgmime = 'text.png';

-		$srclang = 'c';

-		$famime = 'file-code';

-	} elseif (preg_match('/\.(cpp)$/i', $tmpfile)) {

-		$mime = 'text/plain';

-		$imgmime = 'text.png';

-		$srclang = 'cpp';

-		$famime = 'file-code';

-	} elseif (preg_match('/\.cs$/i', $tmpfile)) {

-		$mime = 'text/plain';

-		$imgmime = 'text.png';

-		$srclang = 'cs';

-		$famime = 'file-code';

-	} elseif (preg_match('/\.(h)$/i', $tmpfile)) {

-		$mime = 'text/plain';

-		$imgmime = 'text.png';

-		$srclang = 'h';

-		$famime = 'file-code';

-	} elseif (preg_match('/\.(java|jsp)$/i', $tmpfile)) {

-		$mime = 'text/plain';

-		$imgmime = 'text.png';

-		$srclang = 'java';

-		$famime = 'file-code';

-	} elseif (preg_match('/\.php([0-9]{1})?$/i', $tmpfile)) {

-		$mime = 'text/plain';

-		$imgmime = 'php.png';

-		$srclang = 'php';

-		$famime = 'file-code';

-	} elseif (preg_match('/\.phtml$/i', $tmpfile)) {

-		$mime = 'text/plain';

-		$imgmime = 'php.png';

-		$srclang = 'php';

-		$famime = 'file-code';

-	} elseif (preg_match('/\.(pl|pm)$/i', $tmpfile)) {

-		$mime = 'text/plain';

-		$imgmime = 'pl.png';

-		$srclang = 'perl';

-		$famime = 'file-code';

-	} elseif (preg_match('/\.sql$/i', $tmpfile)) {

-		$mime = 'text/plain';

-		$imgmime = 'text.png';

-		$srclang = 'sql';

-		$famime = 'file-code';

-	} elseif (preg_match('/\.js$/i', $tmpfile)) {

-		$mime = 'text/x-javascript';

-		$imgmime = 'jscript.png';

-		$srclang = 'js';

-		$famime = 'file-code';

-	} elseif (preg_match('/\.odp$/i', $tmpfile)) {					// Open office

-		$mime = 'application/vnd.oasis.opendocument.presentation';

-		$imgmime = 'ooffice.png';

-		$famime = 'file-powerpoint';

-	} elseif (preg_match('/\.ods$/i', $tmpfile)) {

-		$mime = 'application/vnd.oasis.opendocument.spreadsheet';

-		$imgmime = 'ooffice.png';

-		$famime = 'file-excel';

-	} elseif (preg_match('/\.odt$/i', $tmpfile)) {

-		$mime = 'application/vnd.oasis.opendocument.text';

-		$imgmime = 'ooffice.png';

-		$famime = 'file-word';

-	} elseif (preg_match('/\.mdb$/i', $tmpfile)) {					// MS Office

-		$mime = 'application/msaccess';

-		$imgmime = 'mdb.png';

-		$famime = 'file';

-	} elseif (preg_match('/\.doc[xm]?$/i', $tmpfile)) {

-		$mime = 'application/msword';

-		$imgmime = 'doc.png';

-		$famime = 'file-word';

-	} elseif (preg_match('/\.dot[xm]?$/i', $tmpfile)) {

-		$mime = 'application/msword';

-		$imgmime = 'doc.png';

-		$famime = 'file-word';

-	} elseif (preg_match('/\.xlt(x)?$/i', $tmpfile)) {

-		$mime = 'application/vnd.ms-excel';

-		$imgmime = 'xls.png';

-		$famime = 'file-excel';

-	} elseif (preg_match('/\.xla(m)?$/i', $tmpfile)) {

-		$mime = 'application/vnd.ms-excel';

-		$imgmime = 'xls.png';

-		$famime = 'file-excel';

-	} elseif (preg_match('/\.xls$/i', $tmpfile)) {

-		$mime = 'application/vnd.ms-excel';

-		$imgmime = 'xls.png';

-		$famime = 'file-excel';

-	} elseif (preg_match('/\.xls[bmx]$/i', $tmpfile)) {

-		$mime = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';

-		$imgmime = 'xls.png';

-		$famime = 'file-excel';

-	} elseif (preg_match('/\.pps[mx]?$/i', $tmpfile)) {

-		$mime = 'application/vnd.ms-powerpoint';

-		$imgmime = 'ppt.png';

-		$famime = 'file-powerpoint';

-	} elseif (preg_match('/\.ppt[mx]?$/i', $tmpfile)) {

-		$mime = 'application/x-mspowerpoint';

-		$imgmime = 'ppt.png';

-		$famime = 'file-powerpoint';

-	} elseif (preg_match('/\.pdf$/i', $tmpfile)) {					// Other

-		$mime = 'application/pdf';

-		$imgmime = 'pdf.png';

-		$famime = 'file-pdf';

-	} elseif (preg_match('/\.bat$/i', $tmpfile)) {					// Scripts

-		$mime = 'text/x-bat';

-		$imgmime = 'script.png';

-		$srclang = 'dos';

-		$famime = 'file-code';

-	} elseif (preg_match('/\.sh$/i', $tmpfile)) {

-		$mime = 'text/x-sh';

-		$imgmime = 'script.png';

-		$srclang = 'bash';

-		$famime = 'file-code';

-	} elseif (preg_match('/\.ksh$/i', $tmpfile)) {

-		$mime = 'text/x-ksh';

-		$imgmime = 'script.png';

-		$srclang = 'bash';

-		$famime = 'file-code';

-	} elseif (preg_match('/\.bash$/i', $tmpfile)) {

-		$mime = 'text/x-bash';

-		$imgmime = 'script.png';

-		$srclang = 'bash';

-		$famime = 'file-code';

-	} elseif (preg_match('/\.ico$/i', $tmpfile)) {					// Images

-		$mime = 'image/x-icon';

-		$imgmime = 'image.png';

-		$famime = 'file-image';

-	} elseif (preg_match('/\.(jpg|jpeg)$/i', $tmpfile)) {

-		$mime = 'image/jpeg';

-		$imgmime = 'image.png';

-		$famime = 'file-image';

-	} elseif (preg_match('/\.png$/i', $tmpfile)) {

-		$mime = 'image/png';

-		$imgmime = 'image.png';

-		$famime = 'file-image';

-	} elseif (preg_match('/\.gif$/i', $tmpfile)) {

-		$mime = 'image/gif';

-		$imgmime = 'image.png';

-		$famime = 'file-image';

-	} elseif (preg_match('/\.bmp$/i', $tmpfile)) {

-		$mime = 'image/bmp';

-		$imgmime = 'image.png';

-		$famime = 'file-image';

-	} elseif (preg_match('/\.(tif|tiff)$/i', $tmpfile)) {

-		$mime = 'image/tiff';

-		$imgmime = 'image.png';

-		$famime = 'file-image';

-	} elseif (preg_match('/\.svg$/i', $tmpfile)) {

-		$mime = 'image/svg+xml';

-		$imgmime = 'image.png';

-		$famime = 'file-image';

-	} elseif (preg_match('/\.webp$/i', $tmpfile)) {

-		$mime = 'image/webp';

-		$imgmime = 'image.png';

-		$famime = 'file-image';

-	} elseif (preg_match('/\.vcs$/i', $tmpfile)) {					// Calendar

-		$mime = 'text/calendar';

-		$imgmime = 'other.png';

-		$famime = 'file-alt';

-	} elseif (preg_match('/\.ics$/i', $tmpfile)) {

-		$mime = 'text/calendar';

-		$imgmime = 'other.png';

-		$famime = 'file-alt';

-	} elseif (preg_match('/\.torrent$/i', $tmpfile)) {				// Other

-		$mime = 'application/x-bittorrent';

-		$imgmime = 'other.png';

-		$famime = 'file-o';

-	} elseif (preg_match('/\.(mp3|ogg|au|wav|wma|mid)$/i', $tmpfile)) {	// Audio

-		$mime = 'audio';

-		$imgmime = 'audio.png';

-		$famime = 'file-audio';

-	} elseif (preg_match('/\.mp4$/i', $tmpfile)) {					// Video

-		$mime = 'video/mp4';

-		$imgmime = 'video.png';

-		$famime = 'file-video';

-	} elseif (preg_match('/\.ogv$/i', $tmpfile)) {

-		$mime = 'video/ogg';

-		$imgmime = 'video.png';

-		$famime = 'file-video';

-	} elseif (preg_match('/\.webm$/i', $tmpfile)) {

-		$mime = 'video/webm';

-		$imgmime = 'video.png';

-		$famime = 'file-video';

-	} elseif (preg_match('/\.avi$/i', $tmpfile)) {

-		$mime = 'video/x-msvideo';

-		$imgmime = 'video.png';

-		$famime = 'file-video';

-	} elseif (preg_match('/\.divx$/i', $tmpfile)) {

-		$mime = 'video/divx';

-		$imgmime = 'video.png';

-		$famime = 'file-video';

-	} elseif (preg_match('/\.xvid$/i', $tmpfile)) {

-		$mime = 'video/xvid';

-		$imgmime = 'video.png';

-		$famime = 'file-video';

-	} elseif (preg_match('/\.(wmv|mpg|mpeg)$/i', $tmpfile)) {

-		$mime = 'video';

-		$imgmime = 'video.png';

-		$famime = 'file-video';

-	} elseif (preg_match('/\.(zip|rar|gz|tgz|z|cab|bz2|7z|tar|lzh|zst)$/i', $tmpfile)) {	// Archive

-		// application/xxx where zzz is zip, ...

-		$mime = 'archive';

-		$imgmime = 'archive.png';

-		$famime = 'file-archive';

-	} elseif (preg_match('/\.(exe|com)$/i', $tmpfile)) {					// Exe

-		$mime = 'application/octet-stream';

-		$imgmime = 'other.png';

-		$famime = 'file-o';

-	} elseif (preg_match('/\.(dll|lib|o|so|a)$/i', $tmpfile)) {				// Lib

-		$mime = 'library';

-		$imgmime = 'library.png';

-		$famime = 'file-o';

-	} elseif (preg_match('/\.err$/i', $tmpfile)) {							 // phpcs:ignore

-		$mime = 'error';

-		$imgmime = 'error.png';

-		$famime = 'file-alt';

-	}

-

-	// Return mimetype string

-	switch ((int) $mode) {

-		case 1:

-			$tmp = explode('/', $mime);

-			return (!empty($tmp[1]) ? $tmp[1] : $tmp[0]);

-		case 2:

-			return $imgmime;

-		case 3:

-			return $srclang;

-		case 4:

-			return $famime;

+	if (preg_match('/\.txt$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $famime = 'file-text-o'; }

+	if (preg_match('/\.rtx$/i', $tmpfile)) { $mime = 'text/richtext'; $imgmime = 'text.png'; $famime = 'file-text-o'; }

+	if (preg_match('/\.csv$/i', $tmpfile)) { $mime = 'text/csv'; $imgmime = 'text.png'; $famime = 'file-text-o'; }

+	if (preg_match('/\.tsv$/i', $tmpfile)) { $mime = 'text/tab-separated-values'; $imgmime = 'text.png'; $famime = 'file-text-o'; }

+	if (preg_match('/\.(cf|conf|log)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $famime = 'file-text-o'; }

+	if (preg_match('/\.ini$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'ini'; $famime = 'file-text-o'; }

+    if (preg_match('/\.md$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'md'; $famime = 'file-text-o'; }

+	if (preg_match('/\.css$/i', $tmpfile)) { $mime = 'text/css'; $imgmime = 'css.png'; $srclang = 'css'; $famime = 'file-text-o'; }

+	// Certificate files

+	if (preg_match('/\.(crt|cer|key|pub)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $famime = 'file-text-o'; }

+	// XML based (HTML/XML/XAML)

+	if (preg_match('/\.(html|htm|shtml)$/i', $tmpfile)) { $mime = 'text/html'; $imgmime = 'html.png'; $srclang = 'html'; $famime = 'file-text-o'; }

+	if (preg_match('/\.(xml|xhtml)$/i', $tmpfile)) { $mime = 'text/xml'; $imgmime = 'other.png'; $srclang = 'xml'; $famime = 'file-text-o'; }

+    if (preg_match('/\.xaml$/i', $tmpfile)) { $mime = 'text/xml'; $imgmime = 'other.png'; $srclang = 'xaml'; $famime = 'file-text-o'; }

+	// Languages

+	if (preg_match('/\.bas$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'bas'; $famime = 'file-code-o'; }

+	if (preg_match('/\.(c)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'c'; $famime = 'file-code-o'; }

+	if (preg_match('/\.(cpp)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'cpp'; $famime = 'file-code-o'; }

+    if (preg_match('/\.cs$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'cs'; $famime = 'file-code-o'; }

+	if (preg_match('/\.(h)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'h'; $famime = 'file-code-o'; }

+	if (preg_match('/\.(java|jsp)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'java'; $famime = 'file-code-o'; }

+	if (preg_match('/\.php([0-9]{1})?$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'php.png'; $srclang = 'php'; $famime = 'file-code-o'; }

+	if (preg_match('/\.phtml$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'php.png'; $srclang = 'php'; $famime = 'file-code-o'; }

+	if (preg_match('/\.(pl|pm)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'pl.png'; $srclang = 'perl'; $famime = 'file-code-o'; }

+	if (preg_match('/\.sql$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'sql'; $famime = 'file-code-o'; }

+	if (preg_match('/\.js$/i', $tmpfile)) { $mime = 'text/x-javascript'; $imgmime = 'jscript.png'; $srclang = 'js'; $famime = 'file-code-o'; }

+	// Open office

+	if (preg_match('/\.odp$/i', $tmpfile)) { $mime = 'application/vnd.oasis.opendocument.presentation'; $imgmime = 'ooffice.png'; $famime = 'file-powerpoint-o'; }

+	if (preg_match('/\.ods$/i', $tmpfile)) { $mime = 'application/vnd.oasis.opendocument.spreadsheet'; $imgmime = 'ooffice.png'; $famime = 'file-excel-o'; }

+	if (preg_match('/\.odt$/i', $tmpfile)) { $mime = 'application/vnd.oasis.opendocument.text'; $imgmime = 'ooffice.png'; $famime = 'file-word-o'; }

+	// MS Office

+	if (preg_match('/\.mdb$/i', $tmpfile)) { $mime = 'application/msaccess'; $imgmime = 'mdb.png'; $famime = 'file-o'; }

+	if (preg_match('/\.doc(x|m)?$/i', $tmpfile)) { $mime = 'application/msword'; $imgmime = 'doc.png'; $famime = 'file-word-o'; }

+	if (preg_match('/\.dot(x|m)?$/i', $tmpfile)) { $mime = 'application/msword'; $imgmime = 'doc.png'; $famime = 'file-word-o'; }

+	if (preg_match('/\.xlt(x)?$/i', $tmpfile)) { $mime = 'application/vnd.ms-excel'; $imgmime = 'xls.png'; $famime = 'file-excel-o'; }

+	if (preg_match('/\.xla(m)?$/i', $tmpfile)) { $mime = 'application/vnd.ms-excel'; $imgmime = 'xls.png'; $famime = 'file-excel-o'; }

+	if (preg_match('/\.xls$/i', $tmpfile)) { $mime = 'application/vnd.ms-excel'; $imgmime = 'xls.png'; $famime = 'file-excel-o'; }

+	if (preg_match('/\.xls(b|m|x)$/i', $tmpfile)) { $mime = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'; $imgmime = 'xls.png'; $famime = 'file-excel-o'; }

+	if (preg_match('/\.pps(m|x)?$/i', $tmpfile)) { $mime = 'application/vnd.ms-powerpoint'; $imgmime = 'ppt.png'; $famime = 'file-powerpoint-o'; }

+	if (preg_match('/\.ppt(m|x)?$/i', $tmpfile)) { $mime = 'application/x-mspowerpoint'; $imgmime = 'ppt.png'; $famime = 'file-powerpoint-o'; }

+	// Other

+	if (preg_match('/\.pdf$/i', $tmpfile)) { $mime = 'application/pdf'; $imgmime = 'pdf.png'; $famime = 'file-pdf-o'; }

+	// Scripts

+	if (preg_match('/\.bat$/i', $tmpfile)) { $mime = 'text/x-bat'; $imgmime = 'script.png'; $srclang = 'dos'; $famime = 'file-code-o'; }

+	if (preg_match('/\.sh$/i', $tmpfile)) { $mime = 'text/x-sh'; $imgmime = 'script.png'; $srclang = 'bash'; $famime = 'file-code-o'; }

+	if (preg_match('/\.ksh$/i', $tmpfile)) { $mime = 'text/x-ksh'; $imgmime = 'script.png'; $srclang = 'bash'; $famime = 'file-code-o'; }

+	if (preg_match('/\.bash$/i', $tmpfile)) { $mime = 'text/x-bash'; $imgmime = 'script.png'; $srclang = 'bash'; $famime = 'file-code-o'; }

+	// Images

+	if (preg_match('/\.ico$/i', $tmpfile)) { $mime = 'image/x-icon'; $imgmime = 'image.png'; $famime = 'file-image-o'; }

+	if (preg_match('/\.(jpg|jpeg)$/i', $tmpfile)) { $mime = 'image/jpeg'; $imgmime = 'image.png'; $famime = 'file-image-o'; }

+	if (preg_match('/\.png$/i', $tmpfile)) { $mime = 'image/png'; $imgmime = 'image.png'; $famime = 'file-image-o'; }

+	if (preg_match('/\.gif$/i', $tmpfile)) { $mime = 'image/gif'; $imgmime = 'image.png'; $famime = 'file-image-o'; }

+	if (preg_match('/\.bmp$/i', $tmpfile)) { $mime = 'image/bmp'; $imgmime = 'image.png'; $famime = 'file-image-o'; }

+	if (preg_match('/\.(tif|tiff)$/i', $tmpfile)) { $mime = 'image/tiff'; $imgmime = 'image.png'; $famime = 'file-image-o'; }

+	if (preg_match('/\.svg$/i', $tmpfile)) { $mime = 'image/svg+xml'; $imgmime = 'image.png'; $famime = 'file-image-o'; }

+	if (preg_match('/\.webp$/i', $tmpfile)) { $mime = 'image/webp'; $imgmime = 'image.png'; $famime = 'file-image-o'; }

+	// Calendar

+	if (preg_match('/\.vcs$/i', $tmpfile)) { $mime = 'text/calendar'; $imgmime = 'other.png'; $famime = 'file-text-o'; }

+	if (preg_match('/\.ics$/i', $tmpfile)) { $mime = 'text/calendar'; $imgmime = 'other.png'; $famime = 'file-text-o'; }

+	// Other

+	if (preg_match('/\.torrent$/i', $tmpfile)) { $mime = 'application/x-bittorrent'; $imgmime = 'other.png'; $famime = 'file-o'; }

+	// Audio

+	if (preg_match('/\.(mp3|ogg|au|wav|wma|mid)$/i', $tmpfile)) { $mime = 'audio'; $imgmime = 'audio.png'; $famime = 'file-audio-o'; }

+	// Video

+	if (preg_match('/\.ogv$/i', $tmpfile)) { $mime = 'video/ogg'; $imgmime = 'video.png'; $famime = 'file-video-o'; }

+	if (preg_match('/\.webm$/i', $tmpfile)) { $mime = 'video/webm'; $imgmime = 'video.png'; $famime = 'file-video-o'; }

+	if (preg_match('/\.avi$/i', $tmpfile)) { $mime = 'video/x-msvideo'; $imgmime = 'video.png'; $famime = 'file-video-o'; }

+	if (preg_match('/\.divx$/i', $tmpfile)) { $mime = 'video/divx'; $imgmime = 'video.png'; $famime = 'file-video-o'; }

+	if (preg_match('/\.xvid$/i', $tmpfile)) { $mime = 'video/xvid'; $imgmime = 'video.png'; $famime = 'file-video-o'; }

+	if (preg_match('/\.(wmv|mpg|mpeg)$/i', $tmpfile)) { $mime = 'video'; $imgmime = 'video.png'; $famime = 'file-video-o'; }

+	// Archive

+	if (preg_match('/\.(zip|rar|gz|tgz|z|cab|bz2|7z|tar|lzh)$/i', $tmpfile)) { $mime = 'archive'; $imgmime = 'archive.png'; $famime = 'file-archive-o'; }    // application/xxx where zzz is zip, ...

+	// Exe

+	if (preg_match('/\.(exe|com)$/i', $tmpfile)) { $mime = 'application/octet-stream'; $imgmime = 'other.png'; $famime = 'file-o'; }

+	// Lib

+	if (preg_match('/\.(dll|lib|o|so|a)$/i', $tmpfile)) { $mime = 'library'; $imgmime = 'library.png'; $famime = 'file-o'; }

+	// Err

+	if (preg_match('/\.err$/i', $tmpfile)) { $mime = 'error'; $imgmime = 'error.png'; $famime = 'file-text-o'; }

+

+	// Return string

+	if ($mode == 1)

+	{

+		$tmp = explode('/', $mime);

+		return (!empty($tmp[1]) ? $tmp[1] : $tmp[0]);

+	}

+	if ($mode == 2)

+	{

+		return $imgmime;

+	}

+	if ($mode == 3)

+	{

+		return $srclang;

+	}

+	if ($mode == 4)

+	{

+		return $famime;

@@ -11238,25 +8256,18 @@
- * Return the value of a filed into a dictionary for the record $id.

- * This also set all the values into a cache for a next search.

- *

- * @param string	$tablename		Name of table dictionary (without the MAIN_DB_PREFIX, example: 'c_holiday_types')

- * @param string	$field			The name of field where to find the value to return

- * @param int		$id				Id of line record

- * @param bool		$checkentity	Add filter on entity

- * @param string	$rowidfield		Name of the column rowid (to use for the filter on $id)

- * @return string					The value of field $field. This also set $dictvalues cache.

- */

-function getDictionaryValue($tablename, $field, $id, $checkentity = false, $rowidfield = 'rowid')

-{

-	global $conf, $db;

-

-	$tablename = preg_replace('/^'.preg_quote(MAIN_DB_PREFIX, '/').'/', '', $tablename);	// Clean name of table for backward compatibility.

-

-	$dictvalues = (isset($conf->cache['dictvalues_'.$tablename]) ? $conf->cache['dictvalues_'.$tablename] : null);

-

-	if (is_null($dictvalues)) {

-		$dictvalues = array();

-

-		$sql = "SELECT * FROM ".MAIN_DB_PREFIX.$tablename." WHERE 1 = 1"; // Here select * is allowed as it is generic code and we don't have list of fields

-		if ($checkentity) {

-			$sql .= ' AND entity IN (0,'.getEntity($tablename).')';

-		}

+ * Return value from dictionary

+ *

+ * @param string	$tablename		name of dictionary

+ * @param string	$field			the value to return

+ * @param int		$id				id of line

+ * @param bool		$checkentity	add filter on entity

+ * @param string	$rowidfield		name of the column rowid

+ * @return string

+ */

+function getDictvalue($tablename, $field, $id, $checkentity = false, $rowidfield = 'rowid')

+{

+	global $dictvalues, $db, $langs;

+

+	if (!isset($dictvalues[$tablename]))

+	{

+		$dictvalues[$tablename] = array();

+		$sql = 'SELECT * FROM '.$tablename.' WHERE 1'; // Here select * is allowed as it is generic code and we don't have list of fields

+		if ($checkentity) $sql .= ' AND entity IN (0,'.getEntity($tablename).')';

@@ -11265,5 +8276,9 @@
-		if ($resql) {

-			while ($obj = $db->fetch_object($resql)) {

-				$dictvalues[$obj->$rowidfield] = $obj;	// $obj is stdClass

-			}

-		} else {

+		if ($resql)

+		{

+			while ($obj = $db->fetch_object($resql))

+			{

+				$dictvalues[$tablename][$obj->{$rowidfield}] = $obj;

+			}

+		}

+		else

+		{

@@ -11272,10 +8287,6 @@
-

-		$conf->cache['dictvalues_'.$tablename] = $dictvalues;

-	}

-

-	if (!empty($dictvalues[$id])) {

-		// Found

-		$tmp = $dictvalues[$id];

-		return (property_exists($tmp, $field) ? $tmp->$field : '');

-	} else {

-		// Not found

+	}

+

+	if (!empty($dictvalues[$tablename][$id])) return $dictvalues[$tablename][$id]->{$field}; // Found

+	else // Not found

+	{

+		if ($id > 0) return $id;

@@ -11294 +8305 @@
-	$stringcolor = str_replace('#', '', $stringcolor);

+    $stringcolor = str_replace('#', '', $stringcolor);

@@ -11296 +8307,2 @@
-	if (!empty($stringcolor)) {

+	if (!empty($stringcolor))

+	{

@@ -11299 +8311,2 @@
-		if (count($tmp) > 1) {   // This is a comma RGB ('255','255','255')

+		if (count($tmp) > 1)   // This is a comma RGB ('255','255','255')

+		{

@@ -11303 +8316,3 @@
-		} else {

+		}

+		else

+		{

@@ -11312,3 +8327 @@
-		if ($bright > 0.6) {

-			$res = 1;

-		}

+		if ($bright > 0.6) $res = 1;

@@ -11333,4 +8346,3 @@
-	if (empty($menuentry['enabled'])) {

-		return 0; // Entry disabled by condition

-	}

-	if ($type_user && $menuentry['module']) {

+	if (empty($menuentry['enabled'])) return 0; // Entry disabled by condition

+	if ($type_user && $menuentry['module'])

+	{

@@ -11339 +8351,2 @@
-		foreach ($tmploops as $tmploop) {

+		foreach ($tmploops as $tmploop)

+		{

@@ -11341,17 +8354,8 @@
-				$found++;

-				break;

-			}

-		}

-		if (!$found) {

-			return 0; // Entry is for menus all excluded to external users

-		}

-	}

-	if (!$menuentry['perms'] && $type_user) {

-		return 0; // No permissions and user is external

-	}

-	if (!$menuentry['perms'] && getDolGlobalString('MAIN_MENU_HIDE_UNAUTHORIZED')) {

-		return 0; // No permissions and option to hide when not allowed, even for internal user, is on

-	}

-	if (!$menuentry['perms']) {

-		return 2; // No permissions and user is external

-	}

+				$found++; break;

+			}

+		}

+		if (!$found) return 0; // Entry is for menus all excluded to external users

+	}

+	if (!$menuentry['perms'] && $type_user) return 0; // No permissions and user is external

+	if (!$menuentry['perms'] && !empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED))	return 0; // No permissions and option to hide when not allowed, even for internal user, is on

+	if (!$menuentry['perms']) return 2; // No permissions and user is external

@@ -11386,22 +8390,22 @@
-	$attr = array(

-		'class'=>'badge '.(!empty($mode) ? ' badge-'.$mode : '').(!empty($type) ? ' badge-'.$type : '').(empty($params['css']) ? '' : ' '.$params['css'])

-	);

-

-	if (empty($html)) {

-		$html = $label;

-	}

-

-	if (!empty($url)) {

-		$attr['href'] = $url;

-	}

-

-	if ($mode === 'dot') {

-		$attr['class'] .= ' classfortooltip';

-		$attr['title'] = $html;

-		$attr['aria-label'] = $label;

-		$html = '';

-	}

-

-	// Override attr

-	if (!empty($params['attr']) && is_array($params['attr'])) {

-		foreach ($params['attr'] as $key => $value) {

+    $attr = array(

+    	'class'=>'badge '.(!empty($mode) ? ' badge-'.$mode : '').(!empty($type) ? ' badge-'.$type : '').(empty($params['css']) ? '' : ' '.$params['css'])

+    );

+

+    if (empty($html)) {

+        $html = $label;

+    }

+

+    if (!empty($url)) {

+        $attr['href'] = $url;

+    }

+

+    if ($mode === 'dot') {

+        $attr['class'] .= ' classfortooltip';

+        $attr['title'] = $html;

+        $attr['aria-label'] = $label;

+        $html = '';

+    }

+

+    // Override attr

+    if (!empty($params['attr']) && is_array($params['attr'])) {

+        foreach ($params['attr']as $key => $value) {

@@ -11410 +8414,2 @@
-			} elseif ($key == 'classOverride') {

+			}

+			elseif ($key == 'classOverride') {

@@ -11412 +8417,2 @@
-			} else {

+			}

+			else {

@@ -11415,23 +8421,23 @@
-		}

-	}

-

-	// TODO: add hook

-

-	// escape all attribute

-	$attr = array_map('dol_escape_htmltag', $attr);

-

-	$TCompiledAttr = array();

-	foreach ($attr as $key => $value) {

-		$TCompiledAttr[] = $key.'="'.$value.'"';

-	}

-

-	$compiledAttributes = !empty($TCompiledAttr) ? implode(' ', $TCompiledAttr) : '';

-

-	$tag = !empty($url) ? 'a' : 'span';

-

-	return '<'.$tag.' '.$compiledAttributes.'>'.$html.'</'.$tag.'>';

-}

-

-

-/**

- * Output the badge of a status.

+        }

+    }

+

+    // TODO: add hook

+

+    // escape all attribute

+    $attr = array_map('dol_escape_htmltag', $attr);

+

+    $TCompiledAttr = array();

+    foreach ($attr as $key => $value) {

+        $TCompiledAttr[] = $key.'="'.$value.'"';

+    }

+

+    $compiledAttributes = !empty($TCompiledAttr) ?implode(' ', $TCompiledAttr) : '';

+

+    $tag = !empty($url) ? 'a' : 'span';

+

+    return '<'.$tag.' '.$compiledAttributes.'>'.$html.'</'.$tag.'>';

+}

+

+

+/**

+ * Function dolGetStatus

@@ -11445 +8451 @@
- * @param   array   $params            Various params. Example: array('tooltip'=>'no|...', 'badgeParams'=>...)

+ * @param   array   $params            Various params for future : recommended rather than adding more function arguments

@@ -11450,65 +8456,70 @@
-	global $conf;

-

-	$return = '';

-	$dolGetBadgeParams = array();

-

-	if (!empty($params['badgeParams'])) {

-		$dolGetBadgeParams = $params['badgeParams'];

-	}

-

-	// TODO : add a hook

-	if ($displayMode == 0) {

-		$return = !empty($html) ? $html : (empty($conf->dol_optimize_smallscreen) ? $statusLabel : (empty($statusLabelShort) ? $statusLabel : $statusLabelShort));

-	} elseif ($displayMode == 1) {

-		$return = !empty($html) ? $html : (empty($statusLabelShort) ? $statusLabel : $statusLabelShort);

-	} elseif (getDolGlobalString('MAIN_STATUS_USES_IMAGES')) {

-		// Use status with images (for backward compatibility)

-		$return = '';

-		$htmlLabel      = (in_array($displayMode, array(1, 2, 5)) ? '<span class="hideonsmartphone">' : '').(!empty($html) ? $html : $statusLabel).(in_array($displayMode, array(1, 2, 5)) ? '</span>' : '');

-		$htmlLabelShort = (in_array($displayMode, array(1, 2, 5)) ? '<span class="hideonsmartphone">' : '').(!empty($html) ? $html : (!empty($statusLabelShort) ? $statusLabelShort : $statusLabel)).(in_array($displayMode, array(1, 2, 5)) ? '</span>' : '');

-

-		// For small screen, we always use the short label instead of long label.

-		if (!empty($conf->dol_optimize_smallscreen)) {

-			if ($displayMode == 0) {

-				$displayMode = 1;

-			} elseif ($displayMode == 4) {

-				$displayMode = 2;

-			} elseif ($displayMode == 6) {

-				$displayMode = 5;

-			}

-		}

-

-		// For backward compatibility. Image's filename are still in French, so we use this array to convert

-		$statusImg = array(

-			'status0' => 'statut0',

-			'status1' => 'statut1',

-			'status2' => 'statut2',

-			'status3' => 'statut3',

-			'status4' => 'statut4',

-			'status5' => 'statut5',

-			'status6' => 'statut6',

-			'status7' => 'statut7',

-			'status8' => 'statut8',

-			'status9' => 'statut9'

-		);

-

-		if (!empty($statusImg[$statusType])) {

-			$htmlImg = img_picto($statusLabel, $statusImg[$statusType]);

-		} else {

-			$htmlImg = img_picto($statusLabel, $statusType);

-		}

-

-		if ($displayMode === 2) {

-			$return = $htmlImg.' '.$htmlLabelShort;

-		} elseif ($displayMode === 3) {

-			$return = $htmlImg;

-		} elseif ($displayMode === 4) {

-			$return = $htmlImg.' '.$htmlLabel;

-		} elseif ($displayMode === 5) {

-			$return = $htmlLabelShort.' '.$htmlImg;

-		} else { // $displayMode >= 6

-			$return = $htmlLabel.' '.$htmlImg;

-		}

-	} elseif (!getDolGlobalString('MAIN_STATUS_USES_IMAGES') && !empty($displayMode)) {

-		// Use new badge

-		$statusLabelShort = (empty($statusLabelShort) ? $statusLabel : $statusLabelShort);

+    global $conf;

+

+    $return = '';

+    $dolGetBadgeParams = array();

+

+    if (!empty($params['badgeParams'])) {

+        $dolGetBadgeParams = $params['badgeParams'];

+    }

+

+    // TODO : add a hook

+

+    if ($displayMode == 0) {

+        $return = !empty($html) ? $html : $statusLabel;

+    }

+    elseif ($displayMode == 1) {

+        $return = !empty($html) ? $html : (!empty($statusLabelShort) ? $statusLabelShort : $statusLabel);

+    }

+    // Use status with images (for backward compatibility)

+    elseif (!empty($conf->global->MAIN_STATUS_USES_IMAGES)) {

+        $return = '';

+        $htmlLabel      = (in_array($displayMode, array(1, 2, 5)) ? '<span class="hideonsmartphone">' : '').(!empty($html) ? $html : $statusLabel).(in_array($displayMode, array(1, 2, 5)) ? '</span>' : '');

+        $htmlLabelShort = (in_array($displayMode, array(1, 2, 5)) ? '<span class="hideonsmartphone">' : '').(!empty($html) ? $html : (!empty($statusLabelShort) ? $statusLabelShort : $statusLabel)).(in_array($displayMode, array(1, 2, 5)) ? '</span>' : '');

+

+        // For small screen, we always use the short label instead of long label.

+        if (!empty($conf->dol_optimize_smallscreen))

+        {

+        	if ($displayMode == 0) $displayMode = 1;

+        	elseif ($displayMode == 4) $displayMode = 2;

+        	elseif ($displayMode == 6) $displayMode = 5;

+        }

+

+        // For backward compatibility. Image's filename are still in French, so we use this array to convert

+        $statusImg = array(

+        	'status0' => 'statut0',

+        	'status1' => 'statut1',

+        	'status2' => 'statut2',

+        	'status3' => 'statut3',

+        	'status4' => 'statut4',

+        	'status5' => 'statut5',

+        	'status6' => 'statut6',

+        	'status7' => 'statut7',

+        	'status8' => 'statut8',

+        	'status9' => 'statut9'

+        );

+

+        if (!empty($statusImg[$statusType])) {

+            $htmlImg = img_picto($statusLabel, $statusImg[$statusType]);

+        } else {

+            $htmlImg = img_picto($statusLabel, $statusType);

+        }

+

+        if ($displayMode === 2) {

+            $return = $htmlImg.' '.$htmlLabelShort;

+        }

+        elseif ($displayMode === 3) {

+            $return = $htmlImg;

+        }

+        elseif ($displayMode === 4) {

+            $return = $htmlImg.' '.$htmlLabel;

+        }

+        elseif ($displayMode === 5) {

+            $return = $htmlLabelShort.' '.$htmlImg;

+        }

+        else { // $displayMode >= 6

+            $return = $htmlLabel.' '.$htmlImg;

+        }

+    }

+    // Use new badge

+    elseif (empty($conf->global->MAIN_STATUS_USES_IMAGES) && !empty($displayMode)) {

+        $statusLabelShort = !empty($statusLabelShort) ? $statusLabelShort : $statusLabel;

@@ -11517,12 +8528,14 @@
-		$dolGetBadgeParams['attr']['title'] = empty($params['tooltip']) ? $statusLabel : ($params['tooltip'] != 'no' ? $params['tooltip'] : '');

-

-		if ($displayMode == 3) {

-			$return = dolGetBadge((empty($conf->dol_optimize_smallscreen) ? $statusLabel : (empty($statusLabelShort) ? $statusLabel : $statusLabelShort)), '', $statusType, 'dot', $url, $dolGetBadgeParams);

-		} elseif ($displayMode === 5) {

-			$return = dolGetBadge($statusLabelShort, $html, $statusType, '', $url, $dolGetBadgeParams);

-		} else {

-			$return = dolGetBadge((empty($conf->dol_optimize_smallscreen) ? $statusLabel : (empty($statusLabelShort) ? $statusLabel : $statusLabelShort)), $html, $statusType, '', $url, $dolGetBadgeParams);

-		}

-	}

-

-	return $return;

+		$dolGetBadgeParams['attr']['title'] = $statusLabel;

+

+        if ($displayMode == 3) {

+            $return = dolGetBadge($statusLabel, '', $statusType, 'dot', $url, $dolGetBadgeParams);

+        }

+        elseif ($displayMode === 5) {

+            $return = dolGetBadge($statusLabelShort, $html, $statusType, '', $url, $dolGetBadgeParams);

+        }

+        else {

+            $return = dolGetBadge($statusLabel, $html, $statusType, '', $url, $dolGetBadgeParams);

+        }

+    }

+

+    return $return;

@@ -11535,223 +8548,70 @@
- * @param string    	$label      	Label or tooltip of button if $text is provided. Also used as tooltip in title attribute. Can be escaped HTML content or full simple text.

- * @param string    	$text       	Optional : short label on button. Can be escaped HTML content or full simple text.

- * @param string 		$actionType 	'default', 'danger', 'email', 'clone', 'cancel', 'delete', ...

- * @param string|array 	$url        	Url for link or array of subbutton description ('label'=>, 'url'=>, 'lang'=>, 'perm'=> )

- * 										Example when an array is used: $arrayforbutaction = array(

- *                                      10 => array('lang'=>'propal', 'enabled'=>isModEnabled("propal"), 'perm'=>$user->hasRight('propal', 'creer'), 'label' => 'AddProp', 'url'=>'/comm/propal/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),

- *                                      20 => array('lang'=>'orders', 'enabled'=>isModEnabled("commande"), 'perm'=>$user->hasRight('commande', 'creer'), 'label' => 'CreateOrder', 'url'=>'/commande/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),

- *                                      30 => array('lang'=>'bills', 'enabled'=>isModEnabled("facture"), 'perm'=>$user->hasRight('facture', 'creer'), 'label' => 'CreateBill', 'url'=>'/compta/facture/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),

- *										);

- * @param string    	$id         	Attribute id of action button. Example 'action-delete'. This can be used for full ajax confirm if this code is reused into the ->formconfirm() method.

- * @param int|boolean	$userRight  	User action right

- * // phpcs:disable

- * @param array 		$params = [ // Various params for future : recommended rather than adding more function arguments

- *                              'attr' => [ // to add or override button attributes

- *                              'xxxxx' => '', // your xxxxx attribute you want

- *                              'class' => 'reposition', // to add more css class to the button class attribute

- *                              'classOverride' => '' // to replace class attribute of the button

- *                              ],

- *                              'confirm' => [

- *                              'url' => 'http://', // Overide Url to go when user click on action btn, if empty default url is $url.?confirm=yes, for no js compatibility use $url for fallback confirm.

- *                              'title' => '', // Overide title of modal,  if empty default title use "ConfirmBtnCommonTitle" lang key

- *                              'action-btn-label' => '', // Overide label of action button,  if empty default label use "Confirm" lang key

- *                              'cancel-btn-label' => '', // Overide label of cancel button,  if empty default label use "CloseDialog" lang key

- *                              'content' => '', // Overide text of content,  if empty default content use "ConfirmBtnCommonContent" lang key

- *                              'modal' => true, // true|false to display dialog as a modal (with dark background)

- *                              'isDropDrown' => false, // true|false to display dialog as a dropdown (with dark background)

- *                              ],

- *                              ]

- * // phpcs:enable

- * @return string               	html button

- */

-function dolGetButtonAction($label, $text = '', $actionType = 'default', $url = '', $id = '', $userRight = 1, $params = array())

-{

-	global $hookmanager, $action, $object, $langs;

-

-	// If $url is an array, we must build a dropdown button

-	if (is_array($url)) {

-		// Loop on $url array to remove entries of disabled modules

-		foreach ($url as $key => $subbutton) {

-			if (isset($subbutton['enabled']) && empty($subbutton['enabled'])) {

-				unset($url[$key]);

-			}

-		}

-

-		$out = '';

-

-		if (count($url) > 1) {

-			$out .= '<div class="dropdown inline-block dropdown-holder">';

-			$out .= '<a style="margin-right: auto;" class="dropdown-toggle classfortooltip butAction'.($userRight ? '' : 'Refused').'" title="'.dol_escape_htmltag($label).'" data-toggle="dropdown">'.($text ? $text : $label).'</a>';

-			$out .= '<div class="dropdown-content">';

-			foreach ($url as $subbutton) {

-				if (!empty($subbutton['lang'])) {

-					$langs->load($subbutton['lang']);

-				}

-				$tmpurl = DOL_URL_ROOT.$subbutton['url'].(empty($params['backtopage']) ? '' : '&amp;backtopage='.urlencode($params['backtopage']));

-				$out .= dolGetButtonAction('', $langs->trans($subbutton['label']), 'default', $tmpurl, '', $subbutton['perm'], array('isDropDown' => true));

-			}

-			$out .= "</div>";

-			$out .= "</div>";

-		} else {

-			foreach ($url as $subbutton) {	// Should loop on 1 record only

-				if (!empty($subbutton['lang'])) {

-					$langs->load($subbutton['lang']);

-				}

-				$tmpurl = DOL_URL_ROOT.$subbutton['url'].(empty($params['backtopage']) ? '' : '&amp;backtopage='.urlencode($params['backtopage']));

-				$out .= dolGetButtonAction('', $langs->trans($subbutton['label']), 'default', $tmpurl, '', $subbutton['perm']);

-			}

-		}

-

-		return $out;

-	}

-

-	// Here, $url is a simple link

-

-	if (!empty($params['isDropdown'])) {

-		$class = "dropdown-item";

-	} else {

-		$class = 'butAction';

-		if ($actionType == 'danger' || $actionType == 'delete') {

-			$class = 'butActionDelete';

-			if (!empty($url) && strpos($url, 'token=') === false) {

-				$url .= '&token='.newToken();

-			}

-		}

-	}

-	$attr = array(

-		'class' => $class,

-		'href' => empty($url) ? '' : $url,

-		'title' => $label

-	);

-

-	if (empty($text)) {

-		$text = $label;

-		$attr['title'] = ''; // if html not set, leave label on title is redundant

-	} else {

-		$attr['title'] = $label;

-		$attr['aria-label'] = $label;

-	}

-

-	if (empty($userRight)) {

-		$attr['class'] = 'butActionRefused';

-		$attr['href'] = '';

-		$attr['title'] = (($label && $text && $label != $text) ? $label : $langs->trans('NotEnoughPermissions'));

-	}

-

-	if (!empty($id)) {

-		$attr['id'] = $id;

-	}

-

-	// Override attr

-	if (!empty($params['attr']) && is_array($params['attr'])) {

-		foreach ($params['attr'] as $key => $value) {

-			if ($key == 'class') {

-				$attr['class'] .= ' '.$value;

-			} elseif ($key == 'classOverride') {

-				$attr['class'] = $value;

-			} else {

-				$attr[$key] = $value;

-			}

-		}

-	}

-

-	// automatic add tooltip when title is detected

-	if (!empty($attr['title']) && !empty($attr['class']) && strpos($attr['class'], 'classfortooltip') === false) {

-		$attr['class'].= ' classfortooltip';

-	}

-

-	// Js Confirm button

-	if ($userRight && !empty($params['confirm'])) {

-		if (!is_array($params['confirm'])) {

-			$params['confirm'] = array();

-		}

-

-		if (empty($params['confirm']['url'])) {

-			$params['confirm']['url'] = $url . (strpos($url, '?') > 0 ? '&' : '?') . 'confirm=yes';

-		}

-

-		// for js desabled compatibility set $url as call to confirm action and $params['confirm']['url'] to confirmed action

-		$attr['data-confirm-url'] = $params['confirm']['url'];

-		$attr['data-confirm-title'] = !empty($params['confirm']['title']) ? $params['confirm']['title'] : $langs->trans('ConfirmBtnCommonTitle', $label);

-		$attr['data-confirm-content'] = !empty($params['confirm']['content']) ? $params['confirm']['content'] : $langs->trans('ConfirmBtnCommonContent', $label);

-		$attr['data-confirm-content'] = preg_replace("/\r|\n/", "", $attr['data-confirm-content']);

-		$attr['data-confirm-action-btn-label'] = !empty($params['confirm']['action-btn-label']) ? $params['confirm']['action-btn-label'] : $langs->trans('Confirm');

-		$attr['data-confirm-cancel-btn-label'] = !empty($params['confirm']['cancel-btn-label']) ? $params['confirm']['cancel-btn-label'] : $langs->trans('CloseDialog');

-		$attr['data-confirm-modal'] = !empty($params['confirm']['modal']) ? $params['confirm']['modal'] : true;

-

-		$attr['class'].= ' butActionConfirm';

-	}

-

-	if (isset($attr['href']) && empty($attr['href'])) {

-		unset($attr['href']);

-	}

-

-	// escape all attribute

-	$attr = array_map('dol_escape_htmltag', $attr);

-

-	$TCompiledAttr = array();

-	foreach ($attr as $key => $value) {

-		$TCompiledAttr[] = $key.'= "'.$value.'"';

-	}

-

-	$compiledAttributes = empty($TCompiledAttr) ? '' : implode(' ', $TCompiledAttr);

-

-	$tag = !empty($attr['href']) ? 'a' : 'span';

-

-

-	$parameters = array(

-		'TCompiledAttr' => $TCompiledAttr,				// array

-		'compiledAttributes' => $compiledAttributes,	// string

-		'attr' => $attr,

-		'tag' => $tag,

-		'label' => $label,

-		'html' => $text,

-		'actionType' => $actionType,

-		'url' => $url,

-		'id' => $id,

-		'userRight' => $userRight,

-		'params' => $params

-	);

-

-	$reshook = $hookmanager->executeHooks('dolGetButtonAction', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks

-	if ($reshook < 0) {

-		setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

-	}

-

-	if (empty($reshook)) {

-		if (dol_textishtml($text)) {	// If content already HTML encoded

-			return '<' . $tag . ' ' . $compiledAttributes . '>' . $text . '</' . $tag . '>';

-		} else {

-			return '<' . $tag . ' ' . $compiledAttributes . '>' . dol_escape_htmltag($text) . '</' . $tag . '>';

-		}

-	} else {

-		return $hookmanager->resPrint;

-	}

-}

-

-/**

- * Add space between dolGetButtonTitle

- *

- * @param  string $moreClass 	more css class label

- * @return string 				html of title separator

- */

-function dolGetButtonTitleSeparator($moreClass = "")

-{

-	return '<span class="button-title-separator '.$moreClass.'" ></span>';

-}

-

-/**

- * get field error icon

- *

- * @param  string  $fieldValidationErrorMsg message to add in tooltip

- * @return string html output

- */

-function getFieldErrorIcon($fieldValidationErrorMsg)

-{

-	$out = '';

-	if (!empty($fieldValidationErrorMsg)) {

-		$out.= '<span class="field-error-icon classfortooltip" title="'.dol_escape_htmltag($fieldValidationErrorMsg, 1).'"  role="alert" >'; // role alert is used for accessibility

-		$out.= '<span class="fa fa-exclamation-circle" aria-hidden="true" ></span>'; // For accessibility icon is separated and aria-hidden

-		$out.= '</span>';

-	}

-

-	return $out;

+ * @param string    $label      label of button no html : use in alt attribute for accessibility $html is not empty

+ * @param string    $html       optional : content with html

+ * @param string    $actionType default, delete, danger

+ * @param string    $url        the url for link

+ * @param string    $id         attribute id of button

+ * @param int       $userRight  user action right

+ * @param array     $params     various params for future : recommended rather than adding more function arguments

+ * @return string               html button

+ */

+function dolGetButtonAction($label, $html = '', $actionType = 'default', $url = '', $id = '', $userRight = 1, $params = array())

+{

+    $class = 'butAction';

+    if ($actionType == 'danger' || $actionType == 'delete') {

+        $class = 'butActionDelete';

+    }

+

+    $attr = array(

+        'class' => $class

+        ,'href' => empty($url) ? '' : $url

+    );

+

+    if (empty($html)) {

+        $html = $label;

+    } else {

+        $attr['aria-label'] = $label;

+    }

+

+    if (empty($userRight)) {

+        $attr['class'] = 'butActionRefused';

+        $attr['href'] = '';

+    }

+

+    if (!empty($id)) {

+        $attr['id'] = $id;

+    }

+

+    // Override attr

+    if (!empty($params['attr']) && is_array($params['attr'])) {

+        foreach ($params['attr'] as $key => $value) {

+            if ($key == 'class') {

+                $attr['class'] .= ' '.$value;

+            }

+            elseif ($key == 'classOverride') {

+                $attr['class'] = $value;

+            }

+            else {

+                $attr[$key] = $value;

+            }

+        }

+    }

+

+    if (isset($attr['href']) && empty($attr['href'])) {

+        unset($attr['href']);

+    }

+

+    // TODO : add a hook

+

+    // escape all attribute

+    $attr = array_map('dol_escape_htmltag', $attr);

+

+    $TCompiledAttr = array();

+    foreach ($attr as $key => $value) {

+        $TCompiledAttr[] = $key.'="'.$value.'"';

+    }

+

+    $compiledAttributes = !empty($TCompiledAttr) ?implode(' ', $TCompiledAttr) : '';

+

+    $tag = !empty($attr['href']) ? 'a' : 'span';

+

+    return '<div class="inline-block divButAction"><'.$tag.' '.$compiledAttributes.'>'.$html.'</'.$tag.'></div>';

@@ -11768 +8628 @@
- * @param int       $status     0 no user rights, 1 active, 2 current action or selected, -1 Feature Disabled, -2 disable Other reason use param $helpText as tooltip help

+ * @param int       $status     0 no user rights, 1 active, -1 Feature Disabled, -2 disable Other reason use helpText as tooltip

@@ -11774,90 +8634,82 @@
-	global $langs, $conf, $user;

-

-	// Actually this conf is used in css too for external module compatibility and smooth transition to this function

-	if (getDolGlobalString('MAIN_BUTTON_HIDE_UNAUTHORIZED') && (!$user->admin) && $status <= 0) {

-		return '';

-	}

-

-	$class = 'btnTitle';

-	if (in_array($iconClass, array('fa fa-plus-circle', 'fa fa-plus-circle size15x', 'fa fa-comment-dots', 'fa fa-paper-plane'))) {

-		$class .= ' btnTitlePlus';

-	}

-	$useclassfortooltip = 1;

-

-	if (!empty($params['morecss'])) {

-		$class .= ' '.$params['morecss'];

-	}

-

-	$attr = array(

-		'class' => $class,

-		'href' => empty($url) ? '' : $url

-	);

-

-	if (!empty($helpText)) {

-		$attr['title'] = dol_escape_htmltag($helpText);

-	} elseif (empty($attr['title']) && $label) {

-		$attr['title'] = $label;

-		$useclassfortooltip = 0;

-	}

-

-	if ($status == 2) {

-		$attr['class'] .= ' btnTitleSelected';

-	} elseif ($status <= 0) {

-		$attr['class'] .= ' refused';

-

-		$attr['href'] = '';

-

-		if ($status == -1) { // disable

-			$attr['title'] = dol_escape_htmltag($langs->transnoentitiesnoconv("FeatureDisabled"));

-		} elseif ($status == 0) { // Not enough permissions

-			$attr['title'] = dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions"));

-		}

-	}

-

-	if (!empty($attr['title']) && $useclassfortooltip) {

-		$attr['class'] .= ' classfortooltip';

-	}

-

-	if (!empty($id)) {

-		$attr['id'] = $id;

-	}

-

-	// Override attr

-	if (!empty($params['attr']) && is_array($params['attr'])) {

-		foreach ($params['attr'] as $key => $value) {

-			if ($key == 'class') {

-				$attr['class'] .= ' '.$value;

-			} elseif ($key == 'classOverride') {

-				$attr['class'] = $value;

-			} else {

-				$attr[$key] = $value;

-			}

-		}

-	}

-

-	if (isset($attr['href']) && empty($attr['href'])) {

-		unset($attr['href']);

-	}

-

-	// TODO : add a hook

-

-	// escape all attribute

-	$attr = array_map('dol_escape_htmltag', $attr);

-

-	$TCompiledAttr = array();

-	foreach ($attr as $key => $value) {

-		$TCompiledAttr[] = $key.'="'.$value.'"';

-	}

-

-	$compiledAttributes = (empty($TCompiledAttr) ? '' : implode(' ', $TCompiledAttr));

-

-	$tag = (empty($attr['href']) ? 'span' : 'a');

-

-	$button = '<'.$tag.' '.$compiledAttributes.'>';

-	$button .= '<span class="'.$iconClass.' valignmiddle btnTitle-icon"></span>';

-	if (!empty($params['forcenohideoftext'])) {

-		$button .= '<span class="valignmiddle text-plus-circle btnTitle-label'.(empty($params['forcenohideoftext']) ? ' hideonsmartphone' : '').'">'.$label.'</span>';

-	}

-	$button .= '</'.$tag.'>';

-

-	return $button;

+    global $langs, $conf, $user;

+

+    // Actually this conf is used in css too for external module compatibility and smooth transition to this function

+    if (!empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED) && (!$user->admin) && $status <= 0) {

+        return '';

+    }

+

+    $class = 'btnTitle';

+    if ($iconClass == 'fa fa-plus-circle') $class .= ' btnTitlePlus';

+

+    if (!empty($params['morecss'])) $class .= ' '.$params['morecss'];

+

+    $attr = array(

+        'class' => $class

+        ,'href' => empty($url) ? '' : $url

+    );

+

+    if (!empty($helpText)) {

+        $attr['title'] = dol_escape_htmltag($helpText);

+    }

+

+    if ($status <= 0) {

+        $attr['class'] .= ' refused';

+

+        $attr['href'] = '';

+

+        if ($status == -1) { // disable

+            $attr['title'] = dol_escape_htmltag($langs->transnoentitiesnoconv("FeatureDisabled"));

+        }

+        elseif ($status == 0) { // Not enough permissions

+            $attr['title'] = dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions"));

+        }

+    }

+

+    if (!empty($attr['title'])) {

+        $attr['class'] .= ' classfortooltip';

+    }

+

+    if (empty($id)) {

+        $attr['id'] = $id;

+    }

+

+    // Override attr

+    if (!empty($params['attr']) && is_array($params['attr'])) {

+        foreach ($params['attr'] as $key => $value) {

+            if ($key == 'class') {

+                $attr['class'] .= ' '.$value;

+            }

+            elseif ($key == 'classOverride') {

+                $attr['class'] = $value;

+            }

+            else {

+                $attr[$key] = $value;

+            }

+        }

+    }

+

+    if (isset($attr['href']) && empty($attr['href'])) {

+        unset($attr['href']);

+    }

+

+    // TODO : add a hook

+

+    // escape all attribute

+    $attr = array_map('dol_escape_htmltag', $attr);

+

+    $TCompiledAttr = array();

+    foreach ($attr as $key => $value) {

+        $TCompiledAttr[] = $key.'="'.$value.'"';

+    }

+

+    $compiledAttributes = (empty($TCompiledAttr) ? '' : implode(' ', $TCompiledAttr));

+

+    $tag = (empty($attr['href']) ? 'span' : 'a');

+

+    $button = '';

+    $button .= '<'.$tag.' '.$compiledAttributes.' >';

+    $button .= '<span class="'.$iconClass.' valignmiddle btnTitle-icon"></span>';

+    $button .= '<span class="valignmiddle text-plus-circle btnTitle-label'.(empty($params['forcenohideoftext']) ? ' hideonsmartphone' : '').'">'.$label.'</span>';

+    $button .= '</'.$tag.'>';

+

+    return $button;

@@ -11868,7 +8720,4 @@
- *

- * @param   string 	$element_type 	Element type (Value of $object->element). Example:

- * 									'action', 'facture', 'project', 'project_task' or

- * 									'myobject@mymodule' or

- * 									'myobject_mysubobject' (where mymodule = myobject, like 'project_task')

- * @return  array					array('module'=>, 'classpath'=>, 'element'=>, 'subelement'=>, 'classfile'=>, 'classname'=>, 'dir_output'=>)

- * @see fetchObjectByElement()

+ * Called by fetchObjectByElement.

+ *

+ * @param   string 	$element_type 	Element type (Value of $object->element). Example: 'action', 'facture', 'project_task' or 'object@mymodule'...

+ * @return  array					(module, classpath, element, subelement, classfile, classname)

@@ -11878,2 +8726,0 @@
-	global $conf, $db, $hookmanager;

-

@@ -11882,5 +8729,3 @@
-	//$element_type='facture';

-

-	$classfile = $classname = $classpath = $subdir = $dir_output = '';

-

-	// Parse element/subelement

+	$classfile = $classname = $classpath = '';

+

+	// Parse element/subelement (ex: project_task)

@@ -11890,4 +8735,3 @@
-	$table_element = $element_type;

-

-	// If we ask a resource form external module (instead of default path)

-	if (preg_match('/^([^@]+)@([^@]+)$/i', $element_type, $regs)) {	// 'myobject@mymodule'

+

+	// If we ask an resource form external module (instead of default path)

+	if (preg_match('/^([^@]+)@([^@]+)$/i', $element_type, $regs)) {

@@ -11898,3 +8742,2 @@
-	// If we ask a resource for a string with an element and a subelement

-	// Example 'project_task'

-	if (preg_match('/^([^_]+)_([^_]+)/i', $element, $regs)) {	// 'myobject_mysubobject' with myobject=mymodule

+	//print '<br>1. element : '.$element.' - module : '.$module .'<br>';

+	if (preg_match('/^([^_]+)_([^_]+)/i', $element, $regs)) {

@@ -11905,2 +8748,2 @@
-	// For compatibility and to work with non standard path

-	if ($element_type == "action" || $element_type == "actioncomm") {

+	// For compat

+	if ($element_type == "action") {

@@ -11910,47 +8753,4 @@
-		$table_element = 'actioncomm';

-	} elseif ($element_type == 'cronjob') {

-		$classpath = 'cron/class';

-		$module = 'cron';

-		$table_element = 'cron';

-	} elseif ($element_type == 'adherent_type') {

-		$classpath = 'adherents/class';

-		$classfile = 'adherent_type';

-		$module = 'adherent';

-		$subelement = 'adherent_type';

-		$classname = 'AdherentType';

-		$table_element = 'adherent_type';

-	} elseif ($element_type == 'bank_account') {

-		$classpath = 'compta/bank/class';

-		$module = 'bank';	// We need $conf->bank->dir_output and not $conf->banque->dir_output

-		$classfile = 'account';

-		$classname = 'Account';

-	} elseif ($element_type == 'category') {

-		$classpath = 'categories/class';

-		$module = 'categorie';

-		$subelement = 'categorie';

-		$table_element = 'categorie';

-	} elseif ($element_type == 'contact') {

-		$classpath = 'contact/class';

-		$classfile = 'contact';

-		$module = 'societe';

-		$subelement = 'contact';

-		$table_element = 'socpeople';

-	} elseif ($element_type == 'inventory') {

-		$module = 'product';

-		$classpath = 'product/inventory/class';

-	} elseif ($element_type == 'stock' || $element_type == 'entrepot') {

-		$module = 'stock';

-		$classpath = 'product/stock/class';

-		$classfile = 'entrepot';

-		$classname = 'Entrepot';

-		$table_element = 'entrepot';

-	} elseif ($element_type == 'project') {

-		$classpath = 'projet/class';

-		$module = 'projet';

-		$table_element = 'projet';

-	} elseif ($element_type == 'project_task') {

-		$classpath = 'projet/class';

-		$module = 'projet';

-		$subelement = 'task';

-		$table_element = 'projet_task';

-	} elseif ($element_type == 'facture' || $element_type == 'invoice') {

+	}

+

+	// To work with non standard path

+	if ($element_type == 'facture' || $element_type == 'invoice') {

@@ -11960,2 +8760,2 @@
-		$table_element = 'facture';

-	} elseif ($element_type == 'commande' || $element_type == 'order') {

+	}

+	if ($element_type == 'commande' || $element_type == 'order') {

@@ -11965,2 +8765,2 @@
-		$table_element = 'commande';

-	} elseif ($element_type == 'propal') {

+	}

+	if ($element_type == 'propal') {

@@ -11968,8 +8768,2 @@
-		$table_element = 'propal';

-	} elseif ($element_type == 'shipping') {

-		$classpath = 'expedition/class';

-		$classfile = 'expedition';

-		$classname = 'Expedition';

-		$module = 'expedition';

-		$table_element = 'expedition';

-	} elseif ($element_type == 'supplier_proposal') {

+	}

+	if ($element_type == 'supplier_proposal') {

@@ -11977,5 +8771,2 @@
-		$module = 'supplier_proposal';

-		$element = 'supplierproposal';

-		$classfile = 'supplier_proposal';

-		$subelement = 'supplierproposal';

-	} elseif ($element_type == 'shipping') {

+	}

+	if ($element_type == 'shipping') {

@@ -11985,5 +8776,7 @@
-	} elseif ($element_type == 'delivery') {

-		$classpath = 'delivery/class';

-		$subelement = 'delivery';

-		$module = 'expedition';

-	} elseif ($element_type == 'contract') {

+	}

+	if ($element_type == 'delivery') {

+		$classpath = 'livraison/class';

+		$subelement = 'livraison';

+		$module = 'livraison_bon';

+	}

+	if ($element_type == 'contract') {

@@ -11993,8 +8786,2 @@
-		$table_element = 'contract';

-	} elseif ($element_type == 'mailing') {

-		$classpath = 'comm/mailing/class';

-		$module = 'mailing';

-		$classfile = 'mailing';

-		$classname = 'Mailing';

-		$subelement = '';

-	} elseif ($element_type == 'member') {

+	}

+	if ($element_type == 'member') {

@@ -12004,12 +8791,2 @@
-		$table_element = 'adherent';

-	} elseif ($element_type == 'usergroup') {

-		$classpath = 'user/class';

-		$module = 'user';

-	} elseif ($element_type == 'mo') {

-		$classpath = 'mrp/class';

-		$classfile = 'mo';

-		$classname = 'Mo';

-		$module = 'mrp';

-		$subelement = '';

-		$table_element = 'mrp_mo';

-	} elseif ($element_type == 'cabinetmed_cons') {

+	}

+	if ($element_type == 'cabinetmed_cons') {

@@ -12019,2 +8796,2 @@
-		$table_element = 'cabinetmedcons';

-	} elseif ($element_type == 'fichinter') {

+	}

+	if ($element_type == 'fichinter') {

@@ -12024,2 +8801,2 @@
-		$table_element = 'fichinter';

-	} elseif ($element_type == 'dolresource' || $element_type == 'resource') {

+	}

+	if ($element_type == 'dolresource' || $element_type == 'resource') {

@@ -12029,2 +8806,2 @@
-		$table_element = 'resource';

-	} elseif ($element_type == 'propaldet') {

+	}

+	if ($element_type == 'propaldet') {

@@ -12034,5 +8811,2 @@
-	} elseif ($element_type == 'opensurvey_sondage') {

-		$classpath = 'opensurvey/class';

-		$module = 'opensurvey';

-		$subelement = 'opensurveysondage';

-	} elseif ($element_type == 'order_supplier') {

+	}

+	if ($element_type == 'order_supplier') {

@@ -12040,0 +8815 @@
+		$subelement = 'commandefournisseur';

@@ -12042,5 +8817,2 @@
-		$element = 'order_supplier';

-		$subelement = '';

-		$classname = 'CommandeFournisseur';

-		$table_element = 'commande_fournisseur';

-	} elseif ($element_type == 'commande_fournisseurdet') {

+	}

+	if ($element_type == 'invoice_supplier') {

@@ -12049,8 +8821 @@
-		$classfile = 'fournisseur.commande';

-		$element = 'commande_fournisseurdet';

-		$subelement = '';

-		$classname = 'CommandeFournisseurLigne';

-		$table_element = 'commande_fournisseurdet';

-	} elseif ($element_type == 'invoice_supplier') {

-		$classpath = 'fourn/class';

-		$module = 'fournisseur';

+		$subelement = 'facturefournisseur';

@@ -12058,5 +8823,2 @@
-		$element = 'invoice_supplier';

-		$subelement = '';

-		$classname = 'FactureFournisseur';

-		$table_element = 'facture_fourn';

-	} elseif ($element_type == "service") {

+	}

+	if ($element_type == "service") {

@@ -12065,85 +8827,7 @@
-		$table_element = 'product';

-	} elseif ($element_type == 'salary') {

-		$classpath = 'salaries/class';

-		$module = 'salaries';

-	} elseif ($element_type == 'payment_salary') {

-		$classpath = 'salaries/class';

-		$classfile = 'paymentsalary';

-		$classname = 'PaymentSalary';

-		$module = 'salaries';

-	} elseif ($element_type == 'productlot') {

-		$module = 'productbatch';

-		$classpath = 'product/stock/class';

-		$classfile = 'productlot';

-		$classname = 'Productlot';

-		$element = 'productlot';

-		$subelement = '';

-		$table_element = 'product_lot';

-	} elseif ($element_type == 'websitepage') {

-		$classpath = 'website/class';

-		$classfile = 'websitepage';

-		$classname = 'Websitepage';

-		$module = 'website';

-		$subelement = 'websitepage';

-		$table_element = 'website_page';

-	} elseif ($element_type == 'fiscalyear') {

-		$classpath = 'core/class';

-		$module = 'accounting';

-		$subelement = 'fiscalyear';

-	} elseif ($element_type == 'chargesociales') {

-		$classpath = 'compta/sociales/class';

-		$module = 'tax';

-		$table_element = 'chargesociales';

-	} elseif ($element_type == 'tva') {

-		$classpath = 'compta/tva/class';

-		$module = 'tax';

-		$subdir = '/vat';

-		$table_element = 'tva';

-	} elseif ($element_type == 'emailsenderprofile') {

-		$module = '';

-		$classpath = 'core/class';

-		$classfile = 'emailsenderprofile';

-		$classname = 'EmailSenderProfile';

-		$table_element = 'c_email_senderprofile';

-		$subelement = '';

-	} elseif ($element_type == 'ccountry') {

-		$module = '';

-		$classpath = 'core/class';

-		$classfile = 'ccountry';

-		$classname = 'Ccountry';

-		$table_element = 'c_country';

-		$subelement = '';

-	}

-

-	if (empty($classfile)) {

-		$classfile = strtolower($subelement);

-	}

-	if (empty($classname)) {

-		$classname = ucfirst($subelement);

-	}

-	if (empty($classpath)) {

-		$classpath = $module.'/class';

-	}

-

-	//print 'getElementProperties subdir='.$subdir;

-

-	// Set dir_output

-	if ($module && isset($conf->$module)) {	// The generic case

-		if (!empty($conf->$module->multidir_output[$conf->entity])) {

-			$dir_output = $conf->$module->multidir_output[$conf->entity];

-		} elseif (!empty($conf->$module->output[$conf->entity])) {

-			$dir_output = $conf->$module->output[$conf->entity];

-		} elseif (!empty($conf->$module->dir_output)) {

-			$dir_output = $conf->$module->dir_output;

-		}

-	}

-

-	// Overwrite value for special cases

-	if ($element == 'order_supplier') {

-		$dir_output = $conf->fournisseur->commande->dir_output;

-	} elseif ($element == 'invoice_supplier') {

-		$dir_output = $conf->fournisseur->facture->dir_output;

-	}

-	$dir_output .= $subdir;

-

-	$elementProperties = array(

+	}

+

+	if (empty($classfile)) $classfile = strtolower($subelement);

+	if (empty($classname)) $classname = ucfirst($subelement);

+	if (empty($classpath)) $classpath = $module.'/class';

+

+	$element_properties = array(

@@ -12150,0 +8835 @@
+		'classpath' => $classpath,

@@ -12152 +8836,0 @@
-		'table_element' => $table_element,

@@ -12154 +8837,0 @@
-		'classpath' => $classpath,

@@ -12156,2 +8839 @@
-		'classname' => $classname,

-		'dir_output' => $dir_output

+		'classname' => $classname

@@ -12159,30 +8841 @@
-

-

-	// Add  hook

-	if (!is_object($hookmanager)) {

-		include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';

-		$hookmanager = new HookManager($db);

-	}

-	$hookmanager->initHooks(array('elementproperties'));

-

-

-	// Hook params

-	$parameters = array(

-		'elementType' => $element_type,

-		'elementProperties' => $elementProperties

-	);

-

-	$reshook = $hookmanager->executeHooks('getElementProperties', $parameters);

-

-	if ($reshook) {

-		$elementProperties = $hookmanager->resArray;

-	} elseif (!empty($hookmanager->resArray) && is_array($hookmanager->resArray)) { // resArray is always an array but for sécurity against misconfigured external modules

-		$elementProperties = array_replace($elementProperties, $hookmanager->resArray);

-	}

-

-	// context of elementproperties doesn't need to exist out of this function so delete it to avoid elementproperties context is equal to all

-	if (($key = array_search('elementproperties', $hookmanager->contextarray)) !== false) {

-		unset($hookmanager->contextarray[$key]);

-	}

-

-	return $elementProperties;

+	return $element_properties;

@@ -12195,2 +8848,2 @@
- * @param	int     	$element_id 	Element id (Use this or element_id but not both)

- * @param	string  	$element_type 	Element type ('module' or 'myobject@mymodule' or 'mymodule_myobject')

+ * @param	int     	$element_id 	Element id

+ * @param	string  	$element_type 	Element type

@@ -12198,2 +8851 @@
- * @return 	int|object 					object || 0 || <0 if error

- * @see getElementProperties()

+ * @return 	int|object 					object || 0 || -1 if error

@@ -12203,3 +8855 @@
-	global $db;

-

-	$ret = 0;

+	global $conf, $db;

@@ -12208,14 +8858,2 @@
-

-	if ($element_prop['module'] == 'product' || $element_prop['module'] == 'service') {

-		// For example, for an extrafield 'product' (shared for both product and service) that is a link to an object,

-		// this is called with $element_type = 'product' when we need element properties of a service, we must return a product. If we create the

-		// extrafield for a service, it is not supported and not found when editing the product/service card. So we must keep 'product' for extrafields

-		// of service and we will return properties of a product.

-		$ismodenabled = (isModEnabled('product') || isModEnabled('service'));

-	} else {

-		$ismodenabled = isModEnabled($element_prop['module']);

-	}

-	//var_dump('element_type='.$element_type);

-	//var_dump($element_prop);

-	//var_dump($element_prop['module'].' '.$ismodenabled);

-	if (is_array($element_prop) && (empty($element_prop['module']) || $ismodenabled)) {

+	if (is_array($element_prop) && $conf->{$element_prop['module']}->enabled)

+	{

@@ -12224,21 +8862,8 @@
-		if (class_exists($element_prop['classname'])) {

-			$classname = $element_prop['classname'];

-			$objecttmp = new $classname($db);

-

-			if ($element_id > 0 || !empty($element_ref)) {

-				$ret = $objecttmp->fetch($element_id, $element_ref);

-				if ($ret >= 0) {

-					if (empty($objecttmp->module)) {

-						$objecttmp->module = $element_prop['module'];

-					}

-					return $objecttmp;

-				}

-			} else {

-				return $objecttmp;	// returned an object without fetch

-			}

-		} else {

-			return -1;

-		}

-	}

-

-	return $ret;

+		$objecttmp = new $element_prop['classname']($db);

+		$ret = $objecttmp->fetch($element_id, $element_ref);

+		if ($ret >= 0)

+		{

+			return $objecttmp;

+		}

+	}

+	return 0;

@@ -12255,5 +8880,6 @@
-	if (preg_match('/\.(htm|html|js|phar|php|php\d+|phtml|pht|pl|py|cgi|ksh|sh|shtml|bash|bat|cmd|wpk|exe|dmg)$/i', $filename)) {

-		return true;

-	}

-

-	return false;

+    if (preg_match('/\.(htm|html|js|phar|php|php\d+|phtml|pht|pl|py|cgi|ksh|sh|shtml|bash|bat|cmd|wpk|exe|dmg)$/i', $filename))

+    {

+        return true;

+    }

+

+    return false;

@@ -12266 +8891,0 @@
- * @since Dolibarr v10.0.7

@@ -12271 +8896 @@
-	return empty($_SESSION['newtoken']) ? '' : $_SESSION['newtoken'];

+	return $_SESSION['newtoken'];

@@ -12276,3 +8901 @@
- * For ajax call, you must use this token as a parameter of the call into the js calling script (the called ajax php page must also set constant NOTOKENRENEWAL).

- *

- * @since Dolibarr v10.0.7

+ *

@@ -12283,1315 +8906,2 @@
-	return isset($_SESSION['token']) ? $_SESSION['token'] : '';

-}

-

-/**

- * Return a random string to be used as a nonce value for js

- *

- * @return  string

- */

-function getNonce()

-{

-	global $conf;

-

-	if (empty($conf->cache['nonce'])) {

-		$conf->cache['nonce'] = dolGetRandomBytes(8);

-	}

-

-	return $conf->cache['nonce'];

-}

-

-

-/**

- * Start a table with headers and a optinal clickable number (don't forget to use "finishSimpleTable()" after the last table row)

- *

- * @param string	$header		The first left header of the table (automatic translated)

- * @param string	$link		(optional) The link to a internal dolibarr page, when click on the number (without the first "/")

- * @param string	$arguments	(optional) Additional arguments for the link (e.g. "search_status=0")

- * @param integer	$emptyRows	(optional) The count of empty rows after the first header

- * @param integer	$number		(optional) The number that is shown right after the first header, when not set the link is shown on the right side of the header as "FullList"

- * @return void

- *

- * @see finishSimpleTable()

- */

-function startSimpleTable($header, $link = "", $arguments = "", $emptyRows = 0, $number = -1)

-{

-	global $langs;

-

-	print '<div class="div-table-responsive-no-min">';

-	print '<table class="noborder centpercent">';

-	print '<tr class="liste_titre">';

-

-	print $emptyRows < 1 ? '<th>' : '<th colspan="'.($emptyRows + 1).'">';

-

-	print $langs->trans($header);

-

-	// extra space between the first header and the number

-	if ($number > -1) {

-		print ' ';

-	}

-

-	if (!empty($link)) {

-		if (!empty($arguments)) {

-			print '<a href="'.DOL_URL_ROOT.'/'.$link.'?'.$arguments.'">';

-		} else {

-			print '<a href="'.DOL_URL_ROOT.'/'.$link.'">';

-		}

-	}

-

-	if ($number > -1) {

-		print '<span class="badge">'.$number.'</span>';

-	}

-

-	if (!empty($link)) {

-		print '</a>';

-	}

-

-	print '</th>';

-

-	if ($number < 0 && !empty($link)) {

-		print '<th class="right">';

-

-		if (!empty($arguments)) {

-			print '<a class="commonlink" href="'.DOL_URL_ROOT.'/'.$link.'?'.$arguments.'">';

-		} else {

-			print '<a class="commonlink" href="'.DOL_URL_ROOT.'/'.$link.'">';

-		}

-

-		print $langs->trans("FullList");

-		print '</a>';

-		print '</th>';

-	}

-

-	print '</tr>';

-}

-

-/**

- * Add the correct HTML close tags for "startSimpleTable(...)" (use after the last table line)

- *

- * @param 	bool 	$addLineBreak	(optional) Add a extra line break after the complete table (\<br\>)

- * @return 	void

- *

- * @see startSimpleTable()

- */

-function finishSimpleTable($addLineBreak = false)

-{

-	print '</table>';

-	print '</div>';

-

-	if ($addLineBreak) {

-		print '<br>';

-	}

-}

-

-/**

- * Add a summary line to the current open table ("None", "XMoreLines" or "Total xxx")

- *

- * @param integer	$tableColumnCount		The complete count columns of the table

- * @param integer	$num					The count of the rows of the table, when it is zero (0) the "$noneWord" is shown instead

- * @param integer	$nbofloop				(optional)	The maximum count of rows thaht the table show (when it is zero (0) no summary line will show, expect "$noneWord" when $num === 0)

- * @param integer	$total					(optional)	The total value thaht is shown after when the table has minimum of one entire

- * @param string	$noneWord				(optional)	The word that is shown when the table has no entires ($num === 0)

- * @param boolean	$extraRightColumn		(optional)	Add a addtional column after the summary word and total number

- * @return void

- */

-function addSummaryTableLine($tableColumnCount, $num, $nbofloop = 0, $total = 0, $noneWord = "None", $extraRightColumn = false)

-{

-	global $langs;

-

-	if ($num === 0) {

-		print '<tr class="oddeven">';

-		print '<td colspan="'.$tableColumnCount.'"><span class="opacitymedium">'.$langs->trans($noneWord).'</span></td>';

-		print '</tr>';

-		return;

-	}

-

-	if ($nbofloop === 0) {

-		// don't show a summary line

-		return;

-	}

-

-	if ($num === 0) {

-		$colspan = $tableColumnCount;

-	} elseif ($num > $nbofloop) {

-		$colspan = $tableColumnCount;

-	} else {

-		$colspan = $tableColumnCount - 1;

-	}

-

-	if ($extraRightColumn) {

-		$colspan--;

-	}

-

-	print '<tr class="liste_total">';

-

-	if ($nbofloop > 0 && $num > $nbofloop) {

-		print '<td colspan="'.$colspan.'" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop)).'</td>';

-	} else {

-		print '<td colspan="'.$colspan.'" class="right"> '.$langs->trans("Total").'</td>';

-		print '<td class="right centpercent">'.price($total).'</td>';

-	}

-

-	if ($extraRightColumn) {

-		print '<td></td>';

-	}

-

-	print '</tr>';

-}

-

-/**

- *  Return a file on output using a low memory. It can return very large files with no need of memory.

- *  WARNING: This close output buffers.

- *

- *  @param	string	$fullpath_original_file_osencoded		Full path of file to return.

- *  @param	int		$method									-1 automatic, 0=readfile, 1=fread, 2=stream_copy_to_stream

- *  @return void

- */

-function readfileLowMemory($fullpath_original_file_osencoded, $method = -1)

-{

-	if ($method == -1) {

-		$method = 0;

-		if (getDolGlobalString('MAIN_FORCE_READFILE_WITH_FREAD')) {

-			$method = 1;

-		}

-		if (getDolGlobalString('MAIN_FORCE_READFILE_WITH_STREAM_COPY')) {

-			$method = 2;

-		}

-	}

-

-	// Be sure we don't have output buffering enabled to have readfile working correctly

-	while (ob_get_level()) {

-		ob_end_flush();

-	}

-

-	// Solution 0

-	if ($method == 0) {

-		readfile($fullpath_original_file_osencoded);

-	} elseif ($method == 1) {

-		// Solution 1

-		$handle = fopen($fullpath_original_file_osencoded, "rb");

-		while (!feof($handle)) {

-			print fread($handle, 8192);

-		}

-		fclose($handle);

-	} elseif ($method == 2) {

-		// Solution 2

-		$handle1 = fopen($fullpath_original_file_osencoded, "rb");

-		$handle2 = fopen("php://output", "wb");

-		stream_copy_to_stream($handle1, $handle2);

-		fclose($handle1);

-		fclose($handle2);

-	}

-}

-

-/**

- * Create a button to copy $valuetocopy in the clipboard (for copy and paste feature).

- * Code that handle the click is inside core/js/lib_foot.js.php.

- *

- * @param 	string 	$valuetocopy 		The value to print

- * @param	int		$showonlyonhover	Show the copy-paste button only on hover

- * @param	string	$texttoshow			Replace the value to show with this text. Use 'none' to show no text (only the copy-paste picto)

- * @return 	string 						The string to print for the button

- */

-function showValueWithClipboardCPButton($valuetocopy, $showonlyonhover = 1, $texttoshow = '')

-{

-	/*

-	global $conf;

-

-	if (!empty($conf->dol_no_mouse_hover)) {

-		$showonlyonhover = 0;

-	}*/

-

-	$tag = 'span'; 	// Using div (like any style of type 'block') does not work when using the js copy code.

-	if ($texttoshow === 'none') {

-		$result = '<span class="clipboardCP'.($showonlyonhover ? ' clipboardCPShowOnHover' : '').'"><'.$tag.' class="clipboardCPValue hidewithsize">'.dol_escape_htmltag($valuetocopy, 1, 1).'</'.$tag.'><span class="clipboardCPValueToPrint"></span><span class="clipboardCPButton far fa-clipboard opacitymedium paddingleft paddingright"></span><span class="clipboardCPText"></span></span>';

-	} elseif ($texttoshow) {

-		$result = '<span class="clipboardCP'.($showonlyonhover ? ' clipboardCPShowOnHover' : '').'"><'.$tag.' class="clipboardCPValue hidewithsize">'.dol_escape_htmltag($valuetocopy, 1, 1).'</'.$tag.'><span class="clipboardCPValueToPrint">'.dol_escape_htmltag($texttoshow, 1, 1).'</span><span class="clipboardCPButton far fa-clipboard opacitymedium paddingleft paddingright"></span><span class="clipboardCPText"></span></span>';

-	} else {

-		$result = '<span class="clipboardCP'.($showonlyonhover ? ' clipboardCPShowOnHover' : '').'"><'.$tag.' class="clipboardCPValue">'.dol_escape_htmltag($valuetocopy, 1, 1).'</'.$tag.'><span class="clipboardCPButton far fa-clipboard opacitymedium paddingleft paddingright"></span><span class="clipboardCPText"></span></span>';

-	}

-

-	return $result;

-}

-

-

-/**

- * Decode an encode string. The string can be encoded in json format (recommended) or with serialize (avoid this)

- *

- * @param 	string	$stringtodecode		String to decode (json or serialize coded)

- * @return	mixed						The decoded object.

- */

-function jsonOrUnserialize($stringtodecode)

-{

-	$result = json_decode($stringtodecode);

-	if ($result === null) {

-		$result = unserialize($stringtodecode);

-	}

-

-	return $result;

-}

-

-

-/**

- * forgeSQLFromUniversalSearchCriteria

- *

- * @param 	string		$filter		String with universal search string. Must be '(aaa:bbb:...) OR (ccc:ddd:...) ...' with

- * 									aaa is a field name (with alias or not) and

- * 									bbb is one of this operator '=', '<', '>', '<=', '>=', '!=', 'in', 'notin', 'like', 'notlike', 'is', 'isnot'.

- * 									Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'

- * @param	string		$errorstr	Error message string

- * @param	int			$noand		1=Do not add the AND before the condition string.

- * @param	int			$nopar		1=Do not add the perenthesis around the condition string.

- * @param	int			$noerror	1=If search criteria is not valid, does not return an error string but invalidate the SQL

- * @return	string					Return forged SQL string

- */

-function forgeSQLFromUniversalSearchCriteria($filter, &$errorstr = '', $noand = 0, $nopar = 0, $noerror = 0)

-{

-	if (!preg_match('/^\(.*\)$/', $filter)) {    // If $filter does not start and end with ()

-		$filter = '(' . $filter . ')';

-	}

-

-	$regexstring = '\(([a-zA-Z0-9_\.]+:[<>!=insotlke]+:[^\(\)]+)\)';	// Must be  (aaa:bbb:...) with aaa is a field name (with alias or not) and bbb is one of this operator '=', '<', '>', '<=', '>=', '!=', 'in', 'notin', 'like', 'notlike', 'is', 'isnot'

-

-	if (!dolCheckFilters($filter, $errorstr)) {

-		if ($noerror) {

-			return '1 = 2';

-		} else {

-			return 'Filter syntax error - '.$errorstr;		// Bad balance of parenthesis, we return an error message or force a SQL not found

-		}

-	}

-

-	// Test the filter syntax

-	$t = preg_replace_callback('/'.$regexstring.'/i', 'dolForgeDummyCriteriaCallback', $filter);

-	$t = str_replace(array('and','or','AND','OR',' '), '', $t);		// Remove the only strings allowed between each () criteria

-	// If the string result contains something else than '()', the syntax was wrong

-	if (preg_match('/[^\(\)]/', $t)) {

-		$errorstr = 'Bad syntax of the search string';

-		if ($noerror) {

-			return '1 = 2';

-		} else {

-			return 'Filter syntax error - '.$errorstr;		// Bad syntax of the search string, we return an error message or force a SQL not found

-		}

-	}

-

-	return ($noand ? "" : " AND ").($nopar ? "" : '(').preg_replace_callback('/'.$regexstring.'/i', 'dolForgeCriteriaCallback', $filter).($nopar ? "" : ')');

-}

-

-/**

- * Return if a $sqlfilters parameter has a valid balance of parenthesis

- *

- * @param	string  		$sqlfilters     sqlfilter string

- * @param	string			$error			Error message

- * @return 	boolean			   				True if valid, False if not valid ($error is filled with the reason in such a case)

- */

-function dolCheckFilters($sqlfilters, &$error = '')

-{

-	//$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';

-	//$tmp=preg_replace_all('/'.$regexstring.'/', '', $sqlfilters);

-	$tmp = $sqlfilters;

-	$i = 0;

-	$nb = strlen($tmp);

-	$counter = 0;

-	while ($i < $nb) {

-		if ($tmp[$i] == '(') {

-			$counter++;

-		}

-		if ($tmp[$i] == ')') {

-			$counter--;

-		}

-		if ($counter < 0) {

-			$error = "Wrond balance of parenthesis in sqlfilters=".$sqlfilters;

-			dol_syslog($error, LOG_WARNING);

-			return false;

-		}

-		$i++;

-	}

-	return true;

-}

-

-/**

- * Function to forge a SQL criteria from a Dolibarr filter syntax string.

- * This method is called by forgeSQLFromUniversalSearchCriteria()

- *

- * @param  array    $matches       Array of found string by regex search. Example: "t.ref:like:'SO-%'" or "t.date_creation:<:'20160101'" or "t.nature:is:NULL"

- * @return string                  Forged criteria. Example: "" or "()"

- */

-function dolForgeDummyCriteriaCallback($matches)

-{

-	//dol_syslog("Convert matches ".$matches[1]);

-	if (empty($matches[1])) {

-		return '';

-	}

-	$tmp = explode(':', $matches[1]);

-	if (count($tmp) < 3) {

-		return '';

-	}

-

-	return '()';	// An empty criteria

-}

-

-/**

- * Function to forge a SQL criteria from a Dolibarr filter syntax string.

- * This method is called by forgeSQLFromUniversalSearchCriteria()

- *

- * @param  array    $matches       	Array of found string by regex search.

- * 									Example: "t.ref:like:'SO-%'" or "t.date_creation:<:'20160101'" or "t.date_creation:<:'2016-01-01 12:30:00'" or "t.nature:is:NULL"

- * @return string                  	Forged criteria. Example: "t.field LIKE 'abc%'"

- */

-function dolForgeCriteriaCallback($matches)

-{

-	global $db;

-

-	//dol_syslog("Convert matches ".$matches[1]);

-	if (empty($matches[1])) {

-		return '';

-	}

-	$tmp = explode(':', $matches[1]);

-	if (count($tmp) < 3) {

-		return '';

-	}

-

-	$operand = preg_replace('/[^a-z0-9\._]/i', '', trim($tmp[0]));

-

-	$operator = strtoupper(preg_replace('/[^a-z<>!=]/i', '', trim($tmp[1])));

-

-	$realOperator = [

-		'NOTLIKE' => 'NOT LIKE',

-		'ISNOT' => 'IS NOT',

-		'NOTIN' => 'NOT IN',

-		'!=' => '<>',

-	];

-

-	if (array_key_exists($operator, $realOperator)) {

-		$operator = $realOperator[$operator];

-	}

-

-

-	$tmpescaped = $tmp[2];

-	$regbis = array();

-

-	if ($operator == 'IN' || $operator == 'NOT IN') {	// IN is allowed for list of ID or code only

-		//if (!preg_match('/^\(.*\)$/', $tmpescaped)) {

-		$tmpescaped2 = '(';

-		// Explode and sanitize each element in list

-		$tmpelemarray = explode(',', $tmpescaped);

-		foreach ($tmpelemarray as $tmpkey => $tmpelem) {

-			$reg = array();

-			if (preg_match('/^\'(.*)\'$/', $tmpelem, $reg)) {

-				$tmpelemarray[$tmpkey] = "'".$db->escape($db->sanitize($reg[1], 1, 1, 1))."'";

-			} else {

-				$tmpelemarray[$tmpkey] = $db->escape($db->sanitize($tmpelem, 1, 1, 1));

-			}

-		}

-		$tmpescaped2 .= join(',', $tmpelemarray);

-		$tmpescaped2 .= ')';

-

-		$tmpescaped = $tmpescaped2;

-	} elseif ($operator == 'LIKE' || $operator == 'NOT LIKE') {

-		if (preg_match('/^\'(.*)\'$/', $tmpescaped, $regbis)) {

-			$tmpescaped = $regbis[1];

-		}

-		//$tmpescaped = "'".$db->escape($db->escapeforlike($regbis[1]))."'";

-		$tmpescaped = "'".$db->escape($tmpescaped)."'";	// We do not escape the _ and % so the like will works

-	} elseif (preg_match('/^\'(.*)\'$/', $tmpescaped, $regbis)) {

-		$tmpescaped = "'".$db->escape($regbis[1])."'";

-	} else {

-		if (strtoupper($tmpescaped) == 'NULL') {

-			$tmpescaped = 'NULL';

-		} elseif (is_int($tmpescaped)) {

-			$tmpescaped = (int) $tmpescaped;

-		} else {

-			$tmpescaped = (float) $tmpescaped;

-		}

-	}

-

-	return '('.$db->escape($operand).' '.strtoupper($operator).' '.$tmpescaped.')';

-}

-

-

-/**

- * Get timeline icon

- *

- * @param 	ActionComm 	$actionstatic 	actioncomm

- * @param 	array 		$histo 			histo

- * @param 	int 		$key 			key

- * @return 	string						String with timeline icon

- * @deprecated Use actioncomm->getPictoType() instead

- */

-function getTimelineIcon($actionstatic, &$histo, $key)

-{

-	global $conf, $langs;

-

-	$out = '<!-- timeline icon -->'."\n";

-	$iconClass = 'fa fa-comments';

-	$img_picto = '';

-	$colorClass = '';

-	$pictoTitle = '';

-

-	if ($histo[$key]['percent'] == -1) {

-		$colorClass = 'timeline-icon-not-applicble';

-		$pictoTitle = $langs->trans('StatusNotApplicable');

-	} elseif ($histo[$key]['percent'] == 0) {

-		$colorClass = 'timeline-icon-todo';

-		$pictoTitle = $langs->trans('StatusActionToDo').' (0%)';

-	} elseif ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100) {

-		$colorClass = 'timeline-icon-in-progress';

-		$pictoTitle = $langs->trans('StatusActionInProcess').' ('.$histo[$key]['percent'].'%)';

-	} elseif ($histo[$key]['percent'] >= 100) {

-		$colorClass = 'timeline-icon-done';

-		$pictoTitle = $langs->trans('StatusActionDone').' (100%)';

-	}

-

-	if ($actionstatic->code == 'AC_TICKET_CREATE') {

-		$iconClass = 'fa fa-ticket';

-	} elseif ($actionstatic->code == 'AC_TICKET_MODIFY') {

-		$iconClass = 'fa fa-pencilxxx';

-	} elseif (preg_match('/^TICKET_MSG/', $actionstatic->code)) {

-		$iconClass = 'fa fa-comments';

-	} elseif (preg_match('/^TICKET_MSG_PRIVATE/', $actionstatic->code)) {

-		$iconClass = 'fa fa-mask';

-	} elseif (getDolGlobalString('AGENDA_USE_EVENT_TYPE')) {

-		if ($actionstatic->type_picto) {

-			$img_picto = img_picto('', $actionstatic->type_picto);

-		} else {

-			if ($actionstatic->type_code == 'AC_RDV') {

-				$iconClass = 'fa fa-handshake';

-			} elseif ($actionstatic->type_code == 'AC_TEL') {

-				$iconClass = 'fa fa-phone';

-			} elseif ($actionstatic->type_code == 'AC_FAX') {

-				$iconClass = 'fa fa-fax';

-			} elseif ($actionstatic->type_code == 'AC_EMAIL') {

-				$iconClass = 'fa fa-envelope';

-			} elseif ($actionstatic->type_code == 'AC_INT') {

-				$iconClass = 'fa fa-shipping-fast';

-			} elseif ($actionstatic->type_code == 'AC_OTH_AUTO') {

-				$iconClass = 'fa fa-robot';

-			} elseif (!preg_match('/_AUTO/', $actionstatic->type_code)) {

-				$iconClass = 'fa fa-robot';

-			}

-		}

-	}

-

-	$out .= '<i class="'.$iconClass.' '.$colorClass.'" title="'.$pictoTitle.'">'.$img_picto.'</i>'."\n";

-	return $out;

-}

-

-/**

- * getActionCommEcmList

- *

- * @param	ActionComm		$object			Object ActionComm

- * @return 	array							Array of documents in index table

- */

-function getActionCommEcmList($object)

-{

-	global $conf, $db;

-

-	$documents = array();

-

-	$sql = 'SELECT ecm.rowid as id, ecm.src_object_type, ecm.src_object_id, ecm.filepath, ecm.filename';

-	$sql .= ' FROM '.MAIN_DB_PREFIX.'ecm_files ecm';

-	$sql .= " WHERE ecm.filepath = 'agenda/".((int) $object->id)."'";

-	//$sql.= " ecm.src_object_type = '".$db->escape($object->element)."' AND ecm.src_object_id = ".((int) $object->id); // Old version didn't add object_type during upload

-	$sql .= ' ORDER BY ecm.position ASC';

-

-	$resql = $db->query($sql);

-	if ($resql) {

-		if ($db->num_rows($resql)) {

-			while ($obj = $db->fetch_object($resql)) {

-				$documents[$obj->id] = $obj;

-			}

-		}

-	}

-

-	return $documents;

-}

-

-

-

-/**

- *    	Show html area with actions in messaging format.

- *      Note: Global parameter $param must be defined.

- *

- * 		@param	Conf		       $conf		   Object conf

- * 		@param	Translate	       $langs		   Object langs

- * 		@param	DoliDB		       $db			   Object db

- * 		@param	mixed			   $filterobj	   Filter on object Adherent|Societe|Project|Product|CommandeFournisseur|Dolresource|Ticket|... to list events linked to an object

- * 		@param	Contact		       $objcon		   Filter on object contact to filter events on a contact

- *      @param  int			       $noprint        Return string but does not output it

- *      @param  string		       $actioncode     Filter on actioncode

- *      @param  string             $donetodo       Filter on event 'done' or 'todo' or ''=nofilter (all).

- *      @param  array              $filters        Filter on other fields

- *      @param  string             $sortfield      Sort field

- *      @param  string             $sortorder      Sort order

- *      @return	string|void				           Return html part or void if noprint is 1

- */

-function show_actions_messaging($conf, $langs, $db, $filterobj, $objcon = '', $noprint = 0, $actioncode = '', $donetodo = 'done', $filters = array(), $sortfield = 'a.datep,a.id', $sortorder = 'DESC')

-{

-	global $user, $conf;

-	global $form;

-

-	global $param, $massactionbutton;

-

-	dol_include_once('/comm/action/class/actioncomm.class.php');

-

-	// Check parameters

-	if (!is_object($filterobj) && !is_object($objcon)) {

-		dol_print_error('', 'BadParameter');

-	}

-

-	$histo = array();

-	$numaction = 0;

-	$now = dol_now();

-

-	$sortfield_list = explode(',', $sortfield);

-	$sortfield_label_list = array('a.id' => 'id', 'a.datep' => 'dp', 'a.percent' => 'percent');

-	$sortfield_new_list = array();

-	foreach ($sortfield_list as $sortfield_value) {

-		$sortfield_new_list[] = $sortfield_label_list[trim($sortfield_value)];

-	}

-	$sortfield_new = implode(',', $sortfield_new_list);

-

-	if (isModEnabled('agenda')) {

-		// Search histo on actioncomm

-		if (is_object($objcon) && $objcon->id > 0) {

-			$sql = "SELECT DISTINCT a.id, a.label as label,";

-		} else {

-			$sql = "SELECT a.id, a.label as label,";

-		}

-		$sql .= " a.datep as dp,";

-		$sql .= " a.note as message,";

-		$sql .= " a.datep2 as dp2,";

-		$sql .= " a.percent as percent, 'action' as type,";

-		$sql .= " a.fk_element, a.elementtype,";

-		$sql .= " a.fk_contact,";

-		$sql .= " a.email_from as msg_from,";

-		$sql .= " c.code as acode, c.libelle as alabel, c.picto as apicto,";

-		$sql .= " u.rowid as user_id, u.login as user_login, u.photo as user_photo, u.firstname as user_firstname, u.lastname as user_lastname";

-		if (is_object($filterobj) && get_class($filterobj) == 'Societe') {

-			$sql .= ", sp.lastname, sp.firstname";

-		} elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') {

-			$sql .= ", m.lastname, m.firstname";

-		} elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') {

-			$sql .= ", o.ref";

-		} elseif (is_object($filterobj) && get_class($filterobj) == 'Product') {

-			$sql .= ", o.ref";

-		} elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') {

-			$sql .= ", o.ref";

-		} elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') {

-			$sql .= ", o.ref";

-		} elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') {

-			$sql .= ", o.ref";

-		}

-		$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a";

-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on u.rowid = a.fk_user_action";

-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_actioncomm as c ON a.fk_action = c.id";

-

-		$force_filter_contact = false;

-		if (is_object($objcon) && $objcon->id > 0) {

-			$force_filter_contact = true;

-			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm_resources as r ON a.id = r.fk_actioncomm";

-			$sql .= " AND r.element_type = '".$db->escape($objcon->table_element)."' AND r.fk_element = ".((int) $objcon->id);

-		}

-

-		if (is_object($filterobj) && get_class($filterobj) == 'Societe') {

-			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";

-		} elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') {

-			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."element_resources as er";

-			$sql .= " ON er.resource_type = 'dolresource'";

-			$sql .= " AND er.element_id = a.id";

-			$sql .= " AND er.resource_id = ".((int) $filterobj->id);

-		} elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') {

-			$sql .= ", ".MAIN_DB_PREFIX."adherent as m";

-		} elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') {

-			$sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as o";

-		} elseif (is_object($filterobj) && get_class($filterobj) == 'Product') {

-			$sql .= ", ".MAIN_DB_PREFIX."product as o";

-		} elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') {

-			$sql .= ", ".MAIN_DB_PREFIX."ticket as o";

-		} elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') {

-			$sql .= ", ".MAIN_DB_PREFIX."bom_bom as o";

-		} elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') {

-			$sql .= ", ".MAIN_DB_PREFIX."contrat as o";

-		}

-

-		$sql .= " WHERE a.entity IN (".getEntity('agenda').")";

-		if ($force_filter_contact === false) {

-			if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur')) && $filterobj->id) {

-				$sql .= " AND a.fk_soc = ".((int) $filterobj->id);

-			} elseif (is_object($filterobj) && get_class($filterobj) == 'Project' && $filterobj->id) {

-				$sql .= " AND a.fk_project = ".((int) $filterobj->id);

-			} elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') {

-				$sql .= " AND a.fk_element = m.rowid AND a.elementtype = 'member'";

-				if ($filterobj->id) {

-					$sql .= " AND a.fk_element = ".((int) $filterobj->id);

-				}

-			} elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') {

-				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'order_supplier'";

-				if ($filterobj->id) {

-					$sql .= " AND a.fk_element = ".((int) $filterobj->id);

-				}

-			} elseif (is_object($filterobj) && get_class($filterobj) == 'Product') {

-				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'product'";

-				if ($filterobj->id) {

-					$sql .= " AND a.fk_element = ".((int) $filterobj->id);

-				}

-			} elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') {

-				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'ticket'";

-				if ($filterobj->id) {

-					$sql .= " AND a.fk_element = ".((int) $filterobj->id);

-				}

-			} elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') {

-				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'bom'";

-				if ($filterobj->id) {

-					$sql .= " AND a.fk_element = ".((int) $filterobj->id);

-				}

-			} elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') {

-				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'contract'";

-				if ($filterobj->id) {

-					$sql .= " AND a.fk_element = ".((int) $filterobj->id);

-				}

-			}

-		}

-

-		// Condition on actioncode

-		if (!empty($actioncode)) {

-			if (!getDolGlobalString('AGENDA_USE_EVENT_TYPE')) {

-				if ($actioncode == 'AC_NON_AUTO') {

-					$sql .= " AND c.type != 'systemauto'";

-				} elseif ($actioncode == 'AC_ALL_AUTO') {

-					$sql .= " AND c.type = 'systemauto'";

-				} else {

-					if ($actioncode == 'AC_OTH') {

-						$sql .= " AND c.type != 'systemauto'";

-					} elseif ($actioncode == 'AC_OTH_AUTO') {

-						$sql .= " AND c.type = 'systemauto'";

-					}

-				}

-			} else {

-				if ($actioncode == 'AC_NON_AUTO') {

-					$sql .= " AND c.type != 'systemauto'";

-				} elseif ($actioncode == 'AC_ALL_AUTO') {

-					$sql .= " AND c.type = 'systemauto'";

-				} else {

-					$sql .= " AND c.code = '".$db->escape($actioncode)."'";

-				}

-			}

-		}

-		if ($donetodo == 'todo') {

-			$sql .= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))";

-		} elseif ($donetodo == 'done') {

-			$sql .= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))";

-		}

-		if (is_array($filters) && $filters['search_agenda_label']) {

-			$sql .= natural_search('a.label', $filters['search_agenda_label']);

-		}

-	}

-

-	// Add also event from emailings. TODO This should be replaced by an automatic event ? May be it's too much for very large emailing.

-	if (isModEnabled('mailing') && !empty($objcon->email)

-		&& (empty($actioncode) || $actioncode == 'AC_OTH_AUTO' || $actioncode == 'AC_EMAILING')) {

-		$langs->load("mails");

-

-		$sql2 = "SELECT m.rowid as id, m.titre as label, mc.date_envoi as dp, mc.date_envoi as dp2, '100' as percent, 'mailing' as type";

-		$sql2 .= ", null as fk_element, '' as elementtype, null as contact_id";

-		$sql2 .= ", 'AC_EMAILING' as acode, '' as alabel, '' as apicto";

-		$sql2 .= ", u.rowid as user_id, u.login as user_login, u.photo as user_photo, u.firstname as user_firstname, u.lastname as user_lastname"; // User that valid action

-		if (is_object($filterobj) && get_class($filterobj) == 'Societe') {

-			$sql2 .= ", '' as lastname, '' as firstname";

-		} elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') {

-			$sql2 .= ", '' as lastname, '' as firstname";

-		} elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') {

-			$sql2 .= ", '' as ref";

-		} elseif (is_object($filterobj) && get_class($filterobj) == 'Product') {

-			$sql2 .= ", '' as ref";

-		} elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') {

-			$sql2 .= ", '' as ref";

-		}

-		$sql2 .= " FROM ".MAIN_DB_PREFIX."mailing as m, ".MAIN_DB_PREFIX."mailing_cibles as mc, ".MAIN_DB_PREFIX."user as u";

-		$sql2 .= " WHERE mc.email = '".$db->escape($objcon->email)."'"; // Search is done on email.

-		$sql2 .= " AND mc.statut = 1";

-		$sql2 .= " AND u.rowid = m.fk_user_valid";

-		$sql2 .= " AND mc.fk_mailing=m.rowid";

-	}

-

-	if (!empty($sql) && !empty($sql2)) {

-		$sql = $sql." UNION ".$sql2;

-	} elseif (empty($sql) && !empty($sql2)) {

-		$sql = $sql2;

-	}

-

-	// TODO Add limit in nb of results

-	if ($sql) {	// May not be defined if module Agenda is not enabled and mailing module disabled too

-		$sql .= $db->order($sortfield_new, $sortorder);

-

-		dol_syslog("function.lib::show_actions_messaging", LOG_DEBUG);

-		$resql = $db->query($sql);

-		if ($resql) {

-			$i = 0;

-			$num = $db->num_rows($resql);

-

-			while ($i < $num) {

-				$obj = $db->fetch_object($resql);

-

-				if ($obj->type == 'action') {

-					$contactaction = new ActionComm($db);

-					$contactaction->id = $obj->id;

-					$result = $contactaction->fetchResources();

-					if ($result < 0) {

-						dol_print_error($db);

-						setEventMessage("actions.lib::show_actions_messaging Error fetch ressource", 'errors');

-					}

-

-					//if ($donetodo == 'todo') $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))";

-					//elseif ($donetodo == 'done') $sql.= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))";

-					$tododone = '';

-					if (($obj->percent >= 0 and $obj->percent < 100) || ($obj->percent == -1 && $obj->dp > $now)) {

-						$tododone = 'todo';

-					}

-

-					$histo[$numaction] = array(

-						'type'=>$obj->type,

-						'tododone'=>$tododone,

-						'id'=>$obj->id,

-						'datestart'=>$db->jdate($obj->dp),

-						'dateend'=>$db->jdate($obj->dp2),

-						'note'=>$obj->label,

-						'message'=>$obj->message,

-						'percent'=>$obj->percent,

-

-						'userid'=>$obj->user_id,

-						'login'=>$obj->user_login,

-						'userfirstname'=>$obj->user_firstname,

-						'userlastname'=>$obj->user_lastname,

-						'userphoto'=>$obj->user_photo,

-						'msg_from'=>$obj->msg_from,

-

-						'contact_id'=>$obj->fk_contact,

-						'socpeopleassigned' => $contactaction->socpeopleassigned,

-						'lastname' => (empty($obj->lastname) ? '' : $obj->lastname),

-						'firstname' => (empty($obj->firstname) ? '' : $obj->firstname),

-						'fk_element'=>$obj->fk_element,

-						'elementtype'=>$obj->elementtype,

-						// Type of event

-						'acode'=>$obj->acode,

-						'alabel'=>$obj->alabel,

-						'libelle'=>$obj->alabel, // deprecated

-						'apicto'=>$obj->apicto

-					);

-				} else {

-					$histo[$numaction] = array(

-						'type'=>$obj->type,

-						'tododone'=>'done',

-						'id'=>$obj->id,

-						'datestart'=>$db->jdate($obj->dp),

-						'dateend'=>$db->jdate($obj->dp2),

-						'note'=>$obj->label,

-						'message'=>$obj->message,

-						'percent'=>$obj->percent,

-						'acode'=>$obj->acode,

-

-						'userid'=>$obj->user_id,

-						'login'=>$obj->user_login,

-						'userfirstname'=>$obj->user_firstname,

-						'userlastname'=>$obj->user_lastname,

-						'userphoto'=>$obj->user_photo

-					);

-				}

-

-				$numaction++;

-				$i++;

-			}

-		} else {

-			dol_print_error($db);

-		}

-	}

-

-	// Set $out to show events

-	$out = '';

-

-	if (!isModEnabled('agenda')) {

-		$langs->loadLangs(array("admin", "errors"));

-		$out = info_admin($langs->trans("WarningModuleXDisabledSoYouMayMissEventHere", $langs->transnoentitiesnoconv("Module2400Name")), 0, 0, 'warning');

-	}

-

-	if (isModEnabled('agenda') || (isModEnabled('mailing') && !empty($objcon->email))) {

-		$delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO * 24 * 60 * 60;

-

-		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';

-		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';

-		require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';

-		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';

-

-		$formactions = new FormActions($db);

-

-		$actionstatic = new ActionComm($db);

-		$userstatic = new User($db);

-		$contactstatic = new Contact($db);

-		$userGetNomUrlCache = array();

-		$contactGetNomUrlCache = array();

-

-		$out .= '<div class="filters-container" >';

-		$out .= '<form name="listactionsfilter" class="listactionsfilter" action="'.$_SERVER["PHP_SELF"].'" method="POST">';

-		$out .= '<input type="hidden" name="token" value="'.newToken().'">';

-

-		if ($objcon && get_class($objcon) == 'Contact' &&

-			(is_null($filterobj) || get_class($filterobj) == 'Societe')) {

-			$out .= '<input type="hidden" name="id" value="'.$objcon->id.'" />';

-		} else {

-			$out .= '<input type="hidden" name="id" value="'.$filterobj->id.'" />';

-		}

-		if ($filterobj && get_class($filterobj) == 'Societe') {

-			$out .= '<input type="hidden" name="socid" value="'.$filterobj->id.'" />';

-		}

-

-		$out .= "\n";

-

-		$out .= '<div class="div-table-responsive-no-min">';

-		$out .= '<table class="noborder borderbottom centpercent">';

-

-		$out .= '<tr class="liste_titre">';

-

-		// Action column

-		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {

-			$out .= '<th class="liste_titre width50 middle">';

-			$searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1);

-			$out .= $searchpicto;

-			$out .= '</th>';

-		}

-

-		$out .= getTitleFieldOfList('Date', 0, $_SERVER["PHP_SELF"], 'a.datep', '', $param, '', $sortfield, $sortorder, '')."\n";

-

-		$out .= '<th class="liste_titre"><strong class="hideonsmartphone">'.$langs->trans("Search").' : </strong></th>';

-		if ($donetodo) {

-			$out .= '<th class="liste_titre"></th>';

-		}

-		$out .= '<th class="liste_titre">';

-		$out .= '<span class="fas fa-square inline-block fawidth30" style=" color: #ddd;" title="'.$langs->trans("ActionType").'"></span>';

-		//$out .= img_picto($langs->trans("Type"), 'type');

-		$out .= $formactions->select_type_actions($actioncode, "actioncode", '', !getDolGlobalString('AGENDA_USE_EVENT_TYPE') ? 1 : -1, 0, 0, 1, 'minwidth200imp');

-		$out .= '</th>';

-		$out .= '<th class="liste_titre maxwidth100onsmartphone">';

-		$out .= '<input type="text" class="maxwidth100onsmartphone" name="search_agenda_label" value="'.$filters['search_agenda_label'].'" placeholder="'.$langs->trans("Label").'">';

-		$out .= '</th>';

-

-		// Action column

-		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {

-			$out .= '<th class="liste_titre width50 middle">';

-			$searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1);

-			$out .= $searchpicto;

-			$out .= '</th>';

-		}

-

-		$out .= '</tr>';

-

-

-		$out .= '</table>';

-

-		$out .= '</form>';

-		$out .= '</div>';

-

-		$out .= "\n";

-

-		$out .= '<ul class="timeline">';

-

-		if ($donetodo) {

-			$tmp = '';

-			if (get_class($filterobj) == 'Societe') {

-				$tmp .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php?mode=show_list&socid='.$filterobj->id.'&status=done">';

-			}

-			$tmp .= ($donetodo != 'done' ? $langs->trans("ActionsToDoShort") : '');

-			$tmp .= ($donetodo != 'done' && $donetodo != 'todo' ? ' / ' : '');

-			$tmp .= ($donetodo != 'todo' ? $langs->trans("ActionsDoneShort") : '');

-			//$out.=$langs->trans("ActionsToDoShort").' / '.$langs->trans("ActionsDoneShort");

-			if (get_class($filterobj) == 'Societe') {

-				$tmp .= '</a>';

-			}

-			$out .= getTitleFieldOfList($tmp);

-		}

-

-		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';

-		$caction = new CActionComm($db);

-		$arraylist = $caction->liste_array(1, 'code', '', (!getDolGlobalString('AGENDA_USE_EVENT_TYPE') ? 1 : 0), '', 1);

-

-		$actualCycleDate = false;

-

-		// Loop on each event to show it

-		foreach ($histo as $key => $value) {

-			$actionstatic->fetch($histo[$key]['id']); // TODO Do we need this, we already have a lot of data of line into $histo

-

-			$actionstatic->type_picto = $histo[$key]['apicto'];

-			$actionstatic->type_code = $histo[$key]['acode'];

-

-			$labeltype = $actionstatic->type_code;

-			if (!getDolGlobalString('AGENDA_USE_EVENT_TYPE') && empty($arraylist[$labeltype])) {

-				$labeltype = 'AC_OTH';

-			}

-			if (!empty($actionstatic->code) && preg_match('/^TICKET_MSG/', $actionstatic->code)) {

-				$labeltype = $langs->trans("Message");

-			} else {

-				if (!empty($arraylist[$labeltype])) {

-					$labeltype = $arraylist[$labeltype];

-				}

-				if ($actionstatic->type_code == 'AC_OTH_AUTO' && ($actionstatic->type_code != $actionstatic->code) && $labeltype && !empty($arraylist[$actionstatic->code])) {

-					$labeltype .= ' - '.$arraylist[$actionstatic->code]; // Use code in priority on type_code

-				}

-			}

-

-			$url = DOL_URL_ROOT.'/comm/action/card.php?id='.$histo[$key]['id'];

-

-			$tmpa = dol_getdate($histo[$key]['datestart'], false);

-

-			if (isset($tmpa['year']) && isset($tmpa['yday']) && $actualCycleDate !== $tmpa['year'].'-'.$tmpa['yday']) {

-				$actualCycleDate = $tmpa['year'].'-'.$tmpa['yday'];

-				$out .= '<!-- timeline time label -->';

-				$out .= '<li class="time-label">';

-				$out .= '<span class="timeline-badge-date">';

-				$out .= dol_print_date($histo[$key]['datestart'], 'daytext', 'tzuserrel', $langs);

-				$out .= '</span>';

-				$out .= '</li>';

-				$out .= '<!-- /.timeline-label -->';

-			}

-

-

-			$out .= '<!-- timeline item -->'."\n";

-			$out .= '<li class="timeline-code-'.strtolower($actionstatic->code).'">';

-

-			//$timelineicon = getTimelineIcon($actionstatic, $histo, $key);

-			$typeicon = $actionstatic->getTypePicto('pictofixedwidth timeline-icon-not-applicble', $labeltype);

-			//$out .= $timelineicon;

-			//var_dump($timelineicon);

-			$out .= $typeicon;

-

-			$out .= '<div class="timeline-item">'."\n";

-

-			$out .= '<span class="time timeline-header-action2">';

-

-			if (isset($histo[$key]['type']) && $histo[$key]['type'] == 'mailing') {

-				$out .= '<a class="paddingleft paddingright timeline-btn2 editfielda" href="'.DOL_URL_ROOT.'/comm/mailing/card.php?id='.$histo[$key]['id'].'">'.img_object($langs->trans("ShowEMailing"), "email").' ';

-				$out .= $histo[$key]['id'];

-				$out .= '</a> ';

-			} else {

-				$out .= $actionstatic->getNomUrl(1, -1, 'valignmiddle').' ';

-			}

-

-			if ($user->hasRight('agenda', 'allactions', 'create') ||

-				(($actionstatic->authorid == $user->id || $actionstatic->userownerid == $user->id) && $user->hasRight('agenda', 'myactions', 'create'))) {

-				$out .= '<a class="paddingleft paddingright timeline-btn2 editfielda" href="'.DOL_MAIN_URL_ROOT.'/comm/action/card.php?action=edit&token='.newToken().'&id='.$actionstatic->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?'.$param).'">';

-				//$out .= '<i class="fa fa-pencil" title="'.$langs->trans("Modify").'" ></i>';

-				$out .= img_picto($langs->trans("Modify"), 'edit', 'class="edita"');

-				$out .= '</a>';

-			}

-

-			$out .= '</span>';

-

-			// Date

-			$out .= '<span class="time"><i class="fa fa-clock-o valignmiddle"></i> <span class="valignmiddle">';

-			$out .= dol_print_date($histo[$key]['datestart'], 'dayhour', 'tzuserrel');

-			if ($histo[$key]['dateend'] && $histo[$key]['dateend'] != $histo[$key]['datestart']) {

-				$tmpa = dol_getdate($histo[$key]['datestart'], true);

-				$tmpb = dol_getdate($histo[$key]['dateend'], true);

-				if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) {

-					$out .= '-'.dol_print_date($histo[$key]['dateend'], 'hour', 'tzuserrel');

-				} else {

-					$out .= '-'.dol_print_date($histo[$key]['dateend'], 'dayhour', 'tzuserrel');

-				}

-			}

-			$late = 0;

-			if ($histo[$key]['percent'] == 0 && $histo[$key]['datestart'] && $histo[$key]['datestart'] < ($now - $delay_warning)) {

-				$late = 1;

-			}

-			if ($histo[$key]['percent'] == 0 && !$histo[$key]['datestart'] && $histo[$key]['dateend'] && $histo[$key]['datestart'] < ($now - $delay_warning)) {

-				$late = 1;

-			}

-			if ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100 && $histo[$key]['dateend'] && $histo[$key]['dateend'] < ($now - $delay_warning)) {

-				$late = 1;

-			}

-			if ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100 && !$histo[$key]['dateend'] && $histo[$key]['datestart'] && $histo[$key]['datestart'] < ($now - $delay_warning)) {

-				$late = 1;

-			}

-			if ($late) {

-				$out .= img_warning($langs->trans("Late")).' ';

-			}

-			$out .= "</span></span>\n";

-

-			// Ref

-			$out .= '<h3 class="timeline-header">';

-

-			// Author of event

-			$out .= '<div class="messaging-author inline-block tdoverflowmax150 valignmiddle marginrightonly">';

-			if ($histo[$key]['userid'] > 0) {

-				if (!isset($userGetNomUrlCache[$histo[$key]['userid']])) { // is in cache ?

-					$userstatic->fetch($histo[$key]['userid']);

-					$userGetNomUrlCache[$histo[$key]['userid']] = $userstatic->getNomUrl(-1, '', 0, 0, 16, 0, 'firstelselast', '');

-				}

-				$out .= $userGetNomUrlCache[$histo[$key]['userid']];

-			} elseif (!empty($histo[$key]['msg_from']) && $actionstatic->code == 'TICKET_MSG') {

-				if (!isset($contactGetNomUrlCache[$histo[$key]['msg_from']])) {

-					if ($contactstatic->fetch(0, null, '', $histo[$key]['msg_from']) > 0) {

-						$contactGetNomUrlCache[$histo[$key]['msg_from']] = $contactstatic->getNomUrl(-1, '', 16);

-					} else {

-						$contactGetNomUrlCache[$histo[$key]['msg_from']] = $histo[$key]['msg_from'];

-					}

-				}

-				$out .= $contactGetNomUrlCache[$histo[$key]['msg_from']];

-			}

-			$out .= '</div>';

-

-			// Title

-			$out .= ' <div class="messaging-title inline-block">';

-			//$out .= $actionstatic->getTypePicto();

-			if (empty($conf->dol_optimize_smallscreen) && $actionstatic->type_code != 'AC_OTH_AUTO') {

-				$out .= $labeltype.' - ';

-			}

-

-			$libelle = '';

-			if (preg_match('/^TICKET_MSG/', $actionstatic->code)) {

-				$out .= $langs->trans('TicketNewMessage');

-			} elseif (preg_match('/^TICKET_MSG_PRIVATE/', $actionstatic->code)) {

-				$out .= $langs->trans('TicketNewMessage').' <em>('.$langs->trans('Private').')</em>';

-			} elseif (isset($histo[$key]['type'])) {

-				if ($histo[$key]['type'] == 'action') {

-					$transcode = $langs->transnoentitiesnoconv("Action".$histo[$key]['acode']);

-					$libelle = ($transcode != "Action".$histo[$key]['acode'] ? $transcode : $histo[$key]['alabel']);

-					$libelle = $histo[$key]['note'];

-					$actionstatic->id = $histo[$key]['id'];

-					$out .= dol_escape_htmltag(dol_trunc($libelle, 120));

-				} elseif ($histo[$key]['type'] == 'mailing') {

-					$out .= '<a href="'.DOL_URL_ROOT.'/comm/mailing/card.php?id='.$histo[$key]['id'].'">'.img_object($langs->trans("ShowEMailing"), "email").' ';

-					$transcode = $langs->transnoentitiesnoconv("Action".$histo[$key]['acode']);

-					$libelle = ($transcode != "Action".$histo[$key]['acode'] ? $transcode : 'Send mass mailing');

-					$out .= dol_escape_htmltag(dol_trunc($libelle, 120));

-				} else {

-					$libelle .= $histo[$key]['note'];

-					$out .= dol_escape_htmltag(dol_trunc($libelle, 120));

-				}

-			}

-

-			if (isset($histo[$key]['elementtype']) && !empty($histo[$key]['fk_element'])) {

-				if (isset($conf->cache['elementlinkcache'][$histo[$key]['elementtype']]) && isset($conf->cache['elementlinkcache'][$histo[$key]['elementtype']][$histo[$key]['fk_element']])) {

-					$link = $conf->cache['elementlinkcache'][$histo[$key]['elementtype']][$histo[$key]['fk_element']];

-				} else {

-					if (!isset($conf->cache['elementlinkcache'][$histo[$key]['elementtype']])) {

-						$conf->cache['elementlinkcache'][$histo[$key]['elementtype']] = array();

-					}

-					$link = dolGetElementUrl($histo[$key]['fk_element'], $histo[$key]['elementtype'], 1);

-					$conf->cache['elementlinkcache'][$histo[$key]['elementtype']][$histo[$key]['fk_element']] = $link;

-				}

-				if ($link) {

-					$out .= ' - '.$link;

-				}

-			}

-

-			$out .= '</div>';

-

-			$out .= '</h3>';

-

-			// Message

-			if (!empty($histo[$key]['message'] && $histo[$key]['message'] != $libelle)

-				&& $actionstatic->code != 'AC_TICKET_CREATE'

-				&& $actionstatic->code != 'AC_TICKET_MODIFY'

-			) {

-				$out .= '<div class="timeline-body wordbreak">';

-				$truncateLines = getDolGlobalInt('MAIN_TRUNCATE_TIMELINE_MESSAGE', 3);

-				$truncatedText = dolGetFirstLineOfText($histo[$key]['message'], $truncateLines);

-				if ($truncateLines > 0 && strlen($histo[$key]['message']) > strlen($truncatedText)) {

-					$out .= '<div class="readmore-block --closed" >';

-					$out .= '	<div class="readmore-block__excerpt" >';

-					$out .= 	$truncatedText ;

-					$out .= ' 	<a class="read-more-link" data-read-more-action="open" href="'.DOL_MAIN_URL_ROOT.'/comm/action/card.php?id='.$actionstatic->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?'.$param).'" >'.$langs->trans("ReadMore").' <span class="fa fa-chevron-right" aria-hidden="true"></span></a>';

-					$out .= '	</div>';

-					$out .= '	<div class="readmore-block__full-text" >';

-					$out .= $histo[$key]['message'];

-					$out .= ' 	<a class="read-less-link" data-read-more-action="close" href="#" ><span class="fa fa-chevron-up" aria-hidden="true"></span> '.$langs->trans("ReadLess").'</a>';

-					$out .= '	</div>';

-					$out .= '</div>';

-				} else {

-					$out .= $histo[$key]['message'];

-				}

-

-				$out .= '</div>';

-			}

-

-			// Timeline footer

-			$footer = '';

-

-			// Contact for this action

-			if (isset($histo[$key]['socpeopleassigned']) && is_array($histo[$key]['socpeopleassigned']) && count($histo[$key]['socpeopleassigned']) > 0) {

-				$contactList = '';

-				foreach ($histo[$key]['socpeopleassigned'] as $cid => $Tab) {

-					if (empty($conf->cache['contact'][$histo[$key]['contact_id']])) {

-						$contact = new Contact($db);

-						$contact->fetch($cid);

-						$conf->cache['contact'][$histo[$key]['contact_id']] = $contact;

-					} else {

-						$contact = $conf->cache['contact'][$histo[$key]['contact_id']];

-					}

-

-					if ($contact) {

-						$contactList .= !empty($contactList) ? ', ' : '';

-						$contactList .= $contact->getNomUrl(1);

-						if (isset($histo[$key]['acode']) && $histo[$key]['acode'] == 'AC_TEL') {

-							if (!empty($contact->phone_pro)) {

-								$contactList .= '('.dol_print_phone($contact->phone_pro).')';

-							}

-						}

-					}

-				}

-

-				$footer .= $langs->trans('ActionOnContact').' : '.$contactList;

-			} elseif (empty($objcon->id) && isset($histo[$key]['contact_id']) && $histo[$key]['contact_id'] > 0) {

-				if (empty($conf->cache['contact'][$histo[$key]['contact_id']])) {

-					$contact = new Contact($db);

-					$result = $contact->fetch($histo[$key]['contact_id']);

-					$conf->cache['contact'][$histo[$key]['contact_id']] = $contact;

-				} else {

-					$contact = $conf->cache['contact'][$histo[$key]['contact_id']];

-				}

-

-				if ($result > 0) {

-					$footer .= $contact->getNomUrl(1);

-					if (isset($histo[$key]['acode']) && $histo[$key]['acode'] == 'AC_TEL') {

-						if (!empty($contact->phone_pro)) {

-							$footer .= '('.dol_print_phone($contact->phone_pro).')';

-						}

-					}

-				}

-			}

-

-			$documents = getActionCommEcmList($actionstatic);

-			if (!empty($documents)) {

-				$footer .= '<div class="timeline-documents-container">';

-				foreach ($documents as $doc) {

-					$footer .= '<span id="document_'.$doc->id.'" class="timeline-documents" ';

-					$footer .= ' data-id="'.$doc->id.'" ';

-					$footer .= ' data-path="'.$doc->filepath.'"';

-					$footer .= ' data-filename="'.dol_escape_htmltag($doc->filename).'" ';

-					$footer .= '>';

-

-					$filePath = DOL_DATA_ROOT.'/'.$doc->filepath.'/'.$doc->filename;

-					$mime = dol_mimetype($filePath);

-					$file = $actionstatic->id.'/'.$doc->filename;

-					$thumb = $actionstatic->id.'/thumbs/'.substr($doc->filename, 0, strrpos($doc->filename, '.')).'_mini'.substr($doc->filename, strrpos($doc->filename, '.'));

-					$doclink = dol_buildpath('document.php', 1).'?modulepart=actions&attachment=0&file='.urlencode($file).'&entity='.$conf->entity;

-					$viewlink = dol_buildpath('viewimage.php', 1).'?modulepart=actions&file='.urlencode($thumb).'&entity='.$conf->entity;

-

-					$mimeAttr = ' mime="'.$mime.'" ';

-					$class = '';

-					if (in_array($mime, array('image/png', 'image/jpeg', 'application/pdf'))) {

-						$class .= ' documentpreview';

-					}

-

-					$footer .= '<a href="'.$doclink.'" class="btn-link '.$class.'" target="_blank" rel="noopener noreferrer" '.$mimeAttr.' >';

-					$footer .= img_mime($filePath).' '.$doc->filename;

-					$footer .= '</a>';

-

-					$footer .= '</span>';

-				}

-				$footer .= '</div>';

-			}

-

-			if (!empty($footer)) {

-				$out .= '<div class="timeline-footer">'.$footer.'</div>';

-			}

-

-			$out .= '</div>'."\n"; // end timeline-item

-

-			$out .= '</li>';

-			$out .= '<!-- END timeline item -->';

-

-			$i++;

-		}

-

-		$out .= "</ul>\n";

-

-		$out .= '<script>

-				jQuery(document).ready(function () {

-				   $(document).on("click", "[data-read-more-action]", function(e){

-					   let readMoreBloc = $(this).closest(".readmore-block");

-					   if(readMoreBloc.length > 0){

-							e.preventDefault();

-							if($(this).attr("data-read-more-action") == "close"){

-								readMoreBloc.addClass("--closed").removeClass("--open");

-								 $("html, body").animate({

-									scrollTop: readMoreBloc.offset().top - 200

-								}, 100);

-							}else{

-								readMoreBloc.addClass("--open").removeClass("--closed");

-							}

-					   }

-					});

-				});

-			</script>';

-

-

-		if (empty($histo)) {

-			$out .= '<span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span>';

-		}

-	}

-

-	if ($noprint) {

-		return $out;

-	} else {

-		print $out;

-	}

-}

-

-/**

- * Helper function that combines values of a dolibarr DatePicker (such as Form::selectDate) for year, month, day (and

- * optionally hour, minute, second) fields to return a timestamp.

- *

- * @param string $prefix Prefix used to build the date selector (for instance using Form::selectDate)

- * @param string $hourTime  'getpost' to include hour, minute, second values from the HTTP request, 'XX:YY:ZZ' to set

- *                          hour, minute, second respectively (for instance '23:59:59')

- * @param string $gm Passed to dol_mktime

- * @return int|string  Date as a timestamp, '' or false if error

- */

-function GETPOSTDATE($prefix, $hourTime = '', $gm = 'auto')

-{

-	if ($hourTime === 'getpost') {

-		$hour   = GETPOSTINT($prefix . 'hour');

-		$minute = GETPOSTINT($prefix . 'minute');

-		$second = GETPOSTINT($prefix . 'second');

-	} elseif (preg_match('/^(\d\d):(\d\d):(\d\d)$/', $hourTime, $m)) {

-		$hour   = intval($m[1]);

-		$minute = intval($m[2]);

-		$second = intval($m[3]);

-	} else {

-		$hour = $minute = $second = 0;

-	}

-	// normalize out of range values

-	$hour = min($hour, 23);

-	$minute = min($minute, 59);

-	$second = min($second, 59);

-	return dol_mktime($hour, $minute, $second, GETPOSTINT($prefix . 'month'), GETPOSTINT($prefix . 'day'), GETPOSTINT($prefix . 'year'), $gm);

-}

-

-/**

- * Helper function that combines values of a dolibarr DatePicker (such as Form::selectDate) for year, month, day (and

- * optionally hour, minute, second) fields to return a a portion of URL reproducing the values from the current HTTP

- * request.

- *

- * @param string $prefix Prefix used to build the date selector (for instance using Form::selectDate)

- * @param int $timestamp If null, the timestamp will be created from request data

- * @param bool $hourTime If timestamp is null, will be passed to GETPOSTDATE to construct the timestamp

- * @param bool $gm If timestamp is null, will be passed to GETPOSTDATE to construct the timestamp

- * @return string Portion of URL with query parameters for the specified date

- */

-function buildParamDate($prefix, $timestamp = null, $hourTime = '', $gm = 'auto')

-{

-	if ($timestamp === null) {

-		$timestamp = GETPOSTDATE($prefix, $hourTime, $gm);

-	}

-	$TParam = array(

-		$prefix . 'day'   => intval(dol_print_date($timestamp, '%d')),

-		$prefix . 'month' => intval(dol_print_date($timestamp, '%m')),

-		$prefix . 'year'  => intval(dol_print_date($timestamp, '%Y')),

-	);

-	if ($hourTime === 'getpost' || ($timestamp !== null && dol_print_date($timestamp, '%H:%M:%S') !== '00:00:00')) {

-		$TParam = array_merge($TParam, array(

-			$prefix . 'hour'   => intval(dol_print_date($timestamp, '%H')),

-			$prefix . 'minute' => intval(dol_print_date($timestamp, '%M')),

-			$prefix . 'second' => intval(dol_print_date($timestamp, '%S'))

-		));

-	}

-

-	return '&' . http_build_query($TParam);

-}

+	return $_SESSION['token'];

+}

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_functions2.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_functions2.lib.php
@@ -42,28 +42,29 @@
-	$decodedStr = "";

-	$pos = 0;

-	$len = strlen($source);

-	while ($pos < $len) {

-		$charAt = substr($source, $pos, 1);

-		if ($charAt == '%') {

-			$pos++;

-			$charAt = substr($source, $pos, 1);

-			if ($charAt == 'u') {

-				// we got a unicode character

-				$pos++;

-				$unicodeHexVal = substr($source, $pos, 4);

-				$unicode = hexdec($unicodeHexVal);

-				$entity = "&#".$unicode.';';

-				$decodedStr .= mb_convert_encoding($entity, 'UTF-8', 'ISO-8859-1');

-				$pos += 4;

-			} else {

-				// we have an escaped ascii character

-				$hexVal = substr($source, $pos, 2);

-				$decodedStr .= chr(hexdec($hexVal));

-				$pos += 2;

-			}

-		} else {

-			$decodedStr .= $charAt;

-			$pos++;

-		}

-	}

-	return dol_html_entity_decode($decodedStr, ENT_COMPAT | ENT_HTML5);

+    $decodedStr = "";

+    $pos = 0;

+    $len = strlen($source);

+    while ($pos < $len) {

+        $charAt = substr($source, $pos, 1);

+        if ($charAt == '%') {

+            $pos++;

+            $charAt = substr($source, $pos, 1);

+            if ($charAt == 'u') {

+                // we got a unicode character

+                $pos++;

+                $unicodeHexVal = substr($source, $pos, 4);

+                $unicode = hexdec($unicodeHexVal);

+                $entity = "&#".$unicode.';';

+                $decodedStr .= utf8_encode($entity);

+                $pos += 4;

+            }

+            else {

+                // we have an escaped ascii character

+                $hexVal = substr($source, $pos, 2);

+                $decodedStr .= chr(hexdec($hexVal));

+                $pos += 2;

+            }

+        } else {

+            $decodedStr .= $charAt;

+            $pos++;

+        }

+    }

+    return dol_html_entity_decode($decodedStr, ENT_COMPAT);

@@ -82,28 +83,31 @@
-	global $conf;

-

-	$modulesdir = array();

-

-	foreach ($conf->file->dol_document_root as $type => $dirroot) {

-		// Default core/modules dir

-		if ($type === 'main') {

-			$modulesdir[$dirroot.'/core/modules'.$subdir.'/'] = $dirroot.'/core/modules'.$subdir.'/';

-		}

-

-		// Scan dir from external modules

-		$handle = @opendir($dirroot);

-		if (is_resource($handle)) {

-			while (($file = readdir($handle)) !== false) {

-				if (preg_match('/disabled/', $file)) {

-					continue; // We discard module if it contains disabled into name.

-				}

-

-				if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) != '.' && substr($file, 0, 3) != 'CVS' && $file != 'includes') {

-					if (is_dir($dirroot.'/'.$file.'/core/modules'.$subdir.'/')) {

-						$modulesdir[$dirroot.'/'.$file.'/core/modules'.$subdir.'/'] = $dirroot.'/'.$file.'/core/modules'.$subdir.'/';

-					}

-				}

-			}

-			closedir($handle);

-		}

-	}

-	return $modulesdir;

+    global $conf;

+

+    $modulesdir = array();

+

+    foreach ($conf->file->dol_document_root as $type => $dirroot)

+    {

+        // Default core/modules dir

+        if ($type === 'main') {

+            $modulesdir[$dirroot.'/core/modules'.$subdir.'/'] = $dirroot.'/core/modules'.$subdir.'/';

+        }

+

+        // Scan dir from external modules

+        $handle = @opendir($dirroot);

+        if (is_resource($handle))

+        {

+            while (($file = readdir($handle)) !== false)

+            {

+                if (preg_match('/disabled/', $file)) continue; // We discard module if it contains disabled into name.

+

+                if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')

+                {

+                    if (is_dir($dirroot.'/'.$file.'/core/modules'.$subdir.'/'))

+                    {

+                        $modulesdir[$dirroot.'/'.$file.'/core/modules'.$subdir.'/'] = $dirroot.'/'.$file.'/core/modules'.$subdir.'/';

+                    }

+                }

+            }

+            closedir($handle);

+        }

+    }

+    return $modulesdir;

@@ -116,2 +120,2 @@
- *	@param		Translate|null	$outputlangs		Output lang to use to autodetect output format if setup not done

- *	@return		string								Default paper format code

+ *	@param		Translate	$outputlangs		Output lang to use to autodetect output format if setup not done

+ *	@return		string							Default paper format code

@@ -121,16 +125,61 @@
-	global $langs;

-

-	$selected = 'EUA4';

-	if (!$outputlangs) {

-		$outputlangs = $langs;

-	}

-

-	if ($outputlangs->defaultlang == 'ca_CA') {

-		$selected = 'CAP4'; // Canada

-	}

-	if ($outputlangs->defaultlang == 'en_US') {

-		$selected = 'USLetter'; // US

-	}

-	return $selected;

-}

-

+    global $langs;

+

+    $selected = 'EUA4';

+    if (!$outputlangs) {

+    	$outputlangs = $langs;

+    }

+

+    if ($outputlangs->defaultlang == 'ca_CA') $selected = 'CAP4'; // Canada

+    if ($outputlangs->defaultlang == 'en_US') $selected = 'USLetter'; // US

+    return $selected;

+}

+

+/**

+ *  Output content of a file $filename in version of current language (otherwise may use an alternate language)

+ *

+ *  @param	Translate	$langs          Object language to use for output

+ *  @param  string		$filename       Relative filename to output

+ *  @param  int			$searchalt      1=Search also in alternative languages

+ *	@return	boolean						true if OK, false if KO

+ */

+function dol_print_file($langs, $filename, $searchalt = 0)

+{

+    global $conf;

+

+    // Test if file is in lang directory

+    foreach ($langs->dir as $searchdir)

+    {

+        $formfile = ($searchdir."/langs/".$langs->defaultlang."/".$filename);

+        dol_syslog('functions2::dol_print_file search file '.$formfile, LOG_DEBUG);

+        if (is_readable($formfile))

+        {

+            $content = file_get_contents($formfile);

+            $isutf8 = utf8_check($content);

+            if (!$isutf8 && $conf->file->character_set_client == 'UTF-8') print utf8_encode($content);

+            elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') print utf8_decode($content);

+            else print $content;

+            return true;

+        }

+        else dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);

+

+        if ($searchalt) {

+            // Test si fichier dans repertoire de la langue alternative

+            if ($langs->defaultlang != "en_US") $formfilealt = $searchdir."/langs/en_US/".$filename;

+            else $formfilealt = $searchdir."/langs/fr_FR/".$filename;

+            dol_syslog('functions2::dol_print_file search alt file '.$formfilealt, LOG_DEBUG);

+            //print 'getcwd='.getcwd().' htmlfilealt='.$formfilealt.' X '.file_exists(getcwd().'/'.$formfilealt);

+            if (is_readable($formfilealt))

+            {

+                $content = file_get_contents($formfilealt);

+                $isutf8 = utf8_check($content);

+                if (!$isutf8 && $conf->file->character_set_client == 'UTF-8') print utf8_encode($content);

+                elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') print utf8_decode($content);

+                else print $content;

+                return true;

+            }

+            else dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);

+        }

+    }

+

+    return false;

+}

@@ -148,488 +197,285 @@
-	global $langs, $db;

-

-	// Load translation files required by the page

-	$langs->loadLangs(array('other', 'admin'));

-

-	include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';

-

-	$deltadateforserver = getServerTimeZoneInt('now');

-	$deltadateforclient = ((int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst']);

-	//$deltadateforcompany=((int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst']);

-	$deltadateforuser = round($deltadateforclient - $deltadateforserver);

-	//print "x".$deltadateforserver." - ".$deltadateforclient." - ".$deltadateforuser;

-

-	if ($usetable) {

-		print '<table class="border tableforfield centpercent">';

-	}

-

-	// Import key

-	if (!empty($object->import_key)) {

-		if ($usetable) {

-			print '<tr><td class="titlefield">';

-		}

-		print $langs->trans("ImportedWithSet");

-		if ($usetable) {

-			print '</td><td>';

-		} else {

-			print ': ';

-		}

-		print $object->import_key;

-		if ($usetable) {

-			print '</td></tr>';

-		} else {

-			print '<br>';

-		}

-	}

-

-	// User creation (old method using already loaded object and not id is kept for backward compatibility)

-	if (!empty($object->user_creation) || !empty($object->user_creation_id)) {

-		if ($usetable) {

-			print '<tr><td class="titlefield">';

-		}

-		print $langs->trans("CreatedBy");

-		if ($usetable) {

-			print '</td><td>';

-		} else {

-			print ': ';

-		}

-		if (! empty($object->user_creation) && is_object($object->user_creation)) {	// deprecated mode

-			if ($object->user_creation->id) {

-				print $object->user_creation->getNomUrl(-1, '', 0, 0, 0);

-			} else {

-				print $langs->trans("Unknown");

-			}

-		} else {

-			$userstatic = new User($db);

-			$userstatic->fetch($object->user_creation_id);

-			if ($userstatic->id) {

-				print $userstatic->getNomUrl(-1, '', 0, 0, 0);

-			} else {

-				print $langs->trans("Unknown");

-			}

-		}

-		if ($usetable) {

-			print '</td></tr>';

-		} else {

-			print '<br>';

-		}

-	}

-

-	// Date creation

-	if (!empty($object->date_creation)) {

-		if ($usetable) {

-			print '<tr><td class="titlefield">';

-		}

-		print $langs->trans("DateCreation");

-		if ($usetable) {

-			print '</td><td>';

-		} else {

-			print ': ';

-		}

-		print dol_print_date($object->date_creation, 'dayhour', 'tzserver');

-		if ($deltadateforuser) {

-			print ' <span class="opacitymedium">'.$langs->trans("CurrentHour").'</span> &nbsp; / &nbsp; '.dol_print_date($object->date_creation, "dayhour", "tzuserrel").' &nbsp;<span class="opacitymedium">'.$langs->trans("ClientHour").'</span>';

-		}

-		if ($usetable) {

-			print '</td></tr>';

-		} else {

-			print '<br>';

-		}

-	}

-

-	// User change (old method using already loaded object and not id is kept for backward compatibility)

-	if (!empty($object->user_modification) || !empty($object->user_modification_id)) {

-		if ($usetable) {

-			print '<tr><td class="titlefield">';

-		}

-		print $langs->trans("ModifiedBy");

-		if ($usetable) {

-			print '</td><td>';

-		} else {

-			print ': ';

-		}

-		if (is_object($object->user_modification)) {

-			if ($object->user_modification->id) {

-				print $object->user_modification->getNomUrl(-1, '', 0, 0, 0);

-			} else {

-				print $langs->trans("Unknown");

-			}

-		} else {

-			$userstatic = new User($db);

-			$userstatic->fetch($object->user_modification_id);

-			if ($userstatic->id) {

-				print $userstatic->getNomUrl(-1, '', 0, 0, 0);

-			} else {

-				print $langs->trans("Unknown");

-			}

-		}

-		if ($usetable) {

-			print '</td></tr>';

-		} else {

-			print '<br>';

-		}

-	}

-

-	// Date change

-	if (!empty($object->date_modification)) {

-		if ($usetable) {

-			print '<tr><td class="titlefield">';

-		}

-		print $langs->trans("DateLastModification");

-		if ($usetable) {

-			print '</td><td>';

-		} else {

-			print ': ';

-		}

-		print dol_print_date($object->date_modification, 'dayhour', 'tzserver');

-		if ($deltadateforuser) {

-			print ' <span class="opacitymedium">'.$langs->trans("CurrentHour").'</span> &nbsp; / &nbsp; '.dol_print_date($object->date_modification, "dayhour", "tzuserrel").' &nbsp;<span class="opacitymedium">'.$langs->trans("ClientHour").'</span>';

-		}

-		if ($usetable) {

-			print '</td></tr>';

-		} else {

-			print '<br>';

-		}

-	}

-

-	// User validation (old method using already loaded object and not id is kept for backward compatibility)

-	if (!empty($object->user_validation) || !empty($object->user_validation_id)) {

-		if ($usetable) {

-			print '<tr><td class="titlefield">';

-		}

-		print $langs->trans("ValidatedBy");

-		if ($usetable) {

-			print '</td><td>';

-		} else {

-			print ': ';

-		}

-		if (is_object($object->user_validation)) {

-			if ($object->user_validation->id) {

-				print $object->user_validation->getNomUrl(-1, '', 0, 0, 0);

-			} else {

-				print $langs->trans("Unknown");

-			}

-		} else {

-			$userstatic = new User($db);

-			$userstatic->fetch($object->user_validation_id ? $object->user_validation_id : $object->user_validation);

-			if ($userstatic->id) {

-				print $userstatic->getNomUrl(-1, '', 0, 0, 0);

-			} else {

-				print $langs->trans("Unknown");

-			}

-		}

-		if ($usetable) {

-			print '</td></tr>';

-		} else {

-			print '<br>';

-		}

-	}

-

-	// Date validation

-	if (!empty($object->date_validation)) {

-		if ($usetable) {

-			print '<tr><td class="titlefield">';

-		}

-		print $langs->trans("DateValidation");

-		if ($usetable) {

-			print '</td><td>';

-		} else {

-			print ': ';

-		}

-		print dol_print_date($object->date_validation, 'dayhour', 'tzserver');

-		if ($deltadateforuser) {

-			print ' <span class="opacitymedium">'.$langs->trans("CurrentHour").'</span> &nbsp; / &nbsp; '.dol_print_date($object->date_validation, "dayhour", 'tzuserrel').' &nbsp;<span class="opacitymedium">'.$langs->trans("ClientHour").'</span>';

-		}

-		if ($usetable) {

-			print '</td></tr>';

-		} else {

-			print '<br>';

-		}

-	}

-

-	// User approve (old method using already loaded object and not id is kept for backward compatibility)

-	if (!empty($object->user_approve) || !empty($object->user_approve_id)) {

-		if ($usetable) {

-			print '<tr><td class="titlefield">';

-		}

-		print $langs->trans("ApprovedBy");

-		if ($usetable) {

-			print '</td><td>';

-		} else {

-			print ': ';

-		}

-		if (!empty($object->user_approve) && is_object($object->user_approve)) {

-			if ($object->user_approve->id) {

-				print $object->user_approve->getNomUrl(-1, '', 0, 0, 0);

-			} else {

-				print $langs->trans("Unknown");

-			}

-		} else {

-			$userstatic = new User($db);

-			$userstatic->fetch($object->user_approve_id ? $object->user_approve_id : $object->user_approve);

-			if ($userstatic->id) {

-				print $userstatic->getNomUrl(-1, '', 0, 0, 0);

-			} else {

-				print $langs->trans("Unknown");

-			}

-		}

-		if ($usetable) {

-			print '</td></tr>';

-		} else {

-			print '<br>';

-		}

-	}

-

-	// Date approve

-	if (!empty($object->date_approve) || !empty($object->date_approval)) {

-		if ($usetable) {

-			print '<tr><td class="titlefield">';

-		}

-		print $langs->trans("DateApprove");

-		if ($usetable) {

-			print '</td><td>';

-		} else {

-			print ': ';

-		}

-		print dol_print_date($object->date_approve ? $object->date_approve : $object->date_approval, 'dayhour', 'tzserver');

-		if ($deltadateforuser) {

-			print ' <span class="opacitymedium">'.$langs->trans("CurrentHour").'</span> &nbsp; / &nbsp; '.dol_print_date($object->date_approve, "dayhour", 'tzuserrel').' &nbsp;<span class="opacitymedium">'.$langs->trans("ClientHour").'</span>';

-		}

-		if ($usetable) {

-			print '</td></tr>';

-		} else {

-			print '<br>';

-		}

-	}

-

-	// User approve

-	if (!empty($object->user_approve_id2)) {

-		if ($usetable) {

-			print '<tr><td class="titlefield">';

-		}

-		print $langs->trans("ApprovedBy");

-		if ($usetable) {

-			print '</td><td>';

-		} else {

-			print ': ';

-		}

-		$userstatic = new User($db);

-		$userstatic->fetch($object->user_approve_id2);

-		if ($userstatic->id) {

-			print $userstatic->getNomUrl(-1, '', 0, 0, 0);

-		} else {

-			print $langs->trans("Unknown");

-		}

-		if ($usetable) {

-			print '</td></tr>';

-		} else {

-			print '<br>';

-		}

-	}

-

-	// Date approve

-	if (!empty($object->date_approve2)) {

-		if ($usetable) {

-			print '<tr><td class="titlefield">';

-		}

-		print $langs->trans("DateApprove2");

-		if ($usetable) {

-			print '</td><td>';

-		} else {

-			print ': ';

-		}

-		print dol_print_date($object->date_approve2, 'dayhour', 'tzserver');

-		if ($deltadateforuser) {

-			print ' <span class="opacitymedium">'.$langs->trans("CurrentHour").'</span> &nbsp; / &nbsp; '.dol_print_date($object->date_approve2, "dayhour", 'tzuserrel').' &nbsp;<span class="opacitymedium">'.$langs->trans("ClientHour").'</span>';

-		}

-		if ($usetable) {

-			print '</td></tr>';

-		} else {

-			print '<br>';

-		}

-	}

-

-	// User signature

-	if (!empty($object->user_signature) || !empty($object->user_signature_id)) {

-		if ($usetable) {

-			print '<tr><td class="titlefield">';

-		}

-		print $langs->trans('SignedBy');

-		if ($usetable) {

-			print '</td><td>';

-		} else {

-			print ': ';

-		}

-		if (is_object($object->user_signature)) {

-			if ($object->user_signature->id) {

-				print $object->user_signature->getNomUrl(-1, '', 0, 0, 0);

-			} else {

-				print $langs->trans('Unknown');

-			}

-		} else {

-			$userstatic = new User($db);

-			$userstatic->fetch($object->user_signature_id ? $object->user_signature_id : $object->user_signature);

-			if ($userstatic->id) {

-				print $userstatic->getNomUrl(-1, '', 0, 0, 0);

-			} else {

-				print $langs->trans('Unknown');

-			}

-		}

-		if ($usetable) {

-			print '</td></tr>';

-		} else {

-			print '<br>';

-		}

-	}

-

-	// Date signature

-	if (!empty($object->date_signature)) {

-		if ($usetable) {

-			print '<tr><td class="titlefield">';

-		}

-		print $langs->trans('DateSigning');

-		if ($usetable) {

-			print '</td><td>';

-		} else {

-			print ': ';

-		}

-		print dol_print_date($object->date_signature, 'dayhour');

-		if ($deltadateforuser) {

-			print ' <span class="opacitymedium">'.$langs->trans('CurrentHour').'</span> &nbsp; / &nbsp; '.dol_print_date($object->date_signature, 'dayhour', 'tzuserrel').' &nbsp;<span class="opacitymedium">'.$langs->trans('ClientHour').'</span>';

-		}

-		if ($usetable) {

-			print '</td></tr>';

-		} else {

-			print '<br>';

-		}

-	}

-

-	// User close

-	if (!empty($object->user_closing_id)) {

-		if ($usetable) {

-			print '<tr><td class="titlefield">';

-		}

-		print $langs->trans("ClosedBy");

-		if ($usetable) {

-			print '</td><td>';

-		} else {

-			print ': ';

-		}

-		$userstatic = new User($db);

-		$userstatic->fetch($object->user_closing_id);

-		if ($userstatic->id) {

-			print $userstatic->getNomUrl(-1, '', 0, 0, 0);

-		} else {

-			print $langs->trans("Unknown");

-		}

-		if ($usetable) {

-			print '</td></tr>';

-		} else {

-			print '<br>';

-		}

-	}

-

-	// Date close

-	if (!empty($object->date_cloture) || !empty($object->date_closing)) {

-		if (isset($object->date_cloture) && !empty($object->date_cloture)) {

-			$object->date_closing = $object->date_cloture;

-		}

-		if ($usetable) {

-			print '<tr><td class="titlefield">';

-		}

-		print $langs->trans("DateClosing");

-		if ($usetable) {

-			print '</td><td>';

-		} else {

-			print ': ';

-		}

-		print dol_print_date($object->date_closing, 'dayhour', 'tzserver');

-		if ($deltadateforuser) {

-			print ' <span class="opacitymedium">'.$langs->trans("CurrentHour").'</span> &nbsp; / &nbsp; '.dol_print_date($object->date_closing, "dayhour", 'tzuserrel').' &nbsp;<span class="opacitymedium">'.$langs->trans("ClientHour").'</span>';

-		}

-		if ($usetable) {

-			print '</td></tr>';

-		} else {

-			print '<br>';

-		}

-	}

-

-	// User conciliate

-	if (!empty($object->user_rappro) || !empty($object->user_rappro_id)) {

-		if ($usetable) {

-			print '<tr><td class="titlefield">';

-		}

-		print $langs->trans("ReconciledBy");

-		if ($usetable) {

-			print '</td><td>';

-		} else {

-			print ': ';

-		}

-		if (is_object($object->user_rappro)) {

-			if ($object->user_rappro->id) {

-				print $object->user_rappro->getNomUrl(-1, '', 0, 0, 0);

-			} else {

-				print $langs->trans("Unknown");

-			}

-		} else {

-			$userstatic = new User($db);

-			$userstatic->fetch($object->user_rappro_id ? $object->user_rappro_id : $object->user_rappro);

-			if ($userstatic->id) {

-				print $userstatic->getNomUrl(1, '', 0, 0, 0);

-			} else {

-				print $langs->trans("Unknown");

-			}

-		}

-		if ($usetable) {

-			print '</td></tr>';

-		} else {

-			print '<br>';

-		}

-	}

-

-	// Date conciliate

-	if (!empty($object->date_rappro)) {

-		if ($usetable) {

-			print '<tr><td class="titlefield">';

-		}

-		print $langs->trans("DateConciliating");

-		if ($usetable) {

-			print '</td><td>';

-		} else {

-			print ': ';

-		}

-		print dol_print_date($object->date_rappro, 'dayhour', 'tzserver');

-		if ($deltadateforuser) {

-			print ' <span class="opacitymedium">'.$langs->trans("CurrentHour").'</span> &nbsp; / &nbsp; '.dol_print_date($object->date_rappro, "dayhour", 'tzuserrel').' &nbsp;<span class="opacitymedium">'.$langs->trans("ClientHour").'</span>';

-		}

-		if ($usetable) {

-			print '</td></tr>';

-		} else {

-			print '<br>';

-		}

-	}

-

-	// Date send

-	if (!empty($object->date_envoi)) {

-		if ($usetable) {

-			print '<tr><td class="titlefield">';

-		}

-		print $langs->trans("DateLastSend");

-		if ($usetable) {

-			print '</td><td>';

-		} else {

-			print ': ';

-		}

-		print dol_print_date($object->date_envoi, 'dayhour', 'tzserver');

-		if ($deltadateforuser) {

-			print ' <span class="opacitymedium">'.$langs->trans("CurrentHour").'</span> &nbsp; / &nbsp; '.dol_print_date($object->date_envoi, "dayhour", 'tzuserrel').' &nbsp;<span class="opacitymedium">'.$langs->trans("ClientHour").'</span>';

-		}

-		if ($usetable) {

-			print '</td></tr>';

-		} else {

-			print '<br>';

-		}

-	}

-

-	if ($usetable) {

-		print '</table>';

-	}

+    global $langs, $db;

+

+    // Load translation files required by the page

+    $langs->loadLangs(array('other', 'admin'));

+

+    include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';

+

+    $deltadateforserver = getServerTimeZoneInt('now');

+    $deltadateforclient = ((int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst']);

+    //$deltadateforcompany=((int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst']);

+    $deltadateforuser = round($deltadateforclient - $deltadateforserver);

+    //print "x".$deltadateforserver." - ".$deltadateforclient." - ".$deltadateforuser;

+

+    if ($usetable) print '<table class="border tableforfield centpercent">';

+

+    // Import key

+    if (!empty($object->import_key))

+    {

+        if ($usetable) print '<tr><td class="titlefield">';

+        print $langs->trans("ImportedWithSet");

+        if ($usetable) print '</td><td>';

+        else print ': ';

+        print $object->import_key;

+        if ($usetable) print '</td></tr>';

+        else print '<br>';

+    }

+

+    // User creation (old method using already loaded object and not id is kept for backward compatibility)

+    if (!empty($object->user_creation) || !empty($object->user_creation_id))

+    {

+        if ($usetable) print '<tr><td class="titlefield">';

+        print $langs->trans("CreatedBy");

+        if ($usetable) print '</td><td>';

+        else print ': ';

+        if (is_object($object->user_creation))

+        {

+        	if ($object->user_creation->id) print $object->user_creation->getNomUrl(1, '', 0, 0, 0);

+        	else print $langs->trans("Unknown");

+        }

+        else

+        {

+            $userstatic = new User($db);

+            $userstatic->fetch($object->user_creation_id ? $object->user_creation_id : $object->user_creation);

+            if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);

+        	else print $langs->trans("Unknown");

+        }

+        if ($usetable) print '</td></tr>';

+        else print '<br>';

+    }

+

+    // Date creation

+    if (!empty($object->date_creation))

+    {

+        if ($usetable) print '<tr><td class="titlefield">';

+        print $langs->trans("DateCreation");

+        if ($usetable) print '</td><td>';

+        else print ': ';

+        print dol_print_date($object->date_creation, 'dayhour');

+        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_creation + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");

+        if ($usetable) print '</td></tr>';

+        else print '<br>';

+    }

+

+    // User change (old method using already loaded object and not id is kept for backward compatibility)

+    if (!empty($object->user_modification) || !empty($object->user_modification_id))

+    {

+        if ($usetable) print '<tr><td class="titlefield">';

+        print $langs->trans("ModifiedBy");

+        if ($usetable) print '</td><td>';

+        else print ': ';

+        if (is_object($object->user_modification))

+        {

+        	if ($object->user_modification->id) print $object->user_modification->getNomUrl(1, '', 0, 0, 0);

+        	else print $langs->trans("Unknown");

+        }

+        else

+        {

+            $userstatic = new User($db);

+            $userstatic->fetch($object->user_modification_id ? $object->user_modification_id : $object->user_modification);

+            if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);

+        	else print $langs->trans("Unknown");

+        }

+        if ($usetable) print '</td></tr>';

+        else print '<br>';

+    }

+

+    // Date change

+    if (!empty($object->date_modification))

+    {

+        if ($usetable) print '<tr><td class="titlefield">';

+        print $langs->trans("DateLastModification");

+        if ($usetable) print '</td><td>';

+        else print ': ';

+        print dol_print_date($object->date_modification, 'dayhour');

+        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_modification + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");

+        if ($usetable) print '</td></tr>';

+        else print '<br>';

+    }

+

+    // User validation (old method using already loaded object and not id is kept for backward compatibility)

+    if (!empty($object->user_validation) || !empty($object->user_validation_id))

+    {

+        if ($usetable) print '<tr><td class="titlefield">';

+        print $langs->trans("ValidatedBy");

+        if ($usetable) print '</td><td>';

+        else print ': ';

+        if (is_object($object->user_validation))

+        {

+            if ($object->user_validation->id) print $object->user_validation->getNomUrl(1, '', 0, 0, 0);

+        	else print $langs->trans("Unknown");

+        }

+        else

+        {

+            $userstatic = new User($db);

+            $userstatic->fetch($object->user_validation_id ? $object->user_validation_id : $object->user_validation);

+			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);

+        	else print $langs->trans("Unknown");

+        }

+        if ($usetable) print '</td></tr>';

+        else print '<br>';

+    }

+

+    // Date validation

+    if (!empty($object->date_validation))

+    {

+        if ($usetable) print '<tr><td class="titlefield">';

+        print $langs->trans("DateValidation");

+        if ($usetable) print '</td><td>';

+        else print ': ';

+        print dol_print_date($object->date_validation, 'dayhour');

+        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_validation + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");

+        if ($usetable) print '</td></tr>';

+        else print '<br>';

+    }

+

+    // User approve (old method using already loaded object and not id is kept for backward compatibility)

+    if (!empty($object->user_approve) || !empty($object->user_approve_id))

+    {

+        if ($usetable) print '<tr><td class="titlefield">';

+        print $langs->trans("ApprovedBy");

+        if ($usetable) print '</td><td>';

+        else print ': ';

+        if (is_object($object->user_approve))

+        {

+            if ($object->user_approve->id) print $object->user_approve->getNomUrl(1, '', 0, 0, 0);

+        	else print $langs->trans("Unknown");

+        }

+        else

+        {

+            $userstatic = new User($db);

+            $userstatic->fetch($object->user_approve_id ? $object->user_approve_id : $object->user_approve);

+			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);

+        	else print $langs->trans("Unknown");

+        }

+        if ($usetable) print '</td></tr>';

+        else print '<br>';

+    }

+

+    // Date approve

+    if (!empty($object->date_approve))

+    {

+        if ($usetable) print '<tr><td class="titlefield">';

+        print $langs->trans("DateApprove");

+        if ($usetable) print '</td><td>';

+        else print ': ';

+        print dol_print_date($object->date_approve, 'dayhour');

+        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");

+        if ($usetable) print '</td></tr>';

+        else print '<br>';

+    }

+

+    // User approve

+    if (!empty($object->user_approve_id2))

+    {

+        if ($usetable) print '<tr><td class="titlefield">';

+        print $langs->trans("ApprovedBy");

+        if ($usetable) print '</td><td>';

+        else print ': ';

+        $userstatic = new User($db);

+        $userstatic->fetch($object->user_approve_id2);

+        if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);

+        else print $langs->trans("Unknown");

+        if ($usetable) print '</td></tr>';

+        else print '<br>';

+    }

+

+    // Date approve

+    if (!empty($object->date_approve2))

+    {

+        if ($usetable) print '<tr><td class="titlefield">';

+        print $langs->trans("DateApprove2");

+        if ($usetable) print '</td><td>';

+        else print ': ';

+        print dol_print_date($object->date_approve2, 'dayhour');

+        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve2 + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");

+        if ($usetable) print '</td></tr>';

+        else print '<br>';

+    }

+

+    // User close

+    if (!empty($object->user_cloture))

+    {

+        if ($usetable) print '<tr><td class="titlefield">';

+        print $langs->trans("ClosedBy");

+        if ($usetable) print '</td><td>';

+        else print ': ';

+        if (is_object($object->user_cloture))

+        {

+			if ($object->user_cloture->id) print $object->user_cloture->getNomUrl(1, '', 0, 0, 0);

+        	else print $langs->trans("Unknown");

+        }

+        else

+        {

+            $userstatic = new User($db);

+            $userstatic->fetch($object->user_cloture);

+			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);

+        	else print $langs->trans("Unknown");

+        }

+        if ($usetable) print '</td></tr>';

+        else print '<br>';

+    }

+

+    // Date close

+    if (!empty($object->date_cloture))

+    {

+        if ($usetable) print '<tr><td class="titlefield">';

+        print $langs->trans("DateClosing");

+        if ($usetable) print '</td><td>';

+        else print ': ';

+        print dol_print_date($object->date_cloture, 'dayhour');

+        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_cloture + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");

+        if ($usetable) print '</td></tr>';

+        else print '<br>';

+    }

+

+    // User conciliate

+    if (!empty($object->user_rappro))

+    {

+        if ($usetable) print '<tr><td class="titlefield">';

+        print $langs->trans("ConciliatedBy");

+        if ($usetable) print '</td><td>';

+        else print ': ';

+        if (is_object($object->user_rappro))

+        {

+			if ($object->user_rappro->id) print $object->user_rappro->getNomUrl(1, '', 0, 0, 0);

+        	else print $langs->trans("Unknown");

+        }

+        else

+        {

+            $userstatic = new User($db);

+            $userstatic->fetch($object->user_rappro);

+			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);

+        	else print $langs->trans("Unknown");

+        }

+        if ($usetable) print '</td></tr>';

+        else print '<br>';

+    }

+

+    // Date conciliate

+    if (!empty($object->date_rappro))

+    {

+        if ($usetable) print '<tr><td class="titlefield">';

+        print $langs->trans("DateConciliating");

+        if ($usetable) print '</td><td>';

+        else print ': ';

+        print dol_print_date($object->date_rappro, 'dayhour');

+        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_rappro + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");

+        if ($usetable) print '</td></tr>';

+        else print '<br>';

+    }

+

+    // Date send

+    if (!empty($object->date_envoi))

+    {

+        if ($usetable) print '<tr><td class="titlefield">';

+        print $langs->trans("DateLastSend");

+        if ($usetable) print '</td><td>';

+        else print ': ';

+        print dol_print_date($object->date_envoi, 'dayhour');

+        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_envoi + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");

+        if ($usetable) print '</td></tr>';

+        else print '<br>';

+    }

+

+    if ($usetable) print '</table>';

@@ -654 +500 @@
- *	Return true if email has a domain name that can be resolved to MX type.

+ *	Return true if email has a domain name that can't be resolved

@@ -657 +503 @@
- *	@return int     			-1 if error (function not available), 0=Not valid, 1=Valid

+ *	@return boolean     		True if domain email is OK, False if KO

@@ -661,2 +507,2 @@
-	list($user, $domain) = explode("@", $mail, 2);

-	return ($domain ? isValidMXRecord($domain) : 0);

+    list($user, $domain) = explode("@", $mail, 2);

+    return checkdnsrr($domain, "MX");

@@ -680,43 +526,32 @@
-	$ValidUrl = 0;

-	$urlregex = '';

-

-	// SCHEME

-	if ($http) {

-		$urlregex .= "^(http:\/\/|https:\/\/)";

-	}

-

-	// USER AND PASS

-	if ($pass) {

-		$urlregex .= "([a-z0-9+!*(),;?&=\$_.-]+(\:[a-z0-9+!*(),;?&=\$_.-]+)?@)";

-	}

-

-	// HOSTNAME OR IP

-	//$urlregex .= "[a-z0-9+\$_-]+(\.[a-z0-9+\$_-]+)*";  // x allowed (ex. http://localhost, http://routerlogin)

-	//$urlregex .= "[a-z0-9+\$_-]+(\.[a-z0-9+\$_-]+)+";  // x.x

-	$urlregex .= "([a-z0-9+\$_\\\:-])+(\.[a-z0-9+\$_-][a-z0-9+\$_-]+)*"; // x ou x.xx (2 x ou plus)

-	//use only one of the above

-

-	// PORT

-	if ($port) {

-		$urlregex .= "(\:[0-9]{2,5})";

-	}

-	// PATH

-	if ($path) {

-		$urlregex .= "(\/([a-z0-9+\$_-]\.?)+)*\/";

-	}

-	// GET Query

-	if ($query) {

-		$urlregex .= "(\?[a-z+&\$_.-][a-z0-9;:@\/&%=+\$_.-]*)";

-	}

-	// ANCHOR

-	if ($anchor) {

-		$urlregex .= "(#[a-z_.-][a-z0-9+\$_.-]*)$";

-	}

-

-	// check

-	if (preg_match('/'.$urlregex.'/i', $url)) {

-		$ValidUrl = 1;

-	}

-	//print $urlregex.' - '.$url.' - '.$ValidUrl;

-

-	return $ValidUrl;

+    $ValidUrl = 0;

+    $urlregex = '';

+

+    // SCHEME

+    if ($http) $urlregex .= "^(http:\/\/|https:\/\/)";

+

+    // USER AND PASS

+    if ($pass) $urlregex .= "([a-z0-9+!*(),;?&=\$_.-]+(\:[a-z0-9+!*(),;?&=\$_.-]+)?@)";

+

+    // HOSTNAME OR IP

+    //$urlregex .= "[a-z0-9+\$_-]+(\.[a-z0-9+\$_-]+)*";  // x allowed (ex. http://localhost, http://routerlogin)

+    //$urlregex .= "[a-z0-9+\$_-]+(\.[a-z0-9+\$_-]+)+";  // x.x

+    $urlregex .= "([a-z0-9+\$_\\\:-])+(\.[a-z0-9+\$_-][a-z0-9+\$_-]+)*"; // x ou x.xx (2 x ou plus)

+    //use only one of the above

+

+    // PORT

+    if ($port) $urlregex .= "(\:[0-9]{2,5})";

+    // PATH

+    if ($path) $urlregex .= "(\/([a-z0-9+\$_-]\.?)+)*\/";

+    // GET Query

+    if ($query) $urlregex .= "(\?[a-z+&\$_.-][a-z0-9;:@\/&%=+\$_.-]*)";

+    // ANCHOR

+    if ($anchor) $urlregex .= "(#[a-z_.-][a-z0-9+\$_.-]*)$";

+

+    // check

+    if (preg_match('/'.$urlregex.'/i', $url))

+    {

+        $ValidUrl = 1;

+    }

+    //print $urlregex.' - '.$url.' - '.$ValidUrl;

+

+    return $ValidUrl;

@@ -733,13 +568,15 @@
-	if ($company->isInEEC()) {    // Syntax check rules for EEC countries

-		/* Disabled because some companies can have an address in Irland and a vat number in France.

-		$vatprefix = $company->country_code;

-		if ($vatprefix == 'GR') $vatprefix = '(EL|GR)';

-		elseif ($vatprefix == 'MC') $vatprefix = 'FR';	// Monaco is using french VAT numbers

-		else $vatprefix = preg_quote($vatprefix, '/');*/

-		$vatprefix = '[a-zA-Z][a-zA-Z]';

-		if (!preg_match('/^'.$vatprefix.'[a-zA-Z0-9\-\.]{5,14}$/i', str_replace(' ', '', $company->tva_intra))) {

-			return 0;

-		}

-	}

-

-	return 1;

+    if ($company->isInEEC())    // Syntax check rules for EEC countries

+    {

+        /* Disabled because some companies can have an address in Irland and a vat number in France.

+        $vatprefix = $company->country_code;

+        if ($vatprefix == 'GR') $vatprefix = '(EL|GR)';

+        elseif ($vatprefix == 'MC') $vatprefix = 'FR';	// Monaco is using french VAT numbers

+        else $vatprefix = preg_quote($vatprefix, '/');*/

+        $vatprefix = '[a-zA-Z][a-zA-Z]';

+        if (!preg_match('/^'.$vatprefix.'[a-zA-Z0-9\-\.]{5,14}$/i', str_replace(' ', '', $company->tva_intra)))

+        {

+            return 0;

+        }

+    }

+

+    return 1;

@@ -757,28 +594,29 @@
-	// Fixed by Matelli (see http://matelli.fr/showcases/patchs-dolibarr/fix-cleaning-url.html)

-	// To include the minus sign in a char class, we must not escape it but put it at the end of the class

-	// Also, there's no need of escape a dot sign in a class

-	$regs = array();

-	if (preg_match('/^(https?:[\\/]+)?([0-9A-Z.-]+\.[A-Z]{2,4})(:[0-9]+)?/i', $url, $regs)) {

-		$proto = $regs[1];

-		$domain = $regs[2];

-		$port = isset($regs[3]) ? $regs[3] : '';

-		//print $url." -> ".$proto." - ".$domain." - ".$port;

-		//$url = dol_string_nospecial(trim($url));

-		$url = trim($url);

-

-		// Si http: defini on supprime le http (Si https on ne supprime pas)

-		$newproto = $proto;

-		if ($http == 0) {

-			if (preg_match('/^http:[\\/]+/i', $url)) {

-				$url = preg_replace('/^http:[\\/]+/i', '', $url);

-				$newproto = '';

-			}

-		}

-

-		// On passe le nom de domaine en minuscule

-		$CleanUrl = preg_replace('/^'.preg_quote($proto.$domain, '/').'/i', $newproto.strtolower($domain), $url);

-

-		return $CleanUrl;

-	} else {

-		return $url;

-	}

+    // Fixed by Matelli (see http://matelli.fr/showcases/patchs-dolibarr/fix-cleaning-url.html)

+    // To include the minus sign in a char class, we must not escape it but put it at the end of the class

+    // Also, there's no need of escape a dot sign in a class

+    if (preg_match('/^(https?:[\\/]+)?([0-9A-Z.-]+\.[A-Z]{2,4})(:[0-9]+)?/i', $url, $regs))

+    {

+        $proto = $regs[1];

+        $domain = $regs[2];

+        $port = isset($regs[3]) ? $regs[3] : '';

+        //print $url." -> ".$proto." - ".$domain." - ".$port;

+        //$url = dol_string_nospecial(trim($url));

+        $url = trim($url);

+

+        // Si http: defini on supprime le http (Si https on ne supprime pas)

+        $newproto = $proto;

+        if ($http == 0)

+        {

+            if (preg_match('/^http:[\\/]+/i', $url))

+            {

+                $url = preg_replace('/^http:[\\/]+/i', '', $url);

+                $newproto = '';

+            }

+        }

+

+        // On passe le nom de domaine en minuscule

+        $CleanUrl = preg_replace('/^'.preg_quote($proto.$domain, '/').'/i', $newproto.strtolower($domain), $url);

+

+        return $CleanUrl;

+    }

+    else return $url;

@@ -802,3 +640 @@
-	if (!isValidEmail($mail)) {

-		return '';

-	}

+	if (!isValidEmail($mail))return '';

@@ -813 +649,2 @@
-	for ($i = 1; $i < $nbofelem && $displaytld; $i++) {

+	for ($i = 1; $i < $nbofelem && $displaytld; $i++)

+	{

@@ -844,6 +681,6 @@
-	$text = '<tr '.$troptions.'>';

-	foreach ($data as $key => $item) {

-		$text .= '<td '.$tdoptions.'>'.$item.'</td>';

-	}

-	$text .= '</tr>';

-	return $text;

+    $text = '<tr '.$troptions.'>';

+    foreach ($data as $key => $item) {

+        $text .= '<td '.$tdoptions.'>'.$item.'</td>';

+    }

+    $text .= '</tr>';

+    return $text;

@@ -864,18 +701,14 @@
-	$text = '';

-	if ($tableMarkup) {

-		$text = '<table '.$tableoptions.'>';

-	}

-	foreach ($data as $key => $item) {

-		if (is_array($item)) {

-			$text .= array2tr($item, $troptions, $tdoptions);

-		} else {

-			$text .= '<tr '.$troptions.'>';

-			$text .= '<td '.$tdoptions.'>'.$key.'</td>';

-			$text .= '<td '.$tdoptions.'>'.$item.'</td>';

-			$text .= '</tr>';

-		}

-	}

-	if ($tableMarkup) {

-		$text .= '</table>';

-	}

-	return $text;

+    $text = '';

+    if ($tableMarkup) $text = '<table '.$tableoptions.'>';

+    foreach ($data as $key => $item) {

+        if (is_array($item)) {

+            $text .= array2tr($item, $troptions, $tdoptions);

+        } else {

+            $text .= '<tr '.$troptions.'>';

+            $text .= '<td '.$tdoptions.'>'.$key.'</td>';

+            $text .= '<td '.$tdoptions.'>'.$item.'</td>';

+            $text .= '</tr>';

+        }

+    }

+    if ($tableMarkup) $text .= '</table>';

+    return $text;

@@ -902,109 +735,102 @@
-	global $conf, $user;

-

-	if (!is_object($objsoc)) {

-		$valueforccc = $objsoc;

-	} elseif ($table == "commande_fournisseur" || $table == "facture_fourn" || $table == "paiementfourn") {

-		$valueforccc = dol_string_unaccent($objsoc->code_fournisseur);

-	} else {

-		$valueforccc = dol_string_unaccent($objsoc->code_client);

-	}

-

-	$sharetable = $table;

-	if ($table == 'facture' || $table == 'invoice') {

-		$sharetable = 'invoicenumber'; // for getEntity function

-	}

-

-	// Clean parameters

-	if ($date == '') {

-		$date = dol_now(); // We use local year and month of PHP server to search numbers

-	}

-	// but we should use local year and month of user

-

-	// For debugging

-	//dol_syslog("mask=".$mask, LOG_DEBUG);

-	//include_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php');

-	//$mask='FA{yy}{mm}-{0000@99}';

-	//$date=dol_mktime(12, 0, 0, 1, 1, 1900);

-	//$date=dol_stringtotime('20130101');

-

-	$hasglobalcounter = false;

-	$reg = array();

-	// Extract value for mask counter, mask raz and mask offset

-	if (preg_match('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i', $mask, $reg)) {

-		$masktri = $reg[1].(!empty($reg[2]) ? $reg[2] : '').(!empty($reg[3]) ? $reg[3] : '');

-		$maskcounter = $reg[1];

-		$hasglobalcounter = true;

-	} else {

-		// setting some defaults so the rest of the code won't fail if there is a third party counter

-		$masktri = '00000';

-		$maskcounter = '00000';

-	}

-

-	$maskraz = -1;

-	$maskoffset = 0;

-	$resetEveryMonth = false;

-	if (dol_strlen($maskcounter) < 3 && !getDolGlobalString('MAIN_COUNTER_WITH_LESS_3_DIGITS')) {

-		return 'ErrorCounterMustHaveMoreThan3Digits';

-	}

-

-	// Extract value for third party mask counter

-	$regClientRef = array();

-	if (preg_match('/\{(c+)(0*)\}/i', $mask, $regClientRef)) {

-		$maskrefclient = $regClientRef[1].$regClientRef[2];

-		$maskrefclient_maskclientcode = $regClientRef[1];

-		$maskrefclient_maskcounter = $regClientRef[2];

-		$maskrefclient_maskoffset = 0; //default value of maskrefclient_counter offset

-		$maskrefclient_clientcode = substr($valueforccc, 0, dol_strlen($maskrefclient_maskclientcode)); //get n first characters of client code where n is length in mask

-		$maskrefclient_clientcode = str_pad($maskrefclient_clientcode, dol_strlen($maskrefclient_maskclientcode), "#", STR_PAD_RIGHT); //padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode

-		$maskrefclient_clientcode = dol_string_nospecial($maskrefclient_clientcode); //sanitize maskrefclient_clientcode for sql insert and sql select like

-		if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) {

-			return 'ErrorCounterMustHaveMoreThan3Digits';

-		}

-	} else {

-		$maskrefclient = '';

-	}

-

-	// fail if there is neither a global nor a third party counter

-	if (!$hasglobalcounter && ($maskrefclient_maskcounter == '')) {

-		return 'ErrorBadMask';

-	}

-

-	// Extract value for third party type

-	$regType = array();

-	if (preg_match('/\{(t+)\}/i', $mask, $regType)) {

-		$masktype = $regType[1];

-		$masktype_value = dol_substr(preg_replace('/^TE_/', '', $objsoc->typent_code), 0, dol_strlen($regType[1])); // get n first characters of thirdparty typent_code (where n is length in mask)

-		$masktype_value = str_pad($masktype_value, dol_strlen($regType[1]), "#", STR_PAD_RIGHT); // we fill on right with # to have same number of char than into mask

-	} else {

-		$masktype = '';

-		$masktype_value = '';

-	}

-

-	// Extract value for user

-	$regType = array();

-	if (preg_match('/\{(u+)\}/i', $mask, $regType)) {

-		$lastname = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX';

-		if (is_object($objuser)) {

-			$lastname = $objuser->lastname;

-		}

-

-		$maskuser = $regType[1];

-		$maskuser_value = substr($lastname, 0, dol_strlen($regType[1])); // get n first characters of user firstname (where n is length in mask)

-		$maskuser_value = str_pad($maskuser_value, dol_strlen($regType[1]), "#", STR_PAD_RIGHT); // we fill on right with # to have same number of char than into mask

-	} else {

-		$maskuser = '';

-		$maskuser_value = '';

-	}

-

-	// Personalized field {XXX-1} à {XXX-9}

-	$maskperso = array();

-	$maskpersonew = array();

-	$tmpmask = $mask;

-	$regKey = array();

-	while (preg_match('/\{([A-Z]+)\-([1-9])\}/', $tmpmask, $regKey)) {

-		$maskperso[$regKey[1]] = '{'.$regKey[1].'-'.$regKey[2].'}';

-		$maskpersonew[$regKey[1]] = str_pad('', $regKey[2], '_', STR_PAD_RIGHT);

-		$tmpmask = preg_replace('/\{'.$regKey[1].'\-'.$regKey[2].'\}/i', $maskpersonew[$regKey[1]], $tmpmask);

-	}

-

-	if (strstr($mask, 'user_extra_')) {

+    global $conf, $user;

+

+    if (!is_object($objsoc)) $valueforccc = $objsoc;

+    elseif ($table == "commande_fournisseur" || $table == "facture_fourn") $valueforccc = dol_string_unaccent($objsoc->code_fournisseur);

+    else $valueforccc = dol_string_unaccent($objsoc->code_client);

+

+    $sharetable = $table;

+    if ($table == 'facture' || $table == 'invoice') $sharetable = 'invoicenumber'; // for getEntity function

+

+    // Clean parameters

+    if ($date == '') $date = dol_now(); // We use local year and month of PHP server to search numbers

+    // but we should use local year and month of user

+

+    // For debugging

+    //dol_syslog("mask=".$mask, LOG_DEBUG);

+    //include_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php');

+    //$mask='FA{yy}{mm}-{0000@99}';

+    //$date=dol_mktime(12, 0, 0, 1, 1, 1900);

+    //$date=dol_stringtotime('20130101');

+

+    $hasglobalcounter = false;

+    // Extract value for mask counter, mask raz and mask offset

+    if (preg_match('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i', $mask, $reg))

+    {

+        $masktri = $reg[1].(!empty($reg[2]) ? $reg[2] : '').(!empty($reg[3]) ? $reg[3] : '');

+        $maskcounter = $reg[1];

+        $hasglobalcounter = true;

+    }

+    else

+    {

+        // setting some defaults so the rest of the code won't fail if there is a third party counter

+        $masktri = '00000';

+        $maskcounter = '00000';

+    }

+

+    $maskraz = -1;

+    $maskoffset = 0;

+    $resetEveryMonth = false;

+    if (dol_strlen($maskcounter) < 3 && empty($conf->global->MAIN_COUNTER_WITH_LESS_3_DIGITS)) return 'ErrorCounterMustHaveMoreThan3Digits';

+

+    // Extract value for third party mask counter

+    if (preg_match('/\{(c+)(0*)\}/i', $mask, $regClientRef))

+    {

+        $maskrefclient = $regClientRef[1].$regClientRef[2];

+        $maskrefclient_maskclientcode = $regClientRef[1];

+        $maskrefclient_maskcounter = $regClientRef[2];

+        $maskrefclient_maskoffset = 0; //default value of maskrefclient_counter offset

+        $maskrefclient_clientcode = substr($valueforccc, 0, dol_strlen($maskrefclient_maskclientcode)); //get n first characters of client code where n is length in mask

+        $maskrefclient_clientcode = str_pad($maskrefclient_clientcode, dol_strlen($maskrefclient_maskclientcode), "#", STR_PAD_RIGHT); //padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode

+        $maskrefclient_clientcode = dol_string_nospecial($maskrefclient_clientcode); //sanitize maskrefclient_clientcode for sql insert and sql select like

+        if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';

+    }

+    else $maskrefclient = '';

+

+    // fail if there is neither a global nor a third party counter

+    if (!$hasglobalcounter && ($maskrefclient_maskcounter == ''))

+    {

+        return 'ErrorBadMask';

+    }

+

+    // Extract value for third party type

+    if (preg_match('/\{(t+)\}/i', $mask, $regType))

+    {

+        $masktype = $regType[1];

+        $masktype_value = substr(preg_replace('/^TE_/', '', $objsoc->typent_code), 0, dol_strlen($regType[1])); // get n first characters of thirdpaty typent_code (where n is length in mask)

+        $masktype_value = str_pad($masktype_value, dol_strlen($regType[1]), "#", STR_PAD_RIGHT); // we fill on right with # to have same number of char than into mask

+    }

+    else

+    {

+    	$masktype = '';

+    	$masktype_value = '';

+    }

+

+    // Extract value for user

+    if (preg_match('/\{(u+)\}/i', $mask, $regType))

+    {

+    	$lastname = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX';

+    	if (is_object($objuser)) $lastname = $objuser->lastname;

+

+    	$maskuser = $regType[1];

+    	$maskuser_value = substr($lastname, 0, dol_strlen($regType[1])); // get n first characters of user firstname (where n is length in mask)

+    	$maskuser_value = str_pad($maskuser_value, dol_strlen($regType[1]), "#", STR_PAD_RIGHT); // we fill on right with # to have same number of char than into mask

+    }

+    else

+    {

+    	$maskuser = '';

+    	$maskuser_value = '';

+    }

+

+    // Personalized field {XXX-1} à {XXX-9}

+    $maskperso = array();

+    $maskpersonew = array();

+    $tmpmask = $mask;

+    while (preg_match('/\{([A-Z]+)\-([1-9])\}/', $tmpmask, $regKey))

+    {

+        $maskperso[$regKey[1]] = '{'.$regKey[1].'-'.$regKey[2].'}';

+        $maskpersonew[$regKey[1]] = str_pad('', $regKey[2], '_', STR_PAD_RIGHT);

+        $tmpmask = preg_replace('/\{'.$regKey[1].'\-'.$regKey[2].'\}/i', $maskpersonew[$regKey[1]], $tmpmask);

+    }

+

+    if (strstr($mask, 'user_extra_'))

+    {

@@ -1017,53 +843,120 @@
-	}

-	$maskwithonlyymcode = $mask;

-	$maskwithonlyymcode = preg_replace('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i', $maskcounter, $maskwithonlyymcode);

-	$maskwithonlyymcode = preg_replace('/\{dd\}/i', 'dd', $maskwithonlyymcode);

-	$maskwithonlyymcode = preg_replace('/\{(c+)(0*)\}/i', $maskrefclient, $maskwithonlyymcode);

-	$maskwithonlyymcode = preg_replace('/\{(t+)\}/i', $masktype_value, $maskwithonlyymcode);

-	$maskwithonlyymcode = preg_replace('/\{(u+)\}/i', $maskuser_value, $maskwithonlyymcode);

-	foreach ($maskperso as $key => $val) {

-		$maskwithonlyymcode = preg_replace('/'.preg_quote($val, '/').'/i', $maskpersonew[$key], $maskwithonlyymcode);

-	}

-	$maskwithnocode = $maskwithonlyymcode;

-	$maskwithnocode = preg_replace('/\{yyyy\}/i', 'yyyy', $maskwithnocode);

-	$maskwithnocode = preg_replace('/\{yy\}/i', 'yy', $maskwithnocode);

-	$maskwithnocode = preg_replace('/\{y\}/i', 'y', $maskwithnocode);

-	$maskwithnocode = preg_replace('/\{mm\}/i', 'mm', $maskwithnocode);

-	// Now maskwithnocode = 0000ddmmyyyyccc for example

-	// and maskcounter    = 0000 for example

-	//print "maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode."\n<br>";

-	//var_dump($reg);

-

-	// If an offset is asked

-	if (!empty($reg[2]) && preg_match('/^\+/', $reg[2])) {

-		$maskoffset = preg_replace('/^\+/', '', $reg[2]);

-	}

-	if (!empty($reg[3]) && preg_match('/^\+/', $reg[3])) {

-		$maskoffset = preg_replace('/^\+/', '', $reg[3]);

-	}

-

-	// Define $sqlwhere

-	$sqlwhere = '';

-	$yearoffset = 0; // Use year of current $date by default

-	$yearoffsettype = false; // false: no reset, 0,-,=,+: reset at offset SOCIETE_FISCAL_MONTH_START, x=reset at offset x

-

-	// If a restore to zero after a month is asked we check if there is already a value for this year.

-	if (!empty($reg[2]) && preg_match('/^@/', $reg[2])) {

-		$yearoffsettype = preg_replace('/^@/', '', $reg[2]);

-	}

-	if (!empty($reg[3]) && preg_match('/^@/', $reg[3])) {

-		$yearoffsettype = preg_replace('/^@/', '', $reg[3]);

-	}

-

-	//print "yearoffset=".$yearoffset." yearoffsettype=".$yearoffsettype;

-	if (is_numeric($yearoffsettype) && $yearoffsettype >= 1) {

-		$maskraz = $yearoffsettype; // For backward compatibility

-	} elseif ($yearoffsettype === '0' || (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && getDolGlobalInt('SOCIETE_FISCAL_MONTH_START') > 1)) {

-		$maskraz = $conf->global->SOCIETE_FISCAL_MONTH_START;

-	}

-	//print "maskraz=".$maskraz;	// -1=no reset

-

-	if ($maskraz > 0) {   // A reset is required

-		if ($maskraz == 99) {

-			$maskraz = date('m', $date);

-			$resetEveryMonth = true;

+    }

+    $maskwithonlyymcode = $mask;

+    $maskwithonlyymcode = preg_replace('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i', $maskcounter, $maskwithonlyymcode);

+    $maskwithonlyymcode = preg_replace('/\{dd\}/i', 'dd', $maskwithonlyymcode);

+    $maskwithonlyymcode = preg_replace('/\{(c+)(0*)\}/i', $maskrefclient, $maskwithonlyymcode);

+    $maskwithonlyymcode = preg_replace('/\{(t+)\}/i', $masktype_value, $maskwithonlyymcode);

+    $maskwithonlyymcode = preg_replace('/\{(u+)\}/i', $maskuser_value, $maskwithonlyymcode);

+    foreach ($maskperso as $key => $val)

+    {

+        $maskwithonlyymcode = preg_replace('/'.preg_quote($val, '/').'/i', $maskpersonew[$key], $maskwithonlyymcode);

+    }

+    $maskwithnocode = $maskwithonlyymcode;

+    $maskwithnocode = preg_replace('/\{yyyy\}/i', 'yyyy', $maskwithnocode);

+    $maskwithnocode = preg_replace('/\{yy\}/i', 'yy', $maskwithnocode);

+    $maskwithnocode = preg_replace('/\{y\}/i', 'y', $maskwithnocode);

+    $maskwithnocode = preg_replace('/\{mm\}/i', 'mm', $maskwithnocode);

+    // Now maskwithnocode = 0000ddmmyyyyccc for example

+    // and maskcounter    = 0000 for example

+    //print "maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode."\n<br>";

+    //var_dump($reg);

+

+    // If an offset is asked

+    if (!empty($reg[2]) && preg_match('/^\+/', $reg[2])) $maskoffset = preg_replace('/^\+/', '', $reg[2]);

+    if (!empty($reg[3]) && preg_match('/^\+/', $reg[3])) $maskoffset = preg_replace('/^\+/', '', $reg[3]);

+

+    // Define $sqlwhere

+    $sqlwhere = '';

+    $yearoffset = 0; // Use year of current $date by default

+    $yearoffsettype = false; // false: no reset, 0,-,=,+: reset at offset SOCIETE_FISCAL_MONTH_START, x=reset at offset x

+

+    // If a restore to zero after a month is asked we check if there is already a value for this year.

+    if (!empty($reg[2]) && preg_match('/^@/', $reg[2]))	$yearoffsettype = preg_replace('/^@/', '', $reg[2]);

+    if (!empty($reg[3]) && preg_match('/^@/', $reg[3]))	$yearoffsettype = preg_replace('/^@/', '', $reg[3]);

+

+    //print "yearoffset=".$yearoffset." yearoffsettype=".$yearoffsettype;

+    if (is_numeric($yearoffsettype) && $yearoffsettype >= 1)

+        $maskraz = $yearoffsettype; // For backward compatibility

+    elseif ($yearoffsettype === '0' || (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $conf->global->SOCIETE_FISCAL_MONTH_START > 1))

+        $maskraz = $conf->global->SOCIETE_FISCAL_MONTH_START;

+    //print "maskraz=".$maskraz;	// -1=no reset

+

+    if ($maskraz > 0) {   // A reset is required

+        if ($maskraz == 99) {

+            $maskraz = date('m', $date);

+            $resetEveryMonth = true;

+        }

+        if ($maskraz > 12) return 'ErrorBadMaskBadRazMonth';

+

+        // Define posy, posm and reg

+        if ($maskraz > 1)	// if reset is not first month, we need month and year into mask

+        {

+            if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 3; }

+            elseif (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 3; $posm = 2; }

+            else return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';

+

+            if (dol_strlen($reg[$posy]) < 2) return 'ErrorCantUseRazWithYearOnOneDigit';

+        }

+        else // if reset is for a specific month in year, we need year

+        {

+            if (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 3; $posm = 2; }

+        	elseif (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 3; }

+            elseif (preg_match('/^(.*)\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 0; }

+            else return 'ErrorCantUseRazIfNoYearInMask';

+        }

+        // Define length

+        $yearlen = $posy ?dol_strlen($reg[$posy]) : 0;

+        $monthlen = $posm ?dol_strlen($reg[$posm]) : 0;

+        // Define pos

+       	$yearpos = (dol_strlen($reg[1]) + 1);

+        $monthpos = ($yearpos + $yearlen);

+        if ($posy == 3 && $posm == 2) {		// if month is before year

+          	$monthpos = (dol_strlen($reg[1]) + 1);

+           	$yearpos = ($monthpos + $monthlen);

+        }

+        //print "xxx ".$maskwithonlyymcode." maskraz=".$maskraz." posy=".$posy." yearlen=".$yearlen." yearpos=".$yearpos." posm=".$posm." monthlen=".$monthlen." monthpos=".$monthpos." yearoffsettype=".$yearoffsettype." resetEveryMonth=".$resetEveryMonth."\n";

+

+        // Define $yearcomp and $monthcomp (that will be use in the select where to search max number)

+        $monthcomp = $maskraz;

+        $yearcomp = 0;

+

+        if (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $yearoffsettype != '=')	// $yearoffsettype is - or +

+        {

+        	$currentyear = date("Y", $date);

+        	$fiscaldate = dol_mktime('0', '0', '0', $maskraz, '1', $currentyear);

+        	$newyeardate = dol_mktime('0', '0', '0', '1', '1', $currentyear);

+        	$nextnewyeardate = dol_mktime('0', '0', '0', '1', '1', $currentyear + 1);

+        	//echo 'currentyear='.$currentyear.' date='.dol_print_date($date, 'day').' fiscaldate='.dol_print_date($fiscaldate, 'day').'<br>';

+

+        	// If after or equal of current fiscal date

+        	if ($date >= $fiscaldate)

+        	{

+        		// If before of next new year date

+        		if ($date < $nextnewyeardate && $yearoffsettype == '+') $yearoffset = 1;

+        	}

+        	// If after or equal of current new year date

+        	elseif ($date >= $newyeardate && $yearoffsettype == '-') $yearoffset = -1;

+        }

+        // For backward compatibility

+        elseif (date("m", $date) < $maskraz && empty($resetEveryMonth)) { $yearoffset = -1; }	// If current month lower that month of return to zero, year is previous year

+

+        if ($yearlen == 4) $yearcomp = sprintf("%04d", date("Y", $date) + $yearoffset);

+        elseif ($yearlen == 2) $yearcomp = sprintf("%02d", date("y", $date) + $yearoffset);

+        elseif ($yearlen == 1) $yearcomp = substr(date("y", $date), 2, 1) + $yearoffset;

+        if ($monthcomp > 1 && empty($resetEveryMonth))	// Test with month is useless if monthcomp = 0 or 1 (0 is same as 1) (regis: $monthcomp can't equal 0)

+        {

+            if ($yearlen == 4) $yearcomp1 = sprintf("%04d", date("Y", $date) + $yearoffset + 1);

+            elseif ($yearlen == 2) $yearcomp1 = sprintf("%02d", date("y", $date) + $yearoffset + 1);

+

+            $sqlwhere .= "(";

+            $sqlwhere .= " (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'";

+            $sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") >= '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')";

+            $sqlwhere .= " OR";

+            $sqlwhere .= " (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp1."'";

+            $sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") < '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."') ";

+            $sqlwhere .= ')';

+        }

+		elseif ($resetEveryMonth)

+		{

+			$sqlwhere .= "(SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'";

+            $sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") = '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')";

@@ -1071,2 +964,180 @@
-		if ($maskraz > 12) {

-			return 'ErrorBadMaskBadRazMonth';

+        else   // reset is done on january

+        {

+            $sqlwhere .= '(SUBSTRING('.$field.', '.$yearpos.', '.$yearlen.") = '".$yearcomp."')";

+        }

+    }

+    //print "sqlwhere=".$sqlwhere." yearcomp=".$yearcomp."<br>\n";	// sqlwhere and yearcomp defined only if we ask a reset

+    //print "masktri=".$masktri." maskcounter=".$maskcounter." maskraz=".$maskraz." maskoffset=".$maskoffset."<br>\n";

+

+    // Define $sqlstring

+    if (function_exists('mb_strrpos'))

+    	{

+    	$posnumstart = mb_strrpos($maskwithnocode, $maskcounter, 'UTF-8');

+	}

+	else

+	{

+    	$posnumstart = strrpos($maskwithnocode, $maskcounter);

+	}	// Pos of counter in final string (from 0 to ...)

+    if ($posnumstart < 0) return 'ErrorBadMaskFailedToLocatePosOfSequence';

+    $sqlstring = 'SUBSTRING('.$field.', '.($posnumstart + 1).', '.dol_strlen($maskcounter).')';

+

+    // Define $maskLike

+    $maskLike = dol_string_nospecial($mask);

+    $maskLike = str_replace("%", "_", $maskLike);

+

+    // Replace protected special codes with matching number of _ as wild card caracter

+    $maskLike = preg_replace('/\{yyyy\}/i', '____', $maskLike);

+    $maskLike = preg_replace('/\{yy\}/i', '__', $maskLike);

+    $maskLike = preg_replace('/\{y\}/i', '_', $maskLike);

+    $maskLike = preg_replace('/\{mm\}/i', '__', $maskLike);

+    $maskLike = preg_replace('/\{dd\}/i', '__', $maskLike);

+    $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'), str_pad("", dol_strlen($maskcounter), "_"), $maskLike);

+    if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), str_pad("", dol_strlen($maskrefclient), "_"), $maskLike);

+    if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'), $masktype_value, $maskLike);

+    if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'), $maskuser_value, $maskLike);

+    foreach ($maskperso as $key => $val)

+    {

+    	$maskLike = str_replace(dol_string_nospecial($maskperso[$key]), $maskpersonew[$key], $maskLike);

+    }

+

+    // Get counter in database

+    $counter = 0;

+    $sql = "SELECT MAX(".$sqlstring.") as val";

+    $sql .= " FROM ".MAIN_DB_PREFIX.$table;

+    $sql .= " WHERE ".$field." LIKE '".$maskLike."'";

+	$sql .= " AND ".$field." NOT LIKE '(PROV%)'";

+    if ($bentityon) // only if entity enable

+    	$sql .= " AND entity IN (".getEntity($sharetable).")";

+    elseif (!empty($forceentity))

+    	$sql .= " AND entity IN (".$forceentity.")";

+    if ($where) $sql .= $where;

+    if ($sqlwhere) $sql .= ' AND '.$sqlwhere;

+

+    //print $sql.'<br>';

+    dol_syslog("functions2::get_next_value mode=".$mode."", LOG_DEBUG);

+    $resql = $db->query($sql);

+    if ($resql)

+    {

+        $obj = $db->fetch_object($resql);

+        $counter = $obj->val;

+    }

+    else dol_print_error($db);

+

+    // Check if we must force counter to maskoffset

+    if (empty($counter)) $counter = $maskoffset;

+    elseif (preg_match('/[^0-9]/i', $counter))

+    {

+    	$counter = 0;

+    	dol_syslog("Error, the last counter found is '".$counter."' so is not a numeric value. We will restart to 1.", LOG_ERR);

+    }

+    elseif ($counter < $maskoffset && empty($conf->global->MAIN_NUMBERING_OFFSET_ONLY_FOR_FIRST)) $counter = $maskoffset;

+

+    if ($mode == 'last')	// We found value for counter = last counter value. Now need to get corresponding ref of invoice.

+    {

+        $counterpadded = str_pad($counter, dol_strlen($maskcounter), "0", STR_PAD_LEFT);

+

+        // Define $maskLike

+        $maskLike = dol_string_nospecial($mask);

+        $maskLike = str_replace("%", "_", $maskLike);

+        // Replace protected special codes with matching number of _ as wild card caracter

+        $maskLike = preg_replace('/\{yyyy\}/i', '____', $maskLike);

+        $maskLike = preg_replace('/\{yy\}/i', '__', $maskLike);

+        $maskLike = preg_replace('/\{y\}/i', '_', $maskLike);

+        $maskLike = preg_replace('/\{mm\}/i', '__', $maskLike);

+        $maskLike = preg_replace('/\{dd\}/i', '__', $maskLike);

+        $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'), $counterpadded, $maskLike);

+        if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), str_pad("", dol_strlen($maskrefclient), "_"), $maskLike);

+        if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'), $masktype_value, $maskLike);

+        if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'), $maskuser_value, $maskLike);

+

+        $ref = '';

+        $sql = "SELECT ".$field." as ref";

+        $sql .= " FROM ".MAIN_DB_PREFIX.$table;

+        $sql .= " WHERE ".$field." LIKE '".$maskLike."'";

+    	$sql .= " AND ".$field." NOT LIKE '%PROV%'";

+    	if ($bentityon) // only if entity enable

+        	$sql .= " AND entity IN (".getEntity($sharetable).")";

+        elseif (!empty($forceentity))

+        	$sql .= " AND entity IN (".$forceentity.")";

+        if ($where) $sql .= $where;

+        if ($sqlwhere) $sql .= ' AND '.$sqlwhere;

+

+        dol_syslog("functions2::get_next_value mode=".$mode."", LOG_DEBUG);

+        $resql = $db->query($sql);

+        if ($resql)

+        {

+            $obj = $db->fetch_object($resql);

+            if ($obj) $ref = $obj->ref;

+        }

+        else dol_print_error($db);

+

+        $numFinal = $ref;

+    }

+    elseif ($mode == 'next')

+    {

+        $counter++;

+

+        // If value for $counter has a length higher than $maskcounter chars

+        if ($counter >= pow(10, dol_strlen($maskcounter)))

+        {

+        	$counter = 'ErrorMaxNumberReachForThisMask';

+        }

+

+        if (!empty($maskrefclient_maskcounter))

+        {

+            //print "maskrefclient_maskcounter=".$maskrefclient_maskcounter." maskwithnocode=".$maskwithnocode." maskrefclient=".$maskrefclient."\n<br>";

+

+            // Define $sqlstring

+            $maskrefclient_posnumstart = strpos($maskwithnocode, $maskrefclient_maskcounter, strpos($maskwithnocode, $maskrefclient)); // Pos of counter in final string (from 0 to ...)

+            if ($maskrefclient_posnumstart <= 0) return 'ErrorBadMask';

+            $maskrefclient_sqlstring = 'SUBSTRING('.$field.', '.($maskrefclient_posnumstart + 1).', '.dol_strlen($maskrefclient_maskcounter).')';

+            //print "x".$sqlstring;

+

+            // Define $maskrefclient_maskLike

+            $maskrefclient_maskLike = dol_string_nospecial($mask);

+            $maskrefclient_maskLike = str_replace("%", "_", $maskrefclient_maskLike);

+            // Replace protected special codes with matching number of _ as wild card caracter

+            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{yyyy}'), '____', $maskrefclient_maskLike);

+            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{yy}'), '__', $maskrefclient_maskLike);

+            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{y}'), '_', $maskrefclient_maskLike);

+            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{mm}'), '__', $maskrefclient_maskLike);

+            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{dd}'), '__', $maskrefclient_maskLike);

+            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'), str_pad("", dol_strlen($maskcounter), "_"), $maskrefclient_maskLike);

+            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), $maskrefclient_clientcode.str_pad("", dol_strlen($maskrefclient_maskcounter), "_"), $maskrefclient_maskLike);

+

+            // Get counter in database

+            $maskrefclient_counter = 0;

+            $maskrefclient_sql = "SELECT MAX(".$maskrefclient_sqlstring.") as val";

+            $maskrefclient_sql .= " FROM ".MAIN_DB_PREFIX.$table;

+            //$sql.= " WHERE ".$field." not like '(%'";

+            $maskrefclient_sql .= " WHERE ".$field." LIKE '".$maskrefclient_maskLike."'";

+            if ($bentityon) // only if entity enable

+            	$maskrefclient_sql .= " AND entity IN (".getEntity($sharetable).")";

+            elseif (!empty($forceentity))

+            	$sql .= " AND entity IN (".$forceentity.")";

+            if ($where) $maskrefclient_sql .= $where; //use the same optional where as general mask

+            if ($sqlwhere) $maskrefclient_sql .= ' AND '.$sqlwhere; //use the same sqlwhere as general mask

+            $maskrefclient_sql .= ' AND (SUBSTRING('.$field.', '.(strpos($maskwithnocode, $maskrefclient) + 1).', '.dol_strlen($maskrefclient_maskclientcode).")='".$maskrefclient_clientcode."')";

+

+            dol_syslog("functions2::get_next_value maskrefclient", LOG_DEBUG);

+            $maskrefclient_resql = $db->query($maskrefclient_sql);

+            if ($maskrefclient_resql)

+            {

+                $maskrefclient_obj = $db->fetch_object($maskrefclient_resql);

+                $maskrefclient_counter = $maskrefclient_obj->val;

+            }

+            else dol_print_error($db);

+

+            if (empty($maskrefclient_counter) || preg_match('/[^0-9]/i', $maskrefclient_counter)) $maskrefclient_counter = $maskrefclient_maskoffset;

+			$maskrefclient_counter++;

+        }

+

+        // Build numFinal

+        $numFinal = $mask;

+

+        // We replace special codes except refclient

+		if (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $yearoffsettype != '=')	// yearoffsettype is - or +, so we don't want current year

+		{

+	        $numFinal = preg_replace('/\{yyyy\}/i', date("Y", $date) + $yearoffset, $numFinal);

+        	$numFinal = preg_replace('/\{yy\}/i', date("y", $date) + $yearoffset, $numFinal);

+        	$numFinal = preg_replace('/\{y\}/i', substr(date("y", $date), 1, 1) + $yearoffset, $numFinal);

@@ -1074,29 +1145,5 @@
-

-		// Define posy, posm and reg

-		if ($maskraz > 1) {	// if reset is not first month, we need month and year into mask

-			if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) {

-				$posy = 2;

-				$posm = 3;

-			} elseif (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i', $maskwithonlyymcode, $reg)) {

-				$posy = 3;

-				$posm = 2;

-			} else {

-				return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';

-			}

-

-			if (dol_strlen($reg[$posy]) < 2) {

-				return 'ErrorCantUseRazWithYearOnOneDigit';

-			}

-		} else { // if reset is for a specific month in year, we need year

-			if (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i', $maskwithonlyymcode, $reg)) {

-				$posy = 3;

-				$posm = 2;

-			} elseif (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) {

-				$posy = 2;

-				$posm = 3;

-			} elseif (preg_match('/^(.*)\{(y+)\}/i', $maskwithonlyymcode, $reg)) {

-				$posy = 2;

-				$posm = 0;

-			} else {

-				return 'ErrorCantUseRazIfNoYearInMask';

-			}

+		else	// we want yyyy to be current year

+		{

+        	$numFinal = preg_replace('/\{yyyy\}/i', date("Y", $date), $numFinal);

+        	$numFinal = preg_replace('/\{yy\}/i', date("y", $date), $numFinal);

+        	$numFinal = preg_replace('/\{y\}/i', substr(date("y", $date), 1, 1), $numFinal);

@@ -1104,316 +1151,37 @@
-		// Define length

-		$yearlen = $posy ? dol_strlen($reg[$posy]) : 0;

-		$monthlen = $posm ? dol_strlen($reg[$posm]) : 0;

-		// Define pos

-		$yearpos = (dol_strlen($reg[1]) + 1);

-		$monthpos = ($yearpos + $yearlen);

-		if ($posy == 3 && $posm == 2) {		// if month is before year

-			$monthpos = (dol_strlen($reg[1]) + 1);

-			$yearpos = ($monthpos + $monthlen);

-		}

-		//print "xxx ".$maskwithonlyymcode." maskraz=".$maskraz." posy=".$posy." yearlen=".$yearlen." yearpos=".$yearpos." posm=".$posm." monthlen=".$monthlen." monthpos=".$monthpos." yearoffsettype=".$yearoffsettype." resetEveryMonth=".$resetEveryMonth."\n";

-

-		// Define $yearcomp and $monthcomp (that will be use in the select where to search max number)

-		$monthcomp = $maskraz;

-		$yearcomp = 0;

-

-		if (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $yearoffsettype != '=') {	// $yearoffsettype is - or +

-			$currentyear = date("Y", $date);

-			$fiscaldate = dol_mktime('0', '0', '0', $maskraz, '1', $currentyear);

-			$newyeardate = dol_mktime('0', '0', '0', '1', '1', $currentyear);

-			$nextnewyeardate = dol_mktime('0', '0', '0', '1', '1', $currentyear + 1);

-			//echo 'currentyear='.$currentyear.' date='.dol_print_date($date, 'day').' fiscaldate='.dol_print_date($fiscaldate, 'day').'<br>';

-

-			// If after or equal of current fiscal date

-			if ($date >= $fiscaldate) {

-				// If before of next new year date

-				if ($date < $nextnewyeardate && $yearoffsettype == '+') {

-					$yearoffset = 1;

-				}

-			} elseif ($date >= $newyeardate && $yearoffsettype == '-') {

-				// If after or equal of current new year date

-				$yearoffset = -1;

-			}

-		} elseif (date("m", $date) < $maskraz && empty($resetEveryMonth)) {

-			// For backward compatibility

-			$yearoffset = -1;

-		}	// If current month lower that month of return to zero, year is previous year

-

-		if ($yearlen == 4) {

-			$yearcomp = sprintf("%04d", date("Y", $date) + $yearoffset);

-		} elseif ($yearlen == 2) {

-			$yearcomp = sprintf("%02d", date("y", $date) + $yearoffset);

-		} elseif ($yearlen == 1) {

-			$yearcomp = substr(date('y', $date), 1, 1) + $yearoffset;

-		}

-		if ($monthcomp > 1 && empty($resetEveryMonth)) {	// Test with month is useless if monthcomp = 0 or 1 (0 is same as 1) (regis: $monthcomp can't equal 0)

-			if ($yearlen == 4) {

-				$yearcomp1 = sprintf("%04d", date("Y", $date) + $yearoffset + 1);

-			} elseif ($yearlen == 2) {

-				$yearcomp1 = sprintf("%02d", date("y", $date) + $yearoffset + 1);

-			}

-

-			$sqlwhere .= "(";

-			$sqlwhere .= " (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$db->escape($yearcomp)."'";

-			$sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") >= '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')";

-			$sqlwhere .= " OR";

-			$sqlwhere .= " (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$db->escape($yearcomp1)."'";

-			$sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") < '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."') ";

-			$sqlwhere .= ')';

-		} elseif ($resetEveryMonth) {

-			$sqlwhere .= "(SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$db->escape($yearcomp)."'";

-			$sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") = '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')";

-		} else { // reset is done on january

-			$sqlwhere .= "(SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$db->escape($yearcomp)."')";

-		}

-	}

-	//print "sqlwhere=".$sqlwhere." yearcomp=".$yearcomp."<br>\n";	// sqlwhere and yearcomp defined only if we ask a reset

-	//print "masktri=".$masktri." maskcounter=".$maskcounter." maskraz=".$maskraz." maskoffset=".$maskoffset."<br>\n";

-

-	// Define $sqlstring

-	if (function_exists('mb_strrpos')) {

-		$posnumstart = mb_strrpos($maskwithnocode, $maskcounter, 0, 'UTF-8');

-	} else {

-		$posnumstart = strrpos($maskwithnocode, $maskcounter);

-	}	// Pos of counter in final string (from 0 to ...)

-	if ($posnumstart < 0) {

-		return 'ErrorBadMaskFailedToLocatePosOfSequence';

-	}

-	$sqlstring = "SUBSTRING(".$field.", ".($posnumstart + 1).", ".dol_strlen($maskcounter).")";

-

-	// Define $maskLike

-	$maskLike = dol_string_nospecial($mask);

-	$maskLike = str_replace("%", "_", $maskLike);

-

-	// Replace protected special codes with matching number of _ as wild card caracter

-	$maskLike = preg_replace('/\{yyyy\}/i', '____', $maskLike);

-	$maskLike = preg_replace('/\{yy\}/i', '__', $maskLike);

-	$maskLike = preg_replace('/\{y\}/i', '_', $maskLike);

-	$maskLike = preg_replace('/\{mm\}/i', '__', $maskLike);

-	$maskLike = preg_replace('/\{dd\}/i', '__', $maskLike);

-	$maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'), str_pad("", dol_strlen($maskcounter), "_"), $maskLike);

-	if ($maskrefclient) {

-		$maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), str_pad("", dol_strlen($maskrefclient), "_"), $maskLike);

-	}

-	if ($masktype) {

-		$maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'), $masktype_value, $maskLike);

-	}

-	if ($maskuser) {

-		$maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'), $maskuser_value, $maskLike);

-	}

-	foreach ($maskperso as $key => $val) {

-		$maskLike = str_replace(dol_string_nospecial($maskperso[$key]), $maskpersonew[$key], $maskLike);

-	}

-

-	// Get counter in database

-	$counter = 0;

-	$sql = "SELECT MAX(".$sqlstring.") as val";

-	$sql .= " FROM ".MAIN_DB_PREFIX.$table;

-	$sql .= " WHERE ".$field." LIKE '".$db->escape($maskLike) . (getDolGlobalString('SEARCH_FOR_NEXT_VAL_ON_START_ONLY') ? "%" : "") . "'";

-	$sql .= " AND ".$field." NOT LIKE '(PROV%)'";

-

-	// To ensure that all variables within the MAX() brackets are integers

-	// This avoid bad detection of max when data are noised with non numeric values at the position of the numero

-	if (getDolGlobalInt('MAIN_NUMBERING_FILTER_ON_INT_ONLY')) {

-		$sql .= " AND ". $db->regexpsql($sqlstring, '^[0-9]+$', 1);

-	}

-

-	if ($bentityon) { // only if entity enable

-		$sql .= " AND entity IN (".getEntity($sharetable).")";

-	} elseif (!empty($forceentity)) {

-		$sql .= " AND entity IN (".$db->sanitize($forceentity).")";

-	}

-	if ($where) {

-		$sql .= $where;

-	}

-	if ($sqlwhere) {

-		$sql .= " AND ".$sqlwhere;

-	}

-

-	//print $sql.'<br>';

-	dol_syslog("functions2::get_next_value mode=".$mode, LOG_DEBUG);

-	$resql = $db->query($sql);

-	if ($resql) {

-		$obj = $db->fetch_object($resql);

-		$counter = $obj->val;

-	} else {

-		dol_print_error($db);

-	}

-

-	// Check if we must force counter to maskoffset

-	if (empty($counter)) {

-		$counter = $maskoffset;

-	} elseif (preg_match('/[^0-9]/i', $counter)) {

-		dol_syslog("Error, the last counter found is '".$counter."' so is not a numeric value. We will restart to 1.", LOG_ERR);

-		$counter = 0;

-	} elseif ($counter < $maskoffset && !getDolGlobalString('MAIN_NUMBERING_OFFSET_ONLY_FOR_FIRST')) {

-		$counter = $maskoffset;

-	}

-

-	if ($mode == 'last') {	// We found value for counter = last counter value. Now need to get corresponding ref of invoice.

-		$counterpadded = str_pad($counter, dol_strlen($maskcounter), "0", STR_PAD_LEFT);

-

-		// Define $maskLike

-		$maskLike = dol_string_nospecial($mask);

-		$maskLike = str_replace("%", "_", $maskLike);

-		// Replace protected special codes with matching number of _ as wild card caracter

-		$maskLike = preg_replace('/\{yyyy\}/i', '____', $maskLike);

-		$maskLike = preg_replace('/\{yy\}/i', '__', $maskLike);

-		$maskLike = preg_replace('/\{y\}/i', '_', $maskLike);

-		$maskLike = preg_replace('/\{mm\}/i', '__', $maskLike);

-		$maskLike = preg_replace('/\{dd\}/i', '__', $maskLike);

-		$maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'), $counterpadded, $maskLike);

-		if ($maskrefclient) {

-			$maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), str_pad("", dol_strlen($maskrefclient), "_"), $maskLike);

-		}

-		if ($masktype) {

-			$maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'), $masktype_value, $maskLike);

-		}

-		if ($maskuser) {

-			$maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'), $maskuser_value, $maskLike);

-		}

-

-		$ref = '';

-		$sql = "SELECT ".$field." as ref";

-		$sql .= " FROM ".MAIN_DB_PREFIX.$table;

-		$sql .= " WHERE ".$field." LIKE '".$db->escape($maskLike) . (getDolGlobalString('SEARCH_FOR_NEXT_VAL_ON_START_ONLY') ? "%" : "") . "'";

-		$sql .= " AND ".$field." NOT LIKE '%PROV%'";

-		if ($bentityon) { // only if entity enable

-			$sql .= " AND entity IN (".getEntity($sharetable).")";

-		} elseif (!empty($forceentity)) {

-			$sql .= " AND entity IN (".$db->sanitize($forceentity).")";

-		}

-		if ($where) {

-			$sql .= $where;

-		}

-		if ($sqlwhere) {

-			$sql .= " AND ".$sqlwhere;

-		}

-

-		dol_syslog("functions2::get_next_value mode=".$mode, LOG_DEBUG);

-		$resql = $db->query($sql);

-		if ($resql) {

-			$obj = $db->fetch_object($resql);

-			if ($obj) {

-				$ref = $obj->ref;

-			}

-		} else {

-			dol_print_error($db);

-		}

-

-		$numFinal = $ref;

-	} elseif ($mode == 'next') {

-		$counter++;

-		$maskrefclient_counter = 0;

-

-		// If value for $counter has a length higher than $maskcounter chars

-		if ($counter >= pow(10, dol_strlen($maskcounter))) {

-			$counter = 'ErrorMaxNumberReachForThisMask';

-		}

-

-		if (!empty($maskrefclient_maskcounter)) {

-			//print "maskrefclient_maskcounter=".$maskrefclient_maskcounter." maskwithnocode=".$maskwithnocode." maskrefclient=".$maskrefclient."\n<br>";

-

-			// Define $sqlstring

-			$maskrefclient_posnumstart = strpos($maskwithnocode, $maskrefclient_maskcounter, strpos($maskwithnocode, $maskrefclient)); // Pos of counter in final string (from 0 to ...)

-			if ($maskrefclient_posnumstart <= 0) {

-				return 'ErrorBadMask';

-			}

-			$maskrefclient_sqlstring = 'SUBSTRING('.$field.', '.($maskrefclient_posnumstart + 1).', '.dol_strlen($maskrefclient_maskcounter).')';

-			//print "x".$sqlstring;

-

-			// Define $maskrefclient_maskLike

-			$maskrefclient_maskLike = dol_string_nospecial($mask);

-			$maskrefclient_maskLike = str_replace("%", "_", $maskrefclient_maskLike);

-			// Replace protected special codes with matching number of _ as wild card caracter

-			$maskrefclient_maskLike = str_replace(dol_string_nospecial('{yyyy}'), '____', $maskrefclient_maskLike);

-			$maskrefclient_maskLike = str_replace(dol_string_nospecial('{yy}'), '__', $maskrefclient_maskLike);

-			$maskrefclient_maskLike = str_replace(dol_string_nospecial('{y}'), '_', $maskrefclient_maskLike);

-			$maskrefclient_maskLike = str_replace(dol_string_nospecial('{mm}'), '__', $maskrefclient_maskLike);

-			$maskrefclient_maskLike = str_replace(dol_string_nospecial('{dd}'), '__', $maskrefclient_maskLike);

-			$maskrefclient_maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'), str_pad("", dol_strlen($maskcounter), "_"), $maskrefclient_maskLike);

-			$maskrefclient_maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), $maskrefclient_clientcode.str_pad("", dol_strlen($maskrefclient_maskcounter), "_"), $maskrefclient_maskLike);

-

-			// Get counter in database

-			$maskrefclient_sql = "SELECT MAX(".$maskrefclient_sqlstring.") as val";

-			$maskrefclient_sql .= " FROM ".MAIN_DB_PREFIX.$table;

-			//$sql.= " WHERE ".$field." not like '(%'";

-			$maskrefclient_sql .= " WHERE ".$field." LIKE '".$db->escape($maskrefclient_maskLike) . (getDolGlobalString('SEARCH_FOR_NEXT_VAL_ON_START_ONLY') ? "%" : "") . "'";

-			if ($bentityon) { // only if entity enable

-				$maskrefclient_sql .= " AND entity IN (".getEntity($sharetable).")";

-			} elseif (!empty($forceentity)) {

-				$sql .= " AND entity IN (".$db->sanitize($forceentity).")";

-			}

-			if ($where) {

-				$maskrefclient_sql .= $where; //use the same optional where as general mask

-			}

-			if ($sqlwhere) {

-				$maskrefclient_sql .= ' AND '.$sqlwhere; //use the same sqlwhere as general mask

-			}

-			$maskrefclient_sql .= " AND (SUBSTRING(".$field.", ".(strpos($maskwithnocode, $maskrefclient) + 1).", ".dol_strlen($maskrefclient_maskclientcode).") = '".$db->escape($maskrefclient_clientcode)."')";

-

-			dol_syslog("functions2::get_next_value maskrefclient", LOG_DEBUG);

-			$maskrefclient_resql = $db->query($maskrefclient_sql);

-			if ($maskrefclient_resql) {

-				$maskrefclient_obj = $db->fetch_object($maskrefclient_resql);

-				$maskrefclient_counter = $maskrefclient_obj->val;

-			} else {

-				dol_print_error($db);

-			}

-

-			if (empty($maskrefclient_counter) || preg_match('/[^0-9]/i', $maskrefclient_counter)) {

-				$maskrefclient_counter = $maskrefclient_maskoffset;

-			}

-			$maskrefclient_counter++;

-		}

-

-		// Build numFinal

-		$numFinal = $mask;

-

-		// We replace special codes except refclient

-		if (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $yearoffsettype != '=') {	// yearoffsettype is - or +, so we don't want current year

-			$numFinal = preg_replace('/\{yyyy\}/i', date("Y", $date) + $yearoffset, $numFinal);

-			$numFinal = preg_replace('/\{yy\}/i', date("y", $date) + $yearoffset, $numFinal);

-			$numFinal = preg_replace('/\{y\}/i', substr(date("y", $date), 1, 1) + $yearoffset, $numFinal);

-		} else { // we want yyyy to be current year

-			$numFinal = preg_replace('/\{yyyy\}/i', date("Y", $date), $numFinal);

-			$numFinal = preg_replace('/\{yy\}/i', date("y", $date), $numFinal);

-			$numFinal = preg_replace('/\{y\}/i', substr(date("y", $date), 1, 1), $numFinal);

-		}

-		$numFinal = preg_replace('/\{mm\}/i', date("m", $date), $numFinal);

-		$numFinal = preg_replace('/\{dd\}/i', date("d", $date), $numFinal);

-

-		// Now we replace the counter

-		$maskbefore = '{'.$masktri.'}';

-		$maskafter = str_pad($counter, dol_strlen($maskcounter), "0", STR_PAD_LEFT);

-		//print 'x'.$numFinal.' - '.$maskbefore.' - '.$maskafter.'y';exit;

-		$numFinal = str_replace($maskbefore, $maskafter, $numFinal);

-

-		// Now we replace the refclient

-		if ($maskrefclient) {

-			//print "maskrefclient=".$maskrefclient." maskrefclient_counter=".$maskrefclient_counter." maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode." maskrefclient_clientcode=".$maskrefclient_clientcode." maskrefclient_maskcounter=".$maskrefclient_maskcounter."\n<br>";exit;

-			$maskrefclient_maskbefore = '{'.$maskrefclient.'}';

-			$maskrefclient_maskafter = $maskrefclient_clientcode;

-			if (dol_strlen($maskrefclient_maskcounter) > 0) {

-				$maskrefclient_maskafter .= str_pad($maskrefclient_counter, dol_strlen($maskrefclient_maskcounter), "0", STR_PAD_LEFT);

-			}

-			$numFinal = str_replace($maskrefclient_maskbefore, $maskrefclient_maskafter, $numFinal);

-		}

-

-		// Now we replace the type

-		if ($masktype) {

-			$masktype_maskbefore = '{'.$masktype.'}';

-			$masktype_maskafter = $masktype_value;

-			$numFinal = str_replace($masktype_maskbefore, $masktype_maskafter, $numFinal);

-		}

-

-		// Now we replace the user

-		if ($maskuser) {

-			$maskuser_maskbefore = '{'.$maskuser.'}';

-			$maskuser_maskafter = $maskuser_value;

-			$numFinal = str_replace($maskuser_maskbefore, $maskuser_maskafter, $numFinal);

-		}

-	}

-

-	dol_syslog("functions2::get_next_value return ".$numFinal, LOG_DEBUG);

-	return $numFinal;

+        $numFinal = preg_replace('/\{mm\}/i', date("m", $date), $numFinal);

+        $numFinal = preg_replace('/\{dd\}/i', date("d", $date), $numFinal);

+

+        // Now we replace the counter

+        $maskbefore = '{'.$masktri.'}';

+        $maskafter = str_pad($counter, dol_strlen($maskcounter), "0", STR_PAD_LEFT);

+        //print 'x'.$maskbefore.'-'.$maskafter.'y';

+        $numFinal = str_replace($maskbefore, $maskafter, $numFinal);

+

+        // Now we replace the refclient

+        if ($maskrefclient)

+        {

+            //print "maskrefclient=".$maskrefclient." maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode." maskrefclient_clientcode=".$maskrefclient_clientcode."\n<br>";exit;

+            $maskrefclient_maskbefore = '{'.$maskrefclient.'}';

+            $maskrefclient_maskafter = $maskrefclient_clientcode.str_pad($maskrefclient_counter, dol_strlen($maskrefclient_maskcounter), "0", STR_PAD_LEFT);

+            $numFinal = str_replace($maskrefclient_maskbefore, $maskrefclient_maskafter, $numFinal);

+        }

+

+        // Now we replace the type

+        if ($masktype)

+        {

+            $masktype_maskbefore = '{'.$masktype.'}';

+            $masktype_maskafter = $masktype_value;

+            $numFinal = str_replace($masktype_maskbefore, $masktype_maskafter, $numFinal);

+        }

+

+        // Now we replace the user

+        if ($maskuser)

+        {

+        	$maskuser_maskbefore = '{'.$maskuser.'}';

+        	$maskuser_maskafter = $maskuser_value;

+        	$numFinal = str_replace($maskuser_maskbefore, $maskuser_maskafter, $numFinal);

+        }

+    }

+

+    dol_syslog("functions2::get_next_value return ".$numFinal, LOG_DEBUG);

+    return $numFinal;

@@ -1432,8 +1200,6 @@
-	$string = " ".$string;

-	$ini = strpos($string, $start);

-	if ($ini == 0) {

-		return "";

-	}

-	$ini += strlen($start);

-	$len = strpos($string, $end, $ini) - $ini;

-	return substr($string, $ini, $len);

+    $string = " ".$string;

+     $ini = strpos($string, $start);

+     if ($ini == 0) return "";

+     $ini += strlen($start);

+     $len = strpos($string, $end, $ini) - $ini;

+     return substr($string, $ini, $len);

@@ -1447 +1213 @@
- * @return	int|string		    Return integer <0 or error string if KO, 0 if OK

+ * @return	int|string		    <0 or error string if KO, 0 if OK

@@ -1451,112 +1217,101 @@
-	$result = 0;

-

-	$hasglobalcounter = false;

-	// Extract value for mask counter, mask raz and mask offset

-	$reg = array();

-	if (preg_match('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i', $mask, $reg)) {

-		$masktri = $reg[1].(isset($reg[2]) ? $reg[2] : '').(isset($reg[3]) ? $reg[3] : '');

-		$maskcounter = $reg[1];

-		$hasglobalcounter = true;

-	} else {

-		// setting some defaults so the rest of the code won't fail if there is a third party counter

-		$masktri = '00000';

-		$maskcounter = '00000';

-	}

-	$maskraz = -1;

-	$maskoffset = 0;

-	if (dol_strlen($maskcounter) < 3) {

-		return 'ErrorCounterMustHaveMoreThan3Digits';

-	}

-

-	// Extract value for third party mask counter

-	$regClientRef = array();

-	if (preg_match('/\{(c+)(0*)\}/i', $mask, $regClientRef)) {

-		$maskrefclient = $regClientRef[1].$regClientRef[2];

-		$maskrefclient_maskclientcode = $regClientRef[1];

-		$maskrefclient_maskcounter = $regClientRef[2];

-		$maskrefclient_maskoffset = 0; //default value of maskrefclient_counter offset

-		$maskrefclient_clientcode = substr('', 0, dol_strlen($maskrefclient_maskclientcode)); //get n first characters of client code to form maskrefclient_clientcode

-		$maskrefclient_clientcode = str_pad($maskrefclient_clientcode, dol_strlen($maskrefclient_maskclientcode), "#", STR_PAD_RIGHT); //padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode

-		$maskrefclient_clientcode = dol_string_nospecial($maskrefclient_clientcode); //sanitize maskrefclient_clientcode for sql insert and sql select like

-		if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) {

-			return 'ErrorCounterMustHaveMoreThan3Digits';

-		}

-	} else {

-		$maskrefclient = '';

-	}

-

-	// fail if there is neither a global nor a third party counter

-	if (!$hasglobalcounter && ($maskrefclient_maskcounter == '')) {

-		return 'ErrorBadMask';

-	}

-

-	$maskwithonlyymcode = $mask;

-	$maskwithonlyymcode = preg_replace('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i', $maskcounter, $maskwithonlyymcode);

-	$maskwithonlyymcode = preg_replace('/\{dd\}/i', 'dd', $maskwithonlyymcode);

-	$maskwithonlyymcode = preg_replace('/\{(c+)(0*)\}/i', $maskrefclient, $maskwithonlyymcode);

-	$maskwithnocode = $maskwithonlyymcode;

-	$maskwithnocode = preg_replace('/\{yyyy\}/i', 'yyyy', $maskwithnocode);

-	$maskwithnocode = preg_replace('/\{yy\}/i', 'yy', $maskwithnocode);

-	$maskwithnocode = preg_replace('/\{y\}/i', 'y', $maskwithnocode);

-	$maskwithnocode = preg_replace('/\{mm\}/i', 'mm', $maskwithnocode);

-	// Now maskwithnocode = 0000ddmmyyyyccc for example

-	// and maskcounter    = 0000 for example

-	//print "maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode."\n<br>";

-

-	// If an offset is asked

-	if (!empty($reg[2]) && preg_match('/^\+/', $reg[2])) {

-		$maskoffset = preg_replace('/^\+/', '', $reg[2]);

-	}

-	if (!empty($reg[3]) && preg_match('/^\+/', $reg[3])) {

-		$maskoffset = preg_replace('/^\+/', '', $reg[3]);

-	}

-

-	// Define $sqlwhere

-

-	// If a restore to zero after a month is asked we check if there is already a value for this year.

-	if (!empty($reg[2]) && preg_match('/^@/', $reg[2])) {

-		$maskraz = preg_replace('/^@/', '', $reg[2]);

-	}

-	if (!empty($reg[3]) && preg_match('/^@/', $reg[3])) {

-		$maskraz = preg_replace('/^@/', '', $reg[3]);

-	}

-	if ($maskraz >= 0) {

-		if ($maskraz == 99) {

-			$maskraz = date('m');

-			$resetEveryMonth = true;

-		}

-		if ($maskraz > 12) {

-			return 'ErrorBadMaskBadRazMonth';

-		}

-

-		// Define reg

-		if ($maskraz > 1 && !preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) {

-			return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';

-		}

-		if ($maskraz <= 1 && !preg_match('/^(.*)\{(y+)\}/i', $maskwithonlyymcode, $reg)) {

-			return 'ErrorCantUseRazIfNoYearInMask';

-		}

-		//print "x".$maskwithonlyymcode." ".$maskraz;

-	}

-	//print "masktri=".$masktri." maskcounter=".$maskcounter." maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode." maskraz=".$maskraz." maskoffset=".$maskoffset."<br>\n";

-

-	if (function_exists('mb_strrpos')) {

-		$posnumstart = mb_strrpos($maskwithnocode, $maskcounter, 0, 'UTF-8');

-	} else {

-		$posnumstart = strrpos($maskwithnocode, $maskcounter);

-	}	// Pos of counter in final string (from 0 to ...)

-	if ($posnumstart < 0) {

-		return 'ErrorBadMaskFailedToLocatePosOfSequence';

-	}

-

-	// Check we have a number in $value at position ($posnumstart+1).', '.dol_strlen($maskcounter)

-	// TODO

-

-	// Check length

-	$len = dol_strlen($maskwithnocode);

-	if (dol_strlen($value) != $len) {

-		$result = -1;

-	}

-

-	dol_syslog("functions2::check_value result=".$result, LOG_DEBUG);

-	return $result;

+    $result = 0;

+

+    $hasglobalcounter = false;

+    // Extract value for mask counter, mask raz and mask offset

+    if (preg_match('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i', $mask, $reg))

+    {

+        $masktri = $reg[1].(isset($reg[2]) ? $reg[2] : '').(isset($reg[3]) ? $reg[3] : '');

+        $maskcounter = $reg[1];

+        $hasglobalcounter = true;

+    }

+    else

+    {

+        // setting some defaults so the rest of the code won't fail if there is a third party counter

+        $masktri = '00000';

+        $maskcounter = '00000';

+    }

+

+    $maskraz = -1;

+    $maskoffset = 0;

+    if (dol_strlen($maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';

+

+    // Extract value for third party mask counter

+    if (preg_match('/\{(c+)(0*)\}/i', $mask, $regClientRef))

+    {

+        $maskrefclient = $regClientRef[1].$regClientRef[2];

+        $maskrefclient_maskclientcode = $regClientRef[1];

+        $maskrefclient_maskcounter = $regClientRef[2];

+        $maskrefclient_maskoffset = 0; //default value of maskrefclient_counter offset

+        $maskrefclient_clientcode = substr('', 0, dol_strlen($maskrefclient_maskclientcode)); //get n first characters of client code to form maskrefclient_clientcode

+        $maskrefclient_clientcode = str_pad($maskrefclient_clientcode, dol_strlen($maskrefclient_maskclientcode), "#", STR_PAD_RIGHT); //padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode

+        $maskrefclient_clientcode = dol_string_nospecial($maskrefclient_clientcode); //sanitize maskrefclient_clientcode for sql insert and sql select like

+        if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';

+    }

+    else $maskrefclient = '';

+

+    // fail if there is neither a global nor a third party counter

+    if (!$hasglobalcounter && ($maskrefclient_maskcounter == ''))

+    {

+        return 'ErrorBadMask';

+    }

+

+    $maskwithonlyymcode = $mask;

+    $maskwithonlyymcode = preg_replace('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i', $maskcounter, $maskwithonlyymcode);

+    $maskwithonlyymcode = preg_replace('/\{dd\}/i', 'dd', $maskwithonlyymcode);

+    $maskwithonlyymcode = preg_replace('/\{(c+)(0*)\}/i', $maskrefclient, $maskwithonlyymcode);

+    $maskwithnocode = $maskwithonlyymcode;

+    $maskwithnocode = preg_replace('/\{yyyy\}/i', 'yyyy', $maskwithnocode);

+    $maskwithnocode = preg_replace('/\{yy\}/i', 'yy', $maskwithnocode);

+    $maskwithnocode = preg_replace('/\{y\}/i', 'y', $maskwithnocode);

+    $maskwithnocode = preg_replace('/\{mm\}/i', 'mm', $maskwithnocode);

+    // Now maskwithnocode = 0000ddmmyyyyccc for example

+    // and maskcounter    = 0000 for example

+    //print "maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode."\n<br>";

+

+    // If an offset is asked

+    if (!empty($reg[2]) && preg_match('/^\+/', $reg[2])) $maskoffset = preg_replace('/^\+/', '', $reg[2]);

+    if (!empty($reg[3]) && preg_match('/^\+/', $reg[3])) $maskoffset = preg_replace('/^\+/', '', $reg[3]);

+

+    // Define $sqlwhere

+

+    // If a restore to zero after a month is asked we check if there is already a value for this year.

+    if (!empty($reg[2]) && preg_match('/^@/', $reg[2]))  $maskraz = preg_replace('/^@/', '', $reg[2]);

+    if (!empty($reg[3]) && preg_match('/^@/', $reg[3]))  $maskraz = preg_replace('/^@/', '', $reg[3]);

+    if ($maskraz >= 0)

+    {

+        if ($maskraz == 99) {

+            $maskraz = date('m');

+            $resetEveryMonth = true;

+        }

+        if ($maskraz > 12) return 'ErrorBadMaskBadRazMonth';

+

+        // Define reg

+        if ($maskraz > 1 && !preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';

+        if ($maskraz <= 1 && !preg_match('/^(.*)\{(y+)\}/i', $maskwithonlyymcode, $reg)) return 'ErrorCantUseRazIfNoYearInMask';

+        //print "x".$maskwithonlyymcode." ".$maskraz;

+    }

+    //print "masktri=".$masktri." maskcounter=".$maskcounter." maskraz=".$maskraz." maskoffset=".$maskoffset."<br>\n";

+

+    // Check we have a number in ($posnumstart+1).', '.dol_strlen($maskcounter)

+    //

+

+    // Check length

+    $len = dol_strlen($maskwithnocode);

+    if (dol_strlen($value) != $len) $result = -1;

+

+    // Define $maskLike

+    /* seems not used

+    $maskLike = dol_string_nospecial($mask);

+    $maskLike = str_replace("%","_",$maskLike);

+    // Replace protected special codes with matching number of _ as wild card caracter

+    $maskLike = str_replace(dol_string_nospecial('{yyyy}'),'____',$maskLike);

+    $maskLike = str_replace(dol_string_nospecial('{yy}'),'__',$maskLike);

+    $maskLike = str_replace(dol_string_nospecial('{y}'),'_',$maskLike);

+    $maskLike = str_replace(dol_string_nospecial('{mm}'),'__',$maskLike);

+    $maskLike = str_replace(dol_string_nospecial('{dd}'),'__',$maskLike);

+    $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'),str_pad("",dol_strlen($maskcounter),"_"),$maskLike);

+    if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",strlen($maskrefclient),"_"),$maskLike);

+	*/

+

+    dol_syslog("functions2::check_value result=".$result, LOG_DEBUG);

+    return $result;

@@ -1575,14 +1330,6 @@
-	$last = dol_strlen($bin) - 1;

-	for ($i = 0; $i <= $last; $i++) {

-		$x += $bin[$last - $i] * pow(2, $i);

-	}

-	$x = dechex($x);

-	if ($pad) {

-		while (dol_strlen($x) < intval(dol_strlen($bin)) / 4) {

-			$x = "0$x";

-		}

-	}

-	if ($upper) {

-		$x = strtoupper($x);

-	}

-	return $x;

+    $last = dol_strlen($bin) - 1;

+    for ($i = 0; $i <= $last; $i++) { $x += $bin[$last - $i] * pow(2, $i); }

+    $x = dechex($x);

+    if ($pad) { while (dol_strlen($x) < intval(dol_strlen($bin)) / 4) { $x = "0$x"; } }

+    if ($upper) { $x = strtoupper($x); }

+    return $x;

@@ -1599,6 +1346,7 @@
-	$bin = '';

-	$strLength = dol_strlen($hexa);

-	for ($i = 0; $i < $strLength; $i++) {

-		$bin .= str_pad(decbin(hexdec($hexa[$i])), 4, '0', STR_PAD_LEFT);

-	}

-	return $bin;

+    $bin = '';

+    $strLength = dol_strlen($hexa);

+    for ($i = 0; $i < $strLength; $i++)

+    {

+        $bin .= str_pad(decbin(hexdec($hexa[$i])), 4, '0', STR_PAD_LEFT);

+    }

+    return $bin;

@@ -1615,60 +1363,71 @@
-	$stime = strftime('%Y-%m-%d', $time);

-

-	if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?/i', $stime, $reg)) {

-		// Date est au format 'YYYY-MM-DD' ou 'YYYY-MM-DD HH:MM:SS'

-		$annee = $reg[1];

-		$mois = $reg[2];

-		$jour = $reg[3];

-	}

-

-	/*

-	 * Norme ISO-8601:

-	 * - La semaine 1 de toute annee est celle qui contient le 4 janvier ou que la semaine 1 de toute annee est celle qui contient le 1er jeudi de janvier.

-	 * - La majorite des annees ont 52 semaines mais les annees qui commence un jeudi et les annees bissextiles commencant un mercredi en possede 53.

-	 * - Le 1er jour de la semaine est le Lundi

-	 */

-

-	// Definition du Jeudi de la semaine

-	if (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) == 0) { // Dimanche

-		$jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) - 3 * 24 * 60 * 60;

-	} elseif (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) < 4) { // du Lundi au Mercredi

-		$jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) + (4 - date("w", mktime(12, 0, 0, $mois, $jour, $annee))) * 24 * 60 * 60;

-	} elseif (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) > 4) { // du Vendredi au Samedi

-		$jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) - (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) - 4) * 24 * 60 * 60;

-	} else { // Jeudi

-		$jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee);

-	}

-

-	// Definition du premier Jeudi de l'annee

-	if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 0) { // Dimanche

-		$premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + 4 * 24 * 60 * 60;

-	} elseif (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) < 4) { // du Lundi au Mercredi

-		$premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + (4 - date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)))) * 24 * 60 * 60;

-	} elseif (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) > 4) { // du Vendredi au Samedi

-		$premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + (7 - (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) - 4)) * 24 * 60 * 60;

-	} else { // Jeudi

-		$premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine));

-	}

-

-	// Definition du numero de semaine: nb de jours entre "premier Jeudi de l'annee" et "Jeudi de la semaine";

-	$numeroSemaine = (

-		(

-		date("z", mktime(12, 0, 0, date("m", $jeudiSemaine), date("d", $jeudiSemaine), date("Y", $jeudiSemaine)))

-	-

-	date("z", mktime(12, 0, 0, date("m", $premierJeudiAnnee), date("d", $premierJeudiAnnee), date("Y", $premierJeudiAnnee)))

-	) / 7

-	) + 1;

-

-	// Cas particulier de la semaine 53

-	if ($numeroSemaine == 53) {

-		// Les annees qui commence un Jeudi et les annees bissextiles commencant un Mercredi en possede 53

-		if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 4 || (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 3 && date("z", mktime(12, 0, 0, 12, 31, date("Y", $jeudiSemaine))) == 365)) {

-			$numeroSemaine = 53;

-		} else {

-			$numeroSemaine = 1;

-		}

-	}

-

-	//echo $jour."-".$mois."-".$annee." (".date("d-m-Y",$premierJeudiAnnee)." - ".date("d-m-Y",$jeudiSemaine).") -> ".$numeroSemaine."<BR>";

-

-	return sprintf("%02d", $numeroSemaine);

+    $stime = strftime('%Y-%m-%d', $time);

+

+    if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?/i', $stime, $reg))

+    {

+        // Date est au format 'YYYY-MM-DD' ou 'YYYY-MM-DD HH:MM:SS'

+        $annee = $reg[1];

+        $mois = $reg[2];

+        $jour = $reg[3];

+    }

+

+    /*

+     * Norme ISO-8601:

+     * - La semaine 1 de toute annee est celle qui contient le 4 janvier ou que la semaine 1 de toute annee est celle qui contient le 1er jeudi de janvier.

+     * - La majorite des annees ont 52 semaines mais les annees qui commence un jeudi et les annees bissextiles commencant un mercredi en possede 53.

+     * - Le 1er jour de la semaine est le Lundi

+     */

+

+    // Definition du Jeudi de la semaine

+    if (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) == 0) // Dimanche

+    $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) - 3 * 24 * 60 * 60;

+    elseif (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) < 4) // du Lundi au Mercredi

+    $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) + (4 - date("w", mktime(12, 0, 0, $mois, $jour, $annee))) * 24 * 60 * 60;

+    elseif (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) > 4) // du Vendredi au Samedi

+    $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) - (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) - 4) * 24 * 60 * 60;

+    else // Jeudi

+    $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee);

+

+    // Definition du premier Jeudi de l'annee

+    if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 0) // Dimanche

+    {

+        $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + 4 * 24 * 60 * 60;

+    }

+    elseif (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) < 4) // du Lundi au Mercredi

+    {

+        $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + (4 - date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)))) * 24 * 60 * 60;

+    }

+    elseif (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) > 4) // du Vendredi au Samedi

+    {

+        $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + (7 - (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) - 4)) * 24 * 60 * 60;

+    }

+    else // Jeudi

+    {

+        $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine));

+    }

+

+    // Definition du numero de semaine: nb de jours entre "premier Jeudi de l'annee" et "Jeudi de la semaine";

+    $numeroSemaine = (

+    (

+    date("z", mktime(12, 0, 0, date("m", $jeudiSemaine), date("d", $jeudiSemaine), date("Y", $jeudiSemaine)))

+    -

+    date("z", mktime(12, 0, 0, date("m", $premierJeudiAnnee), date("d", $premierJeudiAnnee), date("Y", $premierJeudiAnnee)))

+    ) / 7

+    ) + 1;

+

+    // Cas particulier de la semaine 53

+    if ($numeroSemaine == 53)

+    {

+        // Les annees qui commence un Jeudi et les annees bissextiles commencant un Mercredi en possede 53

+        if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 4 || (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 3 && date("z", mktime(12, 0, 0, 12, 31, date("Y", $jeudiSemaine))) == 365))

+        {

+            $numeroSemaine = 53;

+        }

+        else

+        {

+            $numeroSemaine = 1;

+        }

+    }

+

+    //echo $jour."-".$mois."-".$annee." (".date("d-m-Y",$premierJeudiAnnee)." - ".date("d-m-Y",$jeudiSemaine).") -> ".$numeroSemaine."<BR>";

+

+    return sprintf("%02d", $numeroSemaine);

@@ -1687,20 +1446,22 @@
-	/* Pour convertire 320 gr en Kg appeler

-	 *  $f = -3

-	 *  weigh_convert(320, $f, 0) retournera 0.32

-	 *

-	 */

-	$weight = is_numeric($weight) ? $weight : 0;

-	while ($from_unit != $to_unit) {

-		if ($from_unit > $to_unit) {

-			$weight = $weight * 10;

-			$from_unit = $from_unit - 1;

-			$weight = weight_convert($weight, $from_unit, $to_unit);

-		}

-		if ($from_unit < $to_unit) {

-			$weight = $weight / 10;

-			$from_unit = $from_unit + 1;

-			$weight = weight_convert($weight, $from_unit, $to_unit);

-		}

-	}

-

-	return $weight;

+    /* Pour convertire 320 gr en Kg appeler

+     *  $f = -3

+     *  weigh_convert(320, $f, 0) retournera 0.32

+     *

+     */

+    while ($from_unit <> $to_unit)

+    {

+        if ($from_unit > $to_unit)

+        {

+            $weight = $weight * 10;

+            $from_unit = $from_unit - 1;

+            $weight = weight_convert($weight, $from_unit, $to_unit);

+        }

+        if ($from_unit < $to_unit)

+        {

+            $weight = $weight / 10;

+            $from_unit = $from_unit + 1;

+            $weight = weight_convert($weight, $from_unit, $to_unit);

+        }

+    }

+

+    return $weight;

@@ -1715,2 +1476,2 @@
- *	@param	array	$tab        Array (key=>value) with all parameters to save/update

- *	@return int         		Return integer <0 if KO, >0 if OK

+ *	@param	array	$tab        Array (key=>value) with all parameters to save

+ *	@return int         		<0 if KO, >0 if OK

@@ -1722,53 +1483,56 @@
-	// Verification parametres

-	if (count($tab) < 1) {

-		return -1;

-	}

-

-	$db->begin();

-

-	// We remove old parameters for all keys in $tab

-	$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_param";

-	$sql .= " WHERE fk_user = ".((int) $user->id);

-	$sql .= " AND entity = ".((int) $conf->entity);

-	$sql .= " AND param in (";

-	$i = 0;

-	foreach ($tab as $key => $value) {

-		if ($i > 0) {

-			$sql .= ',';

-		}

-		$sql .= "'".$db->escape($key)."'";

-		$i++;

-	}

-	$sql .= ")";

-	dol_syslog("functions2.lib::dol_set_user_param", LOG_DEBUG);

-

-	$resql = $db->query($sql);

-	if (!$resql) {

-		dol_print_error($db);

-		$db->rollback();

-		return -1;

-	}

-

-	foreach ($tab as $key => $value) {

-		// Set new parameters

-		if ($value) {

-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."user_param(fk_user,entity,param,value)";

-			$sql .= " VALUES (".((int) $user->id).",".((int) $conf->entity).",";

-			$sql .= " '".$db->escape($key)."','".$db->escape($value)."')";

-

-			dol_syslog("functions2.lib::dol_set_user_param", LOG_DEBUG);

-			$result = $db->query($sql);

-			if (!$result) {

-				dol_print_error($db);

-				$db->rollback();

-				return -1;

-			}

-			$user->conf->$key = $value;

-			//print "key=".$key." user->conf->key=".$user->conf->$key;

-		} else {

-			unset($user->conf->$key);

-		}

-	}

-

-	$db->commit();

-	return 1;

+    // Verification parametres

+    if (count($tab) < 1) return -1;

+

+    $db->begin();

+

+    // We remove old parameters for all keys in $tab

+    $sql = "DELETE FROM ".MAIN_DB_PREFIX."user_param";

+    $sql .= " WHERE fk_user = ".$user->id;

+    $sql .= " AND entity = ".$conf->entity;

+    $sql .= " AND param in (";

+    $i = 0;

+    foreach ($tab as $key => $value)

+    {

+        if ($i > 0) $sql .= ',';

+        $sql .= "'".$db->escape($key)."'";

+        $i++;

+    }

+    $sql .= ")";

+    dol_syslog("functions2.lib::dol_set_user_param", LOG_DEBUG);

+

+    $resql = $db->query($sql);

+    if (!$resql)

+    {

+        dol_print_error($db);

+        $db->rollback();

+        return -1;

+    }

+

+    foreach ($tab as $key => $value)

+    {

+        // Set new parameters

+        if ($value)

+        {

+            $sql = "INSERT INTO ".MAIN_DB_PREFIX."user_param(fk_user,entity,param,value)";

+            $sql .= " VALUES (".$user->id.",".$conf->entity.",";

+            $sql .= " '".$db->escape($key)."','".$db->escape($value)."')";

+

+            dol_syslog("functions2.lib::dol_set_user_param", LOG_DEBUG);

+            $result = $db->query($sql);

+            if (!$result)

+            {

+                dol_print_error($db);

+                $db->rollback();

+                return -1;

+            }

+            $user->conf->$key = $value;

+            //print "key=".$key." user->conf->key=".$user->conf->$key;

+        }

+        else

+        {

+            unset($user->conf->$key);

+        }

+    }

+

+    $db->commit();

+    return 1;

@@ -1786,8 +1550,11 @@
-	$string = '';

-	if ($reduction == 100) {

-		$string = $langs->transnoentities("Offered");

-	} else {

-		$string = vatrate($reduction, true);

-	}

-

-	return $string;

+    $string = '';

+    if ($reduction == 100)

+    {

+        $string = $langs->transnoentities("Offered");

+    }

+    else

+    {

+    	$string = vatrate($reduction, true);

+    }

+

+    return $string;

@@ -1805,6 +1572,3 @@
-	if ($option == 'smr') {

-		$osversion = php_uname('s').' '.php_uname('m').' '.php_uname('r');

-	} else {

-		$osversion = php_uname();

-	}

-	return $osversion;

+	if ($option == 'smr') $osversion = php_uname('s').' '.php_uname('m').' '.php_uname('r');

+	else $osversion = php_uname();

+    return $osversion;

@@ -1817 +1581 @@
- *  @see		versionphparray(), versioncompare()

+ *  @see		versionphparray()

@@ -1821,15 +1585 @@
-	return phpversion();

-}

-

-/**

- * 	Return DB version

- *

- * 	@return		string			PHP version

- */

-function version_db()

-{

-	global $db;

-	if (is_object($db) && method_exists($db, 'getVersion')) {

-		return $db->getVersion();

-	}

-	return '';

+    return phpversion();

@@ -1842 +1592 @@
- *  @see		versiondolibarrarray(), versioncompare()

+ *  @see		versiondolibarrarray()

@@ -1846 +1596 @@
-	return DOL_VERSION;

+    return DOL_VERSION;

@@ -1856 +1606 @@
-	return $_SERVER["SERVER_SOFTWARE"];

+    return $_SERVER["SERVER_SOFTWARE"];

@@ -1865 +1615 @@
- * 	@return	array|int			    		0 if no module is activated, or array(key=>label). For modules that need directory scan, key is completed with ":filename".

+ * 	@return	mixed			    			0 if no module is activated, or array(key=>label). For modules that need directory scan, key is completed with ":filename".

@@ -1869,81 +1619,90 @@
-	global $conf, $langs;

-	$liste = array();

-	$found = 0;

-	$dirtoscan = '';

-

-	$sql = "SELECT nom as id, nom as doc_template_name, libelle as label, description as description";

-	$sql .= " FROM ".MAIN_DB_PREFIX."document_model";

-	$sql .= " WHERE type = '".$db->escape($type)."'";

-	$sql .= " AND entity IN (0,".$conf->entity.")";

-	$sql .= " ORDER BY description DESC";

-

-	dol_syslog('/core/lib/function2.lib.php::getListOfModels', LOG_DEBUG);

-	$resql_models = $db->query($sql);

-	if ($resql_models) {

-		$num = $db->num_rows($resql_models);

-		$i = 0;

-		while ($i < $num) {

-			$found = 1;

-

-			$obj = $db->fetch_object($resql_models);

-

-			// If this generation module needs to scan a directory, then description field is filled

-			// with the constant that contains list of directories to scan (COMPANY_ADDON_PDF_ODT_PATH, ...).

-			if (!empty($obj->description)) {	// A list of directories to scan is defined

-				include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

-

-				$const = $obj->description;

-				$dirtoscan = preg_replace('/[\r\n]+/', ',', trim(getDolGlobalString($const)));

-

-				$listoffiles = array();

-

-				// Now we add models found in directories scanned

-				$listofdir = explode(',', $dirtoscan);

-				foreach ($listofdir as $key => $tmpdir) {

-					$tmpdir = trim($tmpdir);

-					$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);

-					if (!$tmpdir) {

-						unset($listofdir[$key]);

-						continue;

-					}

-					if (is_dir($tmpdir)) {

-						// all type of template is allowed

-						$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '', '', 'name', SORT_ASC, 0);

-						if (count($tmpfiles)) {

-							$listoffiles = array_merge($listoffiles, $tmpfiles);

-						}

-					}

-				}

-

-				if (count($listoffiles)) {

-					foreach ($listoffiles as $record) {

-						$max = ($maxfilenamelength ? $maxfilenamelength : 28);

-						$liste[$obj->id.':'.$record['fullname']] = dol_trunc($record['name'], $max, 'middle');

-					}

-				} else {

-					$liste[0] = $obj->label.': '.$langs->trans("None");

-				}

-			} else {

-				if ($type == 'member' && $obj->doc_template_name == 'standard') {   // Special case, if member template, we add variant per format

-					global $_Avery_Labels;

-					include_once DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php';

-					foreach ($_Avery_Labels as $key => $val) {

-						$liste[$obj->id.':'.$key] = ($obj->label ? $obj->label : $obj->doc_template_name).' '.$val['name'];

-					}

-				} else {

-					// Common usage

-					$liste[$obj->id] = $obj->label ? $obj->label : $obj->doc_template_name;

-				}

-			}

-			$i++;

-		}

-	} else {

-		dol_print_error($db);

-		return -1;

-	}

-

-	if ($found) {

-		return $liste;

-	} else {

-		return 0;

-	}

+    global $conf, $langs;

+    $liste = array();

+    $found = 0;

+    $dirtoscan = '';

+

+    $sql = "SELECT nom as id, nom as doc_template_name, libelle as label, description as description";

+    $sql .= " FROM ".MAIN_DB_PREFIX."document_model";

+    $sql .= " WHERE type = '".$type."'";

+    $sql .= " AND entity IN (0,".$conf->entity.")";

+    $sql .= " ORDER BY description DESC";

+

+    dol_syslog('/core/lib/function2.lib.php::getListOfModels', LOG_DEBUG);

+    $resql = $db->query($sql);

+    if ($resql)

+    {

+        $num = $db->num_rows($resql);

+        $i = 0;

+        while ($i < $num)

+        {

+            $found = 1;

+

+            $obj = $db->fetch_object($resql);

+

+            // If this generation module needs to scan a directory, then description field is filled

+            // with the constant that contains list of directories to scan (COMPANY_ADDON_PDF_ODT_PATH, ...).

+            if (!empty($obj->description))	// A list of directories to scan is defined

+            {

+                include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

+

+                $const = $obj->description;

+                //irtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim($conf->global->$const));

+                $dirtoscan = preg_replace('/[\r\n]+/', ',', trim($conf->global->$const));

+

+                $listoffiles = array();

+

+                // Now we add models found in directories scanned

+                $listofdir = explode(',', $dirtoscan);

+                foreach ($listofdir as $key=>$tmpdir)

+                {

+                    $tmpdir = trim($tmpdir);

+                    $tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);

+                    if (!$tmpdir) { unset($listofdir[$key]); continue; }

+                    if (is_dir($tmpdir))

+                    {

+                        // all type of template is allowed

+                        $tmpfiles = dol_dir_list($tmpdir, 'files', 0, '', '', 'name', SORT_ASC, 0);

+                        if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);

+                    }

+                }

+

+                if (count($listoffiles))

+                {

+                    foreach ($listoffiles as $record)

+                    {

+                        $max = ($maxfilenamelength ? $maxfilenamelength : 28);

+                        $liste[$obj->id.':'.$record['fullname']] = dol_trunc($record['name'], $max, 'middle');

+                    }

+                }

+                else

+                {

+                    $liste[0] = $obj->label.': '.$langs->trans("None");

+                }

+            }

+            else

+            {

+            	if ($type == 'member' && $obj->doc_template_name == 'standard')   // Special case, if member template, we add variant per format

+                {

+                    global $_Avery_Labels;

+                    include_once DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php';

+                    foreach ($_Avery_Labels as $key => $val)

+                    {

+                    	$liste[$obj->id.':'.$key] = ($obj->label ? $obj->label : $obj->doc_template_name).' '.$val['name'];

+                    }

+                }

+                else    // Common usage

+                {

+                	$liste[$obj->id] = $obj->label ? $obj->label : $obj->doc_template_name;

+                }

+            }

+            $i++;

+        }

+    }

+    else

+    {

+        dol_print_error($db);

+        return -1;

+    }

+

+    if ($found) return $liste;

+    else return 0;

@@ -1964,3 +1723 @@
-		if (!filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE)) {

-			return 2;

-		}

+		if (!filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE)) return 2;

@@ -1969,3 +1726 @@
-		if (!filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE)) {

-			return 0;

-		}

+		if (!filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE)) return 0;

@@ -1988,18 +1743,5 @@
-	global $conf;

-

-	//$conf->global->MAIN_BUILD_LOGIN_RULE = 'f.lastname';

-	if (getDolGlobalString('MAIN_BUILD_LOGIN_RULE') == 'f.lastname') {	// f.lastname

-		$login = strtolower(dol_string_unaccent(dol_trunc($firstname, 1, 'right', 'UTF-8', 1)));

-		$login .= ($login ? '.' : '');

-		$login .= strtolower(dol_string_unaccent($lastname));

-		$login = dol_string_nospecial($login, ''); // For special names

-	} else {	// firstname.lastname

-		$login = strtolower(dol_string_unaccent($firstname));

-		$login .= ($login ? '.' : '');

-		$login .= strtolower(dol_string_unaccent($lastname));

-		$login = dol_string_nospecial($login, ''); // For special names

-	}

-

-	// TODO Add a hook to allow external modules to suggest new rules

-

-	return $login;

+    $login = strtolower(dol_string_unaccent($firstname));

+    $login .= ($login ? '.' : '');

+    $login .= strtolower(dol_string_unaccent($lastname));

+    $login = dol_string_nospecial($login, ''); // For special names

+    return $login;

@@ -2015,33 +1757,36 @@
-	global $conf;

-

-	$params = array();

-	$proxyuse = (!getDolGlobalString('MAIN_PROXY_USE') ? false : true);

-	$proxyhost = (!getDolGlobalString('MAIN_PROXY_USE') ? false : $conf->global->MAIN_PROXY_HOST);

-	$proxyport = (!getDolGlobalString('MAIN_PROXY_USE') ? false : $conf->global->MAIN_PROXY_PORT);

-	$proxyuser = (!getDolGlobalString('MAIN_PROXY_USE') ? false : $conf->global->MAIN_PROXY_USER);

-	$proxypass = (!getDolGlobalString('MAIN_PROXY_USE') ? false : $conf->global->MAIN_PROXY_PASS);

-	$timeout = (!getDolGlobalString('MAIN_USE_CONNECT_TIMEOUT') ? 10 : $conf->global->MAIN_USE_CONNECT_TIMEOUT); // Connection timeout

-	$response_timeout = (!getDolGlobalString('MAIN_USE_RESPONSE_TIMEOUT') ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT); // Response timeout

-	//print extension_loaded('soap');

-	if ($proxyuse) {

-		$params = array('connection_timeout'=>$timeout,

-					  'response_timeout'=>$response_timeout,

-					  'proxy_use'      => 1,

-					  'proxy_host'     => $proxyhost,

-					  'proxy_port'     => $proxyport,

-					  'proxy_login'    => $proxyuser,

-					  'proxy_password' => $proxypass,

-					  'trace'		   => 1

-		);

-	} else {

-		$params = array('connection_timeout'=>$timeout,

-					  'response_timeout'=>$response_timeout,

-					  'proxy_use'      => 0,

-					  'proxy_host'     => false,

-					  'proxy_port'     => false,

-					  'proxy_login'    => false,

-					  'proxy_password' => false,

-					  'trace'		   => 1

-		);

-	}

-	return $params;

+    global $conf;

+

+    $params = array();

+    $proxyuse = (empty($conf->global->MAIN_PROXY_USE) ?false:true);

+    $proxyhost = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_HOST);

+    $proxyport = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_PORT);

+    $proxyuser = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_USER);

+    $proxypass = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_PASS);

+    $timeout = (empty($conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 10 : $conf->global->MAIN_USE_CONNECT_TIMEOUT); // Connection timeout

+    $response_timeout = (empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT); // Response timeout

+    //print extension_loaded('soap');

+    if ($proxyuse)

+    {

+        $params = array('connection_timeout'=>$timeout,

+                      'response_timeout'=>$response_timeout,

+                      'proxy_use'      => 1,

+                      'proxy_host'     => $proxyhost,

+                      'proxy_port'     => $proxyport,

+                      'proxy_login'    => $proxyuser,

+                      'proxy_password' => $proxypass,

+                      'trace'		   => 1

+        );

+    }

+    else

+    {

+        $params = array('connection_timeout'=>$timeout,

+                      'response_timeout'=>$response_timeout,

+                      'proxy_use'      => 0,

+                      'proxy_host'     => false,

+                      'proxy_port'     => false,

+                      'proxy_login'    => false,

+                      'proxy_password' => false,

+                      'trace'		   => 1

+        );

+    }

+    return $params;

@@ -2067 +1812 @@
-	// If we ask a resource form external module (instead of default path)

+	// If we ask an resource form external module (instead of default path)

@@ -2071,7 +1816,8 @@
-	} else {

-		// Parse $objecttype (ex: project_task)

-		$module = $myobject = $objecttype;

-		if (preg_match('/^([^_]+)_([^_]+)/i', $objecttype, $regs)) {

-			$module = $regs[1];

-			$myobject = $regs[2];

-		}

+	}

+

+	// Parse $objecttype (ex: project_task)

+	$module = $myobject = $objecttype;

+	if (preg_match('/^([^_]+)_([^_]+)/i', $objecttype, $regs))

+	{

+		$module = $regs[1];

+		$myobject = $regs[2];

@@ -2085 +1830,0 @@
-		$langs->load('bills');

@@ -2089,2 +1834,2 @@
-	} elseif ($objecttype == 'commande' || $objecttype == 'order') {

-		$langs->load('orders');

+	}

+	elseif ($objecttype == 'commande' || $objecttype == 'order') {

@@ -2094,2 +1839,2 @@
-	} elseif ($objecttype == 'propal') {

-		$langs->load('propal');

+	}

+	elseif ($objecttype == 'propal') {

@@ -2097,2 +1842,2 @@
-	} elseif ($objecttype == 'supplier_proposal') {

-		$langs->load('supplier_proposal');

+	}

+	elseif ($objecttype == 'supplier_proposal') {

@@ -2100,2 +1845,2 @@
-	} elseif ($objecttype == 'shipping') {

-		$langs->load('sendings');

+	}

+	elseif ($objecttype == 'shipping') {

@@ -2105,7 +1850,7 @@
-	} elseif ($objecttype == 'delivery') {

-		$langs->load('deliveries');

-		$classpath = 'delivery/class';

-		$myobject = 'delivery';

-		$module = 'delivery_note';

-	} elseif ($objecttype == 'contract') {

-		$langs->load('contracts');

+	}

+	elseif ($objecttype == 'delivery') {

+		$classpath = 'livraison/class';

+		$myobject = 'livraison';

+		$module = 'livraison_bon';

+	}

+	elseif ($objecttype == 'contract') {

@@ -2115,2 +1860,2 @@
-	} elseif ($objecttype == 'member') {

-		$langs->load('members');

+	}

+	elseif ($objecttype == 'member') {

@@ -2120 +1865,2 @@
-	} elseif ($objecttype == 'cabinetmed_cons') {

+	}

+	elseif ($objecttype == 'cabinetmed_cons') {

@@ -2124,2 +1870,2 @@
-	} elseif ($objecttype == 'fichinter') {

-		$langs->load('interventions');

+	}

+	elseif ($objecttype == 'fichinter') {

@@ -2129,6 +1875,2 @@
-	} elseif ($objecttype == 'project') {

-		$langs->load('projects');

-		$classpath = 'projet/class';

-		$module = 'projet';

-	} elseif ($objecttype == 'task') {

-		$langs->load('projects');

+	}

+	elseif ($objecttype == 'task') {

@@ -2138 +1880,2 @@
-	} elseif ($objecttype == 'stock') {

+	}

+	elseif ($objecttype == 'stock') {

@@ -2142 +1885,2 @@
-	} elseif ($objecttype == 'inventory') {

+	}

+	elseif ($objecttype == 'inventory') {

@@ -2146 +1890,2 @@
-	} elseif ($objecttype == 'mo') {

+	}

+	elseif ($objecttype == 'mo') {

@@ -2150,4 +1894,0 @@
-	} elseif ($objecttype == 'productlot') {

-		$classpath = 'product/stock/class';

-		$module = 'stock';

-		$myobject = 'productlot';

@@ -2157,3 +1898,2 @@
-	$classfile = strtolower($myobject);

-	$classname = ucfirst($myobject);

-	//print "objecttype=".$objecttype." module=".$module." subelement=".$subelement." classfile=".$classfile." classname=".$classname." classpath=".$classpath;

+	$classfile = strtolower($myobject); $classname = ucfirst($myobject);

+	//print "objecttype=".$objecttype." module=".$module." subelement=".$subelement." classfile=".$classfile." classname=".$classname;

@@ -2166 +1906,2 @@
-	} elseif ($objecttype == 'order_supplier') {

+	}

+	elseif ($objecttype == 'order_supplier') {

@@ -2171,6 +1912,2 @@
-	} elseif ($objecttype == 'supplier_proposal') {

-		$classfile = 'supplier_proposal';

-		$classname = 'SupplierProposal';

-		$classpath = 'supplier_proposal/class';

-		$module = 'supplier_proposal';

-	} elseif ($objecttype == 'stock') {

+	}

+	elseif ($objecttype == 'stock') {

@@ -2180,12 +1917,4 @@
-	} elseif ($objecttype == 'facturerec') {

-		$classpath = 'compta/facture/class';

-		$classfile = 'facture-rec';

-		$classname = 'FactureRec';

-		$module = 'facture';

-	} elseif ($objecttype == 'mailing') {

-		$classpath = 'comm/mailing/class';

-		$classfile = 'mailing';

-		$classname = 'Mailing';

-	}

-

-	if (isModEnabled($module)) {

+	}

+

+	if (!empty($conf->$module->enabled))

+	{

@@ -2193,2 +1922,4 @@
-		if ($res) {

-			if (class_exists($classname)) {

+		if ($res)

+		{

+			if (class_exists($classname))

+			{

@@ -2203,2 +1933,0 @@
-			} else {

-				dol_syslog("Class with classname ".$classname." is unknown even after the include", LOG_ERR);

@@ -2205,0 +1935 @@
+			else dol_syslog("Class with classname ".$classname." is unknown even after the include", LOG_ERR);

@@ -2227 +1957 @@
-	$sql = "SELECT rowid, ".$fieldfkparent." as parent_id FROM ".MAIN_DB_PREFIX.$tabletocleantree;

+	$sql = 'SELECT rowid, '.$fieldfkparent.' as parent_id FROM '.MAIN_DB_PREFIX.$tabletocleantree;

@@ -2229 +1959,2 @@
-	if ($resql) {

+	if ($resql)

+	{

@@ -2232 +1963,2 @@
-		while ($i < $num) {

+		while ($i < $num)

+		{

@@ -2235,3 +1967 @@
-			if ($obj->parent_id > 0) {

-				$listofparentid[$obj->rowid] = $obj->parent_id;

-			}

+			if ($obj->parent_id > 0) $listofparentid[$obj->rowid] = $obj->parent_id;

@@ -2240 +1970,3 @@
-	} else {

+	}

+	else

+	{

@@ -2244 +1976,2 @@
-	if (count($listofid)) {

+	if (count($listofid))

+	{

@@ -2250 +1983,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -2252 +1986,2 @@
-			if ($nb > 0) {

+			if ($nb > 0)

+			{

@@ -2262 +1997,2 @@
-		foreach ($listofparentid as $id => $pid) {

+		foreach ($listofparentid as $id => $pid)

+		{

@@ -2266,3 +2002,3 @@
-			$cursor = $id;

-			$arrayidparsed = array(); // We start from child $id

-			while ($cursor > 0) {

+			$cursor = $id; $arrayidparsed = array(); // We start from child $id

+			while ($cursor > 0)

+			{

@@ -2270 +2006,2 @@
-				if ($arrayidparsed[$listofparentid[$cursor]]) {	// We detect a loop. A record with a parent that was already into child

+				if ($arrayidparsed[$listofparentid[$cursor]])	// We detect a loop. A record with a parent that was already into child

+				{

@@ -2279,3 +2016 @@
-			if (count($listofidtoclean)) {

-				break;

-			}

+			if (count($listofidtoclean)) break;

@@ -2286 +2021 @@
-		$sql .= " WHERE rowid IN (".$db->sanitize(join(',', $listofidtoclean)).")"; // So we update only records detected wrong

+		$sql .= " WHERE rowid IN (".join(',', $listofidtoclean).")"; // So we update only records detected wrong

@@ -2288 +2023,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -2290 +2026,2 @@
-			if ($nb > 0) {

+			if ($nb > 0)

+			{

@@ -2303 +2040 @@
-		$sql .= " WHERE ".$fieldfkparent." NOT IN (".$db->sanitize(join(',', $listofid), 1).")"; // So we update only records linked to a non existing parent

+		$sql .= " WHERE ".$fieldfkparent." NOT IN (".join(',', $listofid).")"; // So we update only records linked to a non existing parent

@@ -2305 +2042,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -2307 +2045,2 @@
-			if ($nb > 0) {

+			if ($nb > 0)

+			{

@@ -2320 +2058,0 @@
-	return -1;

@@ -2335,6 +2073,2 @@
-	if (!is_array($arraycolor)) {

-		return $colorifnotfound;

-	}

-	if (empty($arraycolor)) {

-		return $colorifnotfound;

-	}

+	if (!is_array($arraycolor)) return $colorifnotfound;

+	if (empty($arraycolor)) return $colorifnotfound;

@@ -2356,3 +2090 @@
-	if (is_array($stringcolor)) {

-		return $stringcolor; // If already into correct output format, we return as is

-	}

+	if (is_array($stringcolor)) return $stringcolor; // If already into correct output format, we return as is

@@ -2361 +2093,2 @@
-	if (!$tmp) {

+	if (!$tmp)

+	{

@@ -2363,3 +2096 @@
-		if (count($tmp) < 3) {

-			return $colorifnotfound;

-		}

+		if (count($tmp) < 3) return $colorifnotfound;

@@ -2378,8 +2109,7 @@
-	if (!$allow_white && ($color === '#fff' || $color === '#ffffff')) {

-		return false;

-	}

-

-	if (preg_match('/^#[a-f0-9]{6}$/i', $color)) { //hex color is valid

-		return true;

-	}

-	return false;

+    if (!$allow_white && ($color === '#fff' || $color === '#ffffff')) return false;

+

+    if (preg_match('/^#[a-f0-9]{6}$/i', $color)) //hex color is valid

+    {

+        return true;

+    }

+    return false;

@@ -2399,3 +2129 @@
-	if (empty($ratio)) {

-		$ratio = 0; // To avoid null

-	}

+	if (empty($ratio)) $ratio = 0; // To avoid null

@@ -2418,14 +2146,4 @@
-		if ($ratio > 0) {	// We increase aggressivity

-			if ($color > 127) {

-				$color += ((255 - $color) * ($ratio / 100));

-			}

-			if ($color < 128) {

-				$color -= ($color * ($ratio / 100));

-			}

-		} else { // We decrease agressiveness

-			if ($color > 128) {

-				$color -= (($color - 128) * (abs($ratio) / 100));

-			}

-			if ($color < 127) {

-				$color += ((128 - $color) * (abs($ratio) / 100));

-			}

+		if ($ratio > 0)	// We increase aggressivity

+		{

+			if ($color > 127) $color += ((255 - $color) * ($ratio / 100));

+			if ($color < 128) $color -= ($color * ($ratio / 100));

@@ -2433 +2151,7 @@
-		if ($brightness > 0) {

+		else			// We decrease agressiveness

+		{

+			if ($color > 128) $color -= (($color - 128) * (abs($ratio) / 100));

+			if ($color < 127) $color += ((128 - $color) * (abs($ratio) / 100));

+		}

+		if ($brightness > 0)

+		{

@@ -2435 +2159,3 @@
-		} else {

+		}

+		else

+		{

@@ -2455,20 +2181,20 @@
-	// Steps should be between -255 and 255. Negative = darker, positive = lighter

-	$steps = max(-255, min(255, $steps));

-

-	// Normalize into a six character long hex string

-	$hex = str_replace('#', '', $hex);

-	if (strlen($hex) == 3) {

-		$hex = str_repeat(substr($hex, 0, 1), 2).str_repeat(substr($hex, 1, 1), 2).str_repeat(substr($hex, 2, 1), 2);

-	}

-

-	// Split into three parts: R, G and B

-	$color_parts = str_split($hex, 2);

-	$return = '#';

-

-	foreach ($color_parts as $color) {

-		$color   = hexdec($color); // Convert to decimal

-		$color   = max(0, min(255, $color + $steps)); // Adjust color

-		$return .= str_pad(dechex($color), 2, '0', STR_PAD_LEFT); // Make two char hex code

-	}

-

-	return $return;

+    // Steps should be between -255 and 255. Negative = darker, positive = lighter

+    $steps = max(-255, min(255, $steps));

+

+    // Normalize into a six character long hex string

+    $hex = str_replace('#', '', $hex);

+    if (strlen($hex) == 3) {

+        $hex = str_repeat(substr($hex, 0, 1), 2).str_repeat(substr($hex, 1, 1), 2).str_repeat(substr($hex, 2, 1), 2);

+    }

+

+    // Split into three parts: R, G and B

+    $color_parts = str_split($hex, 2);

+    $return = '#';

+

+    foreach ($color_parts as $color) {

+        $color   = hexdec($color); // Convert to decimal

+        $color   = max(0, min(255, $color + $steps)); // Adjust color

+        $return .= str_pad(dechex($color), 2, '0', STR_PAD_LEFT); // Make two char hex code

+    }

+

+    return $return;

@@ -2484,2 +2210,2 @@
-	$steps = intval(255 * $percent / 100) * -1;

-	return colorAdjustBrightness($hex, $steps);

+    $steps = intval(255 * $percent / 100) * -1;

+    return colorAdjustBrightness($hex, $steps);

@@ -2495,2 +2221,2 @@
-	$steps = intval(255 * $percent / 100);

-	return colorAdjustBrightness($hex, $steps);

+    $steps = intval(255 * $percent / 100);

+    return colorAdjustBrightness($hex, $steps);

@@ -2508,19 +2234,21 @@
-	$string = '';

-	$hex      = str_replace('#', '', $hex);

-	$length   = strlen($hex);

-	$rgb = array();

-	$rgb['r'] = hexdec($length == 6 ? substr($hex, 0, 2) : ($length == 3 ? str_repeat(substr($hex, 0, 1), 2) : 0));

-	$rgb['g'] = hexdec($length == 6 ? substr($hex, 2, 2) : ($length == 3 ? str_repeat(substr($hex, 1, 1), 2) : 0));

-	$rgb['b'] = hexdec($length == 6 ? substr($hex, 4, 2) : ($length == 3 ? str_repeat(substr($hex, 2, 1), 2) : 0));

-	if ($alpha !== false) {

-		$rgb['a'] = (float) $alpha;

-		$string = 'rgba('.implode(',', $rgb).')';

-	} else {

-		$string = 'rgb('.implode(',', $rgb).')';

-	}

-

-	if ($returnArray) {

-		return $rgb;

-	} else {

-		return $string;

-	}

+    $string = '';

+    $hex      = str_replace('#', '', $hex);

+    $length   = strlen($hex);

+    $rgb = array();

+    $rgb['r'] = hexdec($length == 6 ? substr($hex, 0, 2) : ($length == 3 ? str_repeat(substr($hex, 0, 1), 2) : 0));

+    $rgb['g'] = hexdec($length == 6 ? substr($hex, 2, 2) : ($length == 3 ? str_repeat(substr($hex, 1, 1), 2) : 0));

+    $rgb['b'] = hexdec($length == 6 ? substr($hex, 4, 2) : ($length == 3 ? str_repeat(substr($hex, 2, 1), 2) : 0));

+    if ($alpha !== false) {

+        $rgb['a'] = floatval($alpha);

+        $string = 'rgba('.implode(',', $rgb).')';

+    }

+    else {

+        $string = 'rgb('.implode(',', $rgb).')';

+    }

+

+    if ($returnArray) {

+        return $rgb;

+    }

+    else {

+        return $string;

+    }

@@ -2539,19 +2267,19 @@
-	// filter out empty values

-	$input = array_filter($input);

-

-	$result = array(array());

-

-	foreach ($input as $key => $values) {

-		$append = array();

-

-		foreach ($result as $product) {

-			foreach ($values as $item) {

-				$product[$key] = $item;

-				$append[] = $product;

-			}

-		}

-

-		$result = $append;

-	}

-

-	return $result;

+    // filter out empty values

+    $input = array_filter($input);

+

+    $result = array(array());

+

+    foreach ($input as $key => $values) {

+        $append = array();

+

+        foreach ($result as $product) {

+            foreach ($values as $item) {

+                $product[$key] = $item;

+                $append[] = $product;

+            }

+        }

+

+        $result = $append;

+    }

+

+    return $result;

@@ -2569,50 +2297,62 @@
-	$moduledirforclass = $moduleobject;

-	if ($moduledirforclass != 'api') {

-		$moduledirforclass = preg_replace('/api$/i', '', $moduledirforclass);

-	}

-

-	if ($moduleobject == 'contracts') {

-		$moduledirforclass = 'contrat';

-	} elseif (in_array($moduleobject, array('admin', 'login', 'setup', 'access', 'status', 'tools', 'documents'))) {

-		$moduledirforclass = 'api';

-	} elseif ($moduleobject == 'contact' || $moduleobject == 'contacts' || $moduleobject == 'customer' || $moduleobject == 'thirdparty' || $moduleobject == 'thirdparties') {

-		$moduledirforclass = 'societe';

-	} elseif ($moduleobject == 'propale' || $moduleobject == 'proposals') {

-		$moduledirforclass = 'comm/propal';

-	} elseif ($moduleobject == 'agenda' || $moduleobject == 'agendaevents') {

-		$moduledirforclass = 'comm/action';

-	} elseif ($moduleobject == 'adherent' || $moduleobject == 'members' || $moduleobject == 'memberstypes' || $moduleobject == 'subscriptions') {

-		$moduledirforclass = 'adherents';

-	} elseif ($moduleobject == 'don' || $moduleobject == 'donations') {

-		$moduledirforclass = 'don';

-	} elseif ($moduleobject == 'banque' || $moduleobject == 'bankaccounts') {

-		$moduledirforclass = 'compta/bank';

-	} elseif ($moduleobject == 'category' || $moduleobject == 'categorie') {

-		$moduledirforclass = 'categories';

-	} elseif ($moduleobject == 'order' || $moduleobject == 'orders') {

-		$moduledirforclass = 'commande';

-	} elseif ($moduleobject == 'shipments') {

-		$moduledirforclass = 'expedition';

-	} elseif ($moduleobject == 'multicurrencies') {

-		$moduledirforclass = 'multicurrency';

-	} elseif ($moduleobject == 'facture' || $moduleobject == 'invoice' || $moduleobject == 'invoices') {

-		$moduledirforclass = 'compta/facture';

-	} elseif ($moduleobject == 'project' || $moduleobject == 'projects' || $moduleobject == 'task' || $moduleobject == 'tasks') {

-		$moduledirforclass = 'projet';

-	} elseif ($moduleobject == 'stock' || $moduleobject == 'stockmovements' || $moduleobject == 'warehouses') {

-		$moduledirforclass = 'product/stock';

-	} elseif ($moduleobject == 'supplierproposals' || $moduleobject == 'supplierproposal' || $moduleobject == 'supplier_proposal') {

-		$moduledirforclass = 'supplier_proposal';

-	} elseif ($moduleobject == 'fournisseur' || $moduleobject == 'supplierinvoices' || $moduleobject == 'supplierorders') {

-		$moduledirforclass = 'fourn';

-	} elseif ($moduleobject == 'ficheinter' || $moduleobject == 'interventions') {

-		$moduledirforclass = 'fichinter';

-	} elseif ($moduleobject == 'mos') {

-		$moduledirforclass = 'mrp';

-	} elseif ($moduleobject == 'accounting') {

-		$moduledirforclass = 'accountancy';

-	} elseif (in_array($moduleobject, array('products', 'expensereports', 'users', 'tickets', 'boms', 'receptions', 'partnerships', 'recruitments'))) {

-		$moduledirforclass = preg_replace('/s$/', '', $moduleobject);

-	}

-

-	return $moduledirforclass;

+    $moduledirforclass = $moduleobject;

+    if ($moduledirforclass != 'api') $moduledirforclass = preg_replace('/api$/i', '', $moduledirforclass);

+

+    if ($moduleobject == 'contracts') {

+    	$moduledirforclass = 'contrat';

+    }

+    elseif (in_array($moduleobject, array('admin', 'login', 'setup', 'access', 'status', 'tools', 'documents'))) {

+        $moduledirforclass = 'api';

+    }

+    elseif ($moduleobject == 'contact' || $moduleobject == 'contacts' || $moduleobject == 'customer' || $moduleobject == 'thirdparty' || $moduleobject == 'thirdparties') {

+        $moduledirforclass = 'societe';

+    }

+    elseif ($moduleobject == 'propale' || $moduleobject == 'proposals') {

+        $moduledirforclass = 'comm/propal';

+    }

+    elseif ($moduleobject == 'agenda' || $moduleobject == 'agendaevents') {

+        $moduledirforclass = 'comm/action';

+    }

+    elseif ($moduleobject == 'adherent' || $moduleobject == 'members' || $moduleobject == 'memberstypes' || $moduleobject == 'subscriptions') {

+        $moduledirforclass = 'adherents';

+    }

+    elseif ($moduleobject == 'don' || $moduleobject == 'donations') {

+        $moduledirforclass = 'don';

+    }

+    elseif ($moduleobject == 'banque' || $moduleobject == 'bankaccounts') {

+        $moduledirforclass = 'compta/bank';

+    }

+    elseif ($moduleobject == 'category' || $moduleobject == 'categorie') {

+        $moduledirforclass = 'categories';

+    }

+    elseif ($moduleobject == 'order' || $moduleobject == 'orders') {

+        $moduledirforclass = 'commande';

+    }

+    elseif ($moduleobject == 'shipments') {

+        $moduledirforclass = 'expedition';

+    }

+    elseif ($moduleobject == 'facture' || $moduleobject == 'invoice' || $moduleobject == 'invoices') {

+        $moduledirforclass = 'compta/facture';

+    }

+    elseif ($moduleobject == 'project' || $moduleobject == 'projects' || $moduleobject == 'task' || $moduleobject == 'tasks') {

+        $moduledirforclass = 'projet';

+    }

+    elseif ($moduleobject == 'stock' || $moduleobject == 'stockmovements' || $moduleobject == 'warehouses') {

+        $moduledirforclass = 'product/stock';

+    }

+    elseif ($moduleobject == 'supplierproposals' || $moduleobject == 'supplierproposal' || $moduleobject == 'supplier_proposal') {

+    	$moduledirforclass = 'supplier_proposal';

+    }

+    elseif ($moduleobject == 'fournisseur' || $moduleobject == 'supplierinvoices' || $moduleobject == 'supplierorders') {

+        $moduledirforclass = 'fourn';

+    }

+    elseif ($moduleobject == 'ficheinter' || $moduleobject == 'interventions') {

+    	$moduledirforclass = 'fichinter';

+    }

+    elseif ($moduleobject == 'mos') {

+    	$moduledirforclass = 'mrp';

+    }

+    elseif (in_array($moduleobject, array('products', 'expensereports', 'users', 'tickets', 'boms'))) {

+    	$moduledirforclass = preg_replace('/s$/', '', $moduleobject);

+    }

+

+    return $moduledirforclass;

@@ -2630 +2370 @@
-	return str_pad(dechex(mt_rand($min, $max)), 2, '0', STR_PAD_LEFT);

+    return str_pad(dechex(mt_rand($min, $max)), 2, '0', STR_PAD_LEFT);

@@ -2642,15 +2382,52 @@
-	return randomColorPart($min, $max).randomColorPart($min, $max).randomColorPart($min, $max);

-}

-

-

-if (!function_exists('dolEscapeXML')) {

-	/**

-	 * Encode string for xml usage

-	 *

-	 * @param 	string	$string		String to encode

-	 * @return	string				String encoded

-	 */

-	function dolEscapeXML($string)

-	{

-		return strtr($string, array('\''=>'&apos;', '"'=>'&quot;', '&'=>'&amp;', '<'=>'&lt;', '>'=>'&gt;'));

-	}

+    return randomColorPart($min, $max).randomColorPart($min, $max).randomColorPart($min, $max);

+}

+

+

+if (!function_exists('dolEscapeXML'))

+{

+    /**

+     * Encode string for xml usage

+     *

+     * @param 	string	$string		String to encode

+     * @return	string				String encoded

+     */

+    function dolEscapeXML($string)

+    {

+        return strtr($string, array('\''=>'&apos;', '"'=>'&quot;', '&'=>'&amp;', '<'=>'&lt;', '>'=>'&gt;'));

+    }

+}

+

+

+/**

+ *	Return automatic or manual in current language

+ *

+ *	@param	string	$automaticmanual   Value to test (1, 'automatic', 'true' or 0, 'manual', 'false')

+ *	@param	integer	$case			   1=Yes/No, 0=yes/no, 2=Disabled checkbox, 3=Disabled checkbox + Automatic/Manual

+ *	@param	int		$color			   0=texte only, 1=Text is formated with a color font style ('ok' or 'error'), 2=Text is formated with 'ok' color.

+ *	@return	string					   HTML string

+ */

+function autoOrManual($automaticmanual, $case = 1, $color = 0)

+{

+    global $langs;

+    $result = 'unknown'; $classname = '';

+    if ($automaticmanual == 1 || strtolower($automaticmanual) == 'automatic' || strtolower($automaticmanual) == 'true') 	// A mettre avant test sur no a cause du == 0

+    {

+        $result = $langs->trans('automatic');

+        if ($case == 1 || $case == 3) $result = $langs->trans("Automatic");

+        if ($case == 2) $result = '<input type="checkbox" value="1" checked disabled>';

+        if ($case == 3) $result = '<input type="checkbox" value="1" checked disabled> '.$result;

+

+        $classname = 'ok';

+    }

+    elseif ($automaticmanual == 0 || strtolower($automaticmanual) == 'manual' || strtolower($automaticmanual) == 'false')

+    {

+        $result = $langs->trans("manual");

+        if ($case == 1 || $case == 3) $result = $langs->trans("Manual");

+        if ($case == 2) $result = '<input type="checkbox" value="0" disabled>';

+        if ($case == 3) $result = '<input type="checkbox" value="0" disabled> '.$result;

+

+        if ($color == 2) $classname = 'ok';

+        else $classname = 'error';

+    }

+    if ($color) return '<font class="'.$classname.'">'.$result.'</font>';

+    return $result;

@@ -2668,7 +2445,7 @@
-	global $dolibarr_main_url_root;

-	// Define $urlwithroot

-	$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));

-	$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file

-	//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current

-	$notetoshow = preg_replace('/src="[a-zA-Z0-9_\/\-\.]*(viewimage\.php\?modulepart=medias[^"]*)"/', 'src="'.$urlwithroot.'/\1"', $notetoshow);

-	return $notetoshow;

+    global $dolibarr_main_url_root;

+    // Define $urlwithroot

+    $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));

+    $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file

+    //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current

+    $notetoshow = preg_replace('/src="[a-zA-Z0-9_\/\-\.]*(viewimage\.php\?modulepart=medias[^"]*)"/', 'src="'.$urlwithroot.'/\1"', $notetoshow);

+    return $notetoshow;

@@ -2681 +2458 @@
- *		@param	float		$amount		Amount to format

+ *		@param	float		$amount			Amount to format

@@ -2690,3 +2467 @@
-	if (empty($amount)) {

-		$amount = 0; // To have a numeric value if amount not defined or = ''

-	}

+	if (empty($amount)) $amount = 0; // To have a numeric value if amount not defined or = ''

@@ -2696 +2471 @@
-	$nbdecimal = (!getDolGlobalString('ACCOUNTING_FEC_DECIMAL_LENGTH') ? 2 : $conf->global->ACCOUNTING_FEC_DECIMAL_LENGTH);

+	$nbdecimal = (empty($conf->global->ACCOUNTING_FEC_DECIMAL_LENGTH) ? 2 : $conf->global->ACCOUNTING_FEC_DECIMAL_LENGTH);

@@ -2699,2 +2474,2 @@
-	$dec = (!getDolGlobalString('ACCOUNTING_FEC_DECIMAL_SEPARATOR') ? ',' : $conf->global->ACCOUNTING_FEC_DECIMAL_SEPARATOR);

-	$thousand = (!getDolGlobalString('ACCOUNTING_FEC_THOUSAND_SEPARATOR') ? '' : $conf->global->ACCOUNTING_FEC_THOUSAND_SEPARATOR);

+	$dec = (empty($conf->global->ACCOUNTING_FEC_DECIMAL_SEPARATOR) ? ',' : $conf->global->ACCOUNTING_FEC_DECIMAL_SEPARATOR);

+	$thousand = (empty($conf->global->ACCOUNTING_FEC_THOUSAND_SEPARATOR) ? '' : $conf->global->ACCOUNTING_FEC_THOUSAND_SEPARATOR);

@@ -2707,188 +2481,0 @@
-

-/**

- * Check the syntax of some PHP code.

- *

- * @param 	string 			$code 	PHP code to check.

- * @return 	boolean|array 			If false, then check was successful, otherwise an array(message,line) of errors is returned.

- */

-function phpSyntaxError($code)

-{

-	if (!defined("CR")) {

-		define("CR", "\r");

-	}

-	if (!defined("LF")) {

-		define("LF", "\n");

-	}

-	if (!defined("CRLF")) {

-		define("CRLF", "\r\n");

-	}

-

-	$braces = 0;

-	$inString = 0;

-	foreach (token_get_all('<?php '.$code) as $token) {

-		if (is_array($token)) {

-			switch ($token[0]) {

-				case T_CURLY_OPEN:

-				case T_DOLLAR_OPEN_CURLY_BRACES:

-				case T_START_HEREDOC:

-					++$inString;

-					break;

-				case T_END_HEREDOC:

-					--$inString;

-					break;

-			}

-		} elseif ($inString & 1) {

-			switch ($token) {

-				case '`':

-				case '\'':

-				case '"':

-					--$inString;

-					break;

-			}

-		} else {

-			switch ($token) {

-				case '`':

-				case '\'':

-				case '"':

-					++$inString;

-					break;

-				case '{':

-					++$braces;

-					break;

-				case '}':

-					if ($inString) {

-						--$inString;

-					} else {

-						--$braces;

-						if ($braces < 0) {

-							break 2;

-						}

-					}

-					break;

-			}

-		}

-	}

-	$inString = @ini_set('log_errors', false);

-	$token = @ini_set('display_errors', true);

-	ob_start();

-	$code = substr($code, strlen('<?php '));

-	$braces || $code = "if(0){{$code}\n}";

-	if (eval($code) === false) {

-		if ($braces) {

-			$braces = PHP_INT_MAX;

-		} else {

-			false !== strpos($code, CR) && $code = strtr(str_replace(CRLF, LF, $code), CR, LF);

-			$braces = substr_count($code, LF);

-		}

-		$code = ob_get_clean();

-		$code = strip_tags($code);

-		if (preg_match("'syntax error, (.+) in .+ on line (\d+)$'s", $code, $code)) {

-			$code[2] = (int) $code[2];

-			$code = $code[2] <= $braces

-			? array($code[1], $code[2])

-			: array('unexpected $end'.substr($code[1], 14), $braces);

-		} else {

-			$code = array('syntax error', 0);

-		}

-	} else {

-		ob_end_clean();

-		$code = false;

-	}

-	@ini_set('display_errors', $token);

-	@ini_set('log_errors', $inString);

-	return $code;

-}

-

-

-/**

- * Check the syntax of some PHP code.

- *

- * @return 	int		>0 if OK, 0 if no			Return if we accept link added from the media browser into HTML field for public usage

- */

-function acceptLocalLinktoMedia()

-{

-	global $user;

-

-	// If $acceptlocallinktomedia is true, we can add link media files int email templates (we already can do this into HTML editor of an email).

-	// Note that local link to a file into medias are replaced with a real link by email in CMailFile.class.php with value $urlwithroot defined like this:

-	// $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));

-	// $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file

-	$acceptlocallinktomedia = getDolGlobalInt('MAIN_DISALLOW_MEDIAS_IN_EMAIL_TEMPLATES') ? 0 : 1;

-	if ($acceptlocallinktomedia) {

-		global $dolibarr_main_url_root;

-		$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));

-

-		// Parse $newUrl

-		$newUrlArray = parse_url($urlwithouturlroot);

-		$hosttocheck = $newUrlArray['host'];

-		$hosttocheck = str_replace(array('[', ']'), '', $hosttocheck); // Remove brackets of IPv6

-

-		if (function_exists('gethostbyname')) {

-			$iptocheck = gethostbyname($hosttocheck);

-		} else {

-			$iptocheck = $hosttocheck;

-		}

-

-		//var_dump($iptocheck.' '.$acceptlocallinktomedia);

-		$allowParamName = 'MAIN_ALLOW_WYSIWYG_LOCAL_MEDIAS_ON_PRIVATE_NETWORK';

-		$allowPrivateNetworkIP = getDolGlobalInt($allowParamName);

-		if (!$allowPrivateNetworkIP && !filter_var($iptocheck, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) {

-			// If ip of public url is a private network IP, we do not allow this.

-			$acceptlocallinktomedia = 0;

-			//dol_syslog("WYSIWYG Editor : local media not allowed (checked IP: {$iptocheck}). Use {$allowParamName} = 1 to allow local URL into WYSIWYG html content");

-		}

-

-		if (preg_match('/http:/i', $urlwithouturlroot)) {

-			// If public url is not a https, we do not allow to add medias link. It will generate security alerts when email will be sent.

-			$acceptlocallinktomedia = 0;

-			// TODO Show a warning

-		}

-

-		if (!empty($user->socid)) {

-			$acceptlocallinktomedia = 0;

-		}

-	}

-

-	//return 1;

-	return $acceptlocallinktomedia;

-}

-

-

-/**

- * Remove first and last parenthesis but only if first is the opening and last the closing of the same group

- *

- * @param 	string	$string		String to sanitize

- * @return 	string				String without global parenthesis

- */

-function removeGlobalParenthesis($string)

-{

-	$string = trim($string);

-

-	// If string does not start and end with parenthesis, we return $string as is.

-	if (! preg_match('/^\(.*\)$/', $string)) {

-		return $string;

-	}

-

-	$nbofchars = dol_strlen($string);

-	$i = 0;

-	$g = 0;

-	$countparenthesis = 0;

-	while ($i < $nbofchars) {

-		$char = dol_substr($string, $i, 1);

-		if ($char == '(') {

-			$countparenthesis++;

-		} elseif ($char == ')') {

-			$countparenthesis--;

-			if ($countparenthesis <= 0) {	// We reach the end of an independent group of parenthesis

-				$g++;

-			}

-		}

-		$i++;

-	}

-

-	if ($g <= 1) {

-		return preg_replace('/^\(/', '', preg_replace('/\)$/', '', $string));

-	}

-

-	return $string;

-}

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_functionsnumtoword.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_functionsnumtoword.lib.php
@@ -19 +18,0 @@
-

@@ -26,2 +25,3 @@
-/**

- * Function to return a number into a text.

+

+/**

+ * Function to return number in text.

@@ -30 +30 @@
- * @param	float       $num			Number to convert (must be a numeric value, like reported by price2num())

+ * @param	float       $num			Number to convert

@@ -32,2 +32,2 @@
- * @param	string      $currency		''=number to translate | 'XX'=currency code to use into text

- * @param	boolean     $centimes		false=no cents/centimes | true=there is cents/centimes

+ * @param	boolean     $currency		0=number to translate | 1=currency to translate

+ * @param	boolean     $centimes		0=no centimes | 1=centimes to translate

@@ -36 +36 @@
-function dol_convertToWord($num, $langs, $currency = '', $centimes = false)

+function dol_convertToWord($num, $langs, $currency = false, $centimes = false)

@@ -40,4 +40,4 @@
-	//$num = str_replace(array(',', ' '), '', trim($num));	This should be useless since $num MUST be a php numeric value

-	if (!$num) {

-		return false;

-	}

+    $num = str_replace(array(',', ' '), '', trim($num));

+    if (!$num) {

+        return false;

+    }

@@ -49 +49 @@
-	if (isModEnabled('numberwords')) {

+	if (!empty($conf->global->MAIN_MODULE_NUMBERWORDS)) {

@@ -51 +51 @@
-			$type = '1';

+			$type = 1;

@@ -53 +53 @@
-			$type = '0';

+			$type = 0;

@@ -60,24 +60,36 @@
-

-		$num = (int) $TNum[0];

-		$words = array();

-		$list1 = array(

-			'',

-			$langs->transnoentitiesnoconv('one'),

-			$langs->transnoentitiesnoconv('two'),

-			$langs->transnoentitiesnoconv('three'),

-			$langs->transnoentitiesnoconv('four'),

-			$langs->transnoentitiesnoconv('five'),

-			$langs->transnoentitiesnoconv('six'),

-			$langs->transnoentitiesnoconv('seven'),

-			$langs->transnoentitiesnoconv('eight'),

-			$langs->transnoentitiesnoconv('nine'),

-			$langs->transnoentitiesnoconv('ten'),

-			$langs->transnoentitiesnoconv('eleven'),

-			$langs->transnoentitiesnoconv('twelve'),

-			$langs->transnoentitiesnoconv('thirteen'),

-			$langs->transnoentitiesnoconv('fourteen'),

-			$langs->transnoentitiesnoconv('fifteen'),

-			$langs->transnoentitiesnoconv('sixteen'),

-			$langs->transnoentitiesnoconv('seventeen'),

-			$langs->transnoentitiesnoconv('eighteen'),

-			$langs->transnoentitiesnoconv('nineteen')

+	    $num = (int) $TNum[0];

+	    $words = array();

+	    $list1 = array(

+	    	'',

+	    	$langs->transnoentitiesnoconv('one'),

+	    	$langs->transnoentitiesnoconv('two'),

+	    	$langs->transnoentitiesnoconv('three'),

+	    	$langs->transnoentitiesnoconv('four'),

+	    	$langs->transnoentitiesnoconv('five'),

+	    	$langs->transnoentitiesnoconv('six'),

+	    	$langs->transnoentitiesnoconv('seven'),

+	    	$langs->transnoentitiesnoconv('eight'),

+	    	$langs->transnoentitiesnoconv('nine'),

+	    	$langs->transnoentitiesnoconv('ten'),

+	    	$langs->transnoentitiesnoconv('eleven'),

+	        $langs->transnoentitiesnoconv('twelve'),

+	        $langs->transnoentitiesnoconv('thirteen'),

+	        $langs->transnoentitiesnoconv('fourteen'),

+	        $langs->transnoentitiesnoconv('fifteen'),

+	        $langs->transnoentitiesnoconv('sixteen'),

+	        $langs->transnoentitiesnoconv('seventeen'),

+	        $langs->transnoentitiesnoconv('eighteen'),

+	        $langs->transnoentitiesnoconv('nineteen')

+	    );

+	    $list2 = array(

+	    	'',

+		    $langs->transnoentitiesnoconv('ten'),

+		    $langs->transnoentitiesnoconv('twenty'),

+		    $langs->transnoentitiesnoconv('thirty'),

+		    $langs->transnoentitiesnoconv('forty'),

+		    $langs->transnoentitiesnoconv('fifty'),

+		    $langs->transnoentitiesnoconv('sixty'),

+		    $langs->transnoentitiesnoconv('seventy'),

+		    $langs->transnoentitiesnoconv('eighty'),

+		    $langs->transnoentitiesnoconv('ninety'),

+		    $langs->transnoentitiesnoconv('hundred')

@@ -85,48 +97,35 @@
-		$list2 = array(

-			'',

-			$langs->transnoentitiesnoconv('ten'),

-			$langs->transnoentitiesnoconv('twenty'),

-			$langs->transnoentitiesnoconv('thirty'),

-			$langs->transnoentitiesnoconv('forty'),

-			$langs->transnoentitiesnoconv('fifty'),

-			$langs->transnoentitiesnoconv('sixty'),

-			$langs->transnoentitiesnoconv('seventy'),

-			$langs->transnoentitiesnoconv('eighty'),

-			$langs->transnoentitiesnoconv('ninety'),

-			$langs->transnoentitiesnoconv('hundred')

-		);

-		$list3 = array(

-			'',

-			$langs->transnoentitiesnoconv('thousand'),

-			$langs->transnoentitiesnoconv('million'),

-			$langs->transnoentitiesnoconv('billion'),

-			$langs->transnoentitiesnoconv('trillion'),

-			$langs->transnoentitiesnoconv('quadrillion')

-		);

-

-		$num_length = strlen($num);

-		$levels = (int) (($num_length + 2) / 3);

-		$max_length = $levels * 3;

-		$num = substr('00'.$num, -$max_length);

-		$num_levels = str_split($num, 3);

-		$nboflevels = count($num_levels);

-		for ($i = 0; $i < $nboflevels; $i++) {

-			$levels--;

-			$hundreds = (int) ($num_levels[$i] / 100);

-			$hundreds = ($hundreds ? ' '.$list1[$hundreds].' '.$langs->transnoentities('hundred').($hundreds == 1 ? '' : 's').' ' : '');

-			$tens = (int) ($num_levels[$i] % 100);

-			$singles = '';

-			if ($tens < 20) {

-				$tens = ($tens ? ' '.$list1[$tens].' ' : '');

-			} else {

-				$tens = (int) ($tens / 10);

-				$tens = ' '.$list2[$tens].' ';

-				$singles = (int) ($num_levels[$i] % 10);

-				$singles = ' '.$list1[$singles].' ';

-			}

-			$words[] = $hundreds.$tens.$singles.(($levels && (int) ($num_levels[$i])) ? ' '.$list3[$levels].' ' : '');

-		} //end for loop

-		$commas = count($words);

-		if ($commas > 1) {

-			$commas = $commas - 1;

-		}

+	    $list3 = array(

+	    	'',

+	    	$langs->transnoentitiesnoconv('thousand'),

+	    	$langs->transnoentitiesnoconv('million'),

+	    	$langs->transnoentitiesnoconv('billion'),

+	    	$langs->transnoentitiesnoconv('trillion'),

+	    	$langs->transnoentitiesnoconv('quadrillion')

+	    );

+

+	    $num_length = strlen($num);

+	    $levels = (int) (($num_length + 2) / 3);

+	    $max_length = $levels * 3;

+	    $num = substr('00'.$num, -$max_length);

+	    $num_levels = str_split($num, 3);

+	    $nboflevels = count($num_levels);

+	    for ($i = 0; $i < $nboflevels; $i++) {

+	        $levels--;

+	        $hundreds = (int) ($num_levels[$i] / 100);

+	        $hundreds = ($hundreds ? ' '.$list1[$hundreds].' '.$langs->transnoentities('hundred').($hundreds == 1 ? '' : 's').' ' : '');

+	        $tens = (int) ($num_levels[$i] % 100);

+	        $singles = '';

+	        if ($tens < 20) {

+	            $tens = ($tens ? ' '.$list1[$tens].' ' : '');

+	        } else {

+	            $tens = (int) ($tens / 10);

+	            $tens = ' '.$list2[$tens].' ';

+	            $singles = (int) ($num_levels[$i] % 10);

+	            $singles = ' '.$list1[$singles].' ';

+	        }

+	        $words[] = $hundreds.$tens.$singles.(($levels && (int) ($num_levels[$i])) ? ' '.$list3[$levels].' ' : '');

+	    } //end for loop

+	    $commas = count($words);

+	    if ($commas > 1) {

+	        $commas = $commas - 1;

+	    }

@@ -142,13 +141,6 @@
-		$decimalpart = empty($TNum[1]) ? '' : preg_replace('/0+$/', '', $TNum[1]);

-

-		if ($decimalpart) {

-			if (!empty($currency)) {

-				$concatWords .= ' '.$langs->transnoentities('and');

-			}

-

-			$concatWords .= ' '.dol_convertToWord($decimalpart, $langs, '', true);

-			if (!empty($currency)) {

-				$concatWords .= ' '.$langs->transnoentities('centimes');

-			}

-		}

-		return $concatWords;

+		if (!empty($TNum[1])) {

+			if (!empty($currency)) $concatWords .= ' '.$langs->transnoentities('and');

+			$concatWords .= ' '.dol_convertToWord($TNum[1], $langs, $currency, true);

+			if (!empty($currency)) $concatWords .= ' '.$langs->transnoentities('centimes');

+		}

+	    return $concatWords;

@@ -166 +158 @@
- * @return 	string|int  	       			Text of the number or -1 in case TOO LONG (more than 1000000000000.99)

+ * @return 	string  	       			Text of the number or -1 in case TOO LONG (more than 1000000000000.99)

@@ -170,5 +162,3 @@
-	// If the number is negative convert to positive and return -1 if it is too long

-	if ($numero < 0) {

-		$numero *= -1;

-	}

-	if ($numero >= 1000000000001) {

+	// If the number is negative convert to positive and return -1 if is too long

+	if ($numero < 0) $numero *= -1;

+	if ($numero >= 1000000000001)

@@ -176,2 +165,0 @@
-	}

-

@@ -181 +169,2 @@
-	for ($i = 0; $i < $len; $i++) {

+	for ($i = 0; $i < $len; $i++)

+	{

@@ -190 +179,2 @@
-	if (((is_object($langs) && $langs->getDefaultLang(0) == 'es_MX') || (!is_object($langs) && $langs == 'es_MX')) && $numorcurrency == 'currency') {

+	if (((is_object($langs) && $langs->default == 'es_MX') || (!is_object($langs) && $langs == 'es_MX')) && $numorcurrency == 'currency')

+	{

@@ -193 +183,2 @@
-		} elseif ($numero >= 0 && $numero < 1) {

+		}

+		elseif ($numero >= 0 && $numero < 1) {

@@ -195 +186,2 @@
-		} elseif ($numero >= 1000000 && $numero < 1000001) {

+		}

+		elseif ($numero >= 1000000 && $numero < 1000001) {

@@ -197 +189,2 @@
-		} elseif ($numero >= 1000000000000 && $numero < 1000000000001) {

+		}

+		elseif ($numero >= 1000000000000 && $numero < 1000000000001) {

@@ -199 +192,2 @@
-		} else {

+		}

+		else {

@@ -220 +214 @@
-				if (!$CdMMillon && !$DdMMillon && !$UdMMillon && !$CdMILLON && !$DdMILLON && $udMILLON == 1) {

+				if (!$CdMMillon && !$DdMMillon && !$UdMMillon && !$CdMILLON && !$DdMILLON && $udMILLON == 1)

@@ -222 +216 @@
-				} else {

+				else

@@ -224 +217,0 @@
-				}

@@ -234 +227 @@
-				if ($cdm || $ddm || $udm) {

+				if ($cdm || $ddm || $udm)

@@ -236 +228,0 @@
-				}

@@ -243 +235 @@
-			if (!$cdm && !$ddm && !$udm && !$c && !$d && !$u && $number > 1000000) {

+			if (!$cdm && !$ddm && !$udm && !$c && !$d && !$u && $number > 1000000)

@@ -245 +236,0 @@
-			}

@@ -250 +240,0 @@
-	return -1;

@@ -270 +260 @@
-	$unidades = array("UN", "DOS", "TRES", "CUATRO", "CINCO", "SEIS", "SIETE", "OCHO", "NUEVE");

+    $unidades = array("UN", "DOS", "TRES", "CUATRO", "CINCO", "SEIS", "SIETE", "OCHO", "NUEVE");

@@ -276,3 +266 @@
-		if ($hundreds != 0) {

-			$entexto .= " ";

-		}

+		if ($hundreds != 0) $entexto .= " ";

@@ -285,4 +273,3 @@
-	} elseif ($tens == 2) {

-		if ($hundreds != 0) {

-			$entexto .= " ";

-		}

+	}

+	elseif ($tens == 2) {

+		if ($hundreds != 0) $entexto .= " ";

@@ -291,4 +278,3 @@
-	} elseif ($tens == 1) {

-		if ($hundreds != 0) {

-			$entexto .= " ";

-		}

+	}

+	elseif ($tens == 1) {

+		if ($hundreds != 0) $entexto .= " ";

@@ -299,3 +285 @@
-		if ($hundreds != 0 || $tens != 0) {

-			$entexto .= " ";

-		}

+		if ($hundreds != 0 || $tens != 0) $entexto .= " ";

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_geturl.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_geturl.lib.php
@@ -2 +2 @@
-/* Copyright (C) 2008-2020	Laurent Destailleur			<eldy@users.sourceforge.net>

+/* Copyright (C) 2008-2013	Laurent Destailleur			<eldy@users.sourceforge.net>

@@ -21,9 +21,5 @@
- *	\brief			This file contains functions dedicated to get URLs.

- */

-

-/**

- * Function to get a content from an URL (use proxy if proxy defined).

- * Support Dolibarr setup for timeout and proxy.

- * Enhancement of CURL to add an anti SSRF protection:

- * - you can set MAIN_SECURITY_ANTI_SSRF_SERVER_IP to set static ip of server

- * - common local lookup ips like 127.*.*.* are automatically added

+ *	\brief			This file contains functions dedicated to get URL.

+ */

+

+/**

+ * Function to get a content from an URL (use proxy if proxy defined)

@@ -33,2 +29,2 @@
- * @param	string    $param			    Parameters of URL (x=value1&y=value2) or may be a formated content with $postorget='PUTALREADYFORMATED'

- * @param	integer   $followlocation		0=Do not follow, 1=Follow location.

+ * @param	string    $param			    Parameters of URL (x=value1&y=value2) or may be a formated content with PUTALREADYFORMATED

+ * @param	integer   $followlocation		1=Follow location, 0=Do not follow

@@ -36,14 +32,11 @@
- * @param	string[]  $allowedschemes		List of schemes that are allowed ('http' + 'https' only by default)

- * @param	int		  $localurl				0=Only external URL are possible, 1=Only local URL, 2=Both external and local URL are allowed.

- * @param	int		  $ssl_verifypeer		-1=Auto (no ssl check on dev, check on prod), 0=No ssl check, 1=Always ssl check

- * @return	array						    Returns an associative array containing the response from the server array('http_code'=>http response code, 'content'=>response, 'curl_error_no'=>errno, 'curl_error_msg'=>errmsg...)

- */

-function getURLContent($url, $postorget = 'GET', $param = '', $followlocation = 1, $addheaders = array(), $allowedschemes = array('http', 'https'), $localurl = 0, $ssl_verifypeer = -1)

-{

-	//declaring of global variables

-	global $conf;

-	$USE_PROXY = !getDolGlobalString('MAIN_PROXY_USE') ? 0 : $conf->global->MAIN_PROXY_USE;

-	$PROXY_HOST = !getDolGlobalString('MAIN_PROXY_HOST') ? 0 : $conf->global->MAIN_PROXY_HOST;

-	$PROXY_PORT = !getDolGlobalString('MAIN_PROXY_PORT') ? 0 : $conf->global->MAIN_PROXY_PORT;

-	$PROXY_USER = !getDolGlobalString('MAIN_PROXY_USER') ? 0 : $conf->global->MAIN_PROXY_USER;

-	$PROXY_PASS = !getDolGlobalString('MAIN_PROXY_PASS') ? 0 : $conf->global->MAIN_PROXY_PASS;

+ * @return	array						    Returns an associative array containing the response from the server array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...)

+ */

+function getURLContent($url, $postorget = 'GET', $param = '', $followlocation = 1, $addheaders = array())

+{

+    //declaring of global variables

+    global $conf;

+    $USE_PROXY = empty($conf->global->MAIN_PROXY_USE) ? 0 : $conf->global->MAIN_PROXY_USE;

+    $PROXY_HOST = empty($conf->global->MAIN_PROXY_HOST) ? 0 : $conf->global->MAIN_PROXY_HOST;

+    $PROXY_PORT = empty($conf->global->MAIN_PROXY_PORT) ? 0 : $conf->global->MAIN_PROXY_PORT;

+    $PROXY_USER = empty($conf->global->MAIN_PROXY_USER) ? 0 : $conf->global->MAIN_PROXY_USER;

+    $PROXY_PASS = empty($conf->global->MAIN_PROXY_PASS) ? 0 : $conf->global->MAIN_PROXY_PASS;

@@ -53,8 +46,9 @@
-	//setting the curl parameters.

-	$ch = curl_init();

-

-	/*print $API_Endpoint."-".$API_version."-".$PAYPAL_API_USER."-".$PAYPAL_API_PASSWORD."-".$PAYPAL_API_SIGNATURE."<br>";

-	 print $USE_PROXY."-".$gv_ApiErrorURL."<br>";

-	 print $nvpStr;

-	 exit;*/

-	curl_setopt($ch, CURLOPT_VERBOSE, 1);

+    //setting the curl parameters.

+    $ch = curl_init();

+

+    /*print $API_Endpoint."-".$API_version."-".$PAYPAL_API_USER."-".$PAYPAL_API_PASSWORD."-".$PAYPAL_API_SIGNATURE."<br>";

+     print $USE_PROXY."-".$gv_ApiErrorURL."<br>";

+     print $nvpStr;

+     exit;*/

+    curl_setopt($ch, CURLOPT_URL, $url);

+    curl_setopt($ch, CURLOPT_VERBOSE, 1);

@@ -63,7 +57,3 @@
-	// We use @ here because this may return warning if safe mode is on or open_basedir is on (following location is forbidden when safe mode is on).

-	// We force value to false so we will manage redirection ourself later.

-	@curl_setopt($ch, CURLOPT_FOLLOWLOCATION, false);

-

-	if (is_array($addheaders) && count($addheaders)) {

-		curl_setopt($ch, CURLOPT_HTTPHEADER, $addheaders);

-	}

+	@curl_setopt($ch, CURLOPT_FOLLOWLOCATION, ($followlocation ?true:false)); // We use @ here because this may return warning if safe mode is on or open_basedir is on

+

+	if (count($addheaders)) curl_setopt($ch, CURLOPT_HTTPHEADER, $addheaders);

@@ -74,3 +64 @@
-	if (getDolGlobalString('MAIN_CURL_SSLVERSION')) {

-		curl_setopt($ch, CURLOPT_SSLVERSION, $conf->global->MAIN_CURL_SSLVERSION);

-	}

+	if (!empty($conf->global->MAIN_CURL_SSLVERSION)) curl_setopt($ch, CURLOPT_SSLVERSION, $conf->global->MAIN_CURL_SSLVERSION);

@@ -79,175 +67,75 @@
-	// Turning on or off the ssl target certificate

-	if ($ssl_verifypeer < 0) {

-		global $dolibarr_main_prod;

-		$ssl_verifypeer =  ($dolibarr_main_prod ? true : false);

-	}

-	if (getDolGlobalString('MAIN_CURL_DISABLE_VERIFYPEER')) {

-		$ssl_verifypeer = 0;

-	}

-

-	// Turning off the server and peer verification(TrustManager Concept).

-	curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, ($ssl_verifypeer ? true : false));

-	curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, ($ssl_verifypeer ? true : false));

-

-	// Restrict use to some protocols only

-	$protocols = 0;

-	if (is_array($allowedschemes)) {

-		foreach ($allowedschemes as $allowedscheme) {

-			if ($allowedscheme == 'http') {

-				$protocols |= CURLPROTO_HTTP;

-			}

-			if ($allowedscheme == 'https') {

-				$protocols |= CURLPROTO_HTTPS;

-			}

-		}

-		curl_setopt($ch, CURLOPT_PROTOCOLS, $protocols);

-		curl_setopt($ch, CURLOPT_REDIR_PROTOCOLS, $protocols);

-	}

-

-	curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, !getDolGlobalString('MAIN_USE_CONNECT_TIMEOUT') ? 5 : $conf->global->MAIN_USE_CONNECT_TIMEOUT);

-	curl_setopt($ch, CURLOPT_TIMEOUT, !getDolGlobalString('MAIN_USE_RESPONSE_TIMEOUT') ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT);

-

-	// limit size of downloaded files. TODO Add MAIN_SECURITY_MAXFILESIZE_DOWNLOADED

-	$maxsize = getDolGlobalInt('MAIN_SECURITY_MAXFILESIZE_DOWNLOADED');

-	if ($maxsize && defined('CURLOPT_MAXFILESIZE_LARGE')) {

-		curl_setopt($ch, CURLOPT_MAXFILESIZE_LARGE, $maxsize);

-	}

-	if ($maxsize && defined('CURLOPT_MAXFILESIZE')) {

-		curl_setopt($ch, CURLOPT_MAXFILESIZE, $maxsize);

-	}

-

-	//curl_setopt($ch, CURLOPT_SAFE_UPLOAD, true);	// PHP 5.5

-	curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); // We want response

-	if ($postorget == 'POST') {

-		curl_setopt($ch, CURLOPT_POST, 1); // POST

-		curl_setopt($ch, CURLOPT_POSTFIELDS, $param); // Setting param x=a&y=z as POST fields

-	} elseif ($postorget == 'POSTALREADYFORMATED') {

-		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'POST'); // HTTP request is 'POST' but param string is taken as it is

-		curl_setopt($ch, CURLOPT_POSTFIELDS, $param); // param = content of post, like a xml string

-	} elseif ($postorget == 'PUT') {

-		$array_param = null;

-		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'

-		if (!is_array($param)) {

-			parse_str($param, $array_param);

-		} else {

-			dol_syslog("parameter param must be a string", LOG_WARNING);

-			$array_param = $param;

-		}

-		curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($array_param)); // Setting param x=a&y=z as PUT fields

-	} elseif ($postorget == 'PUTALREADYFORMATED') {

-		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'

-		curl_setopt($ch, CURLOPT_POSTFIELDS, $param); // param = content of post, like a xml string

-	} elseif ($postorget == 'HEAD') {

-		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'HEAD'); // HTTP request is 'HEAD'

-		curl_setopt($ch, CURLOPT_NOBODY, true);

-	} elseif ($postorget == 'DELETE') {

-		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE'); // POST

-	} else {

-		curl_setopt($ch, CURLOPT_POST, 0); // GET

-	}

-

-	//if USE_PROXY constant set at begin of this method.

-	if ($USE_PROXY) {

-		dol_syslog("getURLContent set proxy to ".$PROXY_HOST.":".$PROXY_PORT." - ".$PROXY_USER.":".$PROXY_PASS);

-		//curl_setopt ($ch, CURLOPT_PROXYTYPE, CURLPROXY_HTTP); // Curl 7.10

-		curl_setopt($ch, CURLOPT_PROXY, $PROXY_HOST.":".$PROXY_PORT);

-		if ($PROXY_USER) {

-			curl_setopt($ch, CURLOPT_PROXYUSERPWD, $PROXY_USER.":".$PROXY_PASS);

-		}

-	}

-

-	$newUrl = $url;

-	$maxRedirection = 5;

-	$info = array();

-	$response = '';

-

-	do {

-		if ($maxRedirection < 1) {

-			break;

-		}

-

-		curl_setopt($ch, CURLOPT_URL, $newUrl);

-

-		// Parse $newUrl

-		$newUrlArray = parse_url($newUrl);

-		$hosttocheck = $newUrlArray['host'];

-		$hosttocheck = str_replace(array('[', ']'), '', $hosttocheck); // Remove brackets of IPv6

-

-		// Deny some reserved host names

-		if (in_array($hosttocheck, array('metadata.google.internal'))) {

-			$info['http_code'] = 400;

-			$info['content'] = 'Error bad hostname '.$hosttocheck.' (Used by Google metadata). This value for hostname is not allowed.';

-			break;

-		}

-

-		// Clean host name $hosttocheck to convert it into an IP $iptocheck

-		if (in_array($hosttocheck, array('localhost', 'localhost.domain'))) {

-			$iptocheck = '127.0.0.1';

-		} elseif (in_array($hosttocheck, array('ip6-localhost', 'ip6-loopback'))) {

-			$iptocheck = '::1';

-		} else {

-			// Resolve $hosttocheck to get the IP $iptocheck

-			if (function_exists('gethostbyname')) {

-				$iptocheck = gethostbyname($hosttocheck);

-			} else {

-				$iptocheck = $hosttocheck;

-			}

-			// TODO Resolve ip v6

-		}

-

-		// Check $iptocheck is an IP (v4 or v6), if not clear value.

-		if (!filter_var($iptocheck, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4 | FILTER_FLAG_IPV6)) {	// This is not an IP, we clean data

-			$iptocheck = '0'; //

-		}

-

-		if ($iptocheck) {

-			$tmpresult = isIPAllowed($iptocheck, $localurl);

-			if ($tmpresult) {

-				$info['http_code'] = 400;

-				$info['content'] = $tmpresult;

-				break;

-			}

-		}

-

-		if ($iptocheck) {

-			// Set CURLOPT_CONNECT_TO so curl will not try another resolution that may give a different result. Possible only on PHP v7+

-			if (defined('CURLOPT_CONNECT_TO')) {

-				$connect_to = array(sprintf("%s:%d:%s:%d", $newUrlArray['host'], empty($newUrlArray['port']) ? '' : $newUrlArray['port'], $iptocheck, empty($newUrlArray['port']) ? '' : $newUrlArray['port']));

-				//var_dump($newUrlArray);

-				//var_dump($connect_to);

-				curl_setopt($ch, CURLOPT_CONNECT_TO, $connect_to);

-			}

-		}

-

-		// Getting response from server

-		$response = curl_exec($ch);

-

-		$info = curl_getinfo($ch); // Reading of request must be done after sending request

-		$http_code = $info['http_code'];

-

-		if ($followlocation && ($http_code == 301 || $http_code == 302 || $http_code == 303 || $http_code == 307)) {

-			$newUrl = $info['redirect_url'];

-			$maxRedirection--;

-			// TODO Use $info['local_ip'] and $info['primary_ip'] ?

-			continue;

-		}

-

-		$http_code = 0;

-	} while ($http_code);

-

-	$request = curl_getinfo($ch, CURLINFO_HEADER_OUT); // Reading of request must be done after sending request

-

-	dol_syslog("getURLContent request=".$request);

-	if (getDolGlobalInt('MAIN_CURL_DEBUG')) {

-		// This may contains binary data, so we dont output reponse by default.

-		dol_syslog("getURLContent request=".$request, LOG_DEBUG, 0, '_curl');

-		dol_syslog("getURLContent response =".$response, LOG_DEBUG, 0, '_curl');

-	}

-	dol_syslog("getURLContent response size=".strlen($response)); // This may contains binary data, so we dont output it

-

-	$rep = array();

-	if (curl_errno($ch)) {

-		// Add keys to $rep

-		$rep['content'] = $response;

-

-		// moving to display page to display curl errors

+    //turning off the server and peer verification(TrustManager Concept).

+    curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);

+    curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);

+

+    curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, empty($conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 5 : $conf->global->MAIN_USE_CONNECT_TIMEOUT);

+    curl_setopt($ch, CURLOPT_TIMEOUT, empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT);

+

+    //curl_setopt($ch, CURLOPT_SAFE_UPLOAD, true);	// PHP 5.5

+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); // We want response

+    if ($postorget == 'POST')

+    {

+    	curl_setopt($ch, CURLOPT_POST, 1); // POST

+    	curl_setopt($ch, CURLOPT_POSTFIELDS, $param); // Setting param x=a&y=z as POST fields

+    }

+    elseif ($postorget == 'POSTALREADYFORMATED')

+    {

+        curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'POST'); // HTTP request is 'POST' but param string is taken as it is

+        curl_setopt($ch, CURLOPT_POSTFIELDS, $param); // param = content of post, like a xml string

+    }

+    elseif ($postorget == 'PUT')

+    {

+        $array_param = null;

+    	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'

+    	if (!is_array($param)) parse_str($param, $array_param);

+    	else

+    	{

+    	    dol_syslog("parameter param must be a string", LOG_WARNING);

+    	    $array_param = $param;

+    	}

+    	curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($array_param)); // Setting param x=a&y=z as PUT fields

+    }

+    elseif ($postorget == 'PUTALREADYFORMATED')

+    {

+    	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'

+    	curl_setopt($ch, CURLOPT_POSTFIELDS, $param); // param = content of post, like a xml string

+    }

+    elseif ($postorget == 'HEAD')

+    {

+    	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'HEAD'); // HTTP request is 'HEAD'

+    	curl_setopt($ch, CURLOPT_NOBODY, true);

+    }

+    elseif ($postorget == 'DELETE')

+    {

+    	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE'); // POST

+    }

+    else

+    {

+    	curl_setopt($ch, CURLOPT_POST, 0); // GET

+    }

+

+    //if USE_PROXY constant set at begin of this method.

+    if ($USE_PROXY)

+    {

+        dol_syslog("getURLContent set proxy to ".$PROXY_HOST.":".$PROXY_PORT." - ".$PROXY_USER.":".$PROXY_PASS);

+        //curl_setopt ($ch, CURLOPT_PROXYTYPE, CURLPROXY_HTTP); // Curl 7.10

+        curl_setopt($ch, CURLOPT_PROXY, $PROXY_HOST.":".$PROXY_PORT);

+        if ($PROXY_USER) curl_setopt($ch, CURLOPT_PROXYUSERPWD, $PROXY_USER.":".$PROXY_PASS);

+    }

+

+    //getting response from server

+    $response = curl_exec($ch);

+

+    $request = curl_getinfo($ch, CURLINFO_HEADER_OUT); // Reading of request must be done after sending request

+

+    dol_syslog("getURLContent request=".$request);

+    //dol_syslog("getURLContent response =".response);	// This may contains binary data, so we dont output it

+    dol_syslog("getURLContent response size=".strlen($response)); // This may contains binary data, so we dont output it

+

+    $rep = array();

+    if (curl_errno($ch))

+    {

+        // Ad keys to $rep

+        $rep['content'] = $response;

+

+        // moving to display page to display curl errors

@@ -255 +143 @@
-		$rep['curl_error_msg'] = curl_error($ch);

+        $rep['curl_error_msg'] = curl_error($ch);

@@ -258,79 +146,23 @@
-	} else {

-		//$info = curl_getinfo($ch);

-

-		// Add keys to $rep

-		$rep = $info;

-		//$rep['header_size']=$info['header_size'];

-		//$rep['http_code']=$info['http_code'];

-		dol_syslog("getURLContent http_code=".$rep['http_code']);

-

-		// Add more keys to $rep

-		if ($response) {

-			$rep['content'] = $response;

-		}

-		$rep['curl_error_no'] = '';

-		$rep['curl_error_msg'] = '';

-	}

-

-	//closing the curl

-	curl_close($ch);

-

-	return $rep;

-}

-

-/**

- * Is IP allowed

- *

- * @param 	string	$iptocheck		IP to check

- * @param 	int		$localurl		0=external url only, 1=internal url only

- * @return	string					Error message or ''

- */

-function isIPAllowed($iptocheck, $localurl)

-{

-	global $conf;

-

-	if ($localurl == 0) {	// Only external url allowed (dangerous, may allow to get malware)

-		if (!filter_var($iptocheck, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) {

-			// Deny ips like 10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16, 0.0.0.0/8, 169.254.0.0/16, 127.0.0.0/8 et 240.0.0.0/4, ::1/128, ::/128, ::ffff:0:0/96, fe80::/10...

-			$errormsg = 'Error bad hostname IP (private or reserved range). Must be an external URL.';

-			return $errormsg;

-		}

-		if (!empty($_SERVER["SERVER_ADDR"]) && $iptocheck == $_SERVER["SERVER_ADDR"]) {

-			$errormsg = 'Error bad hostname IP (IP is a local IP). Must be an external URL.';

-			return $errormsg;

-		}

-		if (getDolGlobalString('MAIN_SECURITY_ANTI_SSRF_SERVER_IP') && in_array($iptocheck, explode(',', getDolGlobalString('MAIN_SECURITY_ANTI_SSRF_SERVER_IP')))) {

-			$errormsg = 'Error bad hostname IP (IP is a local IP defined into MAIN_SECURITY_SERVER_IP). Must be an external URL.';

-			return $errormsg;

-		}

-	}

-	if ($localurl == 1) {	// Only local url allowed (dangerous, may allow to get metadata on server or make internal port scanning)

-		// Deny ips NOT like 10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16, 0.0.0.0/8, 169.254.0.0/16, 127.0.0.0/8 et 240.0.0.0/4, ::1/128, ::/128, ::ffff:0:0/96, fe80::/10...

-		if (filter_var($iptocheck, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) {

-			$errormsg = 'Error bad hostname '.$iptocheck.'. Must be a local URL.';

-			return $errormsg;

-		}

-		if (getDolGlobalString('MAIN_SECURITY_ANTI_SSRF_SERVER_IP') && !in_array($iptocheck, explode(',', getDolGlobalString('MAIN_SECURITY_ANTI_SSRF_SERVER_IP')))) {

-			$errormsg = 'Error bad hostname IP (IP is not a local IP defined into list MAIN_SECURITY_SERVER_IP). Must be a local URL in allowed list.';

-			return $errormsg;

-		}

-	}

-

-	// Common check on ip (local and external)

-	// See list on https://tagmerge.com/gist/a7b9d57ff8ec11d63642f8778609a0b8

-	// Not evasive url that ar enot IP are excluded by test on IP v4/v6 validity.

-	$arrayofmetadataserver = array(

-		'100.100.100.200' => 'Alibaba',

-		'192.0.0.192' => 'Oracle',

-		'192.80.8.124' => 'Packet',

-		'100.88.222.5' => 'Tencent cloud',

-	);

-	foreach ($arrayofmetadataserver as $ipofmetadataserver => $nameofmetadataserver) {

-		if ($iptocheck == $ipofmetadataserver) {

-			$errormsg = 'Error bad hostname IP (Used by '.$nameofmetadataserver.' metadata server). This IP is forbidden.';

-			return $errormsg;

-		}

-	}

-

-	return '';

-}

+    }

+    else

+    {

+    	$info = curl_getinfo($ch);

+

+    	// Ad keys to $rep

+    	$rep = $info;

+    	//$rep['header_size']=$info['header_size'];

+    	//$rep['http_code']=$info['http_code'];

+    	dol_syslog("getURLContent http_code=".$rep['http_code']);

+

+        // Add more keys to $rep

+        $rep['content'] = $response;

+    	$rep['curl_error_no'] = '';

+    	$rep['curl_error_msg'] = '';

+

+    	//closing the curl

+        curl_close($ch);

+    }

+

+    return $rep;

+}

+

@@ -348,13 +180,5 @@
-	$arrayof2levetopdomain = array(

-		'co.at', 'or.at', 'gv.at',

-		'avocat.fr', 'aeroport.fr', 'veterinaire.fr',

-		'com.ng', 'gov.ng', 'gov.ua', 'com.ua', 'in.ua', 'org.ua', 'edu.ua', 'net.ua',

-		'net.uk', 'org.uk', 'gov.uk', 'co.uk',

-		'com.mx'

-	);

-

-	// Set if tld is on 2 levels

-	$tldon2level = 0;

-	$parts = array_reverse(explode('.', $url));

-	if (!empty($parts[1]) && in_array($parts[1].'.'.$parts[0], $arrayof2levetopdomain)) {

-		$tldon2level = 1;

+	$tmpdomain = preg_replace('/^https?:\/\//i', '', $url); // Remove http(s)://

+	$tmpdomain = preg_replace('/\/.*$/i', '', $tmpdomain); // Remove part after domain

+	if ($mode == 2)

+	{

+		$tmpdomain = preg_replace('/^.*\.([^\.]+)\.([^\.]+)\.([^\.]+)$/', '\1.\2.\3', $tmpdomain); // Remove part 'www.' before 'abc.mydomain.com'

@@ -362,12 +186,2 @@
-

-	if ($tldon2level && $mode > 0) {

-		$mode++;

-	}

-

-	$tmpdomain = preg_replace('/^https?:\/\//i', '', $url); // Remove http(s)://

-	$tmpdomain = preg_replace('/\/.*$/i', '', $tmpdomain); // Remove part after /

-	if ($mode == 3) {

-		$tmpdomain = preg_replace('/^.*\.([^\.]+)\.([^\.]+)\.([^\.]+)\.([^\.]+)$/', '\1.\2.\3.\4', $tmpdomain);

-	} elseif ($mode == 2) {

-		$tmpdomain = preg_replace('/^.*\.([^\.]+)\.([^\.]+)\.([^\.]+)$/', '\1.\2.\3', $tmpdomain); // Remove part 'www.' before 'abc.mydomain.com'

-	} elseif ($mode == 1) {

+	else

+	{

@@ -376,9 +190,3 @@
-

-	if (empty($mode)) {

-		if ($tldon2level) {

-			$tmpdomain = preg_replace('/^.*\.([^\.]+)\.([^\.]+)\.([^\.]+)$/', '\1.\2.\3', $tmpdomain); // Remove part 'www.abc.' before 'mydomain.com'

-			$tmpdomain = preg_replace('/\.[^\.]+\.[^\.]+$/', '', $tmpdomain); // Remove TLD (.com.mx, .co.uk, ...)

-		} else {

-			$tmpdomain = preg_replace('/^.*\.([^\.]+)\.([^\.]+)$/', '\1.\2', $tmpdomain); // Remove part 'www.abc.' before 'mydomain.com'

-			$tmpdomain = preg_replace('/\.[^\.]+$/', '', $tmpdomain); // Remove TLD (.com, .net, ...)

-		}

+	if (empty($mode))

+	{

+		$tmpdomain = preg_replace('/\.[^\.]+$/', '', $tmpdomain); // Remove first level domain (.com, .net, ...)

@@ -403,3 +211 @@
-	if (preg_match('/^(https?:\/\/)/i', $tmpurl, $reg)) {

-		$prefix = $reg[1];

-	}

+	if (preg_match('/^(https?:\/\/)/i', $tmpurl, $reg)) $prefix = $reg[1];

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_holiday.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_holiday.lib.php
@@ -2,2 +2 @@
-/* Copyright (C) 2006-2011  Laurent Destailleur     <eldy@users.sourceforge.net>

- * Copyright (C) 2022       Frédéric France         <frederic.france@netlogic.fr>

+/* Copyright (C) 2006-2011 Laurent Destailleur  <eldy@users.sourceforge.net>

@@ -22 +21 @@
- *		\brief      base functions for holiday

+ *		\brief      Ensemble de fonctions de base pour les adherents

@@ -38,4 +37,4 @@
-	$head[$h][0] = DOL_URL_ROOT.'/holiday/card.php?id='.$object->id;

-	$head[$h][1] = $langs->trans("Leave");

-	$head[$h][2] = 'card';

-	$h++;

+    $head[$h][0] = DOL_URL_ROOT.'/holiday/card.php?id='.$object->id;

+    $head[$h][1] = $langs->trans("Leave");

+    $head[$h][2] = 'card';

+    $h++;

@@ -43,13 +42,11 @@
-	// Attachments

-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

-	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

-	$upload_dir = $conf->holiday->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);

-	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));

-	$nbLinks = Link::count($db, $object->element, $object->id);

-	$head[$h][0] = DOL_URL_ROOT.'/holiday/document.php?id='.$object->id;

-	$head[$h][1] = $langs->trans('Documents');

-	if (($nbFiles + $nbLinks) > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

-	}

-	$head[$h][2] = 'documents';

-	$h++;

+    // Attachments

+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

+    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

+    $upload_dir = $conf->holiday->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);

+    $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));

+    $nbLinks = Link::count($db, $object->element, $object->id);

+    $head[$h][0] = DOL_URL_ROOT.'/holiday/document.php?id='.$object->id;

+    $head[$h][1] = $langs->trans('Documents');

+    if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

+    $head[$h][2] = 'documents';

+    $h++;

@@ -57,12 +54,5 @@
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'holiday', 'add', 'core');

-

-	$head[$h][0] = DOL_URL_ROOT.'/holiday/info.php?id='.$object->id;

-	$head[$h][1] = $langs->trans("Info");

-	$head[$h][2] = 'info';

-	$h++;

-

-	// Show more tabs from modules

-	// Entries must be declared in modules descriptor with line

-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname);   												to remove a tab

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'holiday', 'add', 'external');

+    // Show more tabs from modules

+    // Entries must be declared in modules descriptor with line

+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

+    // $this->tabs = array('entity:-tabname);   												to remove a tab

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'holiday');

@@ -79 +69 @@
- *  @return array           		head

+  *  @return array           		head

@@ -85,3 +74,0 @@
-	$extrafields = new ExtraFields($db);

-	$extrafields->fetch_name_optionals_label('holiday');

-

@@ -91,4 +78,4 @@
-	$head[$h][0] = DOL_URL_ROOT.'/admin/holiday.php';

-	$head[$h][1] = $langs->trans("Setup");

-	$head[$h][2] = 'holiday';

-	$h++;

+    $head[$h][0] = DOL_URL_ROOT.'/admin/holiday.php';

+    $head[$h][1] = $langs->trans("Setup");

+    $head[$h][2] = 'holiday';

+    $h++;

@@ -96,5 +83,5 @@
-	// Show more tabs from modules

-	// Entries must be declared in modules descriptor with line

-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname);   												to remove a tab

-	complete_head_from_modules($conf, $langs, null, $head, $h, 'holiday_admin');

+    // Show more tabs from modules

+    // Entries must be declared in modules descriptor with line

+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

+    // $this->tabs = array('entity:-tabname);   												to remove a tab

+    complete_head_from_modules($conf, $langs, null, $head, $h, 'holiday_admin');

@@ -102,8 +89,4 @@
-	$head[$h][0] = DOL_URL_ROOT.'/admin/holiday_extrafields.php';

-	$head[$h][1] = $langs->trans("ExtraFields");

-	$nbExtrafields = $extrafields->attributes['holiday']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

-	$head[$h][2] = 'attributes';

-	$h++;

+    $head[$h][0] = DOL_URL_ROOT.'/admin/holiday_extrafields.php';

+    $head[$h][1] = $langs->trans("ExtraFields");

+    $head[$h][2] = 'attributes';

+    $h++;

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_hrm.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_hrm.lib.php
@@ -46,2 +46,2 @@
-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname);   												to remove a tab

+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

+    // $this->tabs = array('entity:-tabname);   												to remove a tab

@@ -54,2 +53,0 @@
-

-	complete_head_from_modules($conf, $langs, null, $head, $h, 'hrm');

@@ -69 +67 @@
-	global $langs, $conf;

+    global $langs, $conf, $user;

@@ -71 +69 @@
-	$langs->load('hrm');

+    $langs->load('hrm');

@@ -73,2 +71,2 @@
-	$h = 0;

-	$head = array();

+    $h = 0;

+    $head = array();

@@ -77,3 +75,3 @@
-	$head[$h][1] = $langs->trans("Parameters");

-	$head[$h][2] = 'parameters';

-	$h++;

+    $head[$h][1] = $langs->trans("Parameters");

+    $head[$h][2] = 'parameters';

+    $h++;

@@ -82,3 +80,3 @@
-	$head[$h][1] = $langs->trans("Establishments");

-	$head[$h][2] = 'establishments';

-	$h++;

+    $head[$h][1] = $langs->trans("Establishments");

+    $head[$h][2] = 'establishments';

+    $h++;

@@ -86,5 +84,5 @@
-	// Show more tabs from modules

-	// Entries must be declared in modules descriptor with line

-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab

-	complete_head_from_modules($conf, $langs, null, $head, $h, 'hrm_admin');

+    // Show more tabs from modules

+    // Entries must be declared in modules descriptor with line

+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

+    // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab

+    complete_head_from_modules($conf, $langs, '', $head, $h, 'hrm_admin');

@@ -92 +90 @@
-	complete_head_from_modules($conf, $langs, null, $head, $h, 'hrm_admin', 'remove');

+    complete_head_from_modules($conf, $langs, '', $head, $h, 'hrm_admin', 'remove');

@@ -94 +92 @@
-	return $head;

+    return $head;

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_images.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_images.lib.php
@@ -26,5 +26,2 @@
-// TODO Remove this and call getDefaultImageSizes() instead

-$maxwidthsmall = 480;

-$maxheightsmall = 270; // Near 16/9eme

-$maxwidthmini = 128;

-$maxheightmini = 72; // 16/9eme

+$maxwidthsmall = 350; $maxheightsmall = 200; // Near 16/9eme

+$maxwidthmini = 128; $maxheightmini = 72; // 16/9eme

@@ -33,26 +30 @@
-if (!defined('IMAGETYPE_WEBP')) {

-	define('IMAGETYPE_WEBP', 18);

-}

-

-

-/**

- *      Return default values for image sizes

- *

- *      @return array		Array of default values

- */

-function getDefaultImageSizes()

-{

-	$maxwidthsmall = 480;

-	$maxheightsmall = 270; // Near 16/9eme

-	$maxwidthmini = 128;

-	$maxheightmini = 72; // 16/9eme

-	$quality = 80;

-

-	return array(

-		'maxwidthsmall' => $maxwidthsmall,

-		'maxheightsmall' => $maxheightsmall,

-		'maxwidthmini' => $maxwidthmini,

-		'maxheightmini' => $maxheightmini,

-		'quality' => $quality

-	);

-}

+

@@ -63,18 +34,0 @@
- *      @param	int		$acceptsvg	0=Default (depends on setup), 1=Always accept SVG as image files

- *      @return string				Return list fo image format

- */

-function getListOfPossibleImageExt($acceptsvg = 0)

-{

-	global $conf;

-

-	$regeximgext = '\.gif|\.jpg|\.jpeg|\.png|\.bmp|\.webp|\.xpm|\.xbm'; // See also into product.class.php

-	if ($acceptsvg || getDolGlobalString('MAIN_ALLOW_SVG_FILES_AS_IMAGES')) {

-		$regeximgext .= '|\.svg'; // Not allowed by default. SVG can contains javascript

-	}

-

-	return $regeximgext;

-}

-

-/**

- *      Return if a filename is file name of a supported image format

- *

@@ -82 +35,0 @@
- *      @param	int		$acceptsvg	0=Default (depends on setup), 1=Always accept SVG as image files

@@ -85 +38 @@
-function image_format_supported($file, $acceptsvg = 0)

+function image_format_supported($file)

@@ -87,48 +40,30 @@
-	$regeximgext = getListOfPossibleImageExt();

-

-	// Case filename is not a format image

-	$reg = array();

-	if (!preg_match('/('.$regeximgext.')$/i', $file, $reg)) {

-		return -1;

-	}

-

-	// Case filename is a format image but not supported by this PHP

-	$imgfonction = '';

-	if (strtolower($reg[1]) == '.gif') {

-		$imgfonction = 'imagecreatefromgif';

-	}

-	if (strtolower($reg[1]) == '.jpg') {

-		$imgfonction = 'imagecreatefromjpeg';

-	}

-	if (strtolower($reg[1]) == '.jpeg') {

-		$imgfonction = 'imagecreatefromjpeg';

-	}

-	if (strtolower($reg[1]) == '.png') {

-		$imgfonction = 'imagecreatefrompng';

-	}

-	if (strtolower($reg[1]) == '.bmp') {

-		$imgfonction = 'imagecreatefromwbmp';

-	}

-	if (strtolower($reg[1]) == '.webp') {

-		$imgfonction = 'imagecreatefromwebp';

-	}

-	if (strtolower($reg[1]) == '.xpm') {

-		$imgfonction = 'imagecreatefromxpm';

-	}

-	if (strtolower($reg[1]) == '.xbm') {

-		$imgfonction = 'imagecreatefromxbm';

-	}

-	if (strtolower($reg[1]) == '.svg') {

-		$imgfonction = 'imagecreatefromsvg'; // Never available

-	}

-	if ($imgfonction) {

-		if (!function_exists($imgfonction)) {

-			// Fonctions of conversion not available in this PHP

-			return 0;

-		}

-

-		// Filename is a format image and supported for conversion by this PHP

-		return 1;

-	}

-

-	return 0;

+    $regeximgext = '\.gif|\.jpg|\.jpeg|\.png|\.bmp|\.webp|\.xpm|\.xbm|\.svg'; // See also into product.class.php

+

+    // Case filename is not a format image

+    $reg = array();

+    if (!preg_match('/('.$regeximgext.')$/i', $file, $reg)) return -1;

+

+    // Case filename is a format image but not supported by this PHP

+    $imgfonction = '';

+    if (strtolower($reg[1]) == '.gif')  $imgfonction = 'imagecreatefromgif';

+    if (strtolower($reg[1]) == '.jpg')  $imgfonction = 'imagecreatefromjpeg';

+    if (strtolower($reg[1]) == '.jpeg') $imgfonction = 'imagecreatefromjpeg';

+    if (strtolower($reg[1]) == '.png')  $imgfonction = 'imagecreatefrompng';

+    if (strtolower($reg[1]) == '.bmp')  $imgfonction = 'imagecreatefromwbmp';

+    if (strtolower($reg[1]) == '.webp')  $imgfonction = 'imagecreatefromwebp';

+    if (strtolower($reg[1]) == '.xpm')  $imgfonction = 'imagecreatefromxpm';

+    if (strtolower($reg[1]) == '.xbm')  $imgfonction = 'imagecreatefromxbm';

+    if (strtolower($reg[1]) == '.svg')  $imgfonction = 'imagecreatefromsvg'; // Never available

+    if ($imgfonction)

+    {

+        if (!function_exists($imgfonction))

+        {

+            // Fonctions of conversion not available in this PHP

+            return 0;

+        }

+

+        // Filename is a format image and supported for conversion by this PHP

+        return 1;

+    }

+

+    return 0;

@@ -139 +74 @@
- *    	Return size of image file on disk (Supported extensions are gif, jpg, png, bmp and webp)

+ *    	Return size of image file on disk (Supported extensions are gif, jpg, png and bmp)

@@ -149,3 +84 @@
-	if (image_format_supported($file) < 0) {

-		return $ret;

-	}

+	if (image_format_supported($file) < 0) return $ret;

@@ -154 +87,2 @@
-	if (!$url) {

+	if (!$url)

+	{

@@ -158,8 +92,5 @@
-	if ($filetoread) {

-		$infoImg = getimagesize($filetoread); // Recuperation des infos de l'image

-		if ($infoImg) {

-			$ret['width'] = $infoImg[0]; // Largeur de l'image

-			$ret['height'] = $infoImg[1]; // Hauteur de l'image

-		} else {

-			$ret['width'] = $ret['height'] = '';

-		}

+	if ($filetoread)

+	{

+    	$infoImg = getimagesize($filetoread); // Recuperation des infos de l'image

+    	$ret['width'] = $infoImg[0]; // Largeur de l'image

+    	$ret['height'] = $infoImg[1]; // Hauteur de l'image

@@ -173,12 +104,9 @@
- *  Resize or crop an image file (Supported extensions are gif, jpg, png, bmp and webp)

- *

- *  @param	string	$file          	Path of source file to resize/crop

- * 	@param	int		$mode			0=Resize, 1=Crop

- *  @param  int		$newWidth      	Largeur maximum que dois faire l'image destination (0=keep ratio)

- *  @param  int		$newHeight     	Hauteur maximum que dois faire l'image destination (0=keep ratio)

- * 	@param	int		$src_x			Position of croping image in source image (not use if mode=0)

- * 	@param	int		$src_y			Position of croping image in source image (not use if mode=0)

- * 	@param	string	$filetowrite	Path of file to write (overwrite source file if not provided)

- *  @param	int		$newquality		Value for the new quality of image, for supported format (use 0 for maximum/unchanged).

- *	@return	string                  File name if OK, error message if KO

- *	@see dol_convert_file()

+ *    	Resize or crop an image file (Supported extensions are gif, jpg, png and bmp)

+ *

+ *    	@param	string	$file          	Path of file to resize/crop

+ * 		@param	int		$mode			0=Resize, 1=Crop

+ *    	@param  int		$newWidth      	Largeur maximum que dois faire l'image destination (0=keep ratio)

+ *    	@param  int		$newHeight     	Hauteur maximum que dois faire l'image destination (0=keep ratio)

+ * 		@param	int		$src_x			Position of croping image in source image (not use if mode=0)

+ * 		@param	int		$src_y			Position of croping image in source image (not use if mode=0)

+ *		@return	string                  File name if OK, error message if KO

@@ -186 +114 @@
-function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0, $src_y = 0, $filetowrite = '', $newquality = 0)

+function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0, $src_y = 0)

@@ -198 +126,2 @@
-	if (!$file) {

+	if (!$file)

+	{

@@ -201 +130,3 @@
-	} elseif (!file_exists($file)) {

+	}

+	elseif (!file_exists($file))

+	{

@@ -204 +135,3 @@
-	} elseif (image_format_supported($file) < 0) {

+	}

+	elseif (image_format_supported($file) < 0)

+	{

@@ -206 +139,3 @@
-	} elseif (!is_numeric($newWidth) && !is_numeric($newHeight)) {

+	}

+	elseif (!is_numeric($newWidth) && !is_numeric($newHeight))

+	{

@@ -208,3 +143,7 @@
-	} elseif ($mode == 0 && $newWidth <= 0 && $newHeight <= 0 && (empty($filetowrite) || $filetowrite == $file)) {

-		return 'At least newHeight or newWidth must be defined for resizing, or a target filename must be set to convert';

-	} elseif ($mode == 1 && ($newWidth <= 0 || $newHeight <= 0)) {

+	}

+	elseif ($mode == 0 && $newWidth <= 0 && $newHeight <= 0)

+	{

+		return 'At least newHeight or newWidth must be defined for resizing';

+	}

+	elseif ($mode == 1 && ($newWidth <= 0 || $newHeight <= 0))

+	{

@@ -216 +155 @@
-	$infoImg = getimagesize($filetoread); 			// Get data about src image

+	$infoImg = getimagesize($filetoread); // Recuperation des infos de l'image

@@ -220,10 +159,4 @@
-	$imgTargetName = ($filetowrite ? $filetowrite : $file);

-	$newExt = strtolower(pathinfo($imgTargetName, PATHINFO_EXTENSION));

-

-	if ($mode == 0) {	// If resize, we check parameters

-		if (!empty($filetowrite) && $filetowrite != $file && $newWidth <= 0 && $newHeight <= 0) {

-			$newWidth = $imgWidth;

-			$newHeight = $imgHeight;

-		}

-

-		if ($newWidth <= 0) {

+	if ($mode == 0)	// If resize, we check parameters

+	{

+		if ($newWidth <= 0)

+		{

@@ -232 +165,2 @@
-		if ($newHeight <= 0) {

+		if ($newHeight <= 0)

+		{

@@ -237 +170,0 @@
-	// Test function to read source image exists

@@ -239 +172,2 @@
-	switch ($infoImg[2]) {

+	switch ($infoImg[2])

+	{

@@ -252 +186 @@
-		case 18: // IMG_WEBP

+		case 17:	// IMG_WBMP

@@ -256,2 +190,4 @@
-	if ($imgfonction) {

-		if (!function_exists($imgfonction)) {

+	if ($imgfonction)

+	{

+		if (!function_exists($imgfonction))

+		{

@@ -259,35 +195,7 @@
-			return 'Read of image not possible. This PHP does not support GD functions '.$imgfonction;

-		}

-	}

-

-	// Test function to write target image exists

-	if ($filetowrite) {

-		$imgfonction = '';

-		switch ($newExt) {

-			case 'gif':		// IMG_GIF

-				$imgfonction = 'imagecreatefromgif';

-				break;

-			case 'jpg':		// IMG_JPG

-			case 'jpeg':	// IMG_JPEG

-				$imgfonction = 'imagecreatefromjpeg';

-				break;

-			case 'png':		// IMG_PNG

-				$imgfonction = 'imagecreatefrompng';

-				break;

-			case 'bmp':		// IMG_WBMP

-				$imgfonction = 'imagecreatefromwbmp';

-				break;

-			case 'webp': 	// IMG_WEBP

-				$imgfonction = 'imagecreatefromwebp';

-				break;

-		}

-		if ($imgfonction) {

-			if (!function_exists($imgfonction)) {

-				// Fonctions de conversion non presente dans ce PHP

-				return 'Write of image not possible. This PHP does not support GD functions '.$imgfonction;

-			}

-		}

-	}

-

-	// Read source image file

-	switch ($infoImg[2]) {

+			return 'Resize not possible. This PHP does not support GD functions '.$imgfonction;

+		}

+	}

+

+	// Initialisation des variables selon l'extension de l'image

+	switch ($infoImg[2])

+	{

@@ -296,0 +205 @@
+			$newquality = 'NU'; // Quality is not used for this format

@@ -300,0 +210 @@
+			$newquality = 100; // % quality maximum

@@ -304,0 +215 @@
+			$newquality = 0; // No compression (0-9)

@@ -308,0 +220 @@
+			$newquality = 'NU'; // Quality is not used for this format

@@ -313,9 +225,13 @@
-			break;

-	}

-

-	// Create empty image for target

-	if ($newExt == 'gif') {

-		// Compatibility image GIF

-		$imgTarget = imagecreate($newWidth, $newHeight);

-	} else {

-		$imgTarget = imagecreatetruecolor($newWidth, $newHeight);

+			$newquality = '100'; // % quality maximum

+			break;

+	}

+

+	// Create empty image

+	if ($infoImg[2] == 1)

+	{

+		// Compatibilite image GIF

+		$imgThumb = imagecreate($newWidth, $newHeight);

+	}

+	else

+	{

+		$imgThumb = imagecreatetruecolor($newWidth, $newHeight);

@@ -325,2 +241,3 @@
-	if (function_exists('imageantialias')) {

-		imageantialias($imgTarget, true);

+	if (function_exists('imageantialias'))

+	{

+		imageantialias($imgThumb, true);

@@ -330,33 +247,33 @@
-	if (function_exists('imagesavealpha')) {

-		imagesavealpha($imgTarget, true);

-	}

-

-	// Set transparent color according to image extension

-	$trans_colour = -1;	// By default, undefined

-	switch ($newExt) {

-		case 'gif':	// Gif

-			$trans_colour = imagecolorallocate($imgTarget, 255, 255, 255); // On procede autrement pour le format GIF

-			imagecolortransparent($imgTarget, $trans_colour);

-			break;

-		case 'jpg':	// Jpg

-		case 'jpeg':	// Jpeg

-			$trans_colour = imagecolorallocatealpha($imgTarget, 255, 255, 255, 0);

-			break;

-		case 'png':	// Png

-			imagealphablending($imgTarget, false); // Pour compatibilite sur certain systeme

-			$trans_colour = imagecolorallocatealpha($imgTarget, 255, 255, 255, 127); // Keep transparent channel

-			break;

-		case 'bmp':	// Bmp

-			$trans_colour = imagecolorallocatealpha($imgTarget, 255, 255, 255, 0);

-			break;

-		case 'webp': // Webp

-			$trans_colour = imagecolorallocatealpha($imgTarget, 255, 255, 255, 127);

-			break;

-	}

-	if (function_exists("imagefill") && $trans_colour > 0) {

-		imagefill($imgTarget, 0, 0, $trans_colour);

-	}

-

-	dol_syslog("dol_imageResizeOrCrop: convert image from ($imgWidth x $imgHeight) at position ($src_x x $src_y) to ($newWidth x $newHeight) as a $extImg");

-	//imagecopyresized($imgTarget, $img, 0, 0, 0, 0, $thumbWidth, $thumbHeight, $imgWidth, $imgHeight); // Insere l'image de base redimensionnee

-	imagecopyresampled($imgTarget, $img, 0, 0, $src_x, $src_y, $newWidth, $newHeight, ($mode == 0 ? $imgWidth : $newWidth), ($mode == 0 ? $imgHeight : $newHeight)); // Insere l'image de base redimensionnee

+	if (function_exists('imagesavealpha'))

+	{

+		imagesavealpha($imgThumb, true);

+	}

+

+	// Initialisation des variables selon l'extension de l'image

+	switch ($infoImg[2])

+	{

+		case 1:	// Gif

+			$trans_colour = imagecolorallocate($imgThumb, 255, 255, 255); // On procede autrement pour le format GIF

+			imagecolortransparent($imgThumb, $trans_colour);

+			break;

+		case 2:	// Jpg

+			$trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 0);

+			break;

+		case 3:	// Png

+			imagealphablending($imgThumb, false); // Pour compatibilite sur certain systeme

+			$trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 127); // Keep transparent channel

+			break;

+		case 4:	// Bmp

+			$trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 0);

+			break;

+		case 18: // Webp

+			$trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 127);

+			break;

+	}

+	if (function_exists("imagefill")) imagefill($imgThumb, 0, 0, $trans_colour);

+

+	dol_syslog("dol_imageResizeOrCrop: convert image from ($imgWidth x $imgHeight) at position ($src_x x $src_y) to ($newWidth x $newHeight) as $extImg, newquality=$newquality");

+	//imagecopyresized($imgThumb, $img, 0, 0, 0, 0, $thumbWidth, $thumbHeight, $imgWidth, $imgHeight); // Insere l'image de base redimensionnee

+	imagecopyresampled($imgThumb, $img, 0, 0, $src_x, $src_y, $newWidth, $newHeight, ($mode == 0 ? $imgWidth : $newWidth), ($mode == 0 ? $imgHeight : $newHeight)); // Insere l'image de base redimensionnee

+

+	$imgThumbName = $file;

@@ -365 +282 @@
-	//$fp = fopen($imgTargetName, "w");

+	//$fp = fopen($imgThumbName, "w");

@@ -368,25 +285,18 @@
-	// Create image on disk (overwrite file if exists)

-	switch ($newExt) {

-		case 'gif':	// Gif

-			$newquality = 'NU'; // Quality is not used for this format

-			imagegif($imgTarget, $imgTargetName);

-			break;

-		case 'jpg':	// Jpg

-		case 'jpeg':	// Jpeg

-			$newquality = ($newquality ? $newquality : '100'); // % quality maximum

-			imagejpeg($imgTarget, $imgTargetName, $newquality);

-			break;

-		case 'png':	// Png

-			$newquality = 0; // No compression (0-9)

-			imagepng($imgTarget, $imgTargetName, $newquality);

-			break;

-		case 'bmp':	// Bmp

-			$newquality = 'NU'; // Quality is not used for this format

-			imagewbmp($imgTarget, $imgTargetName);

-			break;

-		case 'webp': // Webp

-			$newquality = ($newquality ? $newquality : '100'); // % quality maximum

-			imagewebp($imgTarget, $imgTargetName, $newquality);

-			break;

-		default:

-			dol_syslog("images.lib.php::imageResizeOrCrop() Format ".$newExt." is not supported", LOG_WARNING);

+	// Create image on disk

+	switch ($infoImg[2])

+	{

+		case 1:	// Gif

+			imagegif($imgThumb, $imgThumbName);

+			break;

+		case 2:	// Jpg

+			imagejpeg($imgThumb, $imgThumbName, $newquality);

+			break;

+		case 3:	// Png

+			imagepng($imgThumb, $imgThumbName, $newquality);

+			break;

+		case 4:	// Bmp

+			imagewbmp($imgThumb, $imgThumbName);

+			break;

+		case 18: // Webp

+			imagewebp($imgThumb, $imgThumbName, $newquality);

+			break;

@@ -396 +306 @@
-	dolChmod($imgTargetName);

+	if (!empty($conf->global->MAIN_UMASK)) @chmod($imgThumbName, octdec($conf->global->MAIN_UMASK));

@@ -399,2 +309,2 @@
-	imagedestroy($img);

-	imagedestroy($imgTarget);

+    imagedestroy($img);

+	imagedestroy($imgThumb);

@@ -404 +314 @@
-	return $imgTargetName;

+	return $imgThumbName;

@@ -426 +336 @@
- * @param string|bool $fileDest string : Full path to image to rotate | false return gd img  | null  the raw image stream will be outputted directly

+ * @param string $fileDest string : Full path to image to rotate | false return gd img  | null  the raw image stream will be outputted directly

@@ -453 +363,2 @@
-					if ($infoImg[2] === IMAGETYPE_PNG) { // In fact there is no exif on PNG but just in case

+					if ($infoImg[2] === 'IMAGETYPE_PNG') // In fact there is no exif on PNG but just in case

+					{

@@ -459 +370,2 @@
-					} else {

+					}

+					else {

@@ -466 +378,3 @@
-				} else {

+				}

+				else

+				{

@@ -471 +385,2 @@
-					switch ($infoImg[2]) {

+					switch ($infoImg[2])

+					{

@@ -506,3 +421,3 @@
- *    	@param     int		$maxWidth       	Maximum width of the thumbnail (-1=unchanged, 160 by default)

- *    	@param     int		$maxHeight      	Maximum height of the thumbnail (-1=unchanged, 120 by default)

- *    	@param     string	$extName        	Extension to differentiate thumb file name ('_small', '_mini')

+ *    	@param     int		$maxWidth       	Largeur maximum que dois faire la miniature (-1=unchanged, 160 by default)

+ *    	@param     int		$maxHeight      	Hauteur maximum que dois faire l'image (-1=unchanged, 120 by default)

+ *    	@param     string	$extName        	Extension to differenciate thumb file name ('_small', '_mini')

@@ -526,2 +441,3 @@
-	if (!$file) {

-		// If the file has not been indicated

+	if (!$file)

+	{

+		// Si le fichier n'a pas ete indique

@@ -529,15 +445,21 @@
-	} elseif (!file_exists($file)) {

-		// If the file passed in parameter does not exist

-		dol_syslog($langs->trans("ErrorFileNotFound", $file), LOG_ERR);

-		return $langs->trans("ErrorFileNotFound", $file);

-	} elseif (image_format_supported($file) < 0) {

-		dol_syslog('This file '.$file.' does not seem to be an image format file name.', LOG_WARNING);

-		return 'ErrorBadImageFormat';

-	} elseif (!is_numeric($maxWidth) || empty($maxWidth) || $maxWidth < -1) {

-		// If max width is incorrect (not numeric, empty, or less than 0)

-		dol_syslog('Wrong value for parameter maxWidth', LOG_ERR);

-		return 'Error: Wrong value for parameter maxWidth';

-	} elseif (!is_numeric($maxHeight) || empty($maxHeight) || $maxHeight < -1) {

-		// If max height is incorrect (not numeric, empty, or less than 0)

-		dol_syslog('Wrong value for parameter maxHeight', LOG_ERR);

-		return 'Error: Wrong value for parameter maxHeight';

+	}

+	elseif (!file_exists($file))

+	{

+		// Si le fichier passe en parametre n'existe pas

+        dol_syslog($langs->trans("ErrorFileNotFound", $file), LOG_ERR);

+	    return $langs->trans("ErrorFileNotFound", $file);

+	}

+	elseif (image_format_supported($file) < 0)

+	{

+        dol_syslog('This file '.$file.' does not seem to be an image format file name.', LOG_WARNING);

+	    return 'ErrorBadImageFormat';

+	}

+	elseif (!is_numeric($maxWidth) || empty($maxWidth) || $maxWidth < -1) {

+		// Si la largeur max est incorrecte (n'est pas numerique, est vide, ou est inferieure a 0)

+        dol_syslog('Wrong value for parameter maxWidth', LOG_ERR);

+	    return 'Error: Wrong value for parameter maxWidth';

+	}

+	elseif (!is_numeric($maxHeight) || empty($maxHeight) || $maxHeight < -1) {

+		// Si la hauteur max est incorrecte (n'est pas numerique, est vide, ou est inferieure a 0)

+        dol_syslog('Wrong value for parameter maxHeight', LOG_ERR);

+	    return 'Error: Wrong value for parameter maxHeight';

@@ -560,9 +482,6 @@
-	if ($maxWidth == -1) {

-		$maxWidth = $infoImg[0]; // If size is -1, we keep unchanged

-	}

-	if ($maxHeight == -1) {

-		$maxHeight = $infoImg[1]; // If size is -1, we keep unchanged

-	}

-

-	// If the image is smaller than the maximum width and height, no thumbnail is created.

-	if ($infoImg[0] < $maxWidth && $infoImg[1] < $maxHeight) {

+	if ($maxWidth == -1) $maxWidth = $infoImg[0]; // If size is -1, we keep unchanged

+	if ($maxHeight == -1) $maxHeight = $infoImg[1]; // If size is -1, we keep unchanged

+

+	// Si l'image est plus petite que la largeur et la hauteur max, on ne cree pas de vignette

+	if ($infoImg[0] < $maxWidth && $infoImg[1] < $maxHeight)

+	{

@@ -575 +494,2 @@
-	switch ($infoImg[2]) {

+	switch ($infoImg[2])

+	{

@@ -586 +506 @@
-			// Not supported by PHP GD

+            // Not supported by PHP GD

@@ -591,7 +511,6 @@
-		case IMAGETYPE_WEBP:	// 18

-			$imgfonction = 'imagecreatefromwebp';

-			break;

-	}

-	if ($imgfonction) {

-		if (!function_exists($imgfonction)) {

-			// Conversion functions not present in this PHP

+	}

+	if ($imgfonction)

+	{

+		if (!function_exists($imgfonction))

+		{

+			// Fonctions de conversion non presente dans ce PHP

@@ -602,2 +521,2 @@
-	// We create the directory containing the thumbnails

-	$dirthumb = dirname($file).($outdir ? '/'.$outdir : ''); // Path to thumbnail folder

+	// On cree le repertoire contenant les vignettes

+	$dirthumb = dirname($file).($outdir ? '/'.$outdir : ''); // Chemin du dossier contenant les vignettes

@@ -606 +525 @@
-	// Variable initialization according to image extension

+	// Initialisation des variables selon l'extension de l'image

@@ -608 +527,2 @@
-	switch ($infoImg[2]) {

+	switch ($infoImg[2])

+	{

@@ -611 +531 @@
-			$extImg = '.gif';

+			$extImg = '.gif'; // Extension de l'image

@@ -615 +535 @@
-			$extImg = (preg_match('/\.jpeg$/', $file) ? '.jpeg' : '.jpg');

+			$extImg = (preg_match('/\.jpeg$/', $file) ? '.jpeg' : '.jpg'); // Extension de l'image

@@ -622 +542 @@
-			// Not supported by PHP GD

+            // Not supported by PHP GD

@@ -629,11 +549,7 @@
-		case IMAGETYPE_WEBP:	// 18

-			$img = imagecreatefromwebp($filetoread);

-			$extImg = '.webp';

-			break;

-	}

-

-	// Before PHP8, img was a resource, With PHP8, it is a GdImage

-	if (!is_resource($img) && class_exists('GdImage') && !($img instanceof GdImage)) {

-		dol_syslog('Failed to detect type of image. We found infoImg[2]='.$infoImg[2], LOG_WARNING);

-		return 0;

-	}

+	}

+

+    if (!is_resource($img))

+    {

+        dol_syslog('Failed to detect type of image. We found infoImg[2]='.$infoImg[2], LOG_WARNING);

+        return 0;

+    }

@@ -642,2 +558,3 @@
-	if ($ort && getDolGlobalString('MAIN_USE_EXIF_ROTATION')) {

-		switch ($ort) {

+    if ($ort && !empty($conf->global->MAIN_USE_EXIF_ROTATION)) {

+		switch ($ort)

+		{

@@ -662 +579,2 @@
-	if ($exifAngle) {

+    if ($exifAngle)

+    {

@@ -665 +583,2 @@
-		if ($infoImg[2] === 'IMAGETYPE_PNG') { // In fact there is no exif on PNG but just in case

+    	if ($infoImg[2] === 'IMAGETYPE_PNG') // In fact there is no exif on PNG but just in case

+    	{

@@ -671 +590,2 @@
-		} else {

+		}

+    	else {

@@ -675,3 +595,3 @@
-		// replace image with good orientation

-		if (!empty($rotated) && isset($trueImgWidth) && isset($trueImgHeight)) {

-			$img = $rotated;

+    	// replace image with good orientation

+    	if (!empty($rotated)) {

+    		$img = $rotated;

@@ -683,14 +603,11 @@
-	// Initialize thumbnail dimensions if larger than original

-	if ($maxWidth > $imgWidth) {

-		$maxWidth = $imgWidth;

-	}

-	if ($maxHeight > $imgHeight) {

-		$maxHeight = $imgHeight;

-	}

-

-	$whFact = $maxWidth / $maxHeight; // Width/height factor for maximum label dimensions

-	$imgWhFact = $imgWidth / $imgHeight; // Original width/height factor

-

-	// Set label dimensions

-	if ($whFact < $imgWhFact) {

-		// If determining width

+	// Initialisation des dimensions de la vignette si elles sont superieures a l'original

+	if ($maxWidth > $imgWidth) { $maxWidth = $imgWidth; }

+	if ($maxHeight > $imgHeight) { $maxHeight = $imgHeight; }

+

+	$whFact = $maxWidth / $maxHeight; // Facteur largeur/hauteur des dimensions max de la vignette

+	$imgWhFact = $imgWidth / $imgHeight; // Facteur largeur/hauteur de l'original

+

+	// Fixe les dimensions de la vignette

+	if ($whFact < $imgWhFact)

+	{

+		// Si largeur determinante

@@ -699,2 +616,4 @@
-	} else {

-		// If determining height

+	}

+	else

+	{

+		// Si hauteur determinante

@@ -707,4 +626,2 @@
-	// Define target format

-	if (empty($targetformat)) {

-		$targetformat = $infoImg[2];

-	}

+    // Define target format

+    if (empty($targetformat)) $targetformat = $infoImg[2];

@@ -713 +630,2 @@
-	if ($targetformat == IMAGETYPE_GIF) {

+	if ($targetformat == IMAGETYPE_GIF)

+	{

@@ -716 +634,3 @@
-	} else {

+	}

+	else

+	{

@@ -721 +641,2 @@
-	if (function_exists('imageantialias')) {

+	if (function_exists('imageantialias'))

+	{

@@ -726 +647,2 @@
-	if (function_exists('imagesavealpha')) {

+	if (function_exists('imagesavealpha'))

+	{

@@ -730 +652 @@
-	// Variable initialization according to image extension

+	// Initialisation des variables selon l'extension de l'image

@@ -732 +654,2 @@
-	switch ($targetformat) {

+	switch ($targetformat)

+	{

@@ -734 +657 @@
-			$trans_colour = imagecolorallocate($imgThumb, 255, 255, 255); // The GIF format works differently

+			$trans_colour = imagecolorallocate($imgThumb, 255, 255, 255); // On procede autrement pour le format GIF

@@ -736,3 +659,3 @@
-			$extImgTarget = '.gif';

-			$newquality = 'NU';

-			break;

+            $extImgTarget = '.gif';

+            $newquality = 'NU';

+            break;

@@ -740,4 +663,4 @@
-			$trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 0);

-			$extImgTarget = (preg_match('/\.jpeg$/i', $file) ? '.jpeg' : '.jpg');

-			$newquality = $quality;

-			break;

+            $trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 0);

+            $extImgTarget = (preg_match('/\.jpeg$/i', $file) ? '.jpeg' : '.jpg');

+            $newquality = $quality;

+            break;

@@ -745 +668 @@
-			imagealphablending($imgThumb, false); // For compatibility on certain systems

+			imagealphablending($imgThumb, false); // Pour compatibilite sur certain systeme

@@ -747,4 +670,4 @@
-			$extImgTarget = '.png';

-			$newquality = $quality - 100;

-			$newquality = round(abs($quality - 100) * 9 / 100);

-			break;

+            $extImgTarget = '.png';

+            $newquality = $quality - 100;

+            $newquality = round(abs($quality - 100) * 9 / 100);

+            break;

@@ -752,4 +675,4 @@
-			// Not supported by PHP GD

-			$extImgTarget = '.bmp';

-			$newquality = 'NU';

-			break;

+            // Not supported by PHP GD

+            $extImgTarget = '.bmp';

+            $newquality = 'NU';

+            break;

@@ -758,12 +681,5 @@
-			$extImgTarget = '.bmp';

-			$newquality = 'NU';

-			break;

-		case IMAGETYPE_WEBP:	// 18

-			$trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 0);

-			$extImgTarget = '.webp';

-			$newquality = $quality;

-			break;

-	}

-	if (function_exists("imagefill")) {

-		imagefill($imgThumb, 0, 0, $trans_colour);

-	}

+            $extImgTarget = '.bmp';

+            $newquality = 'NU';

+            break;

+	}

+	if (function_exists("imagefill")) imagefill($imgThumb, 0, 0, $trans_colour);

@@ -772,4 +688,4 @@
-	//imagecopyresized($imgThumb, $img, 0, 0, 0, 0, $thumbWidth, $thumbHeight, $imgWidth, $imgHeight); // Insert resized base image

-	imagecopyresampled($imgThumb, $img, 0, 0, 0, 0, $thumbWidth, $thumbHeight, $imgWidth, $imgHeight); // Insert resized base image

-

-	$fileName = preg_replace('/(\.gif|\.jpeg|\.jpg|\.png|\.bmp)$/i', '', $file); // We remove any extension box

+	//imagecopyresized($imgThumb, $img, 0, 0, 0, 0, $thumbWidth, $thumbHeight, $imgWidth, $imgHeight); // Insere l'image de base redimensionnee

+	imagecopyresampled($imgThumb, $img, 0, 0, 0, 0, $thumbWidth, $thumbHeight, $imgWidth, $imgHeight); // Insere l'image de base redimensionnee

+

+	$fileName = preg_replace('/(\.gif|\.jpeg|\.jpg|\.png|\.bmp)$/i', '', $file); // On enleve extension quelquesoit la casse

@@ -786 +702,2 @@
-	switch ($targetformat) {

+	switch ($targetformat)

+	{

@@ -797 +714 @@
-			// Not supported by PHP GD

+            // Not supported by PHP GD

@@ -802,3 +718,0 @@
-		case IMAGETYPE_WEBP:    // 18

-			imagewebp($imgThumb, $imgThumbName, $newquality);

-			break;

@@ -808,5 +722,5 @@
-	dolChmod($imgThumbName);

-

-	// Free memory. This does not delete image.

-	imagedestroy($img);

-	imagedestroy($imgThumb);

+	if (!empty($conf->global->MAIN_UMASK)) @chmod($imgThumbName, octdec($conf->global->MAIN_UMASK));

+

+    // Free memory. This does not delete image.

+    imagedestroy($img);

+    imagedestroy($imgThumb);

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_import.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_import.lib.php
@@ -6 +6 @@
- * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>

+ * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>

@@ -27 +26,0 @@
- */

@@ -40,3 +39 @@
-	if (empty($maxstep)) {

-		$maxstep = 6;

-	}

+	if (empty($maxstep)) $maxstep = 6;

@@ -47,6 +44,3 @@
-	while ($i <= $maxstep) {

-		if ($i < 6) {

-			$head[$h][0] = DOL_URL_ROOT.'/imports/import.php?step='.$i.$param;

-		} else {

-			$head[$h][0] = DOL_URL_ROOT.'/imports/import.php?step=5'.$param; // For step6, link is to step 5

-		}

+	while ($i <= $maxstep)

+	{

+		$head[$h][0] = DOL_URL_ROOT.'/imports/import.php?step='.$i.$param;

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_invoice.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_invoice.lib.php
@@ -5 +5 @@
- * Copyright (C) 2015       Juanjo Menent		<jmenent@2byte.es>

+ * Copyright (C) 2015      Juanjo Menent		<jmenent@2byte.es>

@@ -38 +38 @@
-	global $db, $langs, $conf, $user;

+	global $db, $langs, $conf;

@@ -43,2 +43,2 @@
-	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/card.php?id='.$object->id;

-	$head[$h][1] = $langs->trans('CustomerInvoice');

+	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/card.php?facid='.$object->id;

+	$head[$h][1] = $langs->trans('Card');

@@ -48,3 +48,4 @@
-	if (!getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB')) {

-		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));

-		$head[$h][0] = DOL_URL_ROOT.'/compta/facture/contact.php?id='.urlencode($object->id);

+	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))

+	{

+	    $nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));

+	    $head[$h][0] = DOL_URL_ROOT.'/compta/facture/contact.php?facid='.$object->id;

@@ -52,3 +53 @@
-		if ($nbContact > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';

-		}

+		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';

@@ -59,18 +58,15 @@
-	if (isModEnabled('prelevement')) {

-		$nbStandingOrders = 0;

-		$sql = "SELECT COUNT(pfd.rowid) as nb";

-		$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_demande as pfd";

-		$sql .= " WHERE pfd.fk_facture = ".((int) $object->id);

-		$sql .= " AND type = 'ban'";

-		$resql = $db->query($sql);

-		if ($resql) {

-			$obj = $db->fetch_object($resql);

-			if ($obj) {

-				$nbStandingOrders = $obj->nb;

-			}

-		} else {

-			dol_print_error($db);

-		}

-		$langs->load("banks");

-

-		$head[$h][0] = DOL_URL_ROOT.'/compta/facture/prelevement.php?id='.urlencode($object->id);

+	if (!empty($conf->prelevement->enabled))

+	{

+	    $nbStandingOrders = 0;

+	    $sql = "SELECT COUNT(pfd.rowid) as nb";

+	    $sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";

+	    $sql .= " WHERE pfd.fk_facture = ".$object->id;

+	    $sql .= " AND pfd.ext_payment_id IS NULL";

+        $resql = $db->query($sql);

+        if ($resql)

+        {

+            $obj = $db->fetch_object($resql);

+            if ($obj) $nbStandingOrders = $obj->nb;

+        }

+        else dol_print_error($db);

+		$head[$h][0] = DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.$object->id;

@@ -78,3 +74 @@
-		if ($nbStandingOrders > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbStandingOrders.'</span>';

-		}

+		if ($nbStandingOrders > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbStandingOrders.'</span>';

@@ -85,22 +79,17 @@
-	// Show more tabs from modules

-	// Entries must be declared in modules descriptor with line

-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname);   												to remove a tab

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'invoice', 'add', 'core');

-

-	if (!getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {

-		$nbNote = 0;

-		if (!empty($object->note_private)) {

-			$nbNote++;

-		}

-		if (!empty($object->note_public)) {

-			$nbNote++;

-		}

-		$head[$h][0] = DOL_URL_ROOT.'/compta/facture/note.php?id='.$object->id;

-		$head[$h][1] = $langs->trans('Notes');

-		if ($nbNote > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

-		}

-		$head[$h][2] = 'note';

-		$h++;

-	}

+    // Show more tabs from modules

+    // Entries must be declared in modules descriptor with line

+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

+    // $this->tabs = array('entity:-tabname);   												to remove a tab

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'invoice');

+

+    if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))

+    {

+    	$nbNote = 0;

+        if (!empty($object->note_private)) $nbNote++;

+		if (!empty($object->note_public)) $nbNote++;

+    	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/note.php?facid='.$object->id;

+    	$head[$h][1] = $langs->trans('Notes');

+		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

+    	$head[$h][2] = 'note';

+    	$h++;

+    }

@@ -109 +98 @@
-	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

+    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

@@ -112,2 +101,2 @@
-	$nbLinks = Link::count($db, $object->element, $object->id);

-	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/document.php?id='.$object->id;

+    $nbLinks = Link::count($db, $object->element, $object->id);

+	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/document.php?facid='.$object->id;

@@ -115,3 +104 @@
-	if (($nbFiles + $nbLinks) > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

-	}

+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

@@ -121,35 +108,4 @@
-	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/agenda.php?id='.$object->id;

-	$head[$h][1] = $langs->trans("Events");

-	if (isModEnabled('agenda')&& ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {

-		$nbEvent = 0;

-		// Enable caching of thirdparty count actioncomm

-		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';

-		$cachekey = 'count_events_facture_'.$object->id;

-		$dataretrieved = dol_getcache($cachekey);

-		if (!is_null($dataretrieved)) {

-			$nbEvent = $dataretrieved;

-		} else {

-			$sql = "SELECT COUNT(id) as nb";

-			$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm";

-			$sql .= " WHERE fk_element = ".((int) $object->id);

-			$sql .= " AND elementtype = 'invoice'";

-			$resql = $db->query($sql);

-			if ($resql) {

-				$obj = $db->fetch_object($resql);

-				$nbEvent = $obj->nb;

-			} else {

-				dol_syslog('Failed to count actioncomm '.$db->lasterror(), LOG_ERR);

-			}

-			dol_setcache($cachekey, $nbEvent, 120);		// If setting cache fails, this is not a problem, so we do not test result.

-		}

-

-		$head[$h][1] .= '/';

-		$head[$h][1] .= $langs->trans("Agenda");

-		if ($nbEvent > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbEvent.'</span>';

-		}

-	}

-	$head[$h][2] = 'agenda';

-	$h++;

-

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'invoice', 'add', 'external');

+	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/info.php?facid='.$object->id;

+	$head[$h][1] = $langs->trans('Info');

+	$head[$h][2] = 'info';

+	$h++;

@@ -169,7 +125 @@
-	global $langs, $conf, $user, $db;

-

-	$extrafields = new ExtraFields($db);

-	$extrafields->fetch_name_optionals_label('facture');

-	$extrafields->fetch_name_optionals_label('facturedet');

-	$extrafields->fetch_name_optionals_label('facture_rec');

-	$extrafields->fetch_name_optionals_label('facturedet_rec');

+	global $langs, $conf, $user;

@@ -198,4 +147,0 @@
-	$nbExtrafields = $extrafields->attributes['facture']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

@@ -207,4 +152,0 @@
-	$nbExtrafields = $extrafields->attributes['facturedet']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

@@ -216,4 +157,0 @@
-	$nbExtrafields = $extrafields->attributes['facture_rec']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

@@ -225,4 +162,0 @@
-	$nbExtrafields = $extrafields->attributes['facturedet_rec']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

@@ -232 +166 @@
-	if (getDolGlobalInt('INVOICE_USE_SITUATION') > 0) {	// Warning, implementation with value 1 is seriously bugged and a new one not compatible is expected to become stable

+	if ($conf->global->INVOICE_USE_SITUATION) {	// Warning, implementation is seriously bugged and a new one not compatible is expected to become stable

@@ -253 +187 @@
-	global $db, $langs, $conf, $user;

+	global $db, $langs, $conf;

@@ -258,2 +192,2 @@
-	$head[$h][0] = DOL_URL_ROOT . '/compta/facture/card-rec.php?id=' . $object->id;

-	$head[$h][1] = $langs->trans("RepeatableInvoice");

+	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/card-rec.php?id='.$object->id;

+	$head[$h][1] = $langs->trans("CardBill");

@@ -263,39 +197,5 @@
-	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/agenda-rec.php?id='.$object->id;

-	$head[$h][1] = $langs->trans("Events");

-	if (isModEnabled('agenda')&& ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {

-		$nbEvent = 0;

-		// Enable caching of thirdparty count actioncomm

-		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';

-		$cachekey = 'count_events_facturerec_'.$object->id;

-		$dataretrieved = dol_getcache($cachekey);

-		if (!is_null($dataretrieved)) {

-			$nbEvent = $dataretrieved;

-		} else {

-			$sql = "SELECT COUNT(id) as nb";

-			$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm";

-			$sql .= " WHERE fk_element = ".((int) $object->id);

-			$sql .= " AND elementtype = 'invoicerec'";

-			$resql = $db->query($sql);

-			if ($resql) {

-				$obj = $db->fetch_object($resql);

-				$nbEvent = $obj->nb;

-			} else {

-				dol_syslog('Failed to count actioncomm '.$db->lasterror(), LOG_ERR);

-			}

-			dol_setcache($cachekey, $nbEvent, 120);		// If setting cache fails, this is not a problem, so we do not test result.

-		}

-

-		$head[$h][1] .= '/';

-		$head[$h][1] .= $langs->trans("Agenda");

-		if ($nbEvent > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbEvent.'</span>';

-		}

-	}

-	$head[$h][2] = 'agenda';

-	$h++;

-

-	// Show more tabs from modules

-	// Entries must be declared in modules descriptor with line

-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname);   												to remove a tab

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'invoice-rec');

+    // Show more tabs from modules

+    // Entries must be declared in modules descriptor with line

+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

+    // $this->tabs = array('entity:-tabname);   												to remove a tab

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'invoice-rec');

@@ -307,1022 +206,0 @@
-

-/**

- * Return array head with list of tabs to view object informations.

- *

- * @param   Facture     $object     Invoice object

- * @return array                    head array with tabs

- */

-function supplier_invoice_rec_prepare_head($object)

-{

-	global $db, $langs, $conf;

-

-	$h = 0;

-	$head = array();

-

-	$head[$h][0] = DOL_URL_ROOT . '/fourn/facture/card-rec.php?id=' . $object->id;

-	$head[$h][1] = $langs->trans("RepeatableSupplierInvoice");

-	$head[$h][2] = 'card';

-	$h++;

-

-	// Show more tabs from modules

-	// Entries must be declared in modules descriptor with line

-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname);   												to remove a tab

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'invoice_supplier_rec');

-

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'invoice_supplier_rec', 'remove');

-

-	return $head;

-}

-

-/**

- * Return an HTML table that contains a pie chart of the number of customers or supplier invoices

- *

- * @param 	string 	$mode 		Can be 'customers' or 'suppliers'

- * @return 	string 				A HTML table that contains a pie chart of customers or supplier invoices

- */

-function getNumberInvoicesPieChart($mode)

-{

-	global $conf, $db, $langs, $user;

-

-	if (($mode == 'customers' && isModEnabled('facture') && $user->hasRight('facture', 'lire'))

-		|| ($mode == 'suppliers' && (isModEnabled('fournisseur') || isModEnabled('supplier_invoice')) && $user->hasRight('fournisseur', 'facture', 'lire'))

-		) {

-		global $badgeStatus1, $badgeStatus3, $badgeStatus4, $badgeStatus8, $badgeStatus11;

-		include DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';

-

-		$now = date_create(date('Y-m-d', dol_now()));

-		$datenowsub30 = date_create(date('Y-m-d', dol_now()));

-		$datenowsub15 = date_create(date('Y-m-d', dol_now()));

-		$datenowadd30 = date_create(date('Y-m-d', dol_now()));

-		$datenowadd15 = date_create(date('Y-m-d', dol_now()));

-		$interval30days = date_interval_create_from_date_string('30 days');

-		$interval15days = date_interval_create_from_date_string('15 days');

-		date_sub($datenowsub30, $interval30days);

-		date_sub($datenowsub15, $interval15days);

-		date_add($datenowadd30, $interval30days);

-		date_add($datenowadd15, $interval15days);

-

-		$sql = "SELECT";

-		$sql .= " sum(".$db->ifsql("f.date_lim_reglement < '".date_format($datenowsub30, 'Y-m-d')."'", 1, 0).") as nblate30";

-		$sql .= ", sum(".$db->ifsql("f.date_lim_reglement < '".date_format($datenowsub15, 'Y-m-d')."'", 1, 0).") as nblate15";

-		$sql .= ", sum(".$db->ifsql("f.date_lim_reglement < '".date_format($now, 'Y-m-d')."'", 1, 0).") as nblatenow";

-		$sql .= ", sum(".$db->ifsql("f.date_lim_reglement >= '".date_format($now, 'Y-m-d')."' OR f.date_lim_reglement IS NULL", 1, 0).") as nbnotlatenow";

-		$sql .= ", sum(".$db->ifsql("f.date_lim_reglement > '".date_format($datenowadd15, 'Y-m-d')."'", 1, 0).") as nbnotlate15";

-		$sql .= ", sum(".$db->ifsql("f.date_lim_reglement > '".date_format($datenowadd30, 'Y-m-d')."'", 1, 0).") as nbnotlate30";

-		if ($mode == 'customers') {

-			$element = 'invoice';

-			$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";

-		} elseif ($mode == 'fourn' || $mode == 'suppliers') {

-			$element = 'supplier_invoice';

-			$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";

-		} else {

-			return '';

-		}

-		$sql .= " WHERE f.entity IN (".getEntity($element).")";

-		$sql .= " AND f.type <> 2";

-		$sql .= " AND f.fk_statut = 1";

-		if (isset($user->socid) && $user->socid > 0) {

-			$sql .= " AND f.fk_soc = ".((int) $user->socid);

-		}

-

-		$resql = $db->query($sql);

-		if ($resql) {

-			$num = $db->num_rows($resql);

-			$i = 0;

-			$total = 0;

-			$dataseries = array();

-

-			while ($i < $num) {

-				$obj = $db->fetch_object($resql);

-				/*

-				$dataseries = array(array($langs->trans('InvoiceLate30Days'), $obj->nblate30)

-									,array($langs->trans('InvoiceLate15Days'), $obj->nblate15 - $obj->nblate30)

-									,array($langs->trans('InvoiceLateMinus15Days'), $obj->nblatenow - $obj->nblate15)

-									,array($langs->trans('InvoiceNotLate'), $obj->nbnotlatenow - $obj->nbnotlate15)

-									,array($langs->trans('InvoiceNotLate15Days'), $obj->nbnotlate15 - $obj->nbnotlate30)

-									,array($langs->trans('InvoiceNotLate30Days'), $obj->nbnotlate30));

-				*/

-				$dataseries[$i]=array($langs->transnoentitiesnoconv('NbOfOpenInvoices'), $obj->nblate30, $obj->nblate15 - $obj->nblate30, $obj->nblatenow - $obj->nblate15, $obj->nbnotlatenow - $obj->nbnotlate15, $obj->nbnotlate15 - $obj->nbnotlate30, $obj->nbnotlate30);

-				$i++;

-			}

-			if (!empty($dataseries[0])) {

-				foreach ($dataseries[0] as $key => $value) {

-					if (is_numeric($value)) {

-						$total += $value;

-					}

-				}

-			}

-			$legend = array(

-				$langs->trans('InvoiceLate30Days'),

-				$langs->trans('InvoiceLate15Days'),

-				$langs->trans('InvoiceLateMinus15Days'),

-				$mode == 'customers' ? $langs->trans('InvoiceNotLate') : $langs->trans("InvoiceToPay"),

-				$mode == 'customers' ? $langs->trans('InvoiceNotLate15Days') : $langs->trans("InvoiceToPay15Days"),

-				$mode == 'customers' ? $langs->trans('InvoiceNotLate30Days') : $langs->trans("InvoiceToPay30Days"),

-			);

-

-			$colorseries = array($badgeStatus8, $badgeStatus1, $badgeStatus3, $badgeStatus4, $badgeStatus11, '-'.$badgeStatus11);

-

-			$result = '<div class="div-table-responsive-no-min">';

-			$result .= '<table class="noborder nohover centpercent">';

-			$result .= '<tr class="liste_titre">';

-			$result .= '<td>'.$langs->trans("NbOfOpenInvoices").' - ';

-			if ($mode == 'customers') {

-				$result .= $langs->trans("CustomerInvoice");

-			} elseif ($mode == 'fourn' || $mode == 'suppliers') {

-				$result .= $langs->trans("SupplierInvoice");

-			} else {

-				return '';

-			}

-			$result .= '</td>';

-			$result .= '</tr>';

-

-			if ($conf->use_javascript_ajax) {

-				//var_dump($dataseries);

-				$dolgraph = new DolGraph();

-				$dolgraph->SetData($dataseries);

-

-				$dolgraph->setLegend($legend);

-

-				$dolgraph->SetDataColor(array_values($colorseries));

-				$dolgraph->setShowLegend(2);

-				$dolgraph->setShowPercent(1);

-				$dolgraph->SetType(array('bars', 'bars', 'bars', 'bars', 'bars', 'bars'));

-				//$dolgraph->SetType(array('pie'));

-				$dolgraph->setHeight('160');	/* 160 min is required to show the 6 lines of legend */

-				$dolgraph->setWidth('450');

-				$dolgraph->setHideXValues(true);

-				if ($mode == 'customers') {

-					$dolgraph->draw('idgraphcustomerinvoices');

-				} elseif ($mode == 'fourn' || $mode == 'suppliers') {

-					$dolgraph->draw('idgraphfourninvoices');

-				} else {

-					return '';

-				}

-				$result .= '<tr maxwidth="255">';

-				$result .= '<td class="center">'.$dolgraph->show($total ? 0 : $langs->trans("NoOpenInvoice")).'</td>';

-				$result .= '</tr>';

-			} else {

-				// Print text lines

-			}

-

-			$result .= '</table>';

-			$result .= '</div>';

-

-			return $result;

-		} else {

-			dol_print_error($db);

-		}

-	}

-	return '';

-}

-

-/**

- * Return a HTML table that contains a list with customer invoice drafts

- *

- * @param	int		$maxCount	(Optional) The maximum count of elements inside the table

- * @param	int		$socid		(Optional) Show only results from the customer with this id

- * @return	string				A HTML table that contains a list with customer invoice drafts

- */

-function getCustomerInvoiceDraftTable($maxCount = 500, $socid = 0)

-{

-	global $conf, $db, $langs, $user, $hookmanager;

-

-	$result = '';

-

-	if (isModEnabled('facture') && $user->hasRight('facture', 'lire')) {

-		$maxofloop = (!getDolGlobalString('MAIN_MAXLIST_OVERLOAD') ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD);

-

-		$tmpinvoice = new Facture($db);

-

-		$sql = "SELECT f.rowid, f.ref, f.datef as date, f.total_ht, f.total_tva, f.total_ttc, f.ref_client";

-		$sql .= ", f.type, f.fk_statut as status, f.paye";

-		$sql .= ", s.nom as name";

-		$sql .= ", s.rowid as socid, s.email";

-		$sql .= ", s.code_client, s.code_compta, s.code_fournisseur, s.code_compta_fournisseur";

-		$sql .= ", cc.rowid as country_id, cc.code as country_code";

-		if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {

-			$sql .= ", sc.fk_soc, sc.fk_user ";

-		}

-		$sql .= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s LEFT JOIN ".MAIN_DB_PREFIX."c_country as cc ON cc.rowid = s.fk_pays";

-		if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {

-			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

-		}

-		$sql .= " WHERE s.rowid = f.fk_soc AND f.fk_statut = ".Facture::STATUS_DRAFT;

-		$sql .= " AND f.entity IN (".getEntity('invoice').")";

-		if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {

-			$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);

-		}

-

-		if ($socid) {

-			$sql .= " AND f.fk_soc = ".((int) $socid);

-		}

-		// Add where from hooks

-		$parameters = array();

-		$reshook = $hookmanager->executeHooks('printFieldListWhereCustomerDraft', $parameters);

-		$sql .= $hookmanager->resPrint;

-

-		$sql .= " GROUP BY f.rowid, f.ref, f.datef, f.total_ht, f.total_tva, f.total_ttc, f.ref_client, f.type, f.fk_statut, f.paye,";

-		$sql .= " s.nom, s.rowid, s.email, s.code_client, s.code_compta, s.code_fournisseur, s.code_compta_fournisseur,";

-		$sql .= " cc.rowid, cc.code";

-		if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {

-			$sql .= ", sc.fk_soc, sc.fk_user";

-		}

-

-		// Add Group from hooks

-		$parameters = array();

-		$reshook = $hookmanager->executeHooks('printFieldListGroupByCustomerDraft', $parameters);

-		$sql .= $hookmanager->resPrint;

-

-		$resql = $db->query($sql);

-

-		if ($resql) {

-			$num = $db->num_rows($resql);

-			$nbofloop = min($num, $maxofloop);

-

-			$result .= '<div class="div-table-responsive-no-min">';

-			$result .= '<table class="noborder centpercent">';

-

-			$result .= '<tr class="liste_titre">';

-			$result .= '<th colspan="3">';

-			$result .= $langs->trans("CustomersDraftInvoices").' ';

-			$result .= '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?search_status='.Facture::STATUS_DRAFT.'">';

-			$result .= '<span class="badge marginleftonlyshort">'.$num.'</span>';

-			$result .= '</a>';

-			$result .= '</th>';

-			$result .= '</tr>';

-

-			if ($num) {

-				$companystatic = new Societe($db);

-

-				$i = 0;

-				$othernb = 0;

-				$tot_ttc = 0;

-				while ($i < $nbofloop) {

-					$obj = $db->fetch_object($resql);

-

-					if ($i >= $maxCount) {

-						$othernb += 1;

-						$i++;

-						$tot_ttc += $obj->total_ttc;

-						continue;

-					}

-

-					$tmpinvoice->id = $obj->rowid;

-					$tmpinvoice->ref = $obj->ref;

-					$tmpinvoice->date = $db->jdate($obj->date);

-					$tmpinvoice->type = $obj->type;

-					$tmpinvoice->total_ht = $obj->total_ht;

-					$tmpinvoice->total_tva = $obj->total_tva;

-					$tmpinvoice->total_ttc = $obj->total_ttc;

-					$tmpinvoice->ref_client = $obj->ref_client;

-					$tmpinvoice->statut = $obj->status;

-					$tmpinvoice->paye = $obj->paye;

-

-					$companystatic->id = $obj->socid;

-					$companystatic->name = $obj->name;

-					$companystatic->email = $obj->email;

-					$companystatic->country_id = $obj->country_id;

-					$companystatic->country_code = $obj->country_code;

-					$companystatic->client = 1;

-					$companystatic->code_client = $obj->code_client;

-					$companystatic->code_fournisseur = $obj->code_fournisseur;

-					$companystatic->code_compta = $obj->code_compta;

-					$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;

-

-					$result .= '<tr class="oddeven">';

-					$result .= '<td class="nowrap tdoverflowmax100">';

-					$result .= $tmpinvoice->getNomUrl(1, '');

-					$result .= '</td>';

-					$result .= '<td class="nowrap tdoverflowmax100">';

-					$result .= $companystatic->getNomUrl(1, 'customer');

-					$result .= '</td>';

-					$result .= '<td class="nowrap right"><span class="amount">'.price($obj->total_ttc).'</span></td>';

-					$result .= '</tr>';

-					$tot_ttc += $obj->total_ttc;

-					$i++;

-				}

-

-				if ($othernb) {

-					$result .= '<tr class="oddeven">';

-					$result .= '<td class="nowrap" colspan="3">';

-					$result .= '<span class="opacitymedium">'.$langs->trans("More").'...'.($othernb < $maxofloop ? ' ('.$othernb.')' : '').'</span>';

-					$result .= '</td>';

-					$result .= "</tr>\n";

-				}

-

-				$result .= '<tr class="liste_total"><td class="left">'.$langs->trans("Total").'</td>';

-				$result .= '<td colspan="2" class="right">'.price($tot_ttc).'</td>';

-				$result .= '</tr>';

-			} else {

-				$result .= '<tr class="oddeven"><td colspan="3"><span class="opacitymedium">'.$langs->trans("NoInvoice").'</span></td></tr>';

-			}

-			$result .= "</table></div>";

-			$db->free($resql);

-		} else {

-			dol_print_error($db);

-		}

-	}

-

-	return $result;

-}

-

-/**

- * Return a HTML table that contains a list with customer invoice drafts

- *

- * @param	int		$maxCount	(Optional) The maximum count of elements inside the table

- * @param	int		$socid		(Optional) Show only results from the customer with this id

- * @return	string				A HTML table that contains a list with customer invoice drafts

- */

-function getDraftSupplierTable($maxCount = 500, $socid = 0)

-{

-	global $conf, $db, $langs, $user, $hookmanager;

-

-	$result = '';

-

-	if ((isModEnabled('fournisseur') || isModEnabled('supplier_invoice')) && $user->hasRight('facture', 'lire')) {

-		$maxofloop = (!getDolGlobalString('MAIN_MAXLIST_OVERLOAD') ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD);

-

-		$facturesupplierstatic = new FactureFournisseur($db);

-

-		$sql = "SELECT f.ref, f.rowid, f.total_ht, f.total_tva, f.total_ttc, f.type, f.ref_supplier, f.fk_statut as status, f.paye";

-		$sql .= ", s.nom as name";

-		$sql .= ", s.rowid as socid, s.email";

-		$sql .= ", s.code_client, s.code_compta";

-		$sql .= ", s.code_fournisseur, s.code_compta_fournisseur";

-		$sql .= ", cc.rowid as country_id, cc.code as country_code";

-		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f, ".MAIN_DB_PREFIX."societe as s LEFT JOIN ".MAIN_DB_PREFIX."c_country as cc ON cc.rowid = s.fk_pays";

-		if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {

-			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

-		}

-		$sql .= " WHERE s.rowid = f.fk_soc AND f.fk_statut = ".FactureFournisseur::STATUS_DRAFT;

-		$sql .= " AND f.entity IN (".getEntity('invoice').')';

-		if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {

-			$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);

-		}

-		if ($socid) {

-			$sql .= " AND f.fk_soc = ".((int) $socid);

-		}

-		// Add where from hooks

-		$parameters = array();

-		$reshook = $hookmanager->executeHooks('printFieldListWhereSupplierDraft', $parameters);

-		$sql .= $hookmanager->resPrint;

-		$resql = $db->query($sql);

-

-		if ($resql) {

-			$num = $db->num_rows($resql);

-			$nbofloop = min($num, $maxofloop);

-

-			$result .= '<div class="div-table-responsive-no-min">';

-			$result .= '<table class="noborder centpercent">';

-

-			$result .= '<tr class="liste_titre">';

-			$result .= '<th colspan="3">';

-			$result .= $langs->trans("SuppliersDraftInvoices").' ';

-			$result .= '<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?search_status='.FactureFournisseur::STATUS_DRAFT.'">';

-			$result .= '<span class="badge marginleftonlyshort">'.$num.'</span>';

-			$result .= '</a>';

-			$result .= '</th>';

-			$result .= '</tr>';

-

-			if ($num) {

-				$companystatic = new Societe($db);

-

-				$i = 0;

-				$othernb = 0;

-				$tot_ttc = 0;

-				while ($i < $nbofloop) {

-					$obj = $db->fetch_object($resql);

-

-					if ($i >= $maxCount) {

-						$othernb += 1;

-						$i++;

-						$tot_ttc += $obj->total_ttc;

-						continue;

-					}

-

-					$facturesupplierstatic->ref = $obj->ref;

-					$facturesupplierstatic->id = $obj->rowid;

-					$facturesupplierstatic->total_ht = $obj->total_ht;

-					$facturesupplierstatic->total_tva = $obj->total_tva;

-					$facturesupplierstatic->total_ttc = $obj->total_ttc;

-					$facturesupplierstatic->ref_supplier = $obj->ref_supplier;

-					$facturesupplierstatic->type = $obj->type;

-					$facturesupplierstatic->statut = $obj->status;

-					$facturesupplierstatic->paye = $obj->paye;

-

-					$companystatic->id = $obj->socid;

-					$companystatic->name = $obj->name;

-					$companystatic->email = $obj->email;

-					$companystatic->country_id = $obj->country_id;

-					$companystatic->country_code = $obj->country_code;

-					$companystatic->fournisseur = 1;

-					$companystatic->code_client = $obj->code_client;

-					$companystatic->code_fournisseur = $obj->code_fournisseur;

-					$companystatic->code_compta = $obj->code_compta;

-					$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;

-

-					$result .= '<tr class="oddeven">';

-					$result .= '<td class="nowrap tdoverflowmax100">';

-					$result .= $facturesupplierstatic->getNomUrl(1, '');

-					$result .= '</td>';

-					$result .= '<td class="nowrap tdoverflowmax100">';

-					$result .= $companystatic->getNomUrl(1, 'supplier');

-					$result .= '</td>';

-					$result .= '<td class="right"><span class="amount">'.price($obj->total_ttc).'</span></td>';

-					$result .= '</tr>';

-					$tot_ttc += $obj->total_ttc;

-					$i++;

-				}

-

-				if ($othernb) {

-					$result .= '<tr class="oddeven">';

-					$result .= '<td class="nowrap" colspan="3">';

-					$result .= '<span class="opacitymedium">'.$langs->trans("More").'...'.($othernb < $maxofloop ? ' ('.$othernb.')' : '').'</span>';

-					$result .= '</td>';

-					$result .= "</tr>\n";

-				}

-

-				$result .= '<tr class="liste_total"><td class="left">'.$langs->trans("Total").'</td>';

-				$result .= '<td colspan="2" class="right">'.price($tot_ttc).'</td>';

-				$result .= '</tr>';

-			} else {

-				$result .= '<tr class="oddeven"><td colspan="3"><span class="opacitymedium">'.$langs->trans("NoInvoice").'</span></td></tr>';

-			}

-			$result .= "</table></div>";

-			$db->free($resql);

-		} else {

-			dol_print_error($db);

-		}

-	}

-

-	return $result;

-}

-

-

-/**

- * Return a HTML table that contains a list with latest edited customer invoices

- *

- * @param	int		$maxCount	(Optional) The maximum count of elements inside the table

- * @param	int		$socid		(Optional) Show only results from the customer with this id

- * @return	string				A HTML table that contains a list with latest edited customer invoices

- */

-function getCustomerInvoiceLatestEditTable($maxCount = 5, $socid = 0)

-{

-	global $conf, $db, $langs, $user;

-

-	$sql = "SELECT f.rowid, f.entity, f.ref, f.fk_statut as status, f.paye, f.type, f.total_ht, f.total_tva, f.total_ttc, f.datec,";

-	$sql .= " s.nom as socname, s.rowid as socid, s.canvas, s.client";

-	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";

-	$sql .= ", ".MAIN_DB_PREFIX."societe as s";

-	if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {

-		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

-	}

-	$sql .= " WHERE f.fk_soc = s.rowid";

-	$sql .= " AND f.entity IN (".getEntity('facture').")";

-	if ($socid) {

-		$sql .= " AND f.fk_soc = ".((int) $socid);

-	}

-	if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {

-		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);

-	}

-	$sql .= " ORDER BY f.tms DESC";

-	$sql .= $db->plimit($maxCount, 0);

-

-	$resql = $db->query($sql);

-	if (!$resql) {

-		dol_print_error($db);

-	}

-

-	$num = $db->num_rows($resql);

-

-	$result = '<div class="div-table-responsive-no-min">';

-	$result .= '<table class="noborder centpercent">';

-

-	$result .= '<tr class="liste_titre">';

-	$result .= '<th colspan="3">'.$langs->trans("LastCustomersBills", $maxCount).'</th>';

-	$result .= '<th class="right">'.$langs->trans("AmountTTC").'</th>';

-	$result .= '<th class="right"></th>';

-	$result .= '</tr>';

-

-	if ($num < 1) {

-		$result .= '</table>';

-		$result .= '</div>';

-		return $result;

-	}

-

-	$formfile = new FormFile($db);

-	$objectstatic = new Facture($db);

-	$companystatic = new Societe($db);

-	$i = 0;

-

-	while ($i < $num) {

-		$obj = $db->fetch_object($resql);

-

-		$objectstatic->id = $obj->rowid;

-		$objectstatic->ref = $obj->ref;

-		$objectstatic->paye = $obj->paye;

-		$objectstatic->statut = $obj->status;

-		$objectstatic->total_ht = $obj->total_ht;

-		$objectstatic->total_tva = $obj->total_tva;

-		$objectstatic->total_ttc = $obj->total_ttc;

-		$objectstatic->type = $obj->type;

-

-		$companystatic->id = $obj->socid;

-		$companystatic->name = $obj->socname;

-		$companystatic->client	= $obj->client;

-		$companystatic->canvas	= $obj->canvas;

-

-		$filename = dol_sanitizeFileName($obj->ref);

-		$filedir = $conf->propal->multidir_output[$obj->entity].'/'.$filename;

-

-		$result .= '<tr class="nowrap">';

-

-		$result .= '<td class="oddeven">';

-		$result .= '<table class="nobordernopadding">';

-		$result .= '<tr class="nocellnopadd">';

-

-		$result .= '<td width="96" class="nobordernopadding nowrap">'.$objectstatic->getNomUrl(1).'</td>';

-		$result .= '<td width="16" class="nobordernopadding nowrap">&nbsp;</td>';

-		$result .= '<td width="16" class="nobordernopadding right">'.$formfile->getDocumentsLink($objectstatic->element, $filename, $filedir).'</td>';

-

-		$result .= '</tr>';

-		$result .= '</table>';

-		$result .= '</td>';

-

-		$result .= '<td class="tdoverflowmax150">'.$companystatic->getNomUrl(1, 'customer').'</td>';

-		$result .= '<td>'.dol_print_date($db->jdate($obj->datec), 'day').'</td>';

-		$result .= '<td class="right amount">'.price($obj->total_ttc).'</td>';

-

-		// Load amount of existing payment of invoice (needed for complete status)

-		$payment = $objectstatic->getSommePaiement();

-		$result .= '<td class="right">'.$objectstatic->getLibStatut(5, $payment).'</td>';

-

-		$result .= '</tr>';

-

-		$i++;

-	}

-

-	$result .= '</table>';

-	$result .= '</div>';

-	return $result;

-}

-

-/**

- * Return a HTML table that contains a list with latest edited supplier invoices

- *

- * @param	int		$maxCount	(Optional) The maximum count of elements inside the table

- * @param	int		$socid		(Optional) Show only results from the supplier with this id

- * @return	string				A HTML table that contains a list with latest edited supplier invoices

- */

-function getPurchaseInvoiceLatestEditTable($maxCount = 5, $socid = 0)

-{

-	global $conf, $db, $langs, $user;

-

-	$sql = "SELECT f.rowid, f.entity, f.ref, f.fk_statut as status, f.paye, f.total_ht, f.total_tva, f.total_ttc, f.type, f.ref_supplier, f.datec,";

-	$sql .= " s.nom as socname, s.rowid as socid, s.canvas, s.client";

-	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";

-	$sql .= ", ".MAIN_DB_PREFIX."societe as s";

-	if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {

-		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

-	}

-	$sql .= " WHERE f.fk_soc = s.rowid";

-	$sql .= " AND f.entity IN (".getEntity('facture_fourn').")";

-	if ($socid) {

-		$sql .= " AND f.fk_soc = ".((int) $socid);

-	}

-	if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {

-		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);

-	}

-	$sql .= " ORDER BY f.tms DESC";

-	$sql .= $db->plimit($maxCount, 0);

-

-	$resql = $db->query($sql);

-	if (!$resql) {

-		dol_print_error($db);

-		return '';

-	}

-

-	$num = $db->num_rows($resql);

-

-	$result = '<div class="div-table-responsive-no-min">';

-	$result .= '<table class="noborder centpercent">';

-	$result .= '<tr class="liste_titre">';

-	$result .= '<th colspan="3">'.$langs->trans("BoxTitleLastSupplierBills", $maxCount).'</th>';

-	$result .= '<th class="right">'.$langs->trans("AmountTTC").'</th>';

-	$result .= '<th class="right"></th>';

-	$result .= '</tr>';

-

-	if ($num < 1) {

-		$result .= '</table>';

-		$result .= '</div>';

-		return $result;

-	}

-

-	$objectstatic = new FactureFournisseur($db);

-	$companystatic = new Societe($db);

-	$formfile = new FormFile($db);

-	$i = 0;

-

-	while ($i < $num) {

-		$obj = $db->fetch_object($resql);

-

-		$objectstatic->id = $obj->rowid;

-		$objectstatic->ref = $obj->ref;

-		$objectstatic->paye = $obj->paye;

-		$objectstatic->statut = $obj->status;

-		$objectstatic->total_ht = $obj->total_ht;

-		$objectstatic->total_tva = $obj->total_tva;

-		$objectstatic->total_ttc = $obj->total_ttc;

-		$objectstatic->type = $obj->type;

-

-		$companystatic->id = $obj->socid;

-		$companystatic->name = $obj->socname;

-		$companystatic->client = $obj->client;

-		$companystatic->canvas = $obj->canvas;

-

-		$filename = dol_sanitizeFileName($obj->ref);

-		$filedir = $conf->propal->multidir_output[$obj->entity].'/'.$filename;

-

-		$result .= '<tr class="nowrap">';

-

-		$result .= '<td class="oddeven">';

-		$result .= '<table class="nobordernopadding">';

-		$result .= '<tr class="nocellnopadd">';

-

-		$result .= '<td width="96" class="nobordernopadding nowrap">'.$objectstatic->getNomUrl(1).'</td>';

-		$result .= '<td width="16" class="nobordernopadding nowrap">&nbsp;</td>';

-		$result .= '<td width="16" class="nobordernopadding right">'.$formfile->getDocumentsLink($objectstatic->element, $filename, $filedir).'</td>';

-

-		$result .= '</tr>';

-		$result .= '</table>';

-		$result .= '</td>';

-

-		$result .= '<td class="tdoverflowmax150">'.$companystatic->getNomUrl(1, 'supplier').'</td>';

-

-		$result .= '<td>'.dol_print_date($db->jdate($obj->datec), 'day').'</td>';

-

-		$result .= '<td class="amount right">'.price($obj->total_ttc).'</td>';

-

-		$result .= '<td class="right">'.$objectstatic->getLibStatut(5).'</td>';

-

-		$result .= '</tr>';

-

-		$i++;

-	}

-

-	$result .= '</table>';

-	$result .= '</div>';

-	return $result;

-}

-

-/**

- * Return a HTML table that contains of unpaid customers invoices

- *

- * @param	int		$maxCount	(Optional) The maximum count of elements inside the table

- * @param	int		$socid		(Optional) Show only results from the supplier with this id

- * @return	string				A HTML table that conatins a list with open (unpaid) supplier invoices

- */

-function getCustomerInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)

-{

-	global $conf, $db, $langs, $user, $hookmanager;

-

-	$result = '';

-

-	if (isModEnabled('facture') && $user->hasRight('facture', 'lire')) {

-		$tmpinvoice = new Facture($db);

-

-		$sql = "SELECT f.rowid, f.ref, f.fk_statut as status, f.datef, f.type, f.total_ht, f.total_tva, f.total_ttc, f.paye, f.tms";

-		$sql .= ", f.date_lim_reglement as datelimite";

-		$sql .= ", s.nom as name";

-		$sql .= ", s.rowid as socid, s.email";

-		$sql .= ", s.code_client, s.code_compta";

-		$sql .= ", s.code_fournisseur, s.code_compta_fournisseur";

-		$sql .= ", cc.rowid as country_id, cc.code as country_code";

-		$sql .= ", sum(pf.amount) as am";

-		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s LEFT JOIN ".MAIN_DB_PREFIX."c_country as cc ON cc.rowid = s.fk_pays,".MAIN_DB_PREFIX."facture as f";

-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf on f.rowid=pf.fk_facture";

-		if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {

-			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

-		}

-		$sql .= " WHERE s.rowid = f.fk_soc AND f.paye = 0 AND f.fk_statut = ".Facture::STATUS_VALIDATED;

-		$sql .= " AND f.entity IN (".getEntity('invoice').')';

-		if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {

-			$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);

-		}

-		if ($socid) {

-			$sql .= " AND f.fk_soc = ".((int) $socid);

-		}

-		// Add where from hooks

-		$parameters = array();

-		$reshook = $hookmanager->executeHooks('printFieldListWhereCustomerUnpaid', $parameters);

-		$sql .= $hookmanager->resPrint;

-

-		$sql .= " GROUP BY f.rowid, f.ref, f.fk_statut, f.datef, f.type, f.total_ht, f.total_tva, f.total_ttc, f.paye, f.tms, f.date_lim_reglement,";

-		$sql .= " s.nom, s.rowid, s.email, s.code_client, s.code_compta, cc.rowid, cc.code";

-		$sql .= ", s.code_fournisseur, s.code_compta_fournisseur";

-		$sql .= " ORDER BY f.datef ASC, f.ref ASC";

-

-		$resql = $db->query($sql);

-		if ($resql) {

-			$num = $db->num_rows($resql);

-			$i = 0;

-			$othernb = 0;

-

-			$formfile = new FormFile($db);

-

-			print '<div class="div-table-responsive-no-min">';

-			print '<table class="noborder centpercent">';

-

-			print '<tr class="liste_titre">';

-			print '<th colspan="2">';

-			print $langs->trans("BillsCustomersUnpaid", $num).' ';

-			print '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?search_status='.Facture::STATUS_VALIDATED.'">';

-			print '<span class="badge">'.$num.'</span>';

-			print '</a>';

-			print '</th>';

-

-			print '<th class="right">'.$langs->trans("DateDue").'</th>';

-			if (getDolGlobalString('MAIN_SHOW_HT_ON_SUMMARY')) {

-				print '<th class="right">'.$langs->trans("AmountHT").'</th>';

-			}

-			print '<th class="right">'.$langs->trans("AmountTTC").'</th>';

-			print '<th class="right">'.$langs->trans("Received").'</th>';

-			print '<th width="16">&nbsp;</th>';

-			print '</tr>';

-			if ($num) {

-				$societestatic = new Societe($db);

-				$total_ttc = $totalam = $total = 0;

-				while ($i < $num) {

-					$obj = $db->fetch_object($resql);

-

-					if ($i >= $maxCount) {

-						$othernb += 1;

-						$i++;

-						$total += $obj->total_ht;

-						$total_ttc += $obj->total_ttc;

-						$totalam += $obj->am;

-						continue;

-					}

-

-					$tmpinvoice->ref = $obj->ref;

-					$tmpinvoice->id = $obj->rowid;

-					$tmpinvoice->total_ht = $obj->total_ht;

-					$tmpinvoice->total_tva = $obj->total_tva;

-					$tmpinvoice->total_ttc = $obj->total_ttc;

-					$tmpinvoice->type = $obj->type;

-					$tmpinvoice->statut = $obj->status;

-					$tmpinvoice->paye = $obj->paye;

-					$tmpinvoice->date_lim_reglement = $db->jdate($obj->datelimite);

-

-					$societestatic->id = $obj->socid;

-					$societestatic->name = $obj->name;

-					$societestatic->email = $obj->email;

-					$societestatic->country_id = $obj->country_id;

-					$societestatic->country_code = $obj->country_code;

-					$societestatic->client = 1;

-					$societestatic->code_client = $obj->code_client;

-					$societestatic->code_fournisseur = $obj->code_fournisseur;

-					$societestatic->code_compta = $obj->code_compta;

-					$societestatic->code_compta_fournisseur = $obj->code_compta_fournisseur;

-

-					print '<tr class="oddeven">';

-					print '<td class="nowrap">';

-

-					print '<table class="nobordernopadding"><tr class="nocellnopadd">';

-					print '<td class="nobordernopadding nowrap">';

-					print $tmpinvoice->getNomUrl(1, '');

-					print '</td>';

-					print '<td width="16" class="nobordernopadding hideonsmartphone right">';

-					$filename = dol_sanitizeFileName($obj->ref);

-					$filedir = $conf->facture->dir_output.'/'.dol_sanitizeFileName($obj->ref);

-					$urlsource = $_SERVER['PHP_SELF'].'?facid='.$obj->rowid;

-					print $formfile->getDocumentsLink($tmpinvoice->element, $filename, $filedir);

-					print '</td></tr></table>';

-

-					print '</td>';

-					print '<td class="nowrap tdoverflowmax100">';

-					print $societestatic->getNomUrl(1, 'customer');

-					print '</td>';

-					print '<td class="right">';

-					print dol_print_date($db->jdate($obj->datelimite), 'day');

-					if ($tmpinvoice->hasDelay()) {

-						print img_warning($langs->trans("Late"));

-					}

-					print '</td>';

-					if (getDolGlobalString('MAIN_SHOW_HT_ON_SUMMARY')) {

-						print '<td class="right"><span class="amount">'.price($obj->total_ht).'</span></td>';

-					}

-					print '<td class="nowrap right"><span class="amount">'.price($obj->total_ttc).'</span></td>';

-					print '<td class="nowrap right"><span class="amount">'.price($obj->am).'</span></td>';

-					print '<td>'.$tmpinvoice->getLibStatut(3, $obj->am).'</td>';

-					print '</tr>';

-

-					$total_ttc += $obj->total_ttc;

-					$total += $obj->total_ht;

-					$totalam += $obj->am;

-

-					$i++;

-				}

-

-				if ($othernb) {

-					$colspan = 6;

-					if (getDolGlobalString('MAIN_SHOW_HT_ON_SUMMARY')) {

-						$colspan++;

-					}

-					print '<tr class="oddeven">';

-					print '<td class="nowrap" colspan="'.$colspan.'">';

-					print '<span class="opacitymedium">'.$langs->trans("More").'... ('.$othernb.')</span>';

-					print '</td>';

-					print "</tr>\n";

-				}

-

-				print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").' &nbsp; <span style="font-weight: normal">('.$langs->trans("RemainderToTake").': '.price($total_ttc - $totalam).')</span> </td>';

-				print '<td>&nbsp;</td>';

-				if (getDolGlobalString('MAIN_SHOW_HT_ON_SUMMARY')) {

-					print '<td class="right"><span class="amount">'.price($total).'</span></td>';

-				}

-				print '<td class="nowrap right"><span class="amount">'.price($total_ttc).'</span></td>';

-				print '<td class="nowrap right"><span class="amount">'.price($totalam).'</span></td>';

-				print '<td>&nbsp;</td>';

-				print '</tr>';

-			} else {

-				$colspan = 6;

-				if (getDolGlobalString('MAIN_SHOW_HT_ON_SUMMARY')) {

-					$colspan++;

-				}

-				print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';

-			}

-			print '</table></div><br>';

-			$db->free($resql);

-		} else {

-			dol_print_error($db);

-		}

-	}

-

-	return $result;

-}

-

-

-/**

- * Return a HTML table that contains of unpaid purchase invoices

- *

- * @param	int		$maxCount	(Optional) The maximum count of elements inside the table

- * @param	int		$socid		(Optional) Show only results from the supplier with this id

- * @return	string				A HTML table that conatins a list with open (unpaid) supplier invoices

- */

-function getPurchaseInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)

-{

-	global $conf, $db, $langs, $user, $hookmanager;

-

-	$result = '';

-

-	if (isModEnabled("supplier_invoice") && ($user->hasRight('fournisseur', 'facture', 'lire') || $user->hasRight('supplier_invoice', 'read'))) {

-		$facstatic = new FactureFournisseur($db);

-

-		$sql = "SELECT ff.rowid, ff.ref, ff.fk_statut as status, ff.type, ff.libelle as label, ff.total_ht, ff.total_tva, ff.total_ttc, ff.paye";

-		$sql .= ", ff.date_lim_reglement";

-		$sql .= ", s.nom as name";

-		$sql .= ", s.rowid as socid, s.email";

-		$sql .= ", s.code_client, s.code_compta";

-		$sql .= ", s.code_fournisseur, s.code_compta_fournisseur";

-		$sql .= ", sum(pf.amount) as am";

-		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as ff";

-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf on ff.rowid=pf.fk_facturefourn";

-		if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {

-			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

-		}

-		$sql .= " WHERE s.rowid = ff.fk_soc";

-		$sql .= " AND ff.entity = ".$conf->entity;

-		$sql .= " AND ff.paye = 0";

-		$sql .= " AND ff.fk_statut = ".FactureFournisseur::STATUS_VALIDATED;

-		if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {

-			$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);

-		}

-		if ($socid) {

-			$sql .= " AND ff.fk_soc = ".((int) $socid);

-		}

-		// Add where from hooks

-		$parameters = array();

-		$reshook = $hookmanager->executeHooks('printFieldListWhereSupplierUnpaid', $parameters);

-		$sql .= $hookmanager->resPrint;

-

-		$sql .= " GROUP BY ff.rowid, ff.ref, ff.fk_statut, ff.type, ff.libelle, ff.total_ht, ff.total_tva, ff.total_ttc, ff.paye, ff.date_lim_reglement,";

-		$sql .= " s.nom, s.rowid, s.email, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur";

-		$sql .= " ORDER BY ff.date_lim_reglement ASC";

-

-		$resql = $db->query($sql);

-		if ($resql) {

-			$num = $db->num_rows($resql);

-			$othernb = 0;

-

-			$formfile = new FormFile($db);

-

-			print '<div class="div-table-responsive-no-min">';

-			print '<table class="noborder centpercent">';

-

-			print '<tr class="liste_titre">';

-			print '<th colspan="2">';

-			print $langs->trans("BillsSuppliersUnpaid", $num).' ';

-			print '<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?search_status='.FactureFournisseur::STATUS_VALIDATED.'">';

-			print '<span class="badge">'.$num.'</span>';

-			print '</a>';

-			print '</th>';

-

-			print '<th class="right">'.$langs->trans("DateDue").'</th>';

-			if (getDolGlobalString('MAIN_SHOW_HT_ON_SUMMARY')) {

-				print '<th class="right">'.$langs->trans("AmountHT").'</th>';

-			}

-			print '<th class="right">'.$langs->trans("AmountTTC").'</th>';

-			print '<th class="right">'.$langs->trans("Paid").'</th>';

-			print '<th width="16">&nbsp;</th>';

-			print "</tr>\n";

-			$societestatic = new Societe($db);

-			if ($num) {

-				$i = 0;

-				$total = $total_ttc = $totalam = 0;

-				while ($i < $num) {

-					$obj = $db->fetch_object($resql);

-

-					if ($i >= $maxCount) {

-						$othernb += 1;

-						$i++;

-						$total += $obj->total_ht;

-						$total_ttc += $obj->total_ttc;

-						continue;

-					}

-

-					$facstatic->ref = $obj->ref;

-					$facstatic->id = $obj->rowid;

-					$facstatic->type = $obj->type;

-					$facstatic->total_ht = $obj->total_ht;

-					$facstatic->total_tva = $obj->total_tva;

-					$facstatic->total_ttc = $obj->total_ttc;

-					$facstatic->statut = $obj->status;

-					$facstatic->paye = $obj->paye;

-

-					$societestatic->id = $obj->socid;

-					$societestatic->name = $obj->name;

-					$societestatic->email = $obj->email;

-					$societestatic->client = 0;

-					$societestatic->fournisseur = 1;

-					$societestatic->code_client = $obj->code_client;

-					$societestatic->code_fournisseur = $obj->code_fournisseur;

-					$societestatic->code_compta = $obj->code_compta;

-					$societestatic->code_compta_fournisseur = $obj->code_compta_fournisseur;

-

-					print '<tr class="oddeven">';

-					print '<td class="nowrap tdoverflowmax100">';

-					print $facstatic->getNomUrl(1, '');

-					print '</td>';

-					print '<td class="nowrap tdoverflowmax100">'.$societestatic->getNomUrl(1, 'supplier').'</td>';

-					print '<td class="right">'.dol_print_date($db->jdate($obj->date_lim_reglement), 'day').'</td>';

-					if (getDolGlobalString('MAIN_SHOW_HT_ON_SUMMARY')) {

-						print '<td class="right"><span class="amount">'.price($obj->total_ht).'</span></td>';

-					}

-					print '<td class="nowrap right"><span class="amount">'.price($obj->total_ttc).'</span></td>';

-					print '<td class="nowrap right"><span class="amount">'.price($obj->am).'</span></td>';

-					print '<td>'.$facstatic->getLibStatut(3, $obj->am).'</td>';

-					print '</tr>';

-					$total += $obj->total_ht;

-					$total_ttc += $obj->total_ttc;

-					$totalam += $obj->am;

-					$i++;

-				}

-

-				if ($othernb) {

-					$colspan = 6;

-					if (getDolGlobalString('MAIN_SHOW_HT_ON_SUMMARY')) {

-						$colspan++;

-					}

-					print '<tr class="oddeven">';

-					print '<td class="nowrap" colspan="'.$colspan.'">';

-					print '<span class="opacitymedium">'.$langs->trans("More").'... ('.$othernb.')</span>';

-					print '</td>';

-					print "</tr>\n";

-				}

-

-				print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").' &nbsp; <span style="font-weight: normal">('.$langs->trans("RemainderToPay").': '.price($total_ttc - $totalam).')</span> </td>';

-				print '<td>&nbsp;</td>';

-				if (getDolGlobalString('MAIN_SHOW_HT_ON_SUMMARY')) {

-					print '<td class="right">'.price($total).'</td>';

-				}

-				print '<td class="nowrap right">'.price($total_ttc).'</td>';

-				print '<td class="nowrap right">'.price($totalam).'</td>';

-				print '<td>&nbsp;</td>';

-				print '</tr>';

-			} else {

-				$colspan = 6;

-				if (getDolGlobalString('MAIN_SHOW_HT_ON_SUMMARY')) {

-					$colspan++;

-				}

-				print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';

-			}

-			print '</table></div><br>';

-		} else {

-			dol_print_error($db);

-		}

-	}

-

-	return $result;

-}

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_invoice2.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_invoice2.lib.php
@@ -46 +46 @@
- * @param	array		$thirdpartiesid			List of thirdparties id when using filter=excludethirdpartiesid	or filter=onlythirdpartiesid

+ * @param	array		$thirdpartiesid			List of thirdparties id when using filter excludethirdpartiesid	or onlythirdpartiesid

@@ -56 +56,2 @@
-	if (in_array('all', $filter)) {

+	if (in_array('all', $filter))

+	{

@@ -59,6 +60,4 @@
-	if (in_array('date', $filter)) {

-		if (empty($sqlwhere)) {

-			$sqlwhere = ' WHERE ';

-		} else {

-			$sqlwhere .= " AND";

-		}

+	if (in_array('date', $filter))

+	{

+		if (empty($sqlwhere)) $sqlwhere = ' WHERE ';

+		else $sqlwhere .= " AND";

@@ -70 +69,2 @@
-	if (in_array('nopayment', $filter)) {

+	if (in_array('nopayment', $filter))

+	{

@@ -72,5 +72,2 @@
-		if (empty($sqlwhere)) {

-			$sqlwhere = ' WHERE ';

-		} else {

-			$sqlwhere .= " AND";

-		}

+		if (empty($sqlwhere)) $sqlwhere = ' WHERE ';

+		else $sqlwhere .= " AND";

@@ -80 +77,2 @@
-	if (in_array('payments', $filter) || in_array('bank', $filter)) {

+	if (in_array('payments', $filter) || in_array('bank', $filter))

+	{

@@ -82,8 +80,3 @@
-		if (in_array('bank', $filter)) {

-			$sql .= ", ".MAIN_DB_PREFIX."bank as b";

-		}

-		if (empty($sqlwhere)) {

-			$sqlwhere = ' WHERE ';

-		} else {

-			$sqlwhere .= " AND";

-		}

+		if (in_array('bank', $filter)) $sql .= ", ".MAIN_DB_PREFIX."bank as b";

+		if (empty($sqlwhere)) $sqlwhere = ' WHERE ';

+		else $sqlwhere .= " AND";

@@ -93 +86,2 @@
-		if (in_array('payments', $filter)) {

+		if (in_array('payments', $filter))

+		{

@@ -97 +91,2 @@
-		if (in_array('bank', $filter)) {

+		if (in_array('bank', $filter))

+		{

@@ -99 +94 @@
-			$sqlwhere .= " AND b.fk_account = ".((int) $paymentbankid);

+			$sqlwhere .= " AND b.fk_account = ".$paymentbankid;

@@ -103,6 +98,4 @@
-	if (in_array('nodeposit', $filter)) {

-		if (empty($sqlwhere)) {

-			$sqlwhere = ' WHERE ';

-		} else {

-			$sqlwhere .= " AND";

-		}

+	if (in_array('nodeposit', $filter))

+	{

+		if (empty($sqlwhere)) $sqlwhere = ' WHERE ';

+		else $sqlwhere .= " AND";

@@ -111,6 +104,4 @@
-	if (in_array('noreplacement', $filter)) {

-		if (empty($sqlwhere)) {

-			$sqlwhere = ' WHERE ';

-		} else {

-			$sqlwhere .= " AND";

-		}

+	if (in_array('noreplacement', $filter))

+	{

+		if (empty($sqlwhere)) $sqlwhere = ' WHERE ';

+		else $sqlwhere .= " AND";

@@ -119,6 +110,4 @@
-	if (in_array('nocreditnote', $filter)) {

-		if (empty($sqlwhere)) {

-			$sqlwhere = ' WHERE ';

-		} else {

-			$sqlwhere .= " AND";

-		}

+	if (in_array('nocreditnote', $filter))

+	{

+		if (empty($sqlwhere)) $sqlwhere = ' WHERE ';

+		else $sqlwhere .= " AND";

@@ -127,22 +116,14 @@
-	if (in_array('excludethirdparties', $filter) && is_array($thirdpartiesid)) {

-		if (empty($sqlwhere)) {

-			$sqlwhere = ' WHERE ';

-		} else {

-			$sqlwhere .= " AND";

-		}

-		$sqlwhere .= ' f.fk_soc NOT IN ('.$db->sanitize(join(',', $thirdpartiesid)).')';

-	}

-	if (in_array('onlythirdparties', $filter) && is_array($thirdpartiesid)) {

-		if (empty($sqlwhere)) {

-			$sqlwhere = ' WHERE ';

-		} else {

-			$sqlwhere .= " AND";

-		}

-		$sqlwhere .= ' f.fk_soc IN ('.$db->sanitize(join(',', $thirdpartiesid)).')';

-	}

-	if ($sqlwhere) {

-		$sql .= $sqlwhere;

-	}

-	if ($sqlorder) {

-		$sql .= $sqlorder;

-	}

+	if (in_array('excludethirdparties', $filter) && is_array($thirdpartiesid))

+	{

+		if (empty($sqlwhere)) $sqlwhere = ' WHERE ';

+		else $sqlwhere .= " AND";

+		$sqlwhere .= ' f.fk_soc NOT IN ('.join(',', $thirdpartiesid).')';

+	}

+	if (in_array('onlythirdparties', $filter) && is_array($thirdpartiesid))

+	{

+		if (empty($sqlwhere)) $sqlwhere = ' WHERE ';

+		else $sqlwhere .= " AND";

+		$sqlwhere .= ' f.fk_soc IN ('.join(',', $thirdpartiesid).')';

+	}

+	if ($sqlwhere) $sql .= $sqlwhere;

+	if ($sqlorder) $sql .= $sqlorder;

@@ -153,3 +134 @@
-	if ($usestdout) {

-		print '--- start'."\n";

-	}

+	if ($usestdout) print '--- start'."\n";

@@ -165 +144,2 @@
-	if ($resql = $db->query($sql)) {

+	if ($resql = $db->query($sql))

+	{

@@ -172 +152,2 @@
-		if ($num) {

+		if ($num)

+		{

@@ -176 +157,2 @@
-			while ($cpt < $num) {

+			while ($cpt < $num)

+			{

@@ -181 +163,2 @@
-				if ($result > 0) {

+				if ($result > 0)

+				{

@@ -183,2 +166,4 @@
-					if (!empty($newlangid)) {

-						if ($outputlangs->defaultlang != $newlangid) {

+					if (!empty($newlangid))

+					{

+						if ($outputlangs->defaultlang != $newlangid)

+						{

@@ -190,9 +175,7 @@
-					if ($regenerate || !dol_is_file($filename)) {

-						if ($usestdout) {

-							print "Build PDF for invoice ".$obj->ref." - Lang = ".$outputlangs->defaultlang."\n";

-						}

-						$result = $fac->generateDocument($regenerate ? $regenerate : $fac->model_pdf, $outputlangs);

-					} else {

-						if ($usestdout) {

-							print "PDF for invoice ".$obj->ref." already exists\n";

-						}

+					if ($regenerate || !dol_is_file($filename))

+					{

+						if ($usestdout) print "Build PDF for invoice ".$obj->ref." - Lang = ".$outputlangs->defaultlang."\n";

+						$result = $fac->generateDocument($regenerate ? $regenerate : $fac->modelpdf, $outputlangs);

+					}

+					else {

+						if ($usestdout) print "PDF for invoice ".$obj->ref." already exists\n";

@@ -205 +188,2 @@
-				if ($result <= 0) {

+				if ($result <= 0)

+				{

@@ -207,5 +191,2 @@
-					if ($usestdout) {

-						print "Error: Failed to build PDF for invoice ".($fac->ref ? $fac->ref : ' id '.$obj->rowid)."\n";

-					} else {

-						dol_syslog("Failed to build PDF for invoice ".($fac->ref ? $fac->ref : ' id '.$obj->rowid), LOG_ERR);

-					}

+					if ($usestdout) print "Error: Failed to build PDF for invoice ".($fac->ref ? $fac->ref : ' id '.$obj->rowid)."\n";

+					else dol_syslog("Failed to build PDF for invoice ".($fac->ref ? $fac->ref : ' id '.$obj->rowid), LOG_ERR);

@@ -224,5 +205,2 @@
-			if ($usestdout) {

-				print "Using output PDF format ".join('x', $format)."\n";

-			} else {

-				dol_syslog("Using output PDF format ".join('x', $format), LOG_ERR);

-			}

+			if ($usestdout) print "Using output PDF format ".join('x', $format)."\n";

+			else dol_syslog("Using output PDF format ".join('x', $format), LOG_ERR);

@@ -236 +214,2 @@
-			if (class_exists('TCPDF')) {

+			if (class_exists('TCPDF'))

+			{

@@ -242,3 +221 @@
-			if (getDolGlobalString('MAIN_DISABLE_PDF_COMPRESSION')) {

-				$pdf->SetCompression(false);

-			}

+			if ($conf->global->MAIN_DISABLE_PDF_COMPRESSION) $pdf->SetCompression(false);

@@ -248,6 +225,4 @@
-			foreach ($files as $file) {

-				if ($usestdout) {

-					print "Merge PDF file for invoice ".$file."\n";

-				} else {

-					dol_syslog("Merge PDF file for invoice ".$file);

-				}

+			foreach ($files as $file)

+			{

+				if ($usestdout) print "Merge PDF file for invoice ".$file."\n";

+				else dol_syslog("Merge PDF file for invoice ".$file);

@@ -257,5 +232,6 @@
-				for ($i = 1; $i <= $pagecount; $i++) {

-					$tplidx = $pdf->importPage($i);

-					$s = $pdf->getTemplatesize($tplidx);

-					$pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');

-					$pdf->useTemplate($tplidx);

+				for ($i = 1; $i <= $pagecount; $i++)

+				{

+					 $tplidx = $pdf->importPage($i);

+					 $s = $pdf->getTemplatesize($tplidx);

+					 $pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');

+					 $pdf->useTemplate($tplidx);

@@ -270,6 +246,2 @@
-			if (empty($filename)) {

-				$filename = 'mergedpdf';

-			}

-			if (!empty($filesuffix)) {

-				$filename .= '_'.$filesuffix;

-			}

+			if (empty($filename)) $filename = 'mergedpdf';

+			if (!empty($filesuffix)) $filename .= '_'.$filesuffix;

@@ -278 +250,2 @@
-			if (!$error && $pagecount) {

+			if (!$error && $pagecount)

+			{

@@ -280,9 +253,8 @@
-				dolChmod($file);

-			}

-

-			if ($usestdout) {

-				if (!$error) {

-					print "Merged PDF has been built in ".$file."\n";

-				} else {

-					print "Can't build PDF ".$file."\n";

-				}

+				if (!empty($conf->global->MAIN_UMASK))

+					@chmod($file, octdec($conf->global->MAIN_UMASK));

+			}

+

+			if ($usestdout)

+			{

+				if (!$error) print "Merged PDF has been built in ".$file."\n";

+				else print "Can't build PDF ".$file."\n";

@@ -292,6 +264,5 @@
-		} else {

-			if ($usestdout) {

-				print "No invoices found for criteria.\n";

-			} else {

-				dol_syslog("No invoices found for criteria");

-			}

+		}

+		else

+		{

+			if ($usestdout) print "No invoices found for criteria.\n";

+			else dol_syslog("No invoices found for criteria");

@@ -300 +271,3 @@
-	} else {

+	}

+	else

+	{

@@ -306,5 +279,2 @@
-	if ($error) {

-		return -1;

-	} else {

-		return $result;

-	}

+	if ($error) return -1;

+	else return $result;

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_json.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_json.lib.php
@@ -26 +26,2 @@
-if (!function_exists('json_encode')) {

+if (!function_exists('json_encode'))

+{

@@ -39 +39,0 @@
-

@@ -43,2 +42,0 @@
- * Note: We can found some special chars into a json string:

- * Quotation mark (") = \", Backslash (\) = \\, Slash (/) =	\/, Backspace = \b, Form feed = \f, New line =\n, Carriage return =\r, Horizontal tab = \t

@@ -55,6 +53,7 @@
-	if (is_object($elements)) {	// Count number of properties for an object

-		foreach ($elements as $key => $value) {

-			$num++;

-		}

-	} else {

-		$num = count($elements);

+	if (is_object($elements))	// Count number of properties for an object

+	{

+		foreach ($elements as $key => $value) $num++;

+	}

+	else

+	{

+	    $num = count($elements);

@@ -65 +64,2 @@
-	if (is_numeric(key($elements)) && key($elements) == 0) {

+	if (is_numeric(key($elements)) && key($elements) == 0)

+	{

@@ -69,12 +69,6 @@
-		for ($i = 0, $last = ($num - 1); $i < $num; $i++) {

-			if (!isset($elements[$keysofelements[$i]])) {

-				continue;

-			}

-			if (is_array($elements[$keysofelements[$i]]) || is_object($elements[$keysofelements[$i]])) {

-				$output .= json_encode($elements[$keysofelements[$i]]);

-			} else {

-				$output .= _val($elements[$keysofelements[$i]]);

-			}

-			if ($i !== $last) {

-				$output .= ',';

-			}

+		for ($i = 0, $last = ($num - 1); $i < $num; $i++)

+		{

+			if (!isset($elements[$keysofelements[$i]])) continue;

+			if (is_array($elements[$keysofelements[$i]]) || is_object($elements[$keysofelements[$i]])) $output .= json_encode($elements[$keysofelements[$i]]);

+			else $output .= _val($elements[$keysofelements[$i]]);

+			if ($i !== $last) $output .= ',';

@@ -83 +77,3 @@
-	} else {

+	}

+	else

+	{

@@ -89,7 +85,4 @@
-		if (is_array($elements)) {

-			$tmpelements = $elements;

-		}

-		if (is_object($elements)) {

-			$tmpelements = get_object_vars($elements);

-		}

-		foreach ($tmpelements as $key => $value) {

+		if (is_array($elements)) $tmpelements = $elements;

+		if (is_object($elements)) $tmpelements = get_object_vars($elements);

+		foreach ($tmpelements as $key => $value)

+		{

@@ -97,8 +90,3 @@
-			if (is_array($value)) {

-				$output .= json_encode($value);

-			} else {

-				$output .= _val($value);

-			}

-			if ($i !== $last) {

-				$output .= ',';

-			}

+			if (is_array($value)) $output .= json_encode($value);

+			else $output .= _val($value);

+			if ($i !== $last) $output .= ',';

@@ -122,101 +110,99 @@
-	if (is_string($val)) {

-		// STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT

-		$ascii = '';

-		$strlen_var = strlen($val);

-

-		/*

-		 * Iterate over every character in the string,

-		 * escaping with a slash or encoding to UTF-8 where necessary

-		 */

-		for ($c = 0; $c < $strlen_var; ++$c) {

-			$ord_var_c = ord($val[$c]);

-

-			switch (true) {

-				case $ord_var_c == 0x08:

-					$ascii .= '\b';

-					break;

-				case $ord_var_c == 0x09:

-					$ascii .= '\t';

-					break;

-				case $ord_var_c == 0x0A:

-					$ascii .= '\n';

-					break;

-				case $ord_var_c == 0x0C:

-					$ascii .= '\f';

-					break;

-				case $ord_var_c == 0x0D:

-					$ascii .= '\r';

-					break;

-

-				case $ord_var_c == 0x22:

-				case $ord_var_c == 0x2F:

-				case $ord_var_c == 0x5C:

-					// double quote, slash, slosh

-					$ascii .= '\\'.$val[$c];

-					break;

-

-				case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):

-					// characters U-00000000 - U-0000007F (same as ASCII)

-					$ascii .= $val[$c];

-					break;

-

-				case (($ord_var_c & 0xE0) == 0xC0):

-					// characters U-00000080 - U-000007FF, mask 110XXXXX

-					// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8

-					$char = pack('C*', $ord_var_c, ord($val[$c + 1]));

-					$c += 1;

-					$utf16 = utf82utf16($char);

-					$ascii .= sprintf('\u%04s', bin2hex($utf16));

-					break;

-

-				case (($ord_var_c & 0xF0) == 0xE0):

-					// characters U-00000800 - U-0000FFFF, mask 1110XXXX

-					// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8

-					$char = pack('C*', $ord_var_c, ord($val[$c + 1]), ord($val[$c + 2]));

-					$c += 2;

-					$utf16 = utf82utf16($char);

-					$ascii .= sprintf('\u%04s', bin2hex($utf16));

-					break;

-

-				case (($ord_var_c & 0xF8) == 0xF0):

-					// characters U-00010000 - U-001FFFFF, mask 11110XXX

-					// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8

-					$char = pack('C*', $ord_var_c, ord($val[$c + 1]), ord($val[$c + 2]), ord($val[$c + 3]));

-					$c += 3;

-					$utf16 = utf82utf16($char);

-					$ascii .= sprintf('\u%04s', bin2hex($utf16));

-					break;

-

-				case (($ord_var_c & 0xFC) == 0xF8):

-					// characters U-00200000 - U-03FFFFFF, mask 111110XX

-					// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8

-					$char = pack('C*', $ord_var_c, ord($val[$c + 1]), ord($val[$c + 2]), ord($val[$c + 3]), ord($val[$c + 4]));

-					$c += 4;

-					$utf16 = utf82utf16($char);

-					$ascii .= sprintf('\u%04s', bin2hex($utf16));

-					break;

-

-				case (($ord_var_c & 0xFE) == 0xFC):

-					// characters U-04000000 - U-7FFFFFFF, mask 1111110X

-					// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8

-					$char = pack('C*', $ord_var_c, ord($val[$c + 1]), ord($val[$c + 2]), ord($val[$c + 3]), ord($val[$c + 4]), ord($val[$c + 5]));

-					$c += 5;

-					$utf16 = utf82utf16($char);

-					$ascii .= sprintf('\u%04s', bin2hex($utf16));

-					break;

-			}

-		}

-

-		return '"'.$ascii.'"';

-	} elseif (is_int($val)) {

-		return sprintf('%d', $val);

-	} elseif (is_float($val)) {

-		return sprintf('%F', $val);

-	} elseif (is_bool($val)) {

-		return ($val ? 'true' : 'false');

-	} else {

-		return 'null';

-	}

-}

-

-if (!function_exists('json_decode')) {

+	if (is_string($val))

+	{

+        // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT

+        $ascii = '';

+        $strlen_var = strlen($val);

+

+        /*

+	     * Iterate over every character in the string,

+	     * escaping with a slash or encoding to UTF-8 where necessary

+	     */

+	    for ($c = 0; $c < $strlen_var; ++$c) {

+	        $ord_var_c = ord($val[$c]);

+

+	        switch (true) {

+	            case $ord_var_c == 0x08:

+	                $ascii .= '\b';

+	                break;

+	            case $ord_var_c == 0x09:

+	                $ascii .= '\t';

+	                break;

+	            case $ord_var_c == 0x0A:

+	                $ascii .= '\n';

+	                break;

+	            case $ord_var_c == 0x0C:

+	                $ascii .= '\f';

+	                break;

+	            case $ord_var_c == 0x0D:

+	                $ascii .= '\r';

+	                break;

+

+	            case $ord_var_c == 0x22:

+	            case $ord_var_c == 0x2F:

+	            case $ord_var_c == 0x5C:

+	                // double quote, slash, slosh

+	                $ascii .= '\\'.$val[$c];

+	                break;

+

+	            case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):

+	                // characters U-00000000 - U-0000007F (same as ASCII)

+	                $ascii .= $val[$c];

+	                break;

+

+	            case (($ord_var_c & 0xE0) == 0xC0):

+	                // characters U-00000080 - U-000007FF, mask 110XXXXX

+	                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8

+	                $char = pack('C*', $ord_var_c, ord($val[$c + 1]));

+	                $c += 1;

+	                $utf16 = utf82utf16($char);

+	                $ascii .= sprintf('\u%04s', bin2hex($utf16));

+	                break;

+

+	            case (($ord_var_c & 0xF0) == 0xE0):

+	                // characters U-00000800 - U-0000FFFF, mask 1110XXXX

+	                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8

+	                $char = pack('C*', $ord_var_c, ord($val[$c + 1]), ord($val[$c + 2]));

+	                $c += 2;

+	                $utf16 = utf82utf16($char);

+	                $ascii .= sprintf('\u%04s', bin2hex($utf16));

+	                break;

+

+	            case (($ord_var_c & 0xF8) == 0xF0):

+	                // characters U-00010000 - U-001FFFFF, mask 11110XXX

+	                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8

+	                $char = pack('C*', $ord_var_c, ord($val[$c + 1]), ord($val[$c + 2]), ord($val[$c + 3]));

+	                $c += 3;

+	                $utf16 = utf82utf16($char);

+	                $ascii .= sprintf('\u%04s', bin2hex($utf16));

+	                break;

+

+	            case (($ord_var_c & 0xFC) == 0xF8):

+	                // characters U-00200000 - U-03FFFFFF, mask 111110XX

+	                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8

+	                $char = pack('C*', $ord_var_c, ord($val[$c + 1]), ord($val[$c + 2]), ord($val[$c + 3]), ord($val[$c + 4]));

+	                $c += 4;

+	                $utf16 = utf82utf16($char);

+	                $ascii .= sprintf('\u%04s', bin2hex($utf16));

+	                break;

+

+	            case (($ord_var_c & 0xFE) == 0xFC):

+	                // characters U-04000000 - U-7FFFFFFF, mask 1111110X

+	                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8

+	                $char = pack('C*', $ord_var_c, ord($val[$c + 1]), ord($val[$c + 2]), ord($val[$c + 3]), ord($val[$c + 4]), ord($val[$c + 5]));

+	                $c += 5;

+	                $utf16 = utf82utf16($char);

+	                $ascii .= sprintf('\u%04s', bin2hex($utf16));

+	                break;

+	        }

+	    }

+

+	    return '"'.$ascii.'"';

+	}

+	elseif (is_int($val)) return sprintf('%d', $val);

+	elseif (is_float($val)) return sprintf('%F', $val);

+	elseif (is_bool($val)) return ($val ? 'true' : 'false');

+	else  return 'null';

+}

+

+if (!function_exists('json_decode'))

+{

@@ -251 +237 @@
-	$out = '';

+    $out = '';

@@ -253,13 +239,8 @@
-	for ($i = 0; $i < $strLength; $i++) {

-		if (!$comment) {

-			if (($json[$i] == '{') || ($json[$i] == '[')) {

-				$out .= 'array(';

-			} elseif (($json[$i] == '}') || ($json[$i] == ']')) {

-				$out .= ')';

-			} elseif ($json[$i] == ':') {

-				$out .= ' => ';

-			} else {

-				$out .= $json[$i];

-			}

-		} else {

-			$out .= $json[$i];

+	for ($i = 0; $i < $strLength; $i++)

+	{

+		if (!$comment)

+		{

+			if (($json[$i] == '{') || ($json[$i] == '[')) $out .= 'array(';

+			elseif (($json[$i] == '}') || ($json[$i] == ']')) $out .= ')';

+			elseif ($json[$i] == ':') $out .= ' => ';

+			else $out .= $json[$i];

@@ -267,3 +248,2 @@
-		if ($json[$i] == '"' && $json[($i - 1)] != "\\") {

-			$comment = !$comment;

-		}

+		else $out .= $json[$i];

+		if ($json[$i] == '"' && $json[($i - 1)] != "\\") $comment = !$comment;

@@ -274,2 +253,0 @@
-	$array = array();

-

@@ -277,7 +255,2 @@
-	if ($out != '') {

-		try {

-			eval('$array = '.$out.';');

-		} catch (Exception $e) {

-			$array = array();

-		}

-	}

+	if ($out != '') eval('$array = '.$out.';');

+	else $array = array();

@@ -286,2 +259,4 @@
-	if (!$assoc) {

-		if (!empty($array)) {

+	if (!$assoc)

+	{

+		if (!empty($array))

+		{

@@ -292,4 +267,3 @@
-			foreach ($array as $key => $value) {

-				if ($key) {

-					$object->{$key} = $value;

-				}

+			foreach ($array as $key => $value)

+			{

+				if ($key) $object->{$key} = $value;

@@ -316,5 +290,6 @@
-	while (preg_match('/\\\u([0-9A-F]{2})([0-9A-F]{2})/i', $val, $reg)) {

-		// single, escaped unicode character

-		$utf16 = chr(hexdec($reg[1])).chr(hexdec($reg[2]));

-		$utf8  = utf162utf8($utf16);

-		$val = preg_replace('/\\\u'.$reg[1].$reg[2].'/i', $utf8, $val);

+	while (preg_match('/\\\u([0-9A-F]{2})([0-9A-F]{2})/i', $val, $reg))

+	{

+	    // single, escaped unicode character

+	    $utf16 = chr(hexdec($reg[1])).chr(hexdec($reg[2]));

+	    $utf8  = utf162utf8($utf16);

+	    $val = preg_replace('/\\\u'.$reg[1].$reg[2].'/i', $utf8, $val);

@@ -339 +314 @@
-		return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');

+	    return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');

@@ -345 +320 @@
-		case ((0x7F & $bytes) == $bytes):

+    	case ((0x7F & $bytes) == $bytes):

@@ -348,3 +323,3 @@
-			return chr($bytes);

-

-		case (0x07FF & $bytes) == $bytes:

+    	return chr($bytes);

+

+    	case (0x07FF & $bytes) == $bytes:

@@ -353,4 +328,4 @@
-			return chr(0xC0 | (($bytes >> 6) & 0x1F))

-		. chr(0x80 | ($bytes & 0x3F));

-

-		case (0xFFFF & $bytes) == $bytes:

+    	return chr(0xC0 | (($bytes >> 6) & 0x1F))

+    	. chr(0x80 | ($bytes & 0x3F));

+

+    	case (0xFFFF & $bytes) == $bytes:

@@ -359,3 +334,3 @@
-			return chr(0xE0 | (($bytes >> 12) & 0x0F))

-		. chr(0x80 | (($bytes >> 6) & 0x3F))

-		. chr(0x80 | ($bytes & 0x3F));

+    	return chr(0xE0 | (($bytes >> 12) & 0x0F))

+    	. chr(0x80 | (($bytes >> 6) & 0x3F))

+    	. chr(0x80 | ($bytes & 0x3F));

@@ -382 +357 @@
-		return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');

+	    return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');

@@ -387 +362 @@
-			// this case should never be reached, because we are in ASCII range

+	        // this case should never be reached, because we are in ASCII range

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_ldap.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_ldap.lib.php
@@ -3 +3 @@
- * Copyright (C) 2006-2021	Regis Houssin		<regis.houssin@inodbox.com>

+ * Copyright (C) 2006-2017	Regis Houssin		<regis.houssin@inodbox.com>

@@ -46 +46,2 @@
-	if (getDolGlobalString('LDAP_SYNCHRO_ACTIVE')) {

+	if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE))

+	{

@@ -53 +54,2 @@
-	if (getDolGlobalString('LDAP_SYNCHRO_ACTIVE')) {

+	if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE))

+	{

@@ -60 +62,2 @@
-	if (isModEnabled("societe") && getDolGlobalString('LDAP_CONTACT_ACTIVE')) {

+	if (!empty($conf->societe->enabled) && !empty($conf->global->LDAP_CONTACT_ACTIVE))

+	{

@@ -67 +70,2 @@
-	if (isModEnabled('adherent') && getDolGlobalString('LDAP_MEMBER_ACTIVE')) {

+	if (!empty($conf->adherent->enabled) && !empty($conf->global->LDAP_MEMBER_ACTIVE))

+	{

@@ -74 +78,2 @@
-	if (isModEnabled('adherent') && getDolGlobalString('LDAP_MEMBER_TYPE_ACTIVE')) {

+	if (!empty($conf->adherent->enabled) && !empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE))

+	{

@@ -85,3 +90 @@
-	complete_head_from_modules($conf, $langs, null, $head, $h, 'ldap');

-

-	complete_head_from_modules($conf, $langs, null, $head, $h, 'ldap', 'remove');

+	complete_head_from_modules($conf, $langs, '', $head, $h, 'ldap');

@@ -90,0 +94 @@
+

@@ -108 +112,2 @@
-	if (!function_exists("ldap_connect")) {

+	if (!function_exists("ldap_connect"))

+	{

@@ -110 +115,3 @@
-	} elseif (!getDolGlobalString('LDAP_SERVER_HOST')) {

+	}

+	elseif (empty($conf->global->LDAP_SERVER_HOST))

+	{

@@ -112 +119,3 @@
-	} elseif (empty($key) || empty($dn) || empty($objectclass)) {

+	}

+	elseif (empty($key) || empty($dn) || empty($objectclass))

+	{

@@ -115 +124,3 @@
-	} else {

+	}

+	else

+	{

@@ -119,0 +131 @@
+

@@ -137,6 +149,2 @@
-	if ($count == 0) {

-		return -1; // To stop loop

-	}

-	if (!is_array($result)) {

-		return -1;

-	}

+	if ($count == 0) return -1; // To stop loop

+	if (!is_array($result)) return -1;

@@ -144,13 +152,6 @@
-	foreach ($result as $key => $val) {

-		if ("$key" == "objectclass") {

-			continue;

-		}

-		if ("$key" == "count") {

-			continue;

-		}

-		if ("$key" == "dn") {

-			continue;

-		}

-		if (!is_array($val) && "$val" == "objectclass") {

-			continue;

-		}

+	foreach ($result as $key => $val)

+	{

+		if ("$key" == "objectclass") continue;

+		if ("$key" == "count") continue;

+		if ("$key" == "dn") continue;

+		if ("$val" == "objectclass") continue;

@@ -160 +161,2 @@
-		if (is_array($val)) {

+		if (is_array($val))

+		{

@@ -162 +164,2 @@
-			if (!is_numeric($key)) {

+			if (!is_numeric($key))

+			{

@@ -167,3 +170 @@
-				if (strtolower($key) == 'userpassword') {

-					$hide = 1;

-				}

+				if (strtolower($key) == 'userpassword') $hide = 1;

@@ -172 +173,3 @@
-		} elseif ($subcount) {

+		}

+		elseif ($subcount)

+		{

@@ -175,5 +178,2 @@
-			if ($hide) {

-				print preg_replace('/./i', '*', $newstring);

-			} else {

-				print $newstring;

-			}

+			if ($hide) print preg_replace('/./i', '*', $newstring);

+			else print $newstring;

@@ -182,3 +182 @@
-		if (!is_array($val) && "$val" != $lastkey[$level] && !$subcount) {

-			print '</td></tr>';

-		}

+		if ("$val" != $lastkey[$level] && !$subcount) print '</td></tr>';

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_loan.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_loan.lib.php
@@ -3,2 +3 @@
- * Copyright (C) 2015-2020	Frederic France     <frederic.france@netlogic.fr>

- * Copyright (C) 2020       Maxime DEMAREST     <maxime@indelog.fr>

+ * Copyright (C) 2015		Frederic France		<frederic.france@free.fr>

@@ -35 +34 @@
-	global $db, $langs, $conf;

+    global $db, $langs, $conf;

@@ -37,2 +36,2 @@
-	$tab = 0;

-	$head = array();

+    $tab = 0;

+    $head = array();

@@ -50,5 +49,5 @@
-	// Show more tabs from modules

-	// Entries must be declared in modules descriptor with line

-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname);   												to remove a tab

-	complete_head_from_modules($conf, $langs, $object, $head, $tab, 'loan', 'add', 'core');

+    // Show more tabs from modules

+    // Entries must be declared in modules descriptor with line

+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

+    // $this->tabs = array('entity:-tabname);   												to remove a tab

+    complete_head_from_modules($conf, $langs, $object, $head, $tab, 'loan');

@@ -57 +56 @@
-	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

+    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

@@ -60 +59 @@
-	$nbLinks = Link::count($db, $object->element, $object->id);

+    $nbLinks = Link::count($db, $object->element, $object->id);

@@ -63,3 +62 @@
-	if (($nbFiles + $nbLinks) > 0) {

-		$head[$tab][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

-	}

+	if (($nbFiles + $nbLinks) > 0) $head[$tab][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

@@ -69 +66,2 @@
-	if (!getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {

+	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))

+	{

@@ -73,3 +71 @@
-		if ($nbNote > 0) {

-			$head[$tab][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

-		}

+		if ($nbNote > 0) $head[$tab][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

@@ -80,4 +76,4 @@
-	$head[$tab][0] = DOL_URL_ROOT.'/loan/info.php?id='.$object->id;

-	$head[$tab][1] = $langs->trans("Info");

-	$head[$tab][2] = 'info';

-	$tab++;

+    $head[$tab][0] = DOL_URL_ROOT.'/loan/info.php?id='.$object->id;

+    $head[$tab][1] = $langs->trans("Info");

+    $head[$tab][2] = 'info';

+    $tab++;

@@ -85 +81 @@
-	complete_head_from_modules($conf, $langs, $object, $head, $tab, 'loan', 'add', 'external');

+    complete_head_from_modules($conf, $langs, $object, $head, $tab, 'loan', 'remove');

@@ -87,3 +83 @@
-	complete_head_from_modules($conf, $langs, $object, $head, $tab, 'loan', 'remove');

-

-	return $head;

+    return $head;

@@ -91,59 +84,0 @@
-

-/**

- * Calculate remaining loan mensuality and interests

- *

- * @param   float   $mens				Value of this mensuality (interests include, set 0 if we don't paid interests for this mensuality)

- * @param   float   $capital    		Remaining capital for this mensuality

- * @param   float   $rate				Loan rate

- * @param   int     $numactualloadterm	Actual loan term

- * @param   int   	$nbterm  			Total number of term for this loan

- * @return  array						Array with remaining capital, interest, and mensuality for each remaining terms

- */

-function loanCalcMonthlyPayment($mens, $capital, $rate, $numactualloadterm, $nbterm)

-{

-	global $conf, $db;

-	require_once DOL_DOCUMENT_ROOT.'/loan/class/loanschedule.class.php';

-	$object = new LoanSchedule($db);

-	$output = array();

-

-	// Sanitize data in case of

-	$mens = price2num($mens);

-	$capital = price2num($capital);

-	$rate = price2num($rate);

-	$numactualloadterm = ((int) $numactualloadterm);

-	$nbterm = ((int) $nbterm);

-

-	// If mensuality is 0 we don't pay interests and remaining capital not modified

-	if ($mens == 0) {

-		$int = 0;

-		$cap_rest = $capital;

-	} else {

-		$int = ($capital * ($rate / 12));

-		$int = round($int, 2, PHP_ROUND_HALF_UP);

-		$cap_rest = round($capital - ($mens - $int), 2, PHP_ROUND_HALF_UP);

-	}

-	$output[$numactualloadterm] = array('cap_rest'=>$cap_rest, 'cap_rest_str'=>price($cap_rest, 0, '', 1, -1, -1, $conf->currency), 'interet'=>$int, 'interet_str'=>price($int, 0, '', 1, -1, -1, $conf->currency), 'mens'=>$mens);

-

-	$numactualloadterm++;

-	$capital = $cap_rest;

-	while ($numactualloadterm <= $nbterm) {

-		$mens = round($object->calcMonthlyPayments($capital, $rate, $nbterm - $numactualloadterm + 1), 2, PHP_ROUND_HALF_UP);

-

-		$int = ($capital * ($rate / 12));

-		$int = round($int, 2, PHP_ROUND_HALF_UP);

-		$cap_rest = round($capital - ($mens - $int), 2, PHP_ROUND_HALF_UP);

-

-		$output[$numactualloadterm] = array(

-			'cap_rest' => $cap_rest,

-			'cap_rest_str' => price($cap_rest, 0, '', 1, -1, -1, $conf->currency),

-			'interet' => $int,

-			'interet_str' => price($int, 0, '', 1, -1, -1, $conf->currency),

-			'mens' => $mens,

-		);

-

-		$capital = $cap_rest;

-		$numactualloadterm++;

-	}

-

-	return $output;

-}

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_member.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_member.lib.php
@@ -23,2 +23,2 @@
- * \file       htdocs/core/lib/member.lib.php

- * \brief      Functions for module members

+ *	    \file       htdocs/core/lib/member.lib.php

+ *		\brief      Functions for module members

@@ -45,2 +45,3 @@
-	if ((!empty($conf->ldap->enabled) && getDolGlobalString('LDAP_MEMBER_ACTIVE'))

-		&& (!getDolGlobalString('MAIN_DISABLE_LDAP_TAB') || !empty($user->admin))) {

+	if ((!empty($conf->ldap->enabled) && !empty($conf->global->LDAP_MEMBER_ACTIVE))

+		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || !empty($user->admin)))

+	{

@@ -55,2 +56,3 @@
-	if ($user->hasRight('adherent', 'cotisation', 'lire')) {

-		$nbSubscription = is_array($object->subscriptions) ? count($object->subscriptions) : 0;

+	if (!empty($user->rights->adherent->cotisation->lire))

+	{

+		$nbSubscription = is_array($object->subscriptions) ?count($object->subscriptions) : 0;

@@ -60,47 +62,15 @@
-		if ($nbSubscription > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbSubscription.'</span>';

-		}

-		$h++;

-	}

-

-	if (getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR') == 'member') {

-		if ($user->hasRight('partnership', 'read')) {

-			$nbPartnership = is_array($object->partnerships) ? count($object->partnerships) : 0;

-			$head[$h][0] = DOL_URL_ROOT.'/partnership/partnership_list.php?rowid='.$object->id;

-			$head[$h][1] = $langs->trans("Partnerships");

-			$nbNote = 0;

-			$sql = "SELECT COUNT(n.rowid) as nb";

-			$sql .= " FROM ".MAIN_DB_PREFIX."partnership as n";

-			$sql .= " WHERE fk_member = ".((int) $object->id);

-			$resql = $db->query($sql);

-			if ($resql) {

-				$obj = $db->fetch_object($resql);

-				$nbNote = $obj->nb;

-			} else {

-				dol_print_error($db);

-			}

-			if ($nbNote > 0) {

-				$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

-			}

-			$head[$h][2] = 'partnerships';

-			if ($nbPartnership > 0) {

-				$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbPartnership.'</span>';

-			}

-			$h++;

-		}

-	}

-

-	// Show more tabs from modules

-	// Entries must be declared in modules descriptor with line

-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'member', 'add', 'core');

-

-	$nbNote = 0;

-	if (!empty($object->note_private)) {

-		$nbNote++;

-	}

-	if (!empty($object->note_public)) {

-		$nbNote++;

-	}

-	$head[$h][0] = DOL_URL_ROOT.'/adherents/note.php?id='.$object->id;

+		if ($nbSubscription > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbSubscription.'</span>';

+		$h++;

+	}

+

+    // Show more tabs from modules

+    // Entries must be declared in modules descriptor with line

+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

+    // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'member');

+

+    $nbNote = 0;

+    if (!empty($object->note)) $nbNote++;

+    if (!empty($object->note_private)) $nbNote++;

+    if (!empty($object->note_public)) $nbNote++;

+    $head[$h][0] = DOL_URL_ROOT.'/adherents/note.php?id='.$object->id;

@@ -109,18 +79,14 @@
-	if ($nbNote > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

-	}

-	$h++;

-

-	// Attachments

-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

-	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

-	$upload_dir = $conf->adherent->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, 'member');

-	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));

-	$nbLinks = Link::count($db, $object->element, $object->id);

-	$head[$h][0] = DOL_URL_ROOT.'/adherents/document.php?id='.$object->id;

-	$head[$h][1] = $langs->trans('Documents');

-	if (($nbFiles + $nbLinks) > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

-	}

-	$head[$h][2] = 'document';

-	$h++;

+    if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

+	$h++;

+

+    // Attachments

+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

+    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

+    $upload_dir = $conf->adherent->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, 'member');

+    $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));

+    $nbLinks = Link::count($db, $object->element, $object->id);

+    $head[$h][0] = DOL_URL_ROOT.'/adherents/document.php?id='.$object->id;

+    $head[$h][1] = $langs->trans('Documents');

+    if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

+    $head[$h][2] = 'document';

+    $h++;

@@ -129,34 +95,12 @@
-	$head[$h][0] = DOL_URL_ROOT.'/adherents/agenda.php?id='.$object->id;

-	$head[$h][1] = $langs->trans("Events");

-	if (isModEnabled('agenda')&& ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {

-		$nbEvent = 0;

-		// Enable caching of thirdparty count actioncomm

-		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';

-		$cachekey = 'count_events_member_'.$object->id;

-		$dataretrieved = dol_getcache($cachekey);

-		if (!is_null($dataretrieved)) {

-			$nbEvent = $dataretrieved;

-		} else {

-			$sql = "SELECT COUNT(id) as nb";

-			$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm";

-			$sql .= " WHERE elementtype = 'member' AND fk_element = ".((int) $object->id);

-			$resql = $db->query($sql);

-			if ($resql) {

-				$obj = $db->fetch_object($resql);

-				$nbEvent = $obj->nb;

-			} else {

-				dol_syslog('Failed to count actioncomm '.$db->lasterror(), LOG_ERR);

-			}

-			dol_setcache($cachekey, $nbEvent, 120);		// If setting cache fails, this is not a problem, so we do not test result.

-		}

-

-		$head[$h][1] .= '/';

-		$head[$h][1] .= $langs->trans("Agenda");

-		if ($nbEvent > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbEvent.'</span>';

-		}

-	}

-	$head[$h][2] = 'agenda';

-	$h++;

-

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'member', 'add', 'external');

+	if (!empty($conf->agenda->enabled))

+	{

+	    $head[$h][0] = DOL_URL_ROOT."/adherents/agenda.php?id=".$object->id;

+	    $head[$h][1] = $langs->trans("Events");

+	    if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))

+	    {

+	        $head[$h][1] .= '/';

+	        $head[$h][1] .= $langs->trans("Agenda");

+	    }

+	    $head[$h][2] = 'agenda';

+	    $h++;

+	}

@@ -188 +132,2 @@
-	if (getDolGlobalInt('MAIN_MULTILANGS')) {

+	if (!empty($conf->global->MAIN_MULTILANGS))

+	{

@@ -195,2 +140,3 @@
-	if ((!empty($conf->ldap->enabled) && getDolGlobalString('LDAP_MEMBER_TYPE_ACTIVE'))

-		&& (!getDolGlobalString('MAIN_DISABLE_LDAP_TAB') || !empty($user->admin))) {

+	if ((!empty($conf->ldap->enabled) && !empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE))

+		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || !empty($user->admin)))

+	{

@@ -205,5 +151,5 @@
-	// Show more tabs from modules

-	// Entries must be declared in modules descriptor with line

-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'membertype');

+    // Show more tabs from modules

+    // Entries must be declared in modules descriptor with line

+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

+    // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'membertype');

@@ -223,51 +169,39 @@
-	global $langs, $conf, $user, $db;

-

-	$extrafields = new ExtraFields($db);

-	$extrafields->fetch_name_optionals_label('adherent');

-	$extrafields->fetch_name_optionals_label('adherent_type');

-

-	$h = 0;

-	$head = array();

-

-	$head[$h][0] = DOL_URL_ROOT.'/adherents/admin/member.php';

-	$head[$h][1] = $langs->trans("Miscellaneous");

-	$head[$h][2] = 'general';

-	$h++;

-

-	$head[$h][0] = DOL_URL_ROOT.'/adherents/admin/member_emails.php';

-	$head[$h][1] = $langs->trans("EMails");

-	$head[$h][2] = 'emails';

-	$h++;

-

-	// Show more tabs from modules

-	// Entries must be declared in modules descriptor with line

-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab

-	complete_head_from_modules($conf, $langs, null, $head, $h, 'member_admin');

-

-	$head[$h][0] = DOL_URL_ROOT.'/adherents/admin/member_extrafields.php';

-	$head[$h][1] = $langs->trans("ExtraFieldsMember");

-	$nbExtrafields = $extrafields->attributes['adherent']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

-	$head[$h][2] = 'attributes';

-	$h++;

-

-	$head[$h][0] = DOL_URL_ROOT.'/adherents/admin/member_type_extrafields.php';

-	$head[$h][1] = $langs->trans("ExtraFieldsMemberType");

-	$nbExtrafields = $extrafields->attributes['adherent_type']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

-	$head[$h][2] = 'attributes_type';

-	$h++;

-

-	$head[$h][0] = DOL_URL_ROOT.'/adherents/admin/website.php';

-	$head[$h][1] = $langs->trans("BlankSubscriptionForm");

-	$head[$h][2] = 'website';

-	$h++;

-

-	complete_head_from_modules($conf, $langs, null, $head, $h, 'member_admin', 'remove');

-

-	return $head;

+    global $langs, $conf, $user;

+

+    $h = 0;

+    $head = array();

+

+    $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent.php';

+    $head[$h][1] = $langs->trans("Miscellaneous");

+    $head[$h][2] = 'general';

+    $h++;

+

+    $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent_emails.php';

+    $head[$h][1] = $langs->trans("EMails");

+    $head[$h][2] = 'emails';

+    $h++;

+

+    // Show more tabs from modules

+    // Entries must be declared in modules descriptor with line

+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

+    // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab

+    complete_head_from_modules($conf, $langs, '', $head, $h, 'member_admin');

+

+    $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent_extrafields.php';

+    $head[$h][1] = $langs->trans("ExtraFieldsMember");

+    $head[$h][2] = 'attributes';

+    $h++;

+

+    $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent_type_extrafields.php';

+    $head[$h][1] = $langs->trans("ExtraFieldsMemberType");

+    $head[$h][2] = 'attributes_type';

+    $h++;

+

+    $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/website.php';

+    $head[$h][1] = $langs->trans("BlankSubscriptionForm");

+    $head[$h][2] = 'website';

+    $h++;

+

+    complete_head_from_modules($conf, $langs, '', $head, $h, 'member_admin', 'remove');

+

+    return $head;

@@ -285,44 +219,44 @@
-	global $langs, $conf, $user;

-

-	$h = 0;

-	$head = array();

-

-	$head[$h][0] = DOL_URL_ROOT.'/adherents/stats/index.php';

-	$head[$h][1] = $langs->trans("Subscriptions");

-	$head[$h][2] = 'statssubscription';

-	$h++;

-

-	$head[$h][0] = DOL_URL_ROOT.'/adherents/stats/geo.php?mode=memberbycountry';

-	$head[$h][1] = $langs->trans("Country");

-	$head[$h][2] = 'statscountry';

-	$h++;

-

-	$head[$h][0] = DOL_URL_ROOT.'/adherents/stats/geo.php?mode=memberbyregion';

-	$head[$h][1] = $langs->trans("Region");

-	$head[$h][2] = 'statsregion';

-	$h++;

-

-	$head[$h][0] = DOL_URL_ROOT.'/adherents/stats/geo.php?mode=memberbystate';

-	$head[$h][1] = $langs->trans("State");

-	$head[$h][2] = 'statsstate';

-	$h++;

-

-	$head[$h][0] = DOL_URL_ROOT.'/adherents/stats/geo.php?mode=memberbytown';

-	$head[$h][1] = $langs->trans('Town');

-	$head[$h][2] = 'statstown';

-	$h++;

-

-	$head[$h][0] = DOL_URL_ROOT.'/adherents/stats/byproperties.php';

-	$head[$h][1] = $langs->trans('ByProperties');

-	$head[$h][2] = 'statsbyproperties';

-	$h++;

-

-	// Show more tabs from modules

-	// Entries must be declared in modules descriptor with line

-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname);   												to remove a tab

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'member_stats');

-

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'member_stats', 'remove');

-

-	return $head;

+    global $langs, $conf, $user;

+

+    $h = 0;

+    $head = array();

+

+    $head[$h][0] = DOL_URL_ROOT.'/adherents/stats/index.php';

+    $head[$h][1] = $langs->trans("Subscriptions");

+    $head[$h][2] = 'statssubscription';

+    $h++;

+

+    $head[$h][0] = DOL_URL_ROOT.'/adherents/stats/geo.php?mode=memberbycountry';

+    $head[$h][1] = $langs->trans("Country");

+    $head[$h][2] = 'statscountry';

+    $h++;

+

+    $head[$h][0] = DOL_URL_ROOT.'/adherents/stats/geo.php?mode=memberbyregion';

+    $head[$h][1] = $langs->trans("Region");

+    $head[$h][2] = 'statsregion';

+    $h++;

+

+    $head[$h][0] = DOL_URL_ROOT.'/adherents/stats/geo.php?mode=memberbystate';

+    $head[$h][1] = $langs->trans("State");

+    $head[$h][2] = 'statsstate';

+    $h++;

+

+    $head[$h][0] = DOL_URL_ROOT.'/adherents/stats/geo.php?mode=memberbytown';

+    $head[$h][1] = $langs->trans('Town');

+    $head[$h][2] = 'statstown';

+    $h++;

+

+    $head[$h][0] = DOL_URL_ROOT.'/adherents/stats/byproperties.php';

+    $head[$h][1] = $langs->trans('ByProperties');

+    $head[$h][2] = 'statsbyproperties';

+    $h++;

+

+    // Show more tabs from modules

+    // Entries must be declared in modules descriptor with line

+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

+    // $this->tabs = array('entity:-tabname);   												to remove a tab

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'member_stats');

+

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'member_stats', 'remove');

+

+    return $head;

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_memory.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_memory.lib.php
@@ -3 +2,0 @@
- * Copyright (C) 2021       Frédéric France     <frederic.france@netlogic.fr>

@@ -27,28 +26,5 @@
-$shmkeys = array(

-	'main' => 1,

-	'admin' => 2,

-	'dict' => 3,

-	'companies' => 4,

-	'suppliers' => 5,

-	'products' => 6,

-	'commercial' => 7,

-	'compta' => 8,

-	'projects' => 9,

-	'cashdesk' => 10,

-	'agenda' => 11,

-	'bills' => 12,

-	'propal' => 13,

-	'boxes' => 14,

-	'banks' => 15,

-	'other' => 16,

-	'errors' => 17,

-	'members' => 18,

-	'ecm' => 19,

-	'orders' => 20,

-	'users' => 21,

-	'help' => 22,

-	'stocks' => 23,

-	'interventions' => 24,

-	'donations' => 25,

-	'contracts' => 26,

-);

+$shmkeys = array('main'=>1, 'admin'=>2, 'dict'=>3, 'companies'=>4, 'suppliers'=>5, 'products'=>6,

+				'commercial'=>7, 'compta'=>8, 'projects'=>9, 'cashdesk'=>10, 'agenda'=>11, 'bills'=>12,

+				'propal'=>13, 'boxes'=>14, 'banks'=>15, 'other'=>16, 'errors'=>17, 'members'=>18, 'ecm'=>19,

+				'orders'=>20, 'users'=>21, 'help'=>22, 'stocks'=>23, 'interventions'=>24,

+				'donations'=>25, 'contracts'=>26);

@@ -60 +36 @@
- * 	Save data into a memory area shared by all users, all sessions on server. Note: MAIN_CACHE_COUNT must be set.

+ * 	Save data into a memory area shared by all users, all sessions on server

@@ -63,6 +39,4 @@
- * 	@param	mixed		$data			Data to save. It must not be a null value.

- *  @param 	int			$expire			ttl in seconds, 0 never expire

- * 	@return	int							Return integer <0 if KO, 0 if nothing is done, Nb of bytes written if OK

- *  @see dol_getcache()

- */

-function dol_setcache($memoryid, $data, $expire = 0)

+ * 	@param	string		$data			Data to save

+ * 	@return	int							<0 if KO, Nb of bytes written if OK

+ */

+function dol_setcache($memoryid, $data)

@@ -71 +44,0 @@
-

@@ -74,8 +47,27 @@
-	if (strpos($memoryid, 'count_') === 0) {	// The memoryid key start with 'count_...'

-		if (!getDolGlobalString('MAIN_CACHE_COUNT')) {

-			return 0;

-		}

-	}

-

-	if (isModEnabled('memcached') && class_exists('Memcached')) {

-		// Using a memcached server

+	// Using a memcached server

+	if (!empty($conf->memcached->enabled) && class_exists('Memcached'))

+	{

+	    global $dolmemcache;

+		if (empty($dolmemcache) || !is_object($dolmemcache))

+    	{

+       	    $dolmemcache = new Memcached();

+       		$tmparray = explode(':', $conf->global->MEMCACHED_SERVER);

+       		$result = $dolmemcache->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);

+       		if (!$result) return -1;

+       	}

+

+	    $memoryid = session_name().'_'.$memoryid;

+		//$dolmemcache->setOption(Memcached::OPT_COMPRESSION, false);

+		$dolmemcache->add($memoryid, $data); // This fails if key already exists

+		$rescode = $dolmemcache->getResultCode();

+		if ($rescode == 0)

+		{

+			return count($data);

+		}

+		else

+		{

+			return -$rescode;

+		}

+	}

+	elseif (!empty($conf->memcached->enabled) && class_exists('Memcache'))

+	{

@@ -83,10 +75,9 @@
-		if (empty($dolmemcache) || !is_object($dolmemcache)) {

-			$dolmemcache = new Memcached();

-			$tmparray = explode(':', getDolGlobalString('MEMCACHED_SERVER'));

-			$result = $dolmemcache->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);

-			if (!$result) {

-				return -1;

-			}

-		}

-

-		$memoryid = session_name().'_'.$memoryid;

+		if (empty($dolmemcache) || !is_object($dolmemcache))

+    	{

+       	    $dolmemcache = new Memcache();

+       		$tmparray = explode(':', $conf->global->MEMCACHED_SERVER);

+       		$result = $dolmemcache->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);

+       		if (!$result) return -1;

+       	}

+

+       	$memoryid = session_name().'_'.$memoryid;

@@ -94,25 +85,7 @@
-		$dolmemcache->add($memoryid, $data, $expire); // This fails if key already exists

-		$rescode = $dolmemcache->getResultCode();

-		if ($rescode == 0) {

-			return is_array($data) ? count($data) : (is_scalar($data) ? strlen($data) : 0);

-		} else {

-			return -$rescode;

-		}

-	} elseif (isModEnabled('memcached') && class_exists('Memcache')) {	// This is a really not reliable cache ! Use Memcached instead.

-		// Using a memcache server

-		global $dolmemcache;

-		if (empty($dolmemcache) || !is_object($dolmemcache)) {

-			$dolmemcache = new Memcache();

-			$tmparray = explode(':', getDolGlobalString('MEMCACHED_SERVER'));

-			$result = $dolmemcache->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);

-			if (!$result) {

-				return -1;

-			}

-		}

-

-		$memoryid = session_name().'_'.$memoryid;

-		//$dolmemcache->setOption(Memcached::OPT_COMPRESSION, false);

-		$result = $dolmemcache->add($memoryid, $data, false, $expire); // This fails if key already exists

-		if ($result) {

-			return is_array($data) ? count($data) : (is_scalar($data) ? strlen($data) : 0);

-		} else {

+		$result = $dolmemcache->add($memoryid, $data); // This fails if key already exists

+		if ($result)

+		{

+			return count($data);

+		}

+		else

+		{

@@ -121,7 +94,5 @@
-	} elseif (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02)) {	// This is a really not reliable cache ! Use Memcached instead.

-		// Using shmop

-		$result = dol_setshmop($memoryid, $data, $expire);

-	} else {

-		// No intersession cache system available, we use at least the perpage cache

-		$conf->cache['cachememory_'.$memoryid] = $data;

-		$result = is_array($data) ? count($data) : (is_scalar($data) ? strlen($data) : 0);

+	}

+	// Using shmop

+	elseif (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02))

+	{

+		$result = dol_setshmop($memoryid, $data);

@@ -137,2 +108 @@
- * 	@return	int|mixed				Return integer <0 if KO, data if OK, null if not found into cache or no caching feature enabled

- *  @see dol_setcache()

+ * 	@return	int						<0 if KO, data if OK

@@ -144,6 +113,0 @@
-	if (strpos($memoryid, 'count_') === 0) {	// The memoryid key start with 'count_...'

-		if (!getDolGlobalString('MAIN_CACHE_COUNT')) {

-			return null;

-		}

-	}

-

@@ -151 +115,2 @@
-	if (isModEnabled('memcached') && class_exists('Memcached')) {

+	if (!empty($conf->memcached->enabled) && class_exists('Memcached'))

+	{

@@ -153,8 +118,7 @@
-		if (empty($m) || !is_object($m)) {

-			$m = new Memcached();

-			$tmparray = explode(':', getDolGlobalString('MEMCACHED_SERVER'));

-			$result = $m->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);

-			if (!$result) {

-				return -1;

-			}

-		}

+		if (empty($m) || !is_object($m))

+    	{

+            $m = new Memcached();

+       		$tmparray = explode(':', $conf->global->MEMCACHED_SERVER);

+       		$result = $m->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);

+       		if (!$result) return -1;

+       	}

@@ -167 +131 @@
-		//print "memoryid=".$memoryid." - rescode=".$rescode." - count(response)=".count($data)."\n<br>";

+		//print "memoryid=".$memoryid." - rescode=".$rescode." - data=".count($data)."\n<br>";

@@ -169 +133,2 @@
-		if ($rescode == 0) {

+		if ($rescode == 0)

+		{

@@ -171,3 +136,3 @@
-		} elseif ($rescode == 16) {		// = Memcached::MEMCACHED_NOTFOUND but this constant doe snot exists.

-			return null;

-		} else {

+		}

+		else

+		{

@@ -176 +141,3 @@
-	} elseif (isModEnabled('memcached') && class_exists('Memcache')) {	// This is a really not reliable cache ! Use Memcached instead.

+	}

+	elseif (!empty($conf->memcached->enabled) && class_exists('Memcache'))

+	{

@@ -178,10 +145,9 @@
-		if (empty($m) || !is_object($m)) {

-			$m = new Memcache();

-			$tmparray = explode(':', getDolGlobalString('MEMCACHED_SERVER'));

-			$result = $m->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);

-			if (!$result) {

-				return -1;

-			}

-		}

-

-		$memoryid = session_name().'_'.$memoryid;

+		if (empty($m) || !is_object($m))

+    	{

+       	    $m = new Memcache();

+       		$tmparray = explode(':', $conf->global->MEMCACHED_SERVER);

+       		$result = $m->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);

+       		if (!$result) return -1;

+       	}

+

+       	$memoryid = session_name().'_'.$memoryid;

@@ -192 +158,2 @@
-		if ($data) {

+		if ($data)

+		{

@@ -194,5 +161,9 @@
-		} else {

-			return null; // There is no way to make a difference between NOTFOUND and error when using Memcache. So do not use it, use Memcached instead.

-		}

-	} elseif (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02)) {	// This is a really not reliable cache ! Use Memcached instead.

-		// Using shmop

+		}

+		else

+		{

+			return -1;

+		}

+	}

+	// Using shmop

+	elseif (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02))

+	{

@@ -201,8 +172,3 @@
-	} else {

-		// No intersession cache system available, we use at least the perpage cache

-		if (isset($conf->cache['cachememory_'.$memoryid])) {

-			return $conf->cache['cachememory_'.$memoryid];

-		}

-	}

-

-	return null;

+	}

+

+	return 0;

@@ -217 +183 @@
- * 	@return	int						Return integer <0 if KO, Memoy address of shared memory for key

+ * 	@return	int						<0 if KO, Memoy address of shared memory for key

@@ -222,3 +188 @@
-	if (empty($shmkeys[$memoryid])) {	// No room reserved for thid memoryid, no way to use cache

-		return 0;

-	}

+	if (empty($shmkeys[$memoryid])) return 0;

@@ -238 +202,2 @@
-	foreach ($shmkeys as $key => $val) {

+	foreach ($shmkeys as $key => $val)

+	{

@@ -240,3 +205 @@
-		if (!is_numeric($result) || $result > 0) {

-			$resarray[$key] = $result;

-		}

+		if (!is_numeric($result) || $result > 0) $resarray[$key] = $result;

@@ -251,5 +214,4 @@
- * 	@param	string	$data			Data to save. Must be a not null value.

- *  @param 	int		$expire			ttl in seconds, 0 never expire

- * 	@return	int						Return integer <0 if KO, 0=Caching not available, Nb of bytes written if OK

- */

-function dol_setshmop($memoryid, $data, $expire)

+ * 	@param	string	$data			Data to save

+ * 	@return	int						<0 if KO, Nb of bytes written if OK

+ */

+function dol_setshmop($memoryid, $data)

@@ -260,3 +222 @@
-	if (empty($shmkeys[$memoryid]) || !function_exists("shmop_write")) {

-		return 0;

-	}

+	if (empty($shmkeys[$memoryid]) || !function_exists("shmop_write")) return 0;

@@ -264,4 +223,0 @@
-	if (empty($shmkey)) {

-		return 0; // No key reserved for this memoryid, we can't cache this memoryid

-	}

-

@@ -272 +228,2 @@
-	if ($handle) {

+	if ($handle)

+	{

@@ -275,2 +232,3 @@
-		if ($shm_bytes_written1 + $shm_bytes_written2 != 6 + dol_strlen($newdata)) {

-			print "Couldn't write the entire length of data\n";

+		if (($shm_bytes_written1 + $shm_bytes_written2) != (6 + dol_strlen($newdata)))

+		{

+   			print "Couldn't write the entire length of data\n";

@@ -280 +238,3 @@
-	} else {

+	}

+	else

+	{

@@ -290 +250 @@
- * 	@return	int						Return integer <0 if KO, data if OK, Null if no cache enabled or not found

+ * 	@return	int						<0 if KO, data if OK

@@ -296,5 +256 @@
-	$data = null;

-

-	if (empty($shmkeys[$memoryid]) || !function_exists("shmop_open")) {

-		return null;

-	}

+	if (empty($shmkeys[$memoryid]) || !function_exists("shmop_open")) return 0;

@@ -302,4 +257,0 @@
-	if (empty($shmkey)) {

-		return null; // No key reserved for this memoryid, we can't cache this memoryid

-	}

-

@@ -308 +260,2 @@
-	if ($handle) {

+	if ($handle)

+	{

@@ -310,5 +263,2 @@
-		if ($size) {

-			$data = unserialize(shmop_read($handle, 6, $size));

-		} else {

-			return -1;

-		}

+		if ($size) $data = unserialize(shmop_read($handle, 6, $size));

+		else return -1;

@@ -316,2 +266,4 @@
-	} else {

-		return null; // Can't open existing block, so we suppose it was not created, so nothing were cached yet for the memoryid

+	}

+	else

+	{

+		return -2;

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_modulebuilder.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_modulebuilder.lib.php
@@ -20,2 +20,2 @@
- *  \file		htdocs/core/lib/modulebuilder.lib.php

- *  \brief		Set of function for modulebuilder management

+ *  \file		htdocs/core/lib/memory.lib.php

+ *  \brief		Set of function for memory/cache management

@@ -22,0 +23,2 @@
+

+

@@ -33 +35 @@
- *  @param	string		$addfieldentry	Array of 1 field entry to add array('key'=>,'type'=>,''label'=>,'visible'=>,'enabled'=>,'position'=>,'notnull'=>','index'=>,'searchall'=>,'comment'=>,'help'=>,'isameasure')

+ *  @param	string		$addfieldentry	Array of the field entry to add array('key'=>,'type'=>,''label'=>,'visible'=>,'enabled'=>,'position'=>,'notnull'=>','index'=>,'searchall'=>,'comment'=>,'help'=>,'isameasure')

@@ -35 +37 @@
- * 	@return	int|object					Return integer <=0 if KO, Object if OK

+ * 	@return	int|object					<=0 if KO, Object if OK

@@ -42,8 +44,5 @@
-	if (empty($objectname)) {

-		return -6;

-	}

-	if (empty($readdir)) {

-		$readdir = $destdir;

-	}

-

-	if (!empty($addfieldentry['arrayofkeyval']) && !is_array($addfieldentry['arrayofkeyval'])) {

+	if (empty($objectname)) return -1;

+	if (empty($readdir)) $readdir = $destdir;

+

+	if (!empty($addfieldentry['arrayofkeyval']) && !is_array($addfieldentry['arrayofkeyval']))

+	{

@@ -51,4 +50,2 @@
-		return -7;

-	}

-

-	$error = 0;

+		return -1;

+	}

@@ -57,2 +54,4 @@
-	if (is_array($addfieldentry) && count($addfieldentry) > 0) {

-		if (empty($addfieldentry['name'])) {

+	if (count($addfieldentry) > 0)

+	{

+		if (empty($addfieldentry['name']))

+		{

@@ -62 +61,2 @@
-		if (empty($addfieldentry['label'])) {

+		if (empty($addfieldentry['label']))

+		{

@@ -67,2 +67,3 @@
-			&& !preg_match('/^(boolean|smallint|real|date|datetime|timestamp|phone|mail|url|ip|password)$/', $addfieldentry['type'])) {

-			setEventMessages($langs->trans('BadValueForType', $addfieldentry['type']), null, 'errors');

+			&& !preg_match('/^(boolean|real|date|datetime|timestamp)$/', $addfieldentry['type']))

+		{

+			setEventMessages($langs->trans('BadValueForType', $objectname), null, 'errors');

@@ -75 +76,2 @@
-	if (!dol_is_file($pathoffiletoeditsrc)) {

+	if (!dol_is_file($pathoffiletoeditsrc))

+	{

@@ -84 +86,2 @@
-	try {

+	try

+	{

@@ -86,5 +89,2 @@
-		if (class_exists($objectname)) {

-			$object = new $objectname($db);

-		} else {

-			return -4;

-		}

+		if (class_exists($objectname)) $object = new $objectname($db);

+		else return -4;

@@ -98,3 +98,5 @@
-		// Update ->fields (to add or remove entries defined into $addfieldentry)

-		if (count($object->fields)) {

-			if (is_array($addfieldentry) && count($addfieldentry)) {

+		// Update ->fields (add or remove entries)

+		if (count($object->fields))

+		{

+			if (is_array($addfieldentry) && count($addfieldentry))

+			{

@@ -106 +108,2 @@
-			if (!empty($delfieldentry)) {

+			if (!empty($delfieldentry))

+			{

@@ -121,2 +124,4 @@
-		if (count($object->fields)) {

-			foreach ($object->fields as $key => $val) {

+		if (count($object->fields))

+		{

+			foreach ($object->fields as $key => $val)

+			{

@@ -124,54 +129,19 @@
-				$texttoinsert .= "\t\t".'"'.$key.'" => array(';

-				$texttoinsert .= '"type"=>"'.dol_escape_php($val['type']).'",';

-				$texttoinsert .= ' "label"=>"'.dol_escape_php($val['label']).'",';

-				if (!empty($val['picto'])) {

-					$texttoinsert .= ' "picto"=>"'.dol_escape_php($val['picto']).'",';

-				}

-				$texttoinsert .= ' "enabled"=>"'.($val['enabled'] !== '' ? dol_escape_php($val['enabled']) : 1).'",';

-				$texttoinsert .= " 'position'=>".($val['position'] !== '' ? (int) $val['position'] : 50).",";

-				$texttoinsert .= " 'notnull'=>".(empty($val['notnull']) ? 0 : (int) $val['notnull']).",";

-				$texttoinsert .= ' "visible"=>"'.($val['visible'] !== '' ? dol_escape_js($val['visible']) : -1).'",';

-				if (!empty($val['noteditable'])) {

-					$texttoinsert .= ' "noteditable"=>"'.dol_escape_php($val['noteditable']).'",';

-				}

-				if (!empty($val['alwayseditable'])) {

-					$texttoinsert .= ' "alwayseditable"=>"'.dol_escape_php($val['alwayseditable']).'",';

-				}

-				if (!empty($val['default']) || (isset($val['default']) && $val['default'] === '0')) {

-					$texttoinsert .= ' "default"=>"'.dol_escape_php($val['default']).'",';

-				}

-				if (!empty($val['index'])) {

-					$texttoinsert .= ' "index"=>"'.(int) $val['index'].'",';

-				}

-				if (!empty($val['foreignkey'])) {

-					$texttoinsert .= ' "foreignkey"=>"'.(int) $val['foreignkey'].'",';

-				}

-				if (!empty($val['searchall'])) {

-					$texttoinsert .= ' "searchall"=>"'.(int) $val['searchall'].'",';

-				}

-				if (!empty($val['isameasure'])) {

-					$texttoinsert .= ' "isameasure"=>"'.(int) $val['isameasure'].'",';

-				}

-				if (!empty($val['css'])) {

-					$texttoinsert .= ' "css"=>"'.dol_escape_php($val['css']).'",';

-				}

-				if (!empty($val['cssview'])) {

-					$texttoinsert .= ' "cssview"=>"'.dol_escape_php($val['cssview']).'",';

-				}

-				if (!empty($val['csslist'])) {

-					$texttoinsert .= ' "csslist"=>"'.dol_escape_php($val['csslist']).'",';

-				}

-				if (!empty($val['help'])) {

-					$texttoinsert .= ' "help"=>"'.dol_escape_php($val['help']).'",';

-				}

-				if (!empty($val['showoncombobox'])) {

-					$texttoinsert .= ' "showoncombobox"=>"'.(int) $val['showoncombobox'].'",';

-				}

-				if (!empty($val['disabled'])) {

-					$texttoinsert .= ' "disabled"=>"'.(int) $val['disabled'].'",';

-				}

-				if (!empty($val['autofocusoncreate'])) {

-					$texttoinsert .= ' "autofocusoncreate"=>"'.(int) $val['autofocusoncreate'].'",';

-				}

-				if (!empty($val['arrayofkeyval'])) {

-					$texttoinsert .= ' "arrayofkeyval"=>array(';

+				$texttoinsert .= "\t\t'".$key."' => array('type'=>'".$val['type']."', 'label'=>'".$val['label']."',";

+				$texttoinsert .= " 'enabled'=>'".($val['enabled'] !== '' ? $val['enabled'] : 1)."',";

+				$texttoinsert .= " 'position'=>".($val['position'] !== '' ? $val['position'] : 50).",";

+				$texttoinsert .= " 'notnull'=>".(empty($val['notnull']) ? 0 : $val['notnull']).",";

+				$texttoinsert .= " 'visible'=>".($val['visible'] !== '' ? $val['visible'] : -1).",";

+				if ($val['noteditable'])    $texttoinsert .= " 'noteditable'=>'".$val['noteditable']."',";

+				if ($val['default'] || $val['default'] === '0')        $texttoinsert .= " 'default'=>'".$val['default']."',";

+				if ($val['index'])          $texttoinsert .= " 'index'=>".$val['index'].",";

+				if ($val['foreignkey'])     $texttoinsert .= " 'foreignkey'=>'".$val['foreignkey']."',";

+				if ($val['searchall'])      $texttoinsert .= " 'searchall'=>".$val['searchall'].",";

+				if ($val['isameasure'])     $texttoinsert .= " 'isameasure'=>'".$val['isameasure']."',";

+				if ($val['css'])            $texttoinsert .= " 'css'=>'".$val['css']."',";

+				if ($val['help'])           $texttoinsert .= " 'help'=>\"".preg_replace('/"/', '', $val['help'])."\",";

+				if ($val['showoncombobox']) $texttoinsert .= " 'showoncombobox'=>'".$val['showoncombobox']."',";

+				if ($val['disabled'])       $texttoinsert .= " 'disabled'=>'".$val['disabled']."',";

+				if ($val['autofocusoncreate']) $texttoinsert .= " 'autofocusoncreate'=>'".$val['autofocusoncreate']."',";

+				if ($val['arrayofkeyval'])

+				{

+					$texttoinsert .= " 'arrayofkeyval'=>array(";

@@ -179,5 +149,4 @@
-					foreach ($val['arrayofkeyval'] as $key2 => $val2) {

-						if ($i) {

-							$texttoinsert .= ", ";

-						}

-						$texttoinsert .= '"'.dol_escape_php($key2).'" => "'.dol_escape_php($val2).'"';

+					foreach ($val['arrayofkeyval'] as $key2 => $val2)

+					{

+						if ($i) $texttoinsert .= ", ";

+						$texttoinsert .= "'".$key2."'=>'".$val2."'";

@@ -186 +155 @@
-					$texttoinsert .= '),';

+					$texttoinsert .= "),";

@@ -188,6 +157 @@
-				if (!empty($val['validate'])) {

-					$texttoinsert .= ' "validate"=>"'.(int) $val['validate'].'",';

-				}

-				if (!empty($val['comment'])) {

-					$texttoinsert .= ' "comment"=>"'.dol_escape_php($val['comment']).'"';

-				}

+				if ($val['comment'])        $texttoinsert .= " 'comment'=>\"".preg_replace('/"/', '', $val['comment'])."\"";

@@ -196 +159,0 @@
-				//print $texttoinsert;

@@ -203 +166,2 @@
-		if (count($object->fields)) {

+		if (count($object->fields))

+		{

@@ -206 +170,2 @@
-			foreach ($object->fields as $key => $val) {

+			foreach ($object->fields as $key => $val)

+			{

@@ -220 +185 @@
-		//print($texttoinsert);

+		//print($texttoinsert);exit;

@@ -223 +187,0 @@
-		//print $contentclass;

@@ -228,10 +192,7 @@
-		$result = file_put_contents(dol_osencode($pathoffiletoedittarget), $contentclass);

-

-		if ($result) {

-			dolChmod($pathoffiletoedittarget, $newmask);

-		} else {

-			$error++;

-		}

-

-		return $error ? -1 : $object;

-	} catch (Exception $e) {

+		file_put_contents(dol_osencode($pathoffiletoedittarget), $contentclass);

+		@chmod($pathoffiletoedittarget, octdec($newmask));

+

+		return $object;

+	}

+	catch (Exception $e)

+	{

@@ -251,3 +212,2 @@
- *  @param	Object		$object			If object was already loaded/known, it is pass to avoid another include and new.

- *  @param	string		$moduletype		'external' or 'internal'

- * 	@return	int							Return integer <=0 if KO, >0 if OK

+ *  @param	Object		$object			If object was already loaded/known, it is pass to avaoid another include and new.

+ * 	@return	int							<=0 if KO, >0 if OK

@@ -256 +216 @@
-function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '', $object = null, $moduletype = 'external')

+function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '', $object = null)

@@ -262,6 +222,2 @@
-	if (empty($objectname)) {

-		return -1;

-	}

-	if (empty($readdir)) {

-		$readdir = $destdir;

-	}

+	if (empty($objectname)) return -1;

+	if (empty($readdir)) $readdir = $destdir;

@@ -272,29 +228,4 @@
-	if ($moduletype == 'internal') {

-		$pathoffiletoeditsrc = '/../install/mysql/tables/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql';

-		if (! dol_is_file($readdir.$pathoffiletoeditsrc)) {

-			$pathoffiletoeditsrc = '/../install/mysql/tables/llx_'.strtolower($module).'_'.strtolower($objectname).'-'.strtolower($module).'.sql';

-			if (! dol_is_file($readdir.$pathoffiletoeditsrc)) {

-				$pathoffiletoeditsrc = '/../install/mysql/tables/llx_'.strtolower($module).'-'.strtolower($module).'.sql';

-				if (! dol_is_file($readdir.$pathoffiletoeditsrc)) {

-					$pathoffiletoeditsrc = '/../install/mysql/tables/llx_'.strtolower($module).'.sql';

-				}

-			}

-		}

-	} else {

-		$pathoffiletoeditsrc = '/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql';

-		if (! dol_is_file($readdir.$pathoffiletoeditsrc)) {

-			$pathoffiletoeditsrc = '/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'-'.strtolower($module).'.sql';

-			if (! dol_is_file($readdir.$pathoffiletoeditsrc)) {

-				$pathoffiletoeditsrc = '/sql/llx_'.strtolower($module).'-'.strtolower($module).'.sql';

-				if (! dol_is_file($readdir.$pathoffiletoeditsrc)) {

-					$pathoffiletoeditsrc = '/sql/llx_'.strtolower($module).'.sql';

-				}

-			}

-		}

-	}

-

-	// Complete path to be full path

-	$pathoffiletoedittarget = $destdir.$pathoffiletoeditsrc.($readdir != $destdir ? '.new' : '');

-	$pathoffiletoeditsrc = $readdir.$pathoffiletoeditsrc;

-

-	if (!dol_is_file($pathoffiletoeditsrc)) {

+	$pathoffiletoeditsrc = $readdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql';

+	$pathoffiletoedittarget = $destdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql'.($readdir != $destdir ? '.new' : '');

+	if (!dol_is_file($pathoffiletoeditsrc))

+	{

@@ -307,2 +238,4 @@
-	try {

-		if (!is_object($object)) {

+	try

+	{

+		if (!is_object($object))

+		{

@@ -310,7 +243,6 @@
-			if (class_exists($objectname)) {

-				$object = new $objectname($db);

-			} else {

-				return -1;

-			}

-		}

-	} catch (Exception $e) {

+			if (class_exists($objectname)) $object = new $objectname($db);

+			else return -1;

+		}

+	}

+	catch (Exception $e)

+	{

@@ -327,2 +259,4 @@
-	if (count($object->fields)) {

-		foreach ($object->fields as $key => $val) {

+	if (count($object->fields))

+	{

+		foreach ($object->fields as $key => $val)

+		{

@@ -334,14 +268,3 @@
-			if ($type == 'html') {

-				$type = 'text'; // html modulebuilder type is a text type in database

-			} elseif ($type == 'price') {

-				$type = 'double'; // html modulebuilder type is a text type in database

-			} elseif (in_array($type, array('link', 'sellist', 'duration'))) {

-				$type = 'integer';

-			} elseif ($type == 'mail') {

-				$type = 'varchar(128)';

-			} elseif ($type == 'phone') {

-				$type = 'varchar(20)';

-			} elseif ($type == 'ip') {

-				$type = 'varchar(32)';

-			}

-

+			if ($type == 'html') $type = 'text'; // html modulebuilder type is a text type in database

+			elseif ($type == 'price') $type = 'double'; // html modulebuilder type is a text type in database

+			elseif (in_array($type, array('link', 'sellist', 'duration'))) $type = 'integer';

@@ -349,16 +272,9 @@
-			if ($key == 'rowid') {

-				$texttoinsert .= ' AUTO_INCREMENT PRIMARY KEY';

-			} elseif ($type == 'timestamp') {

-				$texttoinsert .= ' DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP';

-			}

-			if ($key == 'entity') {

-				$texttoinsert .= ' DEFAULT 1';

-			} else {

-				if (!empty($val['default'])) {

-					if (preg_match('/^null$/i', $val['default'])) {

-						$texttoinsert .= " DEFAULT NULL";

-					} elseif (preg_match('/varchar/', $type)) {

-						$texttoinsert .= " DEFAULT '".$db->escape($val['default'])."'";

-					} else {

-						$texttoinsert .= (($val['default'] > 0) ? ' DEFAULT '.$val['default'] : '');

-					}

+			if ($key == 'rowid')  $texttoinsert .= ' AUTO_INCREMENT PRIMARY KEY';

+			if ($key == 'entity') $texttoinsert .= ' DEFAULT 1';

+			else

+			{

+				if ($val['default'] != '')

+				{

+					if (preg_match('/^null$/i', $val['default'])) $texttoinsert .= " DEFAULT NULL";

+					elseif (preg_match('/varchar/', $type)) $texttoinsert .= " DEFAULT '".$db->escape($val['default'])."'";

+					else $texttoinsert .= (($val['default'] > 0) ? ' DEFAULT '.$val['default'] : '');

@@ -367,4 +283,2 @@
-			$texttoinsert .= ((!empty($val['notnull']) && $val['notnull'] > 0) ? ' NOT NULL' : '');

-			if ($i < count($object->fields)) {

-				$texttoinsert .= ", ";

-			}

+			$texttoinsert .= (($val['notnull'] > 0) ? ' NOT NULL' : '');

+			if ($i < count($object->fields)) $texttoinsert .= ", ";

@@ -379,3 +293,6 @@
-	if ($result) {

-		dolChmod($pathoffiletoedittarget, $newmask);

-	} else {

+	if ($result)

+	{

+		@chmod($pathoffiletoedittarget, octdec($newmask));

+	}

+	else

+	{

@@ -383 +299,0 @@
-		setEventMessages($langs->trans("ErrorFailToCreateFile", $pathoffiletoedittarget), null, 'errors');

@@ -387,3 +303,2 @@
-	$pathoffiletoeditsrc = preg_replace('/\.sql$/', '.key.sql', $pathoffiletoeditsrc);

-	$pathoffiletoedittarget = preg_replace('/\.sql$/', '.key.sql', $pathoffiletoedittarget);

-	$pathoffiletoedittarget = preg_replace('/\.sql.new$/', '.key.sql.new', $pathoffiletoedittarget);

+	$pathoffiletoeditsrc = $destdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.key.sql';

+	$pathoffiletoedittarget = $destdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.key.sql'.($readdir != $destdir ? '.new' : '');

@@ -395,2 +310,4 @@
-	if (count($object->fields)) {

-		foreach ($object->fields as $key => $val) {

+	if (count($object->fields))

+	{

+		foreach ($object->fields as $key => $val)

+		{

@@ -398 +315,2 @@
-			if (!empty($val['index'])) {

+			if (!empty($val['index']))

+			{

@@ -402 +320,2 @@
-			if (!empty($val['foreignkey'])) {

+			if (!empty($val['foreignkey']))

+			{

@@ -404 +323,2 @@
-				if (!empty($tmp[0]) && !empty($tmp[1])) {

+				if (!empty($tmp[0]) && !empty($tmp[1]))

+				{

@@ -418,3 +338,6 @@
-	if ($result2) {

-		dolChmod($pathoffiletoedittarget, $newmask);

-	} else {

+	if ($result)

+	{

+		@chmod($pathoffiletoedittarget, octdec($newmask));

+	}

+	else

+	{

@@ -422 +344,0 @@
-		setEventMessages($langs->trans("ErrorFailToCreateFile", $pathoffiletoedittarget), null, 'errors');

@@ -427,935 +348,0 @@
-

-/**

- * Get list of existing objects from directory

- *

- * @param	string      $destdir		Directory

- * @return 	array|int                    Return integer <=0 if KO, array if OK

- */

-function dolGetListOfObjectClasses($destdir)

-{

-	$objects = array();

-	$listofobject = dol_dir_list($destdir.'/class', 'files', 0, '\.class\.php$');

-	foreach ($listofobject as $fileobj) {

-		if (preg_match('/^api_/', $fileobj['name'])) {

-			continue;

-		}

-		if (preg_match('/^actions_/', $fileobj['name'])) {

-			continue;

-		}

-

-		$tmpcontent = file_get_contents($fileobj['fullname']);

-		$reg = array();

-		if (preg_match('/class\s+([^\s]*)\s+extends\s+CommonObject/ims', $tmpcontent, $reg)) {

-			$objectnameloop = $reg[1];

-			$objects[$fileobj['fullname']] = $objectnameloop;

-		}

-	}

-	if (count($objects)>0) {

-		return $objects;

-	}

-

-	return -1;

-}

-/**

- * function for check if comment begin an end exist in modMyModule class

- * @param  string  $file    filename or path

- * @param  int     $number   0 = For Menus,1 = For permissions, 2 = For Dictionaries

- * @return int     1 if OK , -1 if KO

- */

-function checkExistComment($file, $number)

-{

-	if (!file_exists($file)) {

-		return -1;

-	}

-	$content = file_get_contents($file);

-	if ($number === 0) {

-		if (strpos($content, '/* BEGIN MODULEBUILDER LEFTMENU MYOBJECT */') !== false && strpos($content, '/* END MODULEBUILDER LEFTMENU MYOBJECT */') !== false) {

-			return 1;

-		}

-	} elseif ($number === 1) {

-		if (strpos($content, '/* BEGIN MODULEBUILDER PERMISSIONS */') !== false && strpos($content, '/* END MODULEBUILDER PERMISSIONS */') !== false) {

-			return 1;

-		}

-	} elseif ($number == 2) {

-		if (strpos($content, '/* BEGIN MODULEBUILDER DICTIONARIES */') !== false && strpos($content, '/* END MODULEBUILDER DICTIONARIES */') !== false) {

-			return 1;

-		}

-	}

-	return -1;

-}

-/**

- * Delete all permissions

- *

- * @param string         $file         file with path

- * @return void

- */

-function deletePerms($file)

-{

-	$start = "/* BEGIN MODULEBUILDER PERMISSIONS */";

-	$end = "/* END MODULEBUILDER PERMISSIONS */";

-	$i = 1;

-	$array = array();

-	$lines = file($file);

-	// Search for start and end lines

-	foreach ($lines as $i => $line) {

-		if (strpos($line, $start) !== false) {

-			$start_line = $i + 1;

-

-			// Copy lines until the end on array

-			while (($line = $lines[++$i]) !== false) {

-				if (strpos($line, $end) !== false) {

-					$end_line = $i + 1;

-					break;

-				}

-				$array[] = $line;

-			}

-			break;

-		}

-	}

-	$allContent = implode("", $array);

-	dolReplaceInFile($file, array($allContent => ''));

-}

-

-/**

- *  Compare two value

- * @param int|string  $a value 1

- * @param int|string  $b value 2

- * @return int      less 0 if str1 is less than str2; > 0 if str1 is greater than str2, and 0 if they are equal.

-*/

-function compareFirstValue($a, $b)

-{

-	return strcmp($a[0], $b[0]);

-}

-/**

- * Rewriting all permissions after any actions

- * @param string      $file            filename or path

- * @param array       $permissions     permissions existing in file

- * @param int|null    $key             key for permission needed

- * @param array|null  $right           $right to update or add

- * @param string|null $objectname      name of object

- * @param string|null $module          name of module

- * @param int         $action          0 for delete, 1 for add, 2 for update, -1 when delete object completly, -2 for generate rights after add

- * @return int                         1 if OK,-1 if KO

- */

-function reWriteAllPermissions($file, $permissions, $key, $right, $objectname, $module, $action)

-{

-	$error = 0;

-	$rights = array();

-	if ($action == 0) {

-		// delete right from permissions array

-		array_splice($permissions, array_search($permissions[$key], $permissions), 1);

-	} elseif ($action == 1) {

-		array_push($permissions, $right);

-	} elseif ($action == 2 && !empty($right)) {

-		// update right from permissions array

-		array_splice($permissions, array_search($permissions[$key], $permissions), 1, $right);

-	} elseif ($action == -1 && !empty($objectname)) {

-		// when delete object

-		$key = null;

-		$right = null;

-		foreach ($permissions as $perms) {

-			if ($perms[4] === strtolower($objectname)) {

-				array_splice($permissions, array_search($perms, $permissions), 1);

-			}

-		}

-	} elseif ($action == -2 && !empty($objectname) && !empty($module)) {

-		$key= null;

-		$right = null;

-		$objectOfRights = array();

-		//check if object already declared in rights file

-		foreach ($permissions as $right) {

-			$objectOfRights[]= $right[4];

-		}

-		if (in_array(strtolower($objectname), $objectOfRights)) {

-			$error++;

-		} else {

-			$permsToadd = array();

-			$perms = array(

-				'read' => 'Read '.$objectname.' object of '.ucfirst($module),

-				'write' => 'Create/Update '.$objectname.' object of '.ucfirst($module),

-				'delete' => 'Delete '.$objectname.' object of '.ucfirst($module)

-			);

-			$i = 0;

-			foreach ($perms as $index => $value) {

-				$permsToadd[$i][0] = '';

-				$permsToadd[$i][1] = $value;

-				$permsToadd[$i][4] = strtolower($objectname);

-				$permsToadd[$i][5] = $index;

-				array_push($permissions, $permsToadd[$i]);

-				$i++;

-			}

-		}

-	} else {

-		$error++;

-	}

-	if (!$error) {

-		// prepare permissions array

-		$count_perms = count($permissions);

-		for ($i = 0;$i<$count_perms;$i++) {

-			$permissions[$i][0] = "\$this->rights[\$r][0] = \$this->numero . sprintf('%02d', \$r + 1)";

-			$permissions[$i][1] = "\$this->rights[\$r][1] = '".$permissions[$i][1]."'";

-			$permissions[$i][4] = "\$this->rights[\$r][4] = '".$permissions[$i][4]."'";

-			$permissions[$i][5] = "\$this->rights[\$r][5] = '".$permissions[$i][5]."';\n\t\t";

-		}

-		// for group permissions by object

-		$perms_grouped = array();

-		foreach ($permissions as $perms) {

-			$object = $perms[4];

-			if (!isset($perms_grouped[$object])) {

-				$perms_grouped[$object] = [];

-			}

-			$perms_grouped[$object][] = $perms;

-		}

-		//$perms_grouped = array_values($perms_grouped);

-		$permissions = $perms_grouped;

-

-

-		// parcourir les objets

-		$o=0;

-		foreach ($permissions as &$object) {

-			// récupérer la permission de l'objet

-			$p = 1;

-			foreach ($object as &$obj) {

-				if (str_contains($obj[5], 'read')) {

-					$obj[0] = "\$this->rights[\$r][0] = \$this->numero . sprintf('%02d', (".$o." * 10) + 0 + 1)";

-				} elseif (str_contains($obj[5], 'write')) {

-					$obj[0] = "\$this->rights[\$r][0] = \$this->numero . sprintf('%02d', (".$o." * 10) + 1 + 1)";

-				} elseif (str_contains($obj[5], 'delete')) {

-					$obj[0] = "\$this->rights[\$r][0] = \$this->numero . sprintf('%02d', (".$o." * 10) + 2 + 1)";

-				} else {

-					$obj[0] = "\$this->rights[\$r][0] = \$this->numero . sprintf('%02d', (".$o." * 10) + ".$p." + 1)";

-					$p++;

-				}

-			}

-			usort($object, 'compareFirstValue');

-			$o++;

-		}

-

-		//convert to string

-		foreach ($permissions as $perms) {

-			foreach ($perms as $per) {

-				$rights[] = implode(";\n\t\t", $per);

-				$rights[] = "\$r++;\n\t\t";

-			}

-		}

-		$rights_str = implode("", $rights);

-		// delete all permission from file

-		deletePerms($file);

-		// rewrite all permission again

-		dolReplaceInFile($file, array('/* BEGIN MODULEBUILDER PERMISSIONS */' => '/* BEGIN MODULEBUILDER PERMISSIONS */'."\n\t\t".$rights_str));

-		return 1;

-	} else {

-		return -1;

-	}

-}

-

-/**

- * Converts a formatted properties string into an associative array.

- *

- * @param string $string The formatted properties string.

- * @return array The resulting associative array.

- */

-function parsePropertyString($string)

-{

-	$string = str_replace("'", '', $string);

-

-	// Uses a regular expression to capture keys and values

-	preg_match_all('/\s*([^\s=>]+)\s*=>\s*([^,]+),?/', $string, $matches, PREG_SET_ORDER);

-	$propertyArray = [];

-

-	foreach ($matches as $match) {

-		$key = trim($match[1]);

-		$value = trim($match[2]);

-

-		if (strpos($value, 'array(') === 0) {

-			$nestedArray = substr($value, 6);

-			$nestedArray = parsePropertyString($nestedArray);

-			$value = $nestedArray;

-		} elseif (strpos($value, '"Id")') !== false) {

-			$value = str_replace(')', '', $value);

-		} else {

-			if (is_numeric($value)) {

-				if (strpos($value, '.') !== false) {

-					$value = (float) $value;

-				} else {

-					$value = (int) $value;

-				}

-			} else {

-				if ($value === 'true') {

-					$value = true;

-				} elseif ($value === 'false') {

-					$value = false;

-				}

-			}

-		}

-		$propertyArray[$key] = $value;

-	}

-

-	return $propertyArray;

-}

-

-/**

- * Write all properties of the object in AsciiDoc format

- * @param  string   $file           path of the class

- * @param  string   $objectname     name of the objectClass

- * @param  string   $destfile       file where write table of properties

- * @return int                      1 if OK, -1 if KO

- */

-function writePropsInAsciiDoc($file, $objectname, $destfile)

-{

-

-	// stock all properties in array

-	$attributesUnique = array('type','label', 'enabled', 'position', 'notnull', 'visible', 'noteditable', 'index', 'default' , 'foreignkey', 'arrayofkeyval', 'alwayseditable','validate', 'searchall','comment', 'isameasure', 'css', 'cssview','csslist', 'help', 'showoncombobox','picto' );

-

-	$start = "public \$fields=array(";

-	$end = ");";

-	$i = 1;

-	$keys = array();

-	$lines = file($file);

-	// Search for start and end lines

-	foreach ($lines as $i => $line) {

-		if (strpos($line, $start) !== false) {

-			// Copy lines until the end on array

-			while (($line = $lines[++$i]) !== false) {

-				if (strpos($line, $end) !== false) {

-					break;

-				}

-				$keys[] = $line;

-			}

-			break;

-		}

-	}

-	// write the begin of table with specifics options

-	$table = "== DATA SPECIFICATIONS\n";

-	$table .= "=== Table of fields with properties for object *$objectname* : \n";

-	$table .= "[options='header',grid=rows,frame=topbot,width=100%,caption=Organisation]\n";

-	$table .= "|===\n";

-	$table .= "|code";

-	// write all properties in the header of the table

-	foreach ($attributesUnique as $attUnique) {

-		$table .= "|".$attUnique;

-	}

-	$table .="\n";

-	$valuesModif = array();

-	foreach ($keys as $string) {

-		$string = trim($string, "'");

-		$string = rtrim($string, ",");

-

-		$array = parsePropertyString($string);

-

-		// Iterate through the array to merge all key to one array

-		$code = '';

-		foreach ($array as $key => $value) {

-			if (is_array($value)) {

-				$code = $key;

-				continue;

-			} else {

-				$array[$code][$key] = $value;

-				unset($array[$key]);

-			}

-		}

-		// check if is array after parsing the string

-		if (!is_array($array)) {

-			return -1;

-		}

-		$field = array_keys($array);

-		if ($field[0] === '') {

-			$field[0] = 'label';

-		}

-		$values = array_values($array)[0];

-

-		// check each field has all properties and add it if missed

-		foreach ($attributesUnique as $attUnique) {

-			if ($attUnique == 'type' && $field[0] === 'label') {

-				$values[$attUnique] = 'varchar(255)';

-			}

-			if (!array_key_exists($attUnique, $values)) {

-				$valuesModif[$attUnique] = '';

-			} else {

-				$valuesModif[$attUnique] = $values[$attUnique];

-			}

-		}

-		$table .= "|*" . $field[0] . "*|";

-		$table .= implode("|", $valuesModif) . "\n";

-	}

-

-	// end table

-	$table .= "|===\n";

-	$table .= "__ end table for object $objectname\n";

-

-	//write in file

-	$writeInFile = dolReplaceInFile($destfile, array('== DATA SPECIFICATIONS' => $table));

-	if ($writeInFile<0) {

-		return -1;

-	}

-	return 1;

-}

-

-

-/**

- * Delete property and permissions from documentation ascii file if we delete an object

- *

- * @param  string  $file         file or path

- * @param  string  $objectname   name of object wants to deleted

- * @return void

- */

-function deletePropsAndPermsFromDoc($file, $objectname)

-{

-	if (dol_is_file($file)) {

-		$start = "== Table of fields and their properties for object *".ucfirst($objectname)."* : ";

-		$end = "__ end table for object ".ucfirst($objectname);

-

-		$str = file_get_contents($file);

-

-		$search = '/' . preg_quote($start, '/') . '(.*?)' . preg_quote($end, '/') . '/s';

-		$new_contents = preg_replace($search, '', $str);

-		file_put_contents($file, $new_contents);

-

-		//perms If Exist

-		$perms = "|*".strtolower($objectname)."*|";

-		$search_pattern_perms = '/' . preg_quote($perms, '/') . '.*?\n/';

-		$new_contents = preg_replace($search_pattern_perms, '', $new_contents);

-		file_put_contents($file, $new_contents);

-	}

-}

-

-

-

-/**

- * Search a string and return all lines needed from file

- * @param  string  $file    file for searching

- * @param  string  $start   start line if exist

- * @param  string  $end     end line if exist

- * @return string           return the content needed

- */

-function getFromFile($file, $start, $end)

-{

-	$i = 1;

-	$keys = array();

-	$lines = file($file);

-	// Search for start and end lines

-	foreach ($lines as $i => $line) {

-		if (strpos($line, $start) !== false) {

-			// Copy lines until the end on array

-			while (($line = $lines[++$i]) !== false) {

-				if (strpos($line, $end) !== false) {

-					break;

-				}

-				$keys[] = $line;

-			}

-			break;

-		}

-	}

-	$content = implode("", $keys);

-	return $content;

-}

-

-/**

- * Write all permissions of each object in AsciiDoc format

- * @param  string   $file           path of the class

- * @param  string   $destfile       file where write table of permissions

- * @return int                      1 if OK, -1 if KO

- */

-function writePermsInAsciiDoc($file, $destfile)

-{

-	global $langs;

-	//search and get all permssion in stirng

-	$start = '/* BEGIN MODULEBUILDER PERMISSIONS */';

-	$end = '/* END MODULEBUILDER PERMISSIONS */';

-	$content = getFromFile($file, $start, $end);

-	if (empty($content)) {

-		return -1;

-	}

-	//prepare table

-	$string = "[options='header',grid=rows,width=60%,caption=Organisation]\n";

-	$string .= "|===\n";

-	// header for table

-	$header = array($langs->trans('Objects'),$langs->trans('Permission'));

-	foreach ($header as $h) {

-		$string .= "|".$h;

-	}

-	$string .= "\n";

-	//content table

-	$array = explode(";", $content);

-	$permissions = array_filter($array);

-	// delete  occurrences "$r++" and ID

-	$permissions = str_replace('$r++', 1, $permissions);

-

-	$permsN = array();

-	foreach ($permissions as $i => $element) {

-		if ($element == 1) {

-			unset($permissions[$i]);

-		}

-		if (str_contains($element, '$this->numero')) {

-			unset($permissions[$i]);

-		}

-		if (str_contains($element, '$this->rights[$r][5]')) {

-			unset($permissions[$i]);

-		}

-	}

-	// cleaning the string on each element

-	foreach ($permissions as $key => $element) {

-		$element = str_replace(" '", '', $element);

-		$element = trim($element, "'");

-		$permsN[] = substr($element, strpos($element, "=")+1);

-	}

-	array_pop($permsN);

-

-	// Group permissions by Object and add it to string

-	$final_array = [];

-	$index = 0;

-	while ($index < count($permsN)) {

-		$temp_array = [$permsN[$index], $permsN[$index + 1]];

-		$final_array[] = $temp_array;

-		$index += 2;

-	}

-

-	$result = array();

-	foreach ($final_array as $subarray) {

-		// found object

-		$key = $subarray[1];

-		// add sub array to object

-		$result[$key][] = $subarray;

-	}

-	foreach ($result as $i => $pems) {

-		$string .= "|*".$i."*|";

-		foreach ($pems as $tab) {

-			$string .= $tab[0]." , ";

-		}

-		$string .= "\n";

-	}

-	// end table

-	$string .= "\n|===\n";

-	$write = dolReplaceInFile($destfile, array('__DATA_PERMISSIONS__'=> $string));

-	if ($write<0) {

-		return -1;

-	}

-	return 1;

-}

-

-/**

- * Add Object in ModuleApi File

- * @param  string $file           path of file

- * @param  array  $objects        array of objects in the module

- * @param  string $modulename     name of module

- * @return int                    1 if OK, -1 if KO

- */

-function addObjectsToApiFile($file, $objects, $modulename)

-{

-	if (!file_exists($file)) {

-		return -1;

-	}

-	$content = file($file);

-	$includeClass = "dol_include_once('/mymodule/class/myobject.class.php');";

-	$props = "public \$myobject;";

-	$varcomented = "@var MyObject \$myobject {@type MyObject}";

-	$constructObj = "\$this->myobject = new MyObject(\$this->db);";

-

-	// add properties and declare them in consturctor

-	foreach ($content as $lineNumber => &$lineContent) {

-		if (strpos($lineContent, $varcomented) !== false) {

-			$lineContent = '';

-			foreach ($objects as $object) {

-				$lineContent .= "\t * @var ".$object." \$".strtolower($object)." {@type ".$object."}". PHP_EOL;

-			}

-			//var_dump($lineContent);exit;

-		}

-		if (strpos($lineContent, $props) !== false) {

-			$lineContent = '';

-			foreach ($objects as $object) {

-				$lineContent .= "\tpublic \$".strtolower($object).";". PHP_EOL;

-			}

-		}

-		if (strpos($lineContent, $constructObj) !== false) {

-			$lineContent = '';

-			foreach ($objects as $object) {

-				$lineContent .= "\t\t\$this->".strtolower($object)." = new ".$object."(\$this->db);". PHP_EOL;

-			}

-		}

-		if (strpos($lineContent, $includeClass) !== false) {

-			$lineContent = '';

-			foreach ($objects as $object) {

-				$lineContent .= "dol_include_once('/".strtolower($modulename)."/class/".strtolower($object).".class.php');". PHP_EOL;

-			}

-		}

-	}

-	$allContent = implode("", $content);

-	file_put_contents($file, $allContent);

-

-	//add methods for each object

-	$allContent = getFromFile($file, '/*begin methods CRUD*/', '/*end methods CRUD*/');

-	foreach ($objects as $object) {

-		$contentReplaced =str_replace(["myobject","MyObject"], [strtolower($object),$object], $allContent);

-		dolReplaceInFile($file, array('/*end methods CRUD*/' => '/*CRUD FOR '.strtoupper($object).'*/'."\n".$contentReplaced."\n\t".'/*END CRUD FOR '.strtoupper($object).'*/'."\n\t".'/*end methods CRUD*/'));

-	}

-	dolReplaceInFile($file, array($allContent => '','MyModule' => ucfirst($modulename)));

-	return 1;

-}

-

-/**

- * Remove Object variables and methods from API_Module File

- * @param string   $file         file api module

- * @param string   $objectname   name of object whant to remove

- * @param string   $modulename   name of module

- * @return int                    1 if OK, -1 if KO

- */

-function removeObjectFromApiFile($file, $objectname, $modulename)

-{

-	$begin = '/*CRUD FOR '.strtoupper($objectname).'*/';

-	$end = '/*END CRUD FOR '.strtoupper($objectname).'*/';

-	$includeClass = "dol_include_once('/".strtolower($modulename)."/class/".strtolower($objectname).".class.php');";

-	$varcomentedDel = "\t * @var ".$objectname." \$".strtolower($objectname)." {@type ".$objectname."}";

-	$propsDel = "\tpublic \$".strtolower($objectname).";";

-	$constructObjDel = "\t\t\$this->".strtolower($objectname)." = new ".$objectname."(\$this->db);";

-

-	if (!file_exists($file)) {

-		return -1;

-	}

-	$content = file($file);

-	// for delete property and the initialization from the construct

-	foreach ($content as $lineNumber => &$lineContent) {

-		if (strpos($lineContent, $includeClass) !== false) {

-			$lineContent = '';

-		}

-		if (strpos($lineContent, $varcomentedDel) !== false) {

-			$lineContent = '';

-		}

-		if (strpos($lineContent, $propsDel) !== false) {

-			$lineContent = '';

-		}

-		if (strpos($lineContent, $constructObjDel) !== false) {

-			$lineContent = '';

-		}

-	}

-	$allContent = implode("", $content);

-	file_put_contents($file, $allContent);

-	// for delete methods of object

-	$allContent = getFromFile($file, $begin, $end);

-	$check = dolReplaceInFile($file, array($allContent => ''));

-	if ($check) {

-		dolReplaceInFile($file, array($begin => '', $end => ''));

-	}

-	return 1;

-}

-

-

-/**

- * @param    string         $file       path of filename

- * @param    mixed          $menus      all menus for module

- * @param    mixed|null     $menuWantTo  menu get for do actions

- * @param    int|null       $key        key for the concerned menu

- * @param    int            $action     for specify what action (0 = delete, 1 = add, 2 = update, -1 = when delete object)

- * @return   int            1 if OK, -1 if KO

- */

-function reWriteAllMenus($file, $menus, $menuWantTo, $key, $action)

-{

-	$errors =0;

-	$counter = 0;

-	if (!file_exists($file)) {

-		return -1;

-	}

-	if ($action == 0 && !empty($key)) {

-		// delete menu manuelly

-		array_splice($menus, array_search($menus[$key], $menus), 1);

-	} elseif ($action == 1) {

-		// add menu manualy

-		array_push($menus, $menuWantTo);

-	} elseif ($action == 2 && !empty($key) && !empty($menuWantTo)) {

-		// update right from permissions array

-		$urlCounter=0;

-		// check if the values already exists

-		foreach ($menus as $index => $menu) {

-			if ($index !== $key) {

-				if ($menu['type'] === $menuWantTo['type']) {

-					if (strcasecmp(str_replace(' ', '', $menu['titre']), str_replace(' ', '', $menuWantTo['titre'])) === 0) {

-						$counter++;

-					}

-					if (strcasecmp(str_replace(' ', '', $menu['url']), str_replace(' ', '', $menuWantTo['url'])) === 0) {

-						$urlCounter++;

-					}

-				}

-			}

-		}

-		if (!$counter && $urlCounter < 2) {

-			$menus[$key] = $menuWantTo;

-		} else {

-			$errors++;

-		}

-	} elseif ($action == -1 && !empty($menuWantTo)) {

-		// delete menus when delete Object

-		foreach ($menus as $index => $menu) {

-			if ((strpos(strtolower($menu['fk_menu']), strtolower($menuWantTo)) !== false) || (strpos(strtolower($menu['leftmenu']), strtolower($menuWantTo)) !== false)) {

-				array_splice($menus, array_search($menu, $menus), 1);

-			}

-		}

-	} else {

-		$errors++;

-	}

-	if (!$errors) {

-		// delete All LEFT Menus

-		$beginMenu = '/* BEGIN MODULEBUILDER LEFTMENU MYOBJECT */';

-		$endMenu = '/* END MODULEBUILDER LEFTMENU MYOBJECT */';

-		$allMenus = getFromFile($file, $beginMenu, $endMenu);

-		dolReplaceInFile($file, array($allMenus => ''));

-

-		//prepare each menu and stock them in string

-		$str_menu = "";

-		foreach ($menus as $index => $menu) {

-			$menu['position'] = "1000 + \$r";

-			if ($menu['type'] === 'left') {

-				$start = "\t\t".'/* LEFTMENU '.strtoupper($menu['titre']).' */';

-				$end   = "\t\t".'/* END LEFTMENU '.strtoupper($menu['titre']).' */';

-

-				$val_actuel = $menu;

-				$next_val = empty($menus[$index + 1]) ? null : $menus[$index + 1];

-				//var_dump(dol_escape_php($menu['perms'], 1)); exit;

-

-				$str_menu .= $start."\n";

-				$str_menu.= "\t\t\$this->menu[\$r++]=array(\n";

-				$str_menu.= "\t\t\t 'fk_menu' => '".dol_escape_php($menu['fk_menu'], 1)."',\n";

-				$str_menu.= "\t\t\t 'type' => '".dol_escape_php($menu['type'], 1)."',\n";

-				$str_menu.= "\t\t\t 'titre' => '".dol_escape_php($menu['titre'], 1)."',\n";

-				$str_menu.= "\t\t\t 'mainmenu' => '".dol_escape_php($menu['mainmenu'], 1)."',\n";

-				$str_menu.= "\t\t\t 'leftmenu' => '".dol_escape_php($menu['leftmenu'], 1)."',\n";

-				$str_menu.= "\t\t\t 'url' => '".dol_escape_php($menu['url'], 1)."',\n";

-				$str_menu.= "\t\t\t 'langs' => '".dol_escape_php($menu['langs'], 1)."',\n";

-				$str_menu.= "\t\t\t 'position' => ".((int) $menu['position']).",\n";

-				$str_menu.= "\t\t\t 'enabled' => '".dol_escape_php($menu['enabled'], 1)."',\n";

-				$str_menu.= "\t\t\t 'perms' => '".dol_escape_php($menu['perms'], 1)."',\n";

-				$str_menu.= "\t\t\t 'target' => '".dol_escape_php($menu['target'], 1)."',\n";

-				$str_menu.= "\t\t\t 'user' => ".((int) $menu['user']).",\n";

-				$str_menu.= "\t\t);\n";

-

-				if (is_null($next_val) || $val_actuel['leftmenu'] !== $next_val['leftmenu']) {

-					$str_menu .= $end."\n";

-				}

-			}

-		}

-

-		dolReplaceInFile($file, array($beginMenu => $beginMenu."\n".$str_menu."\n"));

-		return 1;

-	}

-	return -1;

-}

-

-/**

- * Updates a dictionary in a module descriptor file.

- *

- * @param string $module The name of the module.

- * @param string $file The path to the module descriptor file.

- * @param array $dicts The dictionary data to be updated.

- * @return int Returns the number of replacements made in the file.

- */

-function updateDictionaryInFile($module, $file, $dicts)

-{

-	$isEmpty = false;

-	$dicData = "\t\t\$this->dictionaries=array(\n";

-	$module = strtolower($module);

-	foreach ($dicts as $key => $value) {

-		if (empty($value)) {

-			$isEmpty = true;

-			$dicData = "\t\t\$this->dictionaries=array();";

-			break;

-		}

-

-		$dicData .= "\t\t\t'$key'=>";

-

-		if ($key === 'tabcond') {

-			$conditions = array_map(function ($val) use ($module) {

-				return ($val === true || $val === false) ? "isModEnabled('$module')" : $val;

-			}, $value);

-			$dicData .= "array(" . implode(",", $conditions) . ")";

-		} elseif ($key === 'tabhelp') {

-			$helpItems = array();

-			foreach ($value as $helpValue) {

-				$helpItems[] = "array('code'=>\$langs->trans('".$helpValue['code']."'), 'field2' => 'field2tooltip')";

-			}

-			$dicData .= "array(" . implode(",", $helpItems) . ")";

-		} else {

-			if (is_array($value)) {

-				$dicData .= "array(" . implode(",", array_map(function ($val) {

-					return "'$val'";

-				}, $value)) . ")";

-			} else {

-				$dicData .= "'$value'";

-			}

-		}

-		$dicData .= ",\n";

-	}

-	$dicData .= (!$isEmpty ? "\t\t);" : '');

-

-	$stringDic = getFromFile($file, '/* BEGIN MODULEBUILDER DICTIONARIES */', '/* END MODULEBUILDER DICTIONARIES */');

-	$writeInfile = dolReplaceInFile($file, array($stringDic => $dicData."\n"));

-

-	return $writeInfile;

-}

-

-/**

- * Creates a new dictionary table.

- *

- * for creating a new dictionary table in Dolibarr. It generates the necessary SQL code to define the table structure,

- * including columns such as 'rowid', 'code', 'label', 'position', 'use_default', 'active', etc. The table name is constructed based on the provided $namedic parameter.

- *

- * @param string $modulename The lowercase name of the module for which the dictionary table is being created.

- * @param string $file The file path to the Dolibarr module builder file where the dictionaries are defined.

- * @param string $namedic The name of the dictionary, which will also be used as the base for the table name.

- * @param array|null $dictionnaires An optional array containing pre-existing dictionary data, including 'tabname', 'tablib', 'tabsql', etc.

- * @return void

- */

-function createNewDictionnary($modulename, $file, $namedic, $dictionnaires = null)

-{

-	global $db, $langs;

-

-	if (empty($namedic)) {

-		setEventMessages($langs->trans("ErrorEmptyNameDic"), null, 'errors');

-		return;

-	}

-	if (!file_exists($file)) {

-		return -1;

-	}

-	$modulename = strtolower($modulename);

-

-	if (empty($dictionnaires)) {

-		$dictionnaires = array('langs' => '', 'tabname' => array(), 'tablib' => array(), 'tabsql' => array(), 'tabsqlsort' => array(), 'tabfield' => array(), 'tabfieldvalue' => array(), 'tabfieldinsert' => array(), 'tabrowid' => array(), 'tabcond' => array(), 'tabhelp' => array());

-	}

-

-	$columns = array(

-		'rowid' => array('type' => 'integer(11)'),

-		'code' => array('type' => 'varchar(255) NOT NULL'),

-		'label' => array('type' => 'varchar(255) NOT NULL'),

-		'position' => array('type' => 'integer(11) NULL'),

-		'use_default' => array('type' => 'varchar(255) DEFAULT 1'),

-		'active' => array('type' => 'integer')

-	);

-

-

-	$primaryKey = 'rowid';

-	foreach ($columns as $key => $value) {

-		if ($key === 'rowid') {

-			$primaryKey = 'rowid';

-			break;

-		}

-		if (!array_key_exists('rowid', $columns)) {

-			$primaryKey = array_key_first($columns);

-			break;

-		}

-	}

-	// check if tablename exist in Database and create it if not

-	$query = "SHOW TABLES LIKE '" . MAIN_DB_PREFIX.strtolower($namedic) . "'";

-	$checkTable = $db->query($query);

-	if ($checkTable && $db->num_rows($checkTable) > 0) {

-		setEventMessages($langs->trans("ErrorTableExist", $namedic), null, 'errors');

-		return;

-	} else {

-		$_results = $db->DDLCreateTable(MAIN_DB_PREFIX.strtolower($namedic), $columns, $primaryKey, "InnoDB");

-		if ($_results < 0) {

-			dol_print_error($db);

-			$langs->load("errors");

-			setEventMessages($langs->trans("ErrorTableNotFound", $namedic), null, 'errors');

-		}

-	}

-

-	// rewrite dictionnary if

-	$dictionnaires['langs'] = $modulename.'@'.$modulename;

-	$dictionnaires['tabname'][] = strtolower($namedic);

-	$dictionnaires['tablib'][] = ucfirst(substr($namedic, 2));

-	$dictionnaires['tabsql'][] = 'SELECT t.rowid as rowid, t.code, t.label, t.active FROM '.MAIN_DB_PREFIX.strtolower($namedic).' as t';

-	$dictionnaires['tabsqlsort'][] = (array_key_exists('label', $columns) ? 'label ASC' : '');

-	$dictionnaires['tabfield'][] = (array_key_exists('code', $columns) && array_key_exists('label', $columns) ? 'code,label' : '');

-	$dictionnaires['tabfieldvalue'][] = (array_key_exists('code', $columns) && array_key_exists('label', $columns) ? 'code,label' : '');

-	$dictionnaires['tabfieldinsert'][] = (array_key_exists('code', $columns) && array_key_exists('label', $columns) ? 'code,label' : '');

-	$dictionnaires['tabrowid'][] = $primaryKey;

-	$dictionnaires['tabcond'][] = isModEnabled('$modulename');

-	$dictionnaires['tabhelp'][] = (array_key_exists('code', $columns) ? array('code'=>$langs->trans('CodeTooltipHelp'), 'field2' => 'field2tooltip') : '');

-

-	// Build the dictionary string

-	$writeInfile = updateDictionaryInFile($modulename, $file, $dictionnaires);

-	if ($writeInfile > 0) {

-		setEventMessages($langs->trans("DictionariesCreated", ucfirst(substr($namedic, 2))), null);

-	}

-}

-

-/**

- * Generate Urls and add them to documentaion module

- *

- * @param string $file_api   filename or path of api

- * @param string $file_doc   filename or path of documentation

- * @return int               -1 if KO, 1 if OK, 0 if nothing change

- */

-function writeApiUrlsInDoc($file_api, $file_doc)

-{

-	$error = 0;

-	if (!dol_is_file($file_api) || !dol_is_file($file_doc)) {

-		$error++;

-	}

-	$string = getFromFile($file_api, '/*begin methods CRUD*/', '/*end methods CRUD*/');

-	$extractUrls = explode("\n", $string);

-

-	// extract urls from file

-	$urlValues = [];

-	foreach ($extractUrls as $key => $line) {

-		$lineWithoutTabsSpaces = preg_replace('/^[\t\s]+/', '', $line);

-		if (strpos($lineWithoutTabsSpaces, '* @url') === 0) {

-			$urlValue = trim(substr($lineWithoutTabsSpaces, strlen('* @url')));

-			$urlValues[] = $urlValue;

-		}

-	}

-

-	// get urls by object

-	$str = $_SERVER['HTTP_HOST'].'/api/index.php/';

-	$groupedUrls = [];

-	foreach ($urlValues as $url) {

-		if (preg_match('/(?:GET|POST|PUT|DELETE) (\w+)s/', $url, $matches)) {

-			$objectName = $matches[1];

-			$url = $str.trim(strstr($url, ' '));

-			$groupedUrls[$objectName][] = $url;

-		}

-	}

-	if (empty($groupedUrls)) {

-		$error++;

-	}

-

-	// buil format asciidoc for urls in table

-	if (!$error) {

-		$asciiDocTable = "[options=\"header\"]\n|===\n|Objet | URLs\n";

-		foreach ($groupedUrls as $objectName => $urls) {

-			$urlsList = implode(" +\n*", $urls);

-			$asciiDocTable .= "|$objectName | \n*$urlsList +\n";

-		}

-		$asciiDocTable .= "|===\n";

-		$file_write = dolReplaceInFile($file_doc, array('__API_DOC__' => '__API_DOC__'."\n".$asciiDocTable));

-		if ($file_write < 0) {

-			return -1;

-		}

-		return 1;

-	}

-	return -1;

-}

-

-

-/**

- * count directories or files in modulebuilder folder

- * @param  string $path  path of directory

- * @param  int    $type  type of file 1= file,2=directory

- * @return int|bool

- */

-function countItemsInDirectory($path, $type = 1)

-{

-	if (!is_dir($path)) {

-		return false;

-	}

-

-	$allFilesAndDirs = scandir($path);

-	$count = 0;

-

-	foreach ($allFilesAndDirs as $item) {

-		if ($item != '.' && $item != '..') {

-			if ($type == 1 && is_file($path . DIRECTORY_SEPARATOR . $item) && strpos($item, '.back') === false) {

-				$count++;

-			} elseif ($type == 2 && is_dir($path . DIRECTORY_SEPARATOR . $item)) {

-				$count++;

-			}

-		}

-	}

-	return $count;

-}

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_multicurrency.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_multicurrency.lib.php
@@ -33 +33 @@
-	global $langs, $conf;

+    global $langs, $conf;

@@ -35,2 +35,2 @@
-	$h = 0;

-	$head = array();

+    $h = 0;

+    $head = array();

@@ -38,4 +38,4 @@
-	$head[$h][0] = dol_buildpath("/admin/multicurrency.php", 1);

-	$head[$h][1] = $langs->trans("Parameters");

-	$head[$h][2] = 'settings';

-	$h++;

+    $head[$h][0] = dol_buildpath("/admin/multicurrency.php", 1);

+    $head[$h][1] = $langs->trans("Parameters");

+    $head[$h][2] = 'settings';

+    $h++;

@@ -43,4 +43 @@
-	$head[$h][0] = dol_buildpath("/multicurrency/multicurrency_rate.php", 1);

-	$head[$h][1] = $langs->trans("TabTitleMulticurrencyRate");

-	$head[$h][2] = 'ratelist';

-	$h++;

+    complete_head_from_modules($conf, $langs, null, $head, $h, 'multicurrency');

@@ -48,5 +45 @@
-	complete_head_from_modules($conf, $langs, null, $head, $h, 'multicurrency');

-

-	complete_head_from_modules($conf, $langs, null, $head, $h, 'multicurrency', 'remove');

-

-	return $head;

+    return $head;

@@ -68 +61,2 @@
-	foreach ($aCurrencies as $currency) {

+	foreach ($aCurrencies as $currency)

+	{

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_oauth.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_oauth.lib.php
@@ -25,0 +26,13 @@
+// Supported OAUTH (a provider is supported when a file xxx_oauthcallback.php is available into htdocs/core/modules/oauth)

+$supportedoauth2array = array(

+    'OAUTH_GOOGLE_NAME'=>'google',

+);

+if ($conf->global->MAIN_FEATURES_LEVEL >= 2)

+{

+	$supportedoauth2array['OAUTH_STRIPE_TEST_NAME'] = 'stripetest';

+	$supportedoauth2array['OAUTH_STRIPE_LIVE_NAME'] = 'stripelive';

+}

+$supportedoauth2array['OAUTH_GITHUB_NAME'] = 'github';

+

+

+

@@ -27,191 +40,183 @@
-

-/**

- * Return array of possible OAUTH2 services

- *

- * @return 	array				Array of services

- */

-function getAllOauth2Array()

-{

-	$list = array(

-	array(

-		'OAUTH_AMAZON_NAME',

-		'OAUTH_AMAZON_ID',

-		'OAUTH_AMAZON_SECRET',

-	),

-	array(

-		'OAUTH_BITBUCKET_NAME',

-		'OAUTH_BITBUCKET_ID',

-		'OAUTH_BITBUCKET_SECRET',

-	),

-	array(

-		'OAUTH_BITLY_NAME',

-		'OAUTH_BITLY_ID',

-		'OAUTH_BITLY_SECRET',

-	),

-	array(

-		'OAUTH_BITRIX24_NAME',

-		'OAUTH_BITRIX24_ID',

-		'OAUTH_BITRIX24_SECRET',

-	),

-	array(

-		'OAUTH_BOX_NAME',

-		'OAUTH_BOX_ID',

-		'OAUTH_BOX_SECRET',

-	),

-	array(

-		'OAUTH_BUFFER_NAME',

-		'OAUTH_BUFFER_ID',

-		'OAUTH_BUFFER_SECRET',

-	),

-	array(

-		'OAUTH_DAILYMOTION_NAME',

-		'OAUTH_DAILYMOTION_ID',

-		'OAUTH_DAILYMOTION_SECRET',

-	),

-	array(

-		'OAUTH_DEVIANTART_NAME',

-		'OAUTH_DEVIANTART_ID',

-		'OAUTH_DEVIANTART_SECRET',

-	),

-	array(

-		'OAUTH_DROPBOX_NAME',

-		'OAUTH_DROPBOX_ID',

-		'OAUTH_DROPBOX_SECRET',

-	),

-	array(

-		'OAUTH_ETSY_NAME',

-		'OAUTH_ETSY_ID',

-		'OAUTH_ETSY_SECRET',

-	),

-	array(

-		'OAUTH_EVEONLINE_NAME',

-		'OAUTH_EVEONLINE_ID',

-		'OAUTH_EVEONLINE_SECRET',

-	),

-	array(

-		'OAUTH_FACEBOOK_NAME',

-		'OAUTH_FACEBOOK_ID',

-		'OAUTH_FACEBOOK_SECRET',

-	),

-	array(

-		'OAUTH_FITBIT_NAME',

-		'OAUTH_FITBIT_ID',

-		'OAUTH_FITBIT_SECRET',

-	),

-	array(

-		'OAUTH_FIVEHUNDREDPX_NAME',

-		'OAUTH_FIVEHUNDREDPX_ID',

-		'OAUTH_FIVEHUNDREDPX_SECRET',

-	),

-	array(

-		'OAUTH_FLICKR_NAME',

-		'OAUTH_FLICKR_ID',

-		'OAUTH_FLICKR_SECRET',

-	),

-	array(

-		'OAUTH_FOURSQUARE_NAME',

-		'OAUTH_FOURSQUARE_ID',

-		'OAUTH_FOURSQUARE_SECRET',

-	),

-	array(

-		'OAUTH_GITHUB_NAME',

-		'OAUTH_GITHUB_ID',

-		'OAUTH_GITHUB_SECRET',

-		'OAUTH_GITHUB_DESC',

-	),

-	array(

-		'OAUTH_GOOGLE_NAME',

-		'OAUTH_GOOGLE_ID',

-		'OAUTH_GOOGLE_SECRET',

-		'OAUTH_GOOGLE_DESC',

-	),

-	array(

-		'OAUTH_HUBIC_NAME',

-		'OAUTH_HUBIC_ID',

-		'OAUTH_HUBIC_SECRET',

-	),

-	array(

-		'OAUTH_INSTAGRAM_NAME',

-		'OAUTH_INSTAGRAM_ID',

-		'OAUTH_INSTAGRAM_SECRET',

-	),

-	array(

-		'OAUTH_LINKEDIN_NAME',

-		'OAUTH_LINKEDIN_ID',

-		'OAUTH_LINKEDIN_SECRET',

-	),

-	array(

-		'OAUTH_MAILCHIMP_NAME',

-		'OAUTH_MAILCHIMP_ID',

-		'OAUTH_MAILCHIMP_SECRET',

-	),

-	array(

-		'OAUTH_MICROSOFT_NAME',

-		'OAUTH_MICROSOFT_ID',

-		'OAUTH_MICROSOFT_SECRET',

-	),

-	array(

-		'OAUTH_NEST_NAME',

-		'OAUTH_NEST_ID',

-		'OAUTH_NEST_SECRET',

-	),

-	array(

-		'OAUTH_NETATMO_NAME',

-		'OAUTH_NETATMO_ID',

-		'OAUTH_NETATMO_SECRET',

-	),

-	array(

-		'OAUTH_PARROTFLOWERPOWER_NAME',

-		'OAUTH_PARROTFLOWERPOWER_ID',

-		'OAUTH_PARROTFLOWERPOWER_SECRET',

-	),

-	array(

-		'OAUTH_PAYPAL_NAME',

-		'OAUTH_PAYPAL_ID',

-		'OAUTH_PAYPAL_SECRET',

-	),

-	array(

-		'OAUTH_POCKET_NAME',

-		'OAUTH_POCKET_ID',

-		'OAUTH_POCKET_SECRET',

-	),

-	array(

-		'OAUTH_QUICKBOOKS_NAME',

-		'OAUTH_QUICKBOOKS_ID',

-		'OAUTH_QUICKBOOKS_SECRET',

-	),

-	array(

-		'OAUTH_REDDIT_NAME',

-		'OAUTH_REDDIT_ID',

-		'OAUTH_REDDIT_SECRET',

-	),

-	array(

-		'OAUTH_REDMINE_NAME',

-		'OAUTH_REDMINE_ID',

-		'OAUTH_REDMINE_SECRET',

-	),

-	array(

-		'OAUTH_RUNKEEPER_NAME',

-		'OAUTH_RUNKEEPER_ID',

-		'OAUTH_RUNKEEPER_SECRET',

-	),

-	array(

-		'OAUTH_SCOOPIT_NAME',

-		'OAUTH_SCOOPIT_ID',

-		'OAUTH_SCOOPIT_SECRET',

-	),

-	array(

-		'OAUTH_SOUNDCLOUD_NAME',

-		'OAUTH_SOUNDCLOUD_ID',

-		'OAUTH_SOUNDCLOUD_SECRET',

-	),

-	array(

-		'OAUTH_SPOTIFY_NAME',

-		'OAUTH_SPOTIFY_ID',

-		'OAUTH_SPOTIFY_SECRET',

-	),

-	array(

-		'OAUTH_STRAVA_NAME',

-		'OAUTH_STRAVA_ID',

-		'OAUTH_STRAVA_SECRET',

-	),

+$list = array(

+    array(

+        'OAUTH_AMAZON_NAME',

+        'OAUTH_AMAZON_ID',

+        'OAUTH_AMAZON_SECRET',

+    ),

+    array(

+        'OAUTH_BITBUCKET_NAME',

+        'OAUTH_BITBUCKET_ID',

+        'OAUTH_BITBUCKET_SECRET',

+    ),

+    array(

+        'OAUTH_BITLY_NAME',

+        'OAUTH_BITLY_ID',

+        'OAUTH_BITLY_SECRET',

+    ),

+    array(

+        'OAUTH_BITRIX24_NAME',

+        'OAUTH_BITRIX24_ID',

+        'OAUTH_BITRIX24_SECRET',

+    ),

+    array(

+        'OAUTH_BOX_NAME',

+        'OAUTH_BOX_ID',

+        'OAUTH_BOX_SECRET',

+    ),

+    array(

+        'OAUTH_BUFFER_NAME',

+        'OAUTH_BUFFER_ID',

+        'OAUTH_BUFFER_SECRET',

+    ),

+    array(

+        'OAUTH_DAILYMOTION_NAME',

+        'OAUTH_DAILYMOTION_ID',

+        'OAUTH_DAILYMOTION_SECRET',

+    ),

+    array(

+        'OAUTH_DEVIANTART_NAME',

+        'OAUTH_DEVIANTART_ID',

+        'OAUTH_DEVIANTART_SECRET',

+    ),

+    array(

+        'OAUTH_DROPBOX_NAME',

+        'OAUTH_DROPBOX_ID',

+        'OAUTH_DROPBOX_SECRET',

+    ),

+    array(

+        'OAUTH_ETSY_NAME',

+        'OAUTH_ETSY_ID',

+        'OAUTH_ETSY_SECRET',

+    ),

+    array(

+        'OAUTH_EVEONLINE_NAME',

+        'OAUTH_EVEONLINE_ID',

+        'OAUTH_EVEONLINE_SECRET',

+    ),

+    array(

+        'OAUTH_FACEBOOK_NAME',

+        'OAUTH_FACEBOOK_ID',

+        'OAUTH_FACEBOOK_SECRET',

+    ),

+    array(

+        'OAUTH_FITBIT_NAME',

+        'OAUTH_FITBIT_ID',

+        'OAUTH_FITBIT_SECRET',

+    ),

+    array(

+        'OAUTH_FIVEHUNDREDPX_NAME',

+        'OAUTH_FIVEHUNDREDPX_ID',

+        'OAUTH_FIVEHUNDREDPX_SECRET',

+    ),

+    array(

+        'OAUTH_FLICKR_NAME',

+        'OAUTH_FLICKR_ID',

+        'OAUTH_FLICKR_SECRET',

+    ),

+    array(

+        'OAUTH_FOURSQUARE_NAME',

+        'OAUTH_FOURSQUARE_ID',

+        'OAUTH_FOURSQUARE_SECRET',

+    ),

+    array(

+        'OAUTH_GITHUB_NAME',

+        'OAUTH_GITHUB_ID',

+        'OAUTH_GITHUB_SECRET',

+        'OAUTH_GITHUB_DESC',

+    ),

+    array(

+        'OAUTH_GOOGLE_NAME',

+        'OAUTH_GOOGLE_ID',

+        'OAUTH_GOOGLE_SECRET',

+        'OAUTH_GOOGLE_DESC',

+    ),

+    array(

+        'OAUTH_HUBIC_NAME',

+        'OAUTH_HUBIC_ID',

+        'OAUTH_HUBIC_SECRET',

+    ),

+    array(

+        'OAUTH_INSTAGRAM_NAME',

+        'OAUTH_INSTAGRAM_ID',

+        'OAUTH_INSTAGRAM_SECRET',

+    ),

+    array(

+        'OAUTH_LINKEDIN_NAME',

+        'OAUTH_LINKEDIN_ID',

+        'OAUTH_LINKEDIN_SECRET',

+    ),

+    array(

+        'OAUTH_MAILCHIMP_NAME',

+        'OAUTH_MAILCHIMP_ID',

+        'OAUTH_MAILCHIMP_SECRET',

+    ),

+    array(

+        'OAUTH_MICROSOFT_NAME',

+        'OAUTH_MICROSOFT_ID',

+        'OAUTH_MICROSOFT_SECRET',

+    ),

+    array(

+        'OAUTH_NEST_NAME',

+        'OAUTH_NEST_ID',

+        'OAUTH_NEST_SECRET',

+    ),

+    array(

+        'OAUTH_NETATMO_NAME',

+        'OAUTH_NETATMO_ID',

+        'OAUTH_NETATMO_SECRET',

+    ),

+    array(

+        'OAUTH_PARROTFLOWERPOWER_NAME',

+        'OAUTH_PARROTFLOWERPOWER_ID',

+        'OAUTH_PARROTFLOWERPOWER_SECRET',

+    ),

+    array(

+        'OAUTH_PAYPAL_NAME',

+        'OAUTH_PAYPAL_ID',

+        'OAUTH_PAYPAL_SECRET',

+    ),

+    array(

+        'OAUTH_POCKET_NAME',

+        'OAUTH_POCKET_ID',

+        'OAUTH_POCKET_SECRET',

+    ),

+    array(

+        'OAUTH_QUICKBOOKS_NAME',

+        'OAUTH_QUICKBOOKS_ID',

+        'OAUTH_QUICKBOOKS_SECRET',

+    ),

+    array(

+        'OAUTH_REDDIT_NAME',

+        'OAUTH_REDDIT_ID',

+        'OAUTH_REDDIT_SECRET',

+    ),

+    array(

+        'OAUTH_REDMINE_NAME',

+        'OAUTH_REDMINE_ID',

+        'OAUTH_REDMINE_SECRET',

+    ),

+    array(

+        'OAUTH_RUNKEEPER_NAME',

+        'OAUTH_RUNKEEPER_ID',

+        'OAUTH_RUNKEEPER_SECRET',

+    ),

+    array(

+        'OAUTH_SCOOPIT_NAME',

+        'OAUTH_SCOOPIT_ID',

+        'OAUTH_SCOOPIT_SECRET',

+    ),

+    array(

+        'OAUTH_SOUNDCLOUD_NAME',

+        'OAUTH_SOUNDCLOUD_ID',

+        'OAUTH_SOUNDCLOUD_SECRET',

+    ),

+    array(

+        'OAUTH_SPOTIFY_NAME',

+        'OAUTH_SPOTIFY_ID',

+        'OAUTH_SPOTIFY_SECRET',

+    ),

+    array(

+        'OAUTH_STRAVA_NAME',

+        'OAUTH_STRAVA_ID',

+        'OAUTH_STRAVA_SECRET',

+    ),

@@ -229,113 +234,31 @@
-		'OAUTH_TUMBLR_NAME',

-		'OAUTH_TUMBLR_ID',

-		'OAUTH_TUMBLR_SECRET',

-	),

-	array(

-		'OAUTH_TWITTER_NAME',

-		'OAUTH_TWITTER_ID',

-		'OAUTH_TWITTER_SECRET',

-	),

-	array(

-		'OAUTH_USTREAM_NAME',

-		'OAUTH_USTREAM_ID',

-		'OAUTH_USTREAM_SECRET',

-	),

-	array(

-		'OAUTH_VIMEO_NAME',

-		'OAUTH_VIMEO_ID',

-		'OAUTH_VIMEO_SECRET',

-	),

-	array(

-		'OAUTH_YAHOO_NAME',

-		'OAUTH_YAHOO_ID',

-		'OAUTH_YAHOO_SECRET',

-	),

-	array(

-		'OAUTH_YAMMER_NAME',

-		'OAUTH_YAMMER_ID',

-		'OAUTH_YAMMER_SECRET',

-	),

-	array(

-		'OAUTH_OTHER_NAME',

-		'OAUTH_OTHER_ID',

-		'OAUTH_OTHER_SECRET',

-	)

-	);

-

-	return $list;

-}

-

-

-/**

- * Return array of tabs to used on pages to setup cron module.

- *

- * @return 	array				Array of tabs

- */

-function getSupportedOauth2Array()

-{

-	// Supported OAUTH (a provider is supported when a file xxx_oauthcallback.php is available into htdocs/core/modules/oauth)

-	$supportedoauth2array = array(

-		'OAUTH_GOOGLE_NAME' => array(

-			'callbackfile' => 'google',

-			'picto' => 'google',

-			'urlforapp' => 'OAUTH_GOOGLE_DESC',

-			'name' => 'Google',

-			'urlforcredentials' => 'https://console.developers.google.com/',

-			'availablescopes' => 'userinfo_email,userinfo_profile,openid,email,profile,cloud_print,admin_directory_user,gmail_full,contact,https://www.googleapis.com/auth/contacts,https://www.googleapis.com/auth/calendar',

-			'returnurl' => '/core/modules/oauth/google_oauthcallback.php'

-		),

-	);

-	if (isModEnabled('stripe')) {

-		$supportedoauth2array['OAUTH_STRIPE_TEST_NAME'] = array(

-			'callbackfile' => 'stripetest',

-			'picto' => 'stripe',

-			'urlforapp' => '',

-			'name' => 'StripeTest',

-			'urlforcredentials' => 'https://dashboard.stripe.com/settings/connect',

-			'availablescopes' => 'read_write',

-			'returnurl' => '/core/modules/oauth/stripetest_oauthcallback.php'

-		);

-		$supportedoauth2array['OAUTH_STRIPE_LIVE_NAME'] = array(

-			'callbackfile' => 'stripelive',

-			'picto' => 'stripe',

-			'urlforapp' => '',

-			'name' => 'StripeLive',

-			'urlforcredentials' => 'https://dashboard.stripe.com/settings/connect',

-			'availablescopes' => 'read_write',

-			'returnurl' => '/core/modules/oauth/stripelive_oauthcallback.php'

-		);

-	}

-	$supportedoauth2array['OAUTH_GITHUB_NAME'] = array(

-		'callbackfile' => 'github',

-		'picto' => 'github',

-		'urlforapp' => 'OAUTH_GITHUB_DESC',

-		'name' => 'GitHub',

-		'urlforcredentials' => 'https://github.com/settings/developers',

-		'availablescopes' => 'user,public_repo',

-		'returnurl' => '/core/modules/oauth/github_oauthcallback.php'

-	);

-	// See https://learn.microsoft.com/fr-fr/azure/active-directory/develop/quickstart-register-app#register-an-application

-	$supportedoauth2array['OAUTH_MICROSOFT_NAME'] = array(

-		'callbackfile' => 'microsoft',

-		'picto' => 'microsoft',

-		'urlforapp' => 'OAUTH_MICROSOFT_DESC',

-		'name' => 'Microsoft',

-		'urlforcredentials' => 'https://portal.azure.com/',

-		// User.Read is a microsoftgraph scope, if it's not working, do not select it

-		'availablescopes' => 'openid,offline_access,profile,email,User.Read,https://outlook.office365.com/IMAP.AccessAsUser.All,https://outlook.office365.com/SMTP.Send',

-		'returnurl' => '/core/modules/oauth/microsoft_oauthcallback.php'

-	);

-	if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {

-		$supportedoauth2array['OAUTH_OTHER_NAME'] = array(

-			'callbackfile' => 'generic',

-			'picto' => 'generic',

-			'urlforapp' => 'OAUTH_OTHER_DESC',

-			'name' => 'Other',

-			'urlforcredentials' => '',

-			'availablescopes' => 'Standard',

-			'returnurl' => '/core/modules/oauth/generic_oauthcallback.php'

-		);

-	}

-

-	return $supportedoauth2array;

-}

+        'OAUTH_TUMBLR_NAME',

+        'OAUTH_TUMBLR_ID',

+        'OAUTH_TUMBLR_SECRET',

+    ),

+    array(

+        'OAUTH_TWITTER_NAME',

+        'OAUTH_TWITTER_ID',

+        'OAUTH_TWITTER_SECRET',

+    ),

+    array(

+        'OAUTH_USTREAM_NAME',

+        'OAUTH_USTREAM_ID',

+        'OAUTH_USTREAM_SECRET',

+    ),

+    array(

+        'OAUTH_VIMEO_NAME',

+        'OAUTH_VIMEO_ID',

+        'OAUTH_VIMEO_SECRET',

+    ),

+    array(

+        'OAUTH_YAHOO_NAME',

+        'OAUTH_YAHOO_ID',

+        'OAUTH_YAHOO_SECRET',

+    ),

+    array(

+        'OAUTH_YAMMER_NAME',

+        'OAUTH_YAMMER_ID',

+        'OAUTH_YAMMER_SECRET',

+    ),

+);

+

@@ -351,20 +274,20 @@
-	global $langs, $conf;

-	$h = 0;

-	$head = array();

-

-	$head[$h][0] = dol_buildpath('/admin/oauth.php', 1);

-	$head[$h][1] = $langs->trans("OAuthServices");

-	$head[$h][2] = 'services';

-	$h++;

-

-	$head[$h][0] = dol_buildpath('/admin/oauthlogintokens.php', 1);

-	$head[$h][1] = $langs->trans("TokenManager");

-	$head[$h][2] = 'tokengeneration';

-	$h++;

-

-	complete_head_from_modules($conf, $langs, null, $head, $h, 'oauthadmin');

-

-	complete_head_from_modules($conf, $langs, null, $head, $h, 'oauthadmin', 'remove');

-

-

-	return $head;

+    global $langs, $conf;

+    $h = 0;

+    $head = array();

+

+    $head[$h][0] = dol_buildpath('/admin/oauth.php', 1);

+    $head[$h][1] = $langs->trans("OAuthServices");

+    $head[$h][2] = 'services';

+    $h++;

+

+    $head[$h][0] = dol_buildpath('/admin/oauthlogintokens.php', 1);

+    $head[$h][1] = $langs->trans("TokenManager");

+    $head[$h][2] = 'tokengeneration';

+    $h++;

+

+    complete_head_from_modules($conf, $langs, null, $head, $h, 'oauthadmin');

+

+    complete_head_from_modules($conf, $langs, null, $head, $h, 'oauthadmin', 'remove');

+

+

+    return $head;

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_order.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_order.lib.php
@@ -37,3 +37 @@
-	if (isModEnabled("expedition")) {

-		$langs->load("sendings");

-	}

+	if (!empty($conf->expedition->enabled)) $langs->load("sendings");

@@ -45 +43,2 @@
-	if (isModEnabled('commande') && $user->hasRight('commande', 'lire')) {

+	if (!empty($conf->commande->enabled) && $user->rights->commande->lire)

+	{

@@ -47 +46 @@
-		$head[$h][1] = $langs->trans("CustomerOrder");

+		$head[$h][1] = $langs->trans("OrderCard");

@@ -52,3 +51,4 @@
-	if (!getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB')) {

-		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));

-		$head[$h][0] = DOL_URL_ROOT.'/commande/contact.php?id='.$object->id;

+	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))

+	{

+	    $nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));

+	    $head[$h][0] = DOL_URL_ROOT.'/commande/contact.php?id='.$object->id;

@@ -56,3 +56 @@
-		if ($nbContact > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';

-		}

+		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';

@@ -63,4 +61,4 @@
-	if ((getDolGlobalInt('MAIN_SUBMODULE_EXPEDITION') && $user->hasRight('expedition', 'lire'))

-		|| (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY') && $user->hasRight('expedition', 'delivery', 'lire'))) {

-		$nbShipments = $object->getNbOfShipments();

-		$nbReceiption = 0;

+	if (($conf->expedition_bon->enabled && $user->rights->expedition->lire)

+	|| ($conf->livraison_bon->enabled && $user->rights->expedition->livraison->lire))

+	{

+		$nbShipments = $object->getNbOfShipments(); $nbReceiption = 0;

@@ -69,21 +67,7 @@
-		if (getDolGlobalInt('MAIN_SUBMODULE_EXPEDITION')) {

-			$text .= $langs->trans("Shipments");

-		}

-		if (getDolGlobalInt('MAIN_SUBMODULE_EXPEDITION') && getDolGlobalInt('MAIN_SUBMODULE_DELIVERY')) {

-			$text .= ' - ';

-		}

-		if (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY')) {

-			$text .= $langs->trans("Receivings");

-		}

-		if ($nbShipments > 0 || $nbReceiption > 0) {

-			$text .= '<span class="badge marginleftonlyshort">'.($nbShipments ? $nbShipments : 0);

-		}

-		if (getDolGlobalInt('MAIN_SUBMODULE_EXPEDITION') && getDolGlobalInt('MAIN_SUBMODULE_DELIVERY') && ($nbShipments > 0 || $nbReceiption > 0)) {

-			$text .= ' - ';

-		}

-		if (getDolGlobalInt('MAIN_SUBMODULE_EXPEDITION') && getDolGlobalInt('MAIN_SUBMODULE_DELIVERY') && ($nbShipments > 0 || $nbReceiption > 0)) {

-			$text .= ($nbReceiption ? $nbReceiption : 0);

-		}

-		if ($nbShipments > 0 || $nbReceiption > 0) {

-			$text .= '</span>';

-		}

+		if ($conf->expedition_bon->enabled) $text .= $langs->trans("Shipments");

+		if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled) $text .= '/';

+		if ($conf->livraison_bon->enabled)  $text .= $langs->trans("Receivings");

+		if ($nbShipments > 0 || $nbReceiption > 0) $text .= '<span class="badge marginleftonlyshort">'.($nbShipments ? $nbShipments : 0);

+		if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled && ($nbShipments > 0 || $nbReceiption > 0)) $text .= '/';

+		if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled && ($nbShipments > 0 || $nbReceiption > 0)) $text .= ($nbReceiption ? $nbReceiption : 0);

+		if ($nbShipments > 0 || $nbReceiption > 0) $text .= '</span>';

@@ -95,5 +79,5 @@
-	// Show more tabs from modules

-	// Entries must be declared in modules descriptor with line

-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname);   												to remove a tab

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'order', 'add', 'core');

+    // Show more tabs from modules

+    // Entries must be declared in modules descriptor with line

+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

+    // $this->tabs = array('entity:-tabname);   												to remove a tab

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'order');

@@ -101 +85,2 @@
-	if (!getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {

+	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))

+	{

@@ -103,6 +88,2 @@
-		if (!empty($object->note_private)) {

-			$nbNote++;

-		}

-		if (!empty($object->note_public)) {

-			$nbNote++;

-		}

+        if (!empty($object->note_private)) $nbNote++;

+		if (!empty($object->note_public)) $nbNote++;

@@ -111,3 +92 @@
-		if ($nbNote > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

-		}

+		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

@@ -119 +98 @@
-	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

+    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

@@ -122 +101 @@
-	$nbLinks = Link::count($db, $object->element, $object->id);

+    $nbLinks = Link::count($db, $object->element, $object->id);

@@ -125,3 +104 @@
-	if (($nbFiles + $nbLinks) > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

-	}

+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

@@ -131,33 +108,3 @@
-

-	$head[$h][0] = DOL_URL_ROOT.'/commande/agenda.php?id='.$object->id;

-	$head[$h][1] = $langs->trans("Events");

-	if (isModEnabled('agenda')&& ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {

-		$nbEvent = 0;

-		// Enable caching of thirdparty count actioncomm

-		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';

-		$cachekey = 'count_events_propal_'.$object->id;

-		$dataretrieved = dol_getcache($cachekey);

-		if (!is_null($dataretrieved)) {

-			$nbEvent = $dataretrieved;

-		} else {

-			$sql = "SELECT COUNT(id) as nb";

-			$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm";

-			$sql .= " WHERE fk_element = ".((int) $object->id);

-			$sql .= " AND elementtype = 'order'";

-			$resql = $db->query($sql);

-			if ($resql) {

-				$obj = $db->fetch_object($resql);

-				$nbEvent = $obj->nb;

-			} else {

-				dol_syslog('Failed to count actioncomm '.$db->lasterror(), LOG_ERR);

-			}

-			dol_setcache($cachekey, $nbEvent, 120);		// If setting cache fails, this is not a problem, so we do not test result.

-		}

-

-		$head[$h][1] .= '/';

-		$head[$h][1] .= $langs->trans("Agenda");

-		if ($nbEvent > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbEvent.'</span>';

-		}

-	}

-	$head[$h][2] = 'agenda';

+	$head[$h][0] = DOL_URL_ROOT.'/commande/info.php?id='.$object->id;

+	$head[$h][1] = $langs->trans("Info");

+	$head[$h][2] = 'info';

@@ -166 +113 @@
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'order', 'add', 'external');

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'order', 'remove');

@@ -168,3 +115 @@
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'order', 'remove');

-

-	return $head;

+    return $head;

@@ -180,5 +125 @@
-	global $langs, $conf, $user, $db;

-

-	$extrafields = new ExtraFields($db);

-	$extrafields->fetch_name_optionals_label('commande');

-	$extrafields->fetch_name_optionals_label('commandedet');

+	global $langs, $conf, $user;

@@ -198,4 +138,0 @@
-	$nbExtrafields = $extrafields->attributes['commande']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

@@ -207,4 +143,0 @@
-	$nbExtrafields = $extrafields->attributes['commandedet']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

@@ -218,127 +150,0 @@
-

-

-

-/**

- * Return a HTML table that contains a pie chart of sales orders

- *

- * @param	int		$socid		(Optional) Show only results from the customer with this id

- * @return	string				A HTML table that contains a pie chart of customer invoices

- */

-function getCustomerOrderPieChart($socid = 0)

-{

-	global $conf, $db, $langs, $user;

-

-	$result = '';

-

-	if (!isModEnabled('commande') || !$user->hasRight('commande', 'lire')) {

-		return '';

-	}

-

-	$commandestatic = new Commande($db);

-

-	/*

-	 * Statistics

-	 */

-

-	$sql = "SELECT count(c.rowid) as nb, c.fk_statut as status";

-	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";

-	$sql .= ", ".MAIN_DB_PREFIX."commande as c";

-	if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {

-		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

-	}

-	$sql .= " WHERE c.fk_soc = s.rowid";

-	$sql .= " AND c.entity IN (".getEntity($commandestatic->element).")";

-	if ($user->socid) {

-		$sql .= ' AND c.fk_soc = '.((int) $user->socid);

-	}

-	if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {

-		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);

-	}

-	$sql .= " GROUP BY c.fk_statut";

-

-	$resql = $db->query($sql);

-	if ($resql) {

-		$num = $db->num_rows($resql);

-		$i = 0;

-

-		$total = 0;

-		$totalinprocess = 0;

-		$dataseries = array();

-		$colorseries = array();

-		$vals = array();

-		// -1=Canceled, 0=Draft, 1=Validated, 2=Accepted/On process, 3=Closed (Sent/Received, billed or not)

-		while ($i < $num) {

-			$row = $db->fetch_row($resql);

-			if ($row) {

-				if (!isset($vals[$row[1]])) {

-					$vals[$row[1]] = 0;

-				}

-				$vals[$row[1]] += $row[0];

-				$totalinprocess += $row[0];

-				$total += $row[0];

-			}

-			$i++;

-		}

-		$db->free($resql);

-

-		global $badgeStatus0, $badgeStatus1, $badgeStatus4, $badgeStatus6, $badgeStatus9;

-		include DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';

-

-		$result = '<div class="div-table-responsive-no-min">';

-		$result .= '<table class="noborder nohover centpercent">';

-		$result .= '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("CustomersOrders").'</th></tr>'."\n";

-		$listofstatus = array(0, 1, 2, 3, -1);

-		foreach ($listofstatus as $status) {

-			$dataseries[] = array($commandestatic->LibStatut($status, 0, 1, 1), (isset($vals[$status]) ? (int) $vals[$status] : 0));

-			if ($status == Commande::STATUS_DRAFT) {

-				$colorseries[$status] = '-'.$badgeStatus0;

-			}

-			if ($status == Commande::STATUS_VALIDATED) {

-				$colorseries[$status] = $badgeStatus1;

-			}

-			if ($status == Commande::STATUS_SHIPMENTONPROCESS) {

-				$colorseries[$status] = $badgeStatus4;

-			}

-			if ($status == Commande::STATUS_CLOSED) {

-				$colorseries[$status] = $badgeStatus6;

-			}

-			if ($status == Commande::STATUS_CANCELED) {

-				$colorseries[$status] = $badgeStatus9;

-			}

-

-			if (empty($conf->use_javascript_ajax)) {

-				$result .= '<tr class="oddeven">';

-				$result .= '<td>'.$commandestatic->LibStatut($status, 0, 0, 1).'</td>';

-				$result .= '<td class="right"><a href="list.php?statut='.$status.'">'.(isset($vals[$status]) ? $vals[$status] : 0).' ';

-				$result .= $commandestatic->LibStatut($status, 0, 3, 1);

-				$result .= '</a></td>';

-				$result .= "</tr>\n";

-			}

-		}

-		if (!empty($conf->use_javascript_ajax)) {

-			$result .= '<tr class="impair"><td align="center" colspan="2">';

-

-			include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';

-			$dolgraph = new DolGraph();

-			$dolgraph->SetData($dataseries);

-			$dolgraph->SetDataColor(array_values($colorseries));

-			$dolgraph->setShowLegend(2);

-			$dolgraph->setShowPercent(1);

-			$dolgraph->SetType(array('pie'));

-			$dolgraph->setHeight('150');

-			$dolgraph->setWidth('300');

-			$dolgraph->draw('idgraphstatus');

-			$result .= $dolgraph->show($total ? 0 : 1);

-

-			$result .= '</td></tr>';

-		}

-

-		//if ($totalinprocess != $total)

-		$result .= '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">'.$total.'</td></tr>';

-		$result .= "</table></div><br>";

-	} else {

-		dol_print_error($db);

-	}

-

-	return $result;

-}

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_parsemd.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_parsemd.lib.php
@@ -2 +2 @@
-/* Copyright (C) 2008-2023	Laurent Destailleur			<eldy@users.sourceforge.net>

+/* Copyright (C) 2008-2013	Laurent Destailleur			<eldy@users.sourceforge.net>

@@ -21 +21 @@
- *	\brief			This file contains functions dedicated to MD parsing.

+ *	\brief			This file contains functions dedicated to MD parsind.

@@ -34,4 +34,19 @@
-	// Replace a HTML string with a Markdown syntax

-	$content = preg_replace('/<a href="([^"]+)">([^<]+)<\/a>/', '[\2](\1)', $content);

-	//$content = preg_replace('/<a href="([^"]+)" target="([^"]+)">([^<]+)<\/a>/', '[\3](\1){:target="\2"}', $content);

-	$content = preg_replace('/<a href="([^"]+)" target="([^"]+)">([^<]+)<\/a>/', '[\3](\1)', $content);

+    if (is_array($replaceimagepath))

+    {

+        foreach ($replaceimagepath as $key => $val)

+        {

+            $keytoreplace = ']('.$key;

+            $valafter = ']('.$val;

+            $content = preg_replace('/'.preg_quote($keytoreplace, '/').'/m', $valafter, $content);

+        }

+    }

+    if ($parser == 'parsedown')

+    {

+        include_once DOL_DOCUMENT_ROOT.'/includes/parsedown/Parsedown.php';

+        $Parsedown = new Parsedown();

+        $content = $Parsedown->text($content);

+    }

+    else

+    {

+        $content = nl2br($content);

+    }

@@ -39,20 +54 @@
-	// Replace HTML coments

-	$content = preg_replace('/<!--.*-->/Ums', '', $content);	// We remove HTML comment that are not MD comment because they will be escaped and output when setSafeMode is set to true.

-

-	if (is_array($replaceimagepath)) {

-		foreach ($replaceimagepath as $key => $val) {

-			$keytoreplace = ']('.$key;

-			$valafter = ']('.$val;

-			$content = preg_replace('/'.preg_quote($keytoreplace, '/').'/m', $valafter, $content);

-		}

-	}

-	if ($parser == 'parsedown') {

-		include_once DOL_DOCUMENT_ROOT.'/includes/parsedown/Parsedown.php';

-		$parsedown = new Parsedown();

-		$parsedown->setSafeMode(true);		// This will escape HTML link <a href=""> into html entities but markdown links are ok

-		$content = $parsedown->text($content);

-	} else {

-		$content = nl2br($content);

-	}

-

-	return $content;

+    return $content;

@@ -72,15 +68,17 @@
-	if (is_array($replaceimagepath)) {

-		foreach ($replaceimagepath as $key => $val) {

-			$keytoreplace = ']('.$key;

-			$valafter = ']('.$val;

-			$content = preg_replace('/'.preg_quote($keytoreplace, '/').'/m', $valafter, $content);

-		}

-	}

-	//if ($parser == 'dolibarr')

-	//{

-	$content = preg_replace('/<!--.*-->/msU', '', $content);

-	//}

-	//else

-	//{

-	//    $content = $content;

-	//}

+    if (is_array($replaceimagepath))

+    {

+        foreach ($replaceimagepath as $key => $val)

+        {

+            $keytoreplace = ']('.$key;

+            $valafter = ']('.$val;

+            $content = preg_replace('/'.preg_quote($keytoreplace, '/').'/m', $valafter, $content);

+        }

+    }

+    //if ($parser == 'dolibarr')

+    //{

+        $content = preg_replace('/<!--.*-->/msU', '', $content);

+    //}

+    //else

+    //{

+    //    $content = $content;

+    //}

@@ -88 +86 @@
-	return $content;

+    return $content;

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_payments.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_payments.lib.php
@@ -5,2 +4,0 @@
- * Copyright (C) 2020       Abbes Bahfir            <bafbes@gmail.com>

- * Copyright (C) 2021       Waël Almoman            <info@almoman.com>

@@ -31,0 +30 @@
+

@@ -42,5 +41,5 @@
-	// Show more tabs from modules

-	// Entries must be declared in modules descriptor with line

-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname);   												to remove a tab

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment');

+    // Show more tabs from modules

+    // Entries must be declared in modules descriptor with line

+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

+    // $this->tabs = array('entity:-tabname);   												to remove a tab

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment');

@@ -59,35 +57,0 @@
- * Returns an array with the tabs for the "Bannkline" section

- * It loads tabs from modules looking for the entity payment

- *

- * @param 	int		$id		ID of bank line

- * @return 	array 			Tabs for the Bankline section

- */

-function bankline_prepare_head($id)

-{

-	global $langs, $conf;

-

-	$h = 0;

-	$head = array();

-

-	$head[$h][0] = DOL_URL_ROOT.'/compta/bank/line.php?rowid='.$id;

-	$head[$h][1] = $langs->trans('BankTransaction');

-	$head[$h][2] = 'bankline';

-	$h++;

-

-	// Show more tabs from modules

-	// Entries must be declared in modules descriptor with line

-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname);   												to remove a tab

-	complete_head_from_modules($conf, $langs, null, $head, $h, 'bankline');

-

-	$head[$h][0] = DOL_URL_ROOT.'/compta/bank/info.php?rowid='.$id;

-	$head[$h][1] = $langs->trans("Info");

-	$head[$h][2] = 'info';

-	$h++;

-

-	complete_head_from_modules($conf, $langs, null, $head, $h, 'bankline', 'remove');

-

-	return $head;

-}

-

-/**

@@ -102 +66 @@
-	global $db, $langs, $conf;

+	global $langs, $conf;

@@ -112,5 +76,5 @@
-	// Show more tabs from modules

-	// Entries must be declared in modules descriptor with line

-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname);   												to remove a tab

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment_supplier');

+    // Show more tabs from modules

+    // Entries must be declared in modules descriptor with line

+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

+    // $this->tabs = array('entity:-tabname);   												to remove a tab

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment_supplier');

@@ -123,13 +86,0 @@
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

-	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

-	$upload_dir = $conf->fournisseur->payment->dir_output.'/'.$object->ref;

-	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));

-	$nbLinks = Link::count($db, $object->element, $object->id);

-	$head[$h][0] = DOL_URL_ROOT.'/fourn/paiement/document.php?id='.$object->id;

-	$head[$h][1] = $langs->trans('Documents');

-	if (($nbFiles + $nbLinks) > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

-	}

-	$head[$h][2] = 'documents';

-	$h++;

-

@@ -149 +100 @@
-	global $langs, $hookmanager, $action;

+	global $conf, $langs;

@@ -153 +104,2 @@
-	if ((empty($paymentmethod) || $paymentmethod == 'paypal') && isModEnabled('paypal')) {

+	if ((empty($paymentmethod) || $paymentmethod == 'paypal') && !empty($conf->paypal->enabled))

+	{

@@ -157 +109,2 @@
-	if ((empty($paymentmethod) || $paymentmethod == 'paybox') && isModEnabled('paybox')) {

+	if ((empty($paymentmethod) || $paymentmethod == 'paybox') && !empty($conf->paybox->enabled))

+	{

@@ -161 +114,2 @@
-	if ((empty($paymentmethod) || $paymentmethod == 'stripe') && isModEnabled('stripe')) {

+	if ((empty($paymentmethod) || $paymentmethod == 'stripe') && !empty($conf->stripe->enabled))

+	{

@@ -165,18 +119,2 @@
-

-	// This hook is used to complete the $validpaymentmethod array so an external payment modules

-	// can add its own key (ie 'payzen' for Payzen, ...)

-	$parameters = [

-		'paymentmethod' => $paymentmethod,

-		'validpaymentmethod' => &$validpaymentmethod

-	];

-	$tmpobject = new stdClass();

-	$reshook = $hookmanager->executeHooks('getValidPayment', $parameters, $tmpobject, $action);

-	if ($reshook < 0) {

-		setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

-	} elseif (!empty($hookmanager->resArray['validpaymentmethod'])) {

-		if ($reshook == 0) {

-			$validpaymentmethod = array_merge($validpaymentmethod, $hookmanager->resArray['validpaymentmethod']);

-		} else {

-			$validpaymentmethod = $hookmanager->resArray['validpaymentmethod'];

-		}

-	}

+	// TODO Add trigger

+

@@ -188,8 +126,7 @@
- * Return string with full online payment Url

- *

- * @param   string		$type		Type of URL ('free', 'order', 'invoice', 'contractline', 'member' ...)

- * @param	string		$ref		Ref of object

- * @param	int|float	$amount		Amount of money to request for

- * @return	string					Url string

- */

-function showOnlinePaymentUrl($type, $ref, $amount = 0)

+ * Return string with full Url

+ *

+ * @param   string	$type		Type of URL ('free', 'order', 'invoice', 'contractline', 'membersubscription' ...)

+ * @param	string	$ref		Ref of object

+ * @return	string				Url string

+ */

+function showOnlinePaymentUrl($type, $ref)

@@ -200,9 +137,7 @@
-	$langs->loadLangs(array('payment', 'stripe'));

-

-	$servicename = '';	// Link is a generic link for all payments services (paypal, stripe, ...)

-

-	$out = img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans("ToOfferALinkForOnlinePayment", $servicename).'</span><br>';

-	$url = getOnlinePaymentUrl(0, $type, $ref, $amount);

-	$out .= '<div class="urllink"><input type="text" id="onlinepaymenturl" class="quatrevingtpercentminusx" value="'.$url.'">';

-	$out .= '<a class="" href="'.$url.'" target="_blank" rel="noopener noreferrer">'.img_picto('', 'globe', 'class="paddingleft"').'</a>';

-	$out .= '</div>';

+    $langs->loadLangs(array('payment', 'stripe'));

+

+	$servicename = $langs->transnoentitiesnoconv('Online');

+

+	$out = img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePayment", $servicename).'<br>';

+	$url = getOnlinePaymentUrl(0, $type, $ref);

+	$out .= '<input type="text" id="onlinepaymenturl" class="quatrevingtpercent" value="'.$url.'">';

@@ -214,17 +148,0 @@
- * Return string with HTML link for online payment

- *

- * @param	string		$type		Type of URL ('free', 'order', 'invoice', 'contractline', 'member' ...)

- * @param	string		$ref		Ref of object

- * @param	string		$label		Text or HTML tag to display, if empty it display the URL

- * @param	int|float	$amount		Amount of money to request for

- * @return	string					Url string

- */

-function getHtmlOnlinePaymentLink($type, $ref, $label = '', $amount = 0)

-{

-	$url = getOnlinePaymentUrl(0, $type, $ref, $amount);

-	$label = $label ? $label : $url;

-	return '<a href="'.$url.'" target="_blank" rel="noopener noreferrer">'.$label.'</a>';

-}

-

-

-/**

@@ -233,11 +151,11 @@
- * @param   int			$mode		      0=True url, 1=Url formated with colors

- * @param   string		$type		      Type of URL ('free', 'order', 'invoice', 'contractline', 'member', 'boothlocation', ...)

- * @param	string		$ref		      Ref of object

- * @param	int|float	$amount		      Amount of money to request for

- * @param	string		$freetag	      Free tag (required and used for $type='free' only)

- * @param   string  	$localorexternal  0=Url for browser, 1=Url for external access

- * @return	string					      Url string

- */

-function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = 0, $freetag = 'your_tag', $localorexternal = 1)

-{

-	global $conf, $dolibarr_main_url_root;

+ * @param   int		$mode		      0=True url, 1=Url formated with colors

+ * @param   string	$type		      Type of URL ('free', 'order', 'invoice', 'contractline', 'membersubscription' ...)

+ * @param	string	$ref		      Ref of object

+ * @param	int		$amount		      Amount (required for $type='free' only)

+ * @param	string	$freetag	      Free tag

+ * @param   string  $localorexternal  0=Url for browser, 1=Url for external access

+ * @return	string				      Url string

+ */

+function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag = 'your_tag', $localorexternal = 0)

+{

+    global $conf, $dolibarr_main_url_root;

@@ -253,15 +171,10 @@
-	$urltouse = DOL_MAIN_URL_ROOT;						// Should be "https://www.mydomain.com/mydolibarr" for example

-	//dol_syslog("getOnlinePaymentUrl DOL_MAIN_URL_ROOT=".DOL_MAIN_URL_ROOT);

-

-	if ($localorexternal) {

-		$urltouse = $urlwithroot;

-	}

-

-	if ($type == 'free') {

-		$out = $urltouse.'/public/payment/newpayment.php?amount='.($mode ? '<span style="color: #666666">' : '').$amount.($mode ? '</span>' : '').'&tag='.($mode ? '<span style="color: #666666">' : '').$freetag.($mode ? '</span>' : '');

-		if (getDolGlobalString('PAYMENT_SECURITY_TOKEN')) {

-			if (!getDolGlobalString('PAYMENT_SECURITY_TOKEN_UNIQUE')) {

-				$out .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);

-			} else {

-				$out .= '&securekey='.urlencode(dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN'), 2));

-			}

+	$urltouse = DOL_MAIN_URL_ROOT;

+	if ($localorexternal) $urltouse = $urlwithroot;

+

+	if ($type == 'free')

+	{

+	    $out = $urltouse.'/public/payment/newpayment.php?amount='.($mode ? '<font color="#666666">' : '').$amount.($mode ? '</font>' : '').'&tag='.($mode ? '<font color="#666666">' : '').$freetag.($mode ? '</font>' : '');

+		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))

+		{

+			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;

+			else $out .= '&securekey='.dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);

@@ -270,139 +183,88 @@
-	} elseif ($type == 'order') {

-		$out = $urltouse.'/public/payment/newpayment.php?source='.$type.'&ref='.($mode ? '<span style="color: #666666">' : '');

-		if ($mode == 1) {

-			$out .= 'order_ref';

-		}

-		if ($mode == 0) {

-			$out .= urlencode($ref);

-		}

-		$out .= ($mode ? '</span>' : '');

-		if (getDolGlobalString('PAYMENT_SECURITY_TOKEN')) {

-			if (!getDolGlobalString('PAYMENT_SECURITY_TOKEN_UNIQUE')) {

-				$out .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);

-			} else {

-				$out .= '&securekey='.($mode ? '<span style="color: #666666">' : '');

-				if ($mode == 1) {

-					$out .= "hash('" . getDolGlobalString('PAYMENT_SECURITY_TOKEN')."' + '".$type."' + order_ref)";

-				}

-				if ($mode == 0) {

-					$out .= dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN') . $type.$ref, 2);

-				}

-				$out .= ($mode ? '</span>' : '');

-			}

-		}

-	} elseif ($type == 'invoice') {

-		$out = $urltouse.'/public/payment/newpayment.php?source='.$type.'&ref='.($mode ? '<span style="color: #666666">' : '');

-		if ($mode == 1) {

-			$out .= 'invoice_ref';

-		}

-		if ($mode == 0) {

-			$out .= urlencode($ref);

-		}

-		$out .= ($mode ? '</span>' : '');

-		if (getDolGlobalString('PAYMENT_SECURITY_TOKEN')) {

-			if (!getDolGlobalString('PAYMENT_SECURITY_TOKEN_UNIQUE')) {

-				$out .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);

-			} else {

-				$out .= '&securekey='.($mode ? '<span style="color: #666666">' : '');

-				if ($mode == 1) {

-					$out .= "hash('" . getDolGlobalString('PAYMENT_SECURITY_TOKEN')."' + '".$type."' + invoice_ref)";

-				}

-				if ($mode == 0) {

-					$out .= dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN') . $type.$ref, 2);

-				}

-				$out .= ($mode ? '</span>' : '');

-			}

-		}

-	} elseif ($type == 'contractline') {

-		$out = $urltouse.'/public/payment/newpayment.php?source='.$type.'&ref='.($mode ? '<span style="color: #666666">' : '');

-		if ($mode == 1) {

-			$out .= 'contractline_ref';

-		}

-		if ($mode == 0) {

-			$out .= urlencode($ref);

-		}

-		$out .= ($mode ? '</span>' : '');

-		if (getDolGlobalString('PAYMENT_SECURITY_TOKEN')) {

-			if (!getDolGlobalString('PAYMENT_SECURITY_TOKEN_UNIQUE')) {

-				$out .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);

-			} else {

-				$out .= '&securekey='.($mode ? '<span style="color: #666666">' : '');

-				if ($mode == 1) {

-					$out .= "hash('" . getDolGlobalString('PAYMENT_SECURITY_TOKEN')."' + '".$type."' + contractline_ref)";

-				}

-				if ($mode == 0) {

-					$out .= dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN') . $type.$ref, 2);

-				}

-				$out .= ($mode ? '</span>' : '');

-			}

-		}

-	} elseif ($type == 'member' || $type == 'membersubscription') {

-		$newtype = 'member';

-		$out = $urltouse.'/public/payment/newpayment.php?source=member';

-		$out .= '&amount='.$amount;

-		$out .= '&ref='.($mode ? '<span style="color: #666666">' : '');

-		if ($mode == 1) {

-			$out .= 'member_ref';

-		}

-		if ($mode == 0) {

-			$out .= urlencode($ref);

-		}

-		$out .= ($mode ? '</span>' : '');

-		if (getDolGlobalString('PAYMENT_SECURITY_TOKEN')) {

-			if (!getDolGlobalString('PAYMENT_SECURITY_TOKEN_UNIQUE')) {

-				$out .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);

-			} else {

-				$out .= '&securekey='.($mode ? '<span style="color: #666666">' : '');

-				if ($mode == 1) {

-					$out .= "hash('" . getDolGlobalString('PAYMENT_SECURITY_TOKEN')."' + '".$newtype."' + member_ref)";

-				}

-				if ($mode == 0) {

-					$out .= dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN') . $newtype.$ref, 2);

-				}

-				$out .= ($mode ? '</span>' : '');

-			}

-		}

-	} elseif ($type == 'donation') {

-		$out = $urltouse.'/public/payment/newpayment.php?source='.$type.'&ref='.($mode ? '<span style="color: #666666">' : '');

-		if ($mode == 1) {

-			$out .= 'donation_ref';

-		}

-		if ($mode == 0) {

-			$out .= urlencode($ref);

-		}

-		$out .= ($mode ? '</span>' : '');

-		if (getDolGlobalString('PAYMENT_SECURITY_TOKEN')) {

-			if (!getDolGlobalString('PAYMENT_SECURITY_TOKEN_UNIQUE')) {

-				$out .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);

-			} else {

-				$out .= '&securekey='.($mode ? '<span style="color: #666666">' : '');

-				if ($mode == 1) {

-					$out .= "hash('" . getDolGlobalString('PAYMENT_SECURITY_TOKEN')."' + '".$type."' + donation_ref)";

-				}

-				if ($mode == 0) {

-					$out .= dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN') . $type.$ref, 2);

-				}

-				$out .= ($mode ? '</span>' : '');

-			}

-		}

-	} elseif ($type == 'boothlocation') {

-		$out = $urltouse.'/public/payment/newpayment.php?source='.$type.'&ref='.($mode ? '<span style="color: #666666">' : '');

-		if ($mode == 1) {

-			$out .= 'invoice_ref';

-		}

-		if ($mode == 0) {

-			$out .= urlencode($ref);

-		}

-		$out .= ($mode ? '</span>' : '');

-		if (getDolGlobalString('PAYMENT_SECURITY_TOKEN')) {

-			if (!getDolGlobalString('PAYMENT_SECURITY_TOKEN_UNIQUE')) {

-				$out .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);

-			} else {

-				$out .= '&securekey='.($mode ? '<span style="color: #666666">' : '');

-				if ($mode == 1) {

-					$out .= "hash('" . getDolGlobalString('PAYMENT_SECURITY_TOKEN')."' + '".$type."' + invoice_ref)";

-				}

-				if ($mode == 0) {

-					$out .= dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN') . $type.$ref, 2);

-				}

-				$out .= ($mode ? '</span>' : '');

+	}

+	elseif ($type == 'order')

+	{

+	    $out = $urltouse.'/public/payment/newpayment.php?source=order&ref='.($mode ? '<font color="#666666">' : '');

+		if ($mode == 1) $out .= 'order_ref';

+		if ($mode == 0) $out .= urlencode($ref);

+		$out .= ($mode ? '</font>' : '');

+		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))

+		{

+			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;

+			else

+			{

+				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');

+				if ($mode == 1) $out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + order_ref)";

+				if ($mode == 0) $out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);

+				$out .= ($mode ? '</font>' : '');

+			}

+		}

+	}

+	elseif ($type == 'invoice')

+	{

+	    $out = $urltouse.'/public/payment/newpayment.php?source=invoice&ref='.($mode ? '<font color="#666666">' : '');

+		if ($mode == 1) $out .= 'invoice_ref';

+		if ($mode == 0) $out .= urlencode($ref);

+		$out .= ($mode ? '</font>' : '');

+		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))

+		{

+			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;

+			else

+			{

+				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');

+				if ($mode == 1) $out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + invoice_ref)";

+				if ($mode == 0) $out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);

+				$out .= ($mode ? '</font>' : '');

+			}

+		}

+	}

+	elseif ($type == 'contractline')

+	{

+	    $out = $urltouse.'/public/payment/newpayment.php?source=contractline&ref='.($mode ? '<font color="#666666">' : '');

+		if ($mode == 1) $out .= 'contractline_ref';

+		if ($mode == 0) $out .= urlencode($ref);

+		$out .= ($mode ? '</font>' : '');

+		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))

+		{

+			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;

+			else

+			{

+				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');

+				if ($mode == 1) $out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + contractline_ref)";

+				if ($mode == 0) $out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);

+				$out .= ($mode ? '</font>' : '');

+			}

+		}

+	}

+	elseif ($type == 'member' || $type == 'membersubscription')

+	{

+	    $out = $urltouse.'/public/payment/newpayment.php?source=membersubscription&ref='.($mode ? '<font color="#666666">' : '');

+		if ($mode == 1) $out .= 'member_ref';

+		if ($mode == 0) $out .= urlencode($ref);

+		$out .= ($mode ? '</font>' : '');

+		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))

+		{

+			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;

+			else

+			{

+				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');

+				if ($mode == 1) $out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + member_ref)";

+				if ($mode == 0) $out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);

+				$out .= ($mode ? '</font>' : '');

+			}

+		}

+	}

+	if ($type == 'donation')

+	{

+	    $out = $urltouse.'/public/payment/newpayment.php?source=donation&ref='.($mode ? '<font color="#666666">' : '');

+		if ($mode == 1) $out .= 'donation_ref';

+		if ($mode == 0) $out .= urlencode($ref);

+		$out .= ($mode ? '</font>' : '');

+		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))

+		{

+			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;

+			else

+			{

+				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');

+				if ($mode == 1) $out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + donation_ref)";

+				if ($mode == 0) $out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);

+				$out .= ($mode ? '</font>' : '');

@@ -414,3 +276 @@
-	if (!empty($out) && isModEnabled('multicompany')) {

-		$out .= "&entity=".$conf->entity; // Check the entity because we may have the same reference in several entities

-	}

+	if (!empty($out) && !empty($conf->multicompany->enabled)) $out .= "&entity=".$conf->entity; // Check the entity because we may have the same reference in several entities

@@ -419,0 +280,94 @@
+

+

+

+/**

+ * Show footer of company in HTML pages

+ *

+ * @param   Societe		$fromcompany	Third party

+ * @param   Translate	$langs			Output language

+ * @param	int			$addformmessage	Add the payment form message

+ * @param	string		$suffix			Suffix to use on constants

+ * @param	Object		$object			Object related to payment

+ * @return	void

+ */

+function htmlPrintOnlinePaymentFooter($fromcompany, $langs, $addformmessage = 0, $suffix = '', $object = null)

+{

+    global $conf;

+

+    // Juridical status

+    $line1 = "";

+    if ($fromcompany->forme_juridique_code)

+    {

+        $line1 .= ($line1 ? " - " : "").getFormeJuridiqueLabel($fromcompany->forme_juridique_code);

+    }

+    // Capital

+    if ($fromcompany->capital)

+    {

+        $line1 .= ($line1 ? " - " : "").$langs->transnoentities("CapitalOf", $fromcompany->capital)." ".$langs->transnoentities("Currency".$conf->currency);

+    }

+    // Prof Id 1

+    if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || !$fromcompany->idprof2))

+    {

+        $field = $langs->transcountrynoentities("ProfId1", $fromcompany->country_code);

+        if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];

+        $line1 .= ($line1 ? " - " : "").$field.": ".$fromcompany->idprof1;

+    }

+    // Prof Id 2

+    if ($fromcompany->idprof2)

+    {

+        $field = $langs->transcountrynoentities("ProfId2", $fromcompany->country_code);

+        if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];

+        $line1 .= ($line1 ? " - " : "").$field.": ".$fromcompany->idprof2;

+    }

+

+    // Second line of company infos

+    $line2 = "";

+    // Prof Id 3

+    if ($fromcompany->idprof3)

+    {

+        $field = $langs->transcountrynoentities("ProfId3", $fromcompany->country_code);

+        if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];

+        $line2 .= ($line2 ? " - " : "").$field.": ".$fromcompany->idprof3;

+    }

+    // Prof Id 4

+    if ($fromcompany->idprof4)

+    {

+        $field = $langs->transcountrynoentities("ProfId4", $fromcompany->country_code);

+        if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];

+        $line2 .= ($line2 ? " - " : "").$field.": ".$fromcompany->idprof4;

+    }

+    // IntraCommunautary VAT

+    if ($fromcompany->tva_intra != '')

+    {

+        $line2 .= ($line2 ? " - " : "").$langs->transnoentities("VATIntraShort").": ".$fromcompany->tva_intra;

+    }

+

+    print '<br>';

+

+    print '<div class="center">'."\n";

+    if ($addformmessage)

+    {

+    	print '<!-- object = '.$object->element.' -->';

+    	print '<br>';

+

+    	$parammessageform = 'ONLINE_PAYMENT_MESSAGE_FORM_'.$suffix;

+    	if (!empty($conf->global->$parammessageform)) print $langs->transnoentities($conf->global->$parammessageform);

+    	elseif (!empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORM)) print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORM);

+

+    	// Add other message if VAT exists

+    	if ($object->total_vat != 0 || $object->total_tva != 0)

+    	{

+    		$parammessageform = 'ONLINE_PAYMENT_MESSAGE_FORMIFVAT_'.$suffix;

+    		if (!empty($conf->global->$parammessageform)) print $langs->transnoentities($conf->global->$parammessageform);

+    		elseif (!empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT)) print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT);

+    	}

+    }

+

+    print '<font style="font-size: 10px;"><br><hr>'."\n";

+    print $fromcompany->name.'<br>';

+    print $line1;

+    if (strlen($line1.$line2) > 50) print '<br>';

+    else print ' - ';

+    print $line2;

+    print '</font></div>'."\n";

+}

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_pdf.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_pdf.lib.php
@@ -14,3 +13,0 @@
- * Copyright (C) 2020       Nicolas ZABOURI         <info@inovea-conseil.com>

- * Copyright (C) 2021-2022	Anthony Berton       	<anthony.berton@bb2a.fr>

- * Copyright (C) 2023       Frédéric France         <frederic.france@netlogic.fr>

@@ -39,38 +35,0 @@
-include_once DOL_DOCUMENT_ROOT.'/core/lib/signature.lib.php';

-

-

-/**

- *  Return array head with list of tabs to view object informations.

- *

- *  @return	array   	        head array with tabs

- */

-function pdf_admin_prepare_head()

-{

-	global $langs, $conf;

-

-	$h = 0;

-	$head = array();

-

-	$head[$h][0] = DOL_URL_ROOT.'/admin/pdf.php';

-	$head[$h][1] = $langs->trans("Parameters");

-	$head[$h][2] = 'general';

-	$h++;

-

-	// Show more tabs from modules

-	// Entries must be declared in modules descriptor with line

-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab

-	complete_head_from_modules($conf, $langs, null, $head, $h, 'pdf_admin');

-

-	if (isModEnabled("propal") || isModEnabled('facture') || isModEnabled('reception')) {

-		$head[$h][0] = DOL_URL_ROOT.'/admin/pdf_other.php';

-		$head[$h][1] = $langs->trans("Others");

-		$head[$h][2] = 'other';

-		$h++;

-	}

-

-	complete_head_from_modules($conf, $langs, null, $head, $h, 'pdf_admin', 'remove');

-

-	return $head;

-}

-

@@ -81,3 +40,3 @@
- *	@param		Translate|null	$outputlangs		Output lang to use to autodetect output format if we need 'auto' detection

- *  @param		string			$mode				'setup' = Use setup, 'auto' = Force autodetection whatever is setup

- *  @return     array								Array('width'=>w,'height'=>h,'unit'=>u);

+ *	@param		Translate	$outputlangs		Output lang to use to autodetect output format if we need 'auto' detection

+ *  @param		string		$mode				'setup' = Use setup, 'auto' = Force autodetection whatever is setup

+ *  @return     array							Array('width'=>w,'height'=>h,'unit'=>u);

@@ -89 +48 @@
-	dol_syslog("pdf_getFormat Get paper format with mode=".$mode." MAIN_PDF_FORMAT=".(!getDolGlobalString('MAIN_PDF_FORMAT') ? 'null' : $conf->global->MAIN_PDF_FORMAT)." outputlangs->defaultlang=".(is_object($outputlangs) ? $outputlangs->defaultlang : 'null')." and langs->defaultlang=".(is_object($langs) ? $langs->defaultlang : 'null'));

+	dol_syslog("pdf_getFormat Get paper format with mode=".$mode." MAIN_PDF_FORMAT=".(empty($conf->global->MAIN_PDF_FORMAT) ? 'null' : $conf->global->MAIN_PDF_FORMAT)." outputlangs->defaultlang=".(is_object($outputlangs) ? $outputlangs->defaultlang : 'null')." and langs->defaultlang=".(is_object($langs) ? $langs->defaultlang : 'null'));

@@ -92,5 +51,4 @@
-	$width = 210;

-	$height = 297;

-	$unit = 'mm';

-

-	if ($mode == 'auto' || !getDolGlobalString('MAIN_PDF_FORMAT') || getDolGlobalString('MAIN_PDF_FORMAT') == 'auto') {

+	$width = 210; $height = 297; $unit = 'mm';

+

+	if ($mode == 'auto' || empty($conf->global->MAIN_PDF_FORMAT) || $conf->global->MAIN_PDF_FORMAT == 'auto')

+	{

@@ -99 +57,3 @@
-	} else {

+	}

+	else

+	{

@@ -106 +66,2 @@
-	if ($resql) {

+	if ($resql)

+	{

@@ -108 +69,2 @@
-		if ($obj) {

+		if ($obj)

+		{

@@ -132 +94,2 @@
-	if (!defined('K_TCPDF_EXTERNAL_CONFIG')) {

+	if (!defined('K_TCPDF_EXTERNAL_CONFIG'))

+	{

@@ -163,5 +126 @@
-		if (getDolGlobalString('TCPDF_THROW_ERRORS_INSTEAD_OF_DIE')) {

-			define('K_TCPDF_THROW_EXCEPTION_ERROR', true);

-		} else {

-			define('K_TCPDF_THROW_EXCEPTION_ERROR', false);

-		}

+		define('K_TCPDF_THROW_EXCEPTION_ERROR', false);

@@ -174,3 +133 @@
-	if (!getDolGlobalString('MAIN_DISABLE_TCPDI')) {

-		require_once TCPDI_PATH.'tcpdi.php';

-	}

+	if (empty($conf->global->MAIN_DISABLE_TCPDI)) require_once TCPDI_PATH.'tcpdi.php';

@@ -183,9 +140,4 @@
-	if (getDolGlobalString('PDF_USE_A')) {

-		$pdfa = $conf->global->PDF_USE_A; 	// PDF/A-1 ou PDF/A-3

-	}

-

-	if (class_exists('TCPDI')) {

-		$pdf = new TCPDI($pagetype, $metric, $format, true, 'UTF-8', false, $pdfa);

-	} else {

-		$pdf = new TCPDF($pagetype, $metric, $format, true, 'UTF-8', false, $pdfa);

-	}

+	if (!empty($conf->global->PDF_USE_1A)) $pdfa = true; // PDF1/A

+

+	if (class_exists('TCPDI')) $pdf = new TCPDI($pagetype, $metric, $format, true, 'UTF-8', false, $pdfa);

+	else $pdf = new TCPDF($pagetype, $metric, $format, true, 'UTF-8', false, $pdfa);

@@ -194 +146,2 @@
-	if (getDolGlobalString('PDF_SECURITY_ENCRYPTION')) {

+	if (!empty($conf->global->PDF_SECURITY_ENCRYPTION))

+	{

@@ -208 +161 @@
-		$pdfrights = (getDolGlobalString('PDF_SECURITY_ENCRYPTION_RIGHTS') ? json_decode($conf->global->PDF_SECURITY_ENCRYPTION_RIGHTS, true) : array('modify', 'copy')); // Json format in llx_const

+		$pdfrights = (!empty($conf->global->PDF_SECURITY_ENCRYPTION_RIGHTS) ?json_decode($conf->global->PDF_SECURITY_ENCRYPTION_RIGHTS, true) : array('modify', 'copy')); // Json format in llx_const

@@ -211 +164 @@
-		$pdfuserpass = (getDolGlobalString('PDF_SECURITY_ENCRYPTION_USERPASS') ? $conf->global->PDF_SECURITY_ENCRYPTION_USERPASS : '');

+		$pdfuserpass = (!empty($conf->global->PDF_SECURITY_ENCRYPTION_USERPASS) ? $conf->global->PDF_SECURITY_ENCRYPTION_USERPASS : '');

@@ -214 +167 @@
-		$pdfownerpass = (getDolGlobalString('PDF_SECURITY_ENCRYPTION_OWNERPASS') ? $conf->global->PDF_SECURITY_ENCRYPTION_OWNERPASS : null);

+		$pdfownerpass = (!empty($conf->global->PDF_SECURITY_ENCRYPTION_OWNERPASS) ? $conf->global->PDF_SECURITY_ENCRYPTION_OWNERPASS : null);

@@ -217 +170 @@
-		$encstrength = (getDolGlobalString('PDF_SECURITY_ENCRYPTION_STRENGTH') ? $conf->global->PDF_SECURITY_ENCRYPTION_STRENGTH : 0);

+		$encstrength = (!empty($conf->global->PDF_SECURITY_ENCRYPTION_STRENGTH) ? $conf->global->PDF_SECURITY_ENCRYPTION_STRENGTH : 0);

@@ -221 +174 @@
-		$pubkeys = (getDolGlobalString('PDF_SECURITY_ENCRYPTION_PUBKEYS') ? json_decode($conf->global->PDF_SECURITY_ENCRYPTION_PUBKEYS, true) : null); // Json format in llx_const

+		$pubkeys = (!empty($conf->global->PDF_SECURITY_ENCRYPTION_PUBKEYS) ?json_decode($conf->global->PDF_SECURITY_ENCRYPTION_PUBKEYS, true) : null); // Json format in llx_const

@@ -244 +197 @@
-	@($parser = new TCPDF_PARSER(ltrim($content)));

+	@($parser = new \TCPDF_PARSER(ltrim($content)));

@@ -270,3 +223 @@
-	if (getDolGlobalString('MAIN_PDF_FORCE_FONT')) {

-		return $conf->global->MAIN_PDF_FORCE_FONT;

-	}

+	if (!empty($conf->global->MAIN_PDF_FORCE_FONT)) return $conf->global->MAIN_PDF_FORCE_FONT;

@@ -275,2 +226,4 @@
-	if (class_exists('TCPDF')) {  // If TCPDF on, we can use an UTF8 one like DejaVuSans if required (slower)

-		if ($outputlangs->trans('FONTFORPDF') != 'FONTFORPDF') {

+	if (class_exists('TCPDF'))  // If TCPDF on, we can use an UTF8 one like DejaVuSans if required (slower)

+	{

+		if ($outputlangs->trans('FONTFORPDF') != 'FONTFORPDF')

+		{

@@ -294,2 +247,4 @@
-	if (class_exists('TCPDF')) {  // If TCPDF on, we can use an UTF8 font like DejaVuSans if required (slower)

-		if ($outputlangs->trans('FONTSIZEFORPDF') != 'FONTSIZEFORPDF') {

+	if (class_exists('TCPDF'))  // If TCPDF on, we can use an UTF8 font like DejaVuSans if required (slower)

+	{

+		if ($outputlangs->trans('FONTSIZEFORPDF') != 'FONTSIZEFORPDF')

+		{

@@ -299,3 +254 @@
-	if (getDolGlobalString('MAIN_PDF_FORCE_FONT_SIZE')) {

-		$size = $conf->global->MAIN_PDF_FORCE_FONT_SIZE;

-	}

+	if (!empty($conf->global->MAIN_PDF_FORCE_FONT_SIZE)) $size = $conf->global->MAIN_PDF_FORCE_FONT_SIZE;

@@ -317 +270 @@
-	$height = (!getDolGlobalString('MAIN_DOCUMENTS_LOGO_HEIGHT') ? 20 : $conf->global->MAIN_DOCUMENTS_LOGO_HEIGHT);

+	$height = (empty($conf->global->MAIN_DOCUMENTS_LOGO_HEIGHT) ? 22 : $conf->global->MAIN_DOCUMENTS_LOGO_HEIGHT);

@@ -321 +274,2 @@
-	if ($tmp['height']) {

+	if ($tmp['height'])

+	{

@@ -323,3 +277 @@
-		if ($width > $maxwidth) {

-			$height = $height * $maxwidth / $width;

-		}

+		if ($width > $maxwidth) $height = $height * $maxwidth / $width;

@@ -341,30 +293,32 @@
-	// store current object

-	$pdf->startTransaction();

-	// store starting values

-	$start_y = $pdf->GetY();

-	//var_dump($start_y);

-	$start_page = $pdf->getPage();

-	// call printing functions with content

-	$pdf->writeHTMLCell(0, 0, 0, $start_y, $htmlcontent, 0, 1, false, true, 'J', true);

-	// get the new Y

-	$end_y = $pdf->GetY();

-	$end_page = $pdf->getPage();

-	// calculate height

-	$height = 0;

-	if ($end_page == $start_page) {

-		$height = $end_y - $start_y;

-	} else {

-		for ($page = $start_page; $page <= $end_page; ++$page) {

-			$pdf->setPage($page);

-			$tmpm = $pdf->getMargins();

-			$tMargin = $tmpm['top'];

-			if ($page == $start_page) {

-				// first page

-				$height = $pdf->getPageHeight() - $start_y - $pdf->getBreakMargin();

-			} elseif ($page == $end_page) {

-				// last page

-				$height = $end_y - $tMargin;

-			} else {

-				$height = $pdf->getPageHeight() - $tMargin - $pdf->getBreakMargin();

-			}

-		}

+    // store current object

+    $pdf->startTransaction();

+    // store starting values

+    $start_y = $pdf->GetY();

+    //var_dump($start_y);

+    $start_page = $pdf->getPage();

+    // call printing functions with content

+    $pdf->writeHTMLCell(0, 0, 0, $start_y, $htmlcontent, 0, 1, false, true, 'J', true);

+    // get the new Y

+    $end_y = $pdf->GetY();

+    $end_page = $pdf->getPage();

+    // calculate height

+    $height = 0;

+    if ($end_page == $start_page) {

+        $height = $end_y - $start_y;

+    }

+    else

+    {

+        for ($page = $start_page; $page <= $end_page; ++$page) {

+        	$pdf->setPage($page);

+        	$tmpm = $pdf->getMargins();

+        	$tMargin = $tmpm['top'];

+        	if ($page == $start_page) {

+        		// first page

+        		$height = $pdf->getPageHeight() - $start_y - $pdf->getBreakMargin();

+        	} elseif ($page == $end_page) {

+        		// last page

+        		$height = $end_y - $tMargin;

+        	} else {

+        		$height = $pdf->getPageHeight() - $tMargin - $pdf->getBreakMargin();

+        	}

+        }

@@ -375 +329 @@
-	return $height;

+    return $height;

@@ -389 +343 @@
-	global $conf;

+    global $conf;

@@ -395,7 +349,3 @@
-		$socname = $thirdparty->name;

-		if (($includealias || getDolGlobalInt('PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME')) && !empty($thirdparty->name_alias)) {

-			if (getDolGlobalInt('PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME') == 2) {

-				$socname = $thirdparty->name_alias." - ".$thirdparty->name;

-			} else {

-				$socname = $thirdparty->name." - ".$thirdparty->name_alias;

-			}

+		$socname .= $thirdparty->name;

+		if (($includealias || !empty($conf->global->PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME)) && !empty($thirdparty->name_alias)) {

+		    $socname .= " - ".$thirdparty->name_alias;

@@ -404,11 +354 @@
-		if ($thirdparty->socid > 0) {

-			$thirdparty->fetch_thirdparty();

-			$socname = $thirdparty->thirdparty->name;

-			if (($includealias || getDolGlobalInt('PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME')) && !empty($thirdparty->thirdparty->name_alias)) {

-				if (getDolGlobalInt('PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME') == 2) {

-					$socname = $thirdparty->thirdparty->name_alias." - ".$thirdparty->thirdparty->name;

-				} else {

-					$socname = $thirdparty->thirdparty->name." - ".$thirdparty->thirdparty->name_alias;

-				}

-			}

-		}

+		$socname = $thirdparty->socname;

@@ -439,13 +379,5 @@
-	if ($mode == 'source' && !is_object($sourcecompany)) {

-		return -1;

-	}

-	if ($mode == 'target' && !is_object($targetcompany)) {

-		return -1;

-	}

-

-	if (!empty($sourcecompany->state_id) && empty($sourcecompany->state)) {

-		$sourcecompany->state = getState($sourcecompany->state_id);

-	}

-	if (!empty($targetcompany->state_id) && empty($targetcompany->state)) {

-		$targetcompany->state = getState($targetcompany->state_id);

-	}

+	if ($mode == 'source' && !is_object($sourcecompany)) return -1;

+	if ($mode == 'target' && !is_object($targetcompany)) return -1;

+

+	if (!empty($sourcecompany->state_id) && empty($sourcecompany->state))             $sourcecompany->state = getState($sourcecompany->state_id);

+	if (!empty($targetcompany->state_id) && empty($targetcompany->state))             $targetcompany->state = getState($targetcompany->state_id);

@@ -455 +387,2 @@
-	if (is_object($hookmanager)) {

+	if (is_object($hookmanager))

+	{

@@ -461,13 +394,87 @@
-	if (empty($reshook)) {

-		if ($mode == 'source') {

-			$withCountry = 0;

-			if (isset($targetcompany->country_code) && !empty($sourcecompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) {

-				$withCountry = 1;

-			}

-

-			$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($sourcecompany, $withCountry, "\n", $outputlangs))."\n";

-

-			if (!getDolGlobalString('MAIN_PDF_DISABLESOURCEDETAILS')) {

-				// Phone

-				if ($sourcecompany->phone) {

-					$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("PhoneShort").": ".$outputlangs->convToOutputCharset($sourcecompany->phone);

+	if (empty($reshook))

+	{

+    	if ($mode == 'source')

+    	{

+    		$withCountry = 0;

+    		if (!empty($sourcecompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) $withCountry = 1;

+

+    		$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($sourcecompany, $withCountry, "\n", $outputlangs))."\n";

+

+    		if (empty($conf->global->MAIN_PDF_DISABLESOURCEDETAILS))

+    		{

+    			// Phone

+    			if ($sourcecompany->phone) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("PhoneShort").": ".$outputlangs->convToOutputCharset($sourcecompany->phone);

+    			// Fax

+    			if ($sourcecompany->fax) $stringaddress .= ($stringaddress ? ($sourcecompany->phone ? " - " : "\n") : '').$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($sourcecompany->fax);

+    			// EMail

+    			if ($sourcecompany->email) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($sourcecompany->email);

+    			// Web

+    			if ($sourcecompany->url) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($sourcecompany->url);

+    		}

+    		// Intra VAT

+    		if (!empty($conf->global->MAIN_TVAINTRA_IN_SOURCE_ADDRESS))

+    		{

+    			if ($sourcecompany->tva_intra) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($sourcecompany->tva_intra);

+    		}

+    		// Professionnal Ids

+    		$reg = array();

+    		if (!empty($conf->global->MAIN_PROFID1_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof1))

+    		{

+    			$tmp = $outputlangs->transcountrynoentities("ProfId1", $sourcecompany->country_code);

+    			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];

+    			$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof1);

+    		}

+    		if (!empty($conf->global->MAIN_PROFID2_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof2))

+    		{

+    			$tmp = $outputlangs->transcountrynoentities("ProfId2", $sourcecompany->country_code);

+    			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];

+    			$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof2);

+    		}

+    		if (!empty($conf->global->MAIN_PROFID3_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof3))

+    		{

+    			$tmp = $outputlangs->transcountrynoentities("ProfId3", $sourcecompany->country_code);

+    			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];

+    			$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof3);

+    		}

+    		if (!empty($conf->global->MAIN_PROFID4_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof4))

+    		{

+    			$tmp = $outputlangs->transcountrynoentities("ProfId4", $sourcecompany->country_code);

+    			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];

+    			$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof4);

+    		}

+    		if (!empty($conf->global->MAIN_PROFID5_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof5))

+    		{

+    			$tmp = $outputlangs->transcountrynoentities("ProfId5", $sourcecompany->country_code);

+    			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];

+    			$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof5);

+    		}

+    		if (!empty($conf->global->MAIN_PROFID6_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof6))

+    		{

+    			$tmp = $outputlangs->transcountrynoentities("ProfId6", $sourcecompany->country_code);

+    			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];

+    			$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof6);

+    		}

+    		if (!empty($conf->global->PDF_ADD_MORE_AFTER_SOURCE_ADDRESS)) {

+    			$stringaddress .= ($stringaddress ? "\n" : '').$conf->global->PDF_ADD_MORE_AFTER_SOURCE_ADDRESS;

+    		}

+    	}

+

+    	if ($mode == 'target' || preg_match('/targetwithdetails/', $mode))

+    	{

+    		if ($usecontact)

+    		{

+    			$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($targetcontact->getFullName($outputlangs, 1));

+

+    			if (!empty($targetcontact->address)) {

+    				$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($targetcontact));

+    			} else {

+    				$companytouseforaddress = $targetcompany;

+

+					// Contact on a thirdparty that is a different thirdparty than the thirdparty of object

+					if ($targetcontact->socid > 0 && $targetcontact->socid != $targetcompany->id)

+					{

+						$targetcontact->fetch_thirdparty();

+						$companytouseforaddress = $targetcontact->thirdparty;

+					}

+

+					$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($companytouseforaddress));

@@ -475,237 +482,126 @@
-				// Fax

-				if ($sourcecompany->fax) {

-					$stringaddress .= ($stringaddress ? ($sourcecompany->phone ? " - " : "\n") : '').$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($sourcecompany->fax);

-				}

-				// EMail

-				if ($sourcecompany->email) {

-					$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($sourcecompany->email);

-				}

-				// Web

-				if ($sourcecompany->url) {

-					$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($sourcecompany->url);

-				}

-			}

-			// Intra VAT

-			if (getDolGlobalString('MAIN_TVAINTRA_IN_SOURCE_ADDRESS')) {

-				if ($sourcecompany->tva_intra) {

-					$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($sourcecompany->tva_intra);

-				}

-			}

-			// Professionnal Ids

-			$reg = array();

-			if (getDolGlobalString('MAIN_PROFID1_IN_SOURCE_ADDRESS') && !empty($sourcecompany->idprof1)) {

-				$tmp = $outputlangs->transcountrynoentities("ProfId1", $sourcecompany->country_code);

-				if (preg_match('/\((.+)\)/', $tmp, $reg)) {

-					$tmp = $reg[1];

-				}

-				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof1);

-			}

-			if (getDolGlobalString('MAIN_PROFID2_IN_SOURCE_ADDRESS') && !empty($sourcecompany->idprof2)) {

-				$tmp = $outputlangs->transcountrynoentities("ProfId2", $sourcecompany->country_code);

-				if (preg_match('/\((.+)\)/', $tmp, $reg)) {

-					$tmp = $reg[1];

-				}

-				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof2);

-			}

-			if (getDolGlobalString('MAIN_PROFID3_IN_SOURCE_ADDRESS') && !empty($sourcecompany->idprof3)) {

-				$tmp = $outputlangs->transcountrynoentities("ProfId3", $sourcecompany->country_code);

-				if (preg_match('/\((.+)\)/', $tmp, $reg)) {

-					$tmp = $reg[1];

-				}

-				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof3);

-			}

-			if (getDolGlobalString('MAIN_PROFID4_IN_SOURCE_ADDRESS') && !empty($sourcecompany->idprof4)) {

-				$tmp = $outputlangs->transcountrynoentities("ProfId4", $sourcecompany->country_code);

-				if (preg_match('/\((.+)\)/', $tmp, $reg)) {

-					$tmp = $reg[1];

-				}

-				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof4);

-			}

-			if (getDolGlobalString('MAIN_PROFID5_IN_SOURCE_ADDRESS') && !empty($sourcecompany->idprof5)) {

-				$tmp = $outputlangs->transcountrynoentities("ProfId5", $sourcecompany->country_code);

-				if (preg_match('/\((.+)\)/', $tmp, $reg)) {

-					$tmp = $reg[1];

-				}

-				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof5);

-			}

-			if (getDolGlobalString('MAIN_PROFID6_IN_SOURCE_ADDRESS') && !empty($sourcecompany->idprof6)) {

-				$tmp = $outputlangs->transcountrynoentities("ProfId6", $sourcecompany->country_code);

-				if (preg_match('/\((.+)\)/', $tmp, $reg)) {

-					$tmp = $reg[1];

-				}

-				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof6);

-			}

-			if (getDolGlobalString('PDF_ADD_MORE_AFTER_SOURCE_ADDRESS')) {

-				$stringaddress .= ($stringaddress ? "\n" : '') . getDolGlobalString('PDF_ADD_MORE_AFTER_SOURCE_ADDRESS');

-			}

-		}

-

-		if ($mode == 'target' || preg_match('/targetwithdetails/', $mode)) {

-			if ($usecontact) {

-				if (is_object($targetcontact)) {

-					$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($targetcontact->getFullName($outputlangs, 1));

-

-					if (!empty($targetcontact->address)) {

-						$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($targetcontact))."\n";

-					} else {

-						$companytouseforaddress = $targetcompany;

-

-						// Contact on a thirdparty that is a different thirdparty than the thirdparty of object

-						if ($targetcontact->socid > 0 && $targetcontact->socid != $targetcompany->id) {

-							$targetcontact->fetch_thirdparty();

-							$companytouseforaddress = $targetcontact->thirdparty;

-						}

-

-						$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($companytouseforaddress))."\n";

-					}

-					// Country

-					if (!empty($targetcontact->country_code) && $targetcontact->country_code != $sourcecompany->country_code) {

-						$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcontact->country_code));

-					} elseif (empty($targetcontact->country_code) && !empty($targetcompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) {

-						$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));

-					}

-

-					if (getDolGlobalString('MAIN_PDF_ADDALSOTARGETDETAILS') || preg_match('/targetwithdetails/', $mode)) {

-						// Phone

-						if (getDolGlobalString('MAIN_PDF_ADDALSOTARGETDETAILS') || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_phone/', $mode)) {

-							if (!empty($targetcontact->phone_pro) || !empty($targetcontact->phone_mobile)) {

-								$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Phone").": ";

-							}

-							if (!empty($targetcontact->phone_pro)) {

-								$stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_pro);

-							}

-							if (!empty($targetcontact->phone_pro) && !empty($targetcontact->phone_mobile)) {

-								$stringaddress .= " / ";

-							}

-							if (!empty($targetcontact->phone_mobile)) {

-								$stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_mobile);

-							}

-						}

-						// Fax

-						if (getDolGlobalString('MAIN_PDF_ADDALSOTARGETDETAILS') || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_fax/', $mode)) {

-							if ($targetcontact->fax) {

-								$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcontact->fax);

-							}

-						}

-						// EMail

-						if (getDolGlobalString('MAIN_PDF_ADDALSOTARGETDETAILS') || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_email/', $mode)) {

-							if ($targetcontact->email) {

-								$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcontact->email);

-							}

-						}

-						// Web

-						if (getDolGlobalString('MAIN_PDF_ADDALSOTARGETDETAILS') || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_url/', $mode)) {

-							if ($targetcontact->url) {

-								$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcontact->url);

-							}

-						}

-					}

-				}

-			} else {

-				if (is_object($targetcompany)) {

-					$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($targetcompany));

-					// Country

-					if (!empty($targetcompany->country_code) && $targetcompany->country_code != $sourcecompany->country_code) {

-						$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));

-					} else {

-						$stringaddress .= ($stringaddress ? "\n" : '');

-					}

-

-					if (getDolGlobalString('MAIN_PDF_ADDALSOTARGETDETAILS') || preg_match('/targetwithdetails/', $mode)) {

-						// Phone

-						if (getDolGlobalString('MAIN_PDF_ADDALSOTARGETDETAILS') || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_phone/', $mode)) {

-							if (!empty($targetcompany->phone)) {

-								$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Phone").": ";

-							}

-							if (!empty($targetcompany->phone)) {

-								$stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone);

-							}

-						}

-						// Fax

-						if (getDolGlobalString('MAIN_PDF_ADDALSOTARGETDETAILS') || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_fax/', $mode)) {

-							if ($targetcompany->fax) {

-								$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcompany->fax);

-							}

-						}

-						// EMail

-						if (getDolGlobalString('MAIN_PDF_ADDALSOTARGETDETAILS') || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_email/', $mode)) {

-							if ($targetcompany->email) {

-								$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcompany->email);

-							}

-						}

-						// Web

-						if (getDolGlobalString('MAIN_PDF_ADDALSOTARGETDETAILS') || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_url/', $mode)) {

-							if ($targetcompany->url) {

-								$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcompany->url);

-							}

-						}

-					}

-				}

-			}

-

-			// Intra VAT

-			if (!getDolGlobalString('MAIN_TVAINTRA_NOT_IN_ADDRESS')) {

-				if ($usecontact && is_object($targetcontact) && getDolGlobalInt('MAIN_USE_COMPANY_NAME_OF_CONTACT')) {

-					$targetcontact->fetch_thirdparty();

-					if (!empty($targetcontact->thirdparty->id) && $targetcontact->thirdparty->tva_intra) {

-						$stringaddress .= ($stringaddress ? "\n" : '') . $outputlangs->transnoentities("VATIntraShort") . ': ' . $outputlangs->convToOutputCharset($targetcontact->thirdparty->tva_intra);

-					}

-				} elseif ($targetcompany->tva_intra) {

-					$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($targetcompany->tva_intra);

-				}

-			}

-

-			// Professionnal Ids

-			if (getDolGlobalString('MAIN_PROFID1_IN_ADDRESS') && !empty($targetcompany->idprof1)) {

-				$tmp = $outputlangs->transcountrynoentities("ProfId1", $targetcompany->country_code);

-				if (preg_match('/\((.+)\)/', $tmp, $reg)) {

-					$tmp = $reg[1];

-				}

-				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof1);

-			}

-			if (getDolGlobalString('MAIN_PROFID2_IN_ADDRESS') && !empty($targetcompany->idprof2)) {

-				$tmp = $outputlangs->transcountrynoentities("ProfId2", $targetcompany->country_code);

-				if (preg_match('/\((.+)\)/', $tmp, $reg)) {

-					$tmp = $reg[1];

-				}

-				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof2);

-			}

-			if (getDolGlobalString('MAIN_PROFID3_IN_ADDRESS') && !empty($targetcompany->idprof3)) {

-				$tmp = $outputlangs->transcountrynoentities("ProfId3", $targetcompany->country_code);

-				if (preg_match('/\((.+)\)/', $tmp, $reg)) {

-					$tmp = $reg[1];

-				}

-				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof3);

-			}

-			if (getDolGlobalString('MAIN_PROFID4_IN_ADDRESS') && !empty($targetcompany->idprof4)) {

-				$tmp = $outputlangs->transcountrynoentities("ProfId4", $targetcompany->country_code);

-				if (preg_match('/\((.+)\)/', $tmp, $reg)) {

-					$tmp = $reg[1];

-				}

-				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof4);

-			}

-			if (getDolGlobalString('MAIN_PROFID5_IN_ADDRESS') && !empty($targetcompany->idprof5)) {

-				$tmp = $outputlangs->transcountrynoentities("ProfId5", $targetcompany->country_code);

-				if (preg_match('/\((.+)\)/', $tmp, $reg)) {

-					$tmp = $reg[1];

-				}

-				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof5);

-			}

-			if (getDolGlobalString('MAIN_PROFID6_IN_ADDRESS') && !empty($targetcompany->idprof6)) {

-				$tmp = $outputlangs->transcountrynoentities("ProfId6", $targetcompany->country_code);

-				if (preg_match('/\((.+)\)/', $tmp, $reg)) {

-					$tmp = $reg[1];

-				}

-				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof6);

-			}

-

-			// Public note

-			if (getDolGlobalString('MAIN_PUBLIC_NOTE_IN_ADDRESS')) {

-				if ($mode == 'source' && !empty($sourcecompany->note_public)) {

-					$stringaddress .= ($stringaddress ? "\n" : '').dol_string_nohtmltag($sourcecompany->note_public);

-				}

-				if (($mode == 'target' || preg_match('/targetwithdetails/', $mode)) && !empty($targetcompany->note_public)) {

-					$stringaddress .= ($stringaddress ? "\n" : '').dol_string_nohtmltag($targetcompany->note_public);

-				}

-			}

-		}

+    			// Country

+    			if (!empty($targetcontact->country_code) && $targetcontact->country_code != $sourcecompany->country_code) {

+    				$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcontact->country_code));

+    			}

+    			elseif (empty($targetcontact->country_code) && !empty($targetcompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) {

+    				$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));

+    			}

+

+    			if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || preg_match('/targetwithdetails/', $mode))

+    			{

+    				// Phone

+    			    if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_phone/', $mode))

+    			    {

+        				if (!empty($targetcontact->phone_pro) || !empty($targetcontact->phone_mobile)) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Phone").": ";

+        				if (!empty($targetcontact->phone_pro)) $stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_pro);

+        				if (!empty($targetcontact->phone_pro) && !empty($targetcontact->phone_mobile)) $stringaddress .= " / ";

+        				if (!empty($targetcontact->phone_mobile)) $stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_mobile);

+    			    }

+    				// Fax

+    			    if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_fax/', $mode))

+    			    {

+                        if ($targetcontact->fax) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcontact->fax);

+    			    }

+    				// EMail

+    			    if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_email/', $mode))

+    			    {

+                        if ($targetcontact->email) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcontact->email);

+    			    }

+    				// Web

+    			    if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_url/', $mode))

+    			    {

+                        if ($targetcontact->url) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcontact->url);

+    			    }

+    			}

+    		}

+    		else

+    		{

+    			$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($targetcompany));

+    			// Country

+    			if (!empty($targetcompany->country_code) && $targetcompany->country_code != $sourcecompany->country_code) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));

+

+    			if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || preg_match('/targetwithdetails/', $mode))

+    			{

+    				// Phone

+    			    if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_phone/', $mode))

+    			    {

+    			    	if (!empty($targetcompany->phone) || !empty($targetcompany->phone_mobile)) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Phone").": ";

+	    				if (!empty($targetcompany->phone)) $stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone);

+    					if (!empty($targetcompany->phone) && !empty($targetcompany->phone_mobile)) $stringaddress .= " / ";

+    					if (!empty($targetcompany->phone_mobile)) $stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone_mobile);

+    			    }

+    				// Fax

+    			    if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_fax/', $mode))

+    			    {

+    			    	if ($targetcompany->fax) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcompany->fax);

+    			    }

+    				// EMail

+    			    if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_email/', $mode))

+    			    {

+    			    	if ($targetcompany->email) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcompany->email);

+    			    }

+    				// Web

+    			    if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_url/', $mode))

+    			    {

+    			    	if ($targetcompany->url) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcompany->url);

+    			    }

+    			}

+    		}

+

+    		// Intra VAT

+    		if (empty($conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS))

+    		{

+    			if ($targetcompany->tva_intra) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($targetcompany->tva_intra);

+    		}

+

+    		// Professionnal Ids

+    		if (!empty($conf->global->MAIN_PROFID1_IN_ADDRESS) && !empty($targetcompany->idprof1))

+    		{

+    			$tmp = $outputlangs->transcountrynoentities("ProfId1", $targetcompany->country_code);

+    			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];

+    			$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof1);

+    		}

+    		if (!empty($conf->global->MAIN_PROFID2_IN_ADDRESS) && !empty($targetcompany->idprof2))

+    		{

+    			$tmp = $outputlangs->transcountrynoentities("ProfId2", $targetcompany->country_code);

+    			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];

+    			$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof2);

+    		}

+    		if (!empty($conf->global->MAIN_PROFID3_IN_ADDRESS) && !empty($targetcompany->idprof3))

+    		{

+    			$tmp = $outputlangs->transcountrynoentities("ProfId3", $targetcompany->country_code);

+    			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];

+    			$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof3);

+    		}

+    		if (!empty($conf->global->MAIN_PROFID4_IN_ADDRESS) && !empty($targetcompany->idprof4))

+    		{

+    			$tmp = $outputlangs->transcountrynoentities("ProfId4", $targetcompany->country_code);

+    			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];

+    			$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof4);

+    		}

+    		if (!empty($conf->global->MAIN_PROFID5_IN_ADDRESS) && !empty($targetcompany->idprof5))

+    		{

+    		    $tmp = $outputlangs->transcountrynoentities("ProfId5", $targetcompany->country_code);

+    		    if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];

+    		    $stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof5);

+    		}

+    		if (!empty($conf->global->MAIN_PROFID6_IN_ADDRESS) && !empty($targetcompany->idprof6))

+    		{

+    		    $tmp = $outputlangs->transcountrynoentities("ProfId6", $targetcompany->country_code);

+    		    if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];

+    		    $stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof6);

+    		}

+

+    		// Public note

+    		if (!empty($conf->global->MAIN_PUBLIC_NOTE_IN_ADDRESS))

+    		{

+    		    if ($mode == 'source' && !empty($sourcecompany->note_public))

+        		{

+        		    $stringaddress .= ($stringaddress ? "\n" : '').dol_string_nohtmltag($sourcecompany->note_public);

+        		}

+        		if (($mode == 'target' || preg_match('/targetwithdetails/', $mode)) && !empty($targetcompany->note_public))

+        		{

+        		    $stringaddress .= ($stringaddress ? "\n" : '').dol_string_nohtmltag($targetcompany->note_public);

+        		}

+    		}

+    	}

@@ -730,18 +626,6 @@
-	// Add a background image on document only if good setup of const

-	if (getDolGlobalString('MAIN_USE_BACKGROUND_ON_PDF') && (getDolGlobalString('MAIN_USE_BACKGROUND_ON_PDF') != '-1')) {		// Warning, this option make TCPDF generation being crazy and some content disappeared behind the image

-		$filepath = $conf->mycompany->dir_output.'/logos/' . getDolGlobalString('MAIN_USE_BACKGROUND_ON_PDF');

-		if (file_exists($filepath)) {

-			$pdf->SetAutoPageBreak(0, 0); // Disable auto pagebreak before adding image

-			if (getDolGlobalString('MAIN_USE_BACKGROUND_ON_PDF_ALPHA')) {

-				$pdf->SetAlpha($conf->global->MAIN_USE_BACKGROUND_ON_PDF_ALPHA);

-			} // Option for change opacity of background

-			$pdf->Image($filepath, (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_X) ? $conf->global->MAIN_USE_BACKGROUND_ON_PDF_X : 0), (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y) ? $conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y : 0), 0, $page_height);

-			if (getDolGlobalString('MAIN_USE_BACKGROUND_ON_PDF_ALPHA')) {

-				$pdf->SetAlpha(1);

-			}

-			$pdf->SetPageMark(); // This option avoid to have the images missing on some pages

-			$pdf->SetAutoPageBreak(1, 0); // Restore pagebreak

-		}

-	}

-	if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND') && getDolGlobalString('MAIN_ADD_PDF_BACKGROUND') != '-1') {

-		$pdf->SetPageMark(); // This option avoid to have the images missing on some pages

+	// Add a background image on document

+	if (!empty($conf->global->MAIN_USE_BACKGROUND_ON_PDF))		// Warning, this option make TCPDF generation being crazy and some content disappeared behind the image

+	{

+		$pdf->SetAutoPageBreak(0, 0); // Disable auto pagebreak before adding image

+		$pdf->Image($conf->mycompany->dir_output.'/logos/'.$conf->global->MAIN_USE_BACKGROUND_ON_PDF, (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_X) ? $conf->global->MAIN_USE_BACKGROUND_ON_PDF_X : 0), (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y) ? $conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y : 0), 0, $page_height);

+		$pdf->SetAutoPageBreak(1, 0); // Restore pagebreak

@@ -758,2 +642 @@
- *	@param	int         $onlykey       	1=Do not calculate some heavy values of keys (performance enhancement when we need only the keys), 2=Values are truncated and html sanitized (to use for help tooltip)

- *  @param   array      $include        Array of family keys we want to include. For example array('system', 'mycompany', 'object', 'objectamount', 'date', 'user', ...)

+ *	@param	int         $onlykey       1=Do not calculate some heavy values of keys (performance enhancement when we need only the keys), 2=Values are truncated and html sanitized (to use for help tooltip)

@@ -762,6 +645,6 @@
-function pdf_getSubstitutionArray($outputlangs, $exclude = null, $object = null, $onlykey = 0, $include = null)

-{

-	$substitutionarray = getCommonSubstitutionArray($outputlangs, $onlykey, $exclude, $object, $include);

-	$substitutionarray['__FROM_NAME__'] = '__FROM_NAME__';

-	$substitutionarray['__FROM_EMAIL__'] = '__FROM_EMAIL__';

-	return $substitutionarray;

+function pdf_getSubstitutionArray($outputlangs, $exclude = null, $object = null, $onlykey = 0)

+{

+    $substitutionarray = getCommonSubstitutionArray($outputlangs, $onlykey, $exclude, $object);

+    $substitutionarray['__FROM_NAME__'] = '__FROM_NAME__';

+    $substitutionarray['__FROM_EMAIL__'] = '__FROM_EMAIL__';

+    return $substitutionarray;

@@ -787,9 +670,4 @@
-	if ($unit == 'pt') {

-		$k = 1;

-	} elseif ($unit == 'mm') {

-		$k = 72 / 25.4;

-	} elseif ($unit == 'cm') {

-		$k = 72 / 2.54;

-	} elseif ($unit == 'in') {

-		$k = 72;

-	}

+	if ($unit == 'pt') $k = 1;

+	elseif ($unit == 'mm') $k = 72 / 25.4;

+	elseif ($unit == 'cm') $k = 72 / 2.54;

+	elseif ($unit == 'in') $k = 72;

@@ -803,2 +681 @@
-	$savx = $pdf->getX();

-	$savy = $pdf->getY();

+	$savx = $pdf->getX(); $savy = $pdf->getY();

@@ -843,2 +720,2 @@
-	$diffsizetitle = (!getDolGlobalString('PDF_DIFFSIZE_TITLE') ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);

-	$diffsizecontent = (!getDolGlobalString('PDF_DIFFSIZE_CONTENT') ? 4 : $conf->global->PDF_DIFFSIZE_CONTENT);

+	$diffsizetitle = (empty($conf->global->PDF_DIFFSIZE_TITLE) ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);

+	$diffsizecontent = (empty($conf->global->PDF_DIFFSIZE_CONTENT) ? 4 : $conf->global->PDF_DIFFSIZE_CONTENT);

@@ -847 +724,2 @@
-	if (empty($onlynumber)) {

+	if (empty($onlynumber))

+	{

@@ -857,3 +735 @@
-	if ($account->getCountryCode() == 'IN') {

-		$bickey = "SWIFT";

-	}

+	if ($account->getCountryCode() == 'IN') $bickey = "SWIFT";

@@ -865 +741,2 @@
-	if ($usedetailedbban) {

+	if ($usedetailedbban)

+	{

@@ -868 +745,2 @@
-		if (empty($onlynumber)) {

+		if (empty($onlynumber))

+		{

@@ -875,12 +753,12 @@
-		if (!getDolGlobalString('PDF_BANK_HIDE_NUMBER_SHOW_ONLY_BICIBAN')) {    // Note that some countries still need bank number, BIC/IBAN not enougth for them

-			// Note:

-			// bank = code_banque (FR), sort code (GB, IR. Example: 12-34-56)

-			// desk = code guichet (FR), used only when $usedetailedbban = 1

-			// number = account number

-			// key = check control key used only when $usedetailedbban = 1

-			if (empty($onlynumber)) {

-				$pdf->line($curx + 1, $cury + 1, $curx + 1, $cury + 6);

-			}

-

-

-			foreach ($account->getFieldsToShow() as $val) {

+		if (empty($conf->global->PDF_BANK_HIDE_NUMBER_SHOW_ONLY_BICIBAN))    // Note that some countries still need bank number, BIC/IBAN not enougth for them

+		{

+		    // Note:

+		    // bank = code_banque (FR), sort code (GB, IR. Example: 12-34-56)

+		    // desk = code guichet (FR), used only when $usedetailedbban = 1

+		    // number = account number

+		    // key = check control key used only when $usedetailedbban = 1

+    		if (empty($onlynumber)) $pdf->line($curx + 1, $cury + 1, $curx + 1, $cury + 6);

+

+

+			foreach ($account->getFieldsToShow() as $val)

+			{

@@ -906 +784 @@
-				} elseif ($val == 'IBAN' || $val == 'BIC') {

+				}elseif ($val == 'IBAN' || $val == 'BIC') {

@@ -923,6 +801,8 @@
-			}

-

-			$curx = $savcurx;

-			$cury += 8;

-		}

-	} else {

+    		}

+

+    		$curx = $savcurx;

+    		$cury += 8;

+		}

+	}

+	else

+	{

@@ -939,3 +819 @@
-		if ($diffsizecontent <= 2) {

-			$cury += 1;

-		}

+		if ($diffsizecontent <= 2) $cury += 1;

@@ -946 +824,2 @@
-	if (empty($onlynumber) && !empty($account->domiciliation)) {

+	if (empty($onlynumber) && !empty($account->domiciliation))

+	{

@@ -956 +835,2 @@
-	if (!empty($account->proprio)) {

+	if (!empty($account->proprio))

+	{

@@ -962,3 +842,4 @@
-	} elseif (!$usedetailedbban) {

-		$cury += 1;

-	}

+		$cur += 1;

+	}

+

+	elseif (!$usedetailedbban) $cury += 1;

@@ -969 +850,2 @@
-	if (!empty($account->iban)) {

+	if (!empty($account->iban))

+	{

@@ -975 +857,2 @@
-		for ($i = 0; $i < $nbIbanDisplay_temp; $i++) {

+		for ($i = 0; $i < $nbIbanDisplay_temp; $i++)

+		{

@@ -977,3 +860 @@
-			if ($i % 4 == 3 && $i > 0) {

-				$ibanDisplay .= " ";

-			}

+			if ($i % 4 == 3 && $i > 0)	$ibanDisplay .= " ";

@@ -988 +869,2 @@
-	if (!empty($account->bic)) {

+	if (!empty($account->bic))

+	{

@@ -1000 +882 @@
- *	@param	TCPDF		$pdf     		The PDF factory

+ *	@param	TCPDF			$pdf     		The PDF factory

@@ -1006 +888 @@
- * 	@param	int			$page_hauteur	Page height

+ * 	@param	int			$page_hauteur	Page height (no more used)

@@ -1010,2 +891,0 @@
- *  @param	int			$page_largeur	Page width

- *  @param	int			$watermark		Watermark text to print on page

@@ -1014,3 +894,3 @@
-function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_basse, $marge_gauche, $page_hauteur, $object, $showdetails = 0, $hidefreetext = 0, $page_largeur = 0, $watermark = '')

-{

-	global $conf, $user, $mysoc, $hookmanager;

+function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_basse, $marge_gauche, $page_hauteur, $object, $showdetails = 0, $hidefreetext = 0)

+{

+	global $conf, $user, $mysoc;

@@ -1020 +899,0 @@
-	$reg = array();

@@ -1025 +904,2 @@
-	if (empty($hidefreetext) && !empty($conf->global->$paramfreetext)) {

+	if (empty($hidefreetext) && !empty($conf->global->$paramfreetext))

+	{

@@ -1031 +911 @@
-		$newfreetext = make_substitutions(getDolGlobalString($paramfreetext), $substitutionarray, $outputlangs);

+		$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray, $outputlangs);

@@ -1043,6 +923,4 @@
-	$line1 = "";

-	$line2 = "";

-	$line3 = "";

-	$line4 = "";

-

-	if ($showdetails == 1 || $showdetails == 3) {

+	$line1 = ""; $line2 = ""; $line3 = ""; $line4 = "";

+

+    if ($showdetails == 1 || $showdetails == 3)

+	{

@@ -1050 +928,2 @@
-		if ($fromcompany->name) {

+		if ($fromcompany->name)

+		{

@@ -1054 +933,2 @@
-		if ($fromcompany->address) {

+		if ($fromcompany->address)

+		{

@@ -1058 +938,2 @@
-		if ($fromcompany->zip) {

+		if ($fromcompany->zip)

+		{

@@ -1062 +943,2 @@
-		if ($fromcompany->town) {

+		if ($fromcompany->town)

+		{

@@ -1066 +948,2 @@
-		if ($fromcompany->country) {

+		if ($fromcompany->country)

+		{

@@ -1070 +953,2 @@
-		if ($fromcompany->phone) {

+		if ($fromcompany->phone)

+		{

@@ -1074 +958,2 @@
-		if ($fromcompany->fax) {

+		if ($fromcompany->fax)

+		{

@@ -1079 +964,2 @@
-		if ($fromcompany->url) {

+		if ($fromcompany->url)

+		{

@@ -1083 +969,2 @@
-		if ($fromcompany->email) {

+		if ($fromcompany->email)

+		{

@@ -1087 +974,2 @@
-	if ($showdetails == 2 || $showdetails == 3 || (!empty($fromcompany->country_code) && $fromcompany->country_code == 'DE')) {

+	if ($showdetails == 2 || $showdetails == 3 || ($fromcompany->country_code == 'DE'))

+	{

@@ -1089 +977,2 @@
-		if ($fromcompany->managers) {

+		if ($fromcompany->managers)

+		{

@@ -1096 +985,2 @@
-	if (!empty($fromcompany->forme_juridique_code) && $fromcompany->forme_juridique_code) {

+	if ($fromcompany->forme_juridique_code)

+	{

@@ -1100,7 +990,5 @@
-	if (!empty($fromcompany->capital)) {

-		$tmpamounttoshow = price2num($fromcompany->capital); // This field is a free string or a float

-		if (is_numeric($tmpamounttoshow) && $tmpamounttoshow > 0) {

-			$line3 .= ($line3 ? " - " : "").$outputlangs->transnoentities("CapitalOf", price($tmpamounttoshow, 0, $outputlangs, 0, 0, 0, $conf->currency));

-		} elseif (!empty($fromcompany->capital)) {

-			$line3 .= ($line3 ? " - " : "").$outputlangs->transnoentities("CapitalOf", $fromcompany->capital, $outputlangs);

-		}

+	if ($fromcompany->capital)

+	{

+		$tmpamounttoshow = price2num($fromcompany->capital); // This field is a free string

+		if (is_numeric($tmpamounttoshow) && $tmpamounttoshow > 0) $line3 .= ($line3 ? " - " : "").$outputlangs->transnoentities("CapitalOf", price($tmpamounttoshow, 0, $outputlangs, 0, 0, 0, $conf->currency));

+		else $line3 .= ($line3 ? " - " : "").$outputlangs->transnoentities("CapitalOf", $tmpamounttoshow, $outputlangs);

@@ -1109 +997,2 @@
-	if (!empty($fromcompany->idprof1) && $fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || !$fromcompany->idprof2)) {

+	if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || !$fromcompany->idprof2))

+	{

@@ -1111,3 +1000 @@
-		if (preg_match('/\((.*)\)/i', $field, $reg)) {

-			$field = $reg[1];

-		}

+		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];

@@ -1117 +1004,2 @@
-	if (!empty($fromcompany->idprof2) && $fromcompany->idprof2) {

+	if ($fromcompany->idprof2)

+	{

@@ -1119,3 +1007 @@
-		if (preg_match('/\((.*)\)/i', $field, $reg)) {

-			$field = $reg[1];

-		}

+		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];

@@ -1127 +1013,2 @@
-	if (!empty($fromcompany->idprof3) && $fromcompany->idprof3) {

+	if ($fromcompany->idprof3)

+	{

@@ -1129,3 +1016 @@
-		if (preg_match('/\((.*)\)/i', $field, $reg)) {

-			$field = $reg[1];

-		}

+		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];

@@ -1135 +1020,2 @@
-	if (!empty($fromcompany->idprof4) && $fromcompany->idprof4) {

+	if ($fromcompany->idprof4)

+	{

@@ -1137,3 +1023 @@
-		if (preg_match('/\((.*)\)/i', $field, $reg)) {

-			$field = $reg[1];

-		}

+		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];

@@ -1143 +1027,2 @@
-	if (!empty($fromcompany->idprof5) && $fromcompany->idprof5) {

+	if ($fromcompany->idprof5)

+	{

@@ -1145,3 +1030 @@
-		if (preg_match('/\((.*)\)/i', $field, $reg)) {

-			$field = $reg[1];

-		}

+		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];

@@ -1151 +1034,2 @@
-	if (!empty($fromcompany->idprof6) &&  $fromcompany->idprof6) {

+	if ($fromcompany->idprof6)

+	{

@@ -1153,3 +1037 @@
-		if (preg_match('/\((.*)\)/i', $field, $reg)) {

-			$field = $reg[1];

-		}

+		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];

@@ -1158,32 +1039,0 @@
-	// Prof Id 7

-	if (!empty($fromcompany->idprof7) &&  $fromcompany->idprof7) {

-		$field = $outputlangs->transcountrynoentities("ProfId7", $fromcompany->country_code);

-		if (preg_match('/\((.*)\)/i', $field, $reg)) {

-			$field = $reg[1];

-		}

-		$line4 .= ($line4 ? " - " : "").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof7);

-	}

-	// Prof Id 8

-	if (!empty($fromcompany->idprof8) &&  $fromcompany->idprof8) {

-		$field = $outputlangs->transcountrynoentities("ProfId8", $fromcompany->country_code);

-		if (preg_match('/\((.*)\)/i', $field, $reg)) {

-			$field = $reg[1];

-		}

-		$line4 .= ($line4 ? " - " : "").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof8);

-	}

-	// Prof Id 9

-	if (!empty($fromcompany->idprof9) &&  $fromcompany->idprof9) {

-		$field = $outputlangs->transcountrynoentities("ProfId9", $fromcompany->country_code);

-		if (preg_match('/\((.*)\)/i', $field, $reg)) {

-			$field = $reg[1];

-		}

-		$line4 .= ($line4 ? " - " : "").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof9);

-	}

-	// Prof Id 10

-	if (!empty($fromcompany->idprof10) &&  $fromcompany->idprof10) {

-		$field = $outputlangs->transcountrynoentities("ProfId10", $fromcompany->country_code);

-		if (preg_match('/\((.*)\)/i', $field, $reg)) {

-			$field = $reg[1];

-		}

-		$line4 .= ($line4 ? " - " : "").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof10);

-	}

@@ -1191 +1041,2 @@
-	if (!empty($fromcompany->tva_intra)  && $fromcompany->tva_intra != '') {

+	if ($fromcompany->tva_intra != '')

+	{

@@ -1197,5 +1047,0 @@
-	// Option for footer text color

-	if (getDolGlobalString('PDF_FOOTER_TEXT_COLOR')) {

-		list($r, $g, $b) = sscanf($conf->global->PDF_FOOTER_TEXT_COLOR, '%d, %d, %d');

-		$pdf->SetTextColor($r, $g, $b);

-	}

@@ -1205 +1051,2 @@
-	if ($line) {	// Free text

+	if ($line)	// Free text

+	{

@@ -1207,160 +1054,73 @@
-		if (!getDolGlobalString('PDF_ALLOW_HTML_FOR_FREE_TEXT')) {

-			$width = 20000;

-			$align = 'L'; // By default, ask a manual break: We use a large value 20000, to not have automatic wrap. This make user understand, he need to add CR on its text.

-			if (getDolGlobalString('MAIN_USE_AUTOWRAP_ON_FREETEXT')) {

-				$width = 200;

-				$align = 'C';

-			}

-			$freetextheight = $pdf->getStringHeight($width, $line);

-		} else {

-			$freetextheight = pdfGetHeightForHtmlContent($pdf, dol_htmlentitiesbr($line, 1, 'UTF-8', 0)); // New method (works for HTML content)

-			//print '<br>'.$freetextheight;exit;

-		}

-	}

-

-	// For customize footer

-	if (is_object($hookmanager)) {

-		$parameters = array('line1' => $line1, 'line2' => $line2, 'line3' => $line3, 'line4' => $line4, 'outputlangs'=>$outputlangs);

-		$action = '';

-		$hookmanager->executeHooks('pdf_pagefoot', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks

-		if (!empty($hookmanager->resPrint) && $hidefreetext == 0) {

-			$mycustomfooter = $hookmanager->resPrint;

-			$mycustomfooterheight = pdfGetHeightForHtmlContent($pdf, dol_htmlentitiesbr($mycustomfooter, 1, 'UTF-8', 0));

-

-			$marginwithfooter = $marge_basse + $freetextheight + $mycustomfooterheight;

-			$posy = (float) $marginwithfooter;

-

-			// Option for footer background color (without freetext zone)

-			if (getDolGlobalString('PDF_FOOTER_BACKGROUND_COLOR')) {

-				list($r, $g, $b) = sscanf($conf->global->PDF_FOOTER_BACKGROUND_COLOR, '%d, %d, %d');

-				$pdf->SetAutoPageBreak(0, 0); // Disable auto pagebreak

-				$pdf->Rect(0, $dims['hk'] - $posy + $freetextheight, $dims['wk'] + 1, $marginwithfooter + 1, 'F', '', $fill_color = array($r, $g, $b));

-				$pdf->SetAutoPageBreak(1, 0); // Restore pagebreak

-			}

-

-			if (getDolGlobalInt('PDF_FREETEXT_DISABLE_PAGEBREAK') === 1) {

-				$pdf->SetAutoPageBreak(0, 0);

-			} // Option for disable auto pagebreak

-			if ($line) {	// Free text

-				$pdf->SetXY($dims['lm'], -$posy);

-				if (!getDolGlobalString('PDF_ALLOW_HTML_FOR_FREE_TEXT')) {   // by default

-					$pdf->MultiCell(0, 3, $line, 0, $align, 0);

-				} else {

-					$pdf->writeHTMLCell($dims['wk'] - $dims['lm'] - $dims['rm'], $freetextheight, $dims['lm'], $dims['hk'] - $marginwithfooter, dol_htmlentitiesbr($line, 1, 'UTF-8', 0));

-				}

-				$posy -= $freetextheight;

-			}

-			if (getDolGlobalInt('PDF_FREETEXT_DISABLE_PAGEBREAK') === 1) {

-				$pdf->SetAutoPageBreak(1, 0);

-			} // Restore pagebreak

-

-			$pdf->SetY(-$posy);

-

-			// Hide footer line if footer background color is set

-			if (!getDolGlobalString('PDF_FOOTER_BACKGROUND_COLOR')) {

-				$pdf->line($dims['lm'], $dims['hk'] - $posy, $dims['wk'] - $dims['rm'], $dims['hk'] - $posy);

-			}

-

-			// Option for set top margin height of footer after freetext

-			if (getDolGlobalString('PDF_FOOTER_TOP_MARGIN') || getDolGlobalInt('PDF_FOOTER_TOP_MARGIN') === 0) {

-				$posy -= (float) getDolGlobalString('PDF_FOOTER_TOP_MARGIN');

-			} else {

-				$posy--;

-			}

-

-			if (getDolGlobalInt('PDF_FOOTER_DISABLE_PAGEBREAK') === 1) {

-				$pdf->SetAutoPageBreak(0, 0);

-			} // Option for disable auto pagebreak

-			$pdf->writeHTMLCell($dims['wk'] - $dims['lm'] - $dims['rm'], $mycustomfooterheight, $dims['lm'], $dims['hk'] - $posy, dol_htmlentitiesbr($mycustomfooter, 1, 'UTF-8', 0));

-			if (getDolGlobalInt('PDF_FOOTER_DISABLE_PAGEBREAK') === 1) {

-				$pdf->SetAutoPageBreak(1, 0);

-			} // Restore pagebreak

-

-			$posy -= $mycustomfooterheight - 3;

-		} else {

-			// Else default footer

-			$marginwithfooter = $marge_basse + $freetextheight + (!empty($line1) ? 3 : 0) + (!empty($line2) ? 3 : 0) + (!empty($line3) ? 3 : 0) + (!empty($line4) ? 3 : 0);

-			$posy = (float) $marginwithfooter;

-

-			// Option for footer background color (without freetext zone)

-			if (getDolGlobalString('PDF_FOOTER_BACKGROUND_COLOR')) {

-				list($r, $g, $b) = sscanf($conf->global->PDF_FOOTER_BACKGROUND_COLOR, '%d, %d, %d');

-				$pdf->SetAutoPageBreak(0, 0); // Disable auto pagebreak

-				$pdf->Rect(0, $dims['hk'] - $posy + $freetextheight, $dims['wk'] + 1, $marginwithfooter + 1, 'F', '', $fill_color = array($r, $g, $b));

-				$pdf->SetAutoPageBreak(1, 0); // Restore pagebreak

-			}

-

-			if (getDolGlobalInt('PDF_FREETEXT_DISABLE_PAGEBREAK') === 1) {

-				$pdf->SetAutoPageBreak(0, 0);

-			} // Option for disable auto pagebreak

-			if ($line) {	// Free text

-				$pdf->SetXY($dims['lm'], -$posy);

-				if (!getDolGlobalString('PDF_ALLOW_HTML_FOR_FREE_TEXT')) {   // by default

-					$pdf->MultiCell(0, 3, $line, 0, $align, 0);

-				} else {

-					$pdf->writeHTMLCell($dims['wk'] - $dims['lm'] - $dims['rm'], $freetextheight, $dims['lm'], $dims['hk'] - $marginwithfooter, dol_htmlentitiesbr($line, 1, 'UTF-8', 0));

-				}

-				$posy -= $freetextheight;

-			}

-			if (getDolGlobalInt('PDF_FREETEXT_DISABLE_PAGEBREAK') === 1) {

-				$pdf->SetAutoPageBreak(1, 0);

-			} // Restore pagebreak

-

-			$pdf->SetY(-$posy);

-

-			// Option for hide all footer (page number will no hidden)

-			if (!getDolGlobalInt('PDF_FOOTER_HIDDEN')) {

-				// Hide footer line if footer background color is set

-				if (!getDolGlobalString('PDF_FOOTER_BACKGROUND_COLOR')) {

-					$pdf->line($dims['lm'], $dims['hk'] - $posy, $dims['wk'] - $dims['rm'], $dims['hk'] - $posy);

-				}

-

-				// Option for set top margin height of footer after freetext

-				if (getDolGlobalString('PDF_FOOTER_TOP_MARGIN') || getDolGlobalInt('PDF_FOOTER_TOP_MARGIN') === 0) {

-					$posy -= (float) getDolGlobalString('PDF_FOOTER_TOP_MARGIN');

-				} else {

-					$posy--;

-				}

-

-				if (!empty($line1)) {

-					$pdf->SetFont('', 'B', 7);

-					$pdf->SetXY($dims['lm'], -$posy);

-					$pdf->MultiCell($dims['wk'] - $dims['rm'] - $dims['lm'], 2, $line1, 0, 'C', 0);

-					$posy -= 3;

-					$pdf->SetFont('', '', 7);

-				}

-

-				if (!empty($line2)) {

-					$pdf->SetFont('', 'B', 7);

-					$pdf->SetXY($dims['lm'], -$posy);

-					$pdf->MultiCell($dims['wk'] - $dims['rm'] - $dims['lm'], 2, $line2, 0, 'C', 0);

-					$posy -= 3;

-					$pdf->SetFont('', '', 7);

-				}

-

-				if (!empty($line3)) {

-					$pdf->SetXY($dims['lm'], -$posy);

-					$pdf->MultiCell($dims['wk'] - $dims['rm'] - $dims['lm'], 2, $line3, 0, 'C', 0);

-				}

-

-				if (!empty($line4)) {

-					$posy -= 3;

-					$pdf->SetXY($dims['lm'], -$posy);

-					$pdf->MultiCell($dims['wk'] - $dims['rm'] - $dims['lm'], 2, $line4, 0, 'C', 0);

-				}

-			}

-		}

-	}

-

-	// Show page nb and apply correction for some font.

-	$pdf->SetXY($dims['wk'] - $dims['rm'] - 18 - getDolGlobalInt('PDF_FOOTER_PAGE_NUMBER_X', 0), -$posy - getDolGlobalInt('PDF_FOOTER_PAGE_NUMBER_Y', 0));

-	$pagination = $pdf->PageNo().' / '.$pdf->getAliasNbPages();

-	$fontRenderCorrection = 0;

-	if (in_array(pdf_getPDFFont($outputlangs), array('freemono',  'DejaVuSans'))) {

-		$fontRenderCorrection = 10;

-	}

-	$pdf->MultiCell(18 + $fontRenderCorrection, 2, $pagination, 0, 'R', 0);

-

-	//  Show Draft Watermark

-	if (!empty($watermark)) {

-		pdf_watermark($pdf, $outputlangs, $page_hauteur, $page_largeur, 'mm', $watermark);

+	    if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))

+		{

+			$width = 20000; $align = 'L'; // By default, ask a manual break: We use a large value 20000, to not have automatic wrap. This make user understand, he need to add CR on its text.

+    		if (!empty($conf->global->MAIN_USE_AUTOWRAP_ON_FREETEXT)) {

+    			$width = 200; $align = 'C';

+    		}

+		    $freetextheight = $pdf->getStringHeight($width, $line);

+		}

+		else

+		{

+            $freetextheight = pdfGetHeightForHtmlContent($pdf, dol_htmlentitiesbr($line, 1, 'UTF-8', 0)); // New method (works for HTML content)

+            //print '<br>'.$freetextheight;exit;

+		}

+	}

+

+	$marginwithfooter = $marge_basse + $freetextheight + (!empty($line1) ? 3 : 0) + (!empty($line2) ? 3 : 0) + (!empty($line3) ? 3 : 0) + (!empty($line4) ? 3 : 0);

+	$posy = $marginwithfooter + 0;

+

+	if ($line)	// Free text

+	{

+		$pdf->SetXY($dims['lm'], -$posy);

+		if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))   // by default

+		{

+            $pdf->MultiCell(0, 3, $line, 0, $align, 0);

+		}

+		else

+		{

+            $pdf->writeHTMLCell($pdf->page_largeur - $pdf->margin_left - $pdf->margin_right, $freetextheight, $dims['lm'], $dims['hk'] - $marginwithfooter, dol_htmlentitiesbr($line, 1, 'UTF-8', 0));

+		}

+		$posy -= $freetextheight;

+	}

+

+	$pdf->SetY(-$posy);

+	$pdf->line($dims['lm'], $dims['hk'] - $posy, $dims['wk'] - $dims['rm'], $dims['hk'] - $posy);

+	$posy--;

+

+	if (!empty($line1))

+	{

+		$pdf->SetFont('', 'B', 7);

+		$pdf->SetXY($dims['lm'], -$posy);

+		$pdf->MultiCell($dims['wk'] - $dims['rm'] - $dims['lm'], 2, $line1, 0, 'C', 0);

+		$posy -= 3;

+		$pdf->SetFont('', '', 7);

+	}

+

+	if (!empty($line2))

+	{

+		$pdf->SetFont('', 'B', 7);

+		$pdf->SetXY($dims['lm'], -$posy);

+		$pdf->MultiCell($dims['wk'] - $dims['rm'] - $dims['lm'], 2, $line2, 0, 'C', 0);

+		$posy -= 3;

+		$pdf->SetFont('', '', 7);

+	}

+

+	if (!empty($line3))

+	{

+		$pdf->SetXY($dims['lm'], -$posy);

+		$pdf->MultiCell($dims['wk'] - $dims['rm'] - $dims['lm'], 2, $line3, 0, 'C', 0);

+	}

+

+	if (!empty($line4))

+	{

+		$posy -= 3;

+		$pdf->SetXY($dims['lm'], -$posy);

+		$pdf->MultiCell($dims['wk'] - $dims['rm'] - $dims['lm'], 2, $line4, 0, 'C', 0);

+	}

+

+	// Show page nb only on iso languages (so default Helvetica font)

+	if (strtolower(pdf_getPDFFont($outputlangs)) == 'helvetica')

+	{

+		$pdf->SetXY($dims['wk'] - $dims['rm'] - 15, -$posy);

+		//print 'xxx'.$pdf->PageNo().'-'.$pdf->getAliasNbPages().'-'.$pdf->getAliasNumPage();exit;

+		$pdf->MultiCell(15, 2, $pdf->PageNo().'/'.$pdf->getAliasNbPages(), 0, 'R', 0);

@@ -1389,6 +1149,9 @@
-	if (!empty($linkedobjects)) {

-		foreach ($linkedobjects as $linkedobject) {

-			$reftoshow = $linkedobject["ref_title"].' : '.$linkedobject["ref_value"];

-			if (!empty($linkedobject["date_value"])) {

-				$reftoshow .= ' / '.$linkedobject["date_value"];

-			}

+	if (!empty($linkedobjects))

+	{

+		foreach ($linkedobjects as $linkedobject)

+		{

+		    $reftoshow = $linkedobject["ref_title"].' : '.$linkedobject["ref_value"];

+		    if (!empty($linkedobject["date_value"]))

+		    {

+		        $reftoshow .= ' / '.$linkedobject["date_value"];

+		    }

@@ -1409 +1172 @@
- *  @param  TCPDF			$pdf               	PDF object

+ *  @param  TCPDF				$pdf               PDF object

@@ -1428,6 +1191,5 @@
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )

-	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run

-		$special_code = empty($object->lines[$i]->special_code) ? '' : $object->lines[$i]->special_code;

-		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {

-			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);

-		}

+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )

+	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run

+	{

+		$special_code = $object->lines[$i]->special_code;

+		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);

@@ -1438,5 +1200,4 @@
-		if (!empty($hookmanager->resPrint)) {

-			$result .= $hookmanager->resPrint;

-		}

-	}

-	if (empty($reshook)) {

+		if (!empty($hookmanager->resPrint)) $result .= $hookmanager->resPrint;

+	}

+	if (empty($reshook))

+	{

@@ -1449 +1209,0 @@
-		$nbrep = 0;

@@ -1452,5 +1212 @@
-		if (getDolGlobalString('MARGIN_TOP_ZERO_UL')) {

-			$pdf->setListIndentWidth(5);

-			$TMarginList = ['ul' => [['h'=>0.1, ],['h'=>0.1, ]], 'li' => [['h'=>0.1, ],],];

-			$pdf->setHtmlVSpace($TMarginList);

-		}

+		//var_dump($labelproductservice);exit;

@@ -1482 +1237,0 @@
-	$product_barcode = (!empty($object->lines[$i]->product_barcode) ? $object->lines[$i]->product_barcode : "");

@@ -1488 +1243,2 @@
-	if ($issupplierline) {

+	if ($issupplierline)

+	{

@@ -1491 +1247,3 @@
-	} else {

+	}

+	else

+	{

@@ -1494,7 +1252,4 @@
-

-		if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {

-			include_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';

-		}

-	}

-

-	if ($idprod) {

+	}

+

+	if ($idprod)

+	{

@@ -1503,2 +1258,3 @@
-		if (getDolGlobalInt('MAIN_MULTILANGS') && ($outputlangs->defaultlang != $langs->defaultlang)) {

-			$translatealsoifmodified = (getDolGlobalString('MAIN_MULTILANG_TRANSLATE_EVEN_IF_MODIFIED')); // By default if value was modified manually, we keep it (no translation because we don't have it)

+		if (!empty($conf->global->MAIN_MULTILANGS) && ($outputlangs->defaultlang != $langs->defaultlang))

+		{

+			$translatealsoifmodified = (!empty($conf->global->MAIN_MULTILANG_TRANSLATE_EVEN_IF_MODIFIED)); // By default if value was modified manually, we keep it (no translation because we don't have it)

@@ -1507 +1263 @@
-			// ($textwasnotmodified is replaced with $textwasmodifiedorcompleted and we add completion).

+			// ($textwasmodified is replaced with $textwasmodifiedorcompleted and we add completion).

@@ -1510 +1266 @@
-			// If we want another language, and if label is same than default language (we did not force it to a specific value), we can use translation.

+			// If we want another language, and if label is same than default language (we did force it to a specific value), we can use translation.

@@ -1512,4 +1268,2 @@
-			$textwasnotmodified = ($label == $prodser->label);

-			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && ($textwasnotmodified || $translatealsoifmodified)) {

-				$label = $prodser->multilangs[$outputlangs->defaultlang]["label"];

-			}

+			$textwasmodified = ($label == $prodser->label);

+			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && ($textwasmodified || $translatealsoifmodified))     $label = $prodser->multilangs[$outputlangs->defaultlang]["label"];

@@ -1519 +1273 @@
-			$textwasnotmodified = false;

+			$textwasmodified = false;

@@ -1521 +1275 @@
-				$textwasnotmodified = (strpos(dol_html_entity_decode($desc, ENT_QUOTES | ENT_HTML5), dol_html_entity_decode($prodser->description, ENT_QUOTES | ENT_HTML5)) !== false);

+				$textwasmodified = (strpos(dol_html_entity_decode($desc, ENT_QUOTES | ENT_HTML401), dol_html_entity_decode($prodser->description, ENT_QUOTES | ENT_HTML401)) !== false);

@@ -1523 +1277 @@
-				$textwasnotmodified = ($desc == $prodser->description);

+				$textwasmodified = ($desc == $prodser->description);

@@ -1525,7 +1279 @@
-			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["description"])) {

-				if ($textwasnotmodified) {

-					$desc = str_replace($prodser->description, $prodser->multilangs[$outputlangs->defaultlang]["description"], $desc);

-				} elseif ($translatealsoifmodified) {

-					$desc = $prodser->multilangs[$outputlangs->defaultlang]["description"];

-				}

-			}

+			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && ($textwasmodified || $translatealsoifmodified))  $desc = $prodser->multilangs[$outputlangs->defaultlang]["description"];

@@ -1534,62 +1282,12 @@
-			$textwasnotmodified = ($note == $prodser->note_public);

-			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["other"]) && ($textwasnotmodified || $translatealsoifmodified)) {

-				$note = $prodser->multilangs[$outputlangs->defaultlang]["other"];

-			}

-		}

-	} elseif (($object->element == 'facture' || $object->element == 'facturefourn') && preg_match('/^\(DEPOSIT\).+/', $desc)) { // We must not replace '(DEPOSIT)' when it is alone, it will be translated and detailed later

-		$desc = str_replace('(DEPOSIT)', $outputlangs->trans('Deposit'), $desc);

-	}

-

-	if (!getDolGlobalString('PDF_HIDE_PRODUCT_LABEL_IN_SUPPLIER_LINES')) {

-		// Description short of product line

-		$libelleproduitservice = $label;

-		if (!empty($libelleproduitservice) && getDolGlobalString('PDF_BOLD_PRODUCT_LABEL')) {

-			// Adding <b> may convert the original string into a HTML string. Sowe have to first

-			// convert \n into <br> we text is not already HTML.

-			if (!dol_textishtml($libelleproduitservice)) {

-				$libelleproduitservice = str_replace("\n", '<br>', $libelleproduitservice);

-			}

-			$libelleproduitservice = '<b>'.$libelleproduitservice.'</b>';

-		}

-	}

-

-

-	// Add ref of subproducts

-	if (getDolGlobalString('SHOW_SUBPRODUCT_REF_IN_PDF')) {

-		$prodser->get_sousproduits_arbo();

-		if (!empty($prodser->sousprods) && is_array($prodser->sousprods) && count($prodser->sousprods)) {

-			$outputlangs->load('mrp');

-			$tmparrayofsubproducts = reset($prodser->sousprods);

-

-			$qtyText = null;

-			if (isset($object->lines[$i]->qty) && !empty($object->lines[$i]->qty)) {

-				$qtyText = $object->lines[$i]->qty;

-			} elseif (isset($object->lines[$i]->qty_shipped) && !empty($object->lines[$i]->qty_shipped)) {

-				$qtyText = $object->lines[$i]->qty;

-			}

-

-			if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF')) {

-				foreach ($tmparrayofsubproducts as $subprodval) {

-					$libelleproduitservice = dol_concatdesc(

-						dol_concatdesc($libelleproduitservice, " * ".$subprodval[3]),

-						(!empty($qtyText) ?

-							$outputlangs->trans('Qty').':'.$qtyText.' x '.$outputlangs->trans('AssociatedProducts').':'.$subprodval[1].'= '.$outputlangs->trans('QtyTot').':'.$subprodval[1]*$qtyText :

-							$outputlangs->trans('Qty').' '.$outputlangs->trans('AssociatedProducts').':'.$subprodval[1])

-					);

-				}

-			} else {

-				foreach ($tmparrayofsubproducts as $subprodval) {

-					$libelleproduitservice = dol_concatdesc(

-						dol_concatdesc($libelleproduitservice, " * ".$subprodval[5].(($subprodval[5] && $subprodval[3]) ? ' - ' : '').$subprodval[3]),

-						(!empty($qtyText) ?

-							$outputlangs->trans('Qty').':'.$qtyText.' x '.$outputlangs->trans('AssociatedProducts').':'.$subprodval[1].'= '.$outputlangs->trans('QtyTot').':'.$subprodval[1]*$qtyText :

-							$outputlangs->trans('Qty').' '.$outputlangs->trans('AssociatedProducts').':'.$subprodval[1])

-					);

-				}

-			}

-		}

-	}

-

-	if (isModEnabled('barcode') && getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_PRODUCT_BARCODE') && !empty($product_barcode)) {

-		$libelleproduitservice = dol_concatdesc($libelleproduitservice, $outputlangs->trans("BarCode")." ".$product_barcode);

-	}

+			$textwasmodified = ($note == $prodser->note);

+			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && ($textwasmodified || $translatealsoifmodified))  $note = $prodser->multilangs[$outputlangs->defaultlang]["note"];

+		}

+	}

+	elseif ($object->element == 'facture' || $object->element == 'facturefourn') {

+		if ($object->type == $object::TYPE_DEPOSIT) {

+			$desc = str_replace('(DEPOSIT)', $outputlangs->trans('Deposit'), $desc);

+		}

+	}

+

+	// Description short of product line

+	$libelleproduitservice = $label;

@@ -1598,2 +1296,9 @@
-	if (!empty($desc) && ($desc != $label)) {

-		if ($desc == '(CREDIT_NOTE)' && $object->lines[$i]->fk_remise_except) {

+	if (!empty($desc) && ($desc != $label))

+	{

+		if ($libelleproduitservice && empty($hidedesc))

+		{

+			$libelleproduitservice .= '__N__';

+		}

+

+		if ($desc == '(CREDIT_NOTE)' && $object->lines[$i]->fk_remise_except)

+		{

@@ -1602 +1307 @@
-			$sourceref = !empty($discount->discount_type) ? $discount->ref_invoice_supplier_source : $discount->ref_facture_source;

+			$sourceref = !empty($discount->discount_type) ? $discount->ref_invoive_supplier_source : $discount->ref_facture_source;

@@ -1604 +1309,3 @@
-		} elseif ($desc == '(DEPOSIT)' && $object->lines[$i]->fk_remise_except) {

+		}

+		elseif ($desc == '(DEPOSIT)' && $object->lines[$i]->fk_remise_except)

+		{

@@ -1607 +1314 @@
-			$sourceref = !empty($discount->discount_type) ? $discount->ref_invoice_supplier_source : $discount->ref_facture_source;

+			$sourceref = !empty($discount->discount_type) ? $discount->ref_invoive_supplier_source : $discount->ref_facture_source;

@@ -1610,4 +1317,4 @@
-			if (getDolGlobalString('INVOICE_ADD_DEPOSIT_DATE')) {

-				$libelleproduitservice .= ' ('.dol_print_date($discount->datec, 'day', '', $outputlangs).')';

-			}

-		} elseif ($desc == '(EXCESS RECEIVED)' && $object->lines[$i]->fk_remise_except) {

+			if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) $libelleproduitservice .= ' ('.dol_print_date($discount->datec, 'day', '', $outputlangs).')';

+		}

+		elseif ($desc == '(EXCESS RECEIVED)' && $object->lines[$i]->fk_remise_except)

+		{

@@ -1617 +1324,3 @@
-		} elseif ($desc == '(EXCESS PAID)' && $object->lines[$i]->fk_remise_except) {

+		}

+		elseif ($desc == '(EXCESS PAID)' && $object->lines[$i]->fk_remise_except)

+		{

@@ -1621,7 +1330,14 @@
-		} else {

-			if ($idprod) {

-				// Check if description must be output

-				if (!empty($object->element)) {

-					$tmpkey = 'MAIN_DOCUMENTS_HIDE_DESCRIPTION_FOR_'.strtoupper($object->element);

-					if (!empty($conf->global->$tmpkey)) {

-						$hidedesc = 1;

+		}

+		else

+		{

+			if ($idprod)

+			{

+				if (empty($hidedesc))

+				{

+					if (!empty($conf->global->MAIN_DOCUMENTS_DESCRIPTION_FIRST))

+					{

+						$libelleproduitservice = $desc."\n".$libelleproduitservice;

+					}

+					else

+					{

+						$libelleproduitservice .= $desc;

@@ -1630,13 +1346,4 @@
-				if (empty($hidedesc)) {

-					if (getDolGlobalString('MAIN_DOCUMENTS_DESCRIPTION_FIRST')) {

-						$libelleproduitservice = dol_concatdesc($desc, $libelleproduitservice);

-					} else {

-						if (getDolGlobalString('HIDE_LABEL_VARIANT_PDF') && $prodser->isVariant()) {

-							$libelleproduitservice = $desc;

-						} else {

-							$libelleproduitservice = dol_concatdesc($libelleproduitservice, $desc);

-						}

-					}

-				}

-			} else {

-				$libelleproduitservice = dol_concatdesc($libelleproduitservice, $desc);

+			}

+			else

+			{

+				$libelleproduitservice .= $desc;

@@ -1650,2 +1357,4 @@
-	if (getDolGlobalString('PRODUCT_ADD_TYPE_IN_DOCUMENTS')) {   // In standard mode, we do not show this

-		if ($prodser->isService()) {

+	if (!empty($conf->global->PRODUCT_ADD_TYPE_IN_DOCUMENTS))   // In standard mode, we do not show this

+	{

+		if ($prodser->isService())

+		{

@@ -1653 +1362,3 @@
-		} else {

+		}

+		else

+		{

@@ -1658,3 +1369,10 @@
-	if (empty($hideref)) {

-		if ($issupplierline) {

-			if (!getDolGlobalString('PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES')) {  // Common case

+	if (empty($hideref))

+	{

+		if ($issupplierline)

+		{

+			if ($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES == 1)

+				$ref_prodserv = $ref_supplier;

+			elseif ($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES == 2)

+				$ref_prodserv = $ref_supplier.' ('.$outputlangs->transnoentitiesnoconv("InternalRef").' '.$prodser->ref.')';

+			else	// Common case

+			{

@@ -1662,7 +1380 @@
-				if ($ref_supplier) {

-					$ref_prodserv .= ($prodser->ref ? ' (' : '').$outputlangs->transnoentitiesnoconv("SupplierRef").' '.$ref_supplier.($prodser->ref ? ')' : '');

-				}

-			} elseif (getDolGlobalInt('PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES') == 1) {

-				$ref_prodserv = $ref_supplier;

-			} elseif (getDolGlobalInt('PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES') == 2) {

-				$ref_prodserv = $ref_supplier.' ('.$outputlangs->transnoentitiesnoconv("InternalRef").' '.$prodser->ref.')';

+				if ($ref_supplier) $ref_prodserv .= ($prodser->ref ? ' (' : '').$outputlangs->transnoentitiesnoconv("SupplierRef").' '.$ref_supplier.($prodser->ref ? ')' : '');

@@ -1670 +1382,3 @@
-		} else {

+		}

+		else

+		{

@@ -1672,40 +1386,6 @@
-

-			if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {

-				$productCustomerPriceStatic = new ProductCustomerPrice($db);

-				$filter = array('fk_product' => $idprod, 'fk_soc' => $object->socid);

-

-				$nbCustomerPrices = $productCustomerPriceStatic->fetchAll('', '', 1, 0, $filter);

-

-				if ($nbCustomerPrices > 0) {

-					$productCustomerPrice = $productCustomerPriceStatic->lines[0];

-

-					if (!empty($productCustomerPrice->ref_customer)) {

-						switch ($conf->global->PRODUIT_CUSTOMER_PRICES_PDF_REF_MODE) {

-							case 1:

-								$ref_prodserv = $productCustomerPrice->ref_customer;

-								break;

-

-							case 2:

-								$ref_prodserv = $productCustomerPrice->ref_customer . ' (' . $outputlangs->transnoentitiesnoconv('InternalRef') . ' ' . $ref_prodserv . ')';

-								break;

-

-							default:

-								$ref_prodserv = $ref_prodserv . ' (' . $outputlangs->transnoentitiesnoconv('RefCustomer') . ' ' . $productCustomerPrice->ref_customer . ')';

-						}

-					}

-				}

-			}

-		}

-

-		if (!empty($libelleproduitservice) && !empty($ref_prodserv)) {

-			$ref_prodserv .= " - ";

-		}

-	}

-

-	if (!empty($ref_prodserv) && getDolGlobalString('PDF_BOLD_PRODUCT_REF_AND_PERIOD')) {

-		if (!dol_textishtml($libelleproduitservice)) {

-			$libelleproduitservice = str_replace("\n", '<br>', $libelleproduitservice);

-		}

-		$ref_prodserv = '<b>'.$ref_prodserv.'</b>';

-		// $prefix_prodserv and $ref_prodser are not HTML var

-	}

+		}

+

+		if (!empty($libelleproduitservice) && !empty($ref_prodserv)) $ref_prodserv .= " - ";

+	}

+

+	if (!empty($ref_prodserv) && !empty($conf->global->PDF_BOLD_PRODUCT_REF_AND_PERIOD)) { $ref_prodserv = '<b>'.$ref_prodserv.'</b>'; }

@@ -1715 +1395,2 @@
-	if (getDolGlobalString('CATEGORY_ADD_DESC_INTO_DOC') && $idprod && isModEnabled('categorie')) {

+	if (!empty($conf->global->CATEGORY_ADD_DESC_INTO_DOC) && $idprod && !empty($conf->categorie->enabled))

+	{

@@ -1720 +1401,2 @@
-		foreach ($tblcateg as $cate) {

+		foreach ($tblcateg as $cate)

+		{

@@ -1723,7 +1405,7 @@
-			if ($desccateg) {

-				$libelleproduitservice = dol_concatdesc($libelleproduitservice, $desccateg);

-			}

-		}

-	}

-

-	if (!empty($object->lines[$i]->date_start) || !empty($object->lines[$i]->date_end)) {

+			if ($desccateg)

+				$libelleproduitservice .= '__N__'.$desccateg;

+		}

+	}

+

+	if (!empty($object->lines[$i]->date_start) || !empty($object->lines[$i]->date_end))

+	{

@@ -1731 +1413 @@
-		$period = '';

+        $period = '';

@@ -1733 +1415,2 @@
-		if ($object->lines[$i]->date_start && $object->lines[$i]->date_end) {

+		if ($object->lines[$i]->date_start && $object->lines[$i]->date_end)

+		{

@@ -1736 +1419,2 @@
-		if ($object->lines[$i]->date_start && !$object->lines[$i]->date_end) {

+		if ($object->lines[$i]->date_start && !$object->lines[$i]->date_end)

+		{

@@ -1739 +1423,2 @@
-		if (!$object->lines[$i]->date_start && $object->lines[$i]->date_end) {

+		if (!$object->lines[$i]->date_start && $object->lines[$i]->date_end)

+		{

@@ -1743,5 +1428,2 @@
-		if (getDolGlobalString('PDF_BOLD_PRODUCT_REF_AND_PERIOD')) {

-			if (!dol_textishtml($libelleproduitservice)) {

-				$libelleproduitservice = str_replace("\n", '<br>', $libelleproduitservice);

-			}

-			$libelleproduitservice .= '<br><b style="color:#333666;" ><em>'.$period.'</em></b>';

+		if (!empty($conf->global->PDF_BOLD_PRODUCT_REF_AND_PERIOD)) {

+		    $libelleproduitservice .= '<b style="color:#333666;" ><em>'."__N__</b> ".$period.'</em>';

@@ -1749 +1431 @@
-			$libelleproduitservice = dol_concatdesc($libelleproduitservice, $period);

+		    $libelleproduitservice .= "__N__".$period;

@@ -1754,11 +1436,2 @@
-	// Show information for lot

-	if (!empty($dbatch)) {

-		// $object is a shipment.

-		//var_dump($object->lines[$i]->details_entrepot);		// array from llx_expeditiondet (we can have several lines for one fk_origin_line)

-		//var_dump($object->lines[$i]->detail_batch);			// array from llx_expeditiondet_batch (each line with a lot is linked to llx_expeditiondet)

-

-		include_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';

-		include_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';

-		$tmpwarehouse = new Entrepot($db);

-		$tmpproductbatch = new Productbatch($db);

-

+	if ($dbatch)

+	{

@@ -1766 +1439,2 @@
-		foreach ($dbatch as $detail) {

+		foreach ($dbatch as $detail)

+		{

@@ -1768,9 +1442,3 @@
-			if ($detail->eatby) {

-				$dte[] = $outputlangs->transnoentitiesnoconv('printEatby', dol_print_date($detail->eatby, $format, false, $outputlangs));

-			}

-			if ($detail->sellby) {

-				$dte[] = $outputlangs->transnoentitiesnoconv('printSellby', dol_print_date($detail->sellby, $format, false, $outputlangs));

-			}

-			if ($detail->batch) {

-				$dte[] = $outputlangs->transnoentitiesnoconv('printBatch', $detail->batch);

-			}

+			if ($detail->eatby) $dte[] = $outputlangs->transnoentitiesnoconv('printEatby', dol_print_date($detail->eatby, $format, false, $outputlangs));

+			if ($detail->sellby) $dte[] = $outputlangs->transnoentitiesnoconv('printSellby', dol_print_date($detail->sellby, $format, false, $outputlangs));

+			if ($detail->batch) $dte[] = $outputlangs->transnoentitiesnoconv('printBatch', $detail->batch);

@@ -1778,12 +1445,0 @@
-

-			// Add also info of planned warehouse for lot

-			if ($object->element == 'shipping' && $detail->fk_origin_stock > 0 && getDolGlobalInt('PRODUCTBATCH_SHOW_WAREHOUSE_ON_SHIPMENT')) {

-				$resproductbatch = $tmpproductbatch->fetch($detail->fk_origin_stock);

-				if ($resproductbatch > 0) {

-					$reswarehouse = $tmpwarehouse->fetch($tmpproductbatch->warehouseid);

-					if ($reswarehouse > 0) {

-						$dte[] = $tmpwarehouse->ref;

-					}

-				}

-			}

-

@@ -1792,4 +1447,0 @@
-	} else {

-		if (getDolGlobalInt('PRODUCTBATCH_SHOW_WAREHOUSE_ON_SHIPMENT')) {

-			// TODO Show warehouse for shipment line without batch

-		}

@@ -1799,5 +1451,2 @@
-	if (dol_textishtml($libelleproduitservice)) {

-		$libelleproduitservice = preg_replace('/__N__/', '<br>', $libelleproduitservice);

-	} else {

-		$libelleproduitservice = preg_replace('/__N__/', "\n", $libelleproduitservice);

-	}

+	if (dol_textishtml($libelleproduitservice)) $libelleproduitservice = preg_replace('/__N__/', '<br>', $libelleproduitservice);

+	else $libelleproduitservice = preg_replace('/__N__/', "\n", $libelleproduitservice);

@@ -1824,6 +1473,5 @@
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )

-	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run

-		$special_code = empty($object->lines[$i]->special_code) ? '' : $object->lines[$i]->special_code;

-		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {

-			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);

-		}

+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )

+	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run

+	{

+		$special_code = $object->lines[$i]->special_code;

+		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);

@@ -1835 +1483,2 @@
-	if (empty($reshook)) {

+	if (empty($reshook))

+	{

@@ -1857,6 +1506,5 @@
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )

-	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run

-		$special_code = empty($object->lines[$i]->special_code) ? '' : $object->lines[$i]->special_code;

-		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {

-			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);

-		}

+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )

+	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run

+	{

+		$special_code = $object->lines[$i]->special_code;

+		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);

@@ -1868 +1516,2 @@
-	if (empty($reshook)) {

+	if (empty($reshook))

+	{

@@ -1889,6 +1538,5 @@
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )

-	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run

-		$special_code = empty($object->lines[$i]->special_code) ? '' : $object->lines[$i]->special_code;

-		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {

-			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);

-		}

+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )

+	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run

+	{

+		$special_code = $object->lines[$i]->special_code;

+		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);

@@ -1900 +1548,2 @@
-	if (empty($reshook)) {

+	if (empty($reshook))

+	{

@@ -1921,6 +1570,5 @@
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )

-	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduce this test in the pdf_xxx function if you don't want your hook to run

-		$special_code = empty($object->lines[$i]->special_code) ? '' : $object->lines[$i]->special_code;

-		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {

-			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);

-		}

+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )

+	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduce this test in the pdf_xxx function if you don't want your hook to run

+	{

+		$special_code = $object->lines[$i]->special_code;

+		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);

@@ -1931,6 +1579,6 @@
-		if (!empty($hookmanager->resPrint)) {

-			$result .= $hookmanager->resPrint;

-		}

-	}

-	if (empty($reshook)) {

-		if (empty($hidedetails) || $hidedetails > 1) {

+		if (!empty($hookmanager->resPrint)) $result .= $hookmanager->resPrint;

+	}

+	if (empty($reshook))

+	{

+		if (empty($hidedetails) || $hidedetails > 1)

+		{

@@ -1940,7 +1588,6 @@
-			if (!getDolGlobalString('MAIN_PDF_MAIN_HIDE_SECOND_TAX')) {

-				if ($object->lines[$i]->total_localtax1 != 0) {

-					if (preg_replace('/[\s0%]/', '', $tmpresult)) {

-						$tmpresult .= '/';

-					} else {

-						$tmpresult = '';

-					}

+			if (empty($conf->global->MAIN_PDF_MAIN_HIDE_SECOND_TAX))

+			{

+				if ($object->lines[$i]->total_localtax1 != 0)

+				{

+					if (preg_replace('/[\s0%]/', '', $tmpresult)) $tmpresult .= '/';

+					else $tmpresult = '';

@@ -1950,7 +1597,6 @@
-			if (!getDolGlobalString('MAIN_PDF_MAIN_HIDE_THIRD_TAX')) {

-				if ($object->lines[$i]->total_localtax2 != 0) {

-					if (preg_replace('/[\s0%]/', '', $tmpresult)) {

-						$tmpresult .= '/';

-					} else {

-						$tmpresult = '';

-					}

+			if (empty($conf->global->MAIN_PDF_MAIN_HIDE_THIRD_TAX))

+			{

+				if ($object->lines[$i]->total_localtax2 != 0)

+				{

+					if (preg_replace('/[\s0%]/', '', $tmpresult)) $tmpresult .= '/';

+					else $tmpresult = '';

@@ -1982,3 +1628 @@
-	if (isset($object->type) && $object->type == 2 && getDolGlobalString('INVOICE_POSITIVE_CREDIT_NOTE')) {

-		$sign = -1;

-	}

+	if (isset($object->type) && $object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;

@@ -1988,6 +1632,5 @@
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )

-	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run

-		$special_code = empty($object->lines[$i]->special_code) ? '' : $object->lines[$i]->special_code;

-		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {

-			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);

-		}

+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )

+	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run

+	{

+		$special_code = $object->lines[$i]->special_code;

+		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);

@@ -1998,7 +1641,7 @@
-		if (!empty($hookmanager->resPrint)) {

-			$result .= $hookmanager->resPrint;

-		}

-	}

-	if (empty($reshook)) {

-		if (empty($hidedetails) || $hidedetails > 1) {

-			$subprice = (isModEnabled("multicurrency") && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_subprice : $object->lines[$i]->subprice);

+		if (!empty($hookmanager->resPrint)) $result .= $hookmanager->resPrint;

+	}

+	if (empty($reshook))

+	{

+		if (empty($hidedetails) || $hidedetails > 1)

+		{

+			$subprice = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_subprice : $object->lines[$i]->subprice);

@@ -2025,3 +1668 @@
-	if (isset($object->type) && $object->type == 2 && getDolGlobalString('INVOICE_POSITIVE_CREDIT_NOTE')) {

-		$sign = -1;

-	}

+	if (isset($object->type) && $object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;

@@ -2031,6 +1672,5 @@
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )

-	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run

-		$special_code = empty($object->lines[$i]->special_code) ? '' : $object->lines[$i]->special_code;

-		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {

-			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);

-		}

+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )

+	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run

+	{

+		$special_code = $object->lines[$i]->special_code;

+		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);

@@ -2041,8 +1681,5 @@
-		if (!empty($hookmanager->resPrint)) {

-			$result .= $hookmanager->resPrint;

-		}

-	}

-	if (empty($reshook)) {

-		if (empty($hidedetails) || $hidedetails > 1) {

-			$result .= price($sign * (($object->lines[$i]->subprice) + ($object->lines[$i]->subprice) * ($object->lines[$i]->tva_tx) / 100), 0, $outputlangs);

-		}

+		if (!empty($hookmanager->resPrint)) $result .= $hookmanager->resPrint;

+	}

+	if (empty($reshook))

+	{

+		if (empty($hidedetails) || $hidedetails > 1) $result .= price($sign * (($object->lines[$i]->subprice) + ($object->lines[$i]->subprice) * ($object->lines[$i]->tva_tx) / 100), 0, $outputlangs);

@@ -2068,6 +1705,5 @@
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )

-	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run

-		$special_code = empty($object->lines[$i]->special_code) ? '' : $object->lines[$i]->special_code;

-		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {

-			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);

-		}

+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )

+	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run

+	{

+		$special_code = $object->lines[$i]->special_code;

+		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);

@@ -2078,11 +1714,6 @@
-		if (!empty($hookmanager->resPrint)) {

-			$result = $hookmanager->resPrint;

-		}

-	}

-	if (empty($reshook)) {

-		if ($object->lines[$i]->special_code == 3) {

-			return '';

-		}

-		if (empty($hidedetails) || $hidedetails > 1) {

-			$result .= $object->lines[$i]->qty;

-		}

+		if (!empty($hookmanager->resPrint)) $result = $hookmanager->resPrint;

+	}

+    if (empty($reshook))

+	{

+	    if ($object->lines[$i]->special_code == 3) return '';

+	    if (empty($hidedetails) || $hidedetails > 1) $result .= $object->lines[$i]->qty;

@@ -2108,6 +1739,5 @@
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )

-	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run

-		$special_code = empty($object->lines[$i]->special_code) ? '' : $object->lines[$i]->special_code;

-		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {

-			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);

-		}

+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )

+	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run

+	{

+		$special_code = $object->lines[$i]->special_code;

+		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);

@@ -2118,11 +1748,6 @@
-		if (!empty($hookmanager->resPrint)) {

-			$result .= $hookmanager->resPrint;

-		}

-	}

-	if (empty($reshook)) {

-		if ($object->lines[$i]->special_code == 3) {

-			return '';

-		}

-		if (empty($hidedetails) || $hidedetails > 1) {

-			$result .= $object->lines[$i]->qty_asked;

-		}

+		if (!empty($hookmanager->resPrint)) $result .= $hookmanager->resPrint;

+	}

+	if (empty($reshook))

+	{

+        if ($object->lines[$i]->special_code == 3) return '';

+        if (empty($hidedetails) || $hidedetails > 1) $result .= $object->lines[$i]->qty_asked;

@@ -2148,6 +1773,5 @@
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )

-	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run

-		$special_code = empty($object->lines[$i]->special_code) ? '' : $object->lines[$i]->special_code;

-		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {

-			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);

-		}

+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )

+	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run

+	{

+		$special_code = $object->lines[$i]->special_code;

+		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);

@@ -2158,11 +1782,6 @@
-		if (!empty($hookmanager->resPrint)) {

-			$result .= $hookmanager->resPrint;

-		}

-	}

-	if (empty($reshook)) {

-		if ($object->lines[$i]->special_code == 3) {

-			return '';

-		}

-		if (empty($hidedetails) || $hidedetails > 1) {

-			$result .= $object->lines[$i]->qty_shipped;

-		}

+		if (!empty($hookmanager->resPrint)) $result .= $hookmanager->resPrint;

+	}

+	if (empty($reshook))

+	{

+        if ($object->lines[$i]->special_code == 3) return '';

+	    if (empty($hidedetails) || $hidedetails > 1) $result .= $object->lines[$i]->qty_shipped;

@@ -2187,7 +1806,6 @@
-	$result = '';

-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )

-	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run

-		$special_code = empty($object->lines[$i]->special_code) ? '' : $object->lines[$i]->special_code;

-		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {

-			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);

-		}

+    $result = '';

+    //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )

+	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run

+	{

+		$special_code = $object->lines[$i]->special_code;

+		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);

@@ -2198,11 +1816,6 @@
-		if (!empty($hookmanager->resPrint)) {

-			$result .= $hookmanager->resPrint;

-		}

-	}

-	if (empty($reshook)) {

-		if ($object->lines[$i]->special_code == 3) {

-			return '';

-		}

-		if (empty($hidedetails) || $hidedetails > 1) {

-			$result .= ($object->lines[$i]->qty_asked - $object->lines[$i]->qty_shipped);

-		}

+		if (!empty($hookmanager->resPrint)) $result .= $hookmanager->resPrint;

+	}

+	if (empty($reshook))

+	{

+        if ($object->lines[$i]->special_code == 3) return '';

+		if (empty($hidedetails) || $hidedetails > 1) $result .= ($object->lines[$i]->qty_asked - $object->lines[$i]->qty_shipped);

@@ -2228,5 +1841,6 @@
-	$result = '';

-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )

-	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run

-		$special_code = empty($object->lines[$i]->special_code) ? '' : $object->lines[$i]->special_code;

-		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {

+    $result = '';

+    //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )

+	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run

+	{

+		$special_code = $object->lines[$i]->special_code;

+		if (!empty($object->lines[$i]->fk_parent_line)) {

@@ -2244,8 +1858,6 @@
-		if (!empty($hookmanager->resPrint)) {

-			$result .= $hookmanager->resPrint;

-		}

-	}

-	if (empty($reshook)) {

-		if (empty($hidedetails) || $hidedetails > 1) {

-			$result .= $langs->transnoentitiesnoconv($object->lines[$i]->getLabelOfUnit('short'));

-		}

+		if (!empty($hookmanager->resPrint)) $result .= $hookmanager->resPrint;

+	}

+	if (empty($reshook))

+	{

+        if ($object->lines[$i]->special_code == 3) return '';

+	    if (empty($hidedetails) || $hidedetails > 1) $result .= $langs->transnoentitiesnoconv($object->lines[$i]->getLabelOfUnit('short'));

@@ -2274,6 +1886,5 @@
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )

-	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run

-		$special_code = empty($object->lines[$i]->special_code) ? '' : $object->lines[$i]->special_code;

-		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {

-			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);

-		}

+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )

+	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run

+	{

+		$special_code = $object->lines[$i]->special_code;

+		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);

@@ -2284,11 +1895,6 @@
-		if (!empty($hookmanager->resPrint)) {

-			$result .= $hookmanager->resPrint;

-		}

-	}

-	if (empty($reshook)) {

-		if ($object->lines[$i]->special_code == 3) {

-			return '';

-		}

-		if (empty($hidedetails) || $hidedetails > 1) {

-			$result .= dol_print_reduction($object->lines[$i]->remise_percent, $outputlangs);

-		}

+		if (!empty($hookmanager->resPrint)) $result .= $hookmanager->resPrint;

+	}

+	if (empty($reshook))

+	{

+        if ($object->lines[$i]->special_code == 3) return '';

+	    if (empty($hidedetails) || $hidedetails > 1) $result .= dol_print_reduction($object->lines[$i]->remise_percent, $outputlangs);

@@ -2311,3 +1917 @@
-	if (empty($hookmanager)) {

-		global $hookmanager;

-	}

+	if (empty($hookmanager)) global $hookmanager;

@@ -2317,7 +1921,6 @@
-	$result = '';

-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )

-	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run

-		$special_code = empty($object->lines[$i]->special_code) ? '' : $object->lines[$i]->special_code;

-		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {

-			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);

-		}

+    $result = '';

+    //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )

+	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run

+	{

+		$special_code = $object->lines[$i]->special_code;

+		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);

@@ -2328,10 +1931,9 @@
-		if (!empty($hookmanager->resPrint)) {

-			return $hookmanager->resPrint;

-		}

-	}

-	if (empty($reshook)) {

-		if ($object->lines[$i]->special_code == 3) {

-			return '';

-		}

-		if (empty($hidedetails) || $hidedetails > 1) {

-			if (getDolGlobalString('SITUATION_DISPLAY_DIFF_ON_PDF')) {

+		if (!empty($hookmanager->resPrint)) return $hookmanager->resPrint;

+	}

+	if (empty($reshook))

+	{

+        	if ($object->lines[$i]->special_code == 3) return '';

+		if (empty($hidedetails) || $hidedetails > 1)

+		{

+			if ($conf->global->SITUATION_DISPLAY_DIFF_ON_PDF)

+			{

@@ -2339,2 +1941,3 @@
-				if (method_exists($object->lines[$i], 'get_prev_progress')) {

-					$prev_progress = $object->lines[$i]->get_prev_progress($object->id);

+				if (method_exists($object, 'get_prev_progress'))

+				{

+			 		$prev_progress = $object->lines[$i]->get_prev_progress($object->id);

@@ -2342,3 +1945 @@
-				$result = round($object->lines[$i]->situation_percent - $prev_progress, 1).'%';

-			} else {

-				$result = round($object->lines[$i]->situation_percent, 1).'%';

+			 	$result = ($object->lines[$i]->situation_percent - $prev_progress).'%';

@@ -2346 +1947,3 @@
-		}

+			else

+				$result = $object->lines[$i]->situation_percent.'%';

+	  	}

@@ -2365,3 +1968 @@
-	if (isset($object->type) && $object->type == 2 && getDolGlobalString('INVOICE_POSITIVE_CREDIT_NOTE')) {

-		$sign = -1;

-	}

+	if (isset($object->type) && $object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;

@@ -2371,6 +1972,5 @@
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )

-	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run

-		$special_code = empty($object->lines[$i]->special_code) ? '' : $object->lines[$i]->special_code;

-		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {

-			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);

-		}

+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )

+	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run

+	{

+		$special_code = $object->lines[$i]->special_code;

+		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);

@@ -2381,14 +1981,18 @@
-		if (!empty($hookmanager->resPrint)) {

-			$result .= $hookmanager->resPrint;

-		}

-	}

-	if (empty($reshook)) {

-		if (!empty($object->lines[$i]) && $object->lines[$i]->special_code == 3) {

-			$result .= $outputlangs->transnoentities("Option");

-		} elseif (empty($hidedetails) || $hidedetails > 1) {

-			$total_ht = (isModEnabled("multicurrency") && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_total_ht : $object->lines[$i]->total_ht);

-			if (!empty($object->lines[$i]->situation_percent) && $object->lines[$i]->situation_percent > 0) {

-				// TODO Remove this. The total should be saved correctly in database instead of being modified here.

-				$prev_progress = 0;

-				$progress = 1;

-				if (method_exists($object->lines[$i], 'get_prev_progress')) {

+		if (!empty($hookmanager->resPrint)) $result .= $hookmanager->resPrint;

+	}

+    if (empty($reshook))

+    {

+	    if ($object->lines[$i]->special_code == 3)

+    	{

+    		return $outputlangs->transnoentities("Option");

+    	}

+        if (empty($hidedetails) || $hidedetails > 1)

+        {

+        	$total_ht = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_total_ht : $object->lines[$i]->total_ht);

+        	if ($object->lines[$i]->situation_percent > 0)

+        	{

+        	    // TODO Remove this. The total should be saved correctly in database instead of being modified here.

+        		$prev_progress = 0;

+        		$progress = 1;

+        		if (method_exists($object->lines[$i], 'get_prev_progress'))

+        		{

@@ -2397 +2001 @@
-				}

+        		}

@@ -2399,6 +2003,8 @@
-			} else {

-				$result .= price($sign * $total_ht, 0, $outputlangs);

-			}

-		}

-	}

-	return $result;

+        	}

+        	else

+        	{

+                $result .= price($sign * $total_ht, 0, $outputlangs);

+        	}

+        }

+    }

+    return $result;

@@ -2421,3 +2027 @@
-	if (isset($object->type) && $object->type == 2 && getDolGlobalString('INVOICE_POSITIVE_CREDIT_NOTE')) {

-		$sign = -1;

-	}

+	if (isset($object->type) && $object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;

@@ -2427,6 +2031,5 @@
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )

-	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run

-		$special_code = empty($object->lines[$i]->special_code) ? '' : $object->lines[$i]->special_code;

-		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {

-			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);

-		}

+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )

+	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run

+	{

+		$special_code = $object->lines[$i]->special_code;

+		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);

@@ -2437,20 +2040,37 @@
-		if (!empty($hookmanager->resPrint)) {

-			$result .= $hookmanager->resPrint;

-		}

-	}

-	if (empty($reshook)) {

-		if ($object->lines[$i]->special_code == 3) {

-			$result .= $outputlangs->transnoentities("Option");

-		} elseif (empty($hidedetails) || $hidedetails > 1) {

-			$total_ttc = (isModEnabled("multicurrency") && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_total_ttc : $object->lines[$i]->total_ttc);

-			if (isset($object->lines[$i]->situation_percent) && $object->lines[$i]->situation_percent > 0) {

-				// TODO Remove this. The total should be saved correctly in database instead of being modified here.

-				$prev_progress = 0;

-				$progress = 1;

-				if (method_exists($object->lines[$i], 'get_prev_progress')) {

-					$prev_progress = $object->lines[$i]->get_prev_progress($object->id);

-					$progress = ($object->lines[$i]->situation_percent - $prev_progress) / 100;

-				}

-				$result .= price($sign * ($total_ttc / ($object->lines[$i]->situation_percent / 100)) * $progress, 0, $outputlangs);

-			} else {

-				$result .= price($sign * $total_ttc, 0, $outputlangs);

+		if (!empty($hookmanager->resPrint)) $result .= $hookmanager->resPrint;

+	}

+	if (empty($reshook))

+	{

+		if ($object->lines[$i]->special_code == 3)

+    	{

+    		$result .= $outputlangs->transnoentities("Option");

+    	}

+		elseif (empty($hidedetails) || $hidedetails > 1) $result .= price($sign * ($object->lines[$i]->total_ht) + ($object->lines[$i]->total_ht) * ($object->lines[$i]->tva_tx) / 100, 0, $outputlangs);

+	}

+	return $result;

+}

+

+/**

+ *	Return total quantity of products and/or services

+ *

+ *	@param	Object		$object				Object

+ *	@param	string		$type				Type

+ *  @param  Translate	$outputlangs		Object langs for output

+ * 	@return	integer

+ *  @deprecated Not used by Dolibarr core, so will be removed.

+ */

+function pdf_getTotalQty($object, $type, $outputlangs)

+{

+	global $hookmanager;

+

+	$total = 0;

+	$nblines = count($object->lines);

+

+	// Loop on each lines

+	for ($i = 0; $i < $nblines; $i++)

+	{

+		if ($object->lines[$i]->special_code != 3)

+		{

+			if ($type == 'all')

+			{

+				$total += $object->lines[$i]->qty;

@@ -2458,3 +2078,21 @@
-		}

-	}

-	return $result;

+			elseif ($type == 9 && is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line)))

+			{

+				$special_code = $object->lines[$i]->special_code;

+				if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);

+				$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);

+				$action = '';

+				$reshook = $hookmanager->executeHooks('pdf_getTotalQty', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks

+				return $hookmanager->resPrint;

+			}

+			elseif ($type == 0 && $object->lines[$i]->product_type == 0)

+			{

+				$total += $object->lines[$i]->qty;

+			}

+			elseif ($type == 1 && $object->lines[$i]->product_type == 1)

+			{

+				$total += $object->lines[$i]->qty;

+			}

+		}

+	}

+

+	return $total;

@@ -2467,7 +2105,7 @@
- * 	@param	CommonObject	$object			Object

- * 	@param	Translate		$outputlangs	Object lang for output

- * 	@return	array                       	Linked objects

- */

-function pdf_getLinkedObjects(&$object, $outputlangs)

-{

-	global $db, $hookmanager;

+ * 	@param	object		$object			Object

+ * 	@param	Translate	$outputlangs	Object lang for output

+ * 	@return	array                       Linked objects

+ */

+function pdf_getLinkedObjects($object, $outputlangs)

+{

+	global $hookmanager;

@@ -2479,4 +2117,8 @@
-	foreach ($object->linkedObjects as $objecttype => $objects) {

-		if ($objecttype == 'facture') {

-			// For invoice, we don't want to have a reference line on document. Image we are using recuring invoice, we will have a line longer than document width.

-		} elseif ($objecttype == 'propal' || $objecttype == 'supplier_proposal') {

+	foreach ($object->linkedObjects as $objecttype => $objects)

+	{

+	    if ($objecttype == 'facture')

+	    {

+	        // For invoice, we don't want to have a reference line on document. Image we are using recuring invoice, we will have a line longer than document width.

+	    }

+	    elseif ($objecttype == 'propal' || $objecttype == 'supplier_proposal')

+		{

@@ -2485 +2127,2 @@
-			foreach ($objects as $elementobject) {

+			foreach ($objects as $elementobject)

+			{

@@ -2491 +2134,3 @@
-		} elseif ($objecttype == 'commande' || $objecttype == 'supplier_order') {

+		}

+		elseif ($objecttype == 'commande' || $objecttype == 'supplier_order')

+		{

@@ -2493,9 +2138,2 @@
-

-			if (count($objects) > 1 && count($objects) <= (getDolGlobalInt("MAXREFONDOC") ? getDolGlobalInt("MAXREFONDOC") : 10)) {

-				$object->note_public = dol_concatdesc($object->note_public, $outputlangs->transnoentities("RefOrder").' :');

-				foreach ($objects as $elementobject) {

-					$object->note_public = dol_concatdesc($object->note_public, $outputlangs->transnoentities($elementobject->ref).(empty($elementobject->ref_client) ? '' : ' ('.$elementobject->ref_client.')').(empty($elementobject->ref_supplier) ? '' : ' ('.$elementobject->ref_supplier.')').' ');

-					$object->note_public = dol_concatdesc($object->note_public, $outputlangs->transnoentities("OrderDate").' : '.dol_print_date($elementobject->date, 'day', '', $outputlangs));

-				}

-			} elseif (count($objects) == 1) {

-				$elementobject = array_shift($objects);

+			foreach ($objects as $elementobject)

+			{

@@ -2503 +2141 @@
-				$linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($elementobject->ref).(!empty($elementobject->ref_client) ? ' ('.$elementobject->ref_client.')' : '').(!empty($elementobject->ref_supplier) ? ' ('.$elementobject->ref_supplier.')' : '');

+				$linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($elementobject->ref).($elementobject->ref_client ? ' ('.$elementobject->ref_client.')' : '').($elementobject->ref_supplier ? ' ('.$elementobject->ref_supplier.')' : '');

@@ -2507 +2145,3 @@
-		} elseif ($objecttype == 'contrat') {

+		}

+		elseif ($objecttype == 'contrat')

+		{

@@ -2509 +2149,2 @@
-			foreach ($objects as $elementobject) {

+			foreach ($objects as $elementobject)

+			{

@@ -2515 +2156,3 @@
-		} elseif ($objecttype == 'fichinter') {

+		}

+		elseif ($objecttype == 'fichinter')

+		{

@@ -2517 +2160,2 @@
-			foreach ($objects as $elementobject) {

+			foreach ($objects as $elementobject)

+			{

@@ -2523 +2167,3 @@
-		} elseif ($objecttype == 'shipping') {

+		}

+		elseif ($objecttype == 'shipping')

+		{

@@ -2526,61 +2172,27 @@
-			if (count($objects) > 1) {

-				$order = null;

-				if (empty($object->linkedObjects['commande']) && $object->element != 'commande') {

-					$object->note_public = dol_concatdesc($object->note_public, $outputlangs->transnoentities("RefOrder").' / '.$outputlangs->transnoentities("RefSending").' :');

-				} else {

-					$object->note_public = dol_concatdesc($object->note_public, $outputlangs->transnoentities("RefSending").' :');

-				}

-				// We concat this record info into fields xxx_value. title is overwrote.

-				foreach ($objects as $elementobject) {

-					if (empty($object->linkedObjects['commande']) && $object->element != 'commande') {    // There is not already a link to order and object is not the order, so we show also info with order

-						$elementobject->fetchObjectLinked(null, '', null, '', 'OR', 1, 'sourcetype', 0);

-						if (!empty($elementobject->linkedObjectsIds['commande'])) {

-							include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';

-							$order = new Commande($db);

-							$ret = $order->fetch(reset($elementobject->linkedObjectsIds['commande']));

-							if ($ret < 1) {

-								$order = null;

-							}

-						}

-					}

-

-					if (! is_object($order)) {

-						$object->note_public = dol_concatdesc($object->note_public, $outputlangs->transnoentities($elementobject->ref));

-					} else {

-						$object->note_public = dol_concatdesc($object->note_public, $outputlangs->convToOutputCharset($order->ref).($order->ref_client ? ' ('.$order->ref_client.')' : ''));

-						$object->note_public = dol_concatdesc($object->note_public, ' / '.$outputlangs->transnoentities($elementobject->ref));

-					}

-				}

-			} elseif (count($objects) == 1) {

-				$elementobject = array_shift($objects);

-				$order = null;

-				// We concat this record info into fields xxx_value. title is overwrote.

-				if (empty($object->linkedObjects['commande']) && $object->element != 'commande') {    // There is not already a link to order and object is not the order, so we show also info with order

-					$elementobject->fetchObjectLinked(null, '', null, '', 'OR', 1, 'sourcetype', 0);

-					if (!empty($elementobject->linkedObjectsIds['commande'])) {

-						include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';

-						$order = new Commande($db);

-						$ret = $order->fetch(reset($elementobject->linkedObjectsIds['commande']));

-						if ($ret < 1) {

-							$order = null;

-						}

-					}

-				}

-

-				if (! is_object($order)) {

-					$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefSending");

-					if (empty($linkedobjects[$objecttype]['ref_value'])) {

-						$linkedobjects[$objecttype]['ref_value'] = '';

-					} else {

-						$linkedobjects[$objecttype]['ref_value'] .= ' / ';

-					}

-					$linkedobjects[$objecttype]['ref_value'] .= $outputlangs->transnoentities($elementobject->ref);

-					$linkedobjects[$objecttype]['date_value'] = dol_print_date(empty($elementobject->date_shipping) ? $elementobject->date_delivery : $elementobject->date_shipping, 'day', '', $outputlangs);

-				} else {

-					$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder").' / '.$outputlangs->transnoentities("RefSending");

-					if (empty($linkedobjects[$objecttype]['ref_value'])) {

-						$linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref).($order->ref_client ? ' ('.$order->ref_client.')' : '');

-					}

-					$linkedobjects[$objecttype]['ref_value'] .= ' / '.$outputlangs->transnoentities($elementobject->ref);

-					$linkedobjects[$objecttype]['date_value'] = dol_print_date(empty($elementobject->date_shipping) ? $elementobject->date_delivery : $elementobject->date_shipping, 'day', '', $outputlangs);

-				}

+			foreach ($objects as $x => $elementobject)

+			{

+			    $order = null;

+			    // We concat this record info into fields xxx_value. title is overwrote.

+			    if (empty($object->linkedObjects['commande']) && $object->element != 'commande')	// There is not already a link to order and object is not the order, so we show also info with order

+			    {

+			        $elementobject->fetchObjectLinked();

+			        if (!empty($elementobject->linkedObjects['commande'])) $order = reset($elementobject->linkedObjects['commande']);

+			    }

+			    if (!is_object($order))

+			    {

+			        $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefSending");

+			        if (!empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] .= ' / ';

+			        $linkedobjects[$objecttype]['ref_value'] .= $outputlangs->transnoentities($elementobject->ref);

+			        //$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateShipment");

+			        //if (! empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'].=' / ';

+			        //$linkedobjects[$objecttype]['date_value'].= dol_print_date($elementobject->date_delivery,'day','',$outputlangs);

+			    }

+			    else

+			    {

+			        $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder").' / '.$outputlangs->transnoentities("RefSending");

+			        if (empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref).($order->ref_client ? ' ('.$order->ref_client.')' : '');

+			        $linkedobjects[$objecttype]['ref_value'] .= ' / '.$outputlangs->transnoentities($elementobject->ref);

+			        //$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate") . ($elementobject->date_delivery ? ' / ' . $outputlangs->transnoentities("DateShipment") : '');

+			        //if (empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'] = dol_print_date($order->date,'day','',$outputlangs);

+			        //$linkedobjects[$objecttype]['date_value'].= ($elementobject->date_delivery ? ' / ' . dol_print_date($elementobject->date_delivery,'day','',$outputlangs) : '');

+			    }

@@ -2592 +2204,2 @@
-	if (is_object($hookmanager)) {

+	if (is_object($hookmanager))

+	{

@@ -2596,3 +2209 @@
-		if (!empty($hookmanager->resArray)) {

-			$linkedobjects = $hookmanager->resArray;

-		}

+		if (!empty($hookmanager->resArray)) $linkedobjects = $hookmanager->resArray;

@@ -2615,2 +2226,2 @@
-	$maxwidth = (!getDolGlobalString('MAIN_DOCUMENTS_WITH_PICTURE_WIDTH') ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH);

-	$maxheight = (!getDolGlobalString('MAIN_DOCUMENTS_WITH_PICTURE_HEIGHT') ? 32 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_HEIGHT);

+	$maxwidth = (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH);

+	$maxheight = (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_HEIGHT) ? 32 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_HEIGHT);

@@ -2619,3 +2230,2 @@
-	$width = 0;

-	$height = 0;

-	if ($tmp['height']) {

+	if ($tmp['height'])

+	{

@@ -2623 +2233,2 @@
-		if ($width > $maxwidth) {	// Pb with maxheight, so i use maxwidth

+		if ($width > $maxwidth)	// Pb with maxheight, so i use maxwidth

+		{

@@ -2626 +2237,3 @@
-		} else { // No pb with maxheight

+		}

+		else	// No pb with maxheight

+		{

@@ -2636,5 +2249,5 @@
- *	@param	CommonObject	$object				Object

- *	@param	int				$i					Current line number

- *  @param  Translate		$outputlangs		Object langs for output

- *  @param	int				$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)

- * 	@return	float|string						Return total of line excl tax

+ *	@param	Object		$object				Object

+ *	@param	int			$i					Current line number

+ *  @param  Translate	$outputlangs		Object langs for output

+ *  @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)

+ * 	@return	string							Return total of line excl tax

@@ -2645 +2257,0 @@
-

@@ -2647,4 +2259,3 @@
-	if (isset($object->type) && $object->type == 2 && getDolGlobalString('INVOICE_POSITIVE_CREDIT_NOTE')) {

-		$sign = -1;

-	}

-	if ($object->lines[$i]->special_code == 3) {

+	if (isset($object->type) && $object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;

+	if ($object->lines[$i]->special_code == 3)

+	{

@@ -2652,2 +2263,5 @@
-	} else {

-		if (is_object($hookmanager)) {

+	}

+	else

+	{

+		if (is_object($hookmanager))

+		{

@@ -2655,3 +2269 @@
-			if (!empty($object->lines[$i]->fk_parent_line)) {

-				$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);

-			}

+			if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);

@@ -2668,6 +2280,3 @@
-			if ($hookmanager->executeHooks('getlinetotalremise', $parameters, $object, $action) > 0) {	// Note that $action and $object may have been modified by some hooks

-				if (isset($hookmanager->resArray['linetotalremise'])) {

-					return $hookmanager->resArray['linetotalremise'];

-				} else {

-					return (float) $hookmanager->resPrint;	// For backward compatibility

-				}

+			if ($hookmanager->executeHooks('getlinetotalremise', $parameters, $object, $action) > 0)

+			{

+				return $hookmanager->resPrint; // Note that $action and $object may have been modified by some hooks

@@ -2677,6 +2286,4 @@
-		if (empty($hidedetails) || $hidedetails > 1) {

-			return $sign * (($object->lines[$i]->subprice * $object->lines[$i]->qty) - $object->lines[$i]->total_ht);

-		}

-	}

-	return 0;

-}

+		if (empty($hidedetails) || $hidedetails > 1) return $sign * (($object->lines[$i]->subprice * $object->lines[$i]->qty) - $object->lines[$i]->total_ht);

+	}

+	return '';

+}

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_prelevement.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_prelevement.lib.php
@@ -36,5 +36,2 @@
-	global $langs, $conf;

-

-	$salary = $object->checkIfSalaryBonPrelevement();

-

-	$langs->loadLangs(array("bills", "withdrawals"));

+	global $langs, $conf, $user;

+	$langs->load("withdrawals");

@@ -45,5 +41,0 @@
-	$titleoftab = "WithdrawalsReceipts";

-	if ($object->type == 'bank-transfer') {

-		$titleoftab = "BankTransferReceipts";

-	}

-

@@ -51 +43 @@
-	$head[$h][1] = $langs->trans($titleoftab);

+	$head[$h][1] = $langs->trans("WithdrawalsReceipts");

@@ -55,8 +46,0 @@
-	$titleoftab = $langs->trans("Bills");

-	if ($object->type == 'bank-transfer') {

-		$titleoftab = $langs->trans("SupplierBills");

-	}

-	if ($salary > 0) {

-		$titleoftab = $langs->trans("Salaries");

-	}

-

@@ -64 +48 @@
-	$head[$h][1] = $titleoftab;

+	$head[$h][1] = $langs->trans("Bills");

@@ -92,2 +75,0 @@
- *	@param	string	$type		'bank-transfer' or 'direct-debit'

- *

@@ -96 +78 @@
-function prelevement_check_config($type = 'direct-debit')

+function prelevement_check_config()

@@ -98,18 +80,4 @@
-	global $conf, $db;

-	if ($type == 'bank-transfer') {

-		if (!getDolGlobalString('PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT')) {

-			return -1;

-		}

-		//if (empty($conf->global->PRELEVEMENT_ICS)) return -1;

-		if (!getDolGlobalString('PAYMENTBYBANKTRANSFER_USER')) {

-			return -1;

-		}

-	} else {

-		if (!getDolGlobalString('PRELEVEMENT_ID_BANKACCOUNT')) {

-			return -1;

-		}

-		//if (empty($conf->global->PRELEVEMENT_ICS)) return -1;

-		if (!getDolGlobalString('PRELEVEMENT_USER')) {

-			return -1;

-		}

-	}

+	global $conf;

+	if (empty($conf->global->PRELEVEMENT_ID_BANKACCOUNT)) return -1;

+	if (empty($conf->global->PRELEVEMENT_ICS)) return -1;

+	if (empty($conf->global->PRELEVEMENT_USER)) return -1;

@@ -118,37 +85,0 @@
-

-	/**

- *  Return array head with list of tabs to view object informations

- *

- *  @param	BonPrelevement	$object         	Member

- *  @param  int     		$nbOfInvoices   	No of invoices

- *  @param  int     		$nbOfSalaryInvoice  No of salary invoices

- *  @return array           					head

- */

-function bon_prelevement_prepare_head(BonPrelevement $object, $nbOfInvoices, $nbOfSalaryInvoice)

-{

-	global $langs, $conf;

-

-	$h = 0;

-	$head = array();

-

-	$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/create.php?type=bank-transfer';

-	$head[$h][1] = ($nbOfInvoices <= 0 ? $langs->trans("Invoices") : $langs->trans("Invoices").'<span class="badge marginleftonlyshort">'.$nbOfInvoices.'</span>');

-	$head[$h][2] = 'invoice';

-	$h++;

-

-	// Salaries

-

-	$head[$h][0] = DOL_URL_ROOT."/compta/prelevement/create.php?type=bank-transfer&sourcetype=salary";

-	$head[$h][1] = ($nbOfSalaryInvoice <= 0 ? $langs->trans("Salaries") : $langs->trans("Salaries").'<span class="badge marginleftonlyshort">'.$nbOfSalaryInvoice.'</span>');

-	$head[$h][2] = 'salary';

-	$h++;

-

-	// Show more tabs from modules

-	// Entries must be declared in modules descriptor with line

-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'prelevement');

-

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'prelevement', 'remove');

-	return $head;

-}

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_price.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_price.lib.php
@@ -40 +40 @@
- * 		@param 	float	$pu                         Unit price (HT or TTC depending on price_base_type. TODO Add also mode 'INCT' when pu is price HT+VAT+LT1+LT2)

+ * 		@param 	float	$pu                         Unit price (HT or TTC selon price_base_type)

@@ -43,2 +43,2 @@
- *		@param  float	$uselocaltax1_rate          0=do not use localtax1, >0=apply and get value from localtaxes_array (or database if empty), -1=autodetect according to seller if we must apply, get value from localtaxes_array (or database if empty). Try to always use -1.

- *		@param  float	$uselocaltax2_rate          0=do not use localtax2, >0=apply and get value from localtaxes_array (or database if empty), -1=autodetect according to seller if we must apply, get value from localtaxes_array (or database if empty). Try to always use -1.

+ *		@param  float	$uselocaltax1_rate          0=do not use this localtax, >0=apply and get value from localtaxes_array (or database if empty), -1=autodetect according to seller if we must apply, get value from localtaxes_array (or database if empty). Try to always use -1.

+ *		@param  float	$uselocaltax2_rate          0=do not use this localtax, >0=apply and get value from localtaxes_array (or database if empty), -1=autodetect according to seller if we must apply, get value from localtaxes_array (or database if empty). Try to always use -1.

@@ -46 +46 @@
- *		@param	string	$price_base_type 			'HT'=Unit price parameter $pu is HT, 'TTC'=Unit price parameter $pu is TTC (HT+VAT but not Localtax. TODO Add also mode 'INCT' when pu is price HT+VAT+LT1+LT2)

+ *		@param	string	$price_base_type 			HT=Unit price parameter is HT, TTC=Unit price parameter is TTC

@@ -93,7 +93,4 @@
-	if (empty($info_bits)) {

-		$info_bits = 0;

-	}

-	if (empty($txtva)) {

-		$txtva = 0;

-	}

-	if (empty($seller) || !is_object($seller)) {

+	if (empty($info_bits)) $info_bits = 0;

+	if (empty($txtva)) $txtva = 0;

+	if (empty($seller) || !is_object($seller))

+	{

@@ -101 +98,2 @@
-		if (!is_object($mysoc)) {	// mysoc may be not defined (during migration process)

+		if (!is_object($mysoc))	// mysoc may be not defined (during migration process)

+		{

@@ -108,7 +106,3 @@
-	if (empty($localtaxes_array) || !is_array($localtaxes_array)) {

-		dol_syslog("Price.lib::calcul_price_total Warning: function is called with parameter localtaxes_array that is missing or empty", LOG_WARNING);

-	}

-	if (!is_numeric($txtva)) {

-		dol_syslog("Price.lib::calcul_price_total Warning: function was called with a parameter vat rate that is not a real numeric value. There is surely a bug.", LOG_ERR);

-	} elseif ($txtva >= 1000) {

-		dol_syslog("Price.lib::calcul_price_total Warning: function was called with a bad value for vat rate (should be often < 100, always < 1000). There is surely a bug.", LOG_ERR);

+	if (empty($localtaxes_array) || !is_array($localtaxes_array))

+	{

+		dol_syslog("Price.lib::calcul_price_total Warning: function is called with parameter localtaxes_array that is missing", LOG_WARNING);

@@ -121,13 +115,5 @@
-	if (is_numeric($uselocaltax1_rate)) {

-		$uselocaltax1_rate = (float) $uselocaltax1_rate;

-	}

-	if (is_numeric($uselocaltax2_rate)) {

-		$uselocaltax2_rate = (float) $uselocaltax2_rate;

-	}

-

-	if ($uselocaltax1_rate < 0) {

-		$uselocaltax1_rate = $seller->localtax1_assuj;

-	}

-	if ($uselocaltax2_rate < 0) {

-		$uselocaltax2_rate = $seller->localtax2_assuj;

-	}

+	if (is_numeric($uselocaltax1_rate)) $uselocaltax1_rate = (float) $uselocaltax1_rate;

+	if (is_numeric($uselocaltax2_rate)) $uselocaltax2_rate = (float) $uselocaltax2_rate;

+

+	if ($uselocaltax1_rate < 0) $uselocaltax1_rate = $seller->localtax1_assuj;

+	if ($uselocaltax2_rate < 0) $uselocaltax2_rate = $seller->localtax2_assuj;

@@ -138 +124 @@
-	// Now we search localtaxes information ourself (rates and types).

+    // Now we search localtaxes information ourself (rates and types).

@@ -142 +128,2 @@
-	if (is_array($localtaxes_array) && count($localtaxes_array)) {

+	if (is_array($localtaxes_array))

+	{

@@ -147,6 +134,6 @@
-	} else {

-		// deprecated method. values and type for localtaxes must be provided by caller and loaded with getLocalTaxesFromRate using the full vat rate (including text code)

-		// also, with this method, we may get several possible values (for example with localtax2 in spain), so we take the first one.

-		dol_syslog("Price.lib::calcul_price_total search vat information using old deprecated method", LOG_WARNING);

-

-		$sql = "SELECT taux, localtax1, localtax2, localtax1_type, localtax2_type";

+	}

+	else	// deprecated method. values and type for localtaxes must be provided by caller and loaded with getLocalTaxesFromRate using the full vat rate (including text code)

+	{

+	    dol_syslog("Price.lib::calcul_price_total search vat information using old deprecated method", LOG_WARNING);

+

+	    $sql = "SELECT taux, localtax1, localtax2, localtax1_type, localtax2_type";

@@ -154,3 +141,2 @@
-		$sql .= " WHERE cv.taux = ".((float) $txtva);

-		$sql .= " AND cv.fk_pays = ".((int) $countryid);

-		$sql .= " AND cv.entity IN (".getEntity('c_tva').")";

+		$sql .= " WHERE cv.taux = ".$txtva;

+		$sql .= " AND cv.fk_pays = ".$countryid;

@@ -158 +144,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -160,3 +147,4 @@
-			if ($obj) {

-				$localtax1_rate = (float) $obj->localtax1; // Use float to force to get first numeric value when value is x:y:z

-				$localtax2_rate = (float) $obj->localtax2; // Use float to force to get first numeric value when value is -19:-15:-9

+			if ($obj)

+			{

+				$localtax1_rate = $obj->localtax1;

+				$localtax2_rate = $obj->localtax2;

@@ -165 +153 @@
-				//var_dump($localtax1_rate.' '.$localtax2_rate.' '.$localtax1_type.' '.$localtax2_type);

+				//var_dump($localtax1_rate.' '.$localtax2_rate.' '.$localtax1_type.' '.$localtax2_type);exit;

@@ -167,3 +155,2 @@
-		} else {

-			dol_print_error($db);

-		}

+		}

+		else dol_print_error($db);

@@ -174,3 +161,3 @@
-		if (!empty($multicurrency_tx)) {

-			$pu = $pu_devise / $multicurrency_tx;

-		} else {

+		if (!empty($multicurrency_tx)) $pu = $pu_devise / $multicurrency_tx;

+		else

+		{

@@ -181,3 +168 @@
-	if ($pu === '') {

-		$pu = 0;

-	}

+	if ($pu === '') $pu = 0;

@@ -186,3 +171,3 @@
-		if (is_numeric($pu) && is_numeric($multicurrency_tx)) {

-			$pu_devise = $pu * $multicurrency_tx;

-		} else {

+		if (is_numeric($pu) && is_numeric($multicurrency_tx)) $pu_devise = $pu * $multicurrency_tx;

+		else

+		{

@@ -196,2 +181,2 @@
-	$tot_avec_remise_ligne = $tot_sans_remise * (1 - ((float) $remise_percent_ligne / 100));

-	$tot_avec_remise       = $tot_avec_remise_ligne * (1 - ((float) $remise_percent_global / 100));

+	$tot_avec_remise_ligne = $tot_sans_remise * (1 - ($remise_percent_ligne / 100));

+	$tot_avec_remise       = $tot_avec_remise_ligne * (1 - ($remise_percent_global / 100));

@@ -200,3 +185 @@
-	for ($i = 0; $i <= 15; $i++) {

-		$result[$i] = 0;

-	}

+	for ($i = 0; $i <= 15; $i++) $result[$i] = 0;

@@ -206,10 +189,13 @@
-	// if input unit price is 'HT', we need to have the totals with main VAT for a correct calculation

-	if ($price_base_type != 'TTC') {

-		$tot_sans_remise_wt = price2num($tot_sans_remise * (1 + ($txtva / 100)), 'MU');

-		$tot_avec_remise_wt = price2num($tot_avec_remise * (1 + ($txtva / 100)), 'MU');

-		$pu_wt = price2num($pu * (1 + ($txtva / 100)), 'MU');

-	} else {

-		$tot_sans_remise_wt = $tot_sans_remise;

-		$tot_avec_remise_wt = $tot_avec_remise;

-		$pu_wt = $pu;

-	}

+    // if input unit price is 'HT', we need to have the totals with main VAT for a correct calculation

+    if ($price_base_type != 'TTC')

+    {

+    	$tot_sans_remise_wt = price2num($tot_sans_remise * (1 + ($txtva / 100)), 'MU');

+    	$tot_avec_remise_wt = price2num($tot_avec_remise * (1 + ($txtva / 100)), 'MU');

+    	$pu_wt = price2num($pu * (1 + ($txtva / 100)), 'MU');

+    }

+    else

+    {

+    	$tot_sans_remise_wt = $tot_sans_remise;

+    	$tot_avec_remise_wt = $tot_avec_remise;

+    	$pu_wt = $pu;

+    }

@@ -219,55 +205,47 @@
-	$localtaxes = array(0, 0, 0);

-	$apply_tax = false;

-	switch ($localtax1_type) {

-		case '2':     // localtax on product or service

-			$apply_tax = true;

-			break;

-		case '4':     // localtax on product

-			if ($type == 0) {

-				$apply_tax = true;

-			}

-			break;

-		case '6':     // localtax on service

-			if ($type == 1) {

-				$apply_tax = true;

-			}

-			break;

-	}

-

-	if ($uselocaltax1_rate && $apply_tax) {

-		$result[14] = price2num(($tot_sans_remise_wt * (1 + ($localtax1_rate / 100))) - $tot_sans_remise_wt, 'MT');

-		$localtaxes[0] += $result[14];

-

-		$result[9] = price2num(($tot_avec_remise_wt * (1 + ($localtax1_rate / 100))) - $tot_avec_remise_wt, 'MT');

-		$localtaxes[1] += $result[9];

-

-		$result[11] = price2num(($pu_wt * (1 + ($localtax1_rate / 100))) - $pu_wt, 'MU');

-		$localtaxes[2] += $result[11];

-	}

-

-	$apply_tax = false;

-	switch ($localtax2_type) {

-		case '2':     // localtax on product or service

-			$apply_tax = true;

-			break;

-		case '4':     // localtax on product

-			if ($type == 0) {

-				$apply_tax = true;

-			}

-			break;

-		case '6':     // localtax on service

-			if ($type == 1) {

-				$apply_tax = true;

-			}

-			break;

-	}

-	if ($uselocaltax2_rate && $apply_tax) {

-		$result[15] = price2num(($tot_sans_remise_wt * (1 + ($localtax2_rate / 100))) - $tot_sans_remise_wt, 'MT');

-		$localtaxes[0] += $result[15];

-

-		$result[10] = price2num(($tot_avec_remise_wt * (1 + ($localtax2_rate / 100))) - $tot_avec_remise_wt, 'MT');

-		$localtaxes[1] += $result[10];

-

-		$result[12] = price2num(($pu_wt * (1 + ($localtax2_rate / 100))) - $pu_wt, 'MU');

-		$localtaxes[2] += $result[12];

-	}

+    $localtaxes = array(0, 0, 0);

+    $apply_tax = false;

+    switch ($localtax1_type) {

+        case '2':     // localtax on product or service

+            $apply_tax = true;

+            break;

+        case '4':     // localtax on product

+            if ($type == 0) $apply_tax = true;

+            break;

+        case '6':     // localtax on service

+            if ($type == 1) $apply_tax = true;

+            break;

+    }

+

+    if ($uselocaltax1_rate && $apply_tax) {

+  		$result[14] = price2num(($tot_sans_remise_wt * (1 + ($localtax1_rate / 100))) - $tot_sans_remise_wt, 'MT');

+  		$localtaxes[0] += $result[14];

+

+  		$result[9] = price2num(($tot_avec_remise_wt * (1 + ($localtax1_rate / 100))) - $tot_avec_remise_wt, 'MT');

+  		$localtaxes[1] += $result[9];

+

+  		$result[11] = price2num(($pu_wt * (1 + ($localtax1_rate / 100))) - $pu_wt, 'MU');

+  		$localtaxes[2] += $result[11];

+    }

+

+    $apply_tax = false;

+    switch ($localtax2_type) {

+        case '2':     // localtax on product or service

+            $apply_tax = true;

+            break;

+        case '4':     // localtax on product

+            if ($type == 0) $apply_tax = true;

+            break;

+        case '6':     // localtax on service

+            if ($type == 1) $apply_tax = true;

+            break;

+    }

+    if ($uselocaltax2_rate && $apply_tax) {

+  		$result[15] = price2num(($tot_sans_remise_wt * (1 + ($localtax2_rate / 100))) - $tot_sans_remise_wt, 'MT');

+  		$localtaxes[0] += $result[15];

+

+  		$result[10] = price2num(($tot_avec_remise_wt * (1 + ($localtax2_rate / 100))) - $tot_avec_remise_wt, 'MT');

+  		$localtaxes[1] += $result[10];

+

+  		$result[12] = price2num(($pu_wt * (1 + ($localtax2_rate / 100))) - $pu_wt, 'MU');

+  		$localtaxes[2] += $result[12];

+    }

@@ -276 +254,2 @@
-	if ($price_base_type == 'HT') {

+	if ($price_base_type == 'HT')

+	{

@@ -292 +271,3 @@
-	} else {

+	}

+	else

+	{

@@ -312,6 +293,7 @@
-	//If input unit price is 'TTC', we need to have the totals without main VAT for a correct calculation

-	if ($price_base_type == 'TTC') {

-		$tot_sans_remise = price2num($tot_sans_remise / (1 + ($txtva / 100)), 'MU');

-		$tot_avec_remise = price2num($tot_avec_remise / (1 + ($txtva / 100)), 'MU');

-		$pu = price2num($pu / (1 + ($txtva / 100)), 'MU');

-	}

+    //If input unit price is 'TTC', we need to have the totals without main VAT for a correct calculation

+    if ($price_base_type == 'TTC')

+    {

+    	$tot_sans_remise = price2num($tot_sans_remise / (1 + ($txtva / 100)), 'MU');

+    	$tot_avec_remise = price2num($tot_avec_remise / (1 + ($txtva / 100)), 'MU');

+    	$pu = price2num($pu / (1 + ($txtva / 100)), 'MU');

+    }

@@ -320,52 +302,44 @@
-	switch ($localtax1_type) {

-		case '1':     // localtax on product or service

-			$apply_tax = true;

-			break;

-		case '3':     // localtax on product

-			if ($type == 0) {

-				$apply_tax = true;

-			}

-			break;

-		case '5':     // localtax on service

-			if ($type == 1) {

-				$apply_tax = true;

-			}

-			break;

-	}

-	if ($uselocaltax1_rate && $apply_tax) {

-		$result[14] = price2num(($tot_sans_remise * (1 + ($localtax1_rate / 100))) - $tot_sans_remise, 'MT'); // amount tax1 for total_ht_without_discount

-		$result[8] += $result[14]; // total_ttc_without_discount + tax1

-

-		$result[9] = price2num(($tot_avec_remise * (1 + ($localtax1_rate / 100))) - $tot_avec_remise, 'MT'); // amount tax1 for total_ht

-		$result[2] += $result[9]; // total_ttc + tax1

-

-		$result[11] = price2num(($pu * (1 + ($localtax1_rate / 100))) - $pu, 'MU'); // amount tax1 for pu_ht

-		$result[5] += $result[11]; // pu_ht + tax1

-	}

-

-	$apply_tax = false;

-	switch ($localtax2_type) {

-		case '1':     // localtax on product or service

-			$apply_tax = true;

-			break;

-		case '3':     // localtax on product

-			if ($type == 0) {

-				$apply_tax = true;

-			}

-			break;

-		case '5':     // localtax on service

-			if ($type == 1) {

-				$apply_tax = true;

-			}

-			break;

-	}

-	if ($uselocaltax2_rate && $apply_tax) {

-		$result[15] = price2num(($tot_sans_remise * (1 + ($localtax2_rate / 100))) - $tot_sans_remise, 'MT'); // amount tax2 for total_ht_without_discount

-		$result[8] += $result[15]; // total_ttc_without_discount + tax2

-

-		$result[10] = price2num(($tot_avec_remise * (1 + ($localtax2_rate / 100))) - $tot_avec_remise, 'MT'); // amount tax2 for total_ht

-		$result[2] += $result[10]; // total_ttc + tax2

-

-		$result[12] = price2num(($pu * (1 + ($localtax2_rate / 100))) - $pu, 'MU'); // amount tax2 for pu_ht

-		$result[5] += $result[12]; // pu_ht + tax2

-	}

+    switch ($localtax1_type) {

+        case '1':     // localtax on product or service

+            $apply_tax = true;

+            break;

+        case '3':     // localtax on product

+            if ($type == 0) $apply_tax = true;

+            break;

+        case '5':     // localtax on service

+            if ($type == 1) $apply_tax = true;

+            break;

+    }

+    if ($uselocaltax1_rate && $apply_tax) {

+  		$result[14] = price2num(($tot_sans_remise * (1 + ($localtax1_rate / 100))) - $tot_sans_remise, 'MT'); // amount tax1 for total_ht_without_discount

+  		$result[8] += $result[14]; // total_ttc_without_discount + tax1

+

+  		$result[9] = price2num(($tot_avec_remise * (1 + ($localtax1_rate / 100))) - $tot_avec_remise, 'MT'); // amount tax1 for total_ht

+  		$result[2] += $result[9]; // total_ttc + tax1

+

+  		$result[11] = price2num(($pu * (1 + ($localtax1_rate / 100))) - $pu, 'MU'); // amount tax1 for pu_ht

+  		$result[5] += $result[11]; // pu_ht + tax1

+    }

+

+    $apply_tax = false;

+    switch ($localtax2_type) {

+        case '1':     // localtax on product or service

+            $apply_tax = true;

+            break;

+        case '3':     // localtax on product

+            if ($type == 0) $apply_tax = true;

+            break;

+        case '5':     // localtax on service

+            if ($type == 1) $apply_tax = true;

+            break;

+    }

+    if ($uselocaltax2_rate && $apply_tax) {

+  		$result[15] = price2num(($tot_sans_remise * (1 + ($localtax2_rate / 100))) - $tot_sans_remise, 'MT'); // amount tax2 for total_ht_without_discount

+  		$result[8] += $result[15]; // total_ttc_without_discount + tax2

+

+  		$result[10] = price2num(($tot_avec_remise * (1 + ($localtax2_rate / 100))) - $tot_avec_remise, 'MT'); // amount tax2 for total_ht

+  		$result[2] += $result[10]; // total_ttc + tax2

+

+  		$result[12] = price2num(($pu * (1 + ($localtax2_rate / 100))) - $pu, 'MU'); // amount tax2 for pu_ht

+  		$result[5] += $result[12]; // pu_ht + tax2

+    }

@@ -374,13 +348,17 @@
-	if (getDolGlobalString('MAIN_ROUNDING_RULE_TOT')) {

-		if ($price_base_type == 'HT') {

-			$result[0] = price2num(round($result[0] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT, 'MT');

-			$result[1] = price2num(round($result[1] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT, 'MT');

-			$result[9] = price2num(round($result[9] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT, 'MT');

-			$result[10] = price2num(round($result[10] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT, 'MT');

-			$result[2] = price2num($result[0] + $result[1] + $result[9] + $result[10], 'MT');

-		} else {

-			$result[1] = price2num(round($result[1] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT, 'MT');

-			$result[2] = price2num(round($result[2] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT, 'MT');

-			$result[9] = price2num(round($result[9] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT, 'MT');

-			$result[10] = price2num(round($result[10] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT, 'MT');

-			$result[0] = price2num($result[2] - $result[1] - $result[9] - $result[10], 'MT');

+	if (!empty($conf->global->MAIN_ROUNDING_RULE_TOT))

+	{

+		if ($price_base_type == 'HT')

+		{

+			$result[0] = round($result[0] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;

+			$result[1] = round($result[1] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;

+			$result[2] = price2num($result[0] + $result[1], 'MT');

+			$result[9] = round($result[9] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;

+			$result[10] = round($result[10] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;

+		}

+		else

+		{

+			$result[1] = round($result[1] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;

+			$result[2] = round($result[2] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;

+			$result[0] = price2num($result[2] - $result[1], 'MT');

+			$result[9] = round($result[9] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;

+			$result[10] = round($result[10] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;

@@ -391 +369,2 @@
-	if ($multicurrency_tx != 1) {

+	if ($multicurrency_tx != 1)

+	{

@@ -408 +387 @@
-		// Recall function using the multicurrency price as reference price. We must set param $multicurrency_tx to 1 to avoid infinite loop.

+		// Recal function using the multicurrency price as reference price. We must set param $multicurrency_tx to 1 to avoid infinite loop.

@@ -429 +408,3 @@
-	} else {

+	}

+	else

+	{

@@ -447 +428 @@
-	dol_syslog('Price.lib::calcul_price_total MAIN_ROUNDING_RULE_TOT='.(!getDolGlobalString('MAIN_ROUNDING_RULE_TOT') ? '' : $conf->global->MAIN_ROUNDING_RULE_TOT).' pu='.$pu.' qty='.$qty.' price_base_type='.$price_base_type.' total_ht='.$result[0].'-total_vat='.$result[1].'-total_ttc='.$result[2]);

+	dol_syslog('Price.lib::calcul_price_total MAIN_ROUNDING_RULE_TOT='.$conf->global->MAIN_ROUNDING_RULE_TOT.' pu='.$pu.' qty='.$qty.' price_base_type='.$price_base_type.' total_ht='.$result[0].'-total_vat='.$result[1].'-total_ttc='.$result[2]);

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_product.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_product.lib.php
@@ -7 +6,0 @@
- * Copyright (C) 2023	   	Gauthier VERDOL			<gauthier.verdol@atm-consulting.fr>

@@ -25,3 +24,3 @@
- * \file       htdocs/core/lib/product.lib.php

- * \brief      Ensemble de fonctions de base pour le module produit et service

- * \ingroup	product

+ *	\file       htdocs/core/lib/product.lib.php

+ *	\brief      Ensemble de fonctions de base pour le module produit et service

+ * 	\ingroup	product

@@ -42,6 +41 @@
-	$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight('product', 'product_advance', 'read_prices') : $user->hasRight('product', 'read');

-

-	if ($object->isService()) {

-		$label = $langs->trans('Service');

-		$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight('service', 'service_advance', 'read_prices') : $user->hasRight('service', 'read');

-	}

+	if ($object->isService()) $label = $langs->trans('Service');

@@ -57,33 +51,21 @@
-	// if (!empty($object->status)) {

-	if ($usercancreadprice) {

-		$head[$h][0] = DOL_URL_ROOT."/product/price.php?id=".$object->id;

-		$head[$h][1] = $langs->trans("SellingPrices");

-		$head[$h][2] = 'price';

-		$h++;

-	} else {

-		$head[$h][0] = '#';

-		$head[$h][1] = $langs->trans("SellingPrices");

-		$head[$h][2] = 'price';

-		$head[$h][5] = 'disabled';

-		$h++;

-	}

-	// }

-

-	// if (!empty($object->status_buy) || (isModEnabled('margin') && !empty($object->status))) {   // If margin is on and product on sell, we may need the cost price even if product os not on purchase

-	if ((isModEnabled("supplier_proposal") || isModEnabled("supplier_order") || isModEnabled("supplier_invoice")) && ($user->hasRight('fournisseur', 'lire') || $user->hasRight('supplier_order', 'read') || $user->hasRight('supplier_invoice', 'read'))

-		|| (isModEnabled('margin') && $user->hasRight("margin", "liretous"))

-		) {

-		if ($usercancreadprice) {

-			$head[$h][0] = DOL_URL_ROOT."/product/fournisseurs.php?id=".$object->id;

-			$head[$h][1] = $langs->trans("BuyingPrices");

-			$head[$h][2] = 'suppliers';

-			$h++;

-		} else {

-			$head[$h][0] = '#';

-			$head[$h][1] = $langs->trans("BuyingPrices");

-			$head[$h][2] = 'suppliers';

-			$head[$h][5] = 'disabled';

-			$h++;

-		}

-	}

-	// }

+	if (!empty($object->status))

+	{

+    	$head[$h][0] = DOL_URL_ROOT."/product/price.php?id=".$object->id;

+    	$head[$h][1] = $langs->trans("SellingPrices");

+    	$head[$h][2] = 'price';

+    	$h++;

+	}

+

+

+	if (!empty($object->status_buy) || (!empty($conf->margin->enabled) && !empty($object->status)))   // If margin is on and product on sell, we may need the cost price even if product os not on purchase

+	{

+    	if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->lire)

+    	|| (!empty($conf->margin->enabled) && $user->rights->margin->liretous)

+    	)

+    	{

+    		$head[$h][0] = DOL_URL_ROOT."/product/fournisseurs.php?id=".$object->id;

+    		$head[$h][1] = $langs->trans("BuyingPrices");

+    		$head[$h][2] = 'suppliers';

+    		$h++;

+    	}

+	}

@@ -92 +74,2 @@
-	if (getDolGlobalInt('MAIN_MULTILANGS')) {

+	if (!empty($conf->global->MAIN_MULTILANGS))

+	{

@@ -94 +77 @@
-		$head[$h][1] = $langs->trans("Translations");

+		$head[$h][1] = $langs->trans("Translation");

@@ -100 +83,2 @@
-	if (getDolGlobalString('PRODUIT_SOUSPRODUITS')) {

+	if (!empty($conf->global->PRODUIT_SOUSPRODUITS))

+	{

@@ -105,3 +89 @@
-		if ($nbFatherAndChild > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbFatherAndChild.'</span>';

-		}

+		if ($nbFatherAndChild > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbFatherAndChild.'</span>';

@@ -112 +94,11 @@
-	if (isModEnabled('variants') && ($object->isProduct() || $object->isService())) {

+	$head[$h][0] = DOL_URL_ROOT."/product/stats/card.php?id=".$object->id;

+	$head[$h][1] = $langs->trans('Statistics');

+	$head[$h][2] = 'stats';

+	$h++;

+

+	$head[$h][0] = DOL_URL_ROOT."/product/stats/facture.php?showmessage=1&id=".$object->id;

+	$head[$h][1] = $langs->trans('Referers');

+	$head[$h][2] = 'referers';

+	$h++;

+

+	if (!empty($conf->variants->enabled) && ($object->isProduct() || $object->isService())) {

@@ -119 +111,2 @@
-		if ($prodcomb->fetchByFkProductChild($object->id) <= 0) {

+		if ($prodcomb->fetchByFkProductChild($object->id) == -1)

+		{

@@ -124,3 +117 @@
-			if ($nbVariant > 0) {

-				$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbVariant.'</span>';

-			}

+            if ($nbVariant > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbVariant.'</span>';

@@ -131,59 +122,112 @@
-

-	if ($object->isProduct() || ($object->isService() && getDolGlobalString('STOCK_SUPPORTS_SERVICES'))) {    // If physical product we can stock (or service with option)

-		if (isModEnabled('stock') && $user->hasRight('stock', 'lire')) {

-			$head[$h][0] = DOL_URL_ROOT."/product/stock/product.php?id=".$object->id;

-			$head[$h][1] = $langs->trans("Stock");

-			$head[$h][2] = 'stock';

-			$h++;

-		}

-	}

-

-	// Tab to link resources

-	if (isModEnabled('resource')) {

-		if ($object->isProduct() && getDolGlobalString('RESOURCE_ON_PRODUCTS')) {

-			$head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=product&ref='.$object->ref;

-			$head[$h][1] = $langs->trans("Resources");

-			$head[$h][2] = 'resources';

-			$h++;

-		}

-		if ($object->isService() && getDolGlobalString('RESOURCE_ON_SERVICES')) {

-			$head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=service&ref='.$object->ref;

-			$head[$h][1] = $langs->trans("Resources");

-			$head[$h][2] = 'resources';

-			$h++;

-		}

-	}

-

-	$head[$h][0] = DOL_URL_ROOT."/product/stats/facture.php?showmessage=1&id=".$object->id;

-	$head[$h][1] = $langs->trans('Referers');

-	$head[$h][2] = 'referers';

-	$h++;

-

-	$head[$h][0] = DOL_URL_ROOT."/product/stats/card.php?id=".$object->id;

-	$head[$h][1] = $langs->trans('Statistics');

-	$head[$h][2] = 'stats';

-	$h++;

-

-	// Show more tabs from modules

-	// Entries must be declared in modules descriptor with line

-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname);   												to remove a tab

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'product', 'add', 'core');

-

-	// Notes

-	if (!getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {

-		$nbNote = 0;

-		if (!empty($object->note_private)) {

-			$nbNote++;

-		}

-		if (!empty($object->note_public)) {

-			$nbNote++;

-		}

-		$head[$h][0] = DOL_URL_ROOT.'/product/note.php?id='.$object->id;

-		$head[$h][1] = $langs->trans('Notes');

-		if ($nbNote > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

-		}

-		$head[$h][2] = 'note';

-		$h++;

-	}

+	

+	if (!empty($object->status))

+	{

+    	$head[$h][0] = DOL_URL_ROOT."/product/declin.php?id=".$object->id;

+    	$head[$h][1] = $langs->trans("Déclinaisons");

+    	$head[$h][2] = 'declin';

+    	$h++;

+	}

+

+    if ($object->isProduct() || ($object->isService() && !empty($conf->global->STOCK_SUPPORTS_SERVICES)))    // If physical product we can stock (or service with option)

+    {

+        if (!empty($conf->stock->enabled) && $user->rights->stock->lire)

+        {

+            $head[$h][0] = DOL_URL_ROOT."/product/stock/product.php?id=".$object->id;

+            $head[$h][1] = $langs->trans("Stock");

+            $head[$h][2] = 'stock';

+            $h++;

+        }

+    }

+

+    // Tab to link resources

+    if (!empty($conf->resource->enabled))

+    {

+        if ($object->isProduct() && !empty($conf->global->RESOURCE_ON_PRODUCTS))

+        {

+            $head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=product&ref='.$object->ref;

+            $head[$h][1] = $langs->trans("Resources");

+            $head[$h][2] = 'resources';

+            $h++;

+        }

+        if ($object->isService() && !empty($conf->global->RESOURCE_ON_SERVICES))

+        {

+            $head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=service&ref='.$object->ref;

+            $head[$h][1] = $langs->trans("Resources");

+            $head[$h][2] = 'resources';

+            $h++;

+        }

+    }

+

+    // Show more tabs from modules

+    // Entries must be declared in modules descriptor with line

+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

+    // $this->tabs = array('entity:-tabname);   												to remove a tab

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'product');

+

+    // Notes

+    if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))

+    {

+        $nbNote = 0;

+        if (!empty($object->note_private)) $nbNote++;

+        if (!empty($object->note_public)) $nbNote++;

+        $head[$h][0] = DOL_URL_ROOT.'/product/note.php?id='.$object->id;

+        $head[$h][1] = $langs->trans('Notes');

+        if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

+        $head[$h][2] = 'note';

+        $h++;

+    }

+

+    // Attachments

+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

+    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

+    if (!empty($conf->product->enabled) && ($object->type == Product::TYPE_PRODUCT)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);

+    if (!empty($conf->service->enabled) && ($object->type == Product::TYPE_SERVICE)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);

+    $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));

+    if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {

+        if (!empty($conf->product->enabled) && ($object->type == Product::TYPE_PRODUCT)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.get_exdir($object->id, 2, 0, 0, $object, 'product').$object->id.'/photos';

+        if (!empty($conf->service->enabled) && ($object->type == Product::TYPE_SERVICE)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.get_exdir($object->id, 2, 0, 0, $object, 'product').$object->id.'/photos';

+        $nbFiles += count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));

+    }

+    $nbLinks = Link::count($db, $object->element, $object->id);

+	$head[$h][0] = DOL_URL_ROOT.'/product/document.php?id='.$object->id;

+	$head[$h][1] = $langs->trans('Documents');

+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

+	$head[$h][2] = 'documents';

+	$h++;

+

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'product', 'remove');

+

+    // Log

+    $head[$h][0] = DOL_URL_ROOT.'/product/agenda.php?id='.$object->id;

+    $head[$h][1] = $langs->trans("Events");

+    if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))

+    {

+    	$head[$h][1] .= '/';

+    	$head[$h][1] .= $langs->trans("Agenda");

+    }

+    $head[$h][2] = 'agenda';

+    $h++;

+

+	return $head;

+}

+

+/**

+ * Prepare array with list of tabs

+ *

+ * @param   ProductLot	$object		Object related to tabs

+ * @return  array		     		Array of tabs to show

+ */

+function productlot_prepare_head($object)

+{

+    global $db, $langs, $conf, $user;

+

+    // Load translation files required by the page

+    $langs->loadLangs(array("products", "productbatch"));

+

+    $h = 0;

+    $head = array();

+

+    $head[$h][0] = DOL_URL_ROOT."/product/stock/productlot_card.php?id=".$object->id;

+    $head[$h][1] = $langs->trans("Lot");

+    $head[$h][2] = 'card';

+	$h++;

@@ -193,75 +237,4 @@
-	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

-	if (isModEnabled("product") && ($object->type == Product::TYPE_PRODUCT)) {

-		$upload_dir = $conf->product->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);

-	}

-	if (isModEnabled("service") && ($object->type == Product::TYPE_SERVICE)) {

-		$upload_dir = $conf->service->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);

-	}

-	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));

-	if (getDolGlobalInt('PRODUCT_USE_OLD_PATH_FOR_PHOTO')) {

-		if (isModEnabled("product") && ($object->type == Product::TYPE_PRODUCT)) {

-			$upload_dir = $conf->product->multidir_output[$object->entity].'/'.get_exdir($object->id, 2, 0, 0, $object, 'product').$object->id.'/photos';

-		}

-		if (isModEnabled("service") && ($object->type == Product::TYPE_SERVICE)) {

-			$upload_dir = $conf->service->multidir_output[$object->entity].'/'.get_exdir($object->id, 2, 0, 0, $object, 'product').$object->id.'/photos';

-		}

-		$nbFiles += count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));

-	}

-	$nbLinks = Link::count($db, $object->element, $object->id);

-	$head[$h][0] = DOL_URL_ROOT.'/product/document.php?id='.$object->id;

-	$head[$h][1] = $langs->trans('Documents');

-	if (($nbFiles + $nbLinks) > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

-	}

-	$head[$h][2] = 'documents';

-	$h++;

-

-	// Log

-	$head[$h][0] = DOL_URL_ROOT.'/product/agenda.php?id='.$object->id;

-	$head[$h][1] = $langs->trans("Events");

-	if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {

-		$head[$h][1] .= '/';

-		$head[$h][1] .= $langs->trans("Agenda");

-	}

-	$head[$h][2] = 'agenda';

-	$h++;

-

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'product', 'add', 'external');

-

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'product', 'remove');

-

-	return $head;

-}

-

-/**

- * Prepare array with list of tabs

- *

- * @param   ProductLot	$object		Object related to tabs

- * @return  array		     		Array of tabs to show

- */

-function productlot_prepare_head($object)

-{

-	global $db, $langs, $conf, $user;

-

-	// Load translation files required by the page

-	$langs->loadLangs(array("products", "productbatch"));

-

-	$h = 0;

-	$head = array();

-

-	$head[$h][0] = DOL_URL_ROOT."/product/stock/productlot_card.php?id=".$object->id;

-	$head[$h][1] = $langs->trans("Lot");

-	$head[$h][2] = 'card';

-	$h++;

-

-	$head[$h][0] = DOL_URL_ROOT."/product/stock/stats/expedition.php?showmessage=1&id=".$object->id;

-	$head[$h][1] = $langs->trans('Referers');

-	$head[$h][2] = 'referers';

-	$h++;

-

-	// Attachments

-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

-	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

-	$upload_dir = $conf->productbatch->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);

-	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));

-	$nbLinks = Link::count($db, $object->element, $object->id);

+    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

+    $upload_dir = $conf->productbatch->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);

+    $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));

+    $nbLinks = Link::count($db, $object->element, $object->id);

@@ -270,41 +243,21 @@
-	if (($nbFiles + $nbLinks) > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

-	}

-	$head[$h][2] = 'documents';

-	$h++;

-

-	// Notes

-	if (!getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {

-		$nbNote = 0;

-		if (!empty($object->note_private)) {

-			$nbNote++;

-		}

-		if (!empty($object->note_public)) {

-			$nbNote++;

-		}

-		$head[$h][0] = DOL_URL_ROOT .'/product/stock/productlot_note.php?id=' . $object->id;

-		$head[$h][1] = $langs->trans('Notes');

-		if ($nbNote > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbNote . '</span>';

-		}

-		$head[$h][2] = 'note';

-		$h++;

-	}

-

-	// Show more tabs from modules

-	// Entries must be declared in modules descriptor with line

-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname);   												to remove a tab

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'productlot');

-

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'productlot', 'remove');

-

-	// Log

-	/*

-	$head[$h][0] = DOL_URL_ROOT.'/product/info.php?id='.$object->id;

-	$head[$h][1] = $langs->trans("Info");

-	$head[$h][2] = 'info';

-	$h++;

-	*/

-

-	return $head;

+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

+    $head[$h][2] = 'documents';

+	$h++;

+

+    // Show more tabs from modules

+    // Entries must be declared in modules descriptor with line

+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

+    // $this->tabs = array('entity:-tabname);   												to remove a tab

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'productlot');

+

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'productlot', 'remove');

+

+    // Log

+    /*

+    $head[$h][0] = DOL_URL_ROOT.'/product/info.php?id='.$object->id;

+    $head[$h][1] = $langs->trans("Info");

+    $head[$h][2] = 'info';

+    $h++;

+    */

+

+    return $head;

@@ -322,5 +275 @@
-	global $langs, $conf, $user, $db;

-

-	$extrafields = new ExtraFields($db);

-	$extrafields->fetch_name_optionals_label('product');

-	$extrafields->fetch_name_optionals_label('product_fournisseur_price');

+	global $langs, $conf, $user;

@@ -336 +285,2 @@
-	if (getDolGlobalString('PRODUIT_MULTIPRICES') && getDolGlobalString('PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL')) {

+	if (!empty($conf->global->PRODUIT_MULTIPRICES) && !empty($conf->global->PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL))

+	{

@@ -347,2 +297,2 @@
-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname);   												to remove a tab

+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

+    // $this->tabs = array('entity:-tabname);   												to remove a tab

@@ -353,4 +302,0 @@
-	$nbExtrafields = $extrafields->attributes['product']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

@@ -362,4 +307,0 @@
-	$nbExtrafields = $extrafields->attributes['product_fournisseur_price']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

@@ -377,3 +319,3 @@
- * Return array head with list of tabs to view object informations.

- *

- * @return	array   	        head array with tabs

+ *  Return array head with list of tabs to view object informations.

+ *

+ *  @return	array   	        head array with tabs

@@ -383,31 +325,19 @@
-	global $langs, $conf, $user, $db;

-

-	$extrafields = new ExtraFields($db);

-	$extrafields->fetch_name_optionals_label('product_lot');

-

-	$h = 0;

-	$head = array();

-

-	$head[$h][0] = DOL_URL_ROOT."/product/admin/product_lot.php";

-	$head[$h][1] = $langs->trans('Parameters');

-	$head[$h][2] = 'settings';

-	$h++;

-

-	// Show more tabs from modules

-	// Entries must be declared in modules descriptor with line

-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname);   												to remove a tab

-	complete_head_from_modules($conf, $langs, null, $head, $h, 'product_lot_admin');

-

-	$head[$h][0] = DOL_URL_ROOT.'/product/admin/product_lot_extrafields.php';

-	$head[$h][1] = $langs->trans("ExtraFields");

-	$nbExtrafields = $extrafields->attributes['product_lot']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

-	$head[$h][2] = 'attributes';

-	$h++;

-

-	complete_head_from_modules($conf, $langs, null, $head, $h, 'product_lot_admin', 'remove');

-

-	return $head;

+    global $langs, $conf, $user;

+

+    $h = 0;

+    $head = array();

+

+    // Show more tabs from modules

+    // Entries must be declared in modules descriptor with line

+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

+    // $this->tabs = array('entity:-tabname);   												to remove a tab

+    complete_head_from_modules($conf, $langs, null, $head, $h, 'product_lot_admin');

+

+    $head[$h][0] = DOL_URL_ROOT.'/product/admin/product_lot_extrafields.php';

+    $head[$h][1] = $langs->trans("ExtraFields");

+    $head[$h][2] = 'attributes';

+    $h++;

+

+    complete_head_from_modules($conf, $langs, null, $head, $h, 'product_lot_admin', 'remove');

+

+    return $head;

@@ -427,3 +357 @@
-	global $conf, $langs, $user, $db, $hookmanager;

-

-	$form = new Form($db);

+	global $conf, $langs, $user, $db;

@@ -439,0 +368,18 @@
+	// MO

+	if (!empty($conf->mrp->enabled) && $user->rights->mrp->read)

+	{

+		$nblines++;

+		//$ret = $product->load_stats_mo($socid);

+		if ($ret < 0) dol_print_error($db);

+		$langs->load("orders");

+		print '<tr><td>';

+		print '<a href="mo.php?id='.$product->id.'">'.img_object('', 'mrp').' '.$langs->trans("MO").'</a>';

+		print '</td><td class="right">';

+		print $product->stats_mo['suppliers'];

+		print '</td><td class="right">';

+		print $product->stats_mo['nb'];

+		print '</td><td class="right">';

+		print $product->stats_mo['qty'];

+		print '</td>';

+		print '</tr>';

+	}

@@ -441 +387,2 @@
-	if (isModEnabled("propal") && $user->hasRight('propal', 'lire')) {

+	if (!empty($conf->propal->enabled) && $user->rights->propale->lire)

+	{

@@ -444,3 +391 @@
-		if ($ret < 0) {

-			dol_print_error($db);

-		}

+		if ($ret < 0) dol_print_error($db);

@@ -449 +394 @@
-		print '<a href="propal.php?id='.$product->id.'">'.img_object('', 'propal', 'class="pictofixedwidth"').$langs->trans("Proposals").'</a>';

+		print '<a href="propal.php?id='.$product->id.'">'.img_object('', 'propal').' '.$langs->trans("Proposals").'</a>';

@@ -460 +405,2 @@
-	if (isModEnabled('supplier_proposal') && $user->hasRight('supplier_proposal', 'lire')) {

+	if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire)

+	{

@@ -463,6 +409,4 @@
-		if ($ret < 0) {

-			dol_print_error($db);

-		}

-		$langs->load("supplier_proposal");

-		print '<tr><td>';

-		print '<a href="supplier_proposal.php?id='.$product->id.'">'.img_object('', 'supplier_proposal', 'class="pictofixedwidth"').$langs->trans("SupplierProposals").'</a>';

+		if ($ret < 0) dol_print_error($db);

+		$langs->load("propal");

+		print '<tr><td>';

+		print '<a href="supplier_proposal.php?id='.$product->id.'">'.img_object('', 'supplier_proposal').' '.$langs->trans("SupplierProposals").'</a>';

@@ -478,2 +422,3 @@
-	// Sales orders

-	if (isModEnabled('commande') && $user->hasRight('commande', 'lire')) {

+	// Customer orders

+	if (!empty($conf->commande->enabled) && $user->rights->commande->lire)

+	{

@@ -482,3 +427 @@
-		if ($ret < 0) {

-			dol_print_error($db);

-		}

+		if ($ret < 0) dol_print_error($db);

@@ -487 +430 @@
-		print '<a href="commande.php?id='.$product->id.'">'.img_object('', 'order', 'class="pictofixedwidth"').$langs->trans("CustomersOrders").'</a>';

+		print '<a href="commande.php?id='.$product->id.'">'.img_object('', 'order').' '.$langs->trans("CustomersOrders").'</a>';

@@ -498 +441,2 @@
-	if ((isModEnabled("fournisseur") && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') && $user->hasRight('fournisseur', 'commande', 'lire')) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire'))) {

+	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled)) && $user->rights->fournisseur->commande->lire)

+	{

@@ -501,3 +445 @@
-		if ($ret < 0) {

-			dol_print_error($db);

-		}

+		if ($ret < 0) dol_print_error($db);

@@ -506 +448 @@
-		print '<a href="commande_fournisseur.php?id='.$product->id.'">'.img_object('', 'supplier_order', 'class="pictofixedwidth"').$langs->trans("SuppliersOrders").'</a>';

+		print '<a href="commande_fournisseur.php?id='.$product->id.'">'.img_object('', 'supplier_order').' '.$langs->trans("SuppliersOrders").'</a>';

@@ -517 +459,2 @@
-	if (isModEnabled('facture') && $user->hasRight('facture', 'lire')) {

+	if (!empty($conf->facture->enabled) && $user->rights->facture->lire)

+	{

@@ -520,3 +463 @@
-		if ($ret < 0) {

-			dol_print_error($db);

-		}

+		if ($ret < 0) dol_print_error($db);

@@ -525 +466 @@
-		print '<a href="facture.php?id='.$product->id.'">'.img_object('', 'bill', 'class="pictofixedwidth"').$langs->trans("CustomersInvoices").'</a>';

+		print '<a href="facture.php?id='.$product->id.'">'.img_object('', 'bill').' '.$langs->trans("CustomersInvoices").'</a>';

@@ -535,7 +476,6 @@
-	// Customer template invoices

-	if (isModEnabled("facture") && $user->hasRight('facture', 'lire')) {

-		$nblines++;

-		$ret = $product->load_stats_facturerec($socid);

-		if ($ret < 0) {

-			dol_print_error($db);

-		}

+	// Supplier invoices

+	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->facture->lire)

+	{

+		$nblines++;

+		$ret = $product->load_stats_facture_fournisseur($socid);

+		if ($ret < 0) dol_print_error($db);

@@ -544,20 +484 @@
-		print '<a href="facturerec.php?id='.$product->id.'">'.img_object('', 'bill', 'class="pictofixedwidth"').$langs->trans("RecurringInvoiceTemplate").'</a>';

-		print '</td><td class="right">';

-		print $product->stats_facture['customers'];

-		print '</td><td class="right">';

-		print $product->stats_facturerec['nb'];

-		print '</td><td class="right">';

-		print $product->stats_facturerec['qty'];

-		print '</td>';

-		print '</tr>';

-	}

-	// Supplier invoices

-	if ((isModEnabled("fournisseur") && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') && $user->hasRight('fournisseur', 'facture', 'lire')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire'))) {

-		$nblines++;

-		$ret = $product->load_stats_facture_fournisseur($socid);

-		if ($ret < 0) {

-			dol_print_error($db);

-		}

-		$langs->load("bills");

-		print '<tr><td>';

-		print '<a href="facture_fournisseur.php?id='.$product->id.'">'.img_object('', 'supplier_invoice', 'class="pictofixedwidth"').$langs->trans("SuppliersInvoices").'</a>';

+		print '<a href="facture_fournisseur.php?id='.$product->id.'">'.img_object('', 'supplier_invoice').' '.$langs->trans("SuppliersInvoices").'</a>';

@@ -575 +496,2 @@
-	if (isModEnabled('contrat') && $user->hasRight('contrat', 'lire')) {

+	if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire)

+	{

@@ -578,3 +500 @@
-		if ($ret < 0) {

-			dol_print_error($db);

-		}

+		if ($ret < 0) dol_print_error($db);

@@ -583 +503 @@
-		print '<a href="contrat.php?id='.$product->id.'">'.img_object('', 'contract', 'class="pictofixedwidth"').$langs->trans("Contracts").'</a>';

+		print '<a href="contrat.php?id='.$product->id.'">'.img_object('', 'contract').' '.$langs->trans("Contracts").'</a>';

@@ -593,180 +512,0 @@
-

-	// BOM

-	if (isModEnabled('bom') && $user->hasRight('bom', 'read')) {

-		$nblines++;

-		$ret = $product->load_stats_bom($socid);

-		if ($ret < 0) {

-			setEventMessage($product->error, 'errors');

-		}

-		$langs->load("mrp");

-

-		print '<tr><td>';

-		print '<a href="bom.php?id='.$product->id.'">'.img_object('', 'bom', 'class="pictofixedwidth"').$langs->trans("BOM").'</a>';

-		print '</td><td class="right">';

-

-		print '</td><td class="right">';

-		print $form->textwithpicto($product->stats_bom['nb_toconsume'], $langs->trans("RowMaterial"));

-		print $form->textwithpicto($product->stats_bom['nb_toproduce'], $langs->trans("Finished"));

-		print '</td><td class="right">';

-		print $form->textwithpicto($product->stats_bom['qty_toconsume'], $langs->trans("RowMaterial"));

-		print $form->textwithpicto($product->stats_bom['qty_toproduce'], $langs->trans("Finished"));

-		print '</td>';

-		print '</tr>';

-	}

-

-	// MO

-	if (isModEnabled('mrp') && $user->hasRight('mrp', 'read')) {

-		$nblines++;

-		$ret = $product->load_stats_mo($socid);

-		if ($ret < 0) {

-			setEventMessages($product->error, $product->errors, 'errors');

-		}

-		$langs->load("mrp");

-		print '<tr><td>';

-		print '<a href="mo.php?id='.$product->id.'">'.img_object('', 'mrp', 'class="pictofixedwidth"').$langs->trans("MO").'</a>';

-		print '</td><td class="right">';

-		print $form->textwithpicto($product->stats_mo['customers_toconsume'], $langs->trans("ToConsume"));

-		print $form->textwithpicto($product->stats_mo['customers_consumed'], $langs->trans("QtyAlreadyConsumed"));

-		print $form->textwithpicto($product->stats_mo['customers_toproduce'], $langs->trans("QtyToProduce"));

-		print $form->textwithpicto($product->stats_mo['customers_produced'], $langs->trans("QtyAlreadyProduced"));

-		print '</td><td class="right">';

-		print $form->textwithpicto($product->stats_mo['nb_toconsume'], $langs->trans("ToConsume"));

-		print $form->textwithpicto($product->stats_mo['nb_consumed'], $langs->trans("QtyAlreadyConsumed"));

-		print $form->textwithpicto($product->stats_mo['nb_toproduce'], $langs->trans("QtyToProduce"));

-		print $form->textwithpicto($product->stats_mo['nb_produced'], $langs->trans("QtyAlreadyProduced"));

-		print '</td><td class="right">';

-		print $form->textwithpicto($product->stats_mo['qty_toconsume'], $langs->trans("ToConsume"));

-		print $form->textwithpicto($product->stats_mo['qty_consumed'], $langs->trans("QtyAlreadyConsumed"));

-		print $form->textwithpicto($product->stats_mo['qty_toproduce'], $langs->trans("QtyToProduce"));

-		print $form->textwithpicto($product->stats_mo['qty_produced'], $langs->trans("QtyAlreadyProduced"));

-		print '</td>';

-		print '</tr>';

-	}

-	$parameters = array('socid'=>$socid);

-	$reshook = $hookmanager->executeHooks('addMoreProductStat', $parameters, $product, $nblines); // Note that $action and $object may have been modified by some hooks

-	if ($reshook < 0) {

-		setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

-	}

-

-	print $hookmanager->resPrint;

-

-

-	return $nblines++;

-}

-

-/**

- * Show stats for product batch

- *

- * @param	Productlot	$batch	Product batch object

- * @param 	int			$socid	Thirdparty id

- * @return	integer				NB of lines shown into array

- */

-function show_stats_for_batch($batch, $socid)

-{

-	global $conf, $langs, $user, $db, $hookmanager;

-

-	$langs->LoadLangs(array('sendings', 'orders', 'receptions'));

-

-	$form = new Form($db);

-

-	$nblines = 0;

-

-	print '<tr class="liste_titre">';

-	print '<td class="left" width="25%">'.$langs->trans("Referers").'</td>';

-	print '<td class="right" width="25%">'.$langs->trans("NbOfThirdParties").'</td>';

-	print '<td class="right" width="25%">'.$langs->trans("NbOfObjectReferers").'</td>';

-	print '<td class="right" width="25%">'.$langs->trans("TotalQuantity").'</td>';

-	print '</tr>';

-

-	// Expeditions

-	if (isModEnabled('expedition') && $user->hasRight('expedition', 'lire')) {

-		$nblines++;

-		$ret = $batch->loadStatsExpedition($socid);

-		if ($ret < 0) {

-			dol_print_error($db);

-		}

-		$langs->load("bills");

-		print '<tr><td>';

-		print '<a href="'.dol_buildpath('/product/stock/stats/expedition.php', 1).'?id='.$batch->id.'">'.img_object('', 'bill', 'class="pictofixedwidth"').$langs->trans("Shipments").'</a>';

-		print '</td><td class="right">';

-		print $batch->stats_expedition['customers'];

-		print '</td><td class="right">';

-		print $batch->stats_expedition['nb'];

-		print '</td><td class="right">';

-		print $batch->stats_expedition['qty'];

-		print '</td>';

-		print '</tr>';

-	}

-

-	if (isModEnabled("reception") && $user->hasRight('reception', 'lire')) {

-		$nblines++;

-		$ret = $batch->loadStatsReception($socid);

-		if ($ret < 0) {

-			dol_print_error($db);

-		}

-		$langs->load("bills");

-		print '<tr><td>';

-		print '<a href="'.dol_buildpath('/product/stock/stats/reception.php', 1).'?id='.$batch->id.'">'.img_object('', 'bill', 'class="pictofixedwidth"').$langs->trans("Receptions").'</a>';

-		print '</td><td class="right">';

-		print $batch->stats_reception['customers'];

-		print '</td><td class="right">';

-		print $batch->stats_reception['nb'];

-		print '</td><td class="right">';

-		print $batch->stats_reception['qty'];

-		print '</td>';

-		print '</tr>';

-	} elseif (isModEnabled('supplier_order') && $user->hasRight('fournisseur', 'commande', 'lire')) {

-		$nblines++;

-		$ret = $batch->loadStatsSupplierOrder($socid);

-		if ($ret < 0) {

-			dol_print_error($db);

-		}

-		$langs->load("bills");

-		print '<tr><td>';

-		print '<a href="'.dol_buildpath('/product/stock/stats/commande_fournisseur.php', 1).'?id='.$batch->id.'">'.img_object('', 'bill', 'class="pictofixedwidth"').$langs->trans("SuppliersOrders").'</a>';

-		print '</td><td class="right">';

-		print $batch->stats_supplier_order['customers'];

-		print '</td><td class="right">';

-		print $batch->stats_supplier_order['nb'];

-		print '</td><td class="right">';

-		print $batch->stats_supplier_order['qty'];

-		print '</td>';

-		print '</tr>';

-	}

-

-	if (isModEnabled('mrp') && $user->hasRight('mrp', 'read')) {

-		$nblines++;

-		$ret = $batch->loadStatsMo($socid);

-		if ($ret < 0) {

-			dol_print_error($db);

-		}

-		$langs->load("mrp");

-		print '<tr><td>';

-		print '<a href="'.dol_buildpath('/product/stock/stats/mo.php', 1).'?id='.$batch->id.'">'.img_object('', 'mrp', 'class="pictofixedwidth"').$langs->trans("MO").'</a>';

-		print '</td><td class="right">';

-		//      print $form->textwithpicto($batch->stats_mo['customers_toconsume'], $langs->trans("ToConsume")); Makes no sense with batch, at this moment we don't know batch number

-		print $form->textwithpicto($batch->stats_mo['customers_consumed'], $langs->trans("QtyAlreadyConsumed"));

-		//      print $form->textwithpicto($batch->stats_mo['customers_toproduce'], $langs->trans("QtyToProduce")); Makes no sense with batch, at this moment we don't know batch number

-		print $form->textwithpicto($batch->stats_mo['customers_produced'], $langs->trans("QtyAlreadyProduced"));

-		print '</td><td class="right">';

-		//      print $form->textwithpicto($batch->stats_mo['nb_toconsume'], $langs->trans("ToConsume")); Makes no sense with batch, at this moment we don't know batch number

-		print $form->textwithpicto($batch->stats_mo['nb_consumed'], $langs->trans("QtyAlreadyConsumed"));

-		//      print $form->textwithpicto($batch->stats_mo['nb_toproduce'], $langs->trans("QtyToProduce")); Makes no sense with batch, at this moment we don't know batch number

-		print $form->textwithpicto($batch->stats_mo['nb_produced'], $langs->trans("QtyAlreadyProduced"));

-		print '</td><td class="right">';

-		//      print $form->textwithpicto($batch->stats_mo['qty_toconsume'], $langs->trans("ToConsume")); Makes no sense with batch, at this moment we don't know batch number

-		print $form->textwithpicto($batch->stats_mo['qty_consumed'], $langs->trans("QtyAlreadyConsumed"));

-		//      print $form->textwithpicto($batch->stats_mo['qty_toproduce'], $langs->trans("QtyToProduce")); Makes no sense with batch, at this moment we don't know batch number

-		print $form->textwithpicto($batch->stats_mo['qty_produced'], $langs->trans("QtyAlreadyProduced"));

-		print '</td>';

-		print '</tr>';

-	}

-

-	$parameters = array('socid'=>$socid);

-	$reshook = $hookmanager->executeHooks('addMoreBatchProductStat', $parameters, $batch, $nblines); // Note that $action and $object may have been modified by some hooks

-	if ($reshook < 0) {

-		setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

-	}

-

-	print $hookmanager->resPrint;

-

@@ -781,6 +521,5 @@
- *  @param	string  	$scale				Scale of unit: '0', '-3', '6', ...

- *	@param  string		$measuring_style    Style of unit: weight, volume,...

- *	@param	int			$unit               ID of unit (rowid in llx_c_units table)

- *  @param	int			$use_short_label	1=Use short label ('g' instead of 'gram'). Short labels are not translated.

- *  @param	Translate	$outputlangs		Language object

- *	@return	string	   			         	Unit string

+ *  @param	string  $scale				 Scale of unit: '0', '-3', '6', ...

+ *	@param  string	$measuring_style     Style of unit: weight, volume,...

+ *	@param	int		$unit                ID of unit (rowid in llx_c_units table)

+ *  @param	int		$use_short_label	 1=Use short label ('g' instead of 'gram'). Short labels are not translated.

+ *	@return	string	   			         Unit string

@@ -789,3 +528,3 @@
-function measuring_units_string($scale = '', $measuring_style = '', $unit = 0, $use_short_label = 0, $outputlangs = null)

-{

-	return measuringUnitString($unit, $measuring_style, $scale, $use_short_label, $outputlangs);

+function measuring_units_string($scale = '', $measuring_style = '', $unit = 0, $use_short_label = 0)

+{

+	return measuringUnitString($unit, $measuring_style, $scale, $use_short_label);

@@ -797,6 +536,5 @@
- *	@param	int			$unit               ID of unit (rowid in llx_c_units table)

- *	@param  string		$measuring_style    Style of unit: 'weight', 'volume', ..., '' = 'net_measure' for option PRODUCT_ADD_NET_MEASURE

- *  @param	string  	$scale				Scale of unit: '0', '-3', '6', ...

- *  @param	int			$use_short_label	1=Use short label ('g' instead of 'gram'). Short labels are not translated.

- *  @param	Translate	$outputlangs		Language object

- *	@return	string	   			         	Unit string

+ *	@param	int		$unit                ID of unit (rowid in llx_c_units table)

+ *	@param  string	$measuring_style     Style of unit: 'weight', 'volume', ..., '' = 'net_measure' for option PRODUCT_ADD_NET_MEASURE

+ *  @param	string  $scale				 Scale of unit: '0', '-3', '6', ...

+ *  @param	int		$use_short_label	 1=Use short label ('g' instead of 'gram'). Short labels are not translated.

+ *	@return	string	   			         Unit string

@@ -805 +543 @@
-function measuringUnitString($unit, $measuring_style = '', $scale = '', $use_short_label = 0, $outputlangs = null)

+function measuringUnitString($unit, $measuring_style = '', $scale = '', $use_short_label = 0)

@@ -810,5 +548,2 @@
-	if (empty($outputlangs)) {

-		$outputlangs = $langs;

-	}

-

-	if (empty($measuring_unit_cache[$unit.'_'.$measuring_style.'_'.$scale.'_'.$use_short_label])) {

+	if (empty($measuring_unit_cache[$unit.'_'.$measuring_style.'_'.$scale.'_'.$use_short_label]))

+	{

@@ -818 +553,2 @@
-		if ($measuring_style == '' && $scale == '') {

+		if ($measuring_style == '' && $scale == '')

+		{

@@ -823 +559,3 @@
-		} elseif ($scale !== '') {

+		}

+		elseif ($scale !== '')

+		{

@@ -829 +567,3 @@
-		} else {

+		}

+		else

+		{

@@ -842,5 +582,2 @@
-				if ($use_short_label) {

-					$labeltoreturn = $measuringUnits->records[key($measuringUnits->records)]->short_label;

-				} else {

-					$labeltoreturn = $outputlangs->transnoentitiesnoconv($measuringUnits->records[key($measuringUnits->records)]->label);

-				}

+				if ($use_short_label) $labeltoreturn = $measuringUnits->records[key($measuringUnits->records)]->short_label;

+				else $labeltoreturn = $langs->transnoentitiesnoconv($measuringUnits->records[key($measuringUnits->records)]->label);

@@ -853 +590,2 @@
-	} else {

+	}

+	else {

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_project.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_project.lib.php
@@ -5,3 +5 @@
- * Copyright (C) 2018-2021 Frédéric France      <frederic.france@netlogic.fr>

- * Copyright (C) 2022      Charlene Benke       <charlene@patas-monkey.com>

- * Copyright (C) 2023      Gauthier VERDOL      <gauthier.verdol@atm-consulting.fr>

+ * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>

@@ -25,3 +23,3 @@
- * \file       htdocs/core/lib/project.lib.php

- * \brief      Functions used by project module

- * \ingroup    project

+ *	    \file       htdocs/core/lib/project.lib.php

+ *		\brief      Functions used by project module

+ *      \ingroup    project

@@ -35,3 +33,2 @@
- * @param	Project	$project	Object related to tabs

- * @param	string	$moreparam	More param on url

- * @return	array				Array of tabs to show

+ * @param   Object	$object		Object related to tabs

+ * @return  array				Array of tabs to show

@@ -39 +36 @@
-function project_prepare_head(Project $project, $moreparam = '')

+function project_prepare_head($object)

@@ -46 +43 @@
-	$head[$h][0] = DOL_URL_ROOT.'/projet/card.php?id='.((int) $project->id).($moreparam ? '&'.$moreparam : '');

+	$head[$h][0] = DOL_URL_ROOT.'/projet/card.php?id='.$object->id;

@@ -50,13 +47,3 @@
-	$nbContacts = 0;

-	// Enable caching of project count Contacts

-	require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';

-	$cachekey = 'count_contacts_project_'.$project->id;

-	$dataretrieved = dol_getcache($cachekey);

-

-	if (!is_null($dataretrieved)) {

-		$nbContacts = $dataretrieved;

-	} else {

-		$nbContacts = count($project->liste_contact(-1, 'internal')) + count($project->liste_contact(-1, 'external'));

-		dol_setcache($cachekey, $nbContacts, 120);	// If setting cache fails, this is not a problem, so we do not test result.

-	}

-	$head[$h][0] = DOL_URL_ROOT.'/projet/contact.php?id='.((int) $project->id).($moreparam ? '&'.$moreparam : '');

+

+	$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));

+	$head[$h][0] = DOL_URL_ROOT.'/projet/contact.php?id='.$object->id;

@@ -64,3 +51 @@
-	if ($nbContacts > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContacts.'</span>';

-	}

+	if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';

@@ -70 +55,2 @@
-	if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {

+	if (empty($conf->global->PROJECT_HIDE_TASKS))

+	{

@@ -72,15 +58 @@
-		$nbTasks = 0;

-		// Enable caching of project count Tasks

-		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';

-		$cachekey = 'count_tasks_project_'.$project->id;

-		$dataretrieved = dol_getcache($cachekey);

-

-		if (!is_null($dataretrieved)) {

-			$nbTasks = $dataretrieved;

-		} else {

-			require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';

-			$taskstatic = new Task($db);

-			$nbTasks = count($taskstatic->getTasksArray(0, 0, $project->id, 0, 0));

-			dol_setcache($cachekey, $nbTasks, 120);	// If setting cache fails, this is not a problem, so we do not test result.

-		}

-		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks.php?id='.((int) $project->id).($moreparam ? '&'.$moreparam : '');

+		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks.php?id='.$object->id;

@@ -88,3 +60,5 @@
-		if ($nbTasks > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbTasks).'</span>';

-		}

+

+		require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';

+		$taskstatic = new Task($db);

+		$nbTasks = count($taskstatic->getTasksArray(0, 0, $object->id, 0, 0));

+		if ($nbTasks > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbTasks).'</span>';

@@ -95,26 +69,15 @@
-		// Enable caching of project count Timespent

-		$cachekey = 'count_timespent_project_'.$project->id;

-		$dataretrieved = dol_getcache($cachekey);

-		if (!is_null($dataretrieved)) {

-			$nbTimeSpent = $dataretrieved;

-		} else {

-			$sql = "SELECT t.rowid";

-			//$sql .= " FROM ".MAIN_DB_PREFIX."element_time as t, ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."user as u";

-			//$sql .= " WHERE t.fk_user = u.rowid AND t.fk_task = pt.rowid";

-			$sql .= " FROM ".MAIN_DB_PREFIX."element_time as t, ".MAIN_DB_PREFIX."projet_task as pt";

-			$sql .= " WHERE t.fk_element = pt.rowid";

-			$sql .= " AND t.elementtype = 'task'";

-			$sql .= " AND pt.fk_projet =".((int) $project->id);

-			$resql = $db->query($sql);

-			if ($resql) {

-				$obj = $db->fetch_object($resql);

-				if ($obj) {

-					$nbTimeSpent = 1;

-					dol_setcache($cachekey, $nbTimeSpent, 120);	// If setting cache fails, this is not a problem, so we do not test result.

-				}

-			} else {

-				dol_print_error($db);

-			}

-		}

-

-		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?withproject=1&projectid='.((int) $project->id).($moreparam ? '&'.$moreparam : '');

+		$sql = "SELECT t.rowid";

+		//$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t, ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."user as u";

+		//$sql .= " WHERE t.fk_user = u.rowid AND t.fk_task = pt.rowid";

+		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t, ".MAIN_DB_PREFIX."projet_task as pt";

+		$sql .= " WHERE t.fk_task = pt.rowid";

+		$sql .= " AND pt.fk_projet =".$object->id;

+		$resql = $db->query($sql);

+		if ($resql)

+		{

+			$obj = $db->fetch_object($resql);

+			if ($obj) $nbTimeSpent = 1;

+		}

+		else dol_print_error($db);

+

+		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?withproject=1&projectid='.$object->id;

@@ -122,3 +85 @@
-		if ($nbTimeSpent > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">...</span>';

-		}

+		if ($nbTimeSpent > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">...</span>';

@@ -129,77 +90,6 @@
-	if (isModEnabled("supplier_proposal") || isModEnabled("supplier_order") || isModEnabled("supplier_invoice")

-		|| isModEnabled("propal") || isModEnabled('commande')

-		|| isModEnabled('facture') || isModEnabled('contrat')

-		|| isModEnabled('ficheinter') || isModEnabled('agenda') || isModEnabled('deplacement') || isModEnabled('stock')) {

-		$nbElements = 0;

-		// Enable caching of thirdrparty count Contacts

-		$cachekey = 'count_elements_project_'.$project->id;

-		$dataretrieved = dol_getcache($cachekey);

-		if (!is_null($dataretrieved)) {

-			$nbElements = $dataretrieved;

-		} else {

-			if (isModEnabled('stock')) {

-				$nbElements += $project->getElementCount('stock', 'entrepot', 'fk_project');

-			}

-			if (isModEnabled("propal")) {

-				$nbElements += $project->getElementCount('propal', 'propal');

-			}

-			if (isModEnabled('commande')) {

-				$nbElements += $project->getElementCount('order', 'commande');

-			}

-			if (isModEnabled('facture')) {

-				$nbElements += $project->getElementCount('invoice', 'facture');

-			}

-			if (isModEnabled('facture')) {

-				$nbElements += $project->getElementCount('invoice_predefined', 'facture_rec');

-			}

-			if (isModEnabled('supplier_proposal')) {

-				$nbElements += $project->getElementCount('proposal_supplier', 'supplier_proposal');

-			}

-			if (isModEnabled("supplier_order")) {

-				$nbElements += $project->getElementCount('order_supplier', 'commande_fournisseur');

-			}

-			if (isModEnabled("supplier_invoice")) {

-				$nbElements += $project->getElementCount('invoice_supplier', 'facture_fourn');

-			}

-			if (isModEnabled('contrat')) {

-				$nbElements += $project->getElementCount('contract', 'contrat');

-			}

-			if (isModEnabled('ficheinter')) {

-				$nbElements += $project->getElementCount('intervention', 'fichinter');

-			}

-			if (isModEnabled("expedition")) {

-				$nbElements += $project->getElementCount('shipping', 'expedition');

-			}

-			if (isModEnabled('mrp')) {

-				$nbElements += $project->getElementCount('mrp', 'mrp_mo', 'fk_project');

-			}

-			if (isModEnabled('deplacement')) {

-				$nbElements += $project->getElementCount('trip', 'deplacement');

-			}

-			if (isModEnabled('expensereport')) {

-				$nbElements += $project->getElementCount('expensereport', 'expensereport');

-			}

-			if (isModEnabled('don')) {

-				$nbElements += $project->getElementCount('donation', 'don');

-			}

-			if (isModEnabled('loan')) {

-				$nbElements += $project->getElementCount('loan', 'loan');

-			}

-			if (isModEnabled('tax')) {

-				$nbElements += $project->getElementCount('chargesociales', 'chargesociales');

-			}

-			if (isModEnabled('project')) {

-				$nbElements += $project->getElementCount('project_task', 'projet_task');

-			}

-			if (isModEnabled('stock')) {

-				$nbElements += $project->getElementCount('stock_mouvement', 'stock');

-			}

-			if (isModEnabled('salaries')) {

-				$nbElements += $project->getElementCount('salaries', 'payment_salary');

-			}

-			if (isModEnabled("banque")) {

-				$nbElements += $project->getElementCount('variouspayment', 'payment_various');

-			}

-			dol_setcache($cachekey, $nbElements, 120);	// If setting cache fails, this is not a problem, so we do not test result.

-		}

-		$head[$h][0] = DOL_URL_ROOT.'/projet/element.php?id='.$project->id;

+	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))

+		|| !empty($conf->propal->enabled) || !empty($conf->commande->enabled)

+		|| !empty($conf->facture->enabled) || !empty($conf->contrat->enabled)

+		|| !empty($conf->ficheinter->enabled) || !empty($conf->agenda->enabled) || !empty($conf->deplacement->enabled))

+	{

+		$head[$h][0] = DOL_URL_ROOT.'/projet/element.php?id='.$object->id;

@@ -207,3 +96,0 @@
-		if ($nbElements > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbElements.'</span>';

-		}

@@ -211,65 +97,0 @@
-		$h++;

-	}

-

-	if (isModEnabled('ticket') && $user->hasRight('ticket', 'read')) {

-		require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';

-		$Tickettatic = new Ticket($db);

-		$nbTicket = $Tickettatic->getCountOfItemsLinkedByObjectID($project->id, 'fk_project', 'ticket');

-		$head[$h][0] = DOL_URL_ROOT.'/ticket/list.php?projectid='.((int) $project->id);

-		$head[$h][1] = $langs->trans("Ticket");

-		if ($nbTicket > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbTicket).'</span>';

-		}

-		$head[$h][2] = 'ticket';

-		$h++;

-	}

-

-	if (isModEnabled('eventorganization') && !empty($project->usage_organize_event)) {

-		$langs->load('eventorganization');

-		$head[$h][0] = DOL_URL_ROOT . '/eventorganization/conferenceorbooth_list.php?projectid=' . $project->id;

-		$head[$h][1] = $langs->trans("EventOrganization");

-

-		// Enable caching of conf or booth count

-		$nbConfOrBooth = 0;

-		$nbAttendees = 0;

-		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';

-		$cachekey = 'count_conferenceorbooth_'.$project->id;

-		$dataretrieved = dol_getcache($cachekey);

-		if (!is_null($dataretrieved)) {

-			$nbConfOrBooth = $dataretrieved;

-		} else {

-			require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';

-			$conforbooth=new ConferenceOrBooth($db);

-			$result = $conforbooth->fetchAll('', '', 0, 0, array('t.fk_project'=>$project->id));

-			//,

-			if (!is_array($result) && $result<0) {

-				setEventMessages($conforbooth->error, $conforbooth->errors, 'errors');

-			} else {

-				$nbConfOrBooth = count($result);

-			}

-			dol_setcache($cachekey, $nbConfOrBooth, 120);	// If setting cache fails, this is not a problem, so we do not test result.

-		}

-		$cachekey = 'count_attendees_'.$project->id;

-		$dataretrieved = dol_getcache($cachekey);

-		if (!is_null($dataretrieved)) {

-			$nbAttendees = $dataretrieved;

-		} else {

-			require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';

-			$conforboothattendee=new ConferenceOrBoothAttendee($db);

-			$result = $conforboothattendee->fetchAll('', '', 0, 0, array('t.fk_project'=>$project->id));

-			//,

-			if (!is_array($result) && $result<0) {

-				setEventMessages($conforboothattendee->error, $conforboothattendee->errors, 'errors');

-			} else {

-				$nbAttendees = count($result);

-			}

-			dol_setcache($cachekey, $nbAttendees, 120);	// If setting cache fails, this is not a problem, so we do not test result.

-		}

-		if ($nbConfOrBooth > 0 || $nbAttendees > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">';

-			$head[$h][1] .= '<span title="'.dol_escape_htmltag($langs->trans("ConferenceOrBooth")).'">'.$nbConfOrBooth.'</span>';

-			$head[$h][1] .= ' + ';

-			$head[$h][1] .= '<span title="'.dol_escape_htmltag($langs->trans("Attendees")).'">'.$nbAttendees.'</span>';

-			$head[$h][1] .= '</span>';

-		}

-		$head[$h][2] = 'eventorganisation';

@@ -283,4 +105,5 @@
-	complete_head_from_modules($conf, $langs, $project, $head, $h, 'project', 'add', 'core');

-

-

-	if (!getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {

+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'project');

+

+

+	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))

+	{

@@ -288,7 +111,3 @@
-		if (!empty($project->note_private)) {

-			$nbNote++;

-		}

-		if (!empty($project->note_public)) {

-			$nbNote++;

-		}

-		$head[$h][0] = DOL_URL_ROOT.'/projet/note.php?id='.$project->id;

+		if (!empty($object->note_private)) $nbNote++;

+		if (!empty($object->note_public)) $nbNote++;

+		$head[$h][0] = DOL_URL_ROOT.'/projet/note.php?id='.$object->id;

@@ -296,3 +115 @@
-		if ($nbNote > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

-		}

+		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

@@ -303,18 +120,6 @@
-	// Attached files and Links

-	$totalAttached = 0;

-	// Enable caching of thirdrparty count attached files and links

-	require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';

-	$cachekey = 'count_attached_project_'.$project->id;

-	$dataretrieved = dol_getcache($cachekey);

-	if (!is_null($dataretrieved)) {

-		$totalAttached = $dataretrieved;

-	} else {

-		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

-		require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

-		$upload_dir = $conf->project->multidir_output[empty($project->entity) ? 1 : $project->entity]."/".dol_sanitizeFileName($project->ref);

-		$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));

-		$nbLinks = Link::count($db, $project->element, $project->id);

-		$totalAttached = $nbFiles + $nbLinks;

-		dol_setcache($cachekey, $totalAttached, 120);		// If setting cache fails, this is not a problem, so we do not test result.

-	}

-	$head[$h][0] = DOL_URL_ROOT.'/projet/document.php?id='.$project->id;

+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

+	$upload_dir = $conf->projet->dir_output."/".dol_sanitizeFileName($object->ref);

+	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));

+	$nbLinks = Link::count($db, $object->element, $object->id);

+	$head[$h][0] = DOL_URL_ROOT.'/projet/document.php?id='.$object->id;

@@ -322,3 +127 @@
-	if (($totalAttached) > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($totalAttached).'</span>';

-	}

+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

@@ -329,13 +132,4 @@
-	if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT')) {

-		$nbComments = 0;

-		// Enable caching of thirdrparty count attached files and links

-		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';

-		$cachekey = 'count_attached_project_'.$project->id;

-		$dataretrieved = dol_getcache($cachekey);

-		if (!is_null($dataretrieved)) {

-			$nbComments = $dataretrieved;

-		} else {

-			$nbComments = $project->getNbComments();

-			dol_setcache($cachekey, $nbComments, 120);		// If setting cache fails, this is not a problem, so we do not test result.

-		}

-		$head[$h][0] = DOL_URL_ROOT.'/projet/comment.php?id='.$project->id;

+	if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT))

+	{

+		$nbComments = $object->getNbComments();

+		$head[$h][0] = DOL_URL_ROOT.'/projet/comment.php?id='.$object->id;

@@ -343,3 +137 @@
-		if ($nbComments > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbComments.'</span>';

-		}

+		if ($nbComments > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbComments.'</span>';

@@ -350,3 +142,4 @@
-	$head[$h][0] = DOL_URL_ROOT.'/projet/messaging.php?id='.$project->id;

-	$head[$h][1] = $langs->trans("Events");

-	if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {

+	$head[$h][0] = DOL_URL_ROOT.'/projet/info.php?id='.$object->id;

+	$head[$h][1] .= $langs->trans("Events");

+	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))

+	{

@@ -359,3 +152 @@
-	complete_head_from_modules($conf, $langs, $project, $head, $h, 'project', 'add', 'external');

-

-	complete_head_from_modules($conf, $langs, $project, $head, $h, 'project', 'remove');

+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'project', 'remove');

@@ -380 +171 @@
-	$head[$h][1] = $langs->trans("Task");

+	$head[$h][1] = $langs->trans("Project");

@@ -387,3 +178 @@
-	if ($nbContact > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';

-	}

+	if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';

@@ -396 +185 @@
-	//$sql .= " FROM ".MAIN_DB_PREFIX."element_time as t, ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."user as u";

+	//$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t, ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."user as u";

@@ -398,2 +187,2 @@
-	$sql .= " FROM ".MAIN_DB_PREFIX."element_time as t";

-	$sql .= " WHERE t.elementtype='task' AND t.fk_element = ".((int) $object->id);

+	$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";

+	$sql .= " WHERE t.fk_task =".$object->id;

@@ -401 +190,2 @@
-	if ($resql) {

+	if ($resql)

+	{

@@ -403,8 +193,5 @@
-		if ($obj) {

-			$nbTimeSpent = 1;

-		}

-	} else {

-		dol_print_error($db);

-	}

-

-	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?id='.urlencode($object->id).(GETPOST('withproject') ? '&withproject=1' : '');

+		if ($obj) $nbTimeSpent = 1;

+	}

+	else dol_print_error($db);

+

+	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?id='.$object->id.(GETPOST('withproject') ? '&withproject=1' : '');

@@ -412,3 +199 @@
-	if ($nbTimeSpent > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">...</span>';

-	}

+	if ($nbTimeSpent > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">...</span>';

@@ -422,3 +207,4 @@
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'task', 'add', 'core');

-

-	if (!getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {

+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'task');

+

+	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))

+	{

@@ -426,7 +212,3 @@
-		if (!empty($object->note_private)) {

-			$nbNote++;

-		}

-		if (!empty($object->note_public)) {

-			$nbNote++;

-		}

-		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/note.php?id='.urlencode($object->id).(GETPOST('withproject') ? '&withproject=1' : '');

+		if (!empty($object->note_private)) $nbNote++;

+		if (!empty($object->note_public)) $nbNote++;

+		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/note.php?id='.$object->id.(GETPOST('withproject') ? '&withproject=1' : '');

@@ -434,3 +216 @@
-		if ($nbNote > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

-		}

+		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

@@ -442 +222 @@
-	$filesdir = $conf->project->multidir_output[$object->entity]."/".dol_sanitizeFileName($object->project->ref).'/'.dol_sanitizeFileName($object->ref);

+	$filesdir = $conf->projet->dir_output."/".dol_sanitizeFileName($object->project->ref).'/'.dol_sanitizeFileName($object->ref);

@@ -448,3 +228 @@
-	if (($nbFiles + $nbLinks) > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

-	}

+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

@@ -455 +233,2 @@
-	if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_TASK')) {

+	if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_TASK))

+	{

@@ -459,3 +238 @@
-		if ($nbComments > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbComments.'</span>';

-		}

+		if ($nbComments > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbComments.'</span>';

@@ -465,2 +241,0 @@
-

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'task', 'add', 'external');

@@ -490,5 +265,4 @@
-	if (is_object($fuser) && $fuser->id > 0 && $fuser->id != $user->id) {

-		$param .= '&search_usertoprocessid='.$fuser->id;

-	}

-

-	if (!getDolGlobalString('PROJECT_DISABLE_TIMESHEET_PERMONTH')) {

+	if (is_object($fuser) && $fuser->id > 0 && $fuser->id != $user->id) $param .= '&search_usertoprocessid='.$fuser->id;

+

+	if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERMONTH))

+	{

@@ -501 +275,2 @@
-	if (!getDolGlobalString('PROJECT_DISABLE_TIMESHEET_PERWEEK')) {

+	if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERWEEK))

+	{

@@ -508 +283,2 @@
-	if (!getDolGlobalString('PROJECT_DISABLE_TIMESHEET_PERTIME')) {

+	if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERTIME))

+	{

@@ -513,0 +290,8 @@
+

+	/*if ($conf->global->MAIN_FEATURES_LEVEL >= 2)

+	{

+		$head[$h][0] = DOL_URL_ROOT."/projet/activity/perline.php".($param?'?'.$param:'');

+		$head[$h][1] = $langs->trans("InputDetail");

+		$head[$h][2] = 'inputperline';

+		$h++;

+	}*/

@@ -530,6 +314 @@
-	global $langs, $conf, $user, $db;

-

-	$extrafields = new ExtraFields($db);

-	$extrafields->fetch_name_optionals_label('projet');

-	$extrafields->fetch_name_optionals_label('projet_task');

-

+	global $langs, $conf, $user;

@@ -537,0 +317,2 @@
+

+	$h = 0;

@@ -548,4 +328,0 @@
-	$nbExtrafields = $extrafields->attributes['projet']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

@@ -555,19 +332,4 @@
-	if (empty($conf->global->PROJECT_HIDE_TASKS)) {

-		$head[$h][0] = DOL_URL_ROOT . '/projet/admin/project_task_extrafields.php';

-		$head[$h][1] = $langs->trans("ExtraFieldsProjectTask");

-		$nbExtrafields = $extrafields->attributes['projet_task']['count'];

-		if ($nbExtrafields > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbExtrafields . '</span>';

-		}

-		$head[$h][2] = 'attributes_task';

-		$h++;

-	}

-

-	if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {

-		$langs->load("members");

-

-		$head[$h][0] = DOL_URL_ROOT.'/projet/admin/website.php';

-		$head[$h][1] = $langs->trans("BlankSubscriptionForm");

-		$head[$h][2] = 'website';

-		$h++;

-	}

+	$head[$h][0] = DOL_URL_ROOT.'/projet/admin/project_task_extrafields.php';

+	$head[$h][1] = $langs->trans("ExtraFieldsProjectTask");

+	$head[$h][2] = 'attributes_task';

+	$h++;

@@ -585 +347 @@
- * @param   string		$parent				    Id of parent task to show (0 to show all)

+ * @param   string		$parent				    Id of parent project to show (0 to show all)

@@ -594 +356 @@
- * @param   string      $dummy					Not used.

+ * @param   string      $filterprogresscalc     filter text

@@ -597 +358,0 @@
- * @param   array       $arrayofselected        Array with selected fields

@@ -600 +361 @@
-function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$taskrole, $projectsListId = '', $addordertick = 0, $projectidfortotallink = 0, $dummy = '', $showbilltime = 0, $arrayfields = array(), $arrayofselected = array())

+function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$taskrole, $projectsListId = '', $addordertick = 0, $projectidfortotallink = 0, $filterprogresscalc = '', $showbilltime = 0, $arrayfields = array())

@@ -608 +369,11 @@
-

+	if ($filterprogresscalc !== '') {

+		foreach ($lines as $key=>$line) {

+			if (!empty($line->planned_workload) && !empty($line->duration)) {

+				$filterprogresscalc = str_replace(' = ', ' == ', $filterprogresscalc);

+				if (!eval($filterprogresscalc)) {

+					unset($lines[$key]);

+				}

+			}

+		}

+		$lines = array_values($lines);

+	}

@@ -612,4 +383,4 @@
-	global $total_projectlinesa_spent, $total_projectlinesa_planned, $total_projectlinesa_spent_if_planned, $total_projectlinesa_declared_if_planned, $total_projectlinesa_tobill, $total_projectlinesa_billed, $total_budget_amount;

-	global $totalarray;

-

-	if ($level == 0) {

+	global $total_projectlinesa_spent, $total_projectlinesa_planned, $total_projectlinesa_spent_if_planned, $total_projectlinesa_declared_if_planned, $total_projectlinesa_tobill, $total_projectlinesa_billed;

+

+	if ($level == 0)

+	{

@@ -619 +390 @@
-		$total_projectlinesa_declared_if_planned = 0;

+        $total_projectlinesa_declared_if_planned = 0;

@@ -622,8 +393,5 @@
-		$total_budget_amount = 0;

-		$totalarray = array();

-	}

-

-	for ($i = 0; $i < $numlines; $i++) {

-		if ($parent == 0 && $level >= 0) {

-			$level = 0; // if $level = -1, we dont' use sublevel recursion, we show all lines

-		}

+	}

+

+	for ($i = 0; $i < $numlines; $i++)

+	{

+		if ($parent == 0 && $level >= 0) $level = 0; // if $level = -1, we dont' use sublevel recursion, we show all lines

@@ -633 +401,3 @@
-		if ($lines[$i]->fk_task_parent == $parent || $level < 0) {       // if $level = -1, we dont' use sublevel recursion, we show all lines

+

+		if ($lines[$i]->fk_parent == $parent || $level < 0)       // if $level = -1, we dont' use sublevel recursion, we show all lines

+		{

@@ -639 +409,2 @@
-			if (is_array($taskrole)) {

+			if (is_array($taskrole))

+			{

@@ -641 +412,2 @@
-				if (!isset($taskrole[$lines[$i]->id]) && $lines[$i]->id != $lines[$i]->fk_task_parent) {

+				if (!isset($taskrole[$lines[$i]->id]) && $lines[$i]->id != $lines[$i]->fk_parent)

+				{

@@ -646 +418,2 @@
-					if ($foundtaskforuserdeeper > 0) {

+					if ($foundtaskforuserdeeper > 0)

+					{

@@ -648 +421,3 @@
-					} else {

+					}

+					else

+					{

@@ -652 +427,3 @@
-			} else {

+			}

+			else

+			{

@@ -655 +432,2 @@
-				if (!$user->hasRight('projet', 'all', 'lire')) {

+				if (empty($user->rights->projet->all->lire))

+				{

@@ -657 +435,2 @@
-					if (!in_array($lines[$i]->fk_project, $projectsArrayId)) {

+					if (!in_array($lines[$i]->fk_project, $projectsArrayId))

+					{

@@ -666 +445,2 @@
-			if ($showline) {

+			if ($showline)

+			{

@@ -668 +448,2 @@
-				if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid) {

+				if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)

+				{

@@ -680 +460,0 @@
-				$projectstatic->status = $lines[$i]->projectstatus;

@@ -684 +464 @@
-				$taskstatic->label = (!empty($taskrole[$lines[$i]->id]) ? $langs->trans("YourRole").': '.$taskrole[$lines[$i]->id] : '');

+				$taskstatic->label = ($taskrole[$lines[$i]->id] ? $langs->trans("YourRole").': '.$taskrole[$lines[$i]->id] : '');

@@ -688,19 +468,7 @@
-				$taskstatic->date_start = $lines[$i]->date_start;

-				$taskstatic->date_end = $lines[$i]->date_end;

-				$taskstatic->datee = $lines[$i]->date_end; // deprecated

-				$taskstatic->planned_workload = $lines[$i]->planned_workload;

-				$taskstatic->duration_effective = $lines[$i]->duration_effective;

-				$taskstatic->budget_amount = $lines[$i]->budget_amount;

-

-				// Action column

-				if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {

-					print '<td class="nowrap center">';

-					$selected = 0;

-					if (in_array($lines[$i]->id, $arrayofselected)) {

-						$selected = 1;

-					}

-					print '<input id="cb' . $lines[$i]->id . '" class="flat checkforselect" type="checkbox" name="toselect[]" value="' . $lines[$i]->id . '"' . ($selected ? ' checked="checked"' : '') . '>';

-					print '</td>';

-				}

-

-				if ($showproject) {

+				$taskstatic->datee = $lines[$i]->date_end;

+                $taskstatic->planned_workload = $lines[$i]->planned_workload;

+                $taskstatic->duration_effective = $lines[$i]->duration;

+

+

+				if ($showproject)

+				{

@@ -708 +476 @@
-					print '<td class="nowraponall">';

+					print "<td>";

@@ -710,5 +478,2 @@
-					if ($lines[$i]->public || in_array($lines[$i]->fk_project, $projectsArrayId) || $user->hasRight('projet', 'all', 'lire')) {

-						print $projectstatic->getNomUrl(1);

-					} else {

-						print $projectstatic->getNomUrl(1, 'nolink');

-					}

+					if ($lines[$i]->public || in_array($lines[$i]->fk_project, $projectsArrayId) || !empty($user->rights->projet->all->lire)) print $projectstatic->getNomUrl(1);

+					else print $projectstatic->getNomUrl(1, 'nolink');

@@ -738,4 +503,3 @@
-					$labeltoshow = '';

-					if ($showlineingray) {

-						$labeltoshow .= '<i>';

-					}

+					print "<td>";

+					if ($showlineingray)

+						print '<i>';

@@ -744 +508 @@
-						$labeltoshow .= '<div class="marginleftonly">';

+						print '<div class="marginleftonly">';

@@ -746 +510 @@
-					$labeltoshow .= dol_escape_htmltag($lines[$i]->label);

+					print $lines[$i]->label;

@@ -748 +512 @@
-						$labeltoshow .= '</div>';

+						print '</div>';

@@ -750,5 +514,3 @@
-					if ($showlineingray) {

-						$labeltoshow .= '</i>';

-					}

-					print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($labeltoshow).'">';

-					print $labeltoshow;

+					if ($showlineingray)

+						print '</i>';

+					//else print '</a>';

@@ -759 +521 @@
-					print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($lines[$i]->description).'">';

+					print "<td>";

@@ -766 +528 @@
-					print '<td class="center nowraponall">';

+					print '<td class="center">';

@@ -773 +535 @@
-					print '<td class="center nowraponall">';

+					print '<td class="center">';

@@ -775 +537 @@
-					if ($taskstatic->hasDelay()) {

+					if ($taskstatic->hasDelay())

@@ -777 +538,0 @@
-					}

@@ -783,6 +544,2 @@
-				if (getDolGlobalString('PROJECT_PLANNED_WORKLOAD_FORMAT')) {

-					$plannedworkloadoutputformat = $conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT;

-				}

-				if (getDolGlobalString('PROJECT_TIMES_SPENT_FORMAT')) {

-					$timespentoutputformat = $conf->global->PROJECT_TIME_SPENT_FORMAT;

-				}

+				if (!empty($conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT)) $plannedworkloadoutputformat = $conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT;

+				if (!empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) $timespentoutputformat = $conf->global->PROJECT_TIME_SPENT_FORMAT;

@@ -807 +564 @@
-					if ($showlineingray) {

+					if ($showlineingray)

@@ -809,2 +566,17 @@
-					} else {

-						print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.($showproject ? '' : '&withproject=1').'">';

+					else print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.($showproject ? '' : '&withproject=1').'">';

+					if ($lines[$i]->duration)

+						print convertSecondToTime($lines[$i]->duration, $timespentoutputformat);

+					else print '--:--';

+					if ($showlineingray)

+						print '</i>';

+					else print '</a>';

+					print '</td>';

+				}

+

+				// Progress calculated (Note: ->duration is time spent)

+				if (count($arrayfields) > 0 && !empty($arrayfields['t.progress_calculated']['checked'])) {

+					print '<td class="right">';

+					if ($lines[$i]->planned_workload || $lines[$i]->duration) {

+						if ($lines[$i]->planned_workload)

+							print round(100 * $lines[$i]->duration / $lines[$i]->planned_workload, 2).' %';

+						else print '<span class="opacitymedium">'.$langs->trans('WorkloadNotDefined').'</span>';

@@ -812,28 +583,0 @@
-					if ($lines[$i]->duration_effective) {

-						print convertSecondToTime($lines[$i]->duration_effective, $timespentoutputformat);

-					} else {

-						print '--:--';

-					}

-					if ($showlineingray) {

-						print '</i>';

-					} else {

-						print '</a>';

-					}

-					print '</td>';

-				}

-

-				// Progress calculated (Note: ->duration_effective is time spent)

-				if (count($arrayfields) > 0 && !empty($arrayfields['t.progress_calculated']['checked'])) {

-					$s = '';

-					$shtml = '';

-					if ($lines[$i]->planned_workload || $lines[$i]->duration_effective) {

-						if ($lines[$i]->planned_workload) {

-							$s = round(100 * $lines[$i]->duration_effective / $lines[$i]->planned_workload, 2).' %';

-							$shtml = $s;

-						} else {

-							$s = $langs->trans('WorkloadNotDefined');

-							$shtml = '<span class="opacitymedium">'.$s.'</span>';

-						}

-					}

-					print '<td class="right tdoverflowmax100" title="'.dol_escape_htmltag($s).'">';

-					print $shtml;

@@ -855 +599 @@
-					if ($lines[$i]->progress != '' && $lines[$i]->duration_effective) {

+					if ($lines[$i]->progress != '' && $lines[$i]->duration) {

@@ -861,2 +605,3 @@
-				if ($showbilltime) {

-					// Time not billed

+				if ($showbilltime)

+				{

+    				// Time not billed

@@ -874 +619 @@
-					// Time billed

+    				// Time billed

@@ -887,10 +631,0 @@
-				// Budget task

-				if (count($arrayfields) > 0 && !empty($arrayfields['t.budget_amount']['checked'])) {

-					print '<td class="center">';

-					if ($lines[$i]->budget_amount) {

-						print '<span class="amount">'.price($lines[$i]->budget_amount, 0, $langs, 1, 0, 0, $conf->currency).'</span>';

-						$total_budget_amount += $lines[$i]->budget_amount;

-					}

-					print '</td>';

-				}

-

@@ -898,9 +633,8 @@
-				if (count($arrayfields) > 0 && !empty($arrayfields['c.assigned']['checked'])) {

-					print '<td class="center">';

-					$ifisrt = 1;

-					foreach (array('internal', 'external') as $source) {

-						//$tab = $lines[$i]->liste_contact(-1, $source);

-						$tab = $lines[$i]->liste_contact(-1, $source, 0, '', 1);

-

-						$numcontact = count($tab);

-						if (!empty($numcontact)) {

+				if (!empty($conf->global->PROJECT_SHOW_CONTACTS_IN_LIST))

+				{

+					print '<td>';

+					foreach (array('internal', 'external') as $source)

+					{

+						$tab = $lines[$i]->liste_contact(-1, $source);

+						$num = count($tab);

+						if (!empty($num)) {

@@ -909,5 +643,2 @@
-								if ($source == 'internal') {

-									$c = new User($db);

-								} else {

-									$c = new Contact($db);

-								}

+								if ($source == 'internal') $c = new User($db);

+								else $c = new Contact($db);

@@ -915,14 +646 @@
-								if (!empty($c->photo)) {

-									if (get_class($c) == 'User') {

-										print $c->getNomUrl(-2, '', 0, 0, 24, 1, '', ($ifisrt ? '' : 'notfirst'));

-									} else {

-										print $c->getNomUrl(-2, '', 0, '', -1, 0, ($ifisrt ? '' : 'notfirst'));

-									}

-								} else {

-									if (get_class($c) == 'User') {

-										print $c->getNomUrl(2, '', 0, 0, 24, 1, '', ($ifisrt ? '' : 'notfirst'));

-									} else {

-										print $c->getNomUrl(2, '', 0, '', -1, 0, ($ifisrt ? '' : 'notfirst'));

-									}

-								}

-								$ifisrt = 0;

+								print $c->getNomUrl(1).' ('.$contacttask['libelle'].')<br>';

@@ -937,2 +655 @@
-				$extrafieldsobjectprefix = 'efpt.';

-				$obj = $lines[$i]->obj;

+				$obj = $lines[$i];

@@ -946,12 +663,3 @@
-				print '<td class="tdlineupdown center"></td>';

-

-				// Action column

-				if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {

-					print '<td class="nowrap center">';

-					$selected = 0;

-					if (in_array($lines[$i]->id, $arrayofselected)) {

-						$selected = 1;

-					}

-					print '<input id="cb' . $lines[$i]->id . '" class="flat checkforselect" type="checkbox" name="toselect[]" value="' . $lines[$i]->id . '"' . ($selected ? ' checked="checked"' : '') . '>';

-

-					print '</td>';

+				if ($addordertick)

+				{

+					print '<td class="tdlineupdown hideonsmartphone center">&nbsp;</td>';

@@ -962,5 +670,4 @@
-				if (!$showlineingray) {

-					$inc++;

-				}

-

-				if ($level >= 0) {    // Call sublevels

+				if (!$showlineingray) $inc++;

+

+				if ($level >= 0)    // Call sublevels

+				{

@@ -968,3 +675 @@
-					if ($lines[$i]->id) {

-						projectLinesa($inc, $lines[$i]->id, $lines, $level, $var, $showproject, $taskrole, $projectsListId, $addordertick, $projectidfortotallink, '', $showbilltime, $arrayfields);

-					}

+					if ($lines[$i]->id) projectLinesa($inc, $lines[$i]->id, $lines, $level, $var, $showproject, $taskrole, $projectsListId, $addordertick, $projectidfortotallink, $filterprogresscalc, $showbilltime, $arrayfields);

@@ -974 +679 @@
-				$total_projectlinesa_spent += $lines[$i]->duration_effective;

+				$total_projectlinesa_spent += $lines[$i]->duration;

@@ -976,6 +681,2 @@
-				if ($lines[$i]->planned_workload) {

-					$total_projectlinesa_spent_if_planned += $lines[$i]->duration_effective;

-				}

-				if ($lines[$i]->planned_workload) {

-					$total_projectlinesa_declared_if_planned += $lines[$i]->planned_workload * $lines[$i]->progress / 100;

-				}

+				if ($lines[$i]->planned_workload) $total_projectlinesa_spent_if_planned += $lines[$i]->duration;

+                if ($lines[$i]->planned_workload) $total_projectlinesa_declared_if_planned += $lines[$i]->planned_workload * $lines[$i]->progress / 100;

@@ -983 +684,3 @@
-		} else {

+		}

+		else

+		{

@@ -988,3 +691,3 @@
-	// Total line

-	if (($total_projectlinesa_planned > 0 || $total_projectlinesa_spent > 0 || $total_projectlinesa_tobill > 0 || $total_projectlinesa_billed > 0 || $total_budget_amount > 0)

-		&& $level <= 0) {

+	if (($total_projectlinesa_planned > 0 || $total_projectlinesa_spent > 0 || $total_projectlinesa_tobill > 0 || $total_projectlinesa_billed > 0)

+	    && $level <= 0)

+	{

@@ -992,5 +694,0 @@
-

-		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {

-			print '<td class="liste_total"></td>';

-		}

-

@@ -998,15 +696,4 @@
-		if ($showproject) {

-			print '<td></td><td></td>';

-		}

-		if (count($arrayfields) > 0 && !empty($arrayfields['t.label']['checked'])) {

-			print '<td></td>';

-		}

-		if (count($arrayfields) > 0 && !empty($arrayfields['t.description']['checked'])) {

-			print '<td></td>';

-		}

-		if (count($arrayfields) > 0 && !empty($arrayfields['t.dateo']['checked'])) {

-			print '<td></td>';

-		}

-		if (count($arrayfields) > 0 && !empty($arrayfields['t.datee']['checked'])) {

-			print '<td></td>';

-		}

+		if ($showproject) print '<td></td><td></td>';

+		if (count($arrayfields) > 0 && !empty($arrayfields['t.label']['checked'])) print '<td></td>';

+		if (count($arrayfields) > 0 && !empty($arrayfields['t.dateo']['checked'])) print '<td></td>';

+		if (count($arrayfields) > 0 && !empty($arrayfields['t.datee']['checked'])) print '<td></td>';

@@ -1020 +707 @@
-			if ($projectidfortotallink > 0) {

+			if ($projectidfortotallink > 0)

@@ -1022 +708,0 @@
-			}

@@ -1024 +710 @@
-			if ($projectidfortotallink > 0) {

+			if ($projectidfortotallink > 0)

@@ -1026 +711,0 @@
-			}

@@ -1030,24 +715,23 @@
-		if ($total_projectlinesa_planned) {

-			$totalAverageDeclaredProgress = round(100 * $total_projectlinesa_declared_if_planned / $total_projectlinesa_planned, 2);

-			$totalCalculatedProgress = round(100 * $total_projectlinesa_spent / $total_projectlinesa_planned, 2);

-

-			// this conf is actually hidden, by default we use 10% for "be carefull or warning"

-			$warningRatio = getDolGlobalString('PROJECT_TIME_SPEND_WARNING_PERCENT') ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.10;

-

-			// define progress color according to time spend vs workload

-			$progressBarClass = 'progress-bar-info';

-			$badgeClass = 'badge ';

-

-			if ($totalCalculatedProgress > $totalAverageDeclaredProgress) {

-				$progressBarClass = 'progress-bar-danger';

-				$badgeClass .= 'badge-danger';

-			} elseif ($totalCalculatedProgress * $warningRatio >= $totalAverageDeclaredProgress) { // warning if close at 1%

-				$progressBarClass = 'progress-bar-warning';

-				$badgeClass .= 'badge-warning';

-			} else {

-				$progressBarClass = 'progress-bar-success';

-				$badgeClass .= 'badge-success';

-			}

-		}

-

-		// Computed progress

+        if ($total_projectlinesa_planned) {

+            $totalAverageDeclaredProgress = round(100 * $total_projectlinesa_declared_if_planned / $total_projectlinesa_planned, 2);

+            $totalCalculatedProgress = round(100 * $total_projectlinesa_spent / $total_projectlinesa_planned, 2);

+

+            // this conf is actually hidden, by default we use 10% for "be carefull or warning"

+            $warningRatio = !empty($conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT) ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.10;

+

+            // define progress color according to time spend vs workload

+            $progressBarClass = 'progress-bar-info';

+            $badgeClass = 'badge ';

+

+            if ($totalCalculatedProgress > $totalAverageDeclaredProgress) {

+                $progressBarClass = 'progress-bar-danger';

+                $badgeClass .= 'badge-danger';

+            } elseif ($totalCalculatedProgress * $warningRatio >= $totalAverageDeclaredProgress) { // warning if close at 1%

+                $progressBarClass = 'progress-bar-warning';

+                $badgeClass .= 'badge-warning';

+            } else {

+                $progressBarClass = 'progress-bar-success';

+                $badgeClass .= 'badge-success';

+            }

+        }

+

@@ -1056 +740 @@
-			if ($total_projectlinesa_planned) {

+			if ($total_projectlinesa_planned)

@@ -1058 +741,0 @@
-			}

@@ -1061,2 +743,0 @@
-

-		// Declared progress

@@ -1065 +746 @@
-			if ($total_projectlinesa_planned) {

+			if ($total_projectlinesa_planned)

@@ -1067 +747,0 @@
-			}

@@ -1072 +752 @@
-		// Progress

+        // resume

@@ -1085 +765,2 @@
-		if ($showbilltime) {

+		if ($showbilltime)

+		{

@@ -1097,12 +778,3 @@
-

-		// Budget task

-		if (count($arrayfields) > 0 && !empty($arrayfields['t.budget_amount']['checked'])) {

-			print '<td class="nowrap liste_total center">';

-			if (strcmp($total_budget_amount, '')) {

-				print price($total_budget_amount, 0, $langs, 1, 0, 0, $conf->currency);

-			}

-			print '</td>';

-		}

-

-		// Contacts of task for backward compatibility,

-		if (getDolGlobalString('PROJECT_SHOW_CONTACTS_IN_LIST')) {

+		// Contacts of task

+		if (!empty($conf->global->PROJECT_SHOW_CONTACTS_IN_LIST))

+		{

@@ -1111,25 +783 @@
-		// Contacts of task

-		if (count($arrayfields) > 0 && !empty($arrayfields['c.assigned']['checked'])) {

-			print '<td></td>';

-		}

-

-		// Check if Extrafields is totalizable

-		if (!empty($extrafields->attributes['projet_task']['totalizable'])) {

-			foreach ($extrafields->attributes['projet_task']['totalizable'] as $key => $value) {

-				if (!empty($arrayfields['efpt.'.$key]['checked']) && $arrayfields['efpt.'.$key]['checked'] == 1) {

-					print '<td class="right">';

-					if ($value == 1) {

-						print empty($totalarray['totalizable'][$key]['total']) ? '' : $totalarray['totalizable'][$key]['total'];

-					}

-					print '</td>';

-				}

-			}

-		}

-

-		// Column for the drag and drop

-		print '<td class="liste_total"></td>';

-

-		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {

-			print '<td class="liste_total"></td>';

-		}

-

+		if ($addordertick) print '<td class="hideonsmartphone"></td>';

@@ -1173,10 +821,11 @@
-	if ($parent == 0) { // Always and only if at first level

-		for ($i = 0; $i < $numlines; $i++) {

-			if ($lines[$i]->fk_task_parent) {

-				$lineswithoutlevel0[] = $lines[$i];

-			}

-		}

-	}

-

-	if (empty($oldprojectforbreak)) {

-		$oldprojectforbreak = (!getDolGlobalString('PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT') ? 0 : -1); // 0 to start break , -1 no break

+	if ($parent == 0) // Always and only if at first level

+	{

+		for ($i = 0; $i < $numlines; $i++)

+		{

+			if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[] = $lines[$i];

+		}

+	}

+

+	if (empty($oldprojectforbreak))

+	{

+		$oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT) ? 0 : -1); // 0 to start break , -1 no break

@@ -1186,4 +835,3 @@
-	for ($i = 0; $i < $numlines; $i++) {

-		if ($parent == 0) {

-			$level = 0;

-		}

+	for ($i = 0; $i < $numlines; $i++)

+	{

+		if ($parent == 0) $level = 0;

@@ -1194 +842,2 @@
-		if (empty($mine) || !empty($tasksrole[$lines[$i]->id])) {

+		if (empty($mine) || !empty($tasksrole[$lines[$i]->id]))

+		{

@@ -1198 +847,2 @@
-			if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid) {

+			if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)

+			{

@@ -1200 +850,2 @@
-				if ($preselectedday) {

+				if ($preselectedday)

+				{

@@ -1205,3 +856,5 @@
-			if (empty($workloadforid[$projectstatic->id])) {

-				if ($preselectedday) {

-					$projectstatic->loadTimeSpent($preselectedday, 0, $fuser->id); // Load time spent from table element_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week

+			if (empty($workloadforid[$projectstatic->id]))

+			{

+				if ($preselectedday)

+				{

+					$projectstatic->loadTimeSpent($preselectedday, 0, $fuser->id); // Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week

@@ -1216,3 +869,2 @@
-			$projectstatic->status = $lines[$i]->project->status;

-

-			$taskstatic->id = $lines[$i]->fk_statut;

+

+			$taskstatic->id = $lines[$i]->task_id;

@@ -1228 +880,2 @@
-			if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id)) {

+			if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id))

+			{

@@ -1232 +885,2 @@
-				if ($projectstatic->title) {

+				if ($projectstatic->title)

+				{

@@ -1240,3 +894 @@
-			if ($oldprojectforbreak != -1) {

-				$oldprojectforbreak = $projectstatic->id;

-			}

+			if ($oldprojectforbreak != -1) $oldprojectforbreak = $projectstatic->id;

@@ -1255 +907,2 @@
-			if ($oldprojectforbreak == -1) {

+			if ($oldprojectforbreak == -1)

+			{

@@ -1263,3 +916 @@
-			if ($thirdpartystatic->id > 0) {

-				print $thirdpartystatic->getNomUrl(1, 'project', 10);

-			}

+			if ($thirdpartystatic->id > 0) print $thirdpartystatic->getNomUrl(1, 'project', 10);

@@ -1270,4 +921,2 @@
-			print '<!-- Task id = '.$lines[$i]->id.' (projectlinesperaction) -->';

-			for ($k = 0; $k < $level; $k++) {

-				print '<div class="marginleftonly">';

-			}

+			print '<!-- Task id = '.$lines[$i]->id.' -->';

+			for ($k = 0; $k < $level; $k++) print "&nbsp;&nbsp;&nbsp;";

@@ -1277,4 +926,5 @@
-			print '<div class="opacitymedium tdoverflowmax500" title="'.dol_escape_htmltag($taskstatic->label).'">'.dol_escape_htmltag($taskstatic->label).'</div>';

-			for ($k = 0; $k < $level; $k++) {

-				print "</div>";

-			}

+			for ($k = 0; $k < $level; $k++) print "&nbsp;&nbsp;&nbsp;";

+			print $taskstatic->label;

+			//print "<br>";

+			//for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";

+			//print get_date_range($lines[$i]->date_start,$lines[$i]->date_end,'',$langs,0);

@@ -1288,2 +938 @@
-			$disabledproject = 1;

-			$disabledtask = 1;

+			$disabledproject = 1; $disabledtask = 1;

@@ -1294 +943,2 @@
-			if ($lines[$i]->public || !empty($projectsrole[$lines[$i]->fk_project]) || $user->hasRight('projet', 'all', 'creer')) {

+			if ($lines[$i]->public || !empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer)

+			{

@@ -1299 +949,2 @@
-			if ($restricteditformytask && empty($tasksrole[$lines[$i]->id])) {

+			if ($restricteditformytask && empty($tasksrole[$lines[$i]->id]))

+			{

@@ -1309,7 +960,3 @@
-			if (!$isavailable[$preselectedday]['morning'] && !$isavailable[$preselectedday]['afternoon']) {

-				$cssonholiday .= 'onholidayallday ';

-			} elseif (!$isavailable[$preselectedday]['morning']) {

-				$cssonholiday .= 'onholidaymorning ';

-			} elseif (!$isavailable[$preselectedday]['afternoon']) {

-				$cssonholiday .= 'onholidayafternoon ';

-			}

+			if (!$isavailable[$preselectedday]['morning'] && !$isavailable[$preselectedday]['afternoon'])   $cssonholiday .= 'onholidayallday ';

+			elseif (!$isavailable[$preselectedday]['morning'])   $cssonholiday .= 'onholidaymorning ';

+			elseif (!$isavailable[$preselectedday]['afternoon']) $cssonholiday .= 'onholidayafternoon ';

@@ -1324,3 +971 @@
-			if ($dayWorkLoad > 0) {

-				$alreadyspent = convertSecondToTime($lines[$i]->timespent_duration, 'allhourmin');

-			}

+			if ($dayWorkLoad > 0) $alreadyspent = convertSecondToTime($lines[$i]->timespent_duration, 'allhourmin');

@@ -1328,0 +974,8 @@
+

+			$modeinput = 'hours';

+

+			print '<script type="text/javascript">';

+			print "jQuery(document).ready(function () {\n";

+			print " 	jQuery('.inputhour, .inputminute').bind('keyup', function(e) { updateTotal(0, '".$modeinput."') });";

+			print "})\n";

+			print '</script>';

@@ -1396,17 +1049,11 @@
-	if ($parent == 0) { // Always and only if at first level

-		for ($i = 0; $i < $numlines; $i++) {

-			if ($lines[$i]->fk_task_parent) {

-				$lineswithoutlevel0[] = $lines[$i];

-			}

-		}

-	}

-

-	if (empty($oldprojectforbreak)) {

-		$oldprojectforbreak = (!getDolGlobalString('PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT') ? 0 : -1); // 0 to start break , -1 no break

-	}

-

-	$restrictBefore = null;

-

-	if (getDolGlobalString('PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS')) {

-		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';

-		$restrictBefore = dol_time_plus_duree(dol_now(), - $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS, 'm');

+	if ($parent == 0) // Always and only if at first level

+	{

+		for ($i = 0; $i < $numlines; $i++)

+		{

+			if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[] = $lines[$i];

+		}

+	}

+

+	if (empty($oldprojectforbreak))

+	{

+		$oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT) ? 0 : -1); // 0 to start break , -1 no break

@@ -1416,7 +1063,7 @@
-	for ($i = 0; $i < $numlines; $i++) {

-		if ($parent == 0) {

-			$level = 0;

-		}

-

-		if ($lines[$i]->fk_task_parent == $parent) {

-			$obj = &$lines[$i]; // To display extrafields

+	for ($i = 0; $i < $numlines; $i++)

+	{

+		if ($parent == 0) $level = 0;

+

+		if ($lines[$i]->fk_task_parent == $parent)

+		{

+            $obj = &$lines[$i]; // To display extrafields

@@ -1425 +1072,2 @@
-			if (empty($mine) || !empty($tasksrole[$lines[$i]->id])) {

+			if (empty($mine) || !empty($tasksrole[$lines[$i]->id]))

+			{

@@ -1428 +1076,2 @@
-				if ($restricteditformytask == 2 && empty($tasksrole[$lines[$i]->id])) {	// we have no role on task and we request to hide such cases

+				if ($restricteditformytask == 2 && empty($tasksrole[$lines[$i]->id]))	// we have no role on task and we request to hide such cases

+				{

@@ -1433 +1082,2 @@
-				if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid) {

+				if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)

+				{

@@ -1435 +1085,2 @@
-					if ($preselectedday) {

+					if ($preselectedday)

+					{

@@ -1440,4 +1091,6 @@
-				if (empty($workloadforid[$projectstatic->id])) {

-					if ($preselectedday) {

-						$projectstatic->loadTimeSpent($preselectedday, 0, $fuser->id); // Load time spent from table element_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week

-						$workloadforid[$projectstatic->id] = 1;

+				if (empty($workloadforid[$projectstatic->id]))

+				{

+					if ($preselectedday)

+					{

+						$projectstatic->loadTimeSpent($preselectedday, 0, $fuser->id); // Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week

+		   				$workloadforid[$projectstatic->id] = 1;

@@ -1451 +1103,0 @@
-				$projectstatic->status = $lines[$i]->projectstatus;

@@ -1463,13 +1115,9 @@
-				if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id)) {

-					$addcolspan = 0;

-					if (!empty($arrayfields['t.planned_workload']['checked'])) {

-						$addcolspan++;

-					}

-					if (!empty($arrayfields['t.progress']['checked'])) {

-						$addcolspan++;

-					}

-					foreach ($arrayfields as $key => $val) {

-						if ($val['checked'] && substr($key, 0, 5) == 'efpt.') {

-							$addcolspan++;

-						}

-					}

+				if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id))

+				{

+                    $addcolspan = 0;

+                    if (!empty($arrayfields['t.planned_workload']['checked'])) $addcolspan++;

+                    if (!empty($arrayfields['t.progress']['checked'])) $addcolspan++;

+                    foreach ($arrayfields as $key => $val)

+                    {

+                        if ($val['checked'] && substr($key, 0, 5) == 'efpt.') $addcolspan++;

+                    }

@@ -1480,4 +1128,3 @@
-					if ($thirdpartystatic->id > 0) {

-						print ' - '.$thirdpartystatic->getNomUrl(1);

-					}

-					if ($projectstatic->title) {

+					if ($thirdpartystatic->id > 0) print ' - '.$thirdpartystatic->getNomUrl(1);

+					if ($projectstatic->title)

+					{

@@ -1488,58 +1135,58 @@
-					$colspan=5+(empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:2);

-					print '<table class="">';

-

-					print '<tr class="liste_titre">';

-

-					// PROJECT fields

-					if (!empty($arrayfields['p.fk_opp_status']['checked'])) print_liste_field_titre($arrayfields['p.fk_opp_status']['label'], $_SERVER["PHP_SELF"], 'p.fk_opp_status', "", $param, '', $sortfield, $sortorder, 'center ');

-					if (!empty($arrayfields['p.opp_amount']['checked']))    print_liste_field_titre($arrayfields['p.opp_amount']['label'], $_SERVER["PHP_SELF"], 'p.opp_amount', "", $param, '', $sortfield, $sortorder, 'right ');

-					if (!empty($arrayfields['p.opp_percent']['checked']))   print_liste_field_titre($arrayfields['p.opp_percent']['label'], $_SERVER["PHP_SELF"], 'p.opp_percent', "", $param, '', $sortfield, $sortorder, 'right ');

-					if (!empty($arrayfields['p.budget_amount']['checked'])) print_liste_field_titre($arrayfields['p.budget_amount']['label'], $_SERVER["PHP_SELF"], 'p.budget_amount', "", $param, '', $sortfield, $sortorder, 'right ');

-					if (!empty($arrayfields['p.usage_bill_time']['checked']))     print_liste_field_titre($arrayfields['p.usage_bill_time']['label'], $_SERVER["PHP_SELF"], 'p.usage_bill_time', "", $param, '', $sortfield, $sortorder, 'right ');

-

-					$extrafieldsobjectkey='projet';

-					$extrafieldsobjectprefix='efp.';

-					include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';

-

-					print '</tr>';

-					print '<tr>';

-

-					// PROJECT fields

-					if (!empty($arrayfields['p.fk_opp_status']['checked']))

-					{

-						print '<td class="nowrap">';

-						$code = dol_getIdFromCode($db, $lines[$i]->fk_opp_status, 'c_lead_status', 'rowid', 'code');

-						if ($code) print $langs->trans("OppStatus".$code);

-						print "</td>\n";

-					}

-					if (!empty($arrayfields['p.opp_amount']['checked']))

-					{

-						print '<td class="nowrap">';

-						print price($lines[$i]->opp_amount, 0, $langs, 1, 0, -1, $conf->currency);

-						print "</td>\n";

-					}

-					if (!empty($arrayfields['p.opp_percent']['checked']))

-					{

-						print '<td class="nowrap">';

-						print price($lines[$i]->opp_percent, 0, $langs, 1, 0).' %';

-						print "</td>\n";

-					}

-					if (!empty($arrayfields['p.budget_amount']['checked']))

-					{

-						print '<td class="nowrap">';

-						print price($lines[$i]->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);

-						print "</td>\n";

-					}

-					if (!empty($arrayfields['p.usage_bill_time']['checked']))

-					{

-						print '<td class="nowrap">';

-						print yn($lines[$i]->usage_bill_time);

-						print "</td>\n";

-					}

-

-					$extrafieldsobjectkey='projet';

-					$extrafieldsobjectprefix='efp.';

-					include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';

-

-					print '</tr>';

-					print '</table>';

+                    $colspan=5+(empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:2);

+                    print '<table class="">';

+

+                    print '<tr class="liste_titre">';

+

+                    // PROJECT fields

+                    if (! empty($arrayfields['p.fk_opp_status']['checked'])) print_liste_field_titre($arrayfields['p.fk_opp_status']['label'], $_SERVER["PHP_SELF"], 'p.fk_opp_status', "", $param, '', $sortfield, $sortorder, 'center ');

+                    if (! empty($arrayfields['p.opp_amount']['checked']))    print_liste_field_titre($arrayfields['p.opp_amount']['label'], $_SERVER["PHP_SELF"], 'p.opp_amount', "", $param, '', $sortfield, $sortorder, 'right ');

+                    if (! empty($arrayfields['p.opp_percent']['checked']))   print_liste_field_titre($arrayfields['p.opp_percent']['label'], $_SERVER["PHP_SELF"], 'p.opp_percent', "", $param, '', $sortfield, $sortorder, 'right ');

+                    if (! empty($arrayfields['p.budget_amount']['checked'])) print_liste_field_titre($arrayfields['p.budget_amount']['label'], $_SERVER["PHP_SELF"], 'p.budget_amount', "", $param, '', $sortfield, $sortorder, 'right ');

+                    if (! empty($arrayfields['p.usage_bill_time']['checked']))     print_liste_field_titre($arrayfields['p.usage_bill_time']['label'], $_SERVER["PHP_SELF"], 'p.usage_bill_time', "", $param, '', $sortfield, $sortorder, 'right ');

+

+                    $extrafieldsobjectkey='projet';

+                    $extrafieldsobjectprefix='efp.';

+                    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';

+

+                    print '</tr>';

+                    print '<tr>';

+

+                    // PROJECT fields

+                    if (! empty($arrayfields['p.fk_opp_status']['checked']))

+                    {

+                        print '<td class="nowrap">';

+                        $code = dol_getIdFromCode($db, $lines[$i]->fk_opp_status, 'c_lead_status', 'rowid', 'code');

+                        if ($code) print $langs->trans("OppStatus".$code);

+                        print "</td>\n";

+                    }

+                    if (! empty($arrayfields['p.opp_amount']['checked']))

+                    {

+                        print '<td class="nowrap">';

+                        print price($lines[$i]->opp_amount, 0, $langs, 1, 0, -1, $conf->currency);

+                        print "</td>\n";

+                    }

+                    if (! empty($arrayfields['p.opp_percent']['checked']))

+                    {

+                        print '<td class="nowrap">';

+                        print price($lines[$i]->opp_percent, 0, $langs, 1, 0).' %';

+                        print "</td>\n";

+                    }

+                    if (! empty($arrayfields['p.budget_amount']['checked']))

+                    {

+                        print '<td class="nowrap">';

+                        print price($lines[$i]->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);

+                        print "</td>\n";

+                    }

+                    if (! empty($arrayfields['p.usage_bill_time']['checked']))

+                    {

+                        print '<td class="nowrap">';

+                        print yn($lines[$i]->usage_bill_time);

+                        print "</td>\n";

+                    }

+

+                    $extrafieldsobjectkey='projet';

+                    $extrafieldsobjectprefix='efp.';

+                    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';

+

+                    print '</tr>';

+                    print '</table>';

@@ -1552,3 +1199 @@
-				if ($oldprojectforbreak != -1) {

-					$oldprojectforbreak = $projectstatic->id;

-				}

+				if ($oldprojectforbreak != -1) $oldprojectforbreak = $projectstatic->id;

@@ -1566,6 +1211,5 @@
-				if (getDolGlobalString('PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT')) {

-					print "<td>";

-					if ($oldprojectforbreak == -1) {

-						print $projectstatic->getNomUrl(1, '', 0, $langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);

-					}

-					print "</td>";

+				if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT))

+				{

+				    print "<td>";

+				    if ($oldprojectforbreak == -1) print $projectstatic->getNomUrl(1, '', 0, $langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);

+				    print "</td>";

@@ -1575,6 +1219,5 @@
-				if (getDolGlobalString('PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT')) {

-					print '<td class="tdoverflowmax100">';

-					if ($thirdpartystatic->id > 0) {

-						print $thirdpartystatic->getNomUrl(1, 'project', 10);

-					}

-					print '</td>';

+				if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT))

+				{

+				    print '<td class="tdoverflowmax100">';

+				    if ($thirdpartystatic->id > 0) print $thirdpartystatic->getNomUrl(1, 'project', 10);

+				    print '</td>';

@@ -1585,4 +1228,2 @@
-				print '<!-- Task id = '.$lines[$i]->id.' (projectlinesperday) -->';

-				for ($k = 0; $k < $level; $k++) {

-					print '<div class="marginleftonly">';

-				}

+				print '<!-- Task id = '.$lines[$i]->id.' -->';

+				for ($k = 0; $k < $level; $k++) print '<div class="marginleftonly">';

@@ -1592,4 +1233,2 @@
-				print '<div class="opacitymedium tdoverflowmax500" title="'.dol_escape_htmltag($taskstatic->label).'">'.dol_escape_htmltag($taskstatic->label).'</div>';

-				for ($k = 0; $k < $level; $k++) {

-					print "</div>";

-				}

+				print '<span class="opacitymedium">'.$taskstatic->label.'</a>';

+				for ($k = 0; $k < $level; $k++) print "</div>";

@@ -1598,15 +1237,13 @@
-				// TASK extrafields

-				$extrafieldsobjectkey = 'projet_task';

-				$extrafieldsobjectprefix = 'efpt.';

-				include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';

-

-				// Planned Workload

-				if (!empty($arrayfields['t.planned_workload']['checked'])) {

-					print '<td class="leftborder plannedworkload right">';

-					if ($lines[$i]->planned_workload) {

-						print convertSecondToTime($lines[$i]->planned_workload, 'allhourmin');

-					} else {

-						print '--:--';

-					}

-					print '</td>';

-				}

+                // TASK extrafields

+                $extrafieldsobjectkey = 'projet_task';

+                $extrafieldsobjectprefix = 'efpt.';

+                include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';

+

+                // Planned Workload

+                if (!empty($arrayfields['t.planned_workload']['checked']))

+                {

+                    print '<td class="leftborder plannedworkload right">';

+				    if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload, 'allhourmin');

+				    else print '--:--';

+				    print '</td>';

+                }

@@ -1615,32 +1252,27 @@
-				if (!empty($arrayfields['t.progress']['checked'])) {

-					print '<td class="right">';

-					print $formother->select_percent($lines[$i]->progress, $lines[$i]->id.'progress');

-					print '</td>';

-				}

-

-				if (!empty($arrayfields['timeconsumed']['checked'])) {

-					// Time spent by everybody

-					print '<td class="right">';

-					// $lines[$i]->duration_effective is a denormalised field = summ of time spent by everybody for task. What we need is time consumed by user

-					if ($lines[$i]->duration_effective) {

-						print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.'">';

-						print convertSecondToTime($lines[$i]->duration_effective, 'allhourmin');

-						print '</a>';

-					} else {

-						print '--:--';

-					}

-					print "</td>\n";

-

-					// Time spent by user

-					print '<td class="right">';

-					$tmptimespent = $taskstatic->getSummaryOfTimeSpent($fuser->id);

-					if ($tmptimespent['total_duration']) {

-						print convertSecondToTime($tmptimespent['total_duration'], 'allhourmin');

-					} else {

-						print '--:--';

-					}

-					print "</td>\n";

-				}

-

-				$disabledproject = 1;

-				$disabledtask = 1;

+                if (!empty($arrayfields['t.progress']['checked']))

+                {

+                    print '<td class="right">';

+				    print $formother->select_percent($lines[$i]->progress, $lines[$i]->id.'progress');

+				    print '</td>';

+                }

+

+				// Time spent by everybody

+				print '<td class="right">';

+				// $lines[$i]->duration is a denormalised field = summ of time spent by everybody for task. What we need is time consummed by user

+				if ($lines[$i]->duration)

+				{

+					print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.'">';

+					print convertSecondToTime($lines[$i]->duration, 'allhourmin');

+					print '</a>';

+				}

+				else print '--:--';

+				print "</td>\n";

+

+				// Time spent by user

+				print '<td class="right">';

+				$tmptimespent = $taskstatic->getSummaryOfTimeSpent($fuser->id);

+				if ($tmptimespent['total_duration']) print convertSecondToTime($tmptimespent['total_duration'], 'allhourmin');

+				else print '--:--';

+				print "</td>\n";

+

+				$disabledproject = 1; $disabledtask = 1;

@@ -1651 +1283,2 @@
-				if ($lines[$i]->public || !empty($projectsrole[$lines[$i]->fk_project]) || $user->hasRight('projet', 'all', 'creer')) {

+				if ($lines[$i]->public || !empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer)

+				{

@@ -1656 +1289,2 @@
-				if ($restricteditformytask && empty($tasksrole[$lines[$i]->id])) {

+				if ($restricteditformytask && empty($tasksrole[$lines[$i]->id]))

+				{

@@ -1660,6 +1294,2 @@
-				if ($restrictBefore && $preselectedday < $restrictBefore) {

-					$disabledtask = 1;

-				}

-

-				// Select hour

-				print '<td class="nowraponall leftborder center minwidth150imp">';

+				// Form to add new time

+				print '<td class="nowrap leftborder center">';

@@ -1671,7 +1301,3 @@
-				if (!$isavailable[$preselectedday]['morning'] && !$isavailable[$preselectedday]['afternoon']) {

-					$cssonholiday .= 'onholidayallday ';

-				} elseif (!$isavailable[$preselectedday]['morning']) {

-					$cssonholiday .= 'onholidaymorning ';

-				} elseif (!$isavailable[$preselectedday]['afternoon']) {

-					$cssonholiday .= 'onholidayafternoon ';

-				}

+				if (!$isavailable[$preselectedday]['morning'] && !$isavailable[$preselectedday]['afternoon'])   $cssonholiday .= 'onholidayallday ';

+				elseif (!$isavailable[$preselectedday]['morning'])   $cssonholiday .= 'onholidaymorning ';

+				elseif (!$isavailable[$preselectedday]['afternoon']) $cssonholiday .= 'onholidayafternoon ';

@@ -1681,2 +1307,2 @@
-

-				$idw = ($tmparray['wday'] - (!getDolGlobalString('MAIN_START_WEEK') ? 0 : 1));

+				$idw = $tmparray['wday'];

+

@@ -1685 +1311,2 @@
-				if ((($idw + 1) < $numstartworkingday) || (($idw + 1) > $numendworkingday)) {	// This is a day is not inside the setup of working days, so we use a week-end css.

+				if (($idw + 1) < $numstartworkingday || ($idw + 1) > $numendworkingday)	// This is a day is not inside the setup of working days, so we use a week-end css.

+				{

@@ -1691,4 +1318 @@
-				$dayWorkLoad = empty($projectstatic->weekWorkLoadPerTask[$preselectedday][$lines[$i]->id]) ? 0 : $projectstatic->weekWorkLoadPerTask[$preselectedday][$lines[$i]->id];

-				if (!isset($totalforeachday[$preselectedday])) {

-					$totalforeachday[$preselectedday] = 0;

-				}

+				$dayWorkLoad = $projectstatic->weekWorkLoadPerTask[$preselectedday][$lines[$i]->id];

@@ -1698,3 +1322 @@
-				if ($dayWorkLoad > 0) {

-					$alreadyspent = convertSecondToTime($dayWorkLoad, 'allhourmin');

-				}

+				if ($dayWorkLoad > 0) $alreadyspent = convertSecondToTime($dayWorkLoad, 'allhourmin');

@@ -1705 +1327 @@
-				$tableCell .= '<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center width40" disabled id="timespent['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="'.$alreadyspent.'"></span>';

+				$tableCell .= '<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center" size="2" disabled id="timespent['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="'.$alreadyspent.'"></span>';

@@ -1711,0 +1334,8 @@
+				$modeinput = 'hours';

+

+				print '<script type="text/javascript">';

+				print "jQuery(document).ready(function () {\n";

+				print " 	jQuery('.inputhour, .inputminute').bind('keyup', function(e) { updateTotal(0, '".$modeinput."') });";

+				print "})\n";

+				print '</script>';

+

@@ -1722,10 +1352,8 @@
-				if ((!$lines[$i]->public) && $disabledproject) {

-					print $form->textwithpicto('', $langs->trans("UserIsNotContactOfProject"));

-				} elseif ($disabledtask) {

-					$titleassigntask = $langs->trans("AssignTaskToMe");

-					if ($fuser->id != $user->id) {

-						$titleassigntask = $langs->trans("AssignTaskToUser", '...');

-					}

-

-					print $form->textwithpicto('', $langs->trans("TaskIsNotAssignedToUser", $titleassigntask));

-				}

+   				if ((!$lines[$i]->public) && $disabledproject) print $form->textwithpicto('', $langs->trans("UserIsNotContactOfProject"));

+   				elseif ($disabledtask)

+   				{

+   					$titleassigntask = $langs->trans("AssignTaskToMe");

+   					if ($fuser->id != $user->id) $titleassigntask = $langs->trans("AssignTaskToUser", '...');

+

+   					print $form->textwithpicto('', $langs->trans("TaskIsNotAssignedToUser", $titleassigntask));

+   				}

@@ -1739 +1367,2 @@
-			if ($lines[$i]->id > 0) {

+			if ($lines[$i]->id > 0)

+			{

@@ -1745 +1374,2 @@
-				foreach ($ret as $key => $val) {

+				foreach ($ret as $key => $val)

+				{

@@ -1752 +1382,3 @@
-		} else {

+		}

+		else

+		{

@@ -1793,5 +1425,5 @@
-	if ($parent == 0) { // Always and only if at first level

-		for ($i = 0; $i < $numlines; $i++) {

-			if ($lines[$i]->fk_task_parent) {

-				$lineswithoutlevel0[] = $lines[$i];

-			}

+	if ($parent == 0) // Always and only if at first level

+	{

+		for ($i = 0; $i < $numlines; $i++)

+		{

+		    if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[] = $lines[$i];

@@ -1803,18 +1435,12 @@
-	if (empty($oldprojectforbreak)) {

-		$oldprojectforbreak = (!getDolGlobalString('PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT') ? 0 : -1); // 0 = start break, -1 = never break

-	}

-

-	$restrictBefore = null;

-

-	if (getDolGlobalString('PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS')) {

-		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';

-		$restrictBefore = dol_time_plus_duree(dol_now(), - $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS, 'm');

-	}

-

-	for ($i = 0; $i < $numlines; $i++) {

-		if ($parent == 0) {

-			$level = 0;

-		}

-

-		if ($lines[$i]->fk_task_parent == $parent) {

-			$obj = &$lines[$i]; // To display extrafields

+	if (empty($oldprojectforbreak))

+	{

+		$oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT) ? 0 : -1); // 0 = start break, -1 = never break

+	}

+

+	for ($i = 0; $i < $numlines; $i++)

+	{

+		if ($parent == 0) $level = 0;

+

+		if ($lines[$i]->fk_task_parent == $parent)

+		{

+            $obj = &$lines[$i]; // To display extrafields

@@ -1823 +1449,2 @@
-			if (empty($mine) || !empty($tasksrole[$lines[$i]->id])) {

+			if (empty($mine) || !empty($tasksrole[$lines[$i]->id]))

+			{

@@ -1826 +1453,2 @@
-				if ($restricteditformytask == 2 && empty($tasksrole[$lines[$i]->id])) {	// we have no role on task and we request to hide such cases

+				if ($restricteditformytask == 2 && empty($tasksrole[$lines[$i]->id]))	// we have no role on task and we request to hide such cases

+				{

@@ -1831 +1459,2 @@
-				if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid) {

+				if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)

+				{

@@ -1838,2 +1467,3 @@
-				if (empty($workloadforid[$projectstatic->id])) {

-					$projectstatic->loadTimeSpent($firstdaytoshow, 0, $fuser->id); // Load time spent from table element_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week

+				if (empty($workloadforid[$projectstatic->id]))

+				{

+					$projectstatic->loadTimeSpent($firstdaytoshow, 0, $fuser->id); // Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week

@@ -1850 +1479,0 @@
-				$projectstatic->status = $lines[$i]->projectstatus;

@@ -1862,13 +1491,9 @@
-				if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id)) {

-					$addcolspan = 0;

-					if (!empty($arrayfields['t.planned_workload']['checked'])) {

-						$addcolspan++;

-					}

-					if (!empty($arrayfields['t.progress']['checked'])) {

-						$addcolspan++;

-					}

-					foreach ($arrayfields as $key => $val) {

-						if ($val['checked'] && substr($key, 0, 5) == 'efpt.') {

-							$addcolspan++;

-						}

-					}

+				if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id))

+				{

+                    $addcolspan = 0;

+                    if (!empty($arrayfields['t.planned_workload']['checked'])) $addcolspan++;

+                    if (!empty($arrayfields['t.progress']['checked'])) $addcolspan++;

+                    foreach ($arrayfields as $key => $val)

+                    {

+                        if ($val['checked'] && substr($key, 0, 5) == 'efpt.') $addcolspan++;

+                    }

@@ -1879,4 +1504,3 @@
-					if ($thirdpartystatic->id > 0) {

-						print ' - '.$thirdpartystatic->getNomUrl(1);

-					}

-					if ($projectstatic->title) {

+					if ($thirdpartystatic->id > 0) print ' - '.$thirdpartystatic->getNomUrl(1);

+					if ($projectstatic->title)

+					{

@@ -1887 +1511 @@
-					/*$colspan=5+(empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:2);

+                    /*$colspan=5+(empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:2);

@@ -1893,52 +1517,52 @@
-					if (!empty($arrayfields['p.fk_opp_status']['checked'])) print_liste_field_titre($arrayfields['p.fk_opp_status']['label'], $_SERVER["PHP_SELF"], 'p.fk_opp_status', "", $param, '', $sortfield, $sortorder, 'center ');

-					if (!empty($arrayfields['p.opp_amount']['checked']))    print_liste_field_titre($arrayfields['p.opp_amount']['label'], $_SERVER["PHP_SELF"], 'p.opp_amount', "", $param, '', $sortfield, $sortorder, 'right ');

-					if (!empty($arrayfields['p.opp_percent']['checked']))   print_liste_field_titre($arrayfields['p.opp_percent']['label'], $_SERVER["PHP_SELF"], 'p.opp_percent', "", $param, '', $sortfield, $sortorder, 'right ');

-					if (!empty($arrayfields['p.budget_amount']['checked'])) print_liste_field_titre($arrayfields['p.budget_amount']['label'], $_SERVER["PHP_SELF"], 'p.budget_amount', "", $param, '', $sortfield, $sortorder, 'right ');

-					if (!empty($arrayfields['p.usage_bill_time']['checked']))     print_liste_field_titre($arrayfields['p.usage_bill_time']['label'], $_SERVER["PHP_SELF"], 'p.usage_bill_time', "", $param, '', $sortfield, $sortorder, 'right ');

-

-					$extrafieldsobjectkey='projet';

-					$extrafieldsobjectprefix='efp.';

-					include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';

-

-					print '</tr>';

-					print '<tr>';

-

-					// PROJECT fields

-					if (!empty($arrayfields['p.fk_opp_status']['checked']))

-					{

-						print '<td class="nowrap">';

-						$code = dol_getIdFromCode($db, $lines[$i]->fk_opp_status, 'c_lead_status', 'rowid', 'code');

-						if ($code) print $langs->trans("OppStatus".$code);

-						print "</td>\n";

-					}

-					if (!empty($arrayfields['p.opp_amount']['checked']))

-					{

-						print '<td class="nowrap">';

-						print price($lines[$i]->opp_amount, 0, $langs, 1, 0, -1, $conf->currency);

-						print "</td>\n";

-					}

-					if (!empty($arrayfields['p.opp_percent']['checked']))

-					{

-						print '<td class="nowrap">';

-						print price($lines[$i]->opp_percent, 0, $langs, 1, 0).' %';

-						print "</td>\n";

-					}

-					if (!empty($arrayfields['p.budget_amount']['checked']))

-					{

-						print '<td class="nowrap">';

-						print price($lines[$i]->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);

-						print "</td>\n";

-					}

-					if (!empty($arrayfields['p.usage_bill_time']['checked']))

-					{

-						print '<td class="nowrap">';

-						print yn($lines[$i]->usage_bill_time);

-						print "</td>\n";

-					}

-

-					$extrafieldsobjectkey='projet';

-					$extrafieldsobjectprefix='efp.';

-					include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';

-

-					print '</tr>';

-					print '</table>';

+                    if (! empty($arrayfields['p.fk_opp_status']['checked'])) print_liste_field_titre($arrayfields['p.fk_opp_status']['label'], $_SERVER["PHP_SELF"], 'p.fk_opp_status', "", $param, '', $sortfield, $sortorder, 'center ');

+                    if (! empty($arrayfields['p.opp_amount']['checked']))    print_liste_field_titre($arrayfields['p.opp_amount']['label'], $_SERVER["PHP_SELF"], 'p.opp_amount', "", $param, '', $sortfield, $sortorder, 'right ');

+                    if (! empty($arrayfields['p.opp_percent']['checked']))   print_liste_field_titre($arrayfields['p.opp_percent']['label'], $_SERVER["PHP_SELF"], 'p.opp_percent', "", $param, '', $sortfield, $sortorder, 'right ');

+                    if (! empty($arrayfields['p.budget_amount']['checked'])) print_liste_field_titre($arrayfields['p.budget_amount']['label'], $_SERVER["PHP_SELF"], 'p.budget_amount', "", $param, '', $sortfield, $sortorder, 'right ');

+                    if (! empty($arrayfields['p.usage_bill_time']['checked']))     print_liste_field_titre($arrayfields['p.usage_bill_time']['label'], $_SERVER["PHP_SELF"], 'p.usage_bill_time', "", $param, '', $sortfield, $sortorder, 'right ');

+

+                    $extrafieldsobjectkey='projet';

+                    $extrafieldsobjectprefix='efp.';

+                    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';

+

+                    print '</tr>';

+                    print '<tr>';

+

+                    // PROJECT fields

+                    if (! empty($arrayfields['p.fk_opp_status']['checked']))

+                    {

+                        print '<td class="nowrap">';

+                        $code = dol_getIdFromCode($db, $lines[$i]->fk_opp_status, 'c_lead_status', 'rowid', 'code');

+                        if ($code) print $langs->trans("OppStatus".$code);

+                        print "</td>\n";

+                    }

+                    if (! empty($arrayfields['p.opp_amount']['checked']))

+                    {

+                        print '<td class="nowrap">';

+                        print price($lines[$i]->opp_amount, 0, $langs, 1, 0, -1, $conf->currency);

+                        print "</td>\n";

+                    }

+                    if (! empty($arrayfields['p.opp_percent']['checked']))

+                    {

+                        print '<td class="nowrap">';

+                        print price($lines[$i]->opp_percent, 0, $langs, 1, 0).' %';

+                        print "</td>\n";

+                    }

+                    if (! empty($arrayfields['p.budget_amount']['checked']))

+                    {

+                        print '<td class="nowrap">';

+                        print price($lines[$i]->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);

+                        print "</td>\n";

+                    }

+                    if (! empty($arrayfields['p.usage_bill_time']['checked']))

+                    {

+                        print '<td class="nowrap">';

+                        print yn($lines[$i]->usage_bill_time);

+                        print "</td>\n";

+                    }

+

+                    $extrafieldsobjectkey='projet';

+                    $extrafieldsobjectprefix='efp.';

+                    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';

+

+                    print '</tr>';

+                    print '</table>';

@@ -1951,3 +1575 @@
-				if ($oldprojectforbreak != -1) {

-					$oldprojectforbreak = $projectstatic->id;

-				}

+				if ($oldprojectforbreak != -1) $oldprojectforbreak = $projectstatic->id;

@@ -1965,6 +1587,5 @@
-				if (getDolGlobalString('PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT')) {

-					print '<td class="nowrap">';

-					if ($oldprojectforbreak == -1) {

-						print $projectstatic->getNomUrl(1, '', 0, $langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);

-					}

-					print "</td>";

+				if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT))

+				{

+    				print '<td class="nowrap">';

+    				if ($oldprojectforbreak == -1) print $projectstatic->getNomUrl(1, '', 0, $langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);

+    				print "</td>";

@@ -1974,6 +1595,5 @@
-				if (getDolGlobalString('PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT')) {

-					print '<td class="tdoverflowmax100">';

-					if ($thirdpartystatic->id > 0) {

-						print $thirdpartystatic->getNomUrl(1, 'project');

-					}

-					print '</td>';

+				if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT))

+				{

+				    print '<td class="tdoverflowmax100">';

+				    if ($thirdpartystatic->id > 0) print $thirdpartystatic->getNomUrl(1, 'project');

+				    print '</td>';

@@ -1983,5 +1603,3 @@
-				print '<td class="tdoverflowmax300">';

-				print '<!-- Task id = '.$lines[$i]->id.' (projectlinesperweek) -->';

-				for ($k = 0; $k < $level; $k++) {

-					print '<div class="marginleftonly">';

-				}

+				print '<td class="nowrap">';

+				print '<!-- Task id = '.$lines[$i]->id.' -->';

+				for ($k = 0; $k < $level; $k++) print '<div class="marginleftonly">';

@@ -1991,4 +1609,2 @@
-				print '<div class="opacitymedium tdoverflowmax500" title="'.dol_escape_htmltag($taskstatic->label).'">'.dol_escape_htmltag($taskstatic->label).'</div>';

-				for ($k = 0; $k < $level; $k++) {

-					print "</div>";

-				}

+				print '<span class="opacitymedium">'.$taskstatic->label.'</span>';

+				for ($k = 0; $k < $level; $k++) print "</div>";

@@ -1998,50 +1614,41 @@
-				$extrafieldsobjectkey = 'projet_task';

-				$extrafieldsobjectprefix = 'efpt.';

-				include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';

-

-				// Planned Workload

-				if (!empty($arrayfields['t.planned_workload']['checked'])) {

-					print '<td class="leftborder plannedworkload right">';

-					if ($lines[$i]->planned_workload) {

-						print convertSecondToTime($lines[$i]->planned_workload, 'allhourmin');

-					} else {

-						print '--:--';

-					}

-					print '</td>';

-				}

-

-				if (!empty($arrayfields['t.progress']['checked'])) {

-					// Progress declared %

-					print '<td class="right">';

-					print $formother->select_percent($lines[$i]->progress, $lines[$i]->id.'progress');

-					print '</td>';

-				}

-

-				if (!empty($arrayfields['timeconsumed']['checked'])) {

-					// Time spent by everybody

-					print '<td class="right">';

-					// $lines[$i]->duration_effective is a denormalised field = summ of time spent by everybody for task. What we need is time consumed by user

-					if ($lines[$i]->duration_effective) {

-						print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.((int) $lines[$i]->id).'">';

-						print convertSecondToTime($lines[$i]->duration_effective, 'allhourmin');

-						print '</a>';

-					} else {

-						print '--:--';

-					}

-					print "</td>\n";

-

-					// Time spent by user

-					print '<td class="right">';

-					$tmptimespent = $taskstatic->getSummaryOfTimeSpent($fuser->id);

-					if ($tmptimespent['total_duration']) {

-						print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.((int) $lines[$i]->id).'&search_user='.((int) $fuser->id).'">';

-						print convertSecondToTime($tmptimespent['total_duration'], 'allhourmin');

-						print '</a>';

-					} else {

-						print '--:--';

-					}

-					print "</td>\n";

-				}

-

-				$disabledproject = 1;

-				$disabledtask = 1;

+                $extrafieldsobjectkey = 'projet_task';

+                $extrafieldsobjectprefix = 'efpt.';

+                include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';

+

+                // Planned Workload

+                if (!empty($arrayfields['t.planned_workload']['checked']))

+                {

+    				print '<td class="leftborder plannedworkload right">';

+    				if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload, 'allhourmin');

+    				else print '--:--';

+    				print '</td>';

+                }

+

+                if (!empty($arrayfields['t.progress']['checked']))

+                {

+                    // Progress declared %

+    				print '<td class="right">';

+    				print $formother->select_percent($lines[$i]->progress, $lines[$i]->id.'progress');

+    				print '</td>';

+                }

+

+				// Time spent by everybody

+				print '<td class="right">';

+				// $lines[$i]->duration is a denormalised field = summ of time spent by everybody for task. What we need is time consummed by user

+				if ($lines[$i]->duration)

+				{

+					print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.'">';

+					print convertSecondToTime($lines[$i]->duration, 'allhourmin');

+					print '</a>';

+				}

+				else print '--:--';

+				print "</td>\n";

+

+				// Time spent by user

+				print '<td class="right">';

+				$tmptimespent = $taskstatic->getSummaryOfTimeSpent($fuser->id);

+				if ($tmptimespent['total_duration']) print convertSecondToTime($tmptimespent['total_duration'], 'allhourmin');

+				else print '--:--';

+				print "</td>\n";

+

+				$disabledproject = 1; $disabledtask = 1;

@@ -2052 +1659,2 @@
-				if ($lines[$i]->public || !empty($projectsrole[$lines[$i]->fk_project]) || $user->hasRight('projet', 'all', 'creer')) {

+				if ($lines[$i]->public || !empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer)

+				{

@@ -2057 +1665,2 @@
-				if ($restricteditformytask && empty($tasksrole[$lines[$i]->id])) {

+				if ($restricteditformytask && empty($tasksrole[$lines[$i]->id]))

+				{

@@ -2064,3 +1673,3 @@
-				$tableCell = '';

-				$modeinput = 'hours';

-				for ($idw = 0; $idw < 7; $idw++) {

+				$tableCell = ''; $modeinput = 'hours';

+				for ($idw = 0; $idw < 7; $idw++)

+				{

@@ -2068,3 +1677 @@
-					if (!isset($totalforeachday[$tmpday])) {

-						$totalforeachday[$tmpday] = 0;

-					}

+

@@ -2072,7 +1679,3 @@
-					if (!$isavailable[$tmpday]['morning'] && !$isavailable[$tmpday]['afternoon']) {

-						$cssonholiday .= 'onholidayallday ';

-					} elseif (!$isavailable[$tmpday]['morning']) {

-						$cssonholiday .= 'onholidaymorning ';

-					} elseif (!$isavailable[$tmpday]['afternoon']) {

-						$cssonholiday .= 'onholidayafternoon ';

-					}

+					if (!$isavailable[$tmpday]['morning'] && !$isavailable[$tmpday]['afternoon'])   $cssonholiday .= 'onholidayallday ';

+					elseif (!$isavailable[$tmpday]['morning'])   $cssonholiday .= 'onholidaymorning ';

+					elseif (!$isavailable[$tmpday]['afternoon']) $cssonholiday .= 'onholidayafternoon ';

@@ -2081 +1684 @@
-					$dayWorkLoad = (!empty($projectstatic->weekWorkLoadPerTask[$tmpday][$lines[$i]->id]) ? $projectstatic->weekWorkLoadPerTask[$tmpday][$lines[$i]->id] : 0);

+					$dayWorkLoad = $projectstatic->weekWorkLoadPerTask[$tmpday][$lines[$i]->id];

@@ -2085,4 +1688,2 @@
-					if ($dayWorkLoad > 0) {

-						$alreadyspent = convertSecondToTime($dayWorkLoad, 'allhourmin');

-					}

-					$alttitle = $langs->trans("AddHereTimeSpentForDay", !empty($tmparray['day']) ? $tmparray['day'] : 0, $tmparray['mon']);

+					if ($dayWorkLoad > 0) $alreadyspent = convertSecondToTime($dayWorkLoad, 'allhourmin');

+					$alttitle = $langs->trans("AddHereTimeSpentForDay", $tmparray['day'], $tmparray['mon']);

@@ -2092 +1693,2 @@
-					if (($idw + 1 < $numstartworkingday) || ($idw + 1 > $numendworkingday)) {	// This is a day is not inside the setup of working days, so we use a week-end css.

+					if (($idw + 1) < $numstartworkingday || ($idw + 1) > $numendworkingday)	// This is a day is not inside the setup of working days, so we use a week-end css.

+					{

@@ -2096,4 +1698,7 @@
-					$disabledtaskday = $disabledtask;

-

-					if (! $disabledtask && $restrictBefore && $tmpday < $restrictBefore) {

-						$disabledtaskday = 1;

+					$tableCell = '<td class="center hide'.$idw.($cssonholiday ? ' '.$cssonholiday : '').($cssweekend ? ' '.$cssweekend : '').'">';

+					$placeholder = '';

+					if ($alreadyspent)

+					{

+						$tableCell .= '<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center smallpadd" size="2" disabled id="timespent['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="'.$alreadyspent.'"></span>';

+						//$placeholder=' placeholder="00:00"';

+					 	//$tableCell.='+';

@@ -2101,10 +1706 @@
-

-					$tableCell = '<td class="center hide'.$idw.($cssonholiday ? ' '.$cssonholiday : '').($cssweekend ? ' '.$cssweekend : '').'">';

-					//$tableCell .= 'idw='.$idw.' '.$conf->global->MAIN_START_WEEK.' '.$numstartworkingday.'-'.$numendworkingday;

-					$placeholder = '';

-					if ($alreadyspent) {

-						$tableCell .= '<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center smallpadd width40" disabled id="timespent['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="'.$alreadyspent.'"></span>';

-						//$placeholder=' placeholder="00:00"';

-						//$tableCell.='+';

-					}

-					$tableCell .= '<input type="text" alt="'.($disabledtaskday ? '' : $alttitle).'" title="'.($disabledtaskday ? '' : $alttitle).'" '.($disabledtaskday ? 'disabled' : $placeholder).' class="center smallpadd width40" id="timeadded['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="" cols="2"  maxlength="5"';

+				  	$tableCell .= '<input type="text" alt="'.($disabledtask ? '' : $alttitle).'" title="'.($disabledtask ? '' : $alttitle).'" '.($disabledtask ? 'disabled' : $placeholder).' class="center smallpadd" size="2" id="timeadded['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="" cols="2"  maxlength="5"';

@@ -2112,3 +1708,3 @@
-					$tableCell .= ' onkeyup="updateTotal('.$idw.',\''.$modeinput.'\')"';

-					$tableCell .= ' onblur="regexEvent(this,event,\''.$modeinput.'\'); updateTotal('.$idw.',\''.$modeinput.'\')" />';

-					$tableCell .= '</td>';

+				   	$tableCell .= ' onkeyup="updateTotal('.$idw.',\''.$modeinput.'\')"';

+				   	$tableCell .= ' onblur="regexEvent(this,event,\''.$modeinput.'\'); updateTotal('.$idw.',\''.$modeinput.'\')" />';

+				   	$tableCell .= '</td>';

@@ -2120,10 +1716,8 @@
-				if ((!$lines[$i]->public) && $disabledproject) {

-					print $form->textwithpicto('', $langs->trans("UserIsNotContactOfProject"));

-				} elseif ($disabledtask) {

-					$titleassigntask = $langs->trans("AssignTaskToMe");

-					if ($fuser->id != $user->id) {

-						$titleassigntask = $langs->trans("AssignTaskToUser", '...');

-					}

-

-					print $form->textwithpicto('', $langs->trans("TaskIsNotAssignedToUser", $titleassigntask));

-				}

+   				if ((!$lines[$i]->public) && $disabledproject) print $form->textwithpicto('', $langs->trans("UserIsNotContactOfProject"));

+   				elseif ($disabledtask)

+   				{

+   					$titleassigntask = $langs->trans("AssignTaskToMe");

+   					if ($fuser->id != $user->id) $titleassigntask = $langs->trans("AssignTaskToUser", '...');

+

+   					print $form->textwithpicto('', $langs->trans("TaskIsNotAssignedToUser", $titleassigntask));

+   				}

@@ -2138 +1732,2 @@
-			if ($lines[$i]->id > 0) {

+			if ($lines[$i]->id > 0)

+			{

@@ -2144 +1739,2 @@
-				foreach ($ret as $key => $val) {

+				foreach ($ret as $key => $val)

+				{

@@ -2151 +1747,3 @@
-		} else {

+		}

+		else

+		{

@@ -2190,5 +1788,5 @@
-	if ($parent == 0) { // Always and only if at first level

-		for ($i = 0; $i < $numlines; $i++) {

-			if ($lines[$i]->fk_task_parent) {

-				$lineswithoutlevel0[] = $lines[$i];

-			}

+	if ($parent == 0) // Always and only if at first level

+	{

+		for ($i = 0; $i < $numlines; $i++)

+		{

+			if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[] = $lines[$i];

@@ -2200,17 +1798,11 @@
-	if (empty($oldprojectforbreak)) {

-		$oldprojectforbreak = (!getDolGlobalString('PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT') ? 0 : -1); // 0 = start break, -1 = never break

-	}

-

-	$restrictBefore = null;

-

-	if (getDolGlobalString('PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS')) {

-		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';

-		$restrictBefore = dol_time_plus_duree(dol_now(), - $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS, 'm');

-	}

-

-	for ($i = 0; $i < $numlines; $i++) {

-		if ($parent == 0) {

-			$level = 0;

-		}

-

-		if ($lines[$i]->fk_task_parent == $parent) {

+	if (empty($oldprojectforbreak))

+	{

+		$oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT) ? 0 : -1); // 0 = start break, -1 = never break

+	}

+

+	for ($i = 0; $i < $numlines; $i++)

+	{

+		if ($parent == 0) $level = 0;

+

+		if ($lines[$i]->fk_task_parent == $parent)

+		{

@@ -2218 +1810,2 @@
-			if (empty($mine) || !empty($tasksrole[$lines[$i]->id])) {

+			if (empty($mine) || !empty($tasksrole[$lines[$i]->id]))

+			{

@@ -2221,4 +1813,0 @@
-				if ($restricteditformytask == 2 && empty($tasksrole[$lines[$i]->id])) {	// we have no role on task and we request to hide such cases

-					continue;

-				}

-

@@ -2226 +1815,2 @@
-				if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid) {

+				if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)

+				{

@@ -2233,2 +1823,3 @@
-				if (empty($workloadforid[$projectstatic->id])) {

-					$projectstatic->loadTimeSpentMonth($firstdaytoshow, 0, $fuser->id); // Load time spent from table element_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week

+				if (empty($workloadforid[$projectstatic->id]))

+				{

+					$projectstatic->loadTimeSpentMonth($firstdaytoshow, 0, $fuser->id); // Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week

@@ -2245 +1835,0 @@
-				$projectstatic->status = $lines[$i]->projectstatus;

@@ -2257 +1847,2 @@
-				if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id)) {

+				if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id))

+				{

@@ -2261,4 +1852,3 @@
-					if ($thirdpartystatic->id > 0) {

-						print ' - '.$thirdpartystatic->getNomUrl(1);

-					}

-					if ($projectstatic->title) {

+					if ($thirdpartystatic->id > 0) print ' - '.$thirdpartystatic->getNomUrl(1);

+					if ($projectstatic->title)

+					{

@@ -2272,3 +1862 @@
-				if ($oldprojectforbreak != -1) {

-					$oldprojectforbreak = $projectstatic->id;

-				}

+				if ($oldprojectforbreak != -1) $oldprojectforbreak = $projectstatic->id;

@@ -2296,4 +1884,2 @@
-				print '<!-- Task id = '.$lines[$i]->id.' (projectlinespermonth)  -->';

-				for ($k = 0; $k < $level; $k++) {

-					print '<div class="marginleftonly">';

-				}

+				print '<!-- Task id = '.$lines[$i]->id.' -->';

+				for ($k = 0; $k < $level; $k++) print '<div class="marginleftonly">';

@@ -2303,4 +1889,2 @@
-				print '<div class="opacitymedium tdoverflowmax500" title="'.dol_escape_htmltag($taskstatic->label).'">'.dol_escape_htmltag($taskstatic->label).'</div>';

-				for ($k = 0; $k < $level; $k++) {

-					print "</div>";

-				}

+				print '<span class="opacitymedium">'.$taskstatic->label.'</span>';

+				for ($k = 0; $k < $level; $k++) print "</div>";

@@ -2311,5 +1895,2 @@
-				if ($lines[$i]->planned_workload) {

-					print convertSecondToTime($lines[$i]->planned_workload, 'allhourmin');

-				} else {

-					print '--:--';

-				}

+				if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload, 'allhourmin');

+				else print '--:--';

@@ -2325,2 +1906,3 @@
-				// $lines[$i]->duration_effective is a denormalised field = summ of time spent by everybody for task. What we need is time consumed by user

-				if ($lines[$i]->duration_effective) {

+				// $lines[$i]->duration is a denormalised field = summ of time spent by everybody for task. What we need is time consummed by user

+				if ($lines[$i]->duration)

+				{

@@ -2328 +1910 @@
-					print convertSecondToTime($lines[$i]->duration_effective, 'allhourmin');

+					print convertSecondToTime($lines[$i]->duration, 'allhourmin');

@@ -2330,3 +1912,2 @@
-				} else {

-					print '--:--';

-				}

+				}

+				else print '--:--';

@@ -2338,5 +1919,2 @@
-				if ($tmptimespent['total_duration']) {

-					print convertSecondToTime($tmptimespent['total_duration'], 'allhourmin');

-				} else {

-					print '--:--';

-				}

+				if ($tmptimespent['total_duration']) print convertSecondToTime($tmptimespent['total_duration'], 'allhourmin');

+				else print '--:--';

@@ -2345,2 +1923 @@
-				$disabledproject = 1;

-				$disabledtask = 1;

+				$disabledproject = 1; $disabledtask = 1;

@@ -2351 +1928,2 @@
-				if ($lines[$i]->public || !empty($projectsrole[$lines[$i]->fk_project]) || $user->hasRight('projet', 'all', 'creer')) {

+				if ($lines[$i]->public || !empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer)

+				{

@@ -2356 +1934,2 @@
-				if ($restricteditformytask && empty($tasksrole[$lines[$i]->id])) {

+				if ($restricteditformytask && empty($tasksrole[$lines[$i]->id]))

+				{

@@ -2363,2 +1942 @@
-				$tableCell = '';

-				$modeinput = 'hours';

+				$tableCell = ''; $modeinput = 'hours';

@@ -2367,9 +1945,6 @@
-

-				$firstdaytoshowarray = dol_getdate($firstdaytoshow);

-				$year = $firstdaytoshowarray['year'];

-				$month = $firstdaytoshowarray['mon'];

-				foreach ($TWeek as $weekIndex => $weekNb) {

-					$weekWorkLoad = !empty($projectstatic->monthWorkLoadPerTask[$weekNb][$lines[$i]->id]) ? $projectstatic->monthWorkLoadPerTask[$weekNb][$lines[$i]->id] : 0 ;

-					if (!isset($totalforeachweek[$weekNb])) {

-						$totalforeachweek[$weekNb] = 0;

-					}

+				foreach ($TFirstDay as &$fday) {

+					$fday--;

+				}

+				foreach ($TWeek as $weekNb)

+				{

+					$weekWorkLoad = $projectstatic->monthWorkLoadPerTask[$weekNb][$lines[$i]->id];

@@ -2379,3 +1954 @@
-					if ($weekWorkLoad > 0) {

-						$alreadyspent = convertSecondToTime($weekWorkLoad, 'allhourmin');

-					}

+					if ($weekWorkLoad > 0) $alreadyspent = convertSecondToTime($weekWorkLoad, 'allhourmin');

@@ -2384,6 +1956,0 @@
-					$disabledtaskweek = $disabledtask;

-					$firstdayofweek = dol_mktime(0, 0, 0, $month, $TFirstDay[$weekIndex], $year);

-

-					if (! $disabledtask && $restrictBefore && $firstdayofweek < $restrictBefore) {

-						$disabledtaskweek = 1;

-					}

@@ -2393,2 +1960,3 @@
-					if ($alreadyspent) {

-						$tableCell .= '<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center smallpadd width40" disabled id="timespent['.$inc.']['.((int) $weekNb).']" name="task['.$lines[$i]->id.']['.$weekNb.']" value="'.$alreadyspent.'"></span>';

+					if ($alreadyspent)

+					{

+						$tableCell .= '<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center smallpadd" size="2" disabled id="timespent['.$inc.']['.((int) $weekNb).']" name="task['.$lines[$i]->id.']['.$weekNb.']" value="'.$alreadyspent.'"></span>';

@@ -2399 +1967 @@
-					$tableCell .= '<input type="text" alt="'.($disabledtaskweek ? '' : $alttitle).'" title="'.($disabledtaskweek ? '' : $alttitle).'" '.($disabledtaskweek ? 'disabled' : $placeholder).' class="center smallpadd width40" id="timeadded['.$inc.']['.((int) $weekNb).']" name="task['.$lines[$i]->id.']['.($TFirstDay[$weekNb] - 1).']" value="" cols="2"  maxlength="5"';

+					$tableCell .= '<input type="text" alt="'.($disabledtask ? '' : $alttitle).'" title="'.($disabledtask ? '' : $alttitle).'" '.($disabledtask ? 'disabled' : $placeholder).' class="center smallpadd" size="2" id="timeadded['.$inc.']['.((int) $weekNb).']" name="task['.$lines[$i]->id.']['.$TFirstDay[$weekNb].']" value="" cols="2"  maxlength="5"';

@@ -2409,3 +1977,3 @@
-				if ((!$lines[$i]->public) && $disabledproject) {

-					print $form->textwithpicto('', $langs->trans("UserIsNotContactOfProject"));

-				} elseif ($disabledtask) {

+				if ((!$lines[$i]->public) && $disabledproject) print $form->textwithpicto('', $langs->trans("UserIsNotContactOfProject"));

+				elseif ($disabledtask)

+				{

@@ -2413,3 +1981 @@
-					if ($fuser->id != $user->id) {

-						$titleassigntask = $langs->trans("AssignTaskToUser", '...');

-					}

+					if ($fuser->id != $user->id) $titleassigntask = $langs->trans("AssignTaskToUser", '...');

@@ -2427 +1993,2 @@
-			if ($lines[$i]->id > 0) {

+			if ($lines[$i]->id > 0)

+			{

@@ -2433 +2000,2 @@
-				foreach ($ret as $key => $val) {

+				foreach ($ret as $key => $val)

+				{

@@ -2440 +2008,3 @@
-		} else {

+		}

+		else

+		{

@@ -2462 +2032,2 @@
-	for ($i = 0; $i < $numlines; $i++) {

+	for ($i = 0; $i < $numlines; $i++)

+	{

@@ -2464 +2035,2 @@
-		if ($lines[$i]->fk_task_parent == $parent && $lines[$i]->id != $lines[$i]->fk_task_parent) {

+		if ($lines[$i]->fk_parent == $parent && $lines[$i]->id != $lines[$i]->fk_parent)

+		{

@@ -2466 +2038,2 @@
-			if (isset($taskrole[$lines[$i]->id])) {

+			if (isset($taskrole[$lines[$i]->id]))

+			{

@@ -2475,3 +2048 @@
-			if ($inc > 0) {

-				return $inc;

-			}

+			if ($inc > 0) return $inc;

@@ -2495 +2065,0 @@
- * @param	int		$max				Max nb of record to show in HTML list

@@ -2498 +2068 @@
-function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks = 0, $status = -1, $listofoppstatus = array(), $hiddenfields = array(), $max = 0)

+function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks = 0, $status = -1, $listofoppstatus = array(), $hiddenfields = array())

@@ -2503,2 +2072,0 @@
-	$maxofloop = (!getDolGlobalString('MAIN_MAXLIST_OVERLOAD') ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD);

-

@@ -2509 +2077 @@
-	if (is_array($listofstatus) && getDolGlobalString('USE_COLOR_FOR_PROSPECTION_STATUS')) {

+	if (is_array($listofstatus) && !empty($conf->global->USE_COLOR_FOR_PROSPECTION_STATUS)) {

@@ -2531,5 +2099,4 @@
-	if (strcmp($status, '') && $status >= 0) {

-		$title = $langs->trans("Projects").' '.$langs->trans($projectstatic->labelStatus[$status]);

-	}

-

-	print '<!-- print_projecttasks_array -->';

+	if (strcmp($status, '') && $status >= 0) $title = $langs->trans("Projects").' '.$langs->trans($projectstatic->statuts_long[$status]);

+

+	$arrayidtypeofcontact = array();

+

@@ -2540 +2107,2 @@
-	if ($mytasks) {

+	if ($mytasks)

+	{

@@ -2544 +2112,3 @@
-	} else {

+	}

+	else

+	{

@@ -2548,5 +2118,4 @@
-	$sql .= " AND p.rowid IN (".$db->sanitize($projectsListId).")";

-	if ($socid) {

-		$sql .= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".((int) $socid).")";

-	}

-	if ($mytasks) {

+	$sql .= " AND p.rowid IN (".$projectsListId.")";

+	if ($socid) $sql .= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";

+	if ($mytasks)

+	{

@@ -2555 +2124 @@
-		$sql .= " AND ec.fk_socpeople = ".((int) $user->id);

+		$sql .= " AND ec.fk_socpeople = ".$user->id;

@@ -2559 +2128,2 @@
-	if ($status >= 0) {

+	if ($status >= 0)

+	{

@@ -2562 +2132,2 @@
-	if (getDolGlobalString('PROJECT_LIMIT_YEAR_RANGE')) {

+	if (!empty($conf->global->PROJECT_LIMIT_YEAR_RANGE))

+	{

@@ -2565,2 +2136,4 @@
-		if ($project_year_filter != "*") {

-			if (empty($project_year_filter) || !ctype_digit($project_year_filter)) {

+		if ($project_year_filter != "*")

+		{

+			if (empty($project_year_filter) || !ctype_digit($project_year_filter))

+			{

@@ -2579 +2152,2 @@
-	if ($resql) {

+	if ($resql)

+	{

@@ -2582 +2156,2 @@
-		while ($i < $num) {

+		while ($i < $num)

+		{

@@ -2587,6 +2162,3 @@
-	} else {

-		dol_print_error($db);

-	}

-	if (empty($arrayidofprojects)) {

-		$arrayidofprojects[0] = -1;

-	}

+	}

+	else dol_print_error($db);

+	if (empty($arrayidofprojects)) $arrayidofprojects[0] = -1;

@@ -2595,6 +2167 @@
-	$sql2 = "SELECT p.rowid as projectid, p.ref, p.title, p.fk_soc,";

-	$sql2 .= " s.rowid as socid, s.nom as socname, s.name_alias,";

-	$sql2 .= " s.code_client, s.code_compta, s.client,";

-	$sql2 .= " s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur,";

-	$sql2 .= " s.logo, s.email, s.entity,";

-	$sql2 .= " p.fk_user_creat, p.public, p.fk_statut as status, p.fk_opp_status as opp_status, p.opp_percent, p.opp_amount,";

+	$sql2 = "SELECT p.rowid as projectid, p.ref, p.title, p.fk_soc, s.nom as socname, p.fk_user_creat, p.public, p.fk_statut as status, p.fk_opp_status as opp_status, p.opp_percent, p.opp_amount,";

@@ -2606,3 +2173,2 @@
-	$sql2 .= " WHERE p.rowid IN (".$db->sanitize(join(',', $arrayidofprojects)).")";

-	$sql2 .= " GROUP BY p.rowid, p.ref, p.title, p.fk_soc, s.rowid, s.nom, s.name_alias, s.code_client, s.code_compta, s.client, s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur,";

-	$sql2 .= " s.logo, s.email, s.entity, p.fk_user_creat, p.public, p.fk_statut, p.fk_opp_status, p.opp_percent, p.opp_amount, p.dateo, p.datee";

+	$sql2 .= " WHERE p.rowid IN (".join(',', $arrayidofprojects).")";

+	$sql2 .= " GROUP BY p.rowid, p.ref, p.title, p.fk_soc, s.nom, p.fk_user_creat, p.public, p.fk_statut, p.fk_opp_status, p.opp_percent, p.opp_amount, p.dateo, p.datee";

@@ -2612,3 +2178,3 @@
-	if ($resql) {

-		$othernb = 0;

-		$total_task = 0;

+	if ($resql)

+	{

+	    $total_task = 0;

@@ -2616,0 +2183,22 @@
+

+		$num = $db->num_rows($resql);

+		$i = 0;

+

+		print '<tr class="liste_titre">';

+		print_liste_field_titre($title.'<span class="badge marginleftonlyshort">'.$num.'</span>', $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);

+		print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);

+		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))

+		{

+			if (!in_array('prospectionstatus', $hiddenfields)) print_liste_field_titre("OpportunityStatus", "", "", "", "", '', $sortfield, $sortorder, 'right ');

+			print_liste_field_titre("OpportunityAmount", "", "", "", "", 'align="right"', $sortfield, $sortorder);

+			//print_liste_field_titre('OpportunityWeightedAmount', '', '', '', '', 'align="right"', $sortfield, $sortorder);

+		}

+		if (empty($conf->global->PROJECT_HIDE_TASKS))

+		{

+			print_liste_field_titre("Tasks", "", "", "", "", 'align="right"', $sortfield, $sortorder);

+			if (!in_array('plannedworkload', $hiddenfields))  print_liste_field_titre("PlannedWorkload", "", "", "", "", '', $sortfield, $sortorder, 'right ');

+			if (!in_array('declaredprogress', $hiddenfields)) print_liste_field_titre("ProgressDeclared", "", "", "", "", '', $sortfield, $sortorder, 'right ');

+		}

+		if (!in_array('projectstatus', $hiddenfields)) print_liste_field_titre("Status", "", "", "", "", '', $sortfield, $sortorder, 'right ');

+		print "</tr>\n";

+

@@ -2619,30 +2207,2 @@
-

-		$num = $db->num_rows($resql);

-		$nbofloop = min($num, (!getDolGlobalString('MAIN_MAXLIST_OVERLOAD') ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));

-		$i = 0;

-

-		print '<tr class="liste_titre">';

-		print_liste_field_titre($title.'<a href="'.DOL_URL_ROOT.'/projet/list.php?search_status='.((int) $status).'"><span class="badge marginleftonlyshort">'.$num.'</span></a>', $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);

-		print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);

-		if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {

-			if (!in_array('prospectionstatus', $hiddenfields)) {

-				print_liste_field_titre("OpportunityStatus", "", "", "", "", 'style="max-width: 100px"', $sortfield, $sortorder, 'center ');

-			}

-			print_liste_field_titre($form->textwithpicto($langs->trans("Amount"), $langs->trans("OpportunityAmount").' ('.$langs->trans("Tooltip").' = '.$langs->trans("OpportunityWeightedAmount").')'), "", "", "", "", 'style="max-width: 100px"', $sortfield, $sortorder, 'right ');

-			//print_liste_field_titre('OpportunityWeightedAmount', '', '', '', '', 'align="right"', $sortfield, $sortorder);

-		}

-		if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {

-			print_liste_field_titre("Tasks", "", "", "", "", 'align="right"', $sortfield, $sortorder);

-			if (!in_array('plannedworkload', $hiddenfields)) {

-				print_liste_field_titre("PlannedWorkload", "", "", "", "", 'style="max-width: 100px"', $sortfield, $sortorder, 'right ');

-			}

-			if (!in_array('declaredprogress', $hiddenfields)) {

-				print_liste_field_titre("%", "", "", "", "", '', $sortfield, $sortorder, 'right ', $langs->trans("ProgressDeclared"));

-			}

-		}

-		if (!in_array('projectstatus', $hiddenfields)) {

-			print_liste_field_titre("Status", "", "", "", "", '', $sortfield, $sortorder, 'right ');

-		}

-		print "</tr>\n";

-

-		while ($i < $nbofloop) {

+		while ($i < $num)

+		{

@@ -2650,14 +2209,0 @@
-

-			if ($max && $i >= $max) {

-				$othernb++;

-				$i++;

-				$total_task += $objp->nb;

-				$total_opp_amount += $objp->opp_amount;

-				$opp_weighted_amount = $objp->opp_percent * $objp->opp_amount / 100;

-				$ponderated_opp_amount += price2num($opp_weighted_amount);

-				$plannedworkload = $objp->planned_workload;

-				$total_plannedworkload += $plannedworkload;

-				$declaredprogressworkload = $objp->declared_progess_workload;

-				$total_declaredprogressworkload += $declaredprogressworkload;

-				continue;

-			}

@@ -2671 +2217,2 @@
-			if ($userAccess >= 0) {

+			if ($userAccess >= 0)

+			{

@@ -2672,0 +2220 @@
+				$projectstatic->statut = $objp->status; // deprecated

@@ -2675,2 +2223,2 @@
-				$projectstatic->date_end = $db->jdate($objp->datee);

-				$projectstatic->date_start = $db->jdate($objp->dateo);

+				$projectstatic->datee = $db->jdate($objp->datee);

+				$projectstatic->dateo = $db->jdate($objp->dateo);

@@ -2682,3 +2230 @@
-				if (!in_array('projectlabel', $hiddenfields)) {

-					print '<br><span class="opacitymedium small">'.dol_escape_htmltag($objp->title).'</span>';

-				}

+				if (!in_array('projectlabel', $hiddenfields)) print '<br><span class="opacitymedium">'.dol_trunc($objp->title, 24).'</span>';

@@ -2688,2 +2234,4 @@
-				if ($objp->fk_soc > 0) {

-					$thirdpartystatic->id = $objp->socid;

+				if ($objp->fk_soc > 0)

+				{

+					$thirdpartystatic->id = $objp->fk_soc;

+					$thirdpartystatic->ref = $objp->socname;

@@ -2691,10 +2238,0 @@
-					//$thirdpartystatic->name_alias = $objp->name_alias;

-					//$thirdpartystatic->code_client = $objp->code_client;

-					$thirdpartystatic->code_compta = $objp->code_compta;

-					$thirdpartystatic->client = $objp->client;

-					//$thirdpartystatic->code_fournisseur = $objp->code_fournisseur;

-					$thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;

-					$thirdpartystatic->fournisseur = $objp->fournisseur;

-					$thirdpartystatic->logo = $objp->logo;

-					$thirdpartystatic->email = $objp->email;

-					$thirdpartystatic->entity = $objp->entity;

@@ -2705 +2243,2 @@
-				if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {

+				if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))

+				{

@@ -2709 +2248 @@
-						if (!getDolGlobalString('USE_COLOR_FOR_PROSPECTION_STATUS')) {

+						if (empty($conf->global->USE_COLOR_FOR_PROSPECTION_STATUS)) {

@@ -2739,3 +2278 @@
-					if ($objp->opp_amount) {

-						print '<span class="amount" title="'.$alttext.'">'.$form->textwithpicto(price($objp->opp_amount, 0, '', 1, -1, 0), $alttext).'</span>';

-					}

+					if ($objp->opp_amount) print '<span title="'.$alttext.'">'.price($objp->opp_amount, 0, '', 1, -1, 0, $conf->currency).'</span>';

@@ -2745 +2282,2 @@
-				if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {

+				if (empty($conf->global->PROJECT_HIDE_TASKS))

+				{

@@ -2750,2 +2288,3 @@
-					if (!in_array('plannedworkload', $hiddenfields)) {

-						print '<td class="right nowraponall">'.($plannedworkload ? convertSecondToTime($plannedworkload) : '').'</td>';

+					if (!in_array('plannedworkload', $hiddenfields))

+					{

+						print '<td class="right">'.($plannedworkload ?convertSecondToTime($plannedworkload) : '').'</td>';

@@ -2753 +2292,2 @@
-					if (!in_array('declaredprogress', $hiddenfields)) {

+					if (!in_array('declaredprogress', $hiddenfields))

+					{

@@ -2756 +2296 @@
-						print '<td class="right nowraponall">';

+						print '<td class="right">';

@@ -2758 +2298 @@
-						print($plannedworkload ? round(100 * $declaredprogressworkload / $plannedworkload, 0).'%' : '');

+						print ($plannedworkload ?round(100 * $declaredprogressworkload / $plannedworkload, 0).'%' : '');

@@ -2771,2 +2311,2 @@
-				$total_task += $objp->nb;

-				$total_opp_amount += $objp->opp_amount;

+				$total_task = $total_task + $objp->nb;

+				$total_opp_amount = $total_opp_amount + $objp->opp_amount;

@@ -2776,8 +2315,0 @@
-		}

-

-		if ($othernb) {

-			print '<tr class="oddeven">';

-			print '<td class="nowrap" colspan="5">';

-			print '<span class="opacitymedium">'.$langs->trans("More").'...'.($othernb < $maxofloop ? ' ('.$othernb.')' : '').'</span>';

-			print '</td>';

-			print "</tr>\n";

@@ -2788 +2320,2 @@
-		if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {

+		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))

+		{

@@ -2794 +2327 @@
-			print $form->textwithpicto(price($total_opp_amount, 0, '', 1, -1, 0), $langs->trans("OpportunityPonderatedAmountDesc").' : '.price($ponderated_opp_amount, 0, '', 1, -1, 0, $conf->currency));

+			print $form->textwithpicto(price($total_opp_amount, 0, '', 1, -1, 0, $conf->currency), $langs->trans("OpportunityPonderatedAmountDesc").' : '.price($ponderated_opp_amount, 0, '', 1, -1, 0, $conf->currency));

@@ -2797 +2330,2 @@
-		if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {

+		if (empty($conf->global->PROJECT_HIDE_TASKS))

+		{

@@ -2799,6 +2333,2 @@
-			if (!in_array('plannedworkload', $hiddenfields)) {

-				print '<td class="liste_total right">'.($total_plannedworkload ? convertSecondToTime($total_plannedworkload) : '').'</td>';

-			}

-			if (!in_array('declaredprogress', $hiddenfields)) {

-				print '<td class="liste_total right">'.($total_plannedworkload ? round(100 * $total_declaredprogressworkload / $total_plannedworkload, 0).'%' : '').'</td>';

-			}

+			if (!in_array('plannedworkload', $hiddenfields))  print '<td class="liste_total right">'.($total_plannedworkload ?convertSecondToTime($total_plannedworkload) : '').'</td>';

+			if (!in_array('declaredprogress', $hiddenfields)) print '<td class="liste_total right">'.($total_plannedworkload ?round(100 * $total_declaredprogressworkload / $total_plannedworkload, 0).'%' : '').'</td>';

@@ -2812 +2342,3 @@
-	} else {

+	}

+	else

+	{

@@ -2819 +2351,2 @@
-	if (getDolGlobalString('PROJECT_LIMIT_YEAR_RANGE')) {

+	if (!empty($conf->global->PROJECT_LIMIT_YEAR_RANGE))

+	{

@@ -2825 +2358 @@
-		print '<td class="right"><input type="text" size="4" class="flat" name="project_year_filter" value="'.((int) $project_year_filter).'"/>';

+		print '<td class="right"><input type="text" size="4" class="flat" name="project_year_filter" value="'.$project_year_filter.'"/>';

@@ -2842,71 +2375,70 @@
-	global $langs, $conf;

-

-	$out = '';

-

-	$plannedworkloadoutputformat = 'allhourmin';

-	$timespentoutputformat = 'allhourmin';

-	if (getDolGlobalString('PROJECT_PLANNED_WORKLOAD_FORMAT')) {

-		$plannedworkloadoutputformat = $conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT;

-	}

-	if (getDolGlobalString('PROJECT_TIMES_SPENT_FORMAT')) {

-		$timespentoutputformat = $conf->global->PROJECT_TIME_SPENT_FORMAT;

-	}

-

-	if (empty($task->progress) && !empty($hideOnProgressNull)) {

-		return '';

-	}

-

-	$spaced = !empty($spaced) ? 'spaced' : '';

-

-	$diff = '';

-

-	// define progress color according to time spend vs workload

-	$progressBarClass = 'progress-bar-info';

-	$progressCalculated = 0;

-	if ($task->planned_workload) {

-		$progressCalculated = round(100 * (float) $task->duration_effective / (float) $task->planned_workload, 2);

-

-		// this conf is actually hidden, by default we use 10% for "be carefull or warning"

-		$warningRatio = getDolGlobalString('PROJECT_TIME_SPEND_WARNING_PERCENT') ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.10;

-

-		$diffTitle = '<br>'.$langs->trans('ProgressDeclared').' : '.$task->progress.(isset($task->progress) ? '%' : '');

-		$diffTitle .= '<br>'.$langs->trans('ProgressCalculated').' : '.$progressCalculated.(isset($progressCalculated) ? '%' : '');

-

-		//var_dump($progressCalculated.' '.$warningRatio.' '.$task->progress.' '.floatval($task->progress * $warningRatio));

-		if ((float) $progressCalculated > (float) ($task->progress * $warningRatio)) {

-			$progressBarClass = 'progress-bar-danger';

-			$title = $langs->trans('TheReportedProgressIsLessThanTheCalculatedProgressionByX', abs($task->progress - $progressCalculated).' '.$langs->trans("point"));

-			$diff = '<span class="text-danger classfortooltip paddingrightonly" title="'.dol_htmlentities($title.$diffTitle).'" ><i class="fa fa-caret-down"></i> '.($task->progress - $progressCalculated).'%</span>';

-		} elseif ((float) $progressCalculated > (float) $task->progress) { // warning if close at 10%

-			$progressBarClass = 'progress-bar-warning';

-			$title = $langs->trans('TheReportedProgressIsLessThanTheCalculatedProgressionByX', abs($task->progress - $progressCalculated).' '.$langs->trans("point"));

-			$diff = '<span class="text-warning classfortooltip paddingrightonly" title="'.dol_htmlentities($title.$diffTitle).'" ><i class="fa fa-caret-left"></i> '.($task->progress - $progressCalculated).'%</span>';

-		} else {

-			$progressBarClass = 'progress-bar-success';

-			$title = $langs->trans('TheReportedProgressIsMoreThanTheCalculatedProgressionByX', ($task->progress - $progressCalculated).' '.$langs->trans("point"));

-			$diff = '<span class="text-success classfortooltip paddingrightonly" title="'.dol_htmlentities($title.$diffTitle).'" ><i class="fa fa-caret-up"></i> '.($task->progress - $progressCalculated).'%</span>';

-		}

-	}

-

-	$out .= '<div class="progress-group">';

-

-	if ($label !== false) {

-		$out .= '    <span class="progress-text">';

-

-		if ($label !== true) {

-			$out .= $label; // replace label by param

-		} else {

-			$out .= $task->getNomUrl(1).' '.dol_htmlentities($task->label);

-		}

-		$out .= '    </span>';

-	}

-

-

-	if ($progressNumber !== false) {

-		$out .= '    <span class="progress-number">';

-		if ($progressNumber !== true) {

-			$out .= $progressNumber; // replace label by param

-		} else {

-			if ($task->hasDelay()) {

-				$out .= img_warning($langs->trans("Late")).' ';

-			}

+    global $langs, $conf;

+

+    $out = '';

+

+    $plannedworkloadoutputformat = 'allhourmin';

+    $timespentoutputformat = 'allhourmin';

+    if (!empty($conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT)) $plannedworkloadoutputformat = $conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT;

+    if (!empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) $timespentoutputformat = $conf->global->PROJECT_TIME_SPENT_FORMAT;

+

+    if (empty($task->progress) && !empty($hideOnProgressNull)) {

+        return '';

+    }

+

+    $spaced = !empty($spaced) ? 'spaced' : '';

+

+    $diff = '';

+

+    // define progress color according to time spend vs workload

+    $progressBarClass = 'progress-bar-info';

+    if ($task->planned_workload) {

+        $progressCalculated = round(100 * doubleval($task->duration_effective) / doubleval($task->planned_workload), 2);

+

+        // this conf is actually hidden, by default we use 10% for "be carefull or warning"

+        $warningRatio = !empty($conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT) ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.10;

+

+        $diffTitle = '<br/>'.$langs->trans('ProgressDeclared').' : '.$task->progress.($task->progress ? '%' : '');

+        $diffTitle .= '<br/>'.$langs->trans('ProgressCalculated').' : '.$progressCalculated.($progressCalculated ? '%' : '');

+

+        //var_dump($progressCalculated.' '.$warningRatio.' '.$task->progress.' '.doubleval($task->progress * $warningRatio));

+        if (doubleval($progressCalculated) > doubleval($task->progress * $warningRatio)) {

+            $progressBarClass = 'progress-bar-danger';

+            $title = $langs->trans('TheReportedProgressIsLessThanTheCalculatedProgressionByX', abs($task->progress - $progressCalculated).' '.$langs->trans("point"));

+            $diff = '<span class="text-danger classfortooltip paddingrightonly" title="'.dol_htmlentities($title.$diffTitle).'" ><i class="fa fa-caret-down"></i> '.($task->progress - $progressCalculated).'%</span>';

+        }

+        elseif (doubleval($progressCalculated) > doubleval($task->progress)) { // warning if close at 10%

+            $progressBarClass = 'progress-bar-warning';

+            $title = $langs->trans('TheReportedProgressIsLessThanTheCalculatedProgressionByX', abs($task->progress - $progressCalculated).' '.$langs->trans("point"));

+            $diff = '<span class="text-warning classfortooltip paddingrightonly" title="'.dol_htmlentities($title.$diffTitle).'" ><i class="fa fa-caret-left"></i> '.($task->progress - $progressCalculated).'%</span>';

+        }

+        else {

+            $progressBarClass = 'progress-bar-success';

+            $title = $langs->trans('TheReportedProgressIsMoreThanTheCalculatedProgressionByX', ($task->progress - $progressCalculated).' '.$langs->trans("point"));

+            $diff = '<span class="text-success classfortooltip paddingrightonly" title="'.dol_htmlentities($title.$diffTitle).'" ><i class="fa fa-caret-up"></i> '.($task->progress - $progressCalculated).'%</span>';

+        }

+    }

+

+    $out .= '<div class="progress-group">';

+

+    if ($label !== false)

+    {

+        $out .= '    <span class="progress-text">';

+

+        if ($label !== true) {

+            $out .= $label; // replace label by param

+        }

+        else {

+            $out .= $task->getNomUrl(1).' '.dol_htmlentities($task->label);

+        }

+        $out .= '    </span>';

+    }

+

+

+    if ($progressNumber !== false)

+    {

+        $out .= '    <span class="progress-number">';

+        if ($progressNumber !== true) {

+            $out .= $progressNumber; // replace label by param

+        }

+        else {

+            if ($task->hasDelay()) $out .= img_warning($langs->trans("Late")).' ';

@@ -2916 +2448 @@
-			$out .= !empty($diff) ? $diff.' ' : '';

+            $out .= !empty($diff) ? $diff.' ' : '';

@@ -2918,7 +2450,4 @@
-			$out .= '<b title="'.$langs->trans('TimeSpent').'" >';

-			if ($task->duration_effective) {

-				$out .= convertSecondToTime($task->duration_effective, $timespentoutputformat);

-			} else {

-				$out .= '--:--';

-			}

-			$out .= '</b>';

+            $out .= '<b title="'.$langs->trans('TimeSpent').'" >';

+            if ($task->duration_effective) $out .= convertSecondToTime($task->duration_effective, $timespentoutputformat);

+            else $out .= '--:--';

+            $out .= '</b>';

@@ -2927 +2456 @@
-			$out .= ' / ';

+            $out .= '/';

@@ -2930,6 +2459,3 @@
-			$out .= '<span title="'.$langs->trans('PlannedWorkload').'" >';

-			if ($task->planned_workload) {

-				$out .= convertSecondToTime($task->planned_workload, $plannedworkloadoutputformat);

-			} else {

-				$out .= '--:--';

-			}

+            $out .= '<span title="'.$langs->trans('PlannedWorkload').'" >';

+            if ($task->planned_workload) $out .= convertSecondToTime($task->planned_workload, $plannedworkloadoutputformat);

+            else $out .= '--:--';

@@ -2937,27 +2463,29 @@
-		}

-		$out .= '    </span>';

-	}

-

-

-	$out .= '</span>';

-	$out .= '    <div class="progress sm '.$spaced.'">';

-	$diffval = (float) $task->progress - (float) $progressCalculated;

-	if ($diffval >= 0) {

-		// good

-		$out .= '        <div class="progress-bar '.$progressBarClass.'" style="width: '.(float) $task->progress.'%" title="'.(float) $task->progress.'%">';

-		if (!empty($task->progress)) {

-			$out .= '        <div class="progress-bar progress-bar-consumed" style="width: '.(float) ($progressCalculated / ((float) $task->progress == 0 ? 1 : $task->progress) * 100).'%" title="'.(float) $progressCalculated.'%"></div>';

-		}

-		$out .= '        </div>';

-	} else {

-		// bad

-		$out .= '        <div class="progress-bar progress-bar-consumed-late" style="width: '.(float) $progressCalculated.'%" title="'.(float) $progressCalculated.'%">';

-		$out .= '        <div class="progress-bar '.$progressBarClass.'" style="width: '.($task->progress ? (float) ($task->progress / ((float) $progressCalculated == 0 ? 1 : $progressCalculated) * 100).'%' : '1px').'" title="'.(float) $task->progress.'%"></div>';

-		$out .= '        </div>';

-	}

-	$out .= '    </div>';

-	$out .= '</div>';

-

-

-

-	return $out;

+        }

+        $out .= '    </span>';

+    }

+

+

+    $out .= '</span>';

+    $out .= '    <div class="progress sm '.$spaced.'">';

+    $diffval = doubleval($task->progress) - doubleval($progressCalculated);

+    if ($diffval >= 0) {

+    	// good

+    	$out .= '        <div class="progress-bar '.$progressBarClass.'" style="width: '.doubleval($task->progress).'%" title="'.doubleval($task->progress).'%">';

+    	if (!empty($task->progress)) {

+			$out .= '        <div class="progress-bar progress-bar-consumed" style="width: '.doubleval($progressCalculated / $task->progress * 100).'%" title="'.doubleval($progressCalculated).'%"></div>';

+		}

+    	$out .= '        </div>';

+    }

+    else

+    {

+    	// bad

+    	$out .= '        <div class="progress-bar progress-bar-consumed" style="width: '.doubleval($progressCalculated).'%" title="'.doubleval($progressCalculated).'%">';

+    	$out .= '        <div class="progress-bar '.$progressBarClass.'" style="width: '.($task->progress ? doubleval($task->progress / $progressCalculated * 100).'%' : '1px').'" title="'.doubleval($task->progress).'%"></div>';

+    	$out .= '        </div>';

+    }

+    $out .= '    </div>';

+    $out .= '</div>';

+

+

+

+    return $out;

@@ -2974,49 +2502,46 @@
-	global $conf, $langs;

-

-	$out = '';

-	$badgeClass = '';

-	if ($task->progress != '') {

-		// TODO : manage 100%

-

-		// define color according to time spend vs workload

-		$badgeClass = 'badge ';

-		if ($task->planned_workload) {

-			$progressCalculated = round(100 * (float) $task->duration_effective / (float) $task->planned_workload, 2);

-

-			// this conf is actually hidden, by default we use 10% for "be carefull or warning"

-			$warningRatio = getDolGlobalString('PROJECT_TIME_SPEND_WARNING_PERCENT') ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.10;

-

-			if ((float) $progressCalculated > (float) ($task->progress * $warningRatio)) {

-				$badgeClass .= 'badge-danger';

-				if (empty($tooltip)) {

-					$tooltip = $task->progress.'% < '.$langs->trans("TimeConsumed").' '.$progressCalculated.'%';

-				}

-			} elseif ((float) $progressCalculated > (float) $task->progress) { // warning if close at 10%

-				$badgeClass .= 'badge-warning';

-				if (empty($tooltip)) {

-					$tooltip = $task->progress.'% < '.$langs->trans("TimeConsumed").' '.$progressCalculated.'%';

-				}

-			} else {

-				$badgeClass .= 'badge-success';

-				if (empty($tooltip)) {

-					$tooltip = $task->progress.'% >= '.$langs->trans("TimeConsumed").' '.$progressCalculated.'%';

-				}

-			}

-		}

-	}

-

-	$title = '';

-	if (!empty($tooltip)) {

-		$badgeClass .= ' classfortooltip';

-		$title = 'title="'.dol_htmlentities($tooltip).'"';

-	}

-

-	if (empty($label)) {

-		$label = $task->progress.' %';

-	}

-

-	if (!empty($label)) {

-		$out = '<span class="'.$badgeClass.'" '.$title.' >'.$label.'</span>';

-	}

-

-	return $out;

+    global $conf, $langs;

+

+    $out = '';

+    $badgeClass = '';

+    if ($task->progress != '')

+    {

+        // TODO : manage 100%

+

+        // define color according to time spend vs workload

+        $badgeClass = 'badge ';

+        if ($task->planned_workload) {

+            $progressCalculated = round(100 * doubleval($task->duration_effective) / doubleval($task->planned_workload), 2);

+

+            // this conf is actually hidden, by default we use 10% for "be carefull or warning"

+            $warningRatio = !empty($conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT) ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.10;

+

+            if (doubleval($progressCalculated) > doubleval($task->progress * $warningRatio)) {

+                $badgeClass .= 'badge-danger';

+                if (empty($tooltip)) $tooltip = $task->progress.'% < '.$langs->trans("Expected").' '.$progressCalculated.'%';

+            }

+            elseif (doubleval($progressCalculated) > doubleval($task->progress)) { // warning if close at 10%

+                $badgeClass .= 'badge-warning';

+                if (empty($tooltip)) $tooltip = $task->progress.'% < '.$langs->trans("Expected").' '.$progressCalculated.'%';

+            }

+            else {

+                $badgeClass .= 'badge-success';

+                if (empty($tooltip)) $tooltip = $task->progress.'% >= '.$langs->trans("Expected").' '.$progressCalculated.'%';

+            }

+        }

+    }

+

+    $title = '';

+    if (!empty($tooltip)) {

+        $badgeClass .= ' classfortooltip';

+        $title = 'title="'.dol_htmlentities($tooltip).'"';

+    }

+

+    if (empty($label)) {

+        $label = $task->progress.' %';

+    }

+

+    if (!empty($label)) {

+        $out = '<span class="'.$badgeClass.'" '.$title.' >'.$label.'</span>';

+    }

+

+    return $out;

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_propal.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_propal.lib.php
@@ -21,3 +21,3 @@
- * \file       htdocs/core/lib/propal.lib.php

- * \brief      Ensemble de fonctions de base pour le module propal

- * \ingroup    propal

+ *	\file       htdocs/core/lib/propal.lib.php

+ *	\brief      Ensemble de fonctions de base pour le module propal

+ *	\ingroup    propal

@@ -41 +41 @@
-	$head[$h][1] = $langs->trans('Proposal');

+	$head[$h][1] = $langs->trans('ProposalCard');

@@ -45,2 +45,3 @@
-	if ((empty($conf->commande->enabled) && ((isModEnabled("expedition") && getDolGlobalInt('MAIN_SUBMODULE_EXPEDITION') && $user->hasRight('expedition', 'lire'))

-		|| (isModEnabled("expedition") && getDolGlobalInt('MAIN_SUBMODULE_DELIVERY') && $user->hasRight('expedition', 'delivery', 'lire'))))) {

+	if ((empty($conf->commande->enabled) && ((!empty($conf->expedition->enabled) && !empty($conf->expedition_bon->enabled) && $user->rights->expedition->lire)

+	    || (!empty($conf->expedition->enabled) && !empty($conf->livraison_bon->enabled) && $user->rights->expedition->livraison->lire))))

+	{

@@ -50,9 +51,2 @@
-		if (getDolGlobalInt('MAIN_SUBMODULE_EXPEDITION')) {

-			$text = $langs->trans("Shipment");

-		}

-		if (getDolGlobalInt('MAIN_SUBMODULE_EXPEDITION') && getDolGlobalInt('MAIN_SUBMODULE_DELIVERY')) {

-			$text .= '/';

-		}

-		if (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY')) {

-			$text .= $langs->trans("Receivings");

-		}

+		if ($conf->expedition_bon->enabled) $text = $langs->trans("Shipment");

+		if ($conf->livraison_bon->enabled)  $text .= '/'.$langs->trans("Receivings");

@@ -64,2 +58,3 @@
-	if (!getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB')) {

-		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));

+	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))

+	{

+	    $nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));

@@ -68,3 +63 @@
-		if ($nbContact > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';

-		}

+		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';

@@ -75,5 +68,5 @@
-	// Show more tabs from modules

-	// Entries must be declared in modules descriptor with line

-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname);   												to remove a tab

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'propal', 'add', 'core');

+    // Show more tabs from modules

+    // Entries must be declared in modules descriptor with line

+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

+    // $this->tabs = array('entity:-tabname);   												to remove a tab

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'propal');

@@ -81,9 +74,6 @@
-	if (!getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {

-		$nbNote = 0;

-		if (!empty($object->note_private)) {

-			$nbNote++;

-		}

-		if (!empty($object->note_public)) {

-			$nbNote++;

-		}

-		$head[$h][0] = DOL_URL_ROOT.'/comm/propal/note.php?id='.$object->id;

+    if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))

+    {

+    	$nbNote = 0;

+        if (!empty($object->note_private)) $nbNote++;

+		if (!empty($object->note_public)) $nbNote++;

+	    $head[$h][0] = DOL_URL_ROOT.'/comm/propal/note.php?id='.$object->id;

@@ -91,3 +81 @@
-		if ($nbNote > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

-		}

+		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

@@ -96 +84 @@
-	}

+    }

@@ -99,2 +87,2 @@
-	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

-	$upload_dir = $conf->propal->multidir_output[$object->entity]."/".dol_sanitizeFileName($object->ref);

+    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

+    $upload_dir = $conf->propal->multidir_output[$object->entity]."/".dol_sanitizeFileName($object->ref);

@@ -102 +90 @@
-	$nbLinks = Link::count($db, $object->element, $object->id);

+    $nbLinks = Link::count($db, $object->element, $object->id);

@@ -105,3 +93 @@
-	if (($nbFiles + $nbLinks) > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

-	}

+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

@@ -111,33 +97,3 @@
-

-	$head[$h][0] = DOL_URL_ROOT.'/comm/propal/agenda.php?id='.$object->id;

-	$head[$h][1] = $langs->trans("Events");

-	if (isModEnabled('agenda')&& ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {

-		$nbEvent = 0;

-		// Enable caching of thirdparty count actioncomm

-		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';

-		$cachekey = 'count_events_propal_'.$object->id;

-		$dataretrieved = dol_getcache($cachekey);

-		if (!is_null($dataretrieved)) {

-			$nbEvent = $dataretrieved;

-		} else {

-			$sql = "SELECT COUNT(id) as nb";

-			$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm";

-			$sql .= " WHERE fk_element = ".((int) $object->id);

-			$sql .= " AND elementtype = 'propal'";

-			$resql = $db->query($sql);

-			if ($resql) {

-				$obj = $db->fetch_object($resql);

-				$nbEvent = $obj->nb;

-			} else {

-				dol_syslog('Failed to count actioncomm '.$db->lasterror(), LOG_ERR);

-			}

-			dol_setcache($cachekey, $nbEvent, 120);		// If setting cache fails, this is not a problem, so we do not test result.

-		}

-

-		$head[$h][1] .= '/';

-		$head[$h][1] .= $langs->trans("Agenda");

-		if ($nbEvent > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbEvent.'</span>';

-		}

-	}

-	$head[$h][2] = 'agenda';

+	$head[$h][0] = DOL_URL_ROOT.'/comm/propal/info.php?id='.$object->id;

+	$head[$h][1] = $langs->trans('Info');

+	$head[$h][2] = 'info';

@@ -145,2 +100,0 @@
-

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'propal', 'add', 'external');

@@ -160,5 +114 @@
-	global $langs, $conf, $user, $db;

-

-	$extrafields = new ExtraFields($db);

-	$extrafields->fetch_name_optionals_label('propal');

-	$extrafields->fetch_name_optionals_label('propaldet');

+	global $langs, $conf, $user;

@@ -182,6 +132,2 @@
-	$nbExtrafields = $extrafields->attributes['propal']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

-	$head[$h][2] = 'attributes';

-	$h++;

+    $head[$h][2] = 'attributes';

+    $h++;

@@ -189,8 +135,4 @@
-	$head[$h][0] = DOL_URL_ROOT.'/comm/admin/propaldet_extrafields.php';

-	$head[$h][1] = $langs->trans("ExtraFieldsLines");

-	$nbExtrafields = $extrafields->attributes['propaldet']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

-	$head[$h][2] = 'attributeslines';

-	$h++;

+    $head[$h][0] = DOL_URL_ROOT.'/comm/admin/propaldet_extrafields.php';

+    $head[$h][1] = $langs->trans("ExtraFieldsLines");

+    $head[$h][2] = 'attributeslines';

+    $h++;

@@ -202,139 +143,0 @@
-

-

-

-/**

- * Return a HTML table that contains a pie chart of customer proposals

- *

- * @param	int		$socid		(Optional) Show only results from the customer with this id

- * @return	string				A HTML table that contains a pie chart of customer invoices

- */

-function getCustomerProposalPieChart($socid = 0)

-{

-	global $conf, $db, $langs, $user;

-

-	$result= '';

-

-	if (!isModEnabled('propal') || !$user->hasRight('propal', 'lire')) {

-		return '';

-	}

-

-	$listofstatus = array(Propal::STATUS_DRAFT, Propal::STATUS_VALIDATED, Propal::STATUS_SIGNED, Propal::STATUS_NOTSIGNED, Propal::STATUS_BILLED);

-

-	$propalstatic = new Propal($db);

-

-	$sql = "SELECT count(p.rowid) as nb, p.fk_statut as status";

-	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";

-	$sql .= ", ".MAIN_DB_PREFIX."propal as p";

-	if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {

-		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

-	}

-	$sql .= " WHERE p.entity IN (".getEntity($propalstatic->element).")";

-	$sql .= " AND p.fk_soc = s.rowid";

-	if ($user->socid) {

-		$sql .= ' AND p.fk_soc = '.((int) $user->socid);

-	}

-	if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {

-		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);

-	}

-	$sql .= " AND p.fk_statut IN (".$db->sanitize(implode(" ,", $listofstatus)).")";

-	$sql .= " GROUP BY p.fk_statut";

-	$resql = $db->query($sql);

-	if ($resql) {

-		$num = $db->num_rows($resql);

-		$i = 0;

-		$total = 0;

-		$totalinprocess = 0;

-		$dataseries = array();

-		$colorseries = array();

-		$vals = array();

-

-		while ($i < $num) {

-			$obj = $db->fetch_object($resql);

-			if ($obj) {

-				$vals[$obj->status] = $obj->nb;

-				$totalinprocess += $obj->nb;

-

-				$total += $obj->nb;

-			}

-			$i++;

-		}

-		$db->free($resql);

-

-		global $badgeStatus0, $badgeStatus1, $badgeStatus4, $badgeStatus6, $badgeStatus9;

-		include DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';

-

-		$result = '<div class="div-table-responsive-no-min">';

-		$result .= '<table class="noborder nohover centpercent">';

-

-		$result .=  '<tr class="liste_titre">';

-		$result .=  '<td colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("Proposals").'</td>';

-		$result .=  '</tr>';

-

-		foreach ($listofstatus as $status) {

-			$dataseries[] = array($propalstatic->LibStatut($status, 1), (isset($vals[$status]) ? (int) $vals[$status] : 0));

-			if ($status == Propal::STATUS_DRAFT) {

-				$colorseries[$status] = '-'.$badgeStatus0;

-			}

-			if ($status == Propal::STATUS_VALIDATED) {

-				$colorseries[$status] = $badgeStatus1;

-			}

-			if ($status == Propal::STATUS_SIGNED) {

-				$colorseries[$status] = $badgeStatus4;

-			}

-			if ($status == Propal::STATUS_NOTSIGNED) {

-				$colorseries[$status] = $badgeStatus9;

-			}

-			if ($status == Propal::STATUS_BILLED) {

-				$colorseries[$status] = $badgeStatus6;

-			}

-

-			if (empty($conf->use_javascript_ajax)) {

-				$result .=  '<tr class="oddeven">';

-				$result .=  '<td>'.$propalstatic->LibStatut($status, 0).'</td>';

-				$result .=  '<td class="right"><a href="list.php?statut='.$status.'">'.(isset($vals[$status]) ? $vals[$status] : 0).'</a></td>';

-				$result .=  "</tr>\n";

-			}

-		}

-

-		if ($conf->use_javascript_ajax) {

-			$result .=  '<tr>';

-			$result .=  '<td align="center" colspan="2">';

-

-			include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';

-			$dolgraph = new DolGraph();

-			$dolgraph->SetData($dataseries);

-			$dolgraph->SetDataColor(array_values($colorseries));

-			$dolgraph->setShowLegend(2);

-			$dolgraph->setShowPercent(1);

-			$dolgraph->SetType(array('pie'));

-			$dolgraph->setHeight('150');

-			$dolgraph->setWidth('300');

-			$dolgraph->draw('idgraphthirdparties');

-			$result .=  $dolgraph->show($total ? 0 : 1);

-

-			$result .=  '</td>';

-			$result .=  '</tr>';

-		}

-

-		//if ($totalinprocess != $total)

-		//{

-		//	print '<tr class="liste_total">';

-		//	print '<td>'.$langs->trans("Total").' ('.$langs->trans("CustomersOrdersRunning").')</td>';

-		//	print '<td class="right">'.$totalinprocess.'</td>';

-		//	print '</tr>';

-		//}

-

-		$result .=  '<tr class="liste_total">';

-		$result .=  '<td>'.$langs->trans("Total").'</td>';

-		$result .=  '<td class="right">'.$total.'</td>';

-		$result .=  '</tr>';

-

-		$result .=  '</table>';

-		$result .=  '</div>';

-		$result .=  '<br>';

-	} else {

-		dol_print_error($db);

-	}

-

-	return $result;

-}

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_reception.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_reception.lib.php
@@ -39 +39,2 @@
-	$langs->loadLangs(array("sendings", "deliveries"));

+	$langs->load("sendings");

+	$langs->load("deliveries");

@@ -49,5 +50,16 @@
-	if ($object->statut ==  Reception::STATUS_DRAFT || ($object->statut == Reception::STATUS_VALIDATED && !getDolGlobalString('STOCK_CALCULATE_ON_RECEPTION'))) {

-		$head[$h][0] = DOL_URL_ROOT."/reception/dispatch.php?id=".$object->id;

-		$head[$h][1] = $langs->trans("ReceptionDistribution");

-		$head[$h][2] = 'dispatch';

-		$h++;

+

+

+	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))

+	{

+	    $objectsrc = $object;

+	    if ($object->origin == 'commande' && $object->origin_id > 0)

+	    {

+	        $objectsrc = new Commande($db);

+	        $objectsrc->fetch($object->origin_id);

+	    }

+	    $nbContact = count($objectsrc->liste_contact(-1, 'internal')) + count($objectsrc->liste_contact(-1, 'external'));

+	    $head[$h][0] = DOL_URL_ROOT."/reception/contact.php?id=".$object->id;

+    	$head[$h][1] = $langs->trans("ContactsAddresses");

+		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';

+    	$head[$h][2] = 'contact';

+    	$h++;

@@ -56,42 +68,3 @@
-	if (!getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB')) {

-		$objectsrc = $object;

-		if ($object->origin == 'supplier_order' && $object->origin_id > 0) {

-			$objectsrc = new CommandeFournisseur($db);

-			$objectsrc->fetch($object->origin_id);

-		}

-		$nbContact = count($objectsrc->liste_contact(-1, 'internal')) + count($objectsrc->liste_contact(-1, 'external'));

-		$head[$h][0] = DOL_URL_ROOT."/reception/contact.php?id=".$object->id;

-		$head[$h][1] = $langs->trans("ContactsAddresses");

-		if ($nbContact > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';

-		}

-		$head[$h][2] = 'contact';

-		$h++;

-	}

-

-	// Show more tabs from modules

-	// Entries must be declared in modules descriptor with line

-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname);   												to remove a tab

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'reception', 'add', 'core');

-

-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

-	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

-	$upload_dir = $conf->reception->dir_output."/".dol_sanitizeFileName($object->ref);

-	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));

-	$nbLinks = Link::count($db, $object->element, $object->id);

-	$head[$h][0] = DOL_URL_ROOT.'/reception/document.php?id='.$object->id;

-	$head[$h][1] = $langs->trans('Documents');

-	if (($nbFiles + $nbLinks) > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

-	}

-	$head[$h][2] = 'documents';

-	$h++;

-

-	$nbNote = 0;

-	if (!empty($object->note_private)) {

-		$nbNote++;

-	}

-	if (!empty($object->note_public)) {

-		$nbNote++;

-	}

+    $nbNote = 0;

+    if (!empty($object->note_private)) $nbNote++;

+    if (!empty($object->note_public)) $nbNote++;

@@ -100,3 +73 @@
-	if ($nbNote > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

-	}

+	if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

@@ -106 +76,0 @@
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'reception', 'add', 'external');

@@ -108 +77,0 @@
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'reception', 'remove');

@@ -110 +79,6 @@
-	return $head;

+

+

+

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'order', 'remove');

+

+    return $head;

@@ -120 +94 @@
-	global $langs, $conf, $user, $db;

+	global $langs, $conf, $user;

@@ -122,4 +95,0 @@
-

-	$extrafields = new ExtraFields($db);

-	$extrafields->fetch_name_optionals_label('reception');

-	$extrafields->fetch_name_optionals_label('commande_fournisseur_dispatch');

@@ -135 +104,0 @@
-	complete_head_from_modules($conf, $langs, null, $head, $h, 'reception_admin');

@@ -137,9 +106,6 @@
-	if (getDolGlobalString('MAIN_SUBMODULE_RECEPTION')) {

-		$head[$h][0] = DOL_URL_ROOT.'/admin/reception_extrafields.php';

-		$head[$h][1] = $langs->trans("ExtraFields");

-		$nbExtrafields = $extrafields->attributes['reception']['count'];

-		if ($nbExtrafields > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-		}

-		$head[$h][2] = 'attributes_reception';

-		$h++;

+	if (!empty($conf->global->MAIN_SUBMODULE_RECEPTION))

+	{

+	    $head[$h][0] = DOL_URL_ROOT.'/admin/reception_extrafields.php';

+	    $head[$h][1] = $langs->trans("ExtraFields");

+	    $head[$h][2] = 'attributes_reception';

+	    $h++;

@@ -148,9 +114,6 @@
-	if (getDolGlobalString('MAIN_SUBMODULE_RECEPTION')) {

-		$head[$h][0] = DOL_URL_ROOT.'/admin/commande_fournisseur_dispatch_extrafields.php';

-		$head[$h][1] = $langs->trans("ExtraFieldsLines");

-		$nbExtrafields = $extrafields->attributes['commande_fournisseur_dispatch']['count'];

-		if ($nbExtrafields > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-		}

-		$head[$h][2] = 'attributeslines_reception';

-		$h++;

+	if (!empty($conf->global->MAIN_SUBMODULE_RECEPTION))

+	{

+	    $head[$h][0] = DOL_URL_ROOT.'/admin/commande_fournisseur_dispatch_extrafields.php';

+	    $head[$h][1] = $langs->trans("ExtraFieldsLines");

+	    $head[$h][2] = 'attributeslines_reception';

+	    $h++;

@@ -157,0 +121,2 @@
+

+

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_report.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_report.lib.php
@@ -47,3 +47 @@
-	if (!empty($varlink)) {

-		$varlink = '?'.$varlink;

-	}

+	if (!empty($varlink)) $varlink = '?'.$varlink;

@@ -51 +49 @@
-	$title = $langs->trans("Report");

+	$head = array();

@@ -53 +51,4 @@
-	print_barre_liste($title, 0, '', '', '', '', '', -1, '', 'generic', 0, '', '', -1, 1, 1);

+	$h = 0;

+	$head[$h][0] = $_SERVER["PHP_SELF"].$varlink;

+	$head[$h][1] = $langs->trans("Report");

+	$head[$h][2] = 'report';

@@ -55 +56 @@
-	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].$varlink.'">'."\n";

+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].$varlink.'">'."\n";

@@ -58 +59 @@
-	print dol_get_fiche_head();

+	dol_fiche_head($head, 'report');

@@ -60,2 +61,3 @@
-	foreach ($moreparam as $key => $value) {

-		print '<input type="hidden" name="'.$key.'" value="'.$value.'">'."\n";

+	foreach ($moreparam as $key => $value)

+	{

+		 print '<input type="hidden" name="'.$key.'" value="'.$value.'">'."\n";

@@ -70 +72 @@
-	print '<td width="150">'.$langs->trans("ReportName").'</td>';

+	print '<td width="110">'.$langs->trans("ReportName").'</td>';

@@ -74,3 +76 @@
-	if ($variante) {

-		print '<td></td>';

-	}

+	if ($variante) print '<td></td>';

@@ -80 +80,2 @@
-	if ($calcmode) {

+	if ($calcmode)

+	{

@@ -82 +83 @@
-		print '<td width="150">'.$langs->trans("CalculationMode").'</td>';

+		print '<td width="110">'.$langs->trans("CalculationMode").'</td>';

@@ -85,3 +86 @@
-		if ($variante) {

-			print '<td></td>';

-		}

+		if ($variante) print '<td></td>';

@@ -96,6 +95,2 @@
-	if ($period) {

-		print $period;

-	}

-	if ($variante) {

-		print '<td class="nowraponall">'.$periodlink.'</td>';

-	}

+	if ($period) print $period;

+	if ($variante) print '<td class="nowraponall">'.$periodlink.'</td>';

@@ -109,3 +104 @@
-	if ($variante) {

-		print '<td></td>';

-	}

+	if ($variante) print '<td></td>';

@@ -120,3 +113 @@
-	if ($variante) {

-		print '<td>'.($exportlink ? $langs->trans("Export").': '.$exportlink : '').'</td>';

-	}

+	if ($variante) print '<td>'.($exportlink ? $langs->trans("Export").': '.$exportlink : '').'</td>';

@@ -127 +118 @@
-	print dol_get_fiche_end();

+	dol_fiche_end();

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_resource.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_resource.lib.php
@@ -3,3 +3,2 @@
- * Copyright (C) 2013       Jean-François Ferry     <jfefe@aternatik.fr>

- * Copyright (C) 2016       Gilles Poirier          <gilles.poirier@netlogic.fr>

- * Copyright (C) 2023       Frédéric France         <frederic.france@netlogic.fr>

+ * Copyright (C) 2013	Jean-François Ferry	<jfefe@aternatik.fr>

+ * Copyright (C) 2016	Gilles Poirier		<glgpoirier@gmail.com>

@@ -30 +29 @@
- * @param	Dolresource	$object		Object

+ * @param	Object	$object		Object

@@ -41 +40 @@
-	$head[$h][2] = 'resource';

+    	$head[$h][2] = 'resource';

@@ -44,3 +43,4 @@
-	if (!getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB') && (!getDolGlobalString('RESOURCE_HIDE_ADD_CONTACT_USER') || !getDolGlobalString('RESOURCE_HIDE_ADD_CONTACT_THIPARTY'))) {

-		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));

-		$head[$h][0] = DOL_URL_ROOT.'/resource/contact.php?id='.$object->id;

+	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && (empty($conf->global->RESOURCE_HIDE_ADD_CONTACT_USER) || empty($conf->global->RESOURCE_HIDE_ADD_CONTACT_THIPARTY)))

+	{

+	    $nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));

+	    $head[$h][0] = DOL_URL_ROOT.'/resource/contact.php?id='.$object->id;

@@ -48,3 +48 @@
-		if ($nbContact > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';

-		}

+		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';

@@ -59 +57 @@
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'resource', 'add', 'core');

+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'resource');

@@ -61 +59,2 @@
-	if (!getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {

+	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))

+	{

@@ -63,6 +62,2 @@
-		if (!empty($object->note_private)) {

-			$nbNote++;

-		}

-		if (!empty($object->note_public)) {

-			$nbNote++;

-		}

+		if (!empty($object->note_private)) $nbNote++;

+		if (!empty($object->note_public)) $nbNote++;

@@ -71,3 +66 @@
-		if ($nbNote > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

-		}

+		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

@@ -83,3 +76 @@
-	if ($nbFiles > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbFiles.'</span>';

-	}

+	if ($nbFiles > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbFiles.'</span>';

@@ -91 +82,2 @@
-	if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {

+	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))

+	{

@@ -102,2 +93,0 @@
-

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'resource', 'add', 'external');

@@ -117 +106,0 @@
-	global $conf, $db, $langs, $user;

@@ -119,2 +108 @@
-	$extrafields = new ExtraFields($db);

-	$extrafields->fetch_name_optionals_label('resource');

+	global $langs, $conf, $user;

@@ -138,4 +125,0 @@
-	$nbExtrafields = $extrafields->attributes['resource']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_salaries.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_salaries.lib.php
@@ -5,2 +4,0 @@
- * Copyright (C) 2021		Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>

- * Copyright (C) 2023       Frédéric France         <frederic.france@netlogic.fr>

@@ -32 +29,0 @@
-	global $db, $langs, $conf;

@@ -34,2 +31 @@
-	$h = 0;

-	$head = array();

+    global $db, $langs, $conf;

@@ -37,4 +33,2 @@
-	$head[$h][0] = DOL_URL_ROOT.'/salaries/card.php?id='.$object->id;

-	$head[$h][1] = $langs->trans("Salary");

-	$head[$h][2] = 'card';

-	$h++;

+    $h = 0;

+    $head = array();

@@ -42,24 +36,4 @@
-	if (isModEnabled('paymentbybanktransfer')) {

-		$nbStandingOrders = 0;

-		$sql = "SELECT COUNT(pfd.rowid) as nb";

-		$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_demande as pfd";

-		$sql .= " WHERE pfd.fk_salary = ".((int) $object->id);

-		$sql .= " AND type = 'ban'";

-		$resql = $db->query($sql);

-		if ($resql) {

-			$obj = $db->fetch_object($resql);

-			if ($obj) {

-				$nbStandingOrders = $obj->nb;

-			}

-		} else {

-			dol_print_error($db);

-		}

-		$langs->load("banks");

-		$head[$h][0] = DOL_URL_ROOT.'/salaries/virement_request.php?id='.$object->id.'&type=bank-transfer';

-		$head[$h][1] = $langs->trans('BankTransfer');

-		if ($nbStandingOrders > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbStandingOrders.'</span>';

-		}

-		$head[$h][2] = 'request_virement';

-		$h++;

-	}

+    $head[$h][0] = DOL_URL_ROOT.'/salaries/card.php?id='.$object->id;

+    $head[$h][1] = $langs->trans("SalaryPayment");

+    $head[$h][2] = 'card';

+    $h++;

@@ -67,5 +41,5 @@
-	// Show more tabs from modules

-	// Entries must be declared in modules descriptor with line

-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname);   												to remove a tab

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'salaries', 'add', 'core');

+    // Show more tabs from modules

+    // Entries must be declared in modules descriptor with line

+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

+    // $this->tabs = array('entity:-tabname);   												to remove a tab

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'salaries');

@@ -73,12 +47,10 @@
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

-	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

-	$upload_dir = $conf->salaries->dir_output."/".dol_sanitizeFileName($object->ref);

-	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));

-	$nbLinks = Link::count($db, $object->element, $object->id);

-	$head[$h][0] = DOL_URL_ROOT.'/salaries/document.php?id='.$object->id;

-	$head[$h][1] = $langs->trans('Documents');

-	if (($nbFiles + $nbLinks) > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

-	}

-	$head[$h][2] = 'documents';

-	$h++;

+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

+    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

+    $upload_dir = $conf->salaries->dir_output."/".dol_sanitizeFileName($object->ref);

+    $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));

+    $nbLinks = Link::count($db, $object->element, $object->id);

+    $head[$h][0] = DOL_URL_ROOT.'/salaries/document.php?id='.$object->id;

+    $head[$h][1] = $langs->trans('Documents');

+    if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge ">'.($nbFiles + $nbLinks).'</span>';

+    $head[$h][2] = 'documents';

+    $h++;

@@ -86,4 +58,4 @@
-	$head[$h][0] = DOL_URL_ROOT.'/salaries/info.php?id='.$object->id;

-	$head[$h][1] = $langs->trans("Info");

-	$head[$h][2] = 'info';

-	$h++;

+    $head[$h][0] = DOL_URL_ROOT.'/salaries/info.php?id='.$object->id;

+    $head[$h][1] = $langs->trans("Info");

+    $head[$h][2] = 'info';

+    $h++;

@@ -91 +63 @@
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'salaries', 'add', 'external');

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'salaries', 'remove');

@@ -93,3 +65 @@
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'salaries', 'remove');

-

-	return $head;

+    return $head;

@@ -105 +75 @@
-	global $conf, $db, $langs, $user;

+    global $langs, $conf, $user;

@@ -107,2 +77,2 @@
-	$extrafields = new ExtraFields($db);

-	$extrafields->fetch_name_optionals_label('salary');

+    $h = 0;

+    $head = array();

@@ -110,2 +80,4 @@
-	$h = 0;

-	$head = array();

+    $head[$h][0] = DOL_URL_ROOT.'/salaries/admin/salaries.php';

+    $head[$h][1] = $langs->trans("Miscellaneous");

+    $head[$h][2] = 'general';

+    $h++;

@@ -113,4 +85,5 @@
-	$head[$h][0] = DOL_URL_ROOT.'/salaries/admin/salaries.php';

-	$head[$h][1] = $langs->trans("Miscellaneous");

-	$head[$h][2] = 'general';

-	$h++;

+    // Show more tabs from modules

+    // Entries must be declared in modules descriptor with line

+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

+    // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab

+    complete_head_from_modules($conf, $langs, '', $head, $h, 'salaries_admin');

@@ -118,5 +91,4 @@
-	// Show more tabs from modules

-	// Entries must be declared in modules descriptor with line

-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab

-	complete_head_from_modules($conf, $langs, null, $head, $h, 'salaries_admin');

+    $head[$h][0] = DOL_URL_ROOT.'/salaries/admin/salaries_extrafields.php';

+    $head[$h][1] = $langs->trans("ExtraFieldsSalaries");

+    $head[$h][2] = 'attributes';

+    $h++;

@@ -124,8 +96 @@
-	$head[$h][0] = DOL_URL_ROOT.'/salaries/admin/salaries_extrafields.php';

-	$head[$h][1] = $langs->trans("ExtraFieldsSalaries");

-	$nbExtrafields = $extrafields->attributes['salary']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

-	$head[$h][2] = 'attributes';

-	$h++;

+    complete_head_from_modules($conf, $langs, '', $head, $h, 'salaries_admin', 'remove');

@@ -133,3 +98 @@
-	complete_head_from_modules($conf, $langs, null, $head, $h, 'salaries_admin', 'remove');

-

-	return $head;

+    return $head;

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_security.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_security.lib.php
@@ -2,3 +2,2 @@
-/* Copyright (C) 2008-2021 Laurent Destailleur  <eldy@users.sourceforge.net>

- * Copyright (C) 2008-2021 Regis Houssin        <regis.houssin@inodbox.com>

- * Copyright (C) 2020	   Ferran Marcet        <fmarcet@2byte.es>

+/* Copyright (C) 2008-2011 Laurent Destailleur  <eldy@users.sourceforge.net>

+ * Copyright (C) 2008-2017 Regis Houssin        <regis.houssin@inodbox.com>

@@ -40 +39,2 @@
-	if (is_numeric($key) && $key == '1') {	// rule 1 is offset of 17 for char

+	if (is_numeric($key) && $key == '1')	// rule 1 is offset of 17 for char

+	{

@@ -43 +43,2 @@
-		for ($i = 0; $i < $strlength; $i++) {

+		for ($i = 0; $i < $strlength; $i++)

+		{

@@ -47 +48,3 @@
-	} elseif ($key) {

+	}

+	elseif ($key)

+	{

@@ -50 +53,2 @@
-		for ($i = 0; $i < $strlength; $i++) {

+		for ($i = 0; $i < $strlength; $i++)

+		{

@@ -73 +77,2 @@
-	if (is_numeric($key) && $key == '1') {	// rule 1 is offset of 17 for char

+	if (is_numeric($key) && $key == '1')	// rule 1 is offset of 17 for char

+	{

@@ -76 +81,2 @@
-		for ($i = 0; $i < $strlength; $i++) {

+		for ($i = 0; $i < $strlength; $i++)

+		{

@@ -81 +87,3 @@
-	} elseif ($key) {

+	}

+	elseif ($key)

+	{

@@ -84 +92,2 @@
-		for ($i = 0; $i < $strlength; $i++) {

+		for ($i = 0; $i < $strlength; $i++)

+		{

@@ -93,0 +103 @@
+

@@ -95,28 +105,10 @@
- * Return a string of random bytes (hexa string) with length = $length fro cryptographic purposes.

- *

- * @param 	int			$length		Length of random string

- * @return	string					Random string

- */

-function dolGetRandomBytes($length)

-{

-	if (function_exists('random_bytes')) {	// Available with PHP 7 only.

-		return bin2hex(random_bytes((int) floor($length / 2)));	// the bin2hex will double the number of bytes so we take length / 2

-	}

-

-	return bin2hex(openssl_random_pseudo_bytes((int) floor($length / 2)));		// the bin2hex will double the number of bytes so we take length / 2. May be very slow on Windows.

-}

-

-/**

- *	Encode a string with a symetric encryption. Used to encrypt sensitive data into database.

- *  Note: If a backup is restored onto another instance with a different $conf->file->instance_unique_id, then decoded value will differ.

- *  This function is called for example by dol_set_const() when saving a sensible data into database configuration table llx_const.

- *

- *	@param   string		$chain		String to encode

- *	@param   string		$key		If '', we use $conf->file->instance_unique_id (so $dolibarr_main_instance_unique_id in conf.php)

- *  @param	 string		$ciphering	Default ciphering algorithm

- *  @param	 string		$forceseed	To force the seed

- *	@return  string					encoded string

- *  @since v17

- *  @see dolDecrypt(), dol_hash()

- */

-function dolEncrypt($chain, $key = '', $ciphering = 'AES-256-CTR', $forceseed = '')

+ * 	Returns a hash of a string.

+ *  If constant MAIN_SECURITY_HASH_ALGO is defined, we use this function as hashing function (recommanded value is 'password_hash')

+ *  If constant MAIN_SECURITY_SALT is defined, we use it as a salt (used only if hashing algorightm is something else than 'password_hash').

+ *

+ * 	@param 		string		$chain		String to hash

+ * 	@param		string		$type		Type of hash ('0':auto will use MAIN_SECURITY_HASH_ALGO else md5, '1':sha1, '2':sha1+md5, '3':md5, '4':md5 for OpenLdap with no salt, '5':sha256). Use '3' here, if hash is not needed for security purpose, for security need, prefer '0'.

+ * 	@return		string					Hash of string

+ *  @see getRandomPassword()

+ */

+function dol_hash($chain, $type = '0')

@@ -125,113 +117 @@
-	global $dolibarr_disable_dolcrypt_for_debug;

-

-	if ($chain === '' || is_null($chain)) {

-		return '';

-	}

-

-	$reg = array();

-	if (preg_match('/^dolcrypt:([^:]+):(.+)$/', $chain, $reg)) {

-		// The $chain is already a crypted string

-		return $chain;

-	}

-

-	if (empty($key)) {

-		$key = $conf->file->instance_unique_id;

-	}

-	if (empty($ciphering)) {

-		$ciphering = 'AES-256-CTR';

-	}

-

-	$newchain = $chain;

-

-	if (function_exists('openssl_encrypt') && empty($dolibarr_disable_dolcrypt_for_debug)) {

-		if (empty($key)) {

-			return $chain;

-		}

-

-		$ivlen = 16;

-		if (function_exists('openssl_cipher_iv_length')) {

-			$ivlen = openssl_cipher_iv_length($ciphering);

-		}

-		if ($ivlen === false || $ivlen < 1 || $ivlen > 32) {

-			$ivlen = 16;

-		}

-		if (empty($forceseed)) {

-			$ivseed = dolGetRandomBytes($ivlen);

-		} else {

-			$ivseed = dol_substr(md5($forceseed), 0, $ivlen, 'ascii', 1);

-		}

-

-		$newchain = openssl_encrypt($chain, $ciphering, $key, 0, $ivseed);

-		return 'dolcrypt:'.$ciphering.':'.$ivseed.':'.$newchain;

-	} else {

-		return $chain;

-	}

-}

-

-/**

- *	Decode a string with a symetric encryption. Used to decrypt sensitive data saved into database.

- *  Note: If a backup is restored onto another instance with a different $conf->file->instance_unique_id, then decoded value will differ.

- *

- *	@param   string		$chain		string to decode

- *	@param   string		$key		If '', we use $conf->file->instance_unique_id

- *	@return  string					encoded string

- *  @since v17

- *  @see dolEncrypt(), dol_hash()

- */

-function dolDecrypt($chain, $key = '')

-{

-	global $conf;

-

-	if ($chain === '' || is_null($chain)) {

-		return '';

-	}

-

-	if (empty($key)) {

-		if (!empty($conf->file->dolcrypt_key)) {

-			// If dolcrypt_key is defined, we used it in priority

-			$key = $conf->file->dolcrypt_key;

-		} else {

-			// We fall back on the instance_unique_id

-			$key = $conf->file->instance_unique_id;

-		}

-	}

-

-	//var_dump('key='.$key);

-	$reg = array();

-	if (preg_match('/^dolcrypt:([^:]+):(.+)$/', $chain, $reg)) {

-		$ciphering = $reg[1];

-		if (function_exists('openssl_decrypt')) {

-			if (empty($key)) {

-				dol_syslog("Error dolDecrypt decrypt key is empty", LOG_WARNING);

-				return $chain;

-			}

-			$tmpexplode = explode(':', $reg[2]);

-			if (!empty($tmpexplode[1]) && is_string($tmpexplode[0])) {

-				$newchain = openssl_decrypt($tmpexplode[1], $ciphering, $key, 0, $tmpexplode[0]);

-			} else {

-				$newchain = openssl_decrypt($tmpexplode[0], $ciphering, $key, 0, null);

-			}

-		} else {

-			dol_syslog("Error dolDecrypt openssl_decrypt is not available", LOG_ERR);

-			return $chain;

-		}

-		return $newchain;

-	} else {

-		return $chain;

-	}

-}

-

-/**

- * 	Returns a hash (non reversible encryption) of a string.

- *  If constant MAIN_SECURITY_HASH_ALGO is defined, we use this function as hashing function (recommanded value is 'password_hash')

- *  If constant MAIN_SECURITY_SALT is defined, we use it as a salt (used only if hashing algorightm is something else than 'password_hash').

- *

- * 	@param 		string		$chain		String to hash

- * 	@param		string		$type		Type of hash ('0':auto will use MAIN_SECURITY_HASH_ALGO else md5, '1':sha1, '2':sha1+md5, '3':md5, '4': for OpenLdap, '5':sha256, '6':password_hash).

- * 										Use 'md5' if hash is not needed for security purpose. For security need, prefer 'auto'.

- * 	@param 		string		$nosalt		Do not include any salt

- * 	@return		string					Hash of string

- *  @see getRandomPassword(), dol_verifyHash()

- */

-function dol_hash($chain, $type = '0', $nosalt = 0)

-{

+

@@ -239 +119,2 @@
-	if (($type == '0' || $type == 'auto') && getDolGlobalString('MAIN_SECURITY_HASH_ALGO') && getDolGlobalString('MAIN_SECURITY_HASH_ALGO') == 'password_hash' && function_exists('password_hash')) {

+	if (($type == '0' || $type == 'auto') && !empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'password_hash' && function_exists('password_hash'))

+	{

@@ -244,21 +125,9 @@
-	if (getDolGlobalString('MAIN_SECURITY_SALT') && $type != '4' && $type !== 'openldap' && empty($nosalt)) {

-		$chain = getDolGlobalString('MAIN_SECURITY_SALT') . $chain;

-	}

-

-	if ($type == '1' || $type == 'sha1') {

-		return sha1($chain);

-	} elseif ($type == '2' || $type == 'sha1md5') {

-		return sha1(md5($chain));

-	} elseif ($type == '3' || $type == 'md5') {		// For hashing with no need of security

-		return md5($chain);

-	} elseif ($type == '4' || $type == 'openldap') {

-		return dolGetLdapPasswordHash($chain, getDolGlobalString('LDAP_PASSWORD_HASH_TYPE', 'md5'));

-	} elseif ($type == '5' || $type == 'sha256') {

-		return hash('sha256', $chain);

-	} elseif ($type == '6' || $type == 'password_hash') {

-		return password_hash($chain, PASSWORD_DEFAULT);

-	} elseif (getDolGlobalString('MAIN_SECURITY_HASH_ALGO') == 'sha1') {

-		return sha1($chain);

-	} elseif (getDolGlobalString('MAIN_SECURITY_HASH_ALGO') == 'sha1md5') {

-		return sha1(md5($chain));

-	}

+	if (!empty($conf->global->MAIN_SECURITY_SALT) && $type != '4' && $type !== 'md5openldap') $chain = $conf->global->MAIN_SECURITY_SALT.$chain;

+

+	if ($type == '1' || $type == 'sha1') return sha1($chain);

+	elseif ($type == '2' || $type == 'sha1md5') return sha1(md5($chain));

+	elseif ($type == '3' || $type == 'md5') return md5($chain);

+	elseif ($type == '4' || $type == 'md5openldap') return '{md5}'.base64_encode(mhash(MHASH_MD5, $chain)); // For OpenLdap with md5 (based on an unencrypted password in base)

+	elseif ($type == '5') return hash('sha256', $chain);

+	elseif (!empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1') return sha1($chain);

+	elseif (!empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1md5') return sha1(md5($chain));

@@ -278 +147 @@
- * 	@param		string		$type		Type of hash ('0':auto, '1':sha1, '2':sha1+md5, '3':md5, '4': for OpenLdap, '5':sha256). Use '3' here, if hash is not needed for security purpose, for security need, prefer '0'.

+ * 	@param		string		$type		Type of hash ('0':auto, '1':sha1, '2':sha1+md5, '3':md5, '4':md5 for OpenLdap, '5':sha256). Use '3' here, if hash is not needed for security purpose, for security need, prefer '0'.

@@ -280 +148,0 @@
- *  @see dol_hash()

@@ -284,8 +152,6 @@
-	if ($type == '0' && getDolGlobalString('MAIN_SECURITY_HASH_ALGO') && getDolGlobalString('MAIN_SECURITY_HASH_ALGO') == 'password_hash' && function_exists('password_verify')) {

-		if (! empty($hash[0]) && $hash[0] == '$') {

-			return password_verify($chain, $hash);

-		} elseif (dol_strlen($hash) == 32) {

-			return dol_verifyHash($chain, $hash, '3'); // md5

-		} elseif (dol_strlen($hash) == 40) {

-			return dol_verifyHash($chain, $hash, '2'); // sha1md5

-		}

+	global $conf;

+

+	if ($type == '0' && !empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'password_hash' && function_exists('password_verify')) {

+		if ($hash[0] == '$') return password_verify($chain, $hash);

+		elseif (strlen($hash) == 32) return dol_verifyHash($chain, $hash, '3'); // md5

+		elseif (strlen($hash) == 40) return dol_verifyHash($chain, $hash, '2'); // sha1md5

@@ -299,44 +164,0 @@
-/**

- * 	Returns a specific ldap hash of a password.

- *

- * 	@param 		string		$password	Password to hash

- * 	@param		string		$type		Type of hash

- * 	@return		string					Hash of password

- */

-function dolGetLdapPasswordHash($password, $type = 'md5')

-{

-	if (empty($type)) {

-		$type = 'md5';

-	}

-

-	$salt = substr(sha1(time()), 0, 8);

-

-	if ($type === 'md5') {

-		return '{MD5}' . base64_encode(hash("md5", $password, true)); //For OpenLdap with md5 (based on an unencrypted password in base)

-	} elseif ($type === 'md5frommd5') {

-		return '{MD5}' . base64_encode(hex2bin($password)); // Create OpenLDAP MD5 password from Dolibarr MD5 password

-	} elseif ($type === 'smd5') {

-		return "{SMD5}" . base64_encode(hash("md5", $password . $salt, true) . $salt);

-	} elseif ($type === 'sha') {

-		return '{SHA}' . base64_encode(hash("sha1", $password, true));

-	} elseif ($type === 'ssha') {

-		return "{SSHA}" . base64_encode(hash("sha1", $password . $salt, true) . $salt);

-	} elseif ($type === 'sha256') {

-		return "{SHA256}" . base64_encode(hash("sha256", $password, true));

-	} elseif ($type === 'ssha256') {

-		return "{SSHA256}" . base64_encode(hash("sha256", $password . $salt, true) . $salt);

-	} elseif ($type === 'sha384') {

-		return "{SHA384}" . base64_encode(hash("sha384", $password, true));

-	} elseif ($type === 'ssha384') {

-		return "{SSHA384}" . base64_encode(hash("sha384", $password . $salt, true) . $salt);

-	} elseif ($type === 'sha512') {

-		return "{SHA512}" . base64_encode(hash("sha512", $password, true));

-	} elseif ($type === 'ssha512') {

-		return "{SSHA512}" . base64_encode(hash("sha512", $password . $salt, true) . $salt);

-	} elseif ($type === 'crypt') {

-		return '{CRYPT}' . crypt($password, $salt);

-	} elseif ($type === 'clear') {

-		return '{CLEAR}' . $password;  // Just for test, plain text password is not secured !

-	}

-	return "";

-}

@@ -347,18 +169,13 @@
- *  This method check permission on module then call checkUserAccessToObject() for permission on object (according to entity and socid of user).

- *

- *	@param	User				$user      	  	User to check

- *	@param  string				$features	    Features to check (it must be module name or $object->element. Can be a 'or' check with 'levela|levelb'.

- *												Examples: 'societe', 'contact', 'produit&service', 'produit|service', ...)

- *												This is used to check permission $user->rights->features->...

- *	@param  int|string|Object	$object      	Object or Object ID or list of Object ID if we want to check a particular record (optional) is linked to a owned thirdparty (optional).

- *	@param  string				$tableandshare  'TableName&SharedElement' with Tablename is table where object is stored. SharedElement is an optional key to define where to check entity for multicompany module. Param not used if objectid is null (optional).

- *	@param  string				$feature2		Feature to check, second level of permission (optional). Can be a 'or' check with 'sublevela|sublevelb'.

- *												This is used to check permission $user->rights->features->feature2...

- *  @param  string				$dbt_keyfield   Field name for socid foreign key if not fk_soc. Not used if objectid is null (optional). Can use '' if NA.

- *  @param  string				$dbt_select     Field rowid name, for select into tableandshare if not "rowid". Not used if objectid is null (optional)

- *  @param	int					$isdraft		1=The object with id=$objectid is a draft

- *  @param	int					$mode			Mode (0=default, 1=return without dieing)

- * 	@return	int									If mode = 0 (default): Always 1, die process if not allowed. If mode = 1: Return 0 if access not allowed.

- *  @see dol_check_secure_access_document(), checkUserAccessToObject()

- */

-function restrictedArea(User $user, $features, $object = 0, $tableandshare = '', $feature2 = '', $dbt_keyfield = 'fk_soc', $dbt_select = 'rowid', $isdraft = 0, $mode = 0)

+ *

+ *	@param	User	$user      	  	User to check

+ *	@param  string	$features	    Features to check (it must be module $object->element. Examples: 'societe', 'contact', 'produit&service', 'produit|service', ...)

+ *	@param  int		$objectid      	Object ID if we want to check a particular record (optional) is linked to a owned thirdparty (optional).

+ *	@param  string	$tableandshare  'TableName&SharedElement' with Tablename is table where object is stored. SharedElement is an optional key to define where to check entity for multicompany modume. Param not used if objectid is null (optional).

+ *	@param  string	$feature2		Feature to check, second level of permission (optional). Can be a 'or' check with 'sublevela|sublevelb'.

+ *  @param  string	$dbt_keyfield   Field name for socid foreign key if not fk_soc. Not used if objectid is null (optional)

+ *  @param  string	$dbt_select     Field name for select if not rowid. Not used if objectid is null (optional)

+ *  @param	int		$isdraft		1=The object with id=$objectid is a draft

+ * 	@return	int						Always 1, die process if not allowed

+ *  @see dol_check_secure_access_document()

+ */

+function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $feature2 = '', $dbt_keyfield = 'fk_soc', $dbt_select = 'rowid', $isdraft = 0)

@@ -366 +183 @@
-	global $conf;

+	global $db, $conf;

@@ -369,80 +186,9 @@
-	// Define $objectid

-	if (is_object($object)) {

-		$objectid = $object->id;

-	} else {

-		$objectid = $object;		// $objectid can be X or 'X,Y,Z'

-	}

-	if ($objectid == "-1") {

-		$objectid = 0;

-	}

-	if ($objectid) {

-		$objectid = preg_replace('/[^0-9\.\,]/', '', $objectid);	// For the case value is coming from a non sanitized user input

-	}

-

-	//dol_syslog("functions.lib:restrictedArea $feature, $objectid, $dbtablename, $feature2, $dbt_socfield, $dbt_select, $isdraft");

-	/*print "user_id=".$user->id.", features=".$features.", feature2=".$feature2.", objectid=".$objectid;

-	print ", dbtablename=".$tableandshare.", dbt_socfield=".$dbt_keyfield.", dbt_select=".$dbt_select;

-	print ", perm: user->hasRight(".$features.($feature2 ? ",".$feature2 : "").", lire) = ".($feature2 ? $user->hasRight($features, $feature2, 'lire') : $user->hasRight($features, 'lire'))."<br>";

-	*/

-

-	$parentfortableentity = '';

-

-	// Fix syntax of $features param to support non standard module names.

-	$originalfeatures = $features;

-	if ($features == 'agenda') {

-		$tableandshare = 'actioncomm&societe';

-		$feature2 = 'myactions|allactions';

-		$dbt_select = 'id';

-	}

-	if ($features == 'bank') {

-		$features = 'banque';

-	}

-	if ($features == 'facturerec') {

-		$features = 'facture';

-	}

-	if ($features == 'supplier_invoicerec') {

-		$features = 'fournisseur';

-		$feature2 = 'facture';

-	}

-	if ($features == 'mo') {

-		$features = 'mrp';

-	}

-	if ($features == 'member') {

-		$features = 'adherent';

-	}

-	if ($features == 'subscription') {

-		$features = 'adherent';

-		$feature2 = 'cotisation';

-	}

-	if ($features == 'website' && is_object($object) && $object->element == 'websitepage') {

-		$parentfortableentity = 'fk_website@website';

-	}

-	if ($features == 'project') {

-		$features = 'projet';

-	}

-	if ($features == 'product') {

-		$features = 'produit';

-	}

-	if ($features == 'productbatch') {

-		$features = 'produit';

-	}

-	if ($features == 'tax') {

-		$feature2 = 'charges';

-	}

-	if ($features == 'workstation') {

-		$feature2 = 'workstation';

-	}

-	if ($features == 'fournisseur') {	// When vendor invoice and purchase order are into module 'fournisseur'

-		$features = 'fournisseur';

-		if (is_object($object) && $object->element == 'invoice_supplier') {

-			$feature2 = 'facture';

-		} elseif (is_object($object) && $object->element == 'order_supplier') {

-			$feature2 = 'commande';

-		}

-	}

-	if ($features == 'payment_sc') {

-		$tableandshare = 'paiementcharge';

-		$parentfortableentity = 'fk_charge@chargesociales';

-	}

-

-	//print $features.' - '.$tableandshare.' - '.$feature2.' - '.$dbt_select."\n";

+	//dol_syslog("functions.lib:restrictedArea $feature, $objectid, $dbtablename,$feature2,$dbt_socfield,$dbt_select");

+	//print "user_id=".$user->id.", features=".$features.", feature2=".$feature2.", objectid=".$objectid;

+	//print ", dbtablename=".$dbtablename.", dbt_socfield=".$dbt_keyfield.", dbt_select=".$dbt_select;

+	//print ", perm: ".$features."->".$feature2."=".($user->rights->$features->$feature2->lire)."<br>";

+

+	if ($features == 'facturerec') $features = 'facture';

+	if ($features == 'mo') $features = 'mrp';

+	if ($features == 'member') $features = 'adherent';

+	if ($features == 'subscription') { $features = 'adherent'; $feature2 = 'cotisation'; };

@@ -451,17 +197,11 @@
-	$parameters = array('features'=>$features, 'originalfeatures'=>$originalfeatures, 'objectid'=>$objectid, 'dbt_select'=>$dbt_select, 'idtype'=>$dbt_select, 'isdraft'=>$isdraft);

-	if (!empty($hookmanager)) {

-		$reshook = $hookmanager->executeHooks('restrictedArea', $parameters);

-

-		if (isset($hookmanager->resArray['result'])) {

-			if ($hookmanager->resArray['result'] == 0) {

-				if ($mode) {

-					return 0;

-				} else {

-					accessforbidden(); // Module returns 0, so access forbidden

-				}

-			}

-		}

-		if ($reshook > 0) {		// No other test done.

-			return 1;

-		}

-	}

+	$parameters = array('features'=>$features, 'objectid'=>$objectid, 'idtype'=>$dbt_select);

+	$reshook = $hookmanager->executeHooks('restrictedArea', $parameters);

+

+	if (isset($hookmanager->resArray['result'])) {

+		if ($hookmanager->resArray['result'] == 0) accessforbidden(); // Module returns 0, so access forbidden

+	}

+	if ($reshook > 0) {		// No other test done.

+		return 1;

+	}

+

+	if ($dbt_select != 'rowid' && $dbt_select != 'id') $objectid = "'".$objectid."'";

@@ -471,5 +211,2 @@
-	if (preg_match('/&/', $features)) {

-		$featuresarray = explode("&", $features);

-	} elseif (preg_match('/\|/', $features)) {

-		$featuresarray = explode("|", $features);

-	}

+	if (preg_match('/&/', $features)) $featuresarray = explode("&", $features);

+	elseif (preg_match('/\|/', $features)) $featuresarray = explode("|", $features);

@@ -478,5 +215,8 @@
-	if (!empty($feature2)) {

-		$feature2 = explode("|", $feature2);

-	}

-

-	$listofmodules = explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL'));

+	if (!empty($feature2)) $feature2 = explode("|", $feature2);

+

+	// More parameters

+	$params = explode('&', $tableandshare);

+	$dbtablename = (!empty($params[0]) ? $params[0] : '');

+	$sharedelement = (!empty($params[1]) ? $params[1] : $dbtablename);

+

+	$listofmodules = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);

@@ -485,2 +225 @@
-	$readok = 1;

-	$nbko = 0;

+	$readok = 1; $nbko = 0;

@@ -489,9 +228,3 @@
-		if ($featureforlistofmodule == 'produit') {

-			$featureforlistofmodule = 'product';

-		}

-		if ($featureforlistofmodule == 'supplier_proposal') {

-			$featureforlistofmodule = 'supplierproposal';

-		}

-		if (!empty($user->socid) && getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL') && !in_array($featureforlistofmodule, $listofmodules)) {	// If limits on modules for external users, module must be into list of modules for external users

-			$readok = 0;

-			$nbko++;

+		if ($featureforlistofmodule == 'produit') $featureforlistofmodule = 'product';

+		if (!empty($user->socid) && !empty($conf->global->MAIN_MODULES_FOR_EXTERNAL) && !in_array($featureforlistofmodule, $listofmodules)) {	// If limits on modules for external users, module must be into list of modules for external users

+			$readok = 0; $nbko++;

@@ -501,10 +234,4 @@
-		if ($feature == 'societe' && (empty($feature2) || !in_array('contact', $feature2))) {

-			if (!$user->hasRight('societe', 'lire') && !$user->hasRight('fournisseur', 'lire')) {

-				$readok = 0;

-				$nbko++;

-			}

-		} elseif (($feature == 'societe' && (!empty($feature2) && in_array('contact', $feature2))) || $feature == 'contact') {

-			if (!$user->hasRight('societe', 'contact', 'lire')) {

-				$readok = 0;

-				$nbko++;

-			}

+		if ($feature == 'societe') {

+			if (!$user->rights->societe->lire && !$user->rights->fournisseur->lire) { $readok = 0; $nbko++; }

+		} elseif ($feature == 'contact') {

+			if (!$user->rights->societe->contact->lire) { $readok = 0; $nbko++; }

@@ -512,4 +239 @@
-			if (!$user->hasRight('produit', 'lire') && !$user->hasRight('service', 'lire')) {

-				$readok = 0;

-				$nbko++;

-			}

+			if (!$user->rights->produit->lire && !$user->rights->service->lire) { $readok = 0; $nbko++; }

@@ -517,4 +241 @@
-			if (!$user->hasRight('prelevement', 'bons', 'lire')) {

-				$readok = 0;

-				$nbko++;

-			}

+			if (!$user->rights->prelevement->bons->lire) { $readok = 0; $nbko++; }

@@ -522,4 +243 @@
-			if (!$user->hasRight('banque', 'cheque')) {

-				$readok = 0;

-				$nbko++;

-			}

+			if (!$user->rights->banque->cheque) { $readok = 0; $nbko++; }

@@ -527,20 +245,2 @@
-			if (!$user->hasRight('projet', 'lire') && !$user->hasRight('projet', 'all', 'lire')) {

-				$readok = 0;

-				$nbko++;

-			}

-		} elseif ($feature == 'payment') {

-			if (!$user->hasRight('facture', 'lire')) {

-				$readok = 0;

-				$nbko++;

-			}

-		} elseif ($feature == 'payment_supplier') {

-			if (!$user->hasRight('fournisseur', 'facture', 'lire')) {

-				$readok = 0;

-				$nbko++;

-			}

-		} elseif ($feature == 'payment_sc') {

-			if (!$user->hasRight('tax', 'charges', 'lire')) {

-				$readok = 0;

-				$nbko++;

-			}

-		} elseif (!empty($feature2)) { 													// This is for permissions on 2 levels (module->object->read)

+			if (!$user->rights->projet->lire && !$user->rights->projet->all->lire) { $readok = 0; $nbko++; }

+		} elseif (!empty($feature2)) { 													// This is for permissions on 2 levels

@@ -549,16 +249,4 @@
-				if ($subfeature == 'user' && $user->id == $objectid) {

-					continue; // A user can always read its own card

-				}

-				if ($subfeature == 'fiscalyear' && $user->hasRight('accounting', 'fiscalyear', 'write')) {

-					// only one right for fiscalyear

-					$tmpreadok = 1;

-					continue;

-				}

-				if (!empty($subfeature) && !$user->hasRight($feature, $subfeature, 'lire') && !$user->hasRight($feature, $subfeature, 'read')) {

-					$tmpreadok = 0;

-				} elseif (empty($subfeature) && !$user->hasRight($feature, 'lire') && !$user->hasRight($feature, 'read')) {

-					$tmpreadok = 0;

-				} else {

-					$tmpreadok = 1;

-					break;

-				} // Break is to bypass second test if the first is ok

+				if ($subfeature == 'user' && $user->id == $objectid) continue; // A user can always read its own card

+				if (!empty($subfeature) && empty($user->rights->$feature->$subfeature->lire) && empty($user->rights->$feature->$subfeature->read)) { $tmpreadok = 0; }

+				elseif (empty($subfeature) && empty($user->rights->$feature->lire) && empty($user->rights->$feature->read)) { $tmpreadok = 0; }

+				else { $tmpreadok = 1; break; } // Break is to bypass second test if the first is ok

@@ -570,7 +258,4 @@
-		} elseif (!empty($feature) && ($feature != 'user' && $feature != 'usergroup')) {		// This is permissions on 1 level (module->read)

-			if (!$user->hasRight($feature, 'lire')

-				&& !$user->hasRight($feature, 'read')

-				&& !$user->hasRight($feature, 'run')) {

-				$readok = 0;

-				$nbko++;

-			}

+		} elseif (!empty($feature) && ($feature != 'user' && $feature != 'usergroup')) {		// This is permissions on 1 level

+			if (empty($user->rights->$feature->lire)

+				&& empty($user->rights->$feature->read)

+				&& empty($user->rights->$feature->run)) { $readok = 0; $nbko++; }

@@ -581,11 +266,3 @@
-	if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) {

-		$readok = 1;

-	}

-

-	if (!$readok) {

-		if ($mode) {

-			return 0;

-		} else {

-			accessforbidden();

-		}

-	}

+	if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $readok = 1;

+

+	if (!$readok) accessforbidden();

@@ -595,3 +272,2 @@
-	$createok = 1;

-	$nbko = 0;

-	$wemustcheckpermissionforcreate = (GETPOST('sendit', 'alpha') || GETPOST('linkit', 'alpha') || in_array(GETPOST('action', 'aZ09'), array('create', 'update', 'set', 'upload', 'add_element_resource', 'confirm_deletebank', 'confirm_delete_linked_resource')) || GETPOST('roworder', 'alpha', 2));

+	$createok = 1; $nbko = 0;

+	$wemustcheckpermissionforcreate = (GETPOST('sendit', 'alpha') || GETPOST('linkit', 'alpha') || GETPOST('action', 'aZ09') == 'create' || GETPOST('action', 'aZ09') == 'update');

@@ -600,2 +276,4 @@
-	if ($wemustcheckpermissionforcreate || $wemustcheckpermissionfordeletedraft) {

-		foreach ($featuresarray as $feature) {

+	if ($wemustcheckpermissionforcreate || $wemustcheckpermissionfordeletedraft)

+	{

+		foreach ($featuresarray as $feature)

+		{

@@ -603,4 +281 @@
-				if (!$user->hasRight('societe', 'contact', 'creer')) {

-					$createok = 0;

-					$nbko++;

-				}

+				if (!$user->rights->societe->contact->creer) { $createok = 0; $nbko++; }

@@ -608,4 +283 @@
-				if (!$user->hasRight('produit', 'creer') && !$user->hasRight('service', 'creer')) {

-					$createok = 0;

-					$nbko++;

-				}

+				if (!$user->rights->produit->creer && !$user->rights->service->creer) { $createok = 0; $nbko++; }

@@ -613,4 +285 @@
-				if (!$user->hasRight('prelevement', 'bons', 'creer')) {

-					$createok = 0;

-					$nbko++;

-				}

+				if (!$user->rights->prelevement->bons->creer) { $createok = 0; $nbko++; }

@@ -618,4 +287 @@
-				if (!$user->hasRight('fournisseur', 'commande', 'creer') || !$user->hasRight('supplier_order', 'creer')) {

-					$createok = 0;

-					$nbko++;

-				}

+				if (!$user->rights->fournisseur->commande->creer) { $createok = 0; $nbko++; }

@@ -623,4 +289 @@
-				if (!$user->hasRight('banque', 'modifier')) {

-					$createok = 0;

-					$nbko++;

-				}

+				if (!$user->rights->banque->modifier) { $createok = 0; $nbko++; }

@@ -628,4 +291 @@
-				if (!$user->hasRight('banque', 'cheque')) {

-					$createok = 0;

-					$nbko++;

-				}

+				if (!$user->rights->banque->cheque) { $createok = 0; $nbko++; }

@@ -633,4 +293 @@
-				if (!$user->hasRight('import', 'run')) {

-					$createok = 0;

-					$nbko++;

-				}

+				if (!$user->rights->import->run) { $createok = 0; $nbko++; }

@@ -638,10 +295,3 @@
-				if (!$user->hasRight('ecm', 'upload')) {

-					$createok = 0;

-					$nbko++;

-				}

-			} elseif ($feature == 'modulebuilder') {

-				if (!$user->hasRight('modulebuilder', 'run')) {

-					$createok = 0;

-					$nbko++;

-				}

-			} elseif (!empty($feature2)) {													// This is for permissions on 2 levels (module->object->write)

+				if (!$user->rights->ecm->upload) { $createok = 0; $nbko++; }

+			}

+			elseif (!empty($feature2)) {														// This is for permissions on one level

@@ -649,13 +299,6 @@
-					if ($subfeature == 'user' && $user->id == $objectid && $user->hasRight('user', 'self', 'creer')) {

-						continue; // User can edit its own card

-					}

-					if ($subfeature == 'user' && $user->id == $objectid && $user->hasRight('user', 'self', 'password')) {

-						continue; // User can edit its own password

-					}

-					if ($subfeature == 'user' && $user->id != $objectid && $user->hasRight('user', 'user', 'password')) {

-						continue; // User can edit another user's password

-					}

-

-					if (!$user->hasRight($feature, $subfeature, 'creer')

-					&& !$user->hasRight($feature, $subfeature, 'write')

-					&& !$user->hasRight($feature, $subfeature, 'create')) {

+					if ($subfeature == 'user' && $user->id == $objectid && $user->rights->user->self->creer) continue; // User can edit its own card

+					if ($subfeature == 'user' && $user->id == $objectid && $user->rights->user->self->password) continue; // User can edit its own password

+

+					if (empty($user->rights->$feature->$subfeature->creer)

+					&& empty($user->rights->$feature->$subfeature->write)

+					&& empty($user->rights->$feature->$subfeature->create)) {

@@ -670 +313 @@
-			} elseif (!empty($feature)) {												// This is for permissions on 1 levels (module->write)

+			} elseif (!empty($feature))	{												// This is for permissions on 2 levels ('creer' or 'write')

@@ -672,3 +315,3 @@
-				if (!$user->hasRight($feature, 'creer')

-				&& !$user->hasRight($feature, 'write')

-				&& !$user->hasRight($feature, 'create')) {

+				if (empty($user->rights->$feature->creer)

+				&& empty($user->rights->$feature->write)

+				&& empty($user->rights->$feature->create)) {

@@ -682,11 +325,3 @@
-		if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) {

-			$createok = 1;

-		}

-

-		if ($wemustcheckpermissionforcreate && !$createok) {

-			if ($mode) {

-				return 0;

-			} else {

-				accessforbidden();

-			}

-		}

+		if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $createok = 1;

+

+		if ($wemustcheckpermissionforcreate && !$createok) accessforbidden();

@@ -698,12 +333,5 @@
-	if (GETPOST('action', 'aZ09') == 'confirm_create_user' && GETPOST("confirm", 'aZ09') == 'yes') {

-		if (!$user->hasRight('user', 'user', 'creer')) {

-			$createuserok = 0;

-		}

-

-		if (!$createuserok) {

-			if ($mode) {

-				return 0;

-			} else {

-				accessforbidden();

-			}

-		}

+	if (GETPOST('action', 'aZ09') == 'confirm_create_user' && GETPOST("confirm", 'aZ09') == 'yes')

+	{

+		if (!$user->rights->user->user->creer) $createuserok = 0;

+

+		if (!$createuserok) accessforbidden();

@@ -714,9 +342,46 @@
-	$deleteok = 1;

-	$nbko = 0;

-	if ((GETPOST("action", "aZ09") == 'confirm_delete' && GETPOST("confirm", "aZ09") == 'yes') || GETPOST("action", "aZ09") == 'delete') {

-		foreach ($featuresarray as $feature) {

-			if ($feature == 'bookmark') {

-				if (!$user->hasRight('bookmark', 'supprimer')) {

-					if ($user->id != $object->fk_user || !$user->hasRight('bookmark', 'creer')) {

-						$deleteok = 0;

-					}

+	$deleteok = 1; $nbko = 0;

+	if ((GETPOST("action", "aZ09") == 'confirm_delete' && GETPOST("confirm", "aZ09") == 'yes') || GETPOST("action", "aZ09") == 'delete')

+	{

+		foreach ($featuresarray as $feature)

+		{

+			if ($feature == 'contact')

+			{

+				if (!$user->rights->societe->contact->supprimer) $deleteok = 0;

+			}

+			elseif ($feature == 'produit|service')

+			{

+				if (!$user->rights->produit->supprimer && !$user->rights->service->supprimer) $deleteok = 0;

+			}

+			elseif ($feature == 'commande_fournisseur')

+			{

+				if (!$user->rights->fournisseur->commande->supprimer) $deleteok = 0;

+			}

+			elseif ($feature == 'banque')

+			{

+				if (!$user->rights->banque->modifier) $deleteok = 0;

+			}

+			elseif ($feature == 'cheque')

+			{

+				if (!$user->rights->banque->cheque) $deleteok = 0;

+			}

+			elseif ($feature == 'ecm')

+			{

+				if (!$user->rights->ecm->upload) $deleteok = 0;

+			}

+			elseif ($feature == 'ftp')

+			{

+				if (!$user->rights->ftp->write) $deleteok = 0;

+			}elseif ($feature == 'salaries')

+			{

+				if (!$user->rights->salaries->delete) $deleteok = 0;

+			}

+			elseif ($feature == 'salaries')

+			{

+				if (!$user->rights->salaries->delete) $deleteok = 0;

+			}

+			elseif (!empty($feature2))							// This is for permissions on 2 levels

+			{

+				foreach ($feature2 as $subfeature)

+				{

+					if (empty($user->rights->$feature->$subfeature->supprimer) && empty($user->rights->$feature->$subfeature->delete)) $deleteok = 0;

+					else { $deleteok = 1; break; } // For bypass the second test if the first is ok

@@ -724,66 +389,3 @@
-			} elseif ($feature == 'contact') {

-				if (!$user->hasRight('societe', 'contact', 'supprimer')) {

-					$deleteok = 0;

-				}

-			} elseif ($feature == 'produit|service') {

-				if (!$user->hasRight('produit', 'supprimer') && !$user->hasRight('service', 'supprimer')) {

-					$deleteok = 0;

-				}

-			} elseif ($feature == 'commande_fournisseur') {

-				if (!$user->hasRight('fournisseur', 'commande', 'supprimer')) {

-					$deleteok = 0;

-				}

-			} elseif ($feature == 'payment_supplier') {	// Permission to delete a payment of an invoice is permission to edit an invoice.

-				if (!$user->hasRight('fournisseur', 'facture', 'creer')) {

-					$deleteok = 0;

-				}

-			} elseif ($feature == 'payment') {

-				if (!$user->hasRight('facture', 'paiement')) {

-					$deleteok = 0;

-				}

-			} elseif ($feature == 'payment_sc') {

-				if (!$user->hasRight('tax', 'charges', 'creer')) {

-					$deleteok = 0;

-				}

-			} elseif ($feature == 'banque') {

-				if (!$user->hasRight('banque', 'modifier')) {

-					$deleteok = 0;

-				}

-			} elseif ($feature == 'cheque') {

-				if (!$user->hasRight('banque', 'cheque')) {

-					$deleteok = 0;

-				}

-			} elseif ($feature == 'ecm') {

-				if (!$user->hasRight('ecm', 'upload')) {

-					$deleteok = 0;

-				}

-			} elseif ($feature == 'ftp') {

-				if (!$user->hasRight('ftp', 'write')) {

-					$deleteok = 0;

-				}

-			} elseif ($feature == 'salaries') {

-				if (!$user->hasRight('salaries', 'delete')) {

-					$deleteok = 0;

-				}

-			} elseif ($feature == 'adherent') {

-				if (!$user->hasRight('adherent', 'supprimer')) {

-					$deleteok = 0;

-				}

-			} elseif ($feature == 'paymentbybanktransfer') {

-				if (!$user->hasRight('paymentbybanktransfer', 'create')) {	// There is no delete permission

-					$deleteok = 0;

-				}

-			} elseif ($feature == 'prelevement') {

-				if (!$user->hasRight('prelevement', 'bons', 'creer')) {		// There is no delete permission

-					$deleteok = 0;

-				}

-			} elseif (!empty($feature2)) {							// This is for permissions on 2 levels

-				foreach ($feature2 as $subfeature) {

-					if (!$user->hasRight($feature, $subfeature, 'supprimer') && !$user->hasRight($feature, $subfeature, 'delete')) {

-						$deleteok = 0;

-					} else {

-						$deleteok = 1;

-						break;

-					} // For bypass the second test if the first is ok

-				}

-			} elseif (!empty($feature)) {							// This is used for permissions on 1 level

+			}

+			elseif (!empty($feature))							// This is used for permissions on 1 level

+			{

@@ -791,5 +393,3 @@
-				if (!$user->hasRight($feature, 'supprimer')

-					&& !$user->hasRight($feature, 'delete')

-					&& !$user->hasRight($feature, 'run')) {

-					$deleteok = 0;

-				}

+				if (empty($user->rights->$feature->supprimer)

+					&& empty($user->rights->$feature->delete)

+					&& empty($user->rights->$feature->run)) $deleteok = 0;

@@ -800,11 +400,3 @@
-		if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) {

-			$deleteok = 1;

-		}

-

-		if (!$deleteok && !($isdraft && $createok)) {

-			if ($mode) {

-				return 0;

-			} else {

-				accessforbidden();

-			}

-		}

+		if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $deleteok = 1;

+

+		if (!$deleteok && !($isdraft && $createok)) accessforbidden();

@@ -814,4 +406,5 @@
-	// If we have a particular object to check permissions on, we check if $user has permission

-	// for this given object (link to company, is contact for project, ...)

-	if (!empty($objectid) && $objectid > 0) {

-		$ok = checkUserAccessToObject($user, $featuresarray, $object, $tableandshare, $feature2, $dbt_keyfield, $dbt_select, $parentfortableentity);

+	// If we have a particular object to check permissions on, we check this object

+	// is linked to a company allowed to $user.

+	if (!empty($objectid) && $objectid > 0)

+	{

+		$ok = checkUserAccessToObject($user, $featuresarray, $objectid, $tableandshare, $feature2, $dbt_keyfield, $dbt_select);

@@ -819,10 +412 @@
-		//print 'checkUserAccessToObject ok='.$ok;

-		if ($mode) {

-			return $ok ? 1 : 0;

-		} else {

-			if ($ok) {

-				return 1;

-			} else {

-				accessforbidden('', 1, 1, 0, $params);

-			}

-		}

+		return $ok ? 1 : accessforbidden('', 1, 1, 0, $params);

@@ -835,12 +419,11 @@
- * Check that access by a given user to an object is ok.

- * This function is also called by restrictedArea() that check before if module is enabled and if permission of user for $action is ok.

- *

- * @param 	User				$user					User to check

- * @param 	array				$featuresarray			Features/modules to check. Example: ('user','service','member','project','task',...)

- * @param 	int|string|Object	$object					Full object or object ID or list of object id. For example if we want to check a particular record (optional) is linked to a owned thirdparty (optional).

- * @param 	string				$tableandshare			'TableName&SharedElement' with Tablename is table where object is stored. SharedElement is an optional key to define where to check entity for multicompany modume. Param not used if objectid is null (optional).

- * @param 	array|string		$feature2				Feature to check, second level of permission (optional). Can be or check with 'level1|level2'.

- * @param 	string				$dbt_keyfield			Field name for socid foreign key if not fk_soc. Not used if objectid is null (optional). Can use '' if NA.

- * @param 	string				$dbt_select				Field name for select if not rowid. Not used if objectid is null (optional).

- * @param 	string				$parenttableforentity  	Parent table for entity. Example 'fk_website@website'

- * @return	bool										True if user has access, False otherwise

+ * Check access by user to object.

+ * This function is also called by restrictedArea

+ *

+ * @param User			$user			User to check

+ * @param array			$featuresarray	Features/modules to check. Example: ('user','service','member','project','task',...)

+ * @param int|string	$objectid		Object ID if we want to check a particular record (optional) is linked to a owned thirdparty (optional).

+ * @param string		$tableandshare	'TableName&SharedElement' with Tablename is table where object is stored. SharedElement is an optional key to define where to check entity for multicompany modume. Param not used if objectid is null (optional).

+ * @param string		$feature2		Feature to check, second level of permission (optional). Can be or check with 'level1|level2'.

+ * @param string		$dbt_keyfield	Field name for socid foreign key if not fk_soc. Not used if objectid is null (optional)

+ * @param string		$dbt_select		Field name for select if not rowid. Not used if objectid is null (optional)

+ * @return	bool						True if user has access, False otherwise

@@ -849 +432 @@
-function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tableandshare = '', $feature2 = '', $dbt_keyfield = '', $dbt_select = 'rowid', $parenttableforentity = '')

+function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableandshare = '', $feature2 = '', $dbt_keyfield = '', $dbt_select = 'rowid')

@@ -852,11 +434,0 @@
-

-	if (is_object($object)) {

-		$objectid = $object->id;

-	} else {

-		$objectid = $object;		// $objectid can be X or 'X,Y,Z'

-	}

-	$objectid = preg_replace('/[^0-9\.\,]/', '', $objectid);	// For the case value is coming from a non sanitized user input

-

-	//dol_syslog("functions.lib:restrictedArea $feature, $objectid, $dbtablename, $feature2, $dbt_socfield, $dbt_select, $isdraft");

-	//print "user_id=".$user->id.", features=".join(',', $featuresarray).", objectid=".$objectid;

-	//print ", tableandshare=".$tableandshare.", dbt_socfield=".$dbt_keyfield.", dbt_select=".$dbt_select."<br>";

@@ -869 +441,2 @@
-	foreach ($featuresarray as $feature) {

+	foreach ($featuresarray as $feature)

+	{

@@ -872,2 +444,0 @@
-		//var_dump($feature);exit;

-

@@ -875,31 +446,7 @@
-		if ($feature == 'societe' && !empty($feature2) && is_array($feature2) && in_array('contact', $feature2)) {

-			$feature = 'contact';

-			$feature2 = '';

-		}

-		if ($feature == 'member') {

-			$feature = 'adherent';

-		}

-		if ($feature == 'project') {

-			$feature = 'projet';

-		}

-		if ($feature == 'task') {

-			$feature = 'projet_task';

-		}

-		if ($feature == 'eventorganization') {

-			$feature = 'agenda';

-			$dbtablename = 'actioncomm';

-		}

-		if ($feature == 'payment_sc' && empty($parenttableforentity)) {

-			// If we check perm on payment page but $parenttableforentity not defined, we force value on parent table

-			$parenttableforentity = '';

-			$dbtablename = "chargesociales";

-			$feature = "chargesociales";

-			$objectid = $object->fk_charge;

-		}

-

-		$checkonentitydone = 0;

-

-		// Array to define rules of checks to do

-		$check = array('adherent', 'banque', 'bom', 'don', 'mrp', 'user', 'usergroup', 'payment', 'payment_supplier', 'payment_sc', 'product', 'produit', 'service', 'produit|service', 'categorie', 'resource', 'expensereport', 'holiday', 'salaries', 'website', 'recruitment', 'chargesociales', 'knowledgemanagement'); // Test on entity only (Objects with no link to company)

-		$checksoc = array('societe'); // Test for object Societe

-		$checkparentsoc = array('agenda', 'contact', 'contrat'); // Test on entity + link to third party on field $dbt_keyfield. Allowed if link is empty (Ex: contacts...).

+		if ($feature == 'member')  $feature = 'adherent';

+		if ($feature == 'project') $feature = 'projet';

+		if ($feature == 'task')    $feature = 'projet_task';

+

+		$check = array('adherent', 'banque', 'bom', 'don', 'mrp', 'user', 'usergroup', 'product', 'produit', 'service', 'produit|service', 'categorie', 'resource', 'expensereport', 'holiday'); // Test on entity only (Objects with no link to company)

+		$checksoc = array('societe'); // Test for societe object

+		$checkother = array('contact', 'agenda'); // Test on entity and link to third party. Allowed if link is empty (Ex: contacts...).

@@ -907,3 +454 @@
-		$checktask = array('projet_task'); // Test for task object

-		$checkhierarchy = array('expensereport', 'holiday');	// check permission among the hierarchy of user

-		$checkuser = array('bookmark');	// check permission among the fk_user (must be myself or null)

+		$checktask = array('projet_task');

@@ -911,2 +456 @@
-

-		//$checkdefault = 'all other not already defined'; // Test on entity + link to third party on field $dbt_keyfield. Not allowed if link is empty (Ex: invoice, orders...).

+		//$checkdefault = 'all other not already defined'; // Test on entity and link to third party. Not allowed if link is empty (Ex: invoice, orders...).

@@ -915 +459,2 @@
-		if (empty($dbtablename)) {

+		if (empty($dbtablename))

+		{

@@ -920,6 +465,3 @@
-		// To avoid an access forbidden with a numeric ref

-		if ($dbt_select != 'rowid' && $dbt_select != 'id') {

-			$objectid = "'".$objectid."'";	// Note: $objectid was already cast into int at begin of this method.

-		}

-		// Check permission for objectid on entity only

-		if (in_array($feature, $check) && $objectid > 0) {		// For $objectid = 0, no check

+		// Check permission for object with entity

+		if (in_array($feature, $check))

+		{

@@ -928,4 +470,7 @@
-			if (($feature == 'user' || $feature == 'usergroup') && isModEnabled('multicompany')) {	// Special for multicompany

-				if (getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')) {

-					if ($conf->entity == 1 && $user->admin && !$user->entity) {

-						$sql .= " WHERE dbt.".$dbt_select." IN (".$db->sanitize($objectid, 1).")";

+			if (($feature == 'user' || $feature == 'usergroup') && !empty($conf->multicompany->enabled))

+			{

+				if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))

+				{

+					if ($conf->entity == 1 && $user->admin && !$user->entity)

+					{

+						$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";

@@ -933 +478,3 @@
-					} else {

+					}

+					else

+					{

@@ -935 +482 @@
-						$sql .= " WHERE dbt.".$dbt_select." IN (".$db->sanitize($objectid, 1).")";

+						$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";

@@ -940,2 +487,3 @@
-				} else {

-					$sql .= " WHERE dbt.".$dbt_select." IN (".$db->sanitize($objectid, 1).")";

+				}

+				else {

+					$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";

@@ -944,14 +492,9 @@
-			} else {

-				$reg = array();

-				if ($parenttableforentity && preg_match('/(.*)@(.*)/', $parenttableforentity, $reg)) {

-					$sql .= ", ".MAIN_DB_PREFIX.$reg[2]." as dbtp";

-					$sql .= " WHERE dbt.".$reg[1]." = dbtp.rowid AND dbt.".$dbt_select." IN (".$db->sanitize($objectid, 1).")";

-					$sql .= " AND dbtp.entity IN (".getEntity($sharedelement, 1).")";

-				} else {

-					$sql .= " WHERE dbt.".$dbt_select." IN (".$db->sanitize($objectid, 1).")";

-					$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";

-				}

-			}

-			$checkonentitydone = 1;

-		}

-		if (in_array($feature, $checksoc) && $objectid > 0) {	// We check feature = checksoc. For $objectid = 0, no check

+			}

+			else

+			{

+				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";

+				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";

+			}

+		}

+		elseif (in_array($feature, $checksoc))	// We check feature = checksoc

+		{

@@ -959,6 +502,7 @@
-			if ($user->socid > 0) {

-				if ($user->socid != $objectid) {

-					return false;

-				}

-			} elseif (isModEnabled("societe") && ($user->hasRight('societe', 'lire') && !$user->hasRight('societe', 'client', 'voir'))) {

-				// If internal user: Check permission for internal users that are restricted on their objects

+			if ($user->socid > 0)

+			{

+				if ($user->socid <> $objectid) return false;

+			}

+			// If internal user: Check permission for internal users that are restricted on their objects

+			elseif (!empty($conf->societe->enabled) && ($user->rights->societe->lire && !$user->rights->societe->client->voir))

+			{

@@ -968,2 +512,2 @@
-				$sql .= " WHERE sc.fk_soc IN (".$db->sanitize($objectid, 1).")";

-				$sql .= " AND sc.fk_user = ".((int) $user->id);

+				$sql .= " WHERE sc.fk_soc IN (".$objectid.")";

+				$sql .= " AND sc.fk_user = ".$user->id;

@@ -972,2 +516,4 @@
-			} elseif (isModEnabled('multicompany')) {

-				// If multicompany and internal users with all permissions, check user is in correct entity

+			}

+			// If multicompany and internal users with all permissions, check user is in correct entity

+			elseif (!empty($conf->multicompany->enabled))

+			{

@@ -976 +522 @@
-				$sql .= " WHERE s.rowid IN (".$db->sanitize($objectid, 1).")";

+				$sql .= " WHERE s.rowid IN (".$objectid.")";

@@ -979,4 +525,3 @@
-

-			$checkonentitydone = 1;

-		}

-		if (in_array($feature, $checkparentsoc) && $objectid > 0) {	// Test on entity + link to thirdparty. Allowed if link is empty (Ex: contacts...).

+		}

+		elseif (in_array($feature, $checkother))	// Test on entity and link to societe. Allowed if link is empty (Ex: contacts...).

+		{

@@ -984 +529,2 @@
-			if ($user->socid > 0) {

+			if ($user->socid > 0)

+			{

@@ -987,4 +533,6 @@
-				$sql .= " WHERE dbt.".$dbt_select." IN (".$db->sanitize($objectid, 1).")";

-				$sql .= " AND dbt.fk_soc = ".((int) $user->socid);

-			} elseif (isModEnabled("societe") && ($user->hasRight('societe', 'lire') && !$user->hasRight('societe', 'client', 'voir'))) {

-				// If internal user: Check permission for internal users that are restricted on their objects

+				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";

+				$sql .= " AND dbt.fk_soc = ".$user->socid;

+			}

+			// If internal user: Check permission for internal users that are restricted on their objects

+			elseif (!empty($conf->societe->enabled) && ($user->rights->societe->lire && !$user->rights->societe->client->voir))

+			{

@@ -993,2 +541,2 @@
-				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON dbt.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);

-				$sql .= " WHERE dbt.".$dbt_select." IN (".$db->sanitize($objectid, 1).")";

+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON dbt.fk_soc = sc.fk_soc AND sc.fk_user = '".$user->id."'";

+				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";

@@ -997,2 +545,4 @@
-			} elseif (isModEnabled('multicompany')) {

-				// If multicompany and internal users with all permissions, check user is in correct entity

+			}

+			// If multicompany and internal users with all permissions, check user is in correct entity

+			elseif (!empty($conf->multicompany->enabled))

+			{

@@ -1001 +551 @@
-				$sql .= " WHERE dbt.".$dbt_select." IN (".$db->sanitize($objectid, 1).")";

+				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";

@@ -1004,7 +554,5 @@
-

-			$checkonentitydone = 1;

-		}

-		if (in_array($feature, $checkproject) && $objectid > 0) {

-			if (isModEnabled('project') && !$user->hasRight('projet', 'all', 'lire')) {

-				$projectid = $objectid;

-

+		}

+		elseif (in_array($feature, $checkproject))

+		{

+			if (!empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))

+			{

@@ -1014 +561,0 @@
-

@@ -1016,4 +563,4 @@
-				if (!in_array($projectid, $tmparray)) {

-					return false;

-				}

-			} else {

+				if (!in_array($objectid, $tmparray)) return false;

+			}

+			else

+			{

@@ -1022 +569 @@
-				$sql .= " WHERE dbt.".$dbt_select." IN (".$db->sanitize($objectid, 1).")";

+				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";

@@ -1025,4 +572,5 @@
-			$checkonentitydone = 1;

-		}

-		if (in_array($feature, $checktask) && $objectid > 0) {

-			if (isModEnabled('project') && !$user->hasRight('projet', 'all', 'lire')) {

+		}

+		elseif (in_array($feature, $checktask))

+		{

+			if (!empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))

+			{

@@ -1031 +578,0 @@
-				$projectid = $task->fk_project;

@@ -1036 +582,0 @@
-

@@ -1038,4 +584,4 @@
-				if (!in_array($projectid, $tmparray)) {

-					return false;

-				}

-			} else {

+				if (!in_array($task->fk_project, $tmparray)) return false;

+			}

+			else

+			{

@@ -1044 +590 @@
-				$sql .= " WHERE dbt.".$dbt_select." IN (".$db->sanitize($objectid, 1).")";

+				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";

@@ -1047,6 +593,3 @@
-

-			$checkonentitydone = 1;

-		}

-		//var_dump($sql);

-

-		if (!$checkonentitydone && !in_array($feature, $nocheck) && $objectid > 0) {		// By default (case of $checkdefault), we check on object entity + link to third party on field $dbt_keyfield

+		}

+		elseif (!in_array($feature, $nocheck))		// By default (case of $checkdefault), we check on object entity + link to third party on field $dbt_keyfield

+		{

@@ -1054,4 +597,3 @@
-			if ($user->socid > 0) {

-				if (empty($dbt_keyfield)) {

-					dol_print_error('', 'Param dbt_keyfield is required but not defined');

-				}

+			if ($user->socid > 0)

+			{

+				if (empty($dbt_keyfield)) dol_print_error('', 'Param dbt_keyfield is required but not defined');

@@ -1060,26 +602,20 @@
-				$sql .= " WHERE dbt.rowid IN (".$db->sanitize($objectid, 1).")";

-				$sql .= " AND dbt.".$dbt_keyfield." = ".((int) $user->socid);

-			} elseif (isModEnabled("societe") && !$user->hasRight('societe', 'client', 'voir')) {

-				// If internal user without permission to see all thirdparties: Check permission for internal users that are restricted on their objects

-				if ($feature != 'ticket') {

-					if (empty($dbt_keyfield)) {

-						dol_print_error('', 'Param dbt_keyfield is required but not defined');

-					}

-					$sql = "SELECT COUNT(sc.fk_soc) as nb";

-					$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";

-					$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

-					$sql .= " WHERE dbt.".$dbt_select." IN (".$db->sanitize($objectid, 1).")";

-					$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";

-					$sql .= " AND sc.fk_soc = dbt.".$dbt_keyfield;

-					$sql .= " AND sc.fk_user = ".((int) $user->id);

-				} else {

-					// On ticket, the thirdparty is not mandatory, so we need a special test to accept record with no thirdparties.

-					$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";

-					$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";

-					$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = dbt.".$dbt_keyfield." AND sc.fk_user = ".((int) $user->id);

-					$sql .= " WHERE dbt.".$dbt_select." IN (".$db->sanitize($objectid, 1).")";

-					$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";

-					$sql .= " AND (sc.fk_user = ".((int) $user->id)." OR sc.fk_user IS NULL)";

-				}

-			} elseif (isModEnabled('multicompany')) {

-				// If multicompany, and user is an internal user with all permissions, check that object is in correct entity

+				$sql .= " WHERE dbt.rowid IN (".$objectid.")";

+				$sql .= " AND dbt.".$dbt_keyfield." = ".$user->socid;

+			}

+			// If internal user: Check permission for internal users that are restricted on their objects

+			elseif (!empty($conf->societe->enabled) && ($user->rights->societe->lire && !$user->rights->societe->client->voir))

+			{

+				if (empty($dbt_keyfield)) dol_print_error('', 'Param dbt_keyfield is required but not defined');

+				$sql = "SELECT COUNT(sc.fk_soc) as nb";

+				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";

+				$sql .= ", ".MAIN_DB_PREFIX."societe as s";

+				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

+				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";

+				$sql .= " AND sc.fk_soc = dbt.".$dbt_keyfield;

+				$sql .= " AND dbt.".$dbt_keyfield." = s.rowid";

+				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";

+				$sql .= " AND sc.fk_user = ".$user->id;

+			}

+			// If multicompany and internal users with all permissions, check user is in correct entity

+			elseif (!empty($conf->multicompany->enabled))

+			{

@@ -1088 +624 @@
-				$sql .= " WHERE dbt.".$dbt_select." IN (".$db->sanitize($objectid, 1).")";

+				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";

@@ -1093,39 +629,10 @@
-		// For events, check on users assigned to event

-		if ($feature === 'agenda' && $objectid > 0) {

-			// Also check owner or attendee for users without allactions->read

-			if ($objectid > 0 && !$user->hasRight('agenda', 'allactions', 'read')) {

-				require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';

-				$action = new ActionComm($db);

-				$action->fetch($objectid);

-				if ($action->authorid != $user->id && $action->userownerid != $user->id && !(array_key_exists($user->id, $action->userassigned))) {

-					return false;

-				}

-			}

-		}

-

-		// For some object, we also have to check it is in the user hierarchy

-		// Param $object must be the full object and not a simple id to have this test possible.

-		if (in_array($feature, $checkhierarchy) && is_object($object) && $objectid > 0) {

-			$childids = $user->getAllChildIds(1);

-			$useridtocheck = 0;

-			if ($feature == 'holiday') {

-				$useridtocheck = $object->fk_user;

-				if (!$user->hasRight('holiday', 'readall') && !in_array($useridtocheck, $childids) && !in_array($object->fk_validator, $childids)) {

-					return false;

-				}

-			}

-			if ($feature == 'expensereport') {

-				$useridtocheck = $object->fk_user_author;

-				if (!$user->hasRight('expensereport', 'readall')) {

-					if (!in_array($useridtocheck, $childids)) {

-						return false;

-					}

-				}

-			}

-		}

-

-		// For some object, we also have to check it is public or owned by user

-		// Param $object must be the full object and not a simple id to have this test possible.

-		if (in_array($feature, $checkuser) && is_object($object) && $objectid > 0) {

-			$useridtocheck = $object->fk_user;

-			if (!empty($useridtocheck) && $useridtocheck > 0 && $useridtocheck != $user->id && empty($user->admin)) {

+		if ($sql)

+		{

+			$resql = $db->query($sql);

+			if ($resql)

+			{

+				$obj = $db->fetch_object($resql);

+				if (!$obj || $obj->nb < count(explode(',', $objectid))) return false;

+			}

+			else

+			{

@@ -1135,15 +642 @@
-

-		if ($sql) {

-			$resql = $db->query($sql);

-			if ($resql) {

-				$obj = $db->fetch_object($resql);

-				if (!$obj || $obj->nb < count(explode(',', $objectid))) {	// error if we found 0 or less record than nb of id provided

-					return false;

-				}

-			} else {

-				dol_syslog("Bad forged sql in checkUserAccessToObject", LOG_WARNING);

-				return false;

-			}

-		}

-	}

-

+	}

@@ -1153 +645,0 @@
-

@@ -1155,27 +647 @@
- *	Show a message to say access is forbidden and stop program.

- *  This includes only HTTP header.

- *	Calling this function terminate execution of PHP.

- *

- *	@param	string		$message					Force error message

- *	@param	int			$http_response_code			HTTP response code

- *  @param	int			$stringalreadysanitized		1 if string is already sanitized with HTML entities

- *  @return	void

- *  @see accessforbidden()

- */

-function httponly_accessforbidden($message = 1, $http_response_code = 403, $stringalreadysanitized = 0)

-{

-	top_httphead();

-	http_response_code($http_response_code);

-

-	if ($stringalreadysanitized) {

-		print $message;

-	} else {

-		print htmlentities($message);

-	}

-

-	exit(1);

-}

-

-/**

- *	Show a message to say access is forbidden and stop program.

- *  This includes HTTP and HTML header and footer (except if $printheader and $printfooter is  0, use this case inside an already started page).

+ *	Show a message to say access is forbidden and stop program

@@ -1188 +654 @@
- *  @param  array|null  $params         	More parameters provided to hook

+ *  @param  array|null  $params         	Send params

@@ -1190 +655,0 @@
- *  @see httponly_accessforbidden()

@@ -1194,18 +659,14 @@
-	global $conf, $db, $user, $langs, $hookmanager;

-	global $action, $object;

-

-	if (!is_object($langs)) {

-		include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';

-		$langs = new Translate('', $conf);

-		$langs->setDefaultLang();

-	}

-

-	$langs->loadLangs(array("main", "errors"));

-

-	if ($printheader) {

-		if (function_exists("llxHeader")) {

-			llxHeader('');

-		} elseif (function_exists("llxHeaderVierge")) {

-			llxHeaderVierge('');

-		}

-		print '<div style="padding: 20px">';

+    global $conf, $db, $user, $langs, $hookmanager;

+    if (!is_object($langs))

+    {

+        include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';

+        $langs = new Translate('', $conf);

+        $langs->setDefaultLang();

+    }

+

+	$langs->load("errors");

+

+	if ($printheader)

+	{

+		if (function_exists("llxHeader")) llxHeader('');

+		elseif (function_exists("llxHeaderVierge")) llxHeaderVierge('');

@@ -1214,5 +675,2 @@
-	if (empty($message)) {

-		print $langs->trans("ErrorForbidden");

-	} else {

-		print $langs->trans($message);

-	}

+	if (!$message) print $langs->trans("ErrorForbidden");

+	else print $message;

@@ -1221,3 +679,5 @@
-	if (empty($showonlymessage)) {

-		if (empty($hookmanager)) {

-			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';

+	if (empty($showonlymessage))

+	{

+		global $action, $object;

+		if (empty($hookmanager))

+		{

@@ -1228 +687,0 @@
-

@@ -1232,4 +691,5 @@
-		if (empty($reshook)) {

-			$langs->loadLangs(array("errors"));

-			if ($user->login) {

-				print $langs->trans("CurrentLogin").': <span class="error">'.$user->login.'</span><br>';

+		if (empty($reshook))

+		{

+			if ($user->login)

+			{

+				print $langs->trans("CurrentLogin").': <font class="error">'.$user->login.'</font><br>';

@@ -1237,2 +697,3 @@
-				print $langs->trans("ErrorForbidden4");

-			} else {

+			}

+			else

+			{

@@ -1243,5 +704 @@
-	if ($printfooter && function_exists("llxFooter")) {

-		print '</div>';

-		llxFooter();

-	}

-

+	if ($printfooter && function_exists("llxFooter")) llxFooter();

@@ -1250,67 +706,0 @@
-

-

-/**

- *	Return the max allowed for file upload.

- *  Analyze among: upload_max_filesize, post_max_size, MAIN_UPLOAD_DOC

- *

- *  @return	array		Array with all max size for file upload

- */

-function getMaxFileSizeArray()

-{

-	global $conf;

-

-	$max = $conf->global->MAIN_UPLOAD_DOC; // In Kb

-	$maxphp = @ini_get('upload_max_filesize'); // In unknown

-	if (preg_match('/k$/i', $maxphp)) {

-		$maxphp = preg_replace('/k$/i', '', $maxphp);

-		$maxphp = $maxphp * 1;

-	}

-	if (preg_match('/m$/i', $maxphp)) {

-		$maxphp = preg_replace('/m$/i', '', $maxphp);

-		$maxphp = $maxphp * 1024;

-	}

-	if (preg_match('/g$/i', $maxphp)) {

-		$maxphp = preg_replace('/g$/i', '', $maxphp);

-		$maxphp = $maxphp * 1024 * 1024;

-	}

-	if (preg_match('/t$/i', $maxphp)) {

-		$maxphp = preg_replace('/t$/i', '', $maxphp);

-		$maxphp = $maxphp * 1024 * 1024 * 1024;

-	}

-	$maxphp2 = @ini_get('post_max_size'); // In unknown

-	if (preg_match('/k$/i', $maxphp2)) {

-		$maxphp2 = preg_replace('/k$/i', '', $maxphp2);

-		$maxphp2 = $maxphp2 * 1;

-	}

-	if (preg_match('/m$/i', $maxphp2)) {

-		$maxphp2 = preg_replace('/m$/i', '', $maxphp2);

-		$maxphp2 = $maxphp2 * 1024;

-	}

-	if (preg_match('/g$/i', $maxphp2)) {

-		$maxphp2 = preg_replace('/g$/i', '', $maxphp2);

-		$maxphp2 = $maxphp2 * 1024 * 1024;

-	}

-	if (preg_match('/t$/i', $maxphp2)) {

-		$maxphp2 = preg_replace('/t$/i', '', $maxphp2);

-		$maxphp2 = $maxphp2 * 1024 * 1024 * 1024;

-	}

-	// Now $max and $maxphp and $maxphp2 are in Kb

-	$maxmin = $max;

-	$maxphptoshow = $maxphptoshowparam = '';

-	if ($maxphp > 0) {

-		$maxmin = min($maxmin, $maxphp);

-		$maxphptoshow = $maxphp;

-		$maxphptoshowparam = 'upload_max_filesize';

-	}

-	if ($maxphp2 > 0) {

-		$maxmin = min($maxmin, $maxphp2);

-		if ($maxphp2 < $maxphp) {

-			$maxphptoshow = $maxphp2;

-			$maxphptoshowparam = 'post_max_size';

-		}

-	}

-	//var_dump($maxphp.'-'.$maxphp2);

-	//var_dump($maxmin);

-

-	return array('max'=>$max, 'maxmin'=>$maxmin, 'maxphptoshow'=>$maxphptoshow, 'maxphptoshowparam'=>$maxphptoshowparam);

-}

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_security2.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_security2.lib.php
@@ -37,8 +37,4 @@
-	$t = '?';

-	if ($mode == 'user') {

-		$t = getenv('APACHE_RUN_USER'); // $_ENV['APACHE_RUN_USER'] is empty

-	}

-	if ($mode == 'group') {

-		$t = getenv('APACHE_RUN_GROUP');

-	}

-	return $t;

+    $t = '?';

+    if ($mode == 'user')  $t = getenv('APACHE_RUN_USER'); // $_ENV['APACHE_RUN_USER'] is empty

+    if ($mode == 'group') $t = getenv('APACHE_RUN_GROUP');

+    return $t;

@@ -55 +51 @@
- *  @return		string						Login or '' or '--bad-login-validity--'

+ *  @return		string						Login or ''

@@ -59,0 +56 @@
+    //global $dolauthmode;    // To return authentication finally used

@@ -62,5 +59,3 @@
-	if ($entitytotest == '') {

-		$entitytotest = 1;

-	}

-

-	dol_syslog("checkLoginPassEntity usertotest=".$usertotest." entitytotest=".$entitytotest." authmode=".join(',', $authmode));

+	if ($entitytotest == '') $entitytotest = 1;

+

+    dol_syslog("checkLoginPassEntity usertotest=".$usertotest." entitytotest=".$entitytotest." authmode=".join(',', $authmode));

@@ -70,48 +65,51 @@
-	if (empty($login)) {

-		$test = true;

-		foreach ($authmode as $mode) {

-			if ($test && $mode && !$login) {

-				// Validation of login/pass/entity for mode $mode

-				$mode = trim($mode);

-				$authfile = 'functions_'.$mode.'.php';

-				$fullauthfile = '';

-

-				$dirlogin = array_merge(array("/core/login"), (array) $conf->modules_parts['login']);

-				foreach ($dirlogin as $reldir) {

-					$dir = dol_buildpath($reldir, 0);

-					$newdir = dol_osencode($dir);

-

-					// Check if file found (do not use dol_is_file to avoid loading files.lib.php)

-					$tmpnewauthfile = $newdir.(preg_match('/\/$/', $newdir) ? '' : '/').$authfile;

-					if (is_file($tmpnewauthfile)) {

-						$fullauthfile = $tmpnewauthfile;

-					}

-				}

-

-				$result = false;

-				if ($fullauthfile) {

-					$result = include_once $fullauthfile;

-				}

-				if ($fullauthfile && $result) {

-					// Call function to check user/password

-					$function = 'check_user_password_'.$mode;

-					$login = call_user_func($function, $usertotest, $passwordtotest, $entitytotest, $context);

-					if ($login && $login != '--bad-login-validity--') {

-						// Login is successfull with this method

-						$test = false; // To stop once at first login success

-						$conf->authmode = $mode; // This properties is defined only when logged to say what mode was successfully used

-						/*$dol_tz = GETPOST('tz');

-						$dol_dst = GETPOST('dst');

-						$dol_screenwidth = GETPOST('screenwidth');

-						$dol_screenheight = GETPOST('screenheight');*/

-					}

-				} else {

-					dol_syslog("Authentication KO - failed to load file '".$authfile."'", LOG_ERR);

-					sleep(1);

-					// Load translation files required by the page

-					$langs->loadLangs(array('other', 'main', 'errors'));

-

-					$_SESSION["dol_loginmesg"] = (empty($_SESSION["dol_loginmesg"]) ? '' : $_SESSION["dol_loginmesg"].', ').$langs->transnoentitiesnoconv("ErrorFailedToLoadLoginFileForMode", $mode);

-				}

-			}

-		}

+	if (empty($login))

+	{

+	    $test = true;

+    	foreach ($authmode as $mode)

+    	{

+    		if ($test && $mode && !$login)

+    		{

+    		    // Validation of login/pass/entity for mode $mode

+    		    $mode = trim($mode);

+        		$authfile = 'functions_'.$mode.'.php';

+        		$fullauthfile = '';

+

+    		    $dirlogin = array_merge(array("/core/login"), (array) $conf->modules_parts['login']);

+    		    foreach ($dirlogin as $reldir)

+    		    {

+    		        $dir = dol_buildpath($reldir, 0);

+    		        $newdir = dol_osencode($dir);

+

+    		        // Check if file found (do not use dol_is_file to avoid loading files.lib.php)

+    		        $tmpnewauthfile = $newdir.(preg_match('/\/$/', $newdir) ? '' : '/').$authfile;

+    		        if (is_file($tmpnewauthfile)) $fullauthfile = $tmpnewauthfile;

+    		    }

+

+    		    $result = false;

+    		    if ($fullauthfile) $result = include_once $fullauthfile;

+    			if ($fullauthfile && $result)

+    			{

+    				// Call function to check user/password

+    				$function = 'check_user_password_'.$mode;

+    				$login = call_user_func($function, $usertotest, $passwordtotest, $entitytotest, $context);

+    				if ($login)	// Login is successfull

+    				{

+    					$test = false; // To stop once at first login success

+    					$conf->authmode = $mode; // This properties is defined only when logged to say what mode was successfully used

+    					$dol_tz = GETPOST('tz');

+    					$dol_dst = GETPOST('dst');

+    					$dol_screenwidth = GETPOST('screenwidth');

+    					$dol_screenheight = GETPOST('screenheight');

+    				}

+    			}

+    			else

+    			{

+    				dol_syslog("Authentication KO - failed to load file '".$authfile."'", LOG_ERR);

+    				sleep(1);

+    				// Load translation files required by the page

+                    $langs->loadLangs(array('other', 'main', 'errors'));

+

+    				$_SESSION["dol_loginmesg"] = $langs->trans("ErrorFailedToLoadLoginFileForMode", $mode);

+    			}

+    		}

+    	}

@@ -124,14 +122,15 @@
-if (!function_exists('dol_loginfunction')) {

-	/**

-	 * Show Dolibarr default login page.

-	 * Part of this code is also duplicated into main.inc.php::top_htmlhead

-	 *

-	 * @param       Translate   $langs      Lang object (must be initialized by a new).

-	 * @param       Conf        $conf       Conf object

-	 * @param       Societe     $mysoc      Company object

-	 * @return      void

-	 */

-	function dol_loginfunction($langs, $conf, $mysoc)

-	{

-		global $dolibarr_main_demo, $dolibarr_main_force_https;

-		global $db, $hookmanager;

+if (!function_exists('dol_loginfunction'))

+{

+    /**

+     * Show Dolibarr default login page.

+     * Part of this code is also duplicated into main.inc.php::top_htmlhead

+     *

+     * @param       Translate   $langs      Lang object (must be initialized by a new).

+     * @param       Conf        $conf       Conf object

+     * @param       Societe     $mysoc      Company object

+     * @return      void

+     */

+    function dol_loginfunction($langs, $conf, $mysoc)

+	{

+		global $dolibarr_main_demo, $db;

+		global $hookmanager;

@@ -153,3 +152 @@
-		if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {

-			$title = $conf->global->MAIN_APPLICATION_TITLE;

-		}

+		if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $title = $conf->global->MAIN_APPLICATION_TITLE;

@@ -160 +157 @@
-		$conf->css = "/theme/".(GETPOST('theme','aZ09')?GETPOST('theme','aZ09'):$conf->theme)."/style.css.php";

+		$conf->css = "/theme/".(GETPOST('theme','alpha')?GETPOST('theme','alpha'):$conf->theme)."/style.css.php";

@@ -162 +159 @@
-		if (!empty($conf->modules_parts['theme']))		// Using this feature slow down application

+		if (! empty($conf->modules_parts['theme']))		// Using this feature slow down application

@@ -177 +174,2 @@
-		if (!empty($conf->modules_parts['tpl'])) {	// Using this feature slow down application

+		if (!empty($conf->modules_parts['tpl']))	// Using this feature slow down application

+		{

@@ -179 +177,2 @@
-			foreach ($dirtpls as $reldir) {

+			foreach ($dirtpls as $reldir)

+			{

@@ -181,6 +180,5 @@
-				if (file_exists($tmp)) {

-					$template_dir = preg_replace('/login\.tpl\.php$/', '', $tmp);

-					break;

-				}

-			}

-		} else {

+				if (file_exists($tmp)) { $template_dir = preg_replace('/login\.tpl\.php$/', '', $tmp); break; }

+			}

+		}

+		else

+		{

@@ -190,2 +188 @@
-		// Set cookie for timeout management. We set it as a cookie so we will be able to use it to set timeout on next page before the session start

-		// and the conf file is loaded.

+		// Set cookie for timeout management

@@ -194,33 +191,7 @@
-

-		if (getDolGlobalString('MAIN_SESSION_TIMEOUT')) {

-			if (session_status() != PHP_SESSION_ACTIVE) {

-				if (PHP_VERSION_ID < 70300) {

-					session_set_cookie_params(0, '/', null, ((empty($dolibarr_main_force_https) && isHTTPS() === false) ? false : true), true); // Add tag secure and httponly on session cookie (same as setting session.cookie_httponly into php.ini). Must be called before the session_start.

-				} else {

-					// Only available for php >= 7.3

-					$sessioncookieparams = array(

-						'lifetime' => 0,

-						'path' => '/',

-						//'domain' => '.mywebsite.com', // the dot at the beginning allows compatibility with subdomains

-						'secure' => ((empty($dolibarr_main_force_https) && isHTTPS() === false) ? false : true),

-						'httponly' => true,

-						'samesite' => 'Lax'	// None || Lax  || Strict

-					);

-					session_set_cookie_params($sessioncookieparams);

-				}

-

-				setcookie($sessiontimeout, $conf->global->MAIN_SESSION_TIMEOUT, 0, "/", null, (empty($dolibarr_main_force_https) ? false : true), true);

-			}

-		}

-

-		if (GETPOST('urlfrom', 'alpha')) {

-			$_SESSION["urlfrom"] = GETPOST('urlfrom', 'alpha');

-		} else {

-			unset($_SESSION["urlfrom"]);

-		}

-

-		if (!GETPOST("username", 'alpha')) {

-			$focus_element = 'username';

-		} else {

-			$focus_element = 'password';

-		}

+		if (!empty($conf->global->MAIN_SESSION_TIMEOUT)) setcookie($sessiontimeout, $conf->global->MAIN_SESSION_TIMEOUT, 0, "/", null, false, true);

+

+		if (GETPOST('urlfrom', 'alpha')) $_SESSION["urlfrom"] = GETPOST('urlfrom', 'alpha');

+		else unset($_SESSION["urlfrom"]);

+

+		if (!GETPOST("username", 'alpha')) $focus_element = 'username';

+		else $focus_element = 'password';

@@ -230 +201,2 @@
-		if (!empty($dolibarr_main_demo)) {

+		if (!empty($dolibarr_main_demo))

+		{

@@ -237 +209 @@
-		$parameters = array('entity' => GETPOST('entity', 'int'), 'switchentity' => GETPOST('switchentity', 'int'));

+		$parameters = array('entity' => GETPOST('entity', 'int'));

@@ -242 +214 @@
-		$parameters = array('entity' => GETPOST('entity', 'int'), 'switchentity' => GETPOST('switchentity', 'int'));

+		$parameters = array('entity' => GETPOST('entity', 'int'));

@@ -245,5 +216,0 @@
-

-		//Redirect after connection

-		$parameters = array('entity' => GETPOST('entity', 'int'), 'switchentity' => GETPOST('switchentity', 'int'));

-		$reshook = $hookmanager->executeHooks('redirectAfterConnection', $parameters); // Note that $action and $object may have been modified by some hooks.

-		$php_self = $hookmanager->resPrint;

@@ -259 +226,2 @@
-		if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) {

+		if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))

+		{

@@ -261 +229,3 @@
-		} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) {

+		}

+		elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))

+		{

@@ -264,3 +234,3 @@
-		} elseif (!empty($mysoc->logo_squarred_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_small)) {

-			$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_small);

-		} elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg')) {

+		}

+		elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg'))

+		{

@@ -273 +243,2 @@
-		if (function_exists("imagecreatefrompng") && getDolGlobalString('MAIN_SECURITY_ENABLECAPTCHA')) {

+		if (function_exists("imagecreatefrompng") && !empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA))

+		{

@@ -281,2 +252,4 @@
-		if (!getDolGlobalString('MAIN_SECURITY_DISABLEFORGETPASSLINK') || !getDolGlobalString('MAIN_HELPCENTER_DISABLELINK')) {

-			if (!getDolGlobalString('MAIN_SECURITY_DISABLEFORGETPASSLINK')) {

+		if (empty($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK) || empty($conf->global->MAIN_HELPCENTER_DISABLELINK))

+		{

+			if (empty($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK))

+			{

@@ -286 +259,2 @@
-			if (!getDolGlobalString('MAIN_HELPCENTER_DISABLELINK')) {

+			if (empty($conf->global->MAIN_HELPCENTER_DISABLELINK))

+			{

@@ -293,4 +267,5 @@
-		if (getDolGlobalString('MAIN_HOME')) {

-			$substitutionarray = getCommonSubstitutionArray($langs);

-			complete_substitutions_array($substitutionarray, $langs);

-			$texttoshow = make_substitutions(getDolGlobalString('MAIN_HOME'), $substitutionarray, $langs);

+		if (!empty($conf->global->MAIN_HOME))

+		{

+		    $substitutionarray = getCommonSubstitutionArray($langs);

+		    complete_substitutions_array($substitutionarray, $langs);

+		    $texttoshow = make_substitutions($conf->global->MAIN_HOME, $substitutionarray, $langs);

@@ -302 +277 @@
-		$main_google_ad_client = ((getDolGlobalString('MAIN_GOOGLE_AD_CLIENT') && getDolGlobalString('MAIN_GOOGLE_AD_SLOT')) ? 1 : 0);

+		$main_google_ad_client = ((!empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && !empty($conf->global->MAIN_GOOGLE_AD_SLOT)) ? 1 : 0);

@@ -308,6 +283,2 @@
-		if (!empty($mysoc->logo_squarred_mini)) {

-			$favicon = DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_mini);

-		}

-		if (getDolGlobalString('MAIN_FAVICON_URL')) {

-			$favicon = $conf->global->MAIN_FAVICON_URL;

-		}

+		if (!empty($mysoc->logo_squarred_mini)) $favicon = DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_mini);

+		if (!empty($conf->global->MAIN_FAVICON_URL)) $favicon = $conf->global->MAIN_FAVICON_URL;

@@ -316,3 +287 @@
-		if (getDolGlobalString('MAIN_USE_JQUERY_THEME')) {

-			$jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;

-		}

+		if (!empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;

@@ -330,2 +298,0 @@
-		// Global html output events ($mesgs, $errors, $warnings)

-		dol_htmloutput_events(0);

@@ -348 +315,2 @@
-	switch ($type) {

+	switch ($type)

+	{

@@ -350,4 +318 @@
-			$saltlen = 8;

-			$saltprefix = '$1$';

-			$saltsuffix = '$';

-			break;

+			$saltlen = 8; $saltprefix = '$1$'; $saltsuffix = '$'; break;

@@ -355,4 +320 @@
-			$saltlen = 8;

-			$saltprefix = '$1$';

-			$saltsuffix = '$';

-			break;

+			$saltlen = 8; $saltprefix = '$1$'; $saltsuffix = '$'; break;

@@ -361,4 +323 @@
-			$saltlen = 2;

-			$saltprefix = '';

-			$saltsuffix = '';

-			break;

+			$saltlen = 2; $saltprefix = ''; $saltsuffix = ''; break;

@@ -367,3 +326 @@
-	while (dol_strlen($salt) < $saltlen) {

-		$salt .= chr(mt_rand(64, 126));

-	}

+	while (dol_strlen($salt) < $saltlen) $salt .= chr(mt_rand(64, 126));

@@ -380 +337 @@
- *	@return		int					Return integer <0 if KO, >0 if OK

+ *	@return		int					<0 if KO, >0 if OK

@@ -389,2 +346,4 @@
-	if ($fp = fopen(DOL_DOCUMENT_ROOT.'/conf/conf.php', 'r')) {

-		while (!feof($fp)) {

+	if ($fp = fopen(DOL_DOCUMENT_ROOT.'/conf/conf.php', 'r'))

+	{

+		while (!feof($fp))

+		{

@@ -395,2 +354,2 @@
-			$reg = array();

-			if (preg_match('/^[^#]*dolibarr_main_db_encrypted_pass[\s]*=[\s]*(.*)/i', $buffer, $reg)) {	// Old way to save crypted value

+			if (preg_match('/^[^#]*dolibarr_main_db_encrypted_pass[\s]*=[\s]*(.*)/i', $buffer, $reg))	// Old way to save crypted value

+			{

@@ -400 +359,2 @@
-				if (!empty($val)) {

+				if (!empty($val))

+				{

@@ -402 +361,0 @@
-					// method dol_encode/dol_decode

@@ -404 +362,0 @@
-					//$val = dolEncrypt($val);

@@ -408 +366,3 @@
-			} elseif (preg_match('/^[^#]*dolibarr_main_db_pass[\s]*=[\s]*(.*)/i', $buffer, $reg)) {

+			}

+			elseif (preg_match('/^[^#]*dolibarr_main_db_pass[\s]*=[\s]*(.*)/i', $buffer, $reg))

+			{

@@ -412,3 +372,2 @@
-				if (preg_match('/crypted:/i', $buffer)) {

-					// method dol_encode/dol_decode

-					$mode = 'crypted:';

+				if (preg_match('/crypted:/i', $buffer))

+				{

@@ -419,6 +378,3 @@
-				} elseif (preg_match('/^dolcrypt:([^:]+):(.*)$/i', $buffer, $reg)) {

-					// method dolEncrypt/dolDecrypt

-					$mode = 'dolcrypt:';

-					$val = preg_replace('/crypted:([^:]+):/i', '', $val);

-					$passwd_crypted = $val;

-					$val = dolDecrypt($buffer);

+				}

+				else

+				{

@@ -426,3 +381,0 @@
-				} else {

-					$passwd = $val;

-					$mode = 'crypted:';

@@ -431,2 +383,0 @@
-					// TODO replace with dolEncrypt()

-					// ...

@@ -438 +389,2 @@
-			if ($lineofpass) {

+			if ($lineofpass)

+			{

@@ -440 +392,2 @@
-				if ($level == 0) {

+				if ($level == 0)

+				{

@@ -443,2 +396,3 @@
-				if ($level == 1) {

-					$config .= '$dolibarr_main_db_pass=\''.$mode.$passwd_crypted.'\';'."\n";

+				if ($level == 1)

+				{

+					$config .= '$dolibarr_main_db_pass=\'crypted:'.$passwd_crypted.'\';'."\n";

@@ -449 +403,3 @@
-			} else {

+			}

+			else

+			{

@@ -457 +413,2 @@
-		if ($fp = @fopen($file, 'w')) {

+		if ($fp = @fopen($file, 'w'))

+		{

@@ -465 +422 @@
-			//dolChmod($file, '0600');

+			//@chmod($file, octdec('0600'));

@@ -468 +425,3 @@
-		} else {

+		}

+		else

+		{

@@ -472 +431,3 @@
-	} else {

+	}

+	else

+	{

@@ -485 +446 @@
- * @see dol_hash(), dolJSToSetRandomPassword()

+ * @see dol_hash()

@@ -492 +453,2 @@
-	if ($generic) {

+	if ($generic)

+	{

@@ -500 +462,2 @@
-		if (function_exists('random_int')) {	// Cryptographic random

+		if (function_exists('random_int'))	// Cryptographic random

+		{

@@ -503,2 +466 @@
-				$tmp = random_int(0, $max);

-				$randomCode .= $lowercase[$tmp];

+				$randomCode .= $lowercase[random_int(0, $max)];

@@ -508,2 +470 @@
-				$tmp = random_int(0, $max);

-				$randomCode .= $uppercase[$tmp];

+				$randomCode .= $uppercase[random_int(0, $max)];

@@ -513,2 +474 @@
-				$tmp = random_int(0, $max);

-				$randomCode .= $numbers[$tmp];

+				$randomCode .= $numbers[random_int(0, $max)];

@@ -518,2 +478,3 @@
-		} else {

-			// Old platform, non cryptographic random

+		}

+		else	// Old platform, non cryptographic random

+		{

@@ -522,2 +483 @@
-				$tmp = mt_rand(0, $max);

-				$randomCode .= $lowercase[$tmp];

+				$randomCode .= $lowercase[mt_rand(0, $max)];

@@ -527,2 +487 @@
-				$tmp = mt_rand(0, $max);

-				$randomCode .= $uppercase[$tmp];

+				$randomCode .= $uppercase[mt_rand(0, $max)];

@@ -532,2 +491 @@
-				$tmp = mt_rand(0, $max);

-				$randomCode .= $numbers[$tmp];

+				$randomCode .= $numbers[mt_rand(0, $max)];

@@ -538 +496,3 @@
-	} elseif (getDolGlobalString('USER_PASSWORD_GENERATED')) {

+	}

+	elseif (!empty($conf->global->USER_PASSWORD_GENERATED))

+	{

@@ -549 +509,2 @@
-	if (is_array($replaceambiguouschars) && count($replaceambiguouschars) > 0) {

+	if (is_array($replaceambiguouschars) && count($replaceambiguouschars) > 0)

+	{

@@ -552,6 +513,7 @@
-		if (function_exists('random_int')) {	// Cryptographic random

-			$tmp = random_int(0, $max);

-			$generated_password = str_replace($replaceambiguouschars, $numbers[$tmp], $generated_password);

-		} else {

-			$tmp = mt_rand(0, $max);

-			$generated_password = str_replace($replaceambiguouschars, $numbers[$tmp], $generated_password);

+		if (function_exists('random_int'))	// Cryptographic random

+		{

+			$generated_password = str_replace($replaceambiguouschars, $numbers[random_int(0, $max)], $generated_password);

+		}

+		else

+		{

+			$generated_password = str_replace($replaceambiguouschars, $numbers[mt_rand(0, $max)], $generated_password);

@@ -563,41 +524,0 @@
-

-/**

- * Ouput javacript to autoset a generated password using default module into a HTML element.

- *

- * @param		string 		$htmlname			HTML name of element to insert key into

- * @param		string		$htmlnameofbutton	HTML name of button

- * @param		int			$generic			1=Return a generic pass, 0=Return a pass following setup rules

- * @return		string		    				HTML javascript code to set a password

- * @see getRandomPassword()

- */

-function dolJSToSetRandomPassword($htmlname, $htmlnameofbutton = 'generate_token', $generic = 1)

-{

-	global $conf;

-

-	$out = '';

-

-	if (!empty($conf->use_javascript_ajax)) {

-		$out .= "\n".'<!-- Js code to suggest a security key -->';

-		$out .= '<script nonce="'.getNonce().'" type="text/javascript">';

-		$out .= 'jQuery(document).ready(function () {

-            jQuery("#'.dol_escape_js($htmlnameofbutton).'").click(function() {

-				var currenttoken = jQuery("meta[name=anti-csrf-currenttoken]").attr("content");

-				console.log("We click on the button '.dol_escape_js($htmlnameofbutton).' to suggest a key. anti-csrf-currentotken is "+currenttoken+". We will fill '.dol_escape_js($htmlname).'");

-				jQuery.get( "'.DOL_URL_ROOT.'/core/ajax/security.php", {

-            		action: \'getrandompassword\',

-            		generic: '.($generic ? '1' : '0').',

-					token: currenttoken

-				},

-				function(result) {

-					if (jQuery("input#'.dol_escape_js($htmlname).'").attr("type") == "password") {

-						jQuery("input#'.dol_escape_js($htmlname).'").attr("type", "text");

-					}

-					jQuery("#'.dol_escape_js($htmlname).'").val(result);

-				});

-            });

-		});'."\n";

-		$out .= '</script>';

-	}

-

-	return $out;

-}

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_sendings.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_sendings.lib.php
@@ -40 +40 @@
-	$langs->loadLangs(array("sendings", "deliveries"));

+    $langs->loadLangs(array("sendings", "deliveries"));

@@ -50,8 +50,2 @@
-	if ($object->statut == Expedition::STATUS_DRAFT) {

-		$head[$h][0] = DOL_URL_ROOT."/expedition/dispatch.php?id=".$object->id;

-		$head[$h][1] = $langs->trans("ShipmentDistribution");

-		$head[$h][2] = 'dispatch';

-		$h++;

-	}

-

-	if (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY') && $user->hasRight('expedition', 'delivery', 'lire')) {

+	if ($conf->livraison_bon->enabled && $user->rights->expedition->livraison->lire)

+	{

@@ -60,5 +54,6 @@
-		if (isset($object->linkedObjectsIds['delivery']) && is_array($object->linkedObjectsIds['delivery']) && count($object->linkedObjectsIds['delivery']) > 0) {        // If there is a delivery

-			// Take first one element of array

-			$tmp = reset($object->linkedObjectsIds['delivery']);

-

-			$head[$h][0] = DOL_URL_ROOT."/delivery/card.php?id=".$tmp;

+		if (is_array($object->linkedObjectsIds['delivery']) && count($object->linkedObjectsIds['delivery']) > 0)        // If there is a delivery

+		{

+		    // Take first one element of array

+		    $tmp = reset($object->linkedObjectsIds['delivery']);

+

+			$head[$h][0] = DOL_URL_ROOT."/livraison/card.php?id=".$tmp;

@@ -71,14 +66,14 @@
-	if (!getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB')) {

-		$objectsrc = $object;

-		if ($object->origin == 'commande' && $object->origin_id > 0) {

-			$objectsrc = new Commande($db);

-			$objectsrc->fetch($object->origin_id);

-		}

-		$nbContact = count($objectsrc->liste_contact(-1, 'internal')) + count($objectsrc->liste_contact(-1, 'external'));

-		$head[$h][0] = DOL_URL_ROOT."/expedition/contact.php?id=".$object->id;

-		$head[$h][1] = $langs->trans("ContactsAddresses");

-		if ($nbContact > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';

-		}

-		$head[$h][2] = 'contact';

-		$h++;

+	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))

+	{

+	    $objectsrc = $object;

+	    if ($object->origin == 'commande' && $object->origin_id > 0)

+	    {

+	        $objectsrc = new Commande($db);

+	        $objectsrc->fetch($object->origin_id);

+	    }

+	    $nbContact = count($objectsrc->liste_contact(-1, 'internal')) + count($objectsrc->liste_contact(-1, 'external'));

+	    $head[$h][0] = DOL_URL_ROOT."/expedition/contact.php?id=".$object->id;

+    	$head[$h][1] = $langs->trans("ContactsAddresses");

+		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';

+    	$head[$h][2] = 'contact';

+    	$h++;

@@ -88,2 +83,2 @@
-	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

-	$upload_dir = $conf->expedition->dir_output."/sending/".dol_sanitizeFileName($object->ref);

+    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

+	$upload_dir = $conf->commande->dir_output."/".dol_sanitizeFileName($object->ref);

@@ -91 +86 @@
-	$nbLinks = Link::count($db, $object->element, $object->id);

+    $nbLinks = Link::count($db, $object->element, $object->id);

@@ -94,3 +89 @@
-	if (($nbFiles + $nbLinks) > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

-	}

+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

@@ -100,7 +93,3 @@
-	$nbNote = 0;

-	if (!empty($object->note_private)) {

-		$nbNote++;

-	}

-	if (!empty($object->note_public)) {

-		$nbNote++;

-	}

+    $nbNote = 0;

+    if (!empty($object->note_private)) $nbNote++;

+    if (!empty($object->note_public)) $nbNote++;

@@ -109,3 +98 @@
-	if ($nbNote > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

-	}

+	if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

@@ -117,2 +104,2 @@
-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname);   												to remove a tab

+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

+    // $this->tabs = array('entity:-tabname);   												to remove a tab

@@ -138 +125 @@
-	$langs->loadLangs(array("sendings", "deliveries"));

+    $langs->loadLangs(array("sendings", "deliveries"));

@@ -143 +130,2 @@
-	if (getDolGlobalInt('MAIN_SUBMODULE_EXPEDITION') && $user->hasRight('expedition', 'lire')) {

+	if ($conf->expedition_bon->enabled && $user->rights->expedition->lire)

+	{

@@ -150 +138 @@
-	$head[$h][0] = DOL_URL_ROOT."/delivery/card.php?id=".$object->id;

+	$head[$h][0] = DOL_URL_ROOT."/livraison/card.php?id=".$object->id;

@@ -172,15 +160,5 @@
-	if (!getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB')) {

-		$objectsrc = $tmpobject;

-		if ($tmpobject->origin == 'commande' && $tmpobject->origin_id > 0) {

-			$objectsrc = new Commande($db);

-			$objectsrc->fetch($tmpobject->origin_id);

-		}

-		$nbContact = count($objectsrc->liste_contact(-1, 'internal')) + count($objectsrc->liste_contact(-1, 'external'));

-		$head[$h][0] = DOL_URL_ROOT."/expedition/contact.php?id=".$tmpobject->id;

-		$head[$h][1] = $langs->trans("ContactsAddresses");

-		if ($nbContact > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';

-		}

-		$head[$h][2] = 'contact';

-		$h++;

-	}

+	$head[$h][0] = DOL_URL_ROOT."/expedition/contact.php?id=".$tmpobject->id;

+	$head[$h][1] = $langs->trans("ContactsAddresses");

+	$head[$h][2] = 'contact';

+	$h++;

+

@@ -190 +168 @@
-	$upload_dir = $conf->expedition->dir_output."/sending/".dol_sanitizeFileName($tmpobject->ref);

+	$upload_dir = $conf->commande->dir_output."/".dol_sanitizeFileName($tmpobject->ref);

@@ -195,3 +173 @@
-	if (($nbFiles + $nbLinks) > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

-	}

+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

@@ -202,6 +178,2 @@
-	if (!empty($tmpobject->note_private)) {

-		$nbNote++;

-	}

-	if (!empty($tmpobject->note_public)) {

-		$nbNote++;

-	}

+	if (!empty($tmpobject->note_private)) $nbNote++;

+	if (!empty($tmpobject->note_public)) $nbNote++;

@@ -210,3 +182 @@
-	if ($nbNote > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

-	}

+	if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

@@ -218 +188 @@
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'delivery');

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'delivery');

@@ -231,2 +201,2 @@
- * @param	string		$filter			Filter (Do not use a string from a user input)

- * @return	int							Return integer <0 if KO, >0 if OK

+ * @param	string		$filter			Filter

+ * @return	int							<0 if KO, >0 if OK

@@ -245 +215,2 @@
-	$sql .= " e.rowid as sendingid, e.ref as exp_ref, e.date_creation, e.date_delivery, e.date_expedition, e.billed, e.fk_statut as status,";

+	$sql .= " e.rowid as sendingid, e.ref as exp_ref, e.date_creation, e.date_delivery, e.date_expedition,";

+	//if ($conf->livraison_bon->enabled) $sql .= " l.rowid as livraison_id, l.ref as livraison_ref, l.date_delivery, ld.qty as qty_received,";

@@ -248,3 +219,4 @@
-	$sql .= " FROM ".MAIN_DB_PREFIX."expeditiondet as ed,";

-	$sql .= " ".MAIN_DB_PREFIX."expedition as e,";

-	$sql .= " ".MAIN_DB_PREFIX.$origin."det as obj";	// for example llx_commandedet

+	$sql .= " FROM ".MAIN_DB_PREFIX."expeditiondet as ed";

+	$sql .= ", ".MAIN_DB_PREFIX."expedition as e";

+	$sql .= ", ".MAIN_DB_PREFIX.$origin."det as obj";

+	//if ($conf->livraison_bon->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.fk_expedition = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."livraisondet as ld ON ld.fk_livraison = l.rowid  AND obj.rowid = ld.fk_origin_line";

@@ -254 +226 @@
-	$sql .= " AND obj.fk_".$origin." = ".((int) $origin_id);

+	$sql .= " AND obj.fk_".$origin." = ".$origin_id;

@@ -257,4 +229,3 @@
-	if ($filter) {

-		$sql .= $filter;

-	}

-	$sql .= " ORDER BY obj.rowid, obj.fk_product";

+	if ($filter) $sql .= $filter;

+

+	$sql .= " ORDER BY obj.fk_product";

@@ -264 +235,2 @@
-	if ($resql) {

+	if ($resql)

+	{

@@ -268,6 +240,4 @@
-		if ($num) {

-			if ($filter) {

-				print load_fiche_titre($langs->trans("OtherSendingsForSameOrder"));

-			} else {

-				print load_fiche_titre($langs->trans("SendingsAndReceivingForSameOrder"));

-			}

+		if ($num)

+		{

+			if ($filter) print load_fiche_titre($langs->trans("OtherSendingsForSameOrder"));

+			else print load_fiche_titre($langs->trans("SendingsAndReceivingForSameOrder"));

@@ -283,2 +253,3 @@
-			if (isModEnabled('stock')) {

-				print '<td>'.$langs->trans("Warehouse").'</td>';

+			if (!empty($conf->stock->enabled))

+			{

+                print '<td>'.$langs->trans("Warehouse").'</td>';

@@ -287 +258 @@
-			if (!empty($conf->productbatch->enabled))

+			if (! empty($conf->productbatch->enabled))

@@ -289,2 +260,2 @@
-				print '<td>';

-				print '</td>';

+			    print '<td>';

+			    print '</td>';

@@ -292 +263,2 @@
-			if (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY')) {

+			if (!empty($conf->livraison_bon->enabled))

+			{

@@ -299 +271,2 @@
-			while ($i < $num) {

+			while ($i < $num)

+			{

@@ -301,6 +273,0 @@
-

-				$expedition->id = $objp->expedition_id;

-				$expedition->ref = $objp->exp_ref;

-				$expedition->billed = $objp->billed;

-				$expedition->statut = $objp->status;

-				$expedition->status = $objp->status;

@@ -312,2 +279 @@
-				print $expedition->getNomUrl(1);

-				//print '<a href="'.DOL_URL_ROOT.'/expedition/card.php?id='.$objp->expedition_id.'">'.img_object($langs->trans("ShowSending"), 'sending').' '.$objp->exp_ref.'<a>';

+				print '<a href="'.DOL_URL_ROOT.'/expedition/card.php?id='.$objp->expedition_id.'">'.img_object($langs->trans("ShowSending"), 'sending').' '.$objp->exp_ref.'<a>';

@@ -317 +283,2 @@
-				if ($objp->fk_product > 0) {

+				if ($objp->fk_product > 0)

+				{

@@ -319 +286,2 @@
-					if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {

+					if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))

+					{

@@ -330,7 +298,4 @@
-						if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {

-							$newlang = GETPOST('lang_id', 'aZ09');

-						}

-						if (empty($newlang)) {

-							$newlang = $object->thirdparty->default_lang;

-						}

-						if (!empty($newlang)) {

+						if (empty($newlang) && !empty($_REQUEST['lang_id'])) $newlang = $_REQUEST['lang_id'];

+						if (empty($newlang)) $newlang = $object->thirdparty->default_lang;

+						if (!empty($newlang))

+						{

@@ -342 +307,3 @@
-					} else {

+					}

+					else

+					{

@@ -353 +319,0 @@
-

@@ -356 +322 @@
-					$description = (getDolGlobalInt('PRODUIT_DESC_IN_FORM_ACCORDING_TO_DEVICE') ? '' : dol_htmlentitiesbr($objp->description));

+					$description = (!empty($conf->global->PRODUIT_DESC_IN_FORM) ? '' : dol_htmlentitiesbr($objp->description));

@@ -363 +329,2 @@
-					if (getDolGlobalInt('PRODUIT_DESC_IN_FORM_ACCORDING_TO_DEVICE')) {

+					if (!empty($conf->global->PRODUIT_DESC_IN_FORM))

+					{

@@ -368 +335,3 @@
-				} else {

+				}

+				else

+				{

@@ -370,5 +339,2 @@
-					if ($objp->fk_product_type == 1) {

-						$text = img_object($langs->trans('Service'), 'service');

-					} else {

-						$text = img_object($langs->trans('Product'), 'product');

-					}

+					if ($objp->fk_product_type == 1) $text = img_object($langs->trans('Service'), 'service');

+					else $text = img_object($langs->trans('Product'), 'product');

@@ -400,7 +366,9 @@
-				if (isModEnabled('stock')) {

-					print '<td>';

-					if ($objp->warehouse_id > 0) {

-						$warehousestatic->fetch($objp->warehouse_id);

-						print $warehousestatic->getNomUrl(1);

-					}

-					print '</td>';

+				if (!empty($conf->stock->enabled))

+				{

+				    print '<td>';

+    				if ($objp->warehouse_id > 0)

+    				{

+        				$warehousestatic->fetch($objp->warehouse_id);

+        				print $warehousestatic->getNomUrl(1);

+    				}

+    				print '</td>';

@@ -411 +379 @@
-				if (!empty($conf->productbatch->enabled))

+				if (! empty($conf->productbatch->enabled))

@@ -413,10 +381,10 @@
-					//var_dump($objp->edrowid);

-					$lines[$i]->detail_batch

-					if (isset($lines[$i]->detail_batch))

-					{

-						print '<td>';

-						if ($lines[$i]->product_tobatch)

-						{

-							$detail = '';

-							foreach ($lines[$i]->detail_batch as $dbatch)

-							{

+				    var_dump($objp->edrowid);

+				    $lines[$i]->detail_batch

+				    if (isset($lines[$i]->detail_batch))

+				    {

+				        print '<td>';

+				        if ($lines[$i]->product_tobatch)

+				        {

+				            $detail = '';

+				            foreach ($lines[$i]->detail_batch as $dbatch)

+				            {

@@ -428,11 +396,11 @@
-							}

-							print $form->textwithtooltip(img_picto('', 'object_barcode').' '.$langs->trans("DetailBatchNumber"),$detail);

-						}

-						else

-						{

-							print $langs->trans("NA");

-						}

-						print '</td>';

-					} else {

-						print '<td></td>';

-					}

+				            }

+				            print $form->textwithtooltip(img_picto('', 'object_barcode').' '.$langs->trans("DetailBatchNumber"),$detail);

+				        }

+				        else

+				        {

+				            print $langs->trans("NA");

+				        }

+				        print '</td>';

+				    } else {

+				        print '<td></td>';

+				    }

@@ -442,2 +410,4 @@
-				if (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY')) {

-					include_once DOL_DOCUMENT_ROOT.'/delivery/class/delivery.class.php';

+				if (!empty($conf->livraison_bon->enabled))

+				{

+					include_once DOL_DOCUMENT_ROOT.'/livraison/class/livraison.class.php';

+					$expedition->id = $objp->sendingid;

@@ -448,5 +418,4 @@
-					if (!empty($expedition->linkedObjects['delivery'])) {

-						$receiving = reset($expedition->linkedObjects['delivery']); // Take first link

-					}

-

-					if (!empty($receiving)) {

+					if (!empty($expedition->linkedObjects['delivery'])) $receiving = reset($expedition->linkedObjects['delivery']); // Take first link

+

+					if (!empty($receiving))

+					{

@@ -461 +430 @@
-						//print '<a href="'.DOL_URL_ROOT.'/delivery/card.php?id='.$livraison_id.'">'.img_object($langs->trans("ShowReceiving"),'sending').' '.$objp->livraison_ref.'<a>';

+						//print '<a href="'.DOL_URL_ROOT.'/livraison/card.php?id='.$livraison_id.'">'.img_object($langs->trans("ShowReceiving"),'sending').' '.$objp->livraison_ref.'<a>';

@@ -473 +442,3 @@
-					} else {

+					}

+					else

+					{

@@ -486 +457,3 @@
-	} else {

+	}

+	else

+	{

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_signature.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_signature.lib.php
@@ -21 +21 @@
- * Return string with full online Url to accept and sign a quote

+ * Return string with full Url

@@ -23,4 +23,3 @@
- * @param   string			$type		Type of URL ('proposal', ...)

- * @param	string			$ref		Ref of object

- * @param   Object  		$obj  		object (needed to make multicompany good links)

- * @return	string						Url string

+ * @param   string	$type		Type of URL ('proposal', ...)

+ * @param	string	$ref		Ref of object

+ * @return	string				Url string

@@ -28 +27 @@
-function showOnlineSignatureUrl($type, $ref, $obj = null)

+function showOnlineSignatureUrl($type, $ref)

@@ -33 +32 @@
-	$langs->loadLangs(array("payment", "paybox"));

+    $langs->loadLangs(array("payment", "paybox"));

@@ -37,10 +36,3 @@
-	$out = img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans("ToOfferALinkForOnlineSignature", $servicename).'</span><br>';

-	$url = getOnlineSignatureUrl(0, $type, $ref, 1, $obj);

-	$out .= '<div class="urllink">';

-	if ($url == $langs->trans("FeatureOnlineSignDisabled")) {

-		$out .= $url;

-	} else {

-		$out .= '<input type="text" id="onlinesignatureurl" class="quatrevingtpercentminusx" value="'.$url.'">';

-	}

-	$out .= '<a class="" href="'.$url.'" target="_blank" rel="noopener noreferrer">'.img_picto('', 'globe', 'class="paddingleft"').'</a>';

-	$out .= '</div>';

+	$out = img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlineSignature", $servicename).'<br>';

+	$url = getOnlineSignatureUrl(0, $type, $ref);

+	$out .= '<input type="text" id="onlinesignatureurl" class="quatrevingtpercent" value="'.$url.'">';

@@ -55,6 +47,4 @@
- * @param   int				$mode				0=True url, 1=Url formated with colors

- * @param   string			$type				Type of URL ('proposal', ...)

- * @param	string			$ref				Ref of object

- * @param   string  		$localorexternal  	0=Url for browser, 1=Url for external access

- * @param   Object  		$obj  				object (needed to make multicompany good links)

- * @return	string								Url string

+ * @param   int		$mode		0=True url, 1=Url formated with colors

+ * @param   string	$type		Type of URL ('proposal', ...)

+ * @param	string	$ref		Ref of object

+ * @return	string				Url string

@@ -62 +52 @@
-function getOnlineSignatureUrl($mode, $type, $ref = '', $localorexternal = 1, $obj = null)

+function getOnlineSignatureUrl($mode, $type, $ref = '')

@@ -64,12 +54 @@
-	global $conf, $dolibarr_main_url_root;

-

-	if (empty($obj)) {

-		// For compatibility with 15.0 -> 19.0

-		global $object;

-		if (empty($object)) {

-			$obj = new stdClass();

-		} else {

-			dol_syslog(__FUNCTION__." using global object is deprecated, please give obj as argument", LOG_WARNING);

-			$obj = $object;

-		}

-	}

+	global $conf, $db, $langs;

@@ -80,32 +59,9 @@
-	// Define $urlwithroot

-	$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));

-	$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file

-	//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current

-

-	$urltouse = DOL_MAIN_URL_ROOT;

-	if ($localorexternal) {

-		$urltouse = $urlwithroot;

-	}

-

-	$securekeyseed = '';

-

-	if ($type == 'proposal') {

-		$securekeyseed = getDolGlobalString('PROPOSAL_ONLINE_SIGNATURE_SECURITY_TOKEN');

-

-		$out = $urltouse.'/public/onlinesign/newonlinesign.php?source=proposal&ref='.($mode ? '<span style="color: #666666">' : '');

-		if ($mode == 1) {

-			$out .= 'proposal_ref';

-		}

-		if ($mode == 0) {

-			$out .= urlencode($ref);

-		}

-		$out .= ($mode ? '</span>' : '');

-		if ($mode == 1) {

-			$out .= "hash('".$securekeyseed."' + '".$type."' + proposal_ref)";

-		} else {

-			$out .= '&securekey='.dol_hash($securekeyseed.$type.$ref.(isModEnabled('multicompany') ? (empty($obj->entity) ? '' : $obj->entity) : ''), '0');

-		}

-		/*

-		if ($mode == 1) {

-			$out .= '&hashp=<span style="color: #666666">hash_of_file</span>';

-		} else {

+	if ($type == 'proposal')

+	{

+		$out = DOL_MAIN_URL_ROOT.'/public/onlinesign/newonlinesign.php?source=proposal&ref='.($mode ? '<font color="#666666">' : '');

+		if ($mode == 1) $out .= 'proposal_ref';

+		if ($mode == 0) $out .= urlencode($ref);

+		$out .= ($mode ? '</font>' : '');

+		if ($mode == 1) $out .= '&hashp=<font color="#666666">hash_of_file</font>';

+		else

+		{

@@ -115,3 +71 @@
-			if ($res <= 0) {

-				return 'FailedToGetProposal';

-			}

+			if ($res <= 0) return 'FailedToGetProposal';

@@ -125 +79,2 @@
-			if (empty($hashp)) {

+			if (empty($hashp))

+			{

@@ -128 +83,3 @@
-			} else {

+			}

+			else

+			{

@@ -131,45 +87,0 @@
-		}*/

-	} elseif ($type == 'contract') {

-		$securekeyseed = getDolGlobalString('CONTRACT_ONLINE_SIGNATURE_SECURITY_TOKEN');

-		$out = $urltouse.'/public/onlinesign/newonlinesign.php?source=contract&ref='.($mode ? '<span style="color: #666666">' : '');

-		if ($mode == 1) {

-			$out .= 'contract_ref';

-		}

-		if ($mode == 0) {

-			$out .= urlencode($ref);

-		}

-		$out .= ($mode ? '</span>' : '');

-		if ($mode == 1) {

-			$out .= "hash('".$securekeyseed."' + '".$type."' + contract_ref)";

-		} else {

-			$out .= '&securekey='.dol_hash($securekeyseed.$type.$ref.(isModEnabled('multicompany') ? (empty($obj->entity) ? '' : (int) $obj->entity) : ''), '0');

-		}

-	} elseif ($type == 'fichinter') {

-		$securekeyseed = getDolGlobalString('FICHINTER_ONLINE_SIGNATURE_SECURITY_TOKEN');

-		$out = $urltouse.'/public/onlinesign/newonlinesign.php?source=fichinter&ref='.($mode ? '<span style="color: #666666">' : '');

-		if ($mode == 1) {

-			$out .= 'fichinter_ref';

-		}

-		if ($mode == 0) {

-			$out .= urlencode($ref);

-		}

-		$out .= ($mode ? '</span>' : '');

-		if ($mode == 1) {

-			$out .= "hash('".$securekeyseed."' + '".$type."' + fichinter_ref)";

-		} else {

-			$out .= '&securekey='.dol_hash($securekeyseed.$type.$ref.(isModEnabled('multicompany') ? (empty($obj->entity) ? '' : (int) $obj->entity) : ''), '0');

-		}

-	} else {	// For example $type = 'societe_rib'

-		$securekeyseed = getDolGlobalString(dol_strtoupper($type).'_ONLINE_SIGNATURE_SECURITY_TOKEN');

-		$out = $urltouse.'/public/onlinesign/newonlinesign.php?source='.$type.'&ref='.($mode ? '<span style="color: #666666">' : '');

-		if ($mode == 1) {

-			$out .= $type.'_ref';

-		}

-		if ($mode == 0) {

-			$out .= urlencode($ref);

-		}

-		$out .= ($mode ? '</span>' : '');

-		if ($mode == 1) {

-			$out .= "hash('".$securekeyseed."' + '".$type."' + $type + '_ref)";

-		} else {

-			$out .= '&securekey='.dol_hash($securekeyseed.$type.$ref.(!isModEnabled('multicompany') ? '' : $object->entity), '0');

@@ -180,3 +92 @@
-	if (!empty($out) && isModEnabled('multicompany')) {

-		$out .= "&entity=".(empty($obj->entity) ? '' : (int) $obj->entity); // Check the entity because we may have the same reference in several entities

-	}

+	if (!empty($out)) $out .= "&entity=".$conf->entity; // Check the entity because He may be the same reference in several entities

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_stock.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_stock.lib.php
@@ -20,2 +20,2 @@
- * \file       htdocs/core/lib/stock.lib.php

- * \brief      Library file with function for stock module

+ *	    \file       htdocs/core/lib/stock.lib.php

+ *		\brief      Library file with function for stock module

@@ -42 +42,2 @@
-	if ($user->hasRight('stock', 'mouvement', 'lire')) {

+	if (!empty($user->rights->stock->mouvement->lire))

+	{

@@ -57 +58 @@
-	if (!empty($conf->global->STOCK_USE_WAREHOUSE_BY_USER))

+	if (! empty($conf->global->STOCK_USE_WAREHOUSE_BY_USER))

@@ -68,5 +69,5 @@
-	// Show more tabs from modules

-	// Entries must be declared in modules descriptor with line

-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname);   												to remove a tab

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'stock', 'add', 'core');

+    // Show more tabs from modules

+    // Entries must be declared in modules descriptor with line

+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

+    // $this->tabs = array('entity:-tabname);   												to remove a tab

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'stock');

@@ -74 +75 @@
-	$head[$h][0] = DOL_URL_ROOT.'/product/stock/info.php?id='.$object->id;

+    $head[$h][0] = DOL_URL_ROOT.'/product/stock/info.php?id='.$object->id;

@@ -79 +80 @@
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'stock', 'add', 'external');

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'stock', 'remove');

@@ -81,3 +82 @@
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'stock', 'remove');

-

-	return $head;

+    return $head;

@@ -93 +92 @@
-	global $langs, $conf, $user, $db;

+    global $langs, $conf, $user;

@@ -95,4 +94,2 @@
-	$extrafields = new ExtraFields($db);

-	$extrafields->fetch_name_optionals_label('entrepot');

-	$extrafields->fetch_name_optionals_label('stock_mouvement');

-	$extrafields->fetch_name_optionals_label('inventory');

+    $h = 0;

+    $head = array();

@@ -100,2 +97,4 @@
-	$h = 0;

-	$head = array();

+    $head[$h][0] = DOL_URL_ROOT.'/admin/stock.php';

+    $head[$h][1] = $langs->trans("Miscellaneous");

+    $head[$h][2] = 'general';

+    $h++;

@@ -103,4 +102,5 @@
-	$head[$h][0] = DOL_URL_ROOT.'/admin/stock.php';

-	$head[$h][1] = $langs->trans("Miscellaneous");

-	$head[$h][2] = 'general';

-	$h++;

+    // Show more tabs from modules

+    // Entries must be declared in modules descriptor with line

+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

+    // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab

+    complete_head_from_modules($conf, $langs, null, $head, $h, 'stock_admin');

@@ -108,5 +108,4 @@
-	// Show more tabs from modules

-	// Entries must be declared in modules descriptor with line

-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab

-	complete_head_from_modules($conf, $langs, null, $head, $h, 'stock_admin');

+    $head[$h][0] = DOL_URL_ROOT.'/product/admin/stock_extrafields.php';

+    $head[$h][1] = $langs->trans("ExtraFields");

+    $head[$h][2] = 'attributes';

+    $h++;

@@ -114,8 +113 @@
-	$head[$h][0] = DOL_URL_ROOT.'/product/admin/stock_extrafields.php';

-	$head[$h][1] = $langs->trans("ExtraFields");

-	$nbExtrafields = $extrafields->attributes['entrepot']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

-	$head[$h][2] = 'attributes';

-	$h++;

+    complete_head_from_modules($conf, $langs, null, $head, $h, 'stock_admin', 'remove');

@@ -123,21 +115 @@
-	$head[$h][0] = DOL_URL_ROOT.'/product/admin/stock_mouvement_extrafields.php';

-	$head[$h][1] = $langs->trans("StockMouvementExtraFields");

-	$nbExtrafields = $extrafields->attributes['stock_mouvement']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

-	$head[$h][2] = 'stockMouvementAttributes';

-	$h++;

-

-	$head[$h][0] = DOL_URL_ROOT.'/product/admin/inventory_extrafields.php';

-	$head[$h][1] = $langs->trans("InventoryExtraFields");

-	$nbExtrafields = $extrafields->attributes['inventory']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

-	$head[$h][2] = 'inventoryAttributes';

-	$h++;

-

-	complete_head_from_modules($conf, $langs, null, $head, $h, 'stock_admin', 'remove');

-

-	return $head;

+    return $head;

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_supplier_proposal.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_supplier_proposal.lib.php
@@ -4 +3,0 @@
- * Copyright (C) 2022       Frédéric France         <frederic.france@netlogic.fr>

@@ -38 +37 @@
-	$langs->loadLangs(array("supplier_proposal", "compta"));

+    $langs->loadLangs(array("supplier_proposal", "compta"));

@@ -44 +43 @@
-	$head[$h][1] = $langs->trans('CommRequests');

+	$head[$h][1] = $langs->trans('SupplierProposalCard');

@@ -48 +47,2 @@
-	if (!getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB')) {

+	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))

+	{

@@ -52,3 +52 @@
-		if ($nbContact > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';

-		}

+		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';

@@ -59,5 +57,5 @@
-	// Show more tabs from modules

-	// Entries must be declared in modules descriptor with line

-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname);   												to remove a tab

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'supplier_proposal', 'add', 'core');

+    // Show more tabs from modules

+    // Entries must be declared in modules descriptor with line

+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

+    // $this->tabs = array('entity:-tabname);   												to remove a tab

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'supplier_proposal');

@@ -65,9 +63,6 @@
-	if (!getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {

-		$nbNote = 0;

-		if (!empty($object->note_private)) {

-			$nbNote++;

-		}

-		if (!empty($object->note_public)) {

-			$nbNote++;

-		}

-		$head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/note.php?id='.$object->id;

+    if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))

+    {

+    	$nbNote = 0;

+        if (!empty($object->note_private)) $nbNote++;

+		if (!empty($object->note_public)) $nbNote++;

+	    $head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/note.php?id='.$object->id;

@@ -75,3 +70 @@
-		if ($nbNote > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

-		}

+		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

@@ -80 +73 @@
-	}

+    }

@@ -83 +76 @@
-	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

+    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

@@ -86 +79 @@
-	$nbLinks = Link::count($db, $object->element, $object->id);

+    $nbLinks = Link::count($db, $object->element, $object->id);

@@ -89,3 +82 @@
-	if (($nbFiles + $nbLinks) > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

-	}

+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

@@ -99,2 +89,0 @@
-

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'supplier_proposal', 'add', 'external');

@@ -114,5 +103 @@
-	global $langs, $conf, $user, $db;

-

-	$extrafields = new ExtraFields($db);

-	$extrafields->fetch_name_optionals_label('supplier_proposal');

-	$extrafields->fetch_name_optionals_label('supplier_proposaldet');

+	global $langs, $conf, $user;

@@ -136,6 +121,2 @@
-	$nbExtrafields = $extrafields->attributes['supplier_proposal']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

-	$head[$h][2] = 'attributes';

-	$h++;

+    $head[$h][2] = 'attributes';

+    $h++;

@@ -143,8 +124,4 @@
-	$head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/admin/supplier_proposaldet_extrafields.php';

-	$head[$h][1] = $langs->trans("ExtraFieldsLines");

-	$nbExtrafields = $extrafields->attributes['supplier_proposaldet']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

-	$head[$h][2] = 'attributeslines';

-	$h++;

+    $head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/admin/supplier_proposaldet_extrafields.php';

+    $head[$h][1] = $langs->trans("ExtraFieldsLines");

+    $head[$h][2] = 'attributeslines';

+    $h++;

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_takepos.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_takepos.lib.php
@@ -2,2 +2 @@
-/* Copyright (C) 2009       Laurent Destailleur <eldy@users.sourceforge.net>

- * Copyright (C) 2022       Alexandre Spangaro  <aspangaro@open-dsi.fr>

+/* Copyright (C) 2009 Laurent Destailleur  <eldy@users.sourceforge.net>

@@ -30 +29 @@
-function takepos_admin_prepare_head()

+function takepos_prepare_head()

@@ -42,5 +40,0 @@
-	$head[$h][0] = DOL_URL_ROOT.'/takepos/admin/appearance.php';

-	$head[$h][1] = $langs->trans("Appearance");

-	$head[$h][2] = 'appearance';

-	$h++;

-

@@ -48 +42 @@
-	$head[$h][1] = $langs->trans("Printers").' / '.$langs->trans("Receipt");

+	$head[$h][1] = $langs->trans("Receipt");

@@ -52,4 +46,7 @@
-	$head[$h][0] = DOL_URL_ROOT.'/takepos/admin/bar.php';

-	$head[$h][1] = $langs->trans("BarRestaurant");

-	$head[$h][2] = 'bar';

-	$h++;

+	if ($conf->global->TAKEPOS_BAR_RESTAURANT)

+	{

+		$head[$h][0] = DOL_URL_ROOT.'/takepos/admin/bar.php';

+		$head[$h][1] = $langs->trans("BarRestaurant");

+		$head[$h][2] = 'bar';

+		$h++;

+	}

@@ -57,2 +54,3 @@
-	$numterminals = max(1, getDolGlobalInt('TAKEPOS_NUM_TERMINALS', 1));

-	for ($i = 1; $i <= $numterminals; $i++) {

+	$numterminals = max(1, $conf->global->TAKEPOS_NUM_TERMINALS);

+	for ($i = 1; $i <= $numterminals; $i++)

+	{

@@ -60 +58 @@
-		$head[$h][1] = getDolGlobalString('TAKEPOS_TERMINAL_NAME_'.$i, $langs->trans("TerminalName", $i));

+		$head[$h][1] = $langs->trans("Terminal")." ".$i;

@@ -66 +64 @@
-	$head[$h][1] = $langs->trans("About");

+	$head[$h][1] = $langs->trans("Other");

@@ -70 +68 @@
-	complete_head_from_modules($conf, $langs, null, $head, $h, 'takepos_admin');

+	complete_head_from_modules($conf, $langs, null, $head, $h, 'takepos');

@@ -72,3 +70 @@
-	complete_head_from_modules($conf, $langs, null, $head, $h, 'takepos_admin', 'remove');

-

-	return $head;

+    return $head;

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_tax.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_tax.lib.php
@@ -2,8 +2,7 @@
-/* Copyright (C) 2004-2009  Laurent Destailleur <eldy@users.sourceforge.net>

- * Copyright (C) 2006-2007  Yannick Warnier     <ywarnier@beeznest.org>

- * Copyright (C) 2011	    Regis Houssin       <regis.houssin@inodbox.com>

- * Copyright (C) 2012-2017  Juanjo Menent       <jmenent@2byte.es>

- * Copyright (C) 2012       Cédric Salvador     <csalvador@gpcsolutions.fr>

- * Copyright (C) 2012-2014  Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>

- * Copyright (C) 2015       Marcos García       <marcosgdf@gmail.com>

- * Copyright (C) 2021-2022  Open-Dsi            <support@open-dsi.fr>

+/* Copyright (C) 2004-2009 Laurent Destailleur	<eldy@users.sourceforge.net>

+ * Copyright (C) 2006-2007 Yannick Warnier		<ywarnier@beeznest.org>

+ * Copyright (C) 2011	   Regis Houssin		<regis.houssin@inodbox.com>

+ * Copyright (C) 2012-2017 Juanjo Menent		<jmenent@2byte.es>

+ * Copyright (C) 2012      Cédric Salvador      <csalvador@gpcsolutions.fr>

+ * Copyright (C) 2012-2014 Raphaël Doursenaud   <rdoursenaud@gpcsolutions.fr>

+ * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>

@@ -40,4 +39,4 @@
-	global $db, $langs, $conf, $user;

-

-	$h = 0;

-	$head = array();

+    global $db, $langs, $conf, $user;

+

+    $h = 0;

+    $head = array();

@@ -46 +45 @@
-	$head[$h][1] = $langs->trans('SocialContribution');

+	$head[$h][1] = $langs->trans('Card');

@@ -50,5 +49,5 @@
-	// Show more tabs from modules

-	// Entries must be declared in modules descriptor with line

-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname);   												to remove a tab

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'tax');

+    // Show more tabs from modules

+    // Entries must be declared in modules descriptor with line

+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

+    // $this->tabs = array('entity:-tabname);   												to remove a tab

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'tax');

@@ -57 +56 @@
-	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

+    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

@@ -60 +59 @@
-	$nbLinks = Link::count($db, $object->element, $object->id);

+    $nbLinks = Link::count($db, $object->element, $object->id);

@@ -63,3 +62 @@
-	if (($nbFiles + $nbLinks) > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

-	}

+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

@@ -69,26 +66,8 @@
-

-	$nbNote = 0;

-	if (!empty($object->note_private)) {

-		$nbNote++;

-	}

-	if (!empty($object->note_public)) {

-		$nbNote++;

-	}

-	$head[$h][0] = DOL_URL_ROOT.'/compta/sociales/note.php?id='.$object->id;

-	$head[$h][1] = $langs->trans('Notes');

-	if ($nbNote > 0) {

-		$head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');

-	}

-	$head[$h][2] = 'note';

-	$h++;

-

-

-	$head[$h][0] = DOL_URL_ROOT.'/compta/sociales/info.php?id='.$object->id;

-	$head[$h][1] = $langs->trans("Info");

-	$head[$h][2] = 'info';

-	$h++;

-

-

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'tax', 'remove');

-

-	return $head;

+    $head[$h][0] = DOL_URL_ROOT.'/compta/sociales/info.php?id='.$object->id;

+    $head[$h][1] = $langs->trans("Info");

+    $head[$h][2] = 'info';

+    $h++;

+

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'tax', 'remove');

+

+    return $head;

@@ -114,569 +93,448 @@
-	global $conf;

-

-	// If we use date_start and date_end, we must not use $y, $m, $q

-	if (($date_start || $date_end) && (!empty($y) || !empty($m) || !empty($q))) {

-		dol_print_error('', 'Bad value of input parameter for tax_by_rate');

-	}

-

-	$list = array();

-	if ($direction == 'sell') {

-		$invoicetable = 'facture';

-		$invoicedettable = 'facturedet';

-		$fk_facture = 'fk_facture';

-		$fk_facture2 = 'fk_facture';

-		$fk_payment = 'fk_paiement';

-		$total_tva = 'total_tva';

-		$paymenttable = 'paiement';

-		$paymentfacturetable = 'paiement_facture';

-		$invoicefieldref = 'ref';

-	} elseif ($direction == 'buy') {

-		$invoicetable = 'facture_fourn';

-		$invoicedettable = 'facture_fourn_det';

-		$fk_facture = 'fk_facture_fourn';

-		$fk_facture2 = 'fk_facturefourn';

-		$fk_payment = 'fk_paiementfourn';

-		$total_tva = 'tva';

-		$paymenttable = 'paiementfourn';

-		$paymentfacturetable = 'paiementfourn_facturefourn';

-		$invoicefieldref = 'ref';

-	}

-

-	if (strpos($type, 'localtax') === 0) {

-		$f_rate = $type.'_tx';

-	} else {

-		$f_rate = 'tva_tx';

-	}

-

-	$total_localtax1 = 'total_localtax1';

-	$total_localtax2 = 'total_localtax2';

-

-

-	// CAS DES BIENS/PRODUITS

-

-	// Define sql request

-	$sql = '';

-	if (($direction == 'sell' && getDolGlobalString('TAX_MODE_SELL_PRODUCT') == 'invoice')

-		|| ($direction == 'buy' && getDolGlobalString('TAX_MODE_BUY_PRODUCT') == 'invoice')) {

-		// Count on delivery date (use invoice date as delivery is unknown)

-		$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";

-		$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";

-		$sql .= " d.date_start as date_start, d.date_end as date_end,";

-		$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef,";

-		$sql .= " s.nom as company_name, s.name_alias as company_alias, s.rowid as company_id, s.client as company_client, s.fournisseur as company_fournisseur, s.email as company_email,";

-		$sql .= " s.code_client as company_customer_code, s.code_fournisseur as company_supplier_code,";

-		$sql .= " s.code_compta as company_customer_accounting_code, s.code_compta_fournisseur as company_supplier_accounting_code,";

-		$sql .= " s.status as company_status, s.tva_intra as company_tva_intra,";

-		$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype, p.tosell as pstatus, p.tobuy as pstatusbuy,";

-		$sql .= " 0 as payment_id, '' as payment_ref, 0 as payment_amount";

-		$sql .= " ,'' as datep";

-		$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";

-		$sql .= " ".MAIN_DB_PREFIX."societe as s,";

-		$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";

-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";

-		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";

-		$sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)

-		if ($direction == 'buy') {

-			if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {

-				$sql .= " AND f.type IN (0,1,2,5)";

-			} else {

-				$sql .= " AND f.type IN (0,1,2,3,5)";

-			}

-		} else {

-			if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {

-				$sql .= " AND f.type IN (0,1,2,5)";

-			} else {

-				$sql .= " AND f.type IN (0,1,2,3,5)";

-			}

-		}

-		$sql .= " AND f.rowid = d.".$fk_facture;

-		$sql .= " AND s.rowid = f.fk_soc";

-		if ($y && $m) {

-			$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";

-			$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";

-		} elseif ($y) {

-			$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";

-			$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";

-		}

-		if ($q) {

-			$sql .= " AND f.datef > '".$db->idate(dol_get_first_day($y, (($q - 1) * 3) + 1, false))."'";

-			$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, ($q * 3), false))."'";

-		}

-		if ($date_start && $date_end) {

-			$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";

-		}

-		$sql .= " AND (d.product_type = 0"; // Limit to products

-		$sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products

-		if (getDolGlobalString('MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS')) {

-			$sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";

-		}

-		$sql .= " ORDER BY d.rowid, d.".$fk_facture;

-	} else {

-		// Count on payments date

-		$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";

-		$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";

-		$sql .= " d.date_start as date_start, d.date_end as date_end,";

-		$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef,";

-		$sql .= " s.nom as company_name, s.name_alias as company_alias, s.rowid as company_id, s.client as company_client, s.fournisseur as company_fournisseur, s.email as company_email,";

-		$sql .= " s.code_client as company_customer_code, s.code_fournisseur as company_supplier_code,";

-		$sql .= " s.code_compta as company_customer_accounting_code, s.code_compta_fournisseur as company_supplier_accounting_code,";

-		$sql .= " s.status as company_status, s.tva_intra as company_tva_intra,";

-		$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype, p.tosell as pstatus, p.tobuy as pstatusbuy,";

-		$sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";

-		$sql .= " pa.datep as datep, pa.ref as payment_ref";

-		$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";

-		$sql .= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";

-		$sql .= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";

-		$sql .= " ".MAIN_DB_PREFIX."societe as s,";

-		$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";

-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";

-		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";

-		$sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)

-		if ($direction == 'buy') {

-			if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {

-				$sql .= " AND f.type IN (0,1,2,5)";

-			} else {

-				$sql .= " AND f.type IN (0,1,2,3,5)";

-			}

-		} else {

-			if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {

-				$sql .= " AND f.type IN (0,1,2,5)";

-			} else {

-				$sql .= " AND f.type IN (0,1,2,3,5)";

-			}

-		}

-		$sql .= " AND f.rowid = d.".$fk_facture;

-		$sql .= " AND s.rowid = f.fk_soc";

-		$sql .= " AND pf.".$fk_facture2." = f.rowid";

-		$sql .= " AND pa.rowid = pf.".$fk_payment;

-		if ($y && $m) {

-			$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";

-			$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";

-		} elseif ($y) {

-			$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";

-			$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";

-		}

-		if ($q) {

-			$sql .= " AND pa.datep > '".$db->idate(dol_get_first_day($y, (($q - 1) * 3) + 1, false))."'";

-			$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, ($q * 3), false))."'";

-		}

-		if ($date_start && $date_end) {

-			$sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";

-		}

-		$sql .= " AND (d.product_type = 0"; // Limit to products

-		$sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products

-		if (getDolGlobalString('MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS')) {

-			$sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";

-		}

-		$sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";

-	}

-

-	if (!$sql) {

-		return -1;

-	}

-	if ($sql == 'TODO') {

-		return -2;

-	}

-	if ($sql != 'TODO') {

-		dol_syslog("Tax.lib.php::tax_by_thirdparty", LOG_DEBUG);

-

-		$resql = $db->query($sql);

-		if ($resql) {

-			$company_id = -1;

-			$oldrowid = '';

-			while ($assoc = $db->fetch_array($resql)) {

-				if (!isset($list[$assoc['company_id']]['totalht'])) {

-					$list[$assoc['company_id']]['totalht'] = 0;

-				}

-				if (!isset($list[$assoc['company_id']]['vat'])) {

-					$list[$assoc['company_id']]['vat'] = 0;

-				}

-				if (!isset($list[$assoc['company_id']]['localtax1'])) {

-					$list[$assoc['company_id']]['localtax1'] = 0;

-				}

-				if (!isset($list[$assoc['company_id']]['localtax2'])) {

-					$list[$assoc['company_id']]['localtax2'] = 0;

-				}

-

-				if ($assoc['rowid'] != $oldrowid) {       // Si rupture sur d.rowid

-					$oldrowid = $assoc['rowid'];

-					$list[$assoc['company_id']]['totalht']  += $assoc['total_ht'];

-					$list[$assoc['company_id']]['vat']      += $assoc['total_vat'];

-					$list[$assoc['company_id']]['localtax1']      += $assoc['total_localtax1'];

-					$list[$assoc['company_id']]['localtax2']      += $assoc['total_localtax2'];

-				}

-

-				$list[$assoc['company_id']]['dtotal_ttc'][] = $assoc['total_ttc'];

-				$list[$assoc['company_id']]['dtype'][] = $assoc['dtype'];

-				$list[$assoc['company_id']]['datef'][] = $db->jdate($assoc['datef']);

-				$list[$assoc['company_id']]['datep'][] = $db->jdate($assoc['datep']);

-

-				$list[$assoc['company_id']]['company_name'][] = $assoc['company_name'];

-				$list[$assoc['company_id']]['company_id'][] = $assoc['company_id'];

-				$list[$assoc['company_id']]['company_alias'][] = $assoc['company_alias'];

-				$list[$assoc['company_id']]['company_email'][] = $assoc['company_email'];

-				$list[$assoc['company_id']]['company_tva_intra'][] = $assoc['company_tva_intra'];

-				$list[$assoc['company_id']]['company_client'][] = $assoc['company_client'];

-				$list[$assoc['company_id']]['company_fournisseur'][] = $assoc['company_fournisseur'];

-				$list[$assoc['company_id']]['company_customer_code'][] = $assoc['company_customer_code'];

-				$list[$assoc['company_id']]['company_supplier_code'][] = $assoc['company_supplier_code'];

-				$list[$assoc['company_id']]['company_customer_accounting_code'][] = $assoc['company_customer_accounting_code'];

-				$list[$assoc['company_id']]['company_supplier_accounting_code'][] = $assoc['company_supplier_accounting_code'];

-				$list[$assoc['company_id']]['company_status'][] = $assoc['company_status'];

-

-				$list[$assoc['company_id']]['drate'][] = $assoc['rate'];

-				$list[$assoc['company_id']]['ddate_start'][] = $db->jdate($assoc['date_start']);

-				$list[$assoc['company_id']]['ddate_end'][] = $db->jdate($assoc['date_end']);

-

-				$list[$assoc['company_id']]['facid'][] = $assoc['facid'];

-				$list[$assoc['company_id']]['facnum'][] = $assoc['facnum'];

-				$list[$assoc['company_id']]['type'][] = $assoc['type'];

-				$list[$assoc['company_id']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];

-				$list[$assoc['company_id']]['descr'][] = $assoc['descr'];

-

-				$list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht'];

-				$list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat'];

-				$list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1'];

-				$list[$assoc['company_id']]['localtax2_list'][] = $assoc['total_localtax2'];

-

-				$list[$assoc['company_id']]['pid'][] = $assoc['pid'];

-				$list[$assoc['company_id']]['pref'][] = $assoc['pref'];

-				$list[$assoc['company_id']]['ptype'][] = $assoc['ptype'];

-

-				$list[$assoc['company_id']]['payment_id'][] = $assoc['payment_id'];

-				$list[$assoc['company_id']]['payment_amount'][] = $assoc['payment_amount'];

-

-				$company_id = $assoc['company_id'];

-			}

-		} else {

-			dol_print_error($db);

-			return -3;

-		}

-	}

-

-

-	// CAS DES SERVICES

-

-	// Define sql request

-	$sql = '';

-	if (($direction == 'sell' && getDolGlobalString('TAX_MODE_SELL_SERVICE') == 'invoice')

-		|| ($direction == 'buy' && getDolGlobalString('TAX_MODE_BUY_SERVICE') == 'invoice')) {

-		// Count on invoice date

-		$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";

-		$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";

-		$sql .= " d.date_start as date_start, d.date_end as date_end,";

-		$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef,";

-		$sql .= " s.nom as company_name, s.name_alias as company_alias, s.rowid as company_id, s.client as company_client, s.fournisseur as company_fournisseur, s.email as company_email,";

-		$sql .= " s.code_client as company_customer_code, s.code_fournisseur as company_supplier_code,";

-		$sql .= " s.code_compta as company_customer_accounting_code, s.code_compta_fournisseur as company_supplier_accounting_code,";

-		$sql .= " s.status as company_status, s.tva_intra as company_tva_intra,";

-		$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype, p.tosell as pstatus, p.tobuy as pstatusbuy,";

-		$sql .= " 0 as payment_id, '' as payment_ref, 0 as payment_amount";

-		$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";

-		$sql .= " ".MAIN_DB_PREFIX."societe as s,";

-		$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";

-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";

-		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";

-		$sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)

-		if ($direction == 'buy') {

-			if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {

-				$sql .= " AND f.type IN (0,1,2,5)";

-			} else {

-				$sql .= " AND f.type IN (0,1,2,3,5)";

-			}

-		} else {

-			if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {

-				$sql .= " AND f.type IN (0,1,2,5)";

-			} else {

-				$sql .= " AND f.type IN (0,1,2,3,5)";

-			}

-		}

-		$sql .= " AND f.rowid = d.".$fk_facture;

-		$sql .= " AND s.rowid = f.fk_soc";

-		if ($y && $m) {

-			$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";

-			$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";

-		} elseif ($y) {

-			$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";

-			$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";

-		}

-		if ($q) {

-			$sql .= " AND f.datef > '".$db->idate(dol_get_first_day($y, (($q - 1) * 3) + 1, false))."'";

-			$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, ($q * 3), false))."'";

-		}

-		if ($date_start && $date_end) {

-			$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";

-		}

-		$sql .= " AND (d.product_type = 1"; // Limit to services

-		$sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service

-		if (getDolGlobalString('MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS')) {

-			$sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";

-		}

-		$sql .= " ORDER BY d.rowid, d.".$fk_facture;

-	} else {

-		// Count on payments date

-		$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";

-		$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";

-		$sql .= " d.date_start as date_start, d.date_end as date_end,";

-		$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef,";

-		$sql .= " s.nom as company_name, s.name_alias as company_alias, s.rowid as company_id, s.client as company_client, s.fournisseur as company_fournisseur, s.email as company_email,";

-		$sql .= " s.code_client as company_customer_code, s.code_fournisseur as company_supplier_code,";

-		$sql .= " s.code_compta as company_customer_accounting_code, s.code_compta_fournisseur as company_supplier_accounting_code,";

-		$sql .= " s.status as company_status, s.tva_intra as company_tva_intra,";

-		$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype, p.tosell as pstatus, p.tobuy as pstatusbuy,";

-		$sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";

-		$sql .= " pa.datep as datep, pa.ref as payment_ref";

-		$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";

-		$sql .= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";

-		$sql .= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";

-		$sql .= " ".MAIN_DB_PREFIX."societe as s,";

-		$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";

-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";

-		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";

-		$sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)

-		if ($direction == 'buy') {

-			if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {

-				$sql .= " AND f.type IN (0,1,2,5)";

-			} else {

-				$sql .= " AND f.type IN (0,1,2,3,5)";

-			}

-		} else {

-			if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {

-				$sql .= " AND f.type IN (0,1,2,5)";

-			} else {

-				$sql .= " AND f.type IN (0,1,2,3,5)";

-			}

-		}

-		$sql .= " AND f.rowid = d.".$fk_facture;

-		$sql .= " AND s.rowid = f.fk_soc";

-		$sql .= " AND pf.".$fk_facture2." = f.rowid";

-		$sql .= " AND pa.rowid = pf.".$fk_payment;

-		if ($y && $m) {

-			$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";

-			$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";

-		} elseif ($y) {

-			$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";

-			$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";

-		}

-		if ($q) {

-			$sql .= " AND pa.datep > '".$db->idate(dol_get_first_day($y, (($q - 1) * 3) + 1, false))."'";

-			$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, ($q * 3), false))."'";

-		}

-		if ($date_start && $date_end) {

-			$sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";

-		}

-		$sql .= " AND (d.product_type = 1"; // Limit to services

-		$sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service

-		if (getDolGlobalString('MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS')) {

-			$sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";

-		}

-		$sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";

-	}

-

-	if (!$sql) {

-		dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql, LOG_ERR);

-		return -1; // -1 = Not accountancy module enabled

-	}

-	if ($sql == 'TODO') {

-		return -2; // -2 = Feature not yet available

-	}

-	if ($sql != 'TODO') {

-		dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);

-		$resql = $db->query($sql);

-		if ($resql) {

-			$company_id = -1;

-			$oldrowid = '';

-			while ($assoc = $db->fetch_array($resql)) {

-				if (!isset($list[$assoc['company_id']]['totalht'])) {

-					$list[$assoc['company_id']]['totalht'] = 0;

-				}

-				if (!isset($list[$assoc['company_id']]['vat'])) {

-					$list[$assoc['company_id']]['vat'] = 0;

-				}

-				if (!isset($list[$assoc['company_id']]['localtax1'])) {

-					$list[$assoc['company_id']]['localtax1'] = 0;

-				}

-				if (!isset($list[$assoc['company_id']]['localtax2'])) {

-					$list[$assoc['company_id']]['localtax2'] = 0;

-				}

-

-				if ($assoc['rowid'] != $oldrowid) {       // Si rupture sur d.rowid

-					$oldrowid = $assoc['rowid'];

-					$list[$assoc['company_id']]['totalht']  += $assoc['total_ht'];

-					$list[$assoc['company_id']]['vat']      += $assoc['total_vat'];

-					$list[$assoc['company_id']]['localtax1']	 += $assoc['total_localtax1'];

-					$list[$assoc['company_id']]['localtax2']	 += $assoc['total_localtax2'];

-				}

-				$list[$assoc['company_id']]['dtotal_ttc'][] = $assoc['total_ttc'];

-				$list[$assoc['company_id']]['dtype'][] = $assoc['dtype'];

-				$list[$assoc['company_id']]['datef'][] = $db->jdate($assoc['datef']);

-				$list[$assoc['company_id']]['datep'][] = $db->jdate($assoc['datep']);

-

-				$list[$assoc['company_id']]['company_name'][] = $assoc['company_name'];

-				$list[$assoc['company_id']]['company_id'][] = $assoc['company_id'];

-				$list[$assoc['company_id']]['company_alias'][] = $assoc['company_alias'];

-				$list[$assoc['company_id']]['company_email'][] = $assoc['company_email'];

-				$list[$assoc['company_id']]['company_tva_intra'][] = $assoc['company_tva_intra'];

-				$list[$assoc['company_id']]['company_client'][] = $assoc['company_client'];

-				$list[$assoc['company_id']]['company_fournisseur'][] = $assoc['company_fournisseur'];

-				$list[$assoc['company_id']]['company_customer_code'][] = $assoc['company_customer_code'];

-				$list[$assoc['company_id']]['company_supplier_code'][] = $assoc['company_supplier_code'];

-				$list[$assoc['company_id']]['company_customer_accounting_code'][] = $assoc['company_customer_accounting_code'];

-				$list[$assoc['company_id']]['company_supplier_accounting_code'][] = $assoc['company_supplier_accounting_code'];

-				$list[$assoc['company_id']]['company_status'][] = $assoc['company_status'];

-

-				$list[$assoc['company_id']]['drate'][] = $assoc['rate'];

-				$list[$assoc['company_id']]['ddate_start'][] = $db->jdate($assoc['date_start']);

-				$list[$assoc['company_id']]['ddate_end'][] = $db->jdate($assoc['date_end']);

-

-				$list[$assoc['company_id']]['facid'][] = $assoc['facid'];

-				$list[$assoc['company_id']]['facnum'][] = $assoc['facnum'];

-				$list[$assoc['company_id']]['type'][] = $assoc['type'];

-				$list[$assoc['company_id']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];

-				$list[$assoc['company_id']]['descr'][] = $assoc['descr'];

-

-				$list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht'];

-				$list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat'];

-				$list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1'];

-				$list[$assoc['company_id']]['localtax2_list'][] = $assoc['total_localtax2'];

-

-				$list[$assoc['company_id']]['pid'][] = $assoc['pid'];

-				$list[$assoc['company_id']]['pref'][] = $assoc['pref'];

-				$list[$assoc['company_id']]['ptype'][] = $assoc['ptype'];

-

-				$list[$assoc['company_id']]['payment_id'][] = $assoc['payment_id'];

-				$list[$assoc['company_id']]['payment_ref'][] = $assoc['payment_ref'];

-				$list[$assoc['company_id']]['payment_amount'][] = $assoc['payment_amount'];

-

-				$company_id = $assoc['company_id'];

-			}

-		} else {

-			dol_print_error($db);

-			return -3;

-		}

-	}

-

-

-	// CASE OF EXPENSE REPORT

-

-	if ($direction == 'buy') {		// buy only for expense reports

-		// Define sql request

-		$sql = '';

-

-		// Count on payments date

-		$sql = "SELECT d.rowid, d.product_type as dtype, e.rowid as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.total_tva as total_vat, e.note_private as descr,";

-		$sql .= " d.total_localtax1 as total_localtax1, d.total_localtax2 as total_localtax2, ";

-		$sql .= " e.date_debut as date_start, e.date_fin as date_end, e.fk_user_author,";

-		$sql .= " e.ref as facnum, e.total_ttc as ftotal_ttc, e.date_create, d.fk_c_type_fees as type,";

-		$sql .= " p.fk_bank as payment_id, p.amount as payment_amount, p.rowid as pid, e.ref as pref";

-		$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as e";

-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport_det as d ON d.fk_expensereport = e.rowid ";

-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."payment_expensereport as p ON p.fk_expensereport = e.rowid ";

-		$sql .= " WHERE e.entity = ".$conf->entity;

-		$sql .= " AND e.fk_statut in (6)";

-		if ($y && $m) {

-			$sql .= " AND p.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";

-			$sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";

-		} elseif ($y) {

-			$sql .= " AND p.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";

-			$sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";

-		}

-		if ($q) {

-			$sql .= " AND p.datep > '".$db->idate(dol_get_first_day($y, (($q - 1) * 3) + 1, false))."'";

-			$sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, ($q * 3), false))."'";

-		}

-		if ($date_start && $date_end) {

-			$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";

-		}

-		$sql .= " AND (d.product_type = -1";

-		$sql .= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)"; // enhance detection of service

-		if (getDolGlobalString('MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS')) {

-			$sql .= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";

-		}

-		$sql .= " ORDER BY e.rowid";

-

-		if (!$sql) {

-			dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql, LOG_ERR);

-			return -1; // -1 = Not accountancy module enabled

-		}

-		if ($sql == 'TODO') {

-			return -2; // -2 = Feature not yet available

-		}

-		if ($sql != 'TODO') {

-			dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);

-			$resql = $db->query($sql);

-			if ($resql) {

-				$company_id = -1;

-				$oldrowid = '';

-				while ($assoc = $db->fetch_array($resql)) {

-					if (!isset($list[$assoc['company_id']]['totalht'])) {

-						$list[$assoc['company_id']]['totalht'] = 0;

-					}

-					if (!isset($list[$assoc['company_id']]['vat'])) {

-						$list[$assoc['company_id']]['vat'] = 0;

-					}

-					if (!isset($list[$assoc['company_id']]['localtax1'])) {

-						$list[$assoc['company_id']]['localtax1'] = 0;

-					}

-					if (!isset($list[$assoc['company_id']]['localtax2'])) {

-						$list[$assoc['company_id']]['localtax2'] = 0;

-					}

-

-					if ($assoc['rowid'] != $oldrowid) {       // Si rupture sur d.rowid

-						$oldrowid = $assoc['rowid'];

-						$list[$assoc['company_id']]['totalht'] += $assoc['total_ht'];

-						$list[$assoc['company_id']]['vat'] += $assoc['total_vat'];

-						$list[$assoc['company_id']]['localtax1']	 += $assoc['total_localtax1'];

-						$list[$assoc['company_id']]['localtax2']	 += $assoc['total_localtax2'];

-					}

-

-					$list[$assoc['company_id']]['dtotal_ttc'][] = $assoc['total_ttc'];

-					$list[$assoc['company_id']]['dtype'][] = 'ExpenseReportPayment';

-					$list[$assoc['company_id']]['datef'][] = $assoc['datef'];

-

-					$list[$assoc['company_id']]['company_name'][] = '';

-					$list[$assoc['company_id']]['company_id'][] = '';

-					$list[$assoc['company_id']]['company_alias'][] = '';

-					$list[$assoc['company_id']]['company_email'][] = '';

-					$list[$assoc['company_id']]['company_tva_intra'][] = '';

-					$list[$assoc['company_id']]['company_client'][] = '';

-					$list[$assoc['company_id']]['company_fournisseur'][] = '';

-					$list[$assoc['company_id']]['company_customer_code'][] = '';

-					$list[$assoc['company_id']]['company_supplier_code'][] = '';

-					$list[$assoc['company_id']]['company_customer_accounting_code'][] = '';

-					$list[$assoc['company_id']]['company_supplier_accounting_code'][] = '';

-					$list[$assoc['company_id']]['company_status'][] = '';

-

-					$list[$assoc['company_id']]['user_id'][] = $assoc['fk_user_author'];

-					$list[$assoc['company_id']]['drate'][] = $assoc['rate'];

-					$list[$assoc['company_id']]['ddate_start'][] = $db->jdate($assoc['date_start']);

-					$list[$assoc['company_id']]['ddate_end'][] = $db->jdate($assoc['date_end']);

-

-					$list[$assoc['company_id']]['facid'][] = $assoc['facid'];

-					$list[$assoc['company_id']]['facnum'][] = $assoc['facnum'];

-					$list[$assoc['company_id']]['type'][] = $assoc['type'];

-					$list[$assoc['company_id']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];

-					$list[$assoc['company_id']]['descr'][] = $assoc['descr'];

-

-					$list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht'];

-					$list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat'];

-					$list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1'];

-					$list[$assoc['company_id']]['localtax2_list'][] = $assoc['total_localtax2'];

-

-					$list[$assoc['company_id']]['pid'][] = $assoc['pid'];

-					$list[$assoc['company_id']]['pref'][] = $assoc['pref'];

-					$list[$assoc['company_id']]['ptype'][] = 'ExpenseReportPayment';

-

-					$list[$assoc['company_id']]['payment_id'][] = $assoc['payment_id'];

-					$list[$assoc['company_id']]['payment_ref'][] = $assoc['payment_ref'];

-					$list[$assoc['company_id']]['payment_amount'][] = $assoc['payment_amount'];

-

-					$company_id = $assoc['company_id'];

-				}

-			} else {

-				dol_print_error($db);

-				return -3;

-			}

-		}

-	}

-

-	return $list;

+    global $conf;

+

+    // If we use date_start and date_end, we must not use $y, $m, $q

+    if (($date_start || $date_end) && (!empty($y) || !empty($m) || !empty($q)))

+    {

+    	dol_print_error('', 'Bad value of input parameter for tax_by_rate');

+    }

+

+    $list = array();

+    if ($direction == 'sell')

+    {

+    	$invoicetable = 'facture';

+    	$invoicedettable = 'facturedet';

+    	$fk_facture = 'fk_facture';

+    	$fk_facture2 = 'fk_facture';

+    	$fk_payment = 'fk_paiement';

+    	$total_tva = 'total_tva';

+    	$paymenttable = 'paiement';

+    	$paymentfacturetable = 'paiement_facture';

+    	$invoicefieldref = 'ref';

+    }

+    elseif ($direction == 'buy')

+    {

+    	$invoicetable = 'facture_fourn';

+    	$invoicedettable = 'facture_fourn_det';

+    	$fk_facture = 'fk_facture_fourn';

+    	$fk_facture2 = 'fk_facturefourn';

+    	$fk_payment = 'fk_paiementfourn';

+    	$total_tva = 'tva';

+    	$paymenttable = 'paiementfourn';

+    	$paymentfacturetable = 'paiementfourn_facturefourn';

+    	$invoicefieldref = 'ref';

+    }

+

+    if (strpos($type, 'localtax') === 0) {

+    	$f_rate = $type.'_tx';

+    } else {

+    	$f_rate = 'tva_tx';

+    }

+

+    $total_localtax1 = 'total_localtax1';

+    $total_localtax2 = 'total_localtax2';

+

+

+    // CAS DES BIENS/PRODUITS

+

+    // Define sql request

+    $sql = '';

+    if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')

+    	|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice'))

+    {

+    	// Count on delivery date (use invoice date as delivery is unknown)

+    	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";

+    	$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";

+    	$sql .= " d.date_start as date_start, d.date_end as date_end,";

+    	$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";

+    	$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";

+    	$sql .= " 0 as payment_id, 0 as payment_amount";

+    	$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";

+    	$sql .= " ".MAIN_DB_PREFIX."societe as s,";

+    	$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";

+    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";

+    	$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";

+    	$sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)

+    	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";

+    	else $sql .= " AND f.type IN (0,1,2,3,5)";

+    	$sql .= " AND f.rowid = d.".$fk_facture;

+    	$sql .= " AND s.rowid = f.fk_soc";

+    	if ($y && $m)

+    	{

+    		$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";

+    		$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";

+    	}

+    	elseif ($y)

+    	{

+    		$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";

+    		$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";

+    	}

+    	if ($q) $sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")";

+    	if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";

+    	$sql .= " AND (d.product_type = 0"; // Limit to products

+    	$sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products

+    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";

+    	$sql .= " ORDER BY d.rowid, d.".$fk_facture;

+    }

+    else

+    {

+    	// Count on payments date

+    	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";

+    	$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";

+    	$sql .= " d.date_start as date_start, d.date_end as date_end,";

+    	$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";

+    	$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";

+    	$sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";

+    	$sql .= " pa.datep as datep";

+    	$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";

+    	$sql .= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";

+    	$sql .= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";

+    	$sql .= " ".MAIN_DB_PREFIX."societe as s,";

+    	$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";

+    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";

+    	$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";

+    	$sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)

+    	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";

+    	else $sql .= " AND f.type IN (0,1,2,3,5)";

+    	$sql .= " AND f.rowid = d.".$fk_facture;

+    	$sql .= " AND s.rowid = f.fk_soc";

+    	$sql .= " AND pf.".$fk_facture2." = f.rowid";

+    	$sql .= " AND pa.rowid = pf.".$fk_payment;

+    	if ($y && $m)

+    	{

+    		$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";

+    		$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";

+    	}

+    	elseif ($y)

+    	{

+    		$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";

+    		$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";

+    	}

+    	if ($q) $sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")";

+    	if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";

+    	$sql .= " AND (d.product_type = 0"; // Limit to products

+    	$sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products

+    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";

+    	$sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";

+    }

+

+    if (!$sql) return -1;

+    if ($sql == 'TODO') return -2;

+    if ($sql != 'TODO')

+    {

+    	dol_syslog("Tax.lib.php::tax_by_thirdparty", LOG_DEBUG);

+

+    	$resql = $db->query($sql);

+    	if ($resql)

+    	{

+    		$company_id = -1;

+    		$oldrowid = '';

+    		while ($assoc = $db->fetch_array($resql))

+    		{

+    			if (!isset($list[$assoc['company_id']]['totalht']))  $list[$assoc['company_id']]['totalht'] = 0;

+    			if (!isset($list[$assoc['company_id']]['vat']))      $list[$assoc['company_id']]['vat'] = 0;

+    			if (!isset($list[$assoc['company_id']]['localtax1']))      $list[$assoc['company_id']]['localtax1'] = 0;

+    			if (!isset($list[$assoc['company_id']]['localtax2']))      $list[$assoc['company_id']]['localtax2'] = 0;

+

+    			if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid

+    			{

+    				$oldrowid = $assoc['rowid'];

+    				$list[$assoc['company_id']]['totalht']  += $assoc['total_ht'];

+    				$list[$assoc['company_id']]['vat']      += $assoc['total_vat'];

+    				$list[$assoc['company_id']]['localtax1']      += $assoc['total_localtax1'];

+    				$list[$assoc['company_id']]['localtax2']      += $assoc['total_localtax2'];

+    			}

+    			$list[$assoc['company_id']]['dtotal_ttc'][] = $assoc['total_ttc'];

+    			$list[$assoc['company_id']]['dtype'][] = $assoc['dtype'];

+    			$list[$assoc['company_id']]['datef'][] = $db->jdate($assoc['datef']);

+    			$list[$assoc['company_id']]['datep'][] = $db->jdate($assoc['datep']);

+    			$list[$assoc['company_id']]['company_name'][] = $assoc['company_name'];

+    			$list[$assoc['company_id']]['company_id'][] = $assoc['company_id'];

+    			$list[$assoc['company_id']]['drate'][] = $assoc['rate'];

+    			$list[$assoc['company_id']]['ddate_start'][] = $db->jdate($assoc['date_start']);

+    			$list[$assoc['company_id']]['ddate_end'][] = $db->jdate($assoc['date_end']);

+

+    			$list[$assoc['company_id']]['facid'][] = $assoc['facid'];

+    			$list[$assoc['company_id']]['facnum'][] = $assoc['facnum'];

+    			$list[$assoc['company_id']]['type'][] = $assoc['type'];

+    			$list[$assoc['company_id']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];

+    			$list[$assoc['company_id']]['descr'][] = $assoc['descr'];

+

+    			$list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht'];

+    			$list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat'];

+    			$list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1'];

+    			$list[$assoc['company_id']]['localtax2_list'][] = $assoc['total_localtax2'];

+

+    			$list[$assoc['company_id']]['pid'][] = $assoc['pid'];

+    			$list[$assoc['company_id']]['pref'][] = $assoc['pref'];

+    			$list[$assoc['company_id']]['ptype'][] = $assoc['ptype'];

+

+    			$list[$assoc['company_id']]['payment_id'][] = $assoc['payment_id'];

+    			$list[$assoc['company_id']]['payment_amount'][] = $assoc['payment_amount'];

+

+    			$company_id = $assoc['company_id'];

+    		}

+    	}

+    	else

+    	{

+    		dol_print_error($db);

+    		return -3;

+    	}

+    }

+

+

+    // CAS DES SERVICES

+

+    // Define sql request

+    $sql = '';

+    if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')

+    	|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice'))

+    {

+    	// Count on invoice date

+    	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";

+    	$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";

+    	$sql .= " d.date_start as date_start, d.date_end as date_end,";

+    	$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";

+    	$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";

+    	$sql .= " 0 as payment_id, 0 as payment_amount";

+    	$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";

+    	$sql .= " ".MAIN_DB_PREFIX."societe as s,";

+    	$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";

+    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";

+    	$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";

+    	$sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)

+    	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";

+    	else $sql .= " AND f.type IN (0,1,2,3,5)";

+    	$sql .= " AND f.rowid = d.".$fk_facture;

+    	$sql .= " AND s.rowid = f.fk_soc";

+    	if ($y && $m)

+    	{

+    		$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";

+    		$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";

+    	}

+    	elseif ($y)

+    	{

+    		$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";

+    		$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";

+    	}

+    	if ($q) $sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")";

+    	if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";

+    	$sql .= " AND (d.product_type = 1"; // Limit to services

+    	$sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service

+    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";

+    	$sql .= " ORDER BY d.rowid, d.".$fk_facture;

+    }

+    else

+    {

+    	// Count on payments date

+    	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";

+    	$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";

+    	$sql .= " d.date_start as date_start, d.date_end as date_end,";

+    	$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";

+    	$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";

+    	$sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";

+    	$sql .= " pa.datep as datep";

+    	$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";

+    	$sql .= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";

+    	$sql .= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";

+    	$sql .= " ".MAIN_DB_PREFIX."societe as s,";

+    	$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";

+    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";

+    	$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";

+    	$sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)

+    	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";

+    	else $sql .= " AND f.type IN (0,1,2,3,5)";

+    	$sql .= " AND f.rowid = d.".$fk_facture;

+    	$sql .= " AND s.rowid = f.fk_soc";

+    	$sql .= " AND pf.".$fk_facture2." = f.rowid";

+    	$sql .= " AND pa.rowid = pf.".$fk_payment;

+    	if ($y && $m)

+    	{

+    		$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";

+    		$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";

+    	}

+    	elseif ($y)

+    	{

+    		$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";

+    		$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";

+    	}

+    	if ($q) $sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")";

+    	if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";

+    	$sql .= " AND (d.product_type = 1"; // Limit to services

+    	$sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service

+    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";

+    	$sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";

+    }

+

+    if (!$sql)

+    {

+    	dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql, LOG_ERR);

+    	return -1; // -1 = Not accountancy module enabled

+    }

+    if ($sql == 'TODO') return -2; // -2 = Feature not yet available

+    if ($sql != 'TODO')

+    {

+    	dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);

+    	$resql = $db->query($sql);

+    	if ($resql)

+    	{

+    		$company_id = -1;

+    		$oldrowid = '';

+    		while ($assoc = $db->fetch_array($resql))

+    		{

+    			if (!isset($list[$assoc['company_id']]['totalht']))  $list[$assoc['company_id']]['totalht'] = 0;

+    			if (!isset($list[$assoc['company_id']]['vat']))      $list[$assoc['company_id']]['vat'] = 0;

+    			if (!isset($list[$assoc['company_id']]['localtax1']))      $list[$assoc['company_id']]['localtax1'] = 0;

+    			if (!isset($list[$assoc['company_id']]['localtax2']))      $list[$assoc['company_id']]['localtax2'] = 0;

+

+    			if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid

+    			{

+    				$oldrowid = $assoc['rowid'];

+    				$list[$assoc['company_id']]['totalht']  += $assoc['total_ht'];

+    				$list[$assoc['company_id']]['vat']      += $assoc['total_vat'];

+    				$list[$assoc['company_id']]['localtax1']	 += $assoc['total_localtax1'];

+    				$list[$assoc['company_id']]['localtax2']	 += $assoc['total_localtax2'];

+    			}

+    			$list[$assoc['company_id']]['dtotal_ttc'][] = $assoc['total_ttc'];

+    			$list[$assoc['company_id']]['dtype'][] = $assoc['dtype'];

+    			$list[$assoc['company_id']]['datef'][] = $db->jdate($assoc['datef']);

+    			$list[$assoc['company_id']]['datep'][] = $db->jdate($assoc['datep']);

+    			$list[$assoc['company_id']]['company_name'][] = $assoc['company_name'];

+    			$list[$assoc['company_id']]['company_id'][] = $assoc['company_id'];

+    			$list[$assoc['company_id']]['drate'][] = $assoc['rate'];

+    			$list[$assoc['company_id']]['ddate_start'][] = $db->jdate($assoc['date_start']);

+    			$list[$assoc['company_id']]['ddate_end'][] = $db->jdate($assoc['date_end']);

+

+    			$list[$assoc['company_id']]['facid'][] = $assoc['facid'];

+    			$list[$assoc['company_id']]['facnum'][] = $assoc['facnum'];

+    			$list[$assoc['company_id']]['type'][] = $assoc['type'];

+    			$list[$assoc['company_id']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];

+    			$list[$assoc['company_id']]['descr'][] = $assoc['descr'];

+

+    			$list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht'];

+    			$list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat'];

+    			$list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1'];

+    			$list[$assoc['company_id']]['localtax2_list'][] = $assoc['total_localtax2'];

+

+    			$list[$assoc['company_id']]['pid'][] = $assoc['pid'];

+    			$list[$assoc['company_id']]['pref'][] = $assoc['pref'];

+    			$list[$assoc['company_id']]['ptype'][] = $assoc['ptype'];

+

+    			$list[$assoc['company_id']]['payment_id'][] = $assoc['payment_id'];

+    			$list[$assoc['company_id']]['payment_amount'][] = $assoc['payment_amount'];

+

+    			$company_id = $assoc['company_id'];

+    		}

+    	}

+    	else

+    	{

+    		dol_print_error($db);

+    		return -3;

+    	}

+    }

+

+

+    // CASE OF EXPENSE REPORT

+

+    if ($direction == 'buy')		// buy only for expense reports

+    {

+    	// Define sql request

+    	$sql = '';

+

+    	// Count on payments date

+    	$sql = "SELECT d.rowid, d.product_type as dtype, e.rowid as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.total_tva as total_vat, e.note_private as descr,";

+    	$sql .= " d.total_localtax1 as total_localtax1, d.total_localtax2 as total_localtax2, ";

+    	$sql .= " e.date_debut as date_start, e.date_fin as date_end, e.fk_user_author,";

+    	$sql .= " e.ref as facnum, e.total_ttc as ftotal_ttc, e.date_create, d.fk_c_type_fees as type,";

+    	$sql .= " p.fk_bank as payment_id, p.amount as payment_amount, p.rowid as pid, e.ref as pref";

+    	$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as e";

+    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport_det as d ON d.fk_expensereport = e.rowid ";

+    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."payment_expensereport as p ON p.fk_expensereport = e.rowid ";

+    	$sql .= " WHERE e.entity = ".$conf->entity;

+    	$sql .= " AND e.fk_statut in (6)";

+    	if ($y && $m)

+    	{

+    		$sql .= " AND p.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";

+    		$sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";

+    	}

+    	elseif ($y)

+    	{

+    		$sql .= " AND p.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";

+    		$sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";

+    	}

+    	if ($q) $sql .= " AND (date_format(p.datep,'%m') > ".(($q - 1) * 3)." AND date_format(p.datep,'%m') <= ".($q * 3).")";

+    	if ($date_start && $date_end) $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";

+    	$sql .= " AND (d.product_type = -1";

+    	$sql .= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)"; // enhance detection of service

+    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";

+    	$sql .= " ORDER BY e.rowid";

+

+    	if (!$sql)

+    	{

+    		dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql, LOG_ERR);

+    		return -1; // -1 = Not accountancy module enabled

+    	}

+    	if ($sql == 'TODO') return -2; // -2 = Feature not yet available

+    	if ($sql != 'TODO')

+    	{

+    		dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);

+    		$resql = $db->query($sql);

+    		if ($resql)

+    		{

+    			$company_id = -1;

+    			$oldrowid = '';

+    			while ($assoc = $db->fetch_array($resql))

+    			{

+    				if (!isset($list[$assoc['company_id']]['totalht']))  $list[$assoc['company_id']]['totalht'] = 0;

+    				if (!isset($list[$assoc['company_id']]['vat']))      $list[$assoc['company_id']]['vat'] = 0;

+    				if (!isset($list[$assoc['company_id']]['localtax1']))      $list[$assoc['company_id']]['localtax1'] = 0;

+    				if (!isset($list[$assoc['company_id']]['localtax2']))      $list[$assoc['company_id']]['localtax2'] = 0;

+

+    				if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid

+    				{

+    					$oldrowid = $assoc['rowid'];

+    					$list[$assoc['company_id']]['totalht'] += $assoc['total_ht'];

+    					$list[$assoc['company_id']]['vat'] += $assoc['total_vat'];

+    					$list[$assoc['company_id']]['localtax1']	 += $assoc['total_localtax1'];

+    					$list[$assoc['company_id']]['localtax2']	 += $assoc['total_localtax2'];

+    				}

+

+    				$list[$assoc['company_id']]['dtotal_ttc'][] = $assoc['total_ttc'];

+    				$list[$assoc['company_id']]['dtype'][] = 'ExpenseReportPayment';

+    				$list[$assoc['company_id']]['datef'][] = $assoc['datef'];

+    				$list[$assoc['company_id']]['company_name'][] = '';

+    				$list[$assoc['company_id']]['company_id'][] = '';

+    				$list[$assoc['company_id']]['user_id'][] = $assoc['fk_user_author'];

+    				$list[$assoc['company_id']]['drate'][] = $assoc['rate'];

+    				$list[$assoc['company_id']]['ddate_start'][] = $db->jdate($assoc['date_start']);

+    				$list[$assoc['company_id']]['ddate_end'][] = $db->jdate($assoc['date_end']);

+

+    				$list[$assoc['company_id']]['facid'][] = $assoc['facid'];

+    				$list[$assoc['company_id']]['facnum'][] = $assoc['facnum'];

+    				$list[$assoc['company_id']]['type'][] = $assoc['type'];

+    				$list[$assoc['company_id']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];

+    				$list[$assoc['company_id']]['descr'][] = $assoc['descr'];

+

+    				$list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht'];

+    				$list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat'];

+    				$list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1'];

+    				$list[$assoc['company_id']]['localtax2_list'][] = $assoc['total_localtax2'];

+

+    				$list[$assoc['company_id']]['pid'][] = $assoc['pid'];

+    				$list[$assoc['company_id']]['pref'][] = $assoc['pref'];

+    				$list[$assoc['company_id']]['ptype'][] = 'ExpenseReportPayment';

+

+    				$list[$assoc['company_id']]['payment_id'][] = $assoc['payment_id'];

+    				$list[$assoc['company_id']]['payment_amount'][] = $assoc['payment_amount'];

+

+    				$company_id = $assoc['company_id'];

+    			}

+    		}

+    		else

+    		{

+    			dol_print_error($db);

+    			return -3;

+    		}

+    	}

+    }

+

+    return $list;

@@ -703,30 +561,34 @@
-	global $conf;

-

-	// If we use date_start and date_end, we must not use $y, $m, $q

-	if (($date_start || $date_end) && (!empty($y) || !empty($m) || !empty($q))) {

-		dol_print_error('', 'Bad value of input parameter for tax_by_rate');

-	}

-

-	$list = array();

-

-	if ($direction == 'sell') {

-		$invoicetable = 'facture';

-		$invoicedettable = 'facturedet';

-		$fk_facture = 'fk_facture';

-		$fk_facture2 = 'fk_facture';

-		$fk_payment = 'fk_paiement';

-		$total_tva = 'total_tva';

-		$paymenttable = 'paiement';

-		$paymentfacturetable = 'paiement_facture';

-		$invoicefieldref = 'ref';

-	} else {

-		$invoicetable = 'facture_fourn';

-		$invoicedettable = 'facture_fourn_det';

-		$fk_facture = 'fk_facture_fourn';

-		$fk_facture2 = 'fk_facturefourn';

-		$fk_payment = 'fk_paiementfourn';

-		$total_tva = 'tva';

-		$paymenttable = 'paiementfourn';

-		$paymentfacturetable = 'paiementfourn_facturefourn';

-		$invoicefieldref = 'ref';

-	}

+    global $conf;

+

+    // If we use date_start and date_end, we must not use $y, $m, $q

+    if (($date_start || $date_end) && (!empty($y) || !empty($m) || !empty($q)))

+    {

+    	dol_print_error('', 'Bad value of input parameter for tax_by_rate');

+    }

+

+    $list = array();

+

+    if ($direction == 'sell')

+    {

+        $invoicetable = 'facture';

+        $invoicedettable = 'facturedet';

+        $fk_facture = 'fk_facture';

+        $fk_facture2 = 'fk_facture';

+        $fk_payment = 'fk_paiement';

+        $total_tva = 'total_tva';

+        $paymenttable = 'paiement';

+        $paymentfacturetable = 'paiement_facture';

+        $invoicefieldref = 'ref';

+    }

+    else

+    {

+        $invoicetable = 'facture_fourn';

+        $invoicedettable = 'facture_fourn_det';

+        $fk_facture = 'fk_facture_fourn';

+        $fk_facture2 = 'fk_facturefourn';

+        $fk_payment = 'fk_paiementfourn';

+        $total_tva = 'tva';

+        $paymenttable = 'paiementfourn';

+        $paymentfacturetable = 'paiementfourn_facturefourn';

+        $invoicefieldref = 'ref';

+    }

@@ -744,406 +606,303 @@
-	// CASE OF PRODUCTS/GOODS

-

-	// Define sql request

-	$sql = '';

-	if (($direction == 'sell' && getDolGlobalString('TAX_MODE_SELL_PRODUCT') == 'invoice')

-		|| ($direction == 'buy' && getDolGlobalString('TAX_MODE_BUY_PRODUCT') == 'invoice')) {

-		// Count on delivery date (use invoice date as delivery is unknown)

-		$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.vat_src_code as vat_src_code, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";

-		$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";

-		$sql .= " d.date_start as date_start, d.date_end as date_end,";

-		$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef,";

-		$sql .= " s.nom as company_name, s.name_alias as company_alias, s.rowid as company_id, s.client as company_client, s.fournisseur as company_fournisseur, s.email as company_email,";

-		$sql .= " s.code_client as company_customer_code, s.code_fournisseur as company_supplier_code,";

-		$sql .= " s.code_compta as company_customer_accounting_code, s.code_compta_fournisseur as company_supplier_accounting_code,";

-		$sql .= " s.status as company_status, s.tva_intra as company_tva_intra,";

-		$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";

-		$sql .= " 0 as payment_id, '' as payment_ref, 0 as payment_amount,";

-		$sql .= " '' as datep";

-		$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f";

-		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";

-		$sql .= " INNER JOIN ".MAIN_DB_PREFIX.$invoicedettable." as d ON d.".$fk_facture."=f.rowid";

-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";

-		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";

-		$sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)

-		if ($direction == 'buy') {

-			if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {

-				$sql .= " AND f.type IN (0,1,2,5)";

-			} else {

-				$sql .= " AND f.type IN (0,1,2,3,5)";

-			}

-		} else {

-			if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {

-				$sql .= " AND f.type IN (0,1,2,5)";

-			} else {

-				$sql .= " AND f.type IN (0,1,2,3,5)";

-			}

-		}

-		if ($y && $m) {

-			$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";

-			$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";

-		} elseif ($y) {

-			$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";

-			$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";

-		}

-		if ($q) {

-			$sql .= " AND f.datef > '".$db->idate(dol_get_first_day($y, (($q - 1) * 3) + 1, false))."'";

-			$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, ($q * 3), false))."'";

-		}

-		if ($date_start && $date_end) {

-			$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";

-		}

-		$sql .= " AND (d.product_type = 0"; // Limit to products

-		$sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products

-		if (getDolGlobalString('MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS')) {

-			$sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";

-		}

-		$sql .= " ORDER BY d.rowid, d.".$fk_facture;

-	} else {

-		// Count on payments date

-		$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.vat_src_code as vat_src_code, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";

-		$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";

-		$sql .= " d.date_start as date_start, d.date_end as date_end,";

-		$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef,";

-		$sql .= " s.nom as company_name, s.name_alias as company_alias, s.rowid as company_id, s.client as company_client, s.fournisseur as company_fournisseur, s.email as company_email,";

-		$sql .= " s.code_client as company_customer_code, s.code_fournisseur as company_supplier_code,";

-		$sql .= " s.code_compta as company_customer_accounting_code, s.code_compta_fournisseur as company_supplier_accounting_code,";

-		$sql .= " s.status as company_status, s.tva_intra as company_tva_intra,";

-		$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";

-		$sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";

-		$sql .= " pa.datep as datep, pa.ref as payment_ref";

-		$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f";

-		$sql .= " INNER JOIN ".MAIN_DB_PREFIX.$paymentfacturetable." as pf ON pf.".$fk_facture2." = f.rowid";

-		$sql .= " INNER JOIN ".MAIN_DB_PREFIX.$paymenttable." as pa ON pa.rowid = pf.".$fk_payment;

-		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";

-		$sql .= " INNER JOIN ".MAIN_DB_PREFIX.$invoicedettable." as d ON d.".$fk_facture." = f.rowid";

-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";

-		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";

-		$sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)

-		if ($direction == 'buy') {

-			if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {

-				$sql .= " AND f.type IN (0,1,2,5)";

-			} else {

-				$sql .= " AND f.type IN (0,1,2,3,5)";

-			}

-		} else {

-			if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {

-				$sql .= " AND f.type IN (0,1,2,5)";

-			} else {

-				$sql .= " AND f.type IN (0,1,2,3,5)";

-			}

-		}

-		if ($y && $m) {

-			$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";

-			$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";

-		} elseif ($y) {

-			$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";

-			$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";

-		}

-		if ($q) {

-			$sql .= " AND pa.datep > '".$db->idate(dol_get_first_day($y, (($q - 1) * 3) + 1, false))."'";

-			$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, ($q * 3), false))."'";

-		}

-		if ($date_start && $date_end) {

-			$sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";

-		}

-		$sql .= " AND (d.product_type = 0"; // Limit to products

-		$sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products

-		if (getDolGlobalString('MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS')) {

-			$sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";

-		}

-		$sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";

-	}

-

-	if (!$sql) {

-		return -1;

-	}

-	if ($sql == 'TODO') {

-		return -2;

-	}

-	if ($sql != 'TODO') {

-		dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);

-

-		$resql = $db->query($sql);

-		if ($resql) {

-			$rate = -1;

-			$oldrowid = '';

-			while ($assoc = $db->fetch_array($resql)) {

-				$rate_key = $assoc['rate'];

-				if ($f_rate == 'tva_tx' && !empty($assoc['vat_src_code']) && !preg_match('/\(/', $rate_key)) {

-					$rate_key .= ' (' . $assoc['vat_src_code'] . ')';

-				}

-

-				// Code to avoid warnings when array entry not defined

-				if (!isset($list[$rate_key]['totalht'])) {

-					$list[$rate_key]['totalht'] = 0;

-				}

-				if (!isset($list[$rate_key]['vat'])) {

-					$list[$rate_key]['vat'] = 0;

-				}

-				if (!isset($list[$rate_key]['localtax1'])) {

-					$list[$rate_key]['localtax1'] = 0;

-				}

-				if (!isset($list[$rate_key]['localtax2'])) {

-					$list[$rate_key]['localtax2'] = 0;

-				}

-

-				if ($assoc['rowid'] != $oldrowid) {       // Si rupture sur d.rowid

-					$oldrowid = $assoc['rowid'];

-					$list[$rate_key]['totalht']   += $assoc['total_ht'];

-					$list[$rate_key]['vat']       += $assoc['total_vat'];

-					$list[$rate_key]['localtax1'] += $assoc['total_localtax1'];

-					$list[$rate_key]['localtax2'] += $assoc['total_localtax2'];

-				}

-				$list[$rate_key]['dtotal_ttc'][] = $assoc['total_ttc'];

-				$list[$rate_key]['dtype'][] = $assoc['dtype'];

-				$list[$rate_key]['datef'][] = $db->jdate($assoc['datef']);

-				$list[$rate_key]['datep'][] = $db->jdate($assoc['datep']);

-

-				$list[$rate_key]['company_name'][] = $assoc['company_name'];

-				$list[$rate_key]['company_id'][] = $assoc['company_id'];

-				$list[$rate_key]['company_alias'][] = $assoc['company_alias'];

-				$list[$rate_key]['company_email'][] = $assoc['company_email'];

-				$list[$rate_key]['company_tva_intra'][] = $assoc['company_tva_intra'];

-				$list[$rate_key]['company_client'][] = $assoc['company_client'];

-				$list[$rate_key]['company_fournisseur'][] = $assoc['company_fournisseur'];

-				$list[$rate_key]['company_customer_code'][] = $assoc['company_customer_code'];

-				$list[$rate_key]['company_supplier_code'][] = $assoc['company_supplier_code'];

-				$list[$rate_key]['company_customer_accounting_code'][] = $assoc['company_customer_accounting_code'];

-				$list[$rate_key]['company_supplier_accounting_code'][] = $assoc['company_supplier_accounting_code'];

-				$list[$rate_key]['company_status'][] = $assoc['company_status'];

-

-				$list[$rate_key]['ddate_start'][] = $db->jdate($assoc['date_start']);

-				$list[$rate_key]['ddate_end'][] = $db->jdate($assoc['date_end']);

-

-				$list[$rate_key]['facid'][] = $assoc['facid'];

-				$list[$rate_key]['facnum'][] = $assoc['facnum'];

-				$list[$rate_key]['type'][] = $assoc['type'];

-				$list[$rate_key]['ftotal_ttc'][] = $assoc['ftotal_ttc'];

-				$list[$rate_key]['descr'][] = $assoc['descr'];

-

-				$list[$rate_key]['totalht_list'][] = $assoc['total_ht'];

-				$list[$rate_key]['vat_list'][] = $assoc['total_vat'];

-				$list[$rate_key]['localtax1_list'][] = $assoc['total_localtax1'];

-				$list[$rate_key]['localtax2_list'][] = $assoc['total_localtax2'];

-

-				$list[$rate_key]['pid'][] = $assoc['pid'];

-				$list[$rate_key]['pref'][] = $assoc['pref'];

-				$list[$rate_key]['ptype'][] = $assoc['ptype'];

-

-				$list[$rate_key]['payment_id'][] = $assoc['payment_id'];

-				$list[$rate_key]['payment_ref'][] = $assoc['payment_ref'];

-				$list[$rate_key]['payment_amount'][] = $assoc['payment_amount'];

-

-				$rate = $assoc['rate'];

-			}

-		} else {

-			dol_print_error($db);

-			return -3;

-		}

-	}

-

-

-	// CASE OF SERVICES

-

-	// Define sql request

-	$sql = '';

-	if (($direction == 'sell' && getDolGlobalString('TAX_MODE_SELL_SERVICE') == 'invoice')

-		|| ($direction == 'buy' && getDolGlobalString('TAX_MODE_BUY_SERVICE') == 'invoice')) {

-		// Count on invoice date

-		$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.vat_src_code as vat_src_code, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";

-		$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";

-		$sql .= " d.date_start as date_start, d.date_end as date_end,";

-		$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef,";

-		$sql .= " s.nom as company_name, s.name_alias as company_alias, s.rowid as company_id, s.client as company_client, s.fournisseur as company_fournisseur, s.email as company_email,";

-		$sql .= " s.code_client as company_customer_code, s.code_fournisseur as company_supplier_code,";

-		$sql .= " s.code_compta as company_customer_accounting_code, s.code_compta_fournisseur as company_supplier_accounting_code,";

-		$sql .= " s.status as company_status, s.tva_intra as company_tva_intra,";

-		$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";

-		$sql .= " 0 as payment_id, '' as payment_ref, 0 as payment_amount";

-		$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f";

-		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";

-		$sql .= " INNER JOIN ".MAIN_DB_PREFIX.$invoicedettable." as d ON d.".$fk_facture." = f.rowid";

-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";

-		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";

-		$sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)

-		if ($direction == 'buy') {

-			if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {

-				$sql .= " AND f.type IN (0,1,2,5)";

-			} else {

-				$sql .= " AND f.type IN (0,1,2,3,5)";

-			}

-		} else {

-			if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {

-				$sql .= " AND f.type IN (0,1,2,5)";

-			} else {

-				$sql .= " AND f.type IN (0,1,2,3,5)";

-			}

-		}

-		if ($y && $m) {

-			$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";

-			$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";

-		} elseif ($y) {

-			$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";

-			$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";

-		}

-		if ($q) {

-			$sql .= " AND f.datef > '".$db->idate(dol_get_first_day($y, (($q - 1) * 3) + 1, false))."'";

-			$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, ($q * 3), false))."'";

-		}

-		if ($date_start && $date_end) {

-			$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";

-		}

-		$sql .= " AND (d.product_type = 1"; // Limit to services

-		$sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service

-		if (getDolGlobalString('MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS')) {

-			$sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";

-		}

-		$sql .= " ORDER BY d.rowid, d.".$fk_facture;

-	} else {

-		// Count on payments date

-		$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.vat_src_code as vat_src_code, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";

-		$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";

-		$sql .= " d.date_start as date_start, d.date_end as date_end,";

-		$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef,";

-		$sql .= " s.nom as company_name, s.name_alias as company_alias, s.rowid as company_id, s.client as company_client, s.fournisseur as company_fournisseur, s.email as company_email,";

-		$sql .= " s.code_client as company_customer_code, s.code_fournisseur as company_supplier_code,";

-		$sql .= " s.code_compta as company_customer_accounting_code, s.code_compta_fournisseur as company_supplier_accounting_code,";

-		$sql .= " s.status as company_status, s.tva_intra as company_tva_intra,";

-		$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";

-		$sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";

-		$sql .= " pa.datep as datep, pa.ref as payment_ref";

-		$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f";

-		$sql .= " INNER JOIN ".MAIN_DB_PREFIX.$paymentfacturetable." as pf ON pf.".$fk_facture2." = f.rowid";

-		$sql .= " INNER JOIN ".MAIN_DB_PREFIX.$paymenttable." as pa ON pa.rowid = pf.".$fk_payment;

-		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";

-		$sql .= " INNER JOIN ".MAIN_DB_PREFIX.$invoicedettable." as d ON d.".$fk_facture." = f.rowid";

-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";

-		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";

-		$sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)

-		if ($direction == 'buy') {

-			if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {

-				$sql .= " AND f.type IN (0,1,2,5)";

-			} else {

-				$sql .= " AND f.type IN (0,1,2,3,5)";

-			}

-		} else {

-			if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {

-				$sql .= " AND f.type IN (0,1,2,5)";

-			} else {

-				$sql .= " AND f.type IN (0,1,2,3,5)";

-			}

-		}

-		if ($y && $m) {

-			$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";

-			$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";

-		} elseif ($y) {

-			$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";

-			$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";

-		}

-		if ($q) {

-			$sql .= " AND pa.datep > '".$db->idate(dol_get_first_day($y, (($q - 1) * 3) + 1, false))."'";

-			$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, ($q * 3), false))."'";

-		}

-		if ($date_start && $date_end) {

-			$sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";

-		}

-		$sql .= " AND (d.product_type = 1"; // Limit to services

-		$sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service

-		if (getDolGlobalString('MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS')) {

-			$sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";

-		}

-		$sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";

-	}

-

-	if (!$sql) {

-		dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql, LOG_ERR);

-		return -1; // -1 = Not accountancy module enabled

-	}

-	if ($sql == 'TODO') {

-		return -2; // -2 = Feature not yet available

-	}

-	if ($sql != 'TODO') {

-		dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);

-		$resql = $db->query($sql);

-		if ($resql) {

-			$rate = -1;

-			$oldrowid = '';

-			while ($assoc = $db->fetch_array($resql)) {

-				$rate_key = $assoc['rate'];

-				if ($f_rate == 'tva_tx' && !empty($assoc['vat_src_code']) && !preg_match('/\(/', $rate_key)) {

-					$rate_key .= ' (' . $assoc['vat_src_code'] . ')';

-				}

-

-				// Code to avoid warnings when array entry not defined

-				if (!isset($list[$rate_key]['totalht'])) {

-					$list[$rate_key]['totalht'] = 0;

-				}

-				if (!isset($list[$rate_key]['vat'])) {

-					$list[$rate_key]['vat'] = 0;

-				}

-				if (!isset($list[$rate_key]['localtax1'])) {

-					$list[$rate_key]['localtax1'] = 0;

-				}

-				if (!isset($list[$rate_key]['localtax2'])) {

-					$list[$rate_key]['localtax2'] = 0;

-				}

-

-				if ($assoc['rowid'] != $oldrowid) {       // Si rupture sur d.rowid

-					$oldrowid = $assoc['rowid'];

-					$list[$rate_key]['totalht']   += $assoc['total_ht'];

-					$list[$rate_key]['vat']       += $assoc['total_vat'];

-					$list[$rate_key]['localtax1'] += $assoc['total_localtax1'];

-					$list[$rate_key]['localtax2'] += $assoc['total_localtax2'];

-				}

-				$list[$rate_key]['dtotal_ttc'][] = $assoc['total_ttc'];

-				$list[$rate_key]['dtype'][] = $assoc['dtype'];

-				$list[$rate_key]['datef'][] = $db->jdate($assoc['datef']);

-				$list[$rate_key]['datep'][] = $db->jdate($assoc['datep']);

-

-				$list[$rate_key]['ddate_start'][] = $db->jdate($assoc['date_start']);

-				$list[$rate_key]['ddate_end'][] = $db->jdate($assoc['date_end']);

-

-				$list[$rate_key]['company_name'][] = $assoc['company_name'];

-				$list[$rate_key]['company_id'][] = $assoc['company_id'];

-				$list[$rate_key]['company_alias'][] = $assoc['company_alias'];

-				$list[$rate_key]['company_email'][] = $assoc['company_email'];

-				$list[$rate_key]['company_tva_intra'][] = $assoc['company_tva_intra'];

-				$list[$rate_key]['company_client'][] = $assoc['company_client'];

-				$list[$rate_key]['company_fournisseur'][] = $assoc['company_fournisseur'];

-				$list[$rate_key]['company_customer_code'][] = $assoc['company_customer_code'];

-				$list[$rate_key]['company_supplier_code'][] = $assoc['company_supplier_code'];

-				$list[$rate_key]['company_customer_accounting_code'][] = $assoc['company_customer_accounting_code'];

-				$list[$rate_key]['company_supplier_accounting_code'][] = $assoc['company_supplier_accounting_code'];

-				$list[$rate_key]['company_status'][] = $assoc['company_status'];

-

-				$list[$rate_key]['facid'][] = $assoc['facid'];

-				$list[$rate_key]['facnum'][] = $assoc['facnum'];

-				$list[$rate_key]['type'][] = $assoc['type'];

-				$list[$rate_key]['ftotal_ttc'][] = $assoc['ftotal_ttc'];

-				$list[$rate_key]['descr'][] = $assoc['descr'];

-

-				$list[$rate_key]['totalht_list'][] = $assoc['total_ht'];

-				$list[$rate_key]['vat_list'][] = $assoc['total_vat'];

-				$list[$rate_key]['localtax1_list'][] = $assoc['total_localtax1'];

-				$list[$rate_key]['localtax2_list'][] = $assoc['total_localtax2'];

-

-				$list[$rate_key]['pid'][] = $assoc['pid'];

-				$list[$rate_key]['pref'][] = $assoc['pref'];

-				$list[$rate_key]['ptype'][] = $assoc['ptype'];

-

-				$list[$rate_key]['payment_id'][] = $assoc['payment_id'];

-				$list[$rate_key]['payment_ref'][] = $assoc['payment_ref'];

-				$list[$rate_key]['payment_amount'][] = $assoc['payment_amount'];

-

-				$rate = $assoc['rate'];

-			}

-		} else {

-			dol_print_error($db);

-			return -3;

-		}

-	}

-

-

-	// CASE OF EXPENSE REPORT

-

-	if ($direction == 'buy') {		// buy only for expense reports

+    // CAS DES BIENS/PRODUITS

+

+    // Define sql request

+    $sql = '';

+    if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')

+    	|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice'))

+    {

+        // Count on delivery date (use invoice date as delivery is unknown)

+        $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";

+        $sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";

+        $sql .= " d.date_start as date_start, d.date_end as date_end,";

+        $sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";

+        $sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";

+        $sql .= " 0 as payment_id, 0 as payment_amount";

+        $sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";

+        $sql .= " ".MAIN_DB_PREFIX."societe as s,";

+        $sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";

+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";

+        $sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";

+        $sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)

+        if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";

+        else $sql .= " AND f.type IN (0,1,2,3,5)";

+        $sql .= " AND f.rowid = d.".$fk_facture;

+        $sql .= " AND s.rowid = f.fk_soc";

+        if ($y && $m)

+        {

+            $sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";

+            $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";

+        }

+        elseif ($y)

+        {

+            $sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";

+            $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";

+        }

+        if ($q) $sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")";

+        if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";

+        $sql .= " AND (d.product_type = 0"; // Limit to products

+        $sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products

+        if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";

+        $sql .= " ORDER BY d.rowid, d.".$fk_facture;

+    }

+    else

+    {

+    	// Count on payments date

+    	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";

+    	$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";

+    	$sql .= " d.date_start as date_start, d.date_end as date_end,";

+    	$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";

+    	$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";

+    	$sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";

+    	$sql .= " pa.datep as datep";

+    	$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";

+    	$sql .= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";

+    	$sql .= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";

+    	$sql .= " ".MAIN_DB_PREFIX."societe as s,";

+    	$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";

+    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";

+    	$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";

+    	$sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)

+    	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";

+    	else $sql .= " AND f.type IN (0,1,2,3,5)";

+    	$sql .= " AND f.rowid = d.".$fk_facture;

+    	$sql .= " AND s.rowid = f.fk_soc";

+    	$sql .= " AND pf.".$fk_facture2." = f.rowid";

+    	$sql .= " AND pa.rowid = pf.".$fk_payment;

+    	if ($y && $m)

+    	{

+    		$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";

+    		$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";

+    	}

+    	elseif ($y)

+    	{

+    		$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";

+    		$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";

+    	}

+    	if ($q) $sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")";

+    	if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";

+    	$sql .= " AND (d.product_type = 0"; // Limit to products

+    	$sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products

+    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";

+    	$sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";

+    }

+

+    if (!$sql) return -1;

+    if ($sql == 'TODO') return -2;

+    if ($sql != 'TODO')

+    {

+        dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);

+

+        $resql = $db->query($sql);

+        if ($resql)

+        {

+            $rate = -1;

+            $oldrowid = '';

+            while ($assoc = $db->fetch_array($resql))

+            {

+            	// Code to avoid warnings when array entry not defined

+            	if (!isset($list[$assoc['rate']]['totalht']))   $list[$assoc['rate']]['totalht'] = 0;

+                if (!isset($list[$assoc['rate']]['vat']))       $list[$assoc['rate']]['vat'] = 0;

+                if (!isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1'] = 0;

+                if (!isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2'] = 0;

+

+                if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid

+                {

+                    $oldrowid = $assoc['rowid'];

+                    $list[$assoc['rate']]['totalht']   += $assoc['total_ht'];

+                    $list[$assoc['rate']]['vat']       += $assoc['total_vat'];

+                    $list[$assoc['rate']]['localtax1'] += $assoc['total_localtax1'];

+                    $list[$assoc['rate']]['localtax2'] += $assoc['total_localtax2'];

+                }

+                $list[$assoc['rate']]['dtotal_ttc'][] = $assoc['total_ttc'];

+                $list[$assoc['rate']]['dtype'][] = $assoc['dtype'];

+                $list[$assoc['rate']]['datef'][] = $db->jdate($assoc['datef']);

+                $list[$assoc['rate']]['datep'][] = $db->jdate($assoc['datep']);

+                $list[$assoc['rate']]['company_name'][] = $assoc['company_name'];

+                $list[$assoc['rate']]['company_id'][] = $assoc['company_id'];

+                $list[$assoc['rate']]['ddate_start'][] = $db->jdate($assoc['date_start']);

+                $list[$assoc['rate']]['ddate_end'][] = $db->jdate($assoc['date_end']);

+

+                $list[$assoc['rate']]['facid'][] = $assoc['facid'];

+                $list[$assoc['rate']]['facnum'][] = $assoc['facnum'];

+                $list[$assoc['rate']]['type'][] = $assoc['type'];

+                $list[$assoc['rate']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];

+                $list[$assoc['rate']]['descr'][] = $assoc['descr'];

+

+                $list[$assoc['rate']]['totalht_list'][] = $assoc['total_ht'];

+                $list[$assoc['rate']]['vat_list'][] = $assoc['total_vat'];

+                $list[$assoc['rate']]['localtax1_list'][] = $assoc['total_localtax1'];

+                $list[$assoc['rate']]['localtax2_list'][] = $assoc['total_localtax2'];

+

+                $list[$assoc['rate']]['pid'][] = $assoc['pid'];

+                $list[$assoc['rate']]['pref'][] = $assoc['pref'];

+                $list[$assoc['rate']]['ptype'][] = $assoc['ptype'];

+

+                $list[$assoc['rate']]['payment_id'][] = $assoc['payment_id'];

+                $list[$assoc['rate']]['payment_amount'][] = $assoc['payment_amount'];

+

+                $rate = $assoc['rate'];

+            }

+        }

+        else

+        {

+            dol_print_error($db);

+            return -3;

+        }

+    }

+

+

+    // CAS DES SERVICES

+

+    // Define sql request

+    $sql = '';

+    if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')

+    	|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice'))

+    {

+        // Count on invoice date

+        $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";

+        $sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";

+        $sql .= " d.date_start as date_start, d.date_end as date_end,";

+        $sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";

+        $sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";

+        $sql .= " 0 as payment_id, 0 as payment_amount";

+        $sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";

+        $sql .= " ".MAIN_DB_PREFIX."societe as s,";

+        $sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";

+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";

+        $sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";

+        $sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)

+        if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";

+		else $sql .= " AND f.type IN (0,1,2,3,5)";

+        $sql .= " AND f.rowid = d.".$fk_facture;

+        $sql .= " AND s.rowid = f.fk_soc";

+        if ($y && $m)

+        {

+            $sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";

+            $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";

+        }

+        elseif ($y)

+        {

+            $sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";

+            $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";

+        }

+        if ($q) $sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")";

+        if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";

+        $sql .= " AND (d.product_type = 1"; // Limit to services

+        $sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service

+        if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";

+        $sql .= " ORDER BY d.rowid, d.".$fk_facture;

+    }

+    else

+    {

+        // Count on payments date

+        $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";

+        $sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";

+        $sql .= " d.date_start as date_start, d.date_end as date_end,";

+        $sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";

+        $sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";

+        $sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";

+        $sql .= " pa.datep as datep";

+        $sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";

+        $sql .= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";

+        $sql .= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";

+        $sql .= " ".MAIN_DB_PREFIX."societe as s,";

+        $sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";

+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";

+        $sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";

+        $sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)

+        if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";

+		else $sql .= " AND f.type IN (0,1,2,3,5)";

+        $sql .= " AND f.rowid = d.".$fk_facture;

+        $sql .= " AND s.rowid = f.fk_soc";

+        $sql .= " AND pf.".$fk_facture2." = f.rowid";

+        $sql .= " AND pa.rowid = pf.".$fk_payment;

+        if ($y && $m)

+        {

+            $sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";

+            $sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";

+        }

+        elseif ($y)

+        {

+            $sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";

+            $sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";

+        }

+        if ($q) $sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")";

+        if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";

+        $sql .= " AND (d.product_type = 1"; // Limit to services

+        $sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service

+        if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";

+        $sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";

+    }

+

+    if (!$sql)

+    {

+        dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql, LOG_ERR);

+        return -1; // -1 = Not accountancy module enabled

+    }

+    if ($sql == 'TODO') return -2; // -2 = Feature not yet available

+    if ($sql != 'TODO')

+    {

+        dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);

+        $resql = $db->query($sql);

+        if ($resql)

+        {

+            $rate = -1;

+            $oldrowid = '';

+            while ($assoc = $db->fetch_array($resql))

+            {

+            	// Code to avoid warnings when array entry not defined

+            	if (!isset($list[$assoc['rate']]['totalht']))   $list[$assoc['rate']]['totalht'] = 0;

+                if (!isset($list[$assoc['rate']]['vat']))       $list[$assoc['rate']]['vat'] = 0;

+				if (!isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1'] = 0;

+                if (!isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2'] = 0;

+

+                if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid

+                {

+                    $oldrowid = $assoc['rowid'];

+                    $list[$assoc['rate']]['totalht']   += $assoc['total_ht'];

+                    $list[$assoc['rate']]['vat']       += $assoc['total_vat'];

+                    $list[$assoc['rate']]['localtax1'] += $assoc['total_localtax1'];

+                    $list[$assoc['rate']]['localtax2'] += $assoc['total_localtax2'];

+                }

+                $list[$assoc['rate']]['dtotal_ttc'][] = $assoc['total_ttc'];

+                $list[$assoc['rate']]['dtype'][] = $assoc['dtype'];

+                $list[$assoc['rate']]['datef'][] = $db->jdate($assoc['datef']);

+                $list[$assoc['rate']]['datep'][] = $db->jdate($assoc['datep']);

+                $list[$assoc['rate']]['company_name'][] = $assoc['company_name'];

+                $list[$assoc['rate']]['company_id'][] = $assoc['company_id'];

+                $list[$assoc['rate']]['ddate_start'][] = $db->jdate($assoc['date_start']);

+                $list[$assoc['rate']]['ddate_end'][] = $db->jdate($assoc['date_end']);

+

+                $list[$assoc['rate']]['facid'][] = $assoc['facid'];

+                $list[$assoc['rate']]['facnum'][] = $assoc['facnum'];

+                $list[$assoc['rate']]['type'][] = $assoc['type'];

+                $list[$assoc['rate']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];

+                $list[$assoc['rate']]['descr'][] = $assoc['descr'];

+

+                $list[$assoc['rate']]['totalht_list'][] = $assoc['total_ht'];

+                $list[$assoc['rate']]['vat_list'][] = $assoc['total_vat'];

+                $list[$assoc['rate']]['localtax1_list'][] = $assoc['total_localtax1'];

+                $list[$assoc['rate']]['localtax2_list'][] = $assoc['total_localtax2'];

+

+                $list[$assoc['rate']]['pid'][] = $assoc['pid'];

+                $list[$assoc['rate']]['pref'][] = $assoc['pref'];

+                $list[$assoc['rate']]['ptype'][] = $assoc['ptype'];

+

+                $list[$assoc['rate']]['payment_id'][] = $assoc['payment_id'];

+                $list[$assoc['rate']]['payment_amount'][] = $assoc['payment_amount'];

+

+                $rate = $assoc['rate'];

+            }

+        }

+        else

+        {

+            dol_print_error($db);

+            return -3;

+        }

+    }

+

+

+    // CASE OF EXPENSE REPORT

+

+	if ($direction == 'buy')		// buy only for expense reports

+	{

@@ -1154 +913 @@
-		$sql = "SELECT d.rowid, d.product_type as dtype, e.rowid as facid, d.$f_rate as rate, d.vat_src_code as vat_src_code, d.total_ht as total_ht, d.total_ttc as total_ttc, d.total_tva as total_vat, e.note_private as descr,";

+		$sql = "SELECT d.rowid, d.product_type as dtype, e.rowid as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.total_tva as total_vat, e.note_private as descr,";

@@ -1159,3 +918,3 @@
-		$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as e";

-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport_det as d ON d.fk_expensereport = e.rowid";

-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."payment_expensereport as p ON p.fk_expensereport = e.rowid";

+		$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as e ";

+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport_det as d ON d.fk_expensereport = e.rowid ";

+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."payment_expensereport as p ON p.fk_expensereport = e.rowid ";

@@ -1164 +923,2 @@
-		if ($y && $m) {

+		if ($y && $m)

+		{

@@ -1167 +927,3 @@
-		} elseif ($y) {

+		}

+		elseif ($y)

+		{

@@ -1171,7 +933,2 @@
-		if ($q) {

-			$sql .= " AND p.datep > '".$db->idate(dol_get_first_day($y, (($q - 1) * 3) + 1, false))."'";

-			$sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, ($q * 3), false))."'";

-		}

-		if ($date_start && $date_end) {

-			$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";

-		}

+		if ($q) $sql .= " AND (date_format(p.datep,'%m') > ".(($q - 1) * 3)." AND date_format(p.datep,'%m') <= ".($q * 3).")";

+		if ($date_start && $date_end) $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";

@@ -1180,3 +937 @@
-		if (getDolGlobalString('MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS')) {

-			$sql .= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";

-		}

+		if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";

@@ -1185 +940,2 @@
-		if (!$sql) {

+		if (!$sql)

+		{

@@ -1189,4 +945,3 @@
-		if ($sql == 'TODO') {

-			return -2; // -2 = Feature not yet available

-		}

-		if ($sql != 'TODO') {

+		if ($sql == 'TODO') return -2; // -2 = Feature not yet available

+		if ($sql != 'TODO')

+		{

@@ -1195 +950,2 @@
-			if ($resql) {

+			if ($resql)

+			{

@@ -1198,4 +954,15 @@
-				while ($assoc = $db->fetch_array($resql)) {

-					$rate_key = $assoc['rate'];

-					if ($f_rate == 'tva_tx' && !empty($assoc['vat_src_code']) && !preg_match('/\(/', $rate_key)) {

-						$rate_key .= ' (' . $assoc['vat_src_code'] . ')';

+				while ($assoc = $db->fetch_array($resql))

+				{

+					// Code to avoid warnings when array entry not defined

+					if (!isset($list[$assoc['rate']]['totalht']))   $list[$assoc['rate']]['totalht'] = 0;

+					if (!isset($list[$assoc['rate']]['vat']))       $list[$assoc['rate']]['vat'] = 0;

+					if (!isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1'] = 0;

+					if (!isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2'] = 0;

+

+					if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid

+					{

+						$oldrowid = $assoc['rowid'];

+						$list[$assoc['rate']]['totalht']   += $assoc['total_ht'];

+                        $list[$assoc['rate']]['vat'] += $assoc['total_vat'];

+						$list[$assoc['rate']]['localtax1'] += $assoc['total_localtax1'];

+						$list[$assoc['rate']]['localtax2'] += $assoc['total_localtax2'];

@@ -1204,49 +971,26 @@
-					// Code to avoid warnings when array entry not defined

-					if (!isset($list[$rate_key]['totalht'])) {

-						$list[$rate_key]['totalht'] = 0;

-					}

-					if (!isset($list[$rate_key]['vat'])) {

-						$list[$rate_key]['vat'] = 0;

-					}

-					if (!isset($list[$rate_key]['localtax1'])) {

-						$list[$rate_key]['localtax1'] = 0;

-					}

-					if (!isset($list[$rate_key]['localtax2'])) {

-						$list[$rate_key]['localtax2'] = 0;

-					}

-

-					if ($assoc['rowid'] != $oldrowid) {       // Si rupture sur d.rowid

-						$oldrowid = $assoc['rowid'];

-						$list[$rate_key]['totalht']   += $assoc['total_ht'];

-						$list[$rate_key]['vat'] += $assoc['total_vat'];

-						$list[$rate_key]['localtax1'] += $assoc['total_localtax1'];

-						$list[$rate_key]['localtax2'] += $assoc['total_localtax2'];

-					}

-

-					$list[$rate_key]['dtotal_ttc'][] = $assoc['total_ttc'];

-					$list[$rate_key]['dtype'][] = 'ExpenseReportPayment';

-					$list[$rate_key]['datef'][] = $assoc['datef'];

-					$list[$rate_key]['company_name'][] = '';

-					$list[$rate_key]['company_id'][] = '';

-					$list[$rate_key]['user_id'][] = $assoc['fk_user_author'];

-					$list[$rate_key]['ddate_start'][] = $db->jdate($assoc['date_start']);

-					$list[$rate_key]['ddate_end'][] = $db->jdate($assoc['date_end']);

-

-					$list[$rate_key]['facid'][] = $assoc['facid'];

-					$list[$rate_key]['facnum'][] = $assoc['facnum'];

-					$list[$rate_key]['type'][] = $assoc['type'];

-					$list[$rate_key]['ftotal_ttc'][] = $assoc['ftotal_ttc'];

-					$list[$rate_key]['descr'][] = $assoc['descr'];

-

-					$list[$rate_key]['totalht_list'][] = $assoc['total_ht'];

-					$list[$rate_key]['vat_list'][] = $assoc['total_vat'];

-					$list[$rate_key]['localtax1_list'][] = $assoc['total_localtax1'];

-					$list[$rate_key]['localtax2_list'][] = $assoc['total_localtax2'];

-

-					$list[$rate_key]['pid'][] = $assoc['pid'];

-					$list[$rate_key]['pref'][] = $assoc['pref'];

-					$list[$rate_key]['ptype'][] = 'ExpenseReportPayment';

-

-					$list[$rate_key]['payment_id'][] = $assoc['payment_id'];

-					$list[$rate_key]['payment_ref'][] = $assoc['payment_ref'];

-					$list[$rate_key]['payment_amount'][] = $assoc['payment_amount'];

+					$list[$assoc['rate']]['dtotal_ttc'][] = $assoc['total_ttc'];

+					$list[$assoc['rate']]['dtype'][] = 'ExpenseReportPayment';

+					$list[$assoc['rate']]['datef'][] = $assoc['datef'];

+					$list[$assoc['rate']]['company_name'][] = '';

+					$list[$assoc['rate']]['company_id'][] = '';

+					$list[$assoc['rate']]['user_id'][] = $assoc['fk_user_author'];

+					$list[$assoc['rate']]['ddate_start'][] = $db->jdate($assoc['date_start']);

+					$list[$assoc['rate']]['ddate_end'][] = $db->jdate($assoc['date_end']);

+

+					$list[$assoc['rate']]['facid'][] = $assoc['facid'];

+					$list[$assoc['rate']]['facnum'][] = $assoc['facnum'];

+					$list[$assoc['rate']]['type'][] = $assoc['type'];

+					$list[$assoc['rate']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];

+					$list[$assoc['rate']]['descr'][] = $assoc['descr'];

+

+					$list[$assoc['rate']]['totalht_list'][] = $assoc['total_ht'];

+					$list[$assoc['rate']]['vat_list'][] = $assoc['total_vat'];

+					$list[$assoc['rate']]['localtax1_list'][] = $assoc['total_localtax1'];

+					$list[$assoc['rate']]['localtax2_list'][] = $assoc['total_localtax2'];

+

+					$list[$assoc['rate']]['pid'][] = $assoc['pid'];

+					$list[$assoc['rate']]['pref'][] = $assoc['pref'];

+					$list[$assoc['rate']]['ptype'][] = 'ExpenseReportPayment';

+

+					$list[$assoc['rate']]['payment_id'][] = $assoc['payment_id'];

+					$list[$assoc['rate']]['payment_amount'][] = $assoc['payment_amount'];

@@ -1256 +1000,3 @@
-			} else {

+			}

+			else

+			{

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_ticket.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_ticket.lib.php
@@ -4 +4 @@
- * Copyright (C) 2019-2022  Frédéric France     <frederic.france@netlogic.fr>

+ * Copyright (C) 2019       Frédéric France     <frederic.france@netlogic.fr>

@@ -21,3 +21,3 @@
- * \file       core/lib/ticket.lib.php

- * \ingroup    ticket

- * \brief      This file is a library for Ticket module

+ *    \file       core/lib/ticket.lib.php

+ *    \ingroup    ticket

+ *    \brief        This file is a library for Ticket module

@@ -33,42 +33,33 @@
-	global $langs, $conf, $db;

-

-	$extrafields = new ExtraFields($db);

-	$extrafields->fetch_name_optionals_label('ticket');

-

-	$langs->load("ticket");

-

-	$h = 0;

-	$head = array();

-

-	$head[$h][0] = DOL_URL_ROOT.'/admin/ticket.php';

-	$head[$h][1] = $langs->trans("TicketSettings");

-	$head[$h][2] = 'settings';

-	$h++;

-

-	$head[$h][0] = DOL_URL_ROOT.'/admin/ticket_extrafields.php';

-	$head[$h][1] = $langs->trans("ExtraFieldsTicket");

-	$nbExtrafields = $extrafields->attributes['ticket']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

-	$head[$h][2] = 'attributes';

-	$h++;

-

-	$head[$h][0] = DOL_URL_ROOT.'/admin/ticket_public.php';

-	$head[$h][1] = $langs->trans("PublicInterface");

-	$head[$h][2] = 'public';

-	$h++;

-

-	// Show more tabs from modules

-	// Entries must be declared in modules descriptor with line

-	//$this->tabs = array(

-	//    'entity:+tabname:Title:@ticket:/ticket/mypage.php?id=__ID__'

-	//); // to add new tab

-	//$this->tabs = array(

-	//    'entity:-tabname:Title:@ticket:/ticket/mypage.php?id=__ID__'

-	//); // to remove a tab

-	complete_head_from_modules($conf, $langs, null, $head, $h, 'ticketadmin');

-

-	complete_head_from_modules($conf, $langs, null, $head, $h, 'ticketadmin', 'remove');

-

-	return $head;

+    global $langs, $conf;

+

+    $langs->load("ticket");

+

+    $h = 0;

+    $head = array();

+

+    $head[$h][0] = DOL_URL_ROOT.'/admin/ticket.php';

+    $head[$h][1] = $langs->trans("TicketSettings");

+    $head[$h][2] = 'settings';

+    $h++;

+

+    $head[$h][0] = DOL_URL_ROOT.'/admin/ticket_extrafields.php';

+    $head[$h][1] = $langs->trans("ExtraFieldsTicket");

+    $head[$h][2] = 'attributes';

+    $h++;

+

+    $head[$h][0] = DOL_URL_ROOT.'/admin/ticket_public.php';

+    $head[$h][1] = $langs->trans("PublicInterface");

+    $head[$h][2] = 'public';

+    $h++;

+

+    // Show more tabs from modules

+    // Entries must be declared in modules descriptor with line

+    //$this->tabs = array(

+    //    'entity:+tabname:Title:@ticket:/ticket/mypage.php?id=__ID__'

+    //); // to add new tab

+    //$this->tabs = array(

+    //    'entity:-tabname:Title:@ticket:/ticket/mypage.php?id=__ID__'

+    //); // to remove a tab

+    complete_head_from_modules($conf, $langs, null, $head, $h, 'ticketadmin');

+

+    return $head;

@@ -85,37 +76,36 @@
-	global $langs, $conf, $user;

-

-	$h = 0;

-	$head = array();

-	$head[$h][0] = DOL_URL_ROOT.'/ticket/card.php?track_id='.$object->track_id;

-	$head[$h][1] = $langs->trans("Ticket");

-	$head[$h][2] = 'tabTicket';

-	$h++;

-

-	if (!getDolGlobalInt('MAIN_DISABLE_CONTACTS_TAB') && empty($user->socid) && isModEnabled("societe")) {

-		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));

-		$head[$h][0] = DOL_URL_ROOT.'/ticket/contact.php?track_id='.$object->track_id;

-		$head[$h][1] = $langs->trans('ContactsAddresses');

-		if ($nbContact > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';

-		}

-		$head[$h][2] = 'contact';

-		$h++;

-	}

-

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'ticket', 'add', 'core');

-

-	// Attached files

-	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

-	$upload_dir = $conf->ticket->dir_output."/".$object->ref;

-	$nbFiles = count(dol_dir_list($upload_dir, 'files'));

-	$head[$h][0] = DOL_URL_ROOT.'/ticket/document.php?id='.$object->id;

-	$head[$h][1] = $langs->trans("Documents");

-	if ($nbFiles > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbFiles.'</span>';

-	}

-

-	$head[$h][2] = 'tabTicketDocument';

-	$h++;

-

-

-	// History

+    global $db, $langs, $conf, $user;

+

+    $h = 0;

+    $head = array();

+    $head[$h][0] = DOL_URL_ROOT.'/ticket/card.php?action=view&track_id='.$object->track_id;

+    $head[$h][1] = $langs->trans("Ticket");

+    $head[$h][2] = 'tabTicket';

+    $h++;

+

+    if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && empty($user->socid))

+    {

+    	$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));

+    	$head[$h][0] = DOL_URL_ROOT.'/ticket/contact.php?track_id='.$object->track_id;

+    	$head[$h][1] = $langs->trans('ContactsAddresses');

+    	if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';

+    	$head[$h][2] = 'contact';

+    	$h++;

+    }

+

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'ticket');

+

+    // Attached files

+    include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

+    $upload_dir = $conf->ticket->dir_output."/".$object->ref;

+    $nbFiles = count(dol_dir_list($upload_dir, 'files'));

+    $head[$h][0] = dol_buildpath('/ticket/document.php', 1).'?id='.$object->id;

+    $head[$h][1] = $langs->trans("Documents");

+    if ($nbFiles > 0) {

+        $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbFiles.'</span>';

+    }

+

+    $head[$h][2] = 'tabTicketDocument';

+    $h++;

+

+

+    // History

@@ -125 +115,2 @@
-	} else {

+	}

+	else {

@@ -131 +122,2 @@
-	} else {

+	}

+	else {

@@ -135,14 +127,14 @@
-	$head[$h][1] = $langs->trans('Events');

-	if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {

-		$head[$h][1] .= '/';

-		$head[$h][1] .= $langs->trans("Agenda");

-	}

-	$head[$h][2] = 'tabTicketLogs';

-	$h++;

-

-

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'ticket', 'add', 'external');

-

-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'ticket', 'remove');

-

-	return $head;

+    $head[$h][1] = $langs->trans('Events');

+    if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))

+    {

+    	$head[$h][1] .= '/';

+    	$head[$h][1] .= $langs->trans("Agenda");

+    }

+    $head[$h][2] = 'tabTicketLogs';

+    $h++;

+

+

+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'ticket', 'remove');

+

+

+    return $head;

@@ -164,2 +156,3 @@
-	if ($email) {

-		$url = getDolGlobalString('TICKET_URL_PUBLIC_INTERFACE', dol_buildpath('/public/ticket/', 3)).'view.php?track_id='.$object->track_id.'&email='.$email;

+	if ($email)

+	{

+		$url = dol_buildpath('/public/ticket/view.php', 3).'?track_id='.$object->track_id.'&email='.$email;

@@ -169,10 +162,10 @@
-	if (!getDolGlobalInt('TICKET_ENABLE_PUBLIC_INTERFACE')) {

-		$langs->load('errors');

-		$out .= '<span class="opacitymedium">'.$langs->trans("ErrorPublicInterfaceNotEnabled").'</span>';

-	} else {

-		$out .= img_picto('', 'object_globe.png').' <span class="opacitymedium">'.$langs->trans("TicketPublicAccess").'</span><br>';

-		if ($url) {

-			$out .= '<div class="urllink">';

-			$out .= '<input type="text" id="directpubliclink" class="quatrevingtpercentminusx" value="'.$url.'">';

-			$out .= '<a href="'.$url.'" target="_blank" rel="noopener noreferrer">'.img_picto('', 'object_globe.png', 'class="paddingleft"').'</a>';

-			$out .= '</div>';

+	if (empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE))

+	{

+		$out .= '<span class="opacitymedium">'.$langs->trans("PublicInterfaceNotEnabled").'</span>';

+	}

+	else

+	{

+		$out .= img_picto('', 'object_globe.png').' '.$langs->trans("TicketPublicAccess").':<br>';

+		if ($url)

+		{

+			$out .= '<input type="text" id="directpubliclink" class="quatrevingtpercent" value="'.$url.'">';

@@ -180 +173,3 @@
-		} else {

+		}

+		else

+		{

@@ -191 +186 @@
- *  @param  int 	$car 	Length of string to generate key

+ *  @param  int $car Length of string to generate key

@@ -196,7 +191,7 @@
-	$string = "";

-	$chaine = "abcdefghijklmnopqrstuvwxyz123456789";

-	mt_srand((float) microtime() * 1000000);

-	for ($i = 0; $i < $car; $i++) {

-		$string .= $chaine[mt_rand() % strlen($chaine)];

-	}

-	return $string;

+    $string = "";

+    $chaine = "abcdefghijklmnopqrstuvwxyz123456789";

+    srand((double) microtime() * 1000000);

+    for ($i = 0; $i < $car; $i++) {

+        $string .= $chaine[rand() % strlen($chaine)];

+    }

+    return $string;

@@ -206 +201 @@
- * Show http header, open body tag and show HTML header banner for public pages for tickets

+ * Show header for public pages

@@ -218,22 +213,715 @@
-	global $user, $conf, $langs, $mysoc;

-

-	$urllogo = "";

-	top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss, 0, 1); // Show html headers

-

-	print '<body id="mainbody" class="publicnewticketform">';

-	print '<div class="publicnewticketform2 flexcontainer centpercent" style="min-height: 100%;">';

-

-	print '<header class="center centpercent">';

-

-	// Define urllogo

-	if (getDolGlobalInt('TICKET_SHOW_COMPANY_LOGO') || getDolGlobalString('TICKET_PUBLIC_INTERFACE_TOPIC')) {

-		// Print logo

-		if (getDolGlobalInt('TICKET_SHOW_COMPANY_LOGO')) {

-			$urllogo = DOL_URL_ROOT.'/theme/common/login_logo.png';

-

-			if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) {

-				$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small);

-			} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) {

-				$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/'.$mysoc->logo);

-			} elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg')) {

-				$urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.svg';

+    global $user, $conf, $langs, $mysoc;

+

+    top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers

+

+    print '<body id="mainbody" class="publicnewticketform">';

+

+    // Define urllogo

+    $width = 0;

+    if (!empty($conf->global->TICKET_SHOW_COMPANY_LOGO) || !empty($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC)) {

+        // Print logo

+        if (!empty($conf->global->TICKET_SHOW_COMPANY_LOGO))

+        {

+        	$urllogo = DOL_URL_ROOT.'/theme/common/login_logo.png';

+

+        	if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) {

+        		$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small);

+        		$width = 150;

+        	} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) {

+        		$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/'.$mysoc->logo);

+        		$width = 150;

+        	} elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg')) {

+        		$urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.svg';

+        	}

+        }

+    }

+

+    print '<div class="center">';

+    // Output html code for logo

+    if ($urllogo || !empty($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC))

+    {

+    	print '<div class="backgreypublicpayment">';

+    	print '<div class="logopublicpayment">';

+    	if ($urllogo) {

+	    	print '<a href="'.($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE : dol_buildpath('/public/ticket/index.php', 1)).'">';

+	    	print '<img id="dolpaymentlogo" src="'.$urllogo.'"';

+	    	if ($width) print ' width="'.$width.'"';

+	    	print '>';

+	    	print '</a>';

+    	}

+    	if (!empty($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC)) {

+    		print '<div class="clearboth"></div><strong>'.($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC ? $conf->global->TICKET_PUBLIC_INTERFACE_TOPIC : $langs->trans("TicketSystem")).'</strong>';

+    	}

+    	print '</div>';

+    	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {

+    		print '<div class="poweredbypublicpayment opacitymedium right"><a href="https://www.dolibarr.org" target="dolibarr">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';

+    	}

+    	print '</div>';

+    }

+

+    print '</div>';

+

+    print '<div class="ticketlargemargin">';

+}

+

+

+

+/**

+ *    	Show html area with actions for ticket messaging.

+ *      Note: Global parameter $param must be defined.

+ *

+ * 		@param	Conf		       $conf		   Object conf

+ * 		@param	Translate	       $langs		   Object langs

+ * 		@param	DoliDB		       $db			   Object db

+ * 		@param	mixed			   $filterobj	   Filter on object Adherent|Societe|Project|Product|CommandeFournisseur|Dolresource|Ticket|... to list events linked to an object

+ * 		@param	Contact		       $objcon		   Filter on object contact to filter events on a contact

+ *      @param  int			       $noprint        Return string but does not output it

+ *      @param  string		       $actioncode     Filter on actioncode

+ *      @param  string             $donetodo       Filter on event 'done' or 'todo' or ''=nofilter (all).

+ *      @param  array              $filters        Filter on other fields

+ *      @param  string             $sortfield      Sort field

+ *      @param  string             $sortorder      Sort order

+ *      @return	string|void				           Return html part or void if noprint is 1

+ */

+function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $noprint = 0, $actioncode = '', $donetodo = 'done', $filters = array(), $sortfield = 'a.datep,a.id', $sortorder = 'DESC')

+{

+    global $user, $conf;

+    global $form;

+

+    global $param, $massactionbutton;

+

+    dol_include_once('/comm/action/class/actioncomm.class.php');

+

+    // Check parameters

+    if (!is_object($filterobj) && !is_object($objcon)) dol_print_error('', 'BadParameter');

+

+    $out = '';

+    $histo = array();

+    $numaction = 0;

+    $now = dol_now('tzuser');

+

+    // Open DSI -- Fix order by -- Begin

+    $sortfield_list = explode(',', $sortfield);

+    $sortfield_label_list = array('a.id' => 'id', 'a.datep' => 'dp', 'a.percent' => 'percent');

+    $sortfield_new_list = array();

+    foreach ($sortfield_list as $sortfield_value) {

+        $sortfield_new_list[] = $sortfield_label_list[trim($sortfield_value)];

+    }

+    $sortfield_new = implode(',', $sortfield_new_list);

+

+    if (!empty($conf->agenda->enabled))

+    {

+        // Recherche histo sur actioncomm

+        if (is_object($objcon) && $objcon->id > 0) {

+            $sql = "SELECT DISTINCT a.id, a.label as label,";

+        }

+        else

+        {

+            $sql = "SELECT a.id, a.label as label,";

+        }

+        $sql .= " a.datep as dp,";

+        $sql .= " a.note as message,";

+        $sql .= " a.datep2 as dp2,";

+        $sql .= " a.percent as percent, 'action' as type,";

+        $sql .= " a.fk_element, a.elementtype,";

+        $sql .= " a.fk_contact,";

+        $sql .= " c.code as acode, c.libelle as alabel, c.picto as apicto,";

+        $sql .= " u.rowid as user_id, u.login as user_login, u.photo as user_photo, u.firstname as user_firstname, u.lastname as user_lastname";

+        if (is_object($filterobj) && get_class($filterobj) == 'Societe')      $sql .= ", sp.lastname, sp.firstname";

+        elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql .= ", m.lastname, m.firstname";

+        elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur')  $sql .= ", o.ref";

+        elseif (is_object($filterobj) && get_class($filterobj) == 'Product')  $sql .= ", o.ref";

+        elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket')   $sql .= ", o.ref";

+        elseif (is_object($filterobj) && get_class($filterobj) == 'BOM')      $sql .= ", o.ref";

+        elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat')  $sql .= ", o.ref";

+        $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a";

+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on u.rowid = a.fk_user_action";

+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_actioncomm as c ON a.fk_action = c.id";

+

+        $force_filter_contact = false;

+        if (is_object($objcon) && $objcon->id > 0) {

+            $force_filter_contact = true;

+            $sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm_resources as r ON a.id = r.fk_actioncomm";

+            $sql .= " AND r.element_type = '".$db->escape($objcon->table_element)."' AND r.fk_element = ".$objcon->id;

+        }

+

+        if (is_object($filterobj) && get_class($filterobj) == 'Societe')  $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";

+        elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') {

+            $sql .= " INNER JOIN ".MAIN_DB_PREFIX."element_resources as er";

+            $sql .= " ON er.resource_type = 'dolresource'";

+            $sql .= " AND er.element_id = a.id";

+            $sql .= " AND er.resource_id = ".$filterobj->id;

+        }

+        elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql .= ", ".MAIN_DB_PREFIX."adherent as m";

+        elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') $sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as o";

+        elseif (is_object($filterobj) && get_class($filterobj) == 'Product') $sql .= ", ".MAIN_DB_PREFIX."product as o";

+        elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') $sql .= ", ".MAIN_DB_PREFIX."ticket as o";

+        elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') $sql .= ", ".MAIN_DB_PREFIX."bom_bom as o";

+        elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') $sql .= ", ".MAIN_DB_PREFIX."contrat as o";

+

+        $sql .= " WHERE a.entity IN (".getEntity('agenda').")";

+        if ($force_filter_contact === false) {

+            if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur')) && $filterobj->id) $sql .= " AND a.fk_soc = ".$filterobj->id;

+            elseif (is_object($filterobj) && get_class($filterobj) == 'Project' && $filterobj->id) $sql .= " AND a.fk_project = ".$filterobj->id;

+            elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent')

+            {

+                $sql .= " AND a.fk_element = m.rowid AND a.elementtype = 'member'";

+                if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;

+            }

+            elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur')

+            {

+                $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'order_supplier'";

+                if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;

+            }

+            elseif (is_object($filterobj) && get_class($filterobj) == 'Product')

+            {

+                $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'product'";

+                if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;

+            }

+            elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket')

+            {

+                $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'ticket'";

+                if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;

+            }

+            elseif (is_object($filterobj) && get_class($filterobj) == 'BOM')

+            {

+                $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'bom'";

+                if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;

+            }

+            elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat')

+            {

+                $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'contract'";

+                if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;

+            }

+        }

+

+        // Condition on actioncode

+        if (!empty($actioncode))

+        {

+            if (empty($conf->global->AGENDA_USE_EVENT_TYPE))

+            {

+                if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'";

+                elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'";

+                else

+                {

+                    if ($actioncode == 'AC_OTH') $sql .= " AND c.type != 'systemauto'";

+                    elseif ($actioncode == 'AC_OTH_AUTO') $sql .= " AND c.type = 'systemauto'";

+                }

+            }

+            else

+            {

+                if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'";

+                elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'";

+                else $sql .= " AND c.code = '".$db->escape($actioncode)."'";

+            }

+        }

+        if ($donetodo == 'todo') $sql .= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))";

+        elseif ($donetodo == 'done') $sql .= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))";

+        if (is_array($filters) && $filters['search_agenda_label']) $sql .= natural_search('a.label', $filters['search_agenda_label']);

+    }

+

+    // Add also event from emailings. TODO This should be replaced by an automatic event ? May be it's too much for very large emailing.

+    if (!empty($conf->mailing->enabled) && !empty($objcon->email)

+        && (empty($actioncode) || $actioncode == 'AC_OTH_AUTO' || $actioncode == 'AC_EMAILING'))

+    {

+        $langs->load("mails");

+

+        $sql2 = "SELECT m.rowid as id, m.titre as label, mc.date_envoi as dp, mc.date_envoi as dp2, '100' as percent, 'mailing' as type";

+        $sql2 .= ", null as fk_element, '' as elementtype, null as contact_id";

+        $sql2 .= ", 'AC_EMAILING' as acode, '' as alabel, '' as apicto";

+        $sql2 .= ", u.rowid as user_id, u.login as user_login, u.photo as user_photo, u.firstname as user_firstname, u.lastname as user_lastname"; // User that valid action

+        if (is_object($filterobj) && get_class($filterobj) == 'Societe')      $sql2 .= ", '' as lastname, '' as firstname";

+        elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql2 .= ", '' as lastname, '' as firstname";

+        elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur')  $sql2 .= ", '' as ref";

+        elseif (is_object($filterobj) && get_class($filterobj) == 'Product')  $sql2 .= ", '' as ref";

+        elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket')   $sql2 .= ", '' as ref";

+        $sql2 .= " FROM ".MAIN_DB_PREFIX."mailing as m, ".MAIN_DB_PREFIX."mailing_cibles as mc, ".MAIN_DB_PREFIX."user as u";

+        $sql2 .= " WHERE mc.email = '".$db->escape($objcon->email)."'"; // Search is done on email.

+        $sql2 .= " AND mc.statut = 1";

+        $sql2 .= " AND u.rowid = m.fk_user_valid";

+        $sql2 .= " AND mc.fk_mailing=m.rowid";

+    }

+

+    if (!empty($sql) && !empty($sql2)) {

+        $sql = $sql." UNION ".$sql2;

+    } elseif (empty($sql) && !empty($sql2)) {

+        $sql = $sql2;

+    }

+

+    //TODO Add limit in nb of results

+    $sql .= $db->order($sortfield_new, $sortorder);

+    dol_syslog("company.lib::show_actions_done", LOG_DEBUG);

+    $resql = $db->query($sql);

+    if ($resql)

+    {

+        $i = 0;

+        $num = $db->num_rows($resql);

+

+        while ($i < $num)

+        {

+            $obj = $db->fetch_object($resql);

+

+            if ($obj->type == 'action') {

+                $contactaction = new ActionComm($db);

+                $contactaction->id = $obj->id;

+                $result = $contactaction->fetchResources();

+                if ($result < 0) {

+                    dol_print_error($db);

+                    setEventMessage("company.lib::show_actions_done Error fetch ressource", 'errors');

+                }

+

+                //if ($donetodo == 'todo') $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))";

+                //elseif ($donetodo == 'done') $sql.= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))";

+                $tododone = '';

+                if (($obj->percent >= 0 and $obj->percent < 100) || ($obj->percent == -1 && $obj->datep > $now)) $tododone = 'todo';

+

+                $histo[$numaction] = array(

+                    'type'=>$obj->type,

+                    'tododone'=>$tododone,

+                    'id'=>$obj->id,

+                    'datestart'=>$db->jdate($obj->dp),

+                    'dateend'=>$db->jdate($obj->dp2),

+                    'note'=>$obj->label,

+                    'message'=>$obj->message,

+                    'percent'=>$obj->percent,

+

+                    'userid'=>$obj->user_id,

+                    'login'=>$obj->user_login,

+                    'userfirstname'=>$obj->user_firstname,

+                    'userlastname'=>$obj->user_lastname,

+                    'userphoto'=>$obj->user_photo,

+

+                    'contact_id'=>$obj->fk_contact,

+                    'socpeopleassigned' => $contactaction->socpeopleassigned,

+                    'lastname'=>$obj->lastname,

+                    'firstname'=>$obj->firstname,

+                    'fk_element'=>$obj->fk_element,

+                    'elementtype'=>$obj->elementtype,

+                    // Type of event

+                    'acode'=>$obj->acode,

+                    'alabel'=>$obj->alabel,

+                    'libelle'=>$obj->alabel, // deprecated

+                    'apicto'=>$obj->apicto

+                );

+            } else {

+                $histo[$numaction] = array(

+                    'type'=>$obj->type,

+                    'tododone'=>'done',

+                    'id'=>$obj->id,

+                    'datestart'=>$db->jdate($obj->dp),

+                    'dateend'=>$db->jdate($obj->dp2),

+                    'note'=>$obj->label,

+                    'message'=>$obj->message,

+                    'percent'=>$obj->percent,

+                    'acode'=>$obj->acode,

+

+                    'userid'=>$obj->user_id,

+                    'login'=>$obj->user_login,

+                    'userfirstname'=>$obj->user_firstname,

+                    'userlastname'=>$obj->user_lastname,

+                    'userphoto'=>$obj->user_photo

+                );

+            }

+

+            $numaction++;

+            $i++;

+        }

+    }

+    else

+    {

+        dol_print_error($db);

+    }

+

+    if (!empty($conf->agenda->enabled) || (!empty($conf->mailing->enabled) && !empty($objcon->email)))

+    {

+        $delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO * 24 * 60 * 60;

+

+        require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';

+        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';

+        require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';

+        require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';

+

+        $formactions = new FormActions($db);

+

+        $actionstatic = new ActionComm($db);

+        $userstatic = new User($db);

+        $contactstatic = new Contact($db);

+        $userGetNomUrlCache = array();

+

+		$out .= '<div class="filters-container" >';

+		$out .= '<form name="listactionsfilter" class="listactionsfilter" action="'.$_SERVER["PHP_SELF"].'" method="POST">';

+		if ($objcon && get_class($objcon) == 'Contact' &&

+			(is_null($filterobj) || get_class($filterobj) == 'Societe'))

+		{

+			$out .= '<input type="hidden" name="id" value="'.$objcon->id.'" />';

+		}

+		else

+		{

+			$out .= '<input type="hidden" name="id" value="'.$filterobj->id.'" />';

+		}

+		if ($filterobj && get_class($filterobj) == 'Societe') $out .= '<input type="hidden" name="socid" value="'.$filterobj->id.'" />';

+

+		$out .= "\n";

+

+		$out .= '<div class="div-table-responsive-no-min">';

+		$out .= '<table class="noborder borderbottom centpercent">';

+

+		$out .= '<tr class="liste_titre">';

+

+		//$out.='<td class="liste_titre">';

+		$out .= getTitleFieldOfList('Date', 0, $_SERVER["PHP_SELF"], 'a.datep', '', $param, '', $sortfield, $sortorder, '')."\n";

+		//$out.='</td>';

+

+		$out .= '<th class="liste_titre"><strong>'.$langs->trans("Search").' : </strong></th>';

+		if ($donetodo)

+		{

+			$out .= '<th class="liste_titre"></th>';

+		}

+		$out .= '<th class="liste_titre">'.$langs->trans("Type").' ';

+		$out .= $formactions->select_type_actions($actioncode, "actioncode", '', empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : -1, 0, 0, 1);

+		$out .= '</th>';

+		$out .= '<th class="liste_titre maxwidth100onsmartphone">';

+		$out .= $langs->trans("Label").' ';

+		$out .= '<input type="text" class="maxwidth100onsmartphone" name="search_agenda_label" value="'.$filters['search_agenda_label'].'">';

+		$out .= '</th>';

+

+		$out .= '<th class="liste_titre width50 middle">';

+		$searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1);

+		$out .= $searchpicto;

+		$out .= '</th>';

+		$out .= '</tr>';

+

+

+		$out .= '</table>';

+

+        $out .= '</form>';

+		$out .= '</div>';

+

+        $out .= "\n";

+

+        $out .= '<ul class="timeline">';

+

+        if ($donetodo)

+        {

+            $tmp = '';

+            if (get_class($filterobj) == 'Societe') $tmp .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php?socid='.$filterobj->id.'&amp;status=done">';

+            $tmp .= ($donetodo != 'done' ? $langs->trans("ActionsToDoShort") : '');

+            $tmp .= ($donetodo != 'done' && $donetodo != 'todo' ? ' / ' : '');

+            $tmp .= ($donetodo != 'todo' ? $langs->trans("ActionsDoneShort") : '');

+            //$out.=$langs->trans("ActionsToDoShort").' / '.$langs->trans("ActionsDoneShort");

+            if (get_class($filterobj) == 'Societe') $tmp .= '</a>';

+            $out .= getTitleFieldOfList($tmp);

+        }

+

+

+        //require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';

+        //$caction=new CActionComm($db);

+        //$arraylist=$caction->liste_array(1, 'code', '', (empty($conf->global->AGENDA_USE_EVENT_TYPE)?1:0), '', 1);

+

+        $actualCycleDate = false;

+

+        foreach ($histo as $key=>$value)

+        {

+            $actionstatic->fetch($histo[$key]['id']); // TODO Do we need this, we already have a lot of data of line into $histo

+

+            $actionstatic->type_picto = $histo[$key]['apicto'];

+            $actionstatic->type_code = $histo[$key]['acode'];

+

+            $url = DOL_URL_ROOT.'/comm/action/card.php?id='.$histo[$key]['id'];

+

+            $tmpa = dol_getdate($histo[$key]['datestart'], false);

+            if ($actualCycleDate !== $tmpa['year'].'-'.$tmpa['yday']) {

+                $actualCycleDate = $tmpa['year'].'-'.$tmpa['yday'];

+                $out .= '<!-- timeline time label -->';

+                $out .= '<li class="time-label">';

+                $out .= '<span class="timeline-badge-date">';

+                $out .= dol_print_date($histo[$key]['datestart'], 'daytext', 'tzserver', $langs);

+                $out .= '</span>';

+                $out .= '</li>';

+                $out .= '<!-- /.timeline-label -->';

+            }

+

+

+            $out .= '<!-- timeline item -->'."\n";

+            $out .= '<li class="timeline-code-'.strtolower($actionstatic->code).'">';

+

+

+            $out .= '<!-- timeline icon -->'."\n";

+            $iconClass = 'fa fa-comments';

+            $img_picto = '';

+            $colorClass = '';

+            $pictoTitle = '';

+

+            if ($histo[$key]['percent'] == -1) {

+                $colorClass = 'timeline-icon-not-applicble';

+                $pictoTitle = $langs->trans('StatusNotApplicable');

+            }

+            elseif ($histo[$key]['percent'] == 0) {

+                $colorClass = 'timeline-icon-todo';

+                $pictoTitle = $langs->trans('StatusActionToDo').' (0%)';

+            }

+            elseif ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100) {

+                $colorClass = 'timeline-icon-in-progress';

+                $pictoTitle = $langs->trans('StatusActionInProcess').' ('.$histo[$key]['percent'].'%)';

+            }

+            elseif ($histo[$key]['percent'] >= 100) {

+                $colorClass = 'timeline-icon-done';

+                $pictoTitle = $langs->trans('StatusActionDone').' (100%)';

+            }

+

+

+            if ($actionstatic->code == 'AC_TICKET_CREATE') {

+                $iconClass = 'fa fa-ticket';

+            }

+            elseif ($actionstatic->code == 'AC_TICKET_MODIFY') {

+                $iconClass = 'fa fa-pencil';

+            }

+            elseif ($actionstatic->code == 'TICKET_MSG') {

+                $iconClass = 'fa fa-comments';

+            }

+            elseif ($actionstatic->code == 'TICKET_MSG_PRIVATE') {

+                $iconClass = 'fa fa-mask';

+            }

+            elseif (!empty($conf->global->AGENDA_USE_EVENT_TYPE))

+            {

+                if ($actionstatic->type_picto) $img_picto = img_picto('', $actionstatic->type_picto);

+                else {

+                    if ($actionstatic->type_code == 'AC_RDV')       $iconClass = 'fa fa-handshake';

+                    elseif ($actionstatic->type_code == 'AC_TEL')   $iconClass = 'fa fa-phone';

+                    elseif ($actionstatic->type_code == 'AC_FAX')   $iconClass = 'fa fa-fax';

+                    elseif ($actionstatic->type_code == 'AC_EMAIL') $iconClass = 'fa fa-envelope';

+                    elseif ($actionstatic->type_code == 'AC_INT')   $iconClass = 'fa fa-shipping-fast';

+                    elseif ($actionstatic->type_code == 'AC_OTH_AUTO')   $iconClass = 'fa fa-robot';

+                    elseif (!preg_match('/_AUTO/', $actionstatic->type_code)) $iconClass = 'fa fa-robot';

+                }

+            }

+

+

+

+            $out .= '<i class="'.$iconClass.' '.$colorClass.'" title="'.$pictoTitle.'">'.$img_picto.'</i>'."\n";

+

+            $out .= '<div class="timeline-item">'."\n";

+

+            $out .= '<span class="timeline-header-action">';

+

+			if (isset($histo[$key]['type']) && $histo[$key]['type'] == 'mailing') {

+				$out .= '<a class="timeline-btn" href="'.DOL_URL_ROOT.'/comm/mailing/card.php?id='.$histo[$key]['id'].'">'.img_object($langs->trans("ShowEMailing"), "email").' ';

+				$out .= $histo[$key]['id'];

+				$out .= '</a> ';

+			} else {

+				$out .= $actionstatic->getNomUrl(1, -1, 'valignmiddle').' ';

+			}

+

+            //if ($user->rights->agenda->allactions->read || $actionstatic->authorid == $user->id)

+            //{

+            //	$out.='<a href="'.$url.'" class="timeline-btn" title="'.$langs->trans('Show').'" ><i class="fa fa-calendar" ></i>'.$langs->trans('Show').'</a>';

+            //}

+

+

+            if ($user->rights->agenda->allactions->create ||

+                (($actionstatic->authorid == $user->id || $actionstatic->userownerid == $user->id) && $user->rights->agenda->myactions->create))

+            {

+                $out .= '<a class="timeline-btn" href="'.DOL_MAIN_URL_ROOT.'/comm/action/card.php?action=edit&id='.$actionstatic->id.'"><i class="fa fa-pencil" title="'.$langs->trans("Modify").'" ></i></a>';

+            }

+

+

+            $out .= '</span>';

+            // Date

+            $out .= '<span class="time"><i class="fa fa-clock-o"></i> ';

+            $out .= dol_print_date($histo[$key]['datestart'], 'dayhour');

+            if ($histo[$key]['dateend'] && $histo[$key]['dateend'] != $histo[$key]['datestart'])

+            {

+                $tmpa = dol_getdate($histo[$key]['datestart'], true);

+                $tmpb = dol_getdate($histo[$key]['dateend'], true);

+                if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $out .= '-'.dol_print_date($histo[$key]['dateend'], 'hour');

+                else $out .= '-'.dol_print_date($histo[$key]['dateend'], 'dayhour');

+            }

+            $late = 0;

+            if ($histo[$key]['percent'] == 0 && $histo[$key]['datestart'] && $histo[$key]['datestart'] < ($now - $delay_warning)) $late = 1;

+            if ($histo[$key]['percent'] == 0 && !$histo[$key]['datestart'] && $histo[$key]['dateend'] && $histo[$key]['datestart'] < ($now - $delay_warning)) $late = 1;

+            if ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100 && $histo[$key]['dateend'] && $histo[$key]['dateend'] < ($now - $delay_warning)) $late = 1;

+            if ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100 && !$histo[$key]['dateend'] && $histo[$key]['datestart'] && $histo[$key]['datestart'] < ($now - $delay_warning)) $late = 1;

+            if ($late) $out .= img_warning($langs->trans("Late")).' ';

+            $out .= "</span>\n";

+

+            // Ref

+            $out .= '<h3 class="timeline-header">';

+

+            // Author of event

+            $out .= '<span class="messaging-author">';

+            if ($histo[$key]['userid'] > 0)

+            {

+                if (!isset($userGetNomUrlCache[$histo[$key]['userid']])) { // is in cache ?

+                    $userstatic->fetch($histo[$key]['userid']);

+                    $userGetNomUrlCache[$histo[$key]['userid']] = $userstatic->getNomUrl(-1, '', 0, 0, 16, 0, 'firstelselast', '');

+                }

+                $out .= $userGetNomUrlCache[$histo[$key]['userid']];

+            }

+            $out .= '</span>';

+

+            // Title

+            $out .= ' <span class="messaging-title">';

+

+			if ($actionstatic->code == 'TICKET_MSG') {

+				$out .= $langs->trans('TicketNewMessage');

+			}

+			elseif ($actionstatic->code == 'TICKET_MSG_PRIVATE') {

+				$out .= $langs->trans('TicketNewMessage').' <em>('.$langs->trans('Private').')</em>';

+			} else {

+                if (isset($histo[$key]['type']) && $histo[$key]['type'] == 'action') {

+                    $transcode = $langs->trans("Action".$histo[$key]['acode']);

+                    $libelle = ($transcode != "Action".$histo[$key]['acode'] ? $transcode : $histo[$key]['alabel']);

+                    $libelle = $histo[$key]['note'];

+                    $actionstatic->id = $histo[$key]['id'];

+                    $out .= dol_trunc($libelle, 120);

+                }

+                if (isset($histo[$key]['type']) && $histo[$key]['type'] == 'mailing') {

+                    $out .= '<a href="'.DOL_URL_ROOT.'/comm/mailing/card.php?id='.$histo[$key]['id'].'">'.img_object($langs->trans("ShowEMailing"), "email").' ';

+                    $transcode = $langs->trans("Action".$histo[$key]['acode']);

+                    $libelle = ($transcode != "Action".$histo[$key]['acode'] ? $transcode : 'Send mass mailing');

+                    $out .= dol_trunc($libelle, 120);

+                }

+            }

+

+

+            $out .= '</span>';

+

+            $out .= '</h3>';

+

+            if (!empty($histo[$key]['message'])

+                && $actionstatic->code != 'AC_TICKET_CREATE'

+                && $actionstatic->code != 'AC_TICKET_MODIFY'

+            )

+            {

+                $out .= '<div class="timeline-body">';

+                $out .= $histo[$key]['message'];

+                $out .= '</div>';

+            }

+

+

+            // Timeline footer

+            $footer = '';

+

+            // Contact for this action

+            if (isset($histo[$key]['socpeopleassigned']) && is_array($histo[$key]['socpeopleassigned']) && count($histo[$key]['socpeopleassigned']) > 0) {

+                $contactList = '';

+                foreach ($histo[$key]['socpeopleassigned'] as $cid => $Tab) {

+                    $contact = new Contact($db);

+                    $result = $contact->fetch($cid);

+

+                    if ($result < 0)

+                        dol_print_error($db, $contact->error);

+

+                    if ($result > 0) {

+                        $contactList .= !empty($contactList) ? ', ' : '';

+                        $contactList .= $contact->getNomUrl(1);

+                        if (isset($histo[$key]['acode']) && $histo[$key]['acode'] == 'AC_TEL') {

+                            if (!empty($contact->phone_pro))

+                                $contactList .= '('.dol_print_phone($contact->phone_pro).')';

+                        }

+                    }

+                }

+

+                $footer .= $langs->trans('ActionOnContact').' : '.$contactList;

+            }

+            elseif (empty($objcon->id) && isset($histo[$key]['contact_id']) && $histo[$key]['contact_id'] > 0)

+            {

+                $contact = new Contact($db);

+                $result = $contact->fetch($histo[$key]['contact_id']);

+

+                if ($result < 0)

+                    dol_print_error($db, $contact->error);

+

+                if ($result > 0) {

+                    $footer .= $contact->getNomUrl(1);

+                    if (isset($histo[$key]['acode']) && $histo[$key]['acode'] == 'AC_TEL') {

+                        if (!empty($contact->phone_pro))

+                            $footer .= '('.dol_print_phone($contact->phone_pro).')';

+                    }

+                }

+            }

+

+			$documents = getTicketActionCommEcmList($actionstatic);

+            if (!empty($documents))

+			{

+				$footer .= '<div class="timeline-documents-container">';

+				foreach ($documents as $doc)

+				{

+					$footer .= '<span id="document_'.$doc->id.'" class="timeline-documents" ';

+					$footer .= ' data-id="'.$doc->id.'" ';

+					$footer .= ' data-path="'.$doc->filepath.'"';

+					$footer .= ' data-filename="'.dol_escape_htmltag($doc->filename).'" ';

+					$footer .= '>';

+

+					$filePath = DOL_DATA_ROOT.'/'.$doc->filepath.'/'.$doc->filename;

+					$mime = dol_mimetype($filePath);

+					$file = $actionstatic->id.'/'.$doc->filename;

+					$thumb = $actionstatic->id.'/thumbs/'.substr($doc->filename, 0, strrpos($doc->filename, '.')).'_mini'.substr($doc->filename, strrpos($doc->filename, '.'));

+					$doclink = dol_buildpath('document.php', 1).'?modulepart=actions&attachment=0&file='.urlencode($file).'&entity='.$conf->entity;

+					$viewlink = dol_buildpath('viewimage.php', 1).'?modulepart=actions&file='.urlencode($thumb).'&entity='.$conf->entity;

+

+					$mimeAttr = ' mime="'.$mime.'" ';

+					$class = '';

+					if (in_array($mime, array('image/png', 'image/jpeg', 'application/pdf'))) {

+						$class .= ' documentpreview';

+					}

+

+					$footer .= '<a href="'.$doclink.'" class="btn-link '.$class.'" target="_blank"  '.$mimeAttr.' >';

+					$footer .= img_mime($filePath).' '.$doc->filename;

+					$footer .= '</a>';

+

+					$footer .= '</span>';

+				}

+				$footer .= '</div>';

+			}

+

+

+

+

+

+

+

+            if (!empty($footer)) {

+                $out .= '<div class="timeline-footer">'.$footer.'</div>';

+            }

+

+

+            $out .= '</div>'."\n"; // end timeline-item

+

+            $out .= '</li>';

+            $out .= '<!-- END timeline item -->';

+

+            $i++;

+        }

+        $out .= "</ul>\n";

+    }

+

+

+    if ($noprint) return $out;

+    else print $out;

+}

+

+

+/**

+ * getTicketActionCommEcmList

+ *

+ * @param	ActionComm		$object			Object ActionComm

+ * @return 	array							Array of documents in index table

+ */

+function getTicketActionCommEcmList($object)

+{

+	global $conf, $db;

+

+	$documents = array();

+

+	$sql = 'SELECT ecm.rowid as id, ecm.src_object_type, ecm.src_object_id, ecm.filepath, ecm.filename';

+	$sql .= ' FROM '.MAIN_DB_PREFIX.'ecm_files ecm';

+	$sql .= ' WHERE ecm.filepath = \'agenda/'.$object->id.'\'';

+	//$sql.= ' ecm.src_object_type = \''.$object->element.'\' AND ecm.src_object_id = '.$object->id; // Actually upload file doesn't add type

+	$sql .= ' ORDER BY ecm.position ASC';

+

+	$resql = $db->query($sql);

+	if ($resql) {

+		if ($db->num_rows($resql)) {

+			while ($obj = $db->fetch_object($resql)) {

+				$documents[$obj->id] = $obj;

@@ -244,29 +932 @@
-	// Output html code for logo

-	if ($urllogo || getDolGlobalString('TICKET_PUBLIC_INTERFACE_TOPIC')) {

-		print '<div class="backgreypublicpayment">';

-		print '<div class="logopublicpayment">';

-		if ($urllogo) {

-			print '<a href="'.(getDolGlobalString('TICKET_URL_PUBLIC_INTERFACE') ? getDolGlobalString('TICKET_URL_PUBLIC_INTERFACE') : dol_buildpath('/public/ticket/index.php?entity='.$conf->entity, 1)).'">';

-			print '<img id="dolpaymentlogo" src="'.$urllogo.'"';

-			print '>';

-			print '</a>';

-		}

-		if (getDolGlobalString('TICKET_PUBLIC_INTERFACE_TOPIC')) {

-			print '<div class="clearboth"></div><strong>'.(getDolGlobalString('TICKET_PUBLIC_INTERFACE_TOPIC') ? getDolGlobalString('TICKET_PUBLIC_INTERFACE_TOPIC') : $langs->trans("TicketSystem")).'</strong>';

-		}

-		print '</div>';

-		if (!getDolGlobalInt('MAIN_HIDE_POWERED_BY')) {

-			print '<div class="poweredbypublicpayment opacitymedium right hideonsmartphone"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';

-		}

-		print '</div>';

-	}

-

-	if (getDolGlobalInt('TICKET_IMAGE_PUBLIC_INTERFACE')) {

-		print '<div class="backimagepublicticket">';

-		print '<img id="idTICKET_IMAGE_PUBLIC_INTERFACE" src="'.getDolGlobalString('TICKET_IMAGE_PUBLIC_INTERFACE').'">';

-		print '</div>';

-	}

-

-	print '</header>';

-

-	//print '<div class="ticketlargemargin">';

+	return $documents;

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_treeview.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_treeview.lib.php
@@ -41 +41,2 @@
-	while ($pos <= $fulltree[$key]['level'] && $fulltree[$key]['level'] > 0) {

+	while ($pos <= $fulltree[$key]['level'] && $fulltree[$key]['level'] > 0)

+	{

@@ -49,4 +50,7 @@
-		foreach ($fulltree as $key2 => $val2) {

-			//print "x".$pos." ".$key2." ".$found." ".$fulltree[$key2]['level'];

-			if ($found == 1) { // We are after the entry to show

-				if ($fulltree[$key2]['level'] > $pos) {

+		foreach ($fulltree as $key2 => $val2)

+		{

+            //print "x".$pos." ".$key2." ".$found." ".$fulltree[$key2]['level'];

+			if ($found == 1) // We are after the entry to show

+			{

+				if ($fulltree[$key2]['level'] > $pos)

+				{

@@ -54,5 +58,4 @@
-					if (isset($fulltree[$key2]['cachenbofdoc']) && $fulltree[$key2]['cachenbofdoc'] > 0) {

-						$nbofdocinsub += $fulltree[$key2]['cachenbofdoc'];

-					}

-				}

-				if ($fulltree[$key2]['level'] == $pos) {

+					if (isset($fulltree[$key2]['cachenbofdoc']) && $fulltree[$key2]['cachenbofdoc'] > 0) $nbofdocinsub += $fulltree[$key2]['cachenbofdoc'];

+				}

+				if ($fulltree[$key2]['level'] == $pos)

+				{

@@ -61 +64,2 @@
-				if ($fulltree[$key2]['level'] <= $pos) {

+				if ($fulltree[$key2]['level'] <= $pos)

+				{

@@ -65 +69,2 @@
-			if ($key2 == $key) {    // We found ourself, so now every lower level will be counted

+			if ($key2 == $key)    // We found ourself, so now every lower level will be counted

+			{

@@ -71,14 +76,12 @@
-		if (!$silent) {

-			if ($atleastoneofthislevelafter) {

-				if ($fulltree[$key]['level'] == $pos) {

-					print img_picto_common('', 'treemenu/branch.gif');

-				} else {

-					print img_picto_common('', 'treemenu/line.gif');

-				}

-			} else {

-				if ($fulltree[$key]['level'] == $pos) {

-					print img_picto_common('', 'treemenu/branchbottom.gif');

-				} else {

-					print img_picto_common('', 'treemenu/linebottom.gif');

-				}

-			}

+		if (!$silent)

+		{

+    		if ($atleastoneofthislevelafter)

+    		{

+    			if ($fulltree[$key]['level'] == $pos) print img_picto_common('', 'treemenu/branch.gif');

+    			else print img_picto_common('', 'treemenu/line.gif');

+    		}

+    		else

+    		{

+    			if ($fulltree[$key]['level'] == $pos) print img_picto_common('', 'treemenu/branchbottom.gif');

+    			else print img_picto_common('', 'treemenu/linebottom.gif');

+    		}

@@ -105,4 +108,4 @@
- *  @param	array	$tab    					Array of all elements

- *  @param  array   $pere   					Array with parent ids ('rowid'=>,'mainmenu'=>,'leftmenu'=>,'fk_mainmenu'=>,'fk_leftmenu'=>)

- *  @param  int	    $rang   					Level of element

- *  @param	string	$iddivjstree				Id to use for parent ul element

+ *  @param	array	$tab    		Array of all elements

+ *  @param  array   $pere   		Array with parent ids ('rowid'=>,'mainmenu'=>,'leftmenu'=>,'fk_mainmenu=>,'fk_leftmenu=>)

+ *  @param  int	    $rang   		Level of element

+ *  @param	string	$iddivjstree	Id to use for parent ul element

@@ -110,2 +113 @@
- *  @param  int     $showfk         			1=show fk_links to parent into label  (used by menu editor only)

- *  @param	string	$moreparam					Add more param on url of elements

+ *  @param  int     $showfk         1=show fk_links to parent into label  (used by menu editor only)

@@ -114 +116 @@
-function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoresetalreadyloaded = 0, $showfk = 0, $moreparam = '')

+function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoresetalreadyloaded = 0, $showfk = 0)

@@ -116,7 +118,6 @@
-	global $tree_recur_alreadyadded, $menu_handler_to_search;

-

-	if ($rang == 0 && empty($donoresetalreadyloaded)) {

-		$tree_recur_alreadyadded = array();

-	}

-

-	if ($rang == 0) {

+    global $tree_recur_alreadyadded, $menu_handler_to_search;

+

+    if ($rang == 0 && empty($donoresetalreadyloaded)) $tree_recur_alreadyadded = array();

+

+    if ($rang == 0)

+	{

@@ -124 +125 @@
-		print '<script nonce="'.getNonce().'" type="text/javascript">

+		print '<script type="text/javascript" language="javascript">

@@ -141,5 +142,7 @@
-	if ($rang > 50) {

-		return; // Protect against infinite loop. Max 50 depth

-	}

-

-	// Loop on each element of tree

+	if ($rang > 50)

+	{

+	    return; // Protect against infinite loop. Max 50 depth

+	}

+

+	//ballayage du tableau

+	$sizeoftab = count($tab);

@@ -147,3 +150,2 @@
-	foreach ($tab as $tmpkey => $tmpval) {

-		$x = $tmpkey;

-

+	for ($x = 0; $x < $sizeoftab; $x++)

+	{

@@ -152,24 +154,27 @@
-		if ($tab[$x]['fk_menu'] != -1 && ((int) $tab[$x]['fk_menu']) == $pere['rowid']) {

-			//print 'rang='.$rang.'-x='.$x." rowid=".$tab[$x]['rowid']." tab[x]['fk_leftmenu'] = ".$tab[$x]['fk_leftmenu']." leftmenu pere = ".$pere['leftmenu']."<br>\n";

-			if (empty($ulprinted) && !empty($pere['rowid'])) {

-				if (!empty($tree_recur_alreadyadded[$tab[$x]['rowid']])) {

-					dol_syslog('Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.', LOG_WARNING);

-					continue;

-				}

-

-				print "\n".'<ul'.(empty($pere['rowid']) ? ' id="treeData"' : '').'>';

-				$ulprinted++;

-			}

-			print "\n".'<li '.(!empty($tab[$x]['statut']) ? ' class="liuseractive"' : 'class="liuserdisabled"').'>';

-			if ($showfk) {

-				print '<table class="nobordernopadding centpercent"><tr>';

-				print '<td class="tdoverflowmax300">';

-				print '<span class="paddingleft paddingright">'.$tab[$x]['title'].'</span>';

-				print '<span class="opacitymedium">(fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].')</span>';

-				print '</td>';

-				print '<td class="right nowraponall">';

-				print $tab[$x]['buttons'];

-				print '</td></tr></table>';

-			} else {

-				// Show the badge with color for the category

-				print $tab[$x]['entry'];

+		if ($tab[$x]['fk_menu'] != -1 && $tab[$x]['fk_menu'] == $pere['rowid'])

+		{

+		    //print 'rang='.$rang.'-x='.$x." rowid=".$tab[$x]['rowid']." tab[x]['fk_leftmenu'] = ".$tab[$x]['fk_leftmenu']." leftmenu pere = ".$pere['leftmenu']."<br>\n";

+			if (empty($ulprinted) && !empty($pere['rowid']))

+			{

+    		    if (!empty($tree_recur_alreadyadded[$tab[$x]['rowid']]))

+    		    {

+    		          dol_syslog('Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.', LOG_WARNING);

+    		          continue;

+    		    }

+

+                print '<ul'.(empty($pere['rowid']) ? ' id="treeData"' : '').'>'; $ulprinted++;

+			}

+			print "\n".'<li '.($tab[$x]['statut'] ? ' class="liuseractive"' : 'class="liuserdisabled"').'>';

+			if ($showfk)

+			{

+			    print '<table class="nobordernopadding centpercent"><tr><td>';

+			    print '<strong> &nbsp; ';

+			    print $tab[$x]['title'];

+			    print '&nbsp; (fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].')';

+			    print '</td><td class="right">';

+			    print $tab[$x]['buttons'];

+			    print '</td></tr></table>';

+			}

+			else

+			{

+			    print $tab[$x]['entry'];

@@ -178 +183 @@
-			$tree_recur_alreadyadded[$tab[$x]['rowid']] = ($rang + 1);

+		    $tree_recur_alreadyadded[$tab[$x]['rowid']] = ($rang + 1);

@@ -182,28 +187,30 @@
-		} elseif (!empty($tab[$x]['rowid']) && ((int) $tab[$x]['fk_menu']) == -1 && $tab[$x]['fk_mainmenu'] == $pere['mainmenu'] && $tab[$x]['fk_leftmenu'] == $pere['leftmenu']) {

-			//print 'rang='.$rang.'-x='.$x." rowid=".$tab[$x]['rowid']." tab[x]['fk_leftmenu'] = ".$tab[$x]['fk_leftmenu']." leftmenu pere = ".$pere['leftmenu']."<br>\n";

-			if (empty($ulprinted) && !empty($pere['rowid'])) {

-				if (!empty($tree_recur_alreadyadded[$tab[$x]['rowid']])) {

-					dol_syslog('Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.', LOG_WARNING);

-					//print 'Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.';

-					continue;

-				}

-

-				print "\n".'<ul'.(empty($pere['rowid']) ? ' id="treeData"' : '').'>';

-				$ulprinted++;

-			}

-			print "\n".'<li '.(!empty($tab[$x]['statut']) ? ' class="liuseractive"' : 'class="liuserdisabled"').'>';

-			if ($showfk) {

-				print '<table class="nobordernopadding centpercent"><tr>';

-				print '<td class="tdoverflowmax200">';

-				print '<strong class="paddingleft paddingright">';

-				print '<a href="edit.php?menu_handler='.$menu_handler_to_search.'&action=edit&token='.newToken().'&menuId='.$tab[$x]['rowid'].$moreparam.'">';

-				print $tab[$x]['title'];

-				print '</a>';

-				print '</strong>';

-				print '<span class="small opacitymedium">(mainmenu='.$tab[$x]['mainmenu'].' - leftmenu='.$tab[$x]['leftmenu'].', fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].')</small>';

-				print '</td>';

-				print '<td class="right nowraponall">';

-				print $tab[$x]['buttons'];

-				print '</td></tr></table>';

-			} else {

-				print $tab[$x]['entry'];

+		}

+		elseif (!empty($tab[$x]['rowid']) && $tab[$x]['fk_menu'] == -1 && $tab[$x]['fk_mainmenu'] == $pere['mainmenu'] && $tab[$x]['fk_leftmenu'] == $pere['leftmenu'])

+		{

+		    //print 'rang='.$rang.'-x='.$x." rowid=".$tab[$x]['rowid']." tab[x]['fk_leftmenu'] = ".$tab[$x]['fk_leftmenu']." leftmenu pere = ".$pere['leftmenu']."<br>\n";

+		    if (empty($ulprinted) && !empty($pere['rowid']))

+		    {

+		        if (!empty($tree_recur_alreadyadded[$tab[$x]['rowid']]))

+		        {

+		            dol_syslog('Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.', LOG_WARNING);

+		            //print 'Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.';

+                    continue;

+		        }

+

+		        print '<ul'.(empty($pere['rowid']) ? ' id="treeData"' : '').'>'; $ulprinted++;

+		    }

+			print "\n".'<li '.($tab[$x]['statut'] ? ' class="liuseractive"' : 'class="liuserdisabled"').'>';

+			if ($showfk)

+			{

+			    print '<table class="nobordernopadding centpercent"><tr><td>';

+			    print '<strong> &nbsp; <a href="edit.php?menu_handler='.$menu_handler_to_search.'&action=edit&menuId='.$tab[$x]['rowid'].'">';

+			    print $tab[$x]['title'];

+			    print '</a></strong>';

+			    print '&nbsp; (mainmenu='.$tab[$x]['mainmenu'].' leftmenu='.$tab[$x]['leftmenu'].' - fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].')';

+			    print '</td><td class="right">';

+			    print $tab[$x]['buttons'];

+			    print '</td></tr></table>';

+			}

+			else

+			{

+			    print $tab[$x]['entry'];

@@ -215 +222 @@
-			tree_recur($tab, $tab[$x], $rang + 1, 'iddivjstree', 0, $showfk);

+		    tree_recur($tab, $tab[$x], $rang + 1, 'iddivjstree', 0, $showfk);

@@ -219,7 +226,3 @@
-	if (!empty($ulprinted) && !empty($pere['rowid'])) {

-		print '</ul>'."\n";

-	}

-

-	if ($rang == 0) {

-		print '</ul>';

-	}

+	if (!empty($ulprinted) && !empty($pere['rowid'])) { print '</ul>'."\n"; }

+

+    if ($rang == 0) print '</ul>';

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_usergroups.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_usergroups.lib.php
@@ -6 +5,0 @@
- * Copyright (C) 2021-2023  Anthony Berton      <anthony.berton@bb2a.fr>

@@ -26 +25 @@
- *		\brief      Set of function to manage users, groups and permissions

+ *		\brief      Ensemble de fonctions de base pour la gestion des utilisaterus et groupes

@@ -32 +31 @@
- * @param   User	$object		Object related to tabs

+ * @param   Object	$object		Object related to tabs

@@ -35 +34 @@
-function user_prepare_head(User $object)

+function user_prepare_head($object)

@@ -42,2 +41,3 @@
-	if (getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {

-		$canreadperms = ($user->admin || ($user->id != $object->id && $user->hasRight('user', 'user_advance', 'readperms')) || ($user->id == $object->id && $user->hasRight('user', 'self_advance', 'readperms')));

+	if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS))

+	{

+		$canreadperms = ($user->admin || ($user->id != $object->id && $user->rights->user->user_advance->readperms) || ($user->id == $object->id && $user->rights->user->self_advance->readperms));

@@ -50 +50 @@
-	$head[$h][1] = $langs->trans("User");

+	$head[$h][1] = $langs->trans("UserCard");

@@ -54,2 +54,3 @@
-	if ((!empty($conf->ldap->enabled) && getDolGlobalString('LDAP_SYNCHRO_ACTIVE'))

-		&& (!getDolGlobalString('MAIN_DISABLE_LDAP_TAB') || !empty($user->admin))) {

+	if ((!empty($conf->ldap->enabled) && !empty($conf->global->LDAP_SYNCHRO_ACTIVE))

+		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || !empty($user->admin)))

+	{

@@ -63 +64,2 @@
-	if ($canreadperms) {

+	if ($canreadperms)

+	{

@@ -65 +67 @@
-		$head[$h][1] = $langs->trans("Rights").(!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">'.($object->nb_rights).'</span>' : '');

+		$head[$h][1] = $langs->trans("Rights").(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.($object->nb_rights).'</span>' : '');

@@ -75,4 +77,3 @@
-	if (isModEnabled('agenda')) {

-		if (!getDolGlobalString('AGENDA_EXT_NB')) {

-			$conf->global->AGENDA_EXT_NB = 5;

-		}

+	if (!empty($conf->agenda->enabled))

+	{

+		if (empty($conf->global->AGENDA_EXT_NB)) $conf->global->AGENDA_EXT_NB = 5;

@@ -83 +84,2 @@
-		while ($i <= $MAXAGENDA) {

+		while ($i <= $MAXAGENDA)

+		{

@@ -91,3 +93 @@
-			if (!empty($object->conf->$name)) {

-				$nbagenda++;

-			}

+			if (!empty($object->conf->$name)) $nbagenda++;

@@ -102 +102,2 @@
-	if (isModEnabled('clicktodial')) {

+	if (!empty($conf->clicktodial->enabled))

+	{

@@ -110 +111,2 @@
-	if ($user->socid == 0 && isModEnabled('notification')) {

+	if ($user->socid == 0 && !empty($conf->notification->enabled))

+	{

@@ -114 +116 @@
-		$sql .= " WHERE fk_user = ".((int) $object->id);

+		$sql .= " WHERE fk_user = ".$object->id;

@@ -116 +118,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -119 +122,2 @@
-			while ($i < $num) {

+			while ($i < $num)

+			{

@@ -124 +128,2 @@
-		} else {

+		}

+		else {

@@ -128 +132,0 @@
-		$langs->load("mails");

@@ -130,4 +134,2 @@
-		$head[$h][1] = $langs->trans("NotificationsAuto");

-		if ($nbNote > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

-		}

+		$head[$h][1] = $langs->trans("Notifications");

+		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

@@ -144,5 +146,6 @@
-	if ((isModEnabled('salaries') && $user->hasRight('salaries', 'read'))

-		|| (isModEnabled('hrm') && $user->hasRight('hrm', 'employee', 'read'))

-		|| (isModEnabled('expensereport') && $user->hasRight('expensereport', 'lire') && ($user->id == $object->id || $user->hasRight('expensereport', 'readall')))

-		|| (isModEnabled('holiday') && $user->hasRight('holiday', 'read') && ($user->id == $object->id || $user->hasRight('holiday', 'readall')))

-		) {

+	if ((!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read))

+		|| (!empty($conf->hrm->enabled) && !empty($user->rights->hrm->employee->read))

+		|| (!empty($conf->expensereport->enabled) && !empty($user->rights->expensereport->lire) && ($user->id == $object->id || $user->rights->expensereport->readall))

+		|| (!empty($conf->holiday->enabled) && !empty($user->rights->holiday->read) && ($user->id == $object->id || $user->rights->holiday->read_all))

+		)

+	{

@@ -157 +160,2 @@
-	if (empty($user->socid)) {

+	if (empty($user->socid))

+	{

@@ -160,6 +164 @@
-		if (!empty($object->note_public)) {

-			$nbNote++;

-		}

-		if (!empty($object->note_private)) {

-			$nbNote++;

-		}

+		if (!empty($object->note)) $nbNote++;

@@ -168,3 +167 @@
-		if ($nbNote > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

-		}

+		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';

@@ -182,3 +179 @@
-		if (($nbFiles + $nbLinks) > 0) {

-			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

-		}

+		if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

@@ -210 +205,2 @@
-	if (getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {

+	if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS))

+	{

@@ -218 +214 @@
-	$head[$h][1] = $langs->trans("Card");

+	$head[$h][1] = $langs->trans("GroupCard");

@@ -222,2 +218,3 @@
-	if ((!empty($conf->ldap->enabled) && getDolGlobalString('LDAP_SYNCHRO_ACTIVE'))

-		&& (!getDolGlobalString('MAIN_DISABLE_LDAP_TAB') || !empty($user->admin))) {

+	if ((!empty($conf->ldap->enabled) && !empty($conf->global->LDAP_SYNCHRO_ACTIVE))

+		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || !empty($user->admin)))

+	{

@@ -231 +228,2 @@
-	if ($canreadperms) {

+	if ($canreadperms)

+	{

@@ -256,5 +254 @@
-	global $langs, $conf, $user, $db;

-

-	$extrafields = new ExtraFields($db);

-	$extrafields->fetch_name_optionals_label('user');

-	$extrafields->fetch_name_optionals_label('usergroup');

+	global $langs, $conf, $user;

@@ -264 +258 @@
-	$head = array();

+    $head = array();

@@ -278,4 +271,0 @@
-	$nbExtrafields = $extrafields->attributes['user']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

@@ -287,4 +276,0 @@
-	$nbExtrafields = $extrafields->attributes['usergroup']['count'];

-	if ($nbExtrafields > 0) {

-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';

-	}

@@ -322,2 +308,4 @@
-	if (!empty($conf->modules_parts['theme'])) {		// Using this feature slow down application

-		foreach ($conf->modules_parts['theme'] as $reldir) {

+	if (!empty($conf->modules_parts['theme']))		// Using this feature slow down application

+	{

+		foreach ($conf->modules_parts['theme'] as $reldir)

+		{

@@ -331,5 +319,2 @@
-	if (empty($foruserprofile)) {

-		$selected_theme = $conf->global->MAIN_THEME;

-	} else {

-		$selected_theme = ((is_object($fuser) && !empty($fuser->conf->MAIN_THEME)) ? $fuser->conf->MAIN_THEME : '');

-	}

+	if (empty($foruserprofile)) $selected_theme = $conf->global->MAIN_THEME;

+	else $selected_theme = ((is_object($fuser) && !empty($fuser->conf->MAIN_THEME)) ? $fuser->conf->MAIN_THEME : '');

@@ -338,5 +323,2 @@
-	if (empty($foruserprofile)) {

-		$hoverdisabled = (getDolGlobalString('THEME_ELDY_USE_HOVER') == '0');

-	} else {

-		$hoverdisabled = (is_object($fuser) ? (empty($fuser->conf->THEME_ELDY_USE_HOVER) || $fuser->conf->THEME_ELDY_USE_HOVER == '0') : '');

-	}

+	if (empty($foruserprofile)) $hoverdisabled = (isset($conf->global->THEME_ELDY_USE_HOVER) && $conf->global->THEME_ELDY_USE_HOVER == '0');

+	else $hoverdisabled = (is_object($fuser) ? (empty($fuser->conf->THEME_ELDY_USE_HOVER) || $fuser->conf->THEME_ELDY_USE_HOVER == '0') : '');

@@ -345,5 +327,2 @@
-	if (empty($foruserprofile)) {

-		$checkeddisabled = (getDolGlobalString('THEME_ELDY_USE_CHECKED') == '0');

-	} else {

-		$checkeddisabled = (is_object($fuser) ? (empty($fuser->conf->THEME_ELDY_USE_CHECKED) || $fuser->conf->THEME_ELDY_USE_CHECKED == '0') : '');

-	}

+	if (empty($foruserprofile)) $checkeddisabled = (isset($conf->global->THEME_ELDY_USE_CHECKED) && $conf->global->THEME_ELDY_USE_CHECKED == '0');

+	else $checkeddisabled = (is_object($fuser) ? (empty($fuser->conf->THEME_ELDY_USE_CHECKED) || $fuser->conf->THEME_ELDY_USE_CHECKED == '0') : '');

@@ -352,3 +331 @@
-	if ($foruserprofile) {

-		$colspan = 4;

-	}

+	if ($foruserprofile) $colspan = 4;

@@ -357,2 +334 @@
-	print '<div class="div-table-responsive-no-min">';

-	print '<table class="noborder centpercent'.($edit ? ' editmodeforshowskin' : '').'">';

+	print '<table class="noborder centpercent'.($edit ? ' editmode' : '').' tableforfield">';

@@ -361,2 +337,3 @@
-	if ($foruserprofile) {

-		print '<tr class="liste_titre"><th class="titlefieldmiddle">'.$langs->trans("Parameter").'</th><th>'.$langs->trans("DefaultValue").'</th>';

+	if ($foruserprofile)

+	{

+		print '<tr class="liste_titre"><th class="titlefield">'.$langs->trans("Parameter").'</th><th>'.$langs->trans("DefaultValue").'</th>';

@@ -368,2 +345,2 @@
-		print '<td>' . getDolGlobalString('MAIN_THEME').'</td>';

-		print '<td class="nowrap left"><input id="check_MAIN_THEME" name="check_MAIN_THEME"'.($edit ? '' : ' disabled').' type="checkbox" '.($selected_theme ? " checked" : "").'> <label for="check_MAIN_THEME">'.$langs->trans("UsePersonalValue").'</label></td>';

+		print '<td>'.$conf->global->MAIN_THEME.'</td>';

+		print '<td class="nowrap left" width="20%"><input id="check_MAIN_THEME" name="check_MAIN_THEME"'.($edit ? '' : ' disabled').' type="checkbox" '.($selected_theme ? " checked" : "").'> '.$langs->trans("UsePersonalValue").'</td>';

@@ -372 +349,3 @@
-	} else {

+	}

+	else

+	{

@@ -374 +353,2 @@
-		foreach ($dirthemes as $dirtheme) {

+		foreach ($dirthemes as $dirtheme)

+		{

@@ -378 +358 @@
-		print '<tr class="liste_titre"><th class="titlefieldmiddle">';

+		print '<tr class="liste_titre"><th class="titlefield">';

@@ -383 +363 @@
-		print '<a href="'.$url.'" target="_blank" rel="noopener noreferrer external">';

+		print '<a href="'.$url.'" target="_blank">';

@@ -385 +364,0 @@
-		print img_picto('', 'globe', 'class="paddingleft"');

@@ -390,8 +369,3 @@
-	print '<tr><td colspan="'.$colspan.'" class="center">';

-

-	if (getDolGlobalString('MAIN_FORCETHEME')) {

-		$langs->load("errors");

-		print $langs->trans("WarningThemeForcedTo", $conf->global->MAIN_FORCETHEME);

-	}

-

-	print '<table class="nobordernopadding centpercent"><tr><td><div class="center">';

+	print '<tr><td colspan="'.$colspan.'">';

+

+	print '<table class="nobordernopadding" width="100%"><tr><td><div class="center">';

@@ -400 +374,2 @@
-	foreach ($dirthemes as $dir) {

+	foreach ($dirthemes as $dir)

+	{

@@ -405 +380,2 @@
-		if (is_dir($dirtheme)) {

+		if (is_dir($dirtheme))

+		{

@@ -407,4 +383,7 @@
-			if (is_resource($handle)) {

-				while (($subdir = readdir($handle)) !== false) {

-					if (is_dir($dirtheme."/".$subdir) && substr($subdir, 0, 1) != '.'

-							&& substr($subdir, 0, 3) != 'CVS' && !preg_match('/common|phones/i', $subdir)) {

+			if (is_resource($handle))

+			{

+				while (($subdir = readdir($handle)) !== false)

+				{

+					if (is_dir($dirtheme."/".$subdir) && substr($subdir, 0, 1) <> '.'

+							&& substr($subdir, 0, 3) <> 'CVS' && !preg_match('/common|phones/i', $subdir))

+					{

@@ -412,6 +391,2 @@
-						if (getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2 && preg_match('/_dev$/i', $subdir)) {

-							continue;

-						}

-						if (getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1 && preg_match('/_exp$/i', $subdir)) {

-							continue;

-						}

+						if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i', $subdir)) continue;

+						if ($conf->global->MAIN_FEATURES_LEVEL < 1 && preg_match('/_exp$/i', $subdir)) continue;

@@ -422,2 +397,9 @@
-						if (!file_exists($file)) {

-							$url = DOL_URL_ROOT.'/public/theme/common/nophoto.png';

+						if (!file_exists($file)) $url = DOL_URL_ROOT.'/public/theme/common/nophoto.png';

+						print '<a href="'.$_SERVER["PHP_SELF"].($edit ? '?action=edit&theme=' : '?theme=').$subdir.(GETPOST('optioncss', 'alpha', 1) ? '&optioncss='.GETPOST('optioncss', 'alpha', 1) : '').($fuser ? '&id='.$fuser->id : '').'" style="font-weight: normal;" alt="'.$langs->trans("Preview").'">';

+						if ($subdir == $conf->global->MAIN_THEME) $title = $langs->trans("ThemeCurrentlyActive");

+						else $title = $langs->trans("ShowPreview");

+						print '<img class="img-skinthumb shadow" src="'.$url.'" alt="'.$title.'" title="'.$title.'" style="border: none; margin-bottom: 5px;">';

+						print '</a><br>';

+						if ($subdir == $selected_theme)

+						{

+							print '<input '.($edit ? '' : 'disabled').' type="radio" class="themethumbs" style="border: 0px;" checked name="main_theme" value="'.$subdir.'"> <b>'.$subdir.'</b>';

@@ -425,12 +407,3 @@
-						print '<a href="'.$_SERVER["PHP_SELF"].($edit ? '?action=edit&token='.newToken().'&mode=template&theme=' : '?theme=').$subdir.(GETPOST('optioncss', 'alpha', 1) ? '&optioncss='.GETPOST('optioncss', 'alpha', 1) : '').($fuser ? '&id='.$fuser->id : '').'" style="font-weight: normal;" alt="'.$langs->trans("Preview").'">';

-						if ($subdir == $conf->global->MAIN_THEME) {

-							$title = $langs->trans("ThemeCurrentlyActive");

-						} else {

-							$title = $langs->trans("ShowPreview");

-						}

-						print '<img class="img-skinthumb shadow" src="'.$url.'" alt="'.dol_escape_htmltag($title).'" title="'.dol_escape_htmltag($title).'" style="border: none; margin-bottom: 5px;">';

-						print '</a><br>';

-						if ($subdir == $selected_theme) {

-							print '<input '.($edit ? '' : 'disabled').' type="radio" class="themethumbs" style="border: 0px;" id="main_theme'.$subdir.'" checked name="main_theme" value="'.$subdir.'"><label for="main_theme'.$subdir.'"> <b>'.$subdir.'</b></label>';

-						} else {

-							print '<input '.($edit ? '' : 'disabled').' type="radio" class="themethumbs" style="border: 0px;" id="main_theme'.$subdir.'" name="main_theme" value="'.$subdir.'"><label for="main_theme'.$subdir.'"> '.$subdir.'</label>';

+						else

+						{

+							print '<input '.($edit ? '' : 'disabled').' type="radio" class="themethumbs" style="border: 0px;" name="main_theme" value="'.$subdir.'"> '.$subdir;

@@ -455 +427,0 @@
-	$colortexttitlelink = '';

@@ -459 +430,0 @@
-	$colorbacklineimpair2 = '';

@@ -461 +431,0 @@
-	$colorbacklinepair2 = '';

@@ -466,3 +435,0 @@
-	$butactionbg = '';

-	$textbutaction = '';

-	// Set the variables with the default value

@@ -473,19 +440,23 @@
-	// Dark mode

-	if ($foruserprofile) {

-		//Nothing

-	} else {

-		$listofdarkmodes = array(

-			'0' => $langs->trans("AlwaysDisabled"),

-			'1' => $langs->trans("AccordingToBrowser"),

-			'2' => $langs->trans("AlwaysEnabled")

-		);

-		print '<tr class="oddeven">';

-		print '<td>'.$langs->trans("DarkThemeMode").'</td>';

-		print '<td colspan="'.($colspan - 1).'">';

-		if ($edit) {

-			print $form->selectarray('THEME_DARKMODEENABLED', $listofdarkmodes, isset($conf->global->THEME_DARKMODEENABLED) ? $conf->global->THEME_DARKMODEENABLED : 0);

-		} else {

-			print $listofdarkmodes[isset($conf->global->THEME_DARKMODEENABLED) ? $conf->global->THEME_DARKMODEENABLED : 0];

-		}

-		print $form->textwithpicto('', $langs->trans("DoesNotWorkWithAllThemes"));

-		print '</tr>';

+	// Show logo

+	if ($foruserprofile)

+	{

+		// Nothing

+	}

+	else

+	{

+		// Show logo

+		print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("EnableShowLogo").'</td><td>';

+		if ($edit)

+		{

+			print ajax_constantonoff('MAIN_SHOW_LOGO', array(), null, 0, 0, 1);

+			//print $form->selectyesno('MAIN_SHOW_LOGO', $conf->global->MAIN_SHOW_LOGO, 1);

+		}

+		else

+		{

+			print  yn($conf->global->MAIN_SHOW_LOGO);

+		}

+		print '</td>';

+		print '</tr>';

+		/*

+		print '<tr class="oddeven"><td>'.$langs->trans("EnableShowLogo").'</td><td>' . yn($conf->global->MAIN_SHOW_LOGO) . '</td>';

+		print "</tr>";*/

@@ -496 +467,140 @@
-	if ($foruserprofile) {

+	if ($foruserprofile)

+	{

+		/*

+         print '<tr class="oddeven">';

+         print '<td>'.$langs->trans("TopMenuDisableImages").'</td>';

+         print '<td>'.($conf->global->THEME_TOPMENU_DISABLE_IMAGE?$conf->global->THEME_TOPMENU_DISABLE_IMAGE:$langs->trans("Default")).'</td>';

+         print '<td class="left" class="nowrap" width="20%"><input name="check_THEME_TOPMENU_DISABLE_IMAGE" id="check_THEME_TOPMENU_DISABLE_IMAGE" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TEXTLINK)?" checked":"");

+         print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"';	// Disabled for demo

+         print '> '.$langs->trans("UsePersonalValue").'</td>';

+         print '<td>';

+         if ($edit)

+         {

+         print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_TOPMENU_DISABLE_IMAGE,array()),''),'THEME_TOPMENU_DISABLE_IMAGE','formcolor',1).' ';

+         }

+         else

+         {

+         $color = colorArrayToHex(colorStringToArray($conf->global->THEME_TOPMENU_DISABLE_IMAGE,array()),'');

+         if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';

+         else print '';

+         }

+         if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';

+         print '</td>';*/

+	}

+	else

+	{

+		$default = $langs->trans('No');

+		print '<tr class="oddeven">';

+		print '<td>'.$langs->trans("TopMenuDisableImages").'</td>';

+		print '<td colspan="'.($colspan - 1).'">';

+		if ($edit)

+		{

+			print ajax_constantonoff('THEME_TOPMENU_DISABLE_IMAGE', array(), null, 0, 0, 1);

+			//print $form->selectyesno('THEME_TOPMENU_DISABLE_IMAGE', $conf->global->THEME_TOPMENU_DISABLE_IMAGE, 1);

+		}

+		else

+		{

+			print yn($conf->global->THEME_TOPMENU_DISABLE_IMAGE);

+		}

+		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong>'.$default.'</strong> ';

+		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));

+		print '</td>';

+		print '</tr>';

+	}

+

+	// Background color THEME_ELDY_BACKBODY

+	if ($foruserprofile)

+	{

+		/*

+	    print '<tr class="oddeven">';

+	    print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';

+        print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TOPMENU_BACK1:$langs->trans("Default")).'</td>';

+        print '<td class="nowrap left" width="20%"><input name="check_THEME_ELDY_TOPMENU_BACK1" id="check_THEME_ELDY_TOPMENU_BACK1" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TOPMENU_BACK1)?" checked":"");

+        print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"';	// Disabled for demo

+        print '> '.$langs->trans("UsePersonalValue").'</td>';

+        print '<td>';

+	    if ($edit)

+	    {

+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),''),'THEME_ELDY_TOPMENU_BACK1','formcolor',1).' ';

+	    }

+	   	else

+	   	{

+	   		$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),'');

+			if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';

+			else print '';

+	   	}

+    	if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';

+	    print '</td>';*/

+	}

+	else

+	{

+		print '<tr class="oddeven">';

+		print '<td>'.$langs->trans("BackgroundColor").'</td>';

+		print '<td colspan="'.($colspan - 1).'">';

+		//var_dump($conf->global->THEME_ELDY_BACKBODY);

+		if ($edit)

+		{

+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY, array()), ''), 'THEME_ELDY_BACKBODY', 'formcolor', 1).' ';

+		}

+	   	else

+	   	{

+	   		$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY, array()), '');

+			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';

+			else print $langs->trans("Default");

+	   	}

+		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong>ffffff</strong> ';

+		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));

+		print '</td>';

+		print '</tr>';

+	}

+

+	// TopMenuBackgroundColor

+	if ($foruserprofile)

+	{

+		/*

+	    print '<tr class="oddeven">';

+	    print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';

+        print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TOPMENU_BACK1:$langs->trans("Default")).'</td>';

+        print '<td class="nowrap left" width="20%"><input name="check_THEME_ELDY_TOPMENU_BACK1" id="check_THEME_ELDY_TOPMENU_BACK1" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TOPMENU_BACK1)?" checked":"");

+        print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"';	// Disabled for demo

+        print '> '.$langs->trans("UsePersonalValue").'</td>';

+        print '<td>';

+	    if ($edit)

+	    {

+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),''),'THEME_ELDY_TOPMENU_BACK1','formcolor',1).' ';

+	    }

+	   	else

+	   	{

+	   		$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),'');

+			if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';

+			else print '';

+	   	}

+    	if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';

+	    print '</td>';*/

+	}

+	else

+	{

+		$default = (empty($colorbackhmenu1) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbackhmenu1)));

+

+		print '<tr class="oddeven">';

+		print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';

+		print '<td colspan="'.($colspan - 1).'">';

+		if ($edit)

+		{

+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1, array()), ''), 'THEME_ELDY_TOPMENU_BACK1', 'formcolor', 1).' ';

+		}

+	   	else

+	   	{

+	   		$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1, array()), '');

+			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';

+			else print $langs->trans("Default");

+	   	}

+		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong>'.$default.'</strong> ';

+		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));

+		print '</td>';

+		print '</tr>';

+	}

+

+	// LeftMenuBackgroundColor

+	if ($foruserprofile)

+	{

@@ -499,3 +609,3 @@
-		 print '<td>'.$langs->trans("TopMenuDisableImages").'</td>';

-		 print '<td>'.($conf->global->THEME_TOPMENU_DISABLE_IMAGE?$conf->global->THEME_TOPMENU_DISABLE_IMAGE:$langs->trans("Default")).'</td>';

-		 print '<td class="left" class="nowrap" width="20%"><input name="check_THEME_TOPMENU_DISABLE_IMAGE" id="check_THEME_TOPMENU_DISABLE_IMAGE" type="checkbox" '.(!empty($object->conf->THEME_ELDY_TEXTLINK)?" checked":"");

+		 print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';

+		 print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_VERMENU_BACK1:$langs->trans("Default")).'</td>';

+		 print '<td class="nowrap left" width="20%"><input name="check_THEME_ELDY_VERMENU_BACK1" id="check_THEME_ELDY_VERMENU_BACK1" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TOPMENU_BACK1)?" checked":"");

@@ -507,195 +617 @@
-		 print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_TOPMENU_DISABLE_IMAGE,array()),''),'THEME_TOPMENU_DISABLE_IMAGE','',1).' ';

-		 }

-		 else

-		 {

-		 $color = colorArrayToHex(colorStringToArray($conf->global->THEME_TOPMENU_DISABLE_IMAGE,array()),'');

-		 if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';

-		 else print '';

-		 }

-		 if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';

-		 print '</td>';*/

-	} else {

-		$listoftopmenumodes = array(

-			'0' => $langs->transnoentitiesnoconv("IconAndText"),

-			'1' => $langs->transnoentitiesnoconv("TextOnly"),

-			'2' => $langs->transnoentitiesnoconv("IconOnlyAllTextsOnHover"),

-			'3' => $langs->transnoentitiesnoconv("IconOnlyTextOnHover"),

-			'4' => $langs->transnoentitiesnoconv("IconOnly"),

-		);

-		print '<tr class="oddeven">';

-		print '<td>'.$langs->trans("TopMenuDisableImages").'</td>';

-		print '<td colspan="'.($colspan - 1).'">';

-		if ($edit) {

-			//print ajax_constantonoff('THEME_TOPMENU_DISABLE_IMAGE', array(), null, 0, 0, 1);

-			print $form->selectarray('THEME_TOPMENU_DISABLE_IMAGE', $listoftopmenumodes, isset($conf->global->THEME_TOPMENU_DISABLE_IMAGE) ? $conf->global->THEME_TOPMENU_DISABLE_IMAGE : 0, 0, 0, 0, '', 0, 0, 0, '', 'widthcentpercentminusx maxwidth500');

-		} else {

-			$listoftopmenumodes[getDolGlobalString('THEME_TOPMENU_DISABLE_IMAGE')];

-			//print yn($conf->global->THEME_TOPMENU_DISABLE_IMAGE);

-		}

-		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes"));

-		print '</td>';

-		print '</tr>';

-	}

-

-	// Show logo

-	if ($foruserprofile) {

-		// Nothing

-	} else {

-		// Show logo

-		print '<tr class="oddeven"><td class="titlefieldmiddle">'.$langs->trans("EnableShowLogo").'</td>';

-		print '<td colspan="'.($colspan - 1).'" class="valignmiddle">';

-		if ($edit) {

-			print ajax_constantonoff('MAIN_SHOW_LOGO', array(), null, 0, 0, 1);

-			//print $form->selectyesno('MAIN_SHOW_LOGO', $conf->global->MAIN_SHOW_LOGO, 1);

-		} else {

-			print yn($conf->global->MAIN_SHOW_LOGO);

-		}

-		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes"), 1, 'help', 'inline-block');

-		print '</td>';

-		print '</tr>';

-		/*

-		 print '<tr class="oddeven"><td>'.$langs->trans("EnableShowLogo").'</td><td>' . yn($conf->global->MAIN_SHOW_LOGO) . '</td>';

-		 print "</tr>";*/

-	}

-

-	// BorderTableActive

-	if ($foruserprofile) {

-	} else {

-		print '<tr class="oddeven">';

-		print '<td>'.$langs->trans("UseBorderOnTable").'</td>';

-		print '<td colspan="'.($colspan - 1).'" class="valignmiddle">';

-		if ($edit) {

-			print ajax_constantonoff('THEME_ELDY_USEBORDERONTABLE', array(), null, 0, 0, 1);

-			//print $form->selectyesno('THEME_ELDY_USEBORDERONTABLE', $conf->global->THEME_ELDY_USEBORDERONTABLE, 1);

-		} else {

-			print yn($conf->global->THEME_ELDY_USEBORDERONTABLE);

-		}

-		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes"), 1, 'help', 'inline-block');

-		print '</td>';

-		print '</tr>';

-	}

-

-	// Table line height

-	/* removed. height of column must use padding of td and not lineheight that has bad side effect

-	if ($foruserprofile) {

-	} else {

-		$listoftopmenumodes = array(

-			'0' => $langs->transnoentitiesnoconv("Normal"),

-			'1' => $langs->transnoentitiesnoconv("LargeModern"),

-		);

-		print '<tr class="oddeven">';

-		print '<td>'.$langs->trans("TableLineHeight").'</td>';

-		print '<td colspan="'.($colspan - 1).'" class="valignmiddle">';

-		if ($edit) {

-			//print ajax_constantonoff('THEME_ELDY_USECOMOACTROW', array(), null, 0, 0, 1);

-			print $form->selectarray('THEME_ELDY_USECOMOACTROW', $listoftopmenumodes, getDolGlobalString('THEME_ELDY_USECOMOACTROW'), 0, 0, 0, '', 0, 0, 0, '', 'widthcentpercentminusx maxwidth300');

-		} else {

-			print $listoftopmenumodes[getDolGlobalString('THEME_ELDY_USECOMOACTROW')];

-		}

-		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes"), 1, 'help', 'inline-block');

-		print '</td>';

-		print '</tr>';

-	}

-	*/

-

-	// Background color THEME_ELDY_BACKBODY

-	if ($foruserprofile) {

-		/*

-		print '<tr class="oddeven">';

-		print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';

-		print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TOPMENU_BACK1:$langs->trans("Default")).'</td>';

-		print '<td class="nowrap left" width="20%"><input name="check_THEME_ELDY_TOPMENU_BACK1" id="check_THEME_ELDY_TOPMENU_BACK1" type="checkbox" '.(!empty($object->conf->THEME_ELDY_TOPMENU_BACK1)?" checked":"");

-		print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"';	// Disabled for demo

-		print '> '.$langs->trans("UsePersonalValue").'</td>';

-		print '<td>';

-		if ($edit)

-		{

-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),''),'THEME_ELDY_TOPMENU_BACK1','',1).' ';

-		}

-		   else

-		   {

-			   $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),'');

-			if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';

-			else print '';

-		   }

-		if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';

-		print '</td>';*/

-	} else {

-		$default = 'ffffff';

-		print '<tr class="oddeven">';

-		print '<td>'.$langs->trans("BackgroundColor").'</td>';

-		print '<td colspan="'.($colspan - 1).'">';

-		//var_dump($conf->global->THEME_ELDY_BACKBODY);

-		if ($edit) {

-			print $formother->selectColor(colorArrayToHex(colorStringToArray((getDolGlobalString('THEME_ELDY_BACKBODY') ? $conf->global->THEME_ELDY_BACKBODY : ''), array()), ''), 'THEME_ELDY_BACKBODY', '', 1, '', '', 'colorbackbody', $default).' ';

-		} else {

-			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY, array()), '');

-			if ($color) {

-				print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';

-			} else {

-				print $langs->trans("Default");

-			}

-		}

-		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong>'.$default.'</strong> ';

-		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));

-		print '</td>';

-		print '</tr>';

-	}

-

-	// TopMenuBackgroundColor

-	if ($foruserprofile) {

-		/*

-		print '<tr class="oddeven">';

-		print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';

-		print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TOPMENU_BACK1:$langs->trans("Default")).'</td>';

-		print '<td class="nowrap left" width="20%"><input name="check_THEME_ELDY_TOPMENU_BACK1" id="check_THEME_ELDY_TOPMENU_BACK1" type="checkbox" '.(!empty($object->conf->THEME_ELDY_TOPMENU_BACK1)?" checked":"");

-		print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"';	// Disabled for demo

-		print '> '.$langs->trans("UsePersonalValue").'</td>';

-		print '<td>';

-		if ($edit)

-		{

-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),''),'THEME_ELDY_TOPMENU_BACK1','',1).' ';

-		}

-		   else

-		   {

-			   $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),'');

-			if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';

-			else print '';

-		   }

-		if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';

-		print '</td>';*/

-	} else {

-		$default = (empty($colorbackhmenu1) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbackhmenu1)));

-

-		print '<tr class="oddeven">';

-		print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';

-		print '<td colspan="'.($colspan - 1).'">';

-		if ($edit) {

-			print $formother->selectColor(colorArrayToHex(colorStringToArray((getDolGlobalString('THEME_ELDY_TOPMENU_BACK1') ? $conf->global->THEME_ELDY_TOPMENU_BACK1 : ''), array()), ''), 'THEME_ELDY_TOPMENU_BACK1', '', 1, '', '', 'colorbackhmenu1', $default).' ';

-		} else {

-			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1, array()), '');

-			if ($color) {

-				print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';

-			} else {

-				print $langs->trans("Default");

-			}

-		}

-		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong>'.$default.'</strong> ';

-		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));

-		print '</td>';

-		print '</tr>';

-	}

-

-	// LeftMenuBackgroundColor

-	if ($foruserprofile) {

-		/*

-		 print '<tr class="oddeven">';

-		 print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';

-		 print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_VERMENU_BACK1:$langs->trans("Default")).'</td>';

-		 print '<td class="nowrap left" width="20%"><input name="check_THEME_ELDY_VERMENU_BACK1" id="check_THEME_ELDY_VERMENU_BACK1" type="checkbox" '.(!empty($object->conf->THEME_ELDY_TOPMENU_BACK1)?" checked":"");

-		 print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"';	// Disabled for demo

-		 print '> '.$langs->trans("UsePersonalValue").'</td>';

-		 print '<td>';

-		 if ($edit)

-		 {

-		 print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1,array()),''),'THEME_ELDY_VERMENU_BACK1','',1).' ';

+		 print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1,array()),''),'THEME_ELDY_VERMENU_BACK1','formcolor',1).' ';

@@ -711 +627,3 @@
-	} else {

+	}

+	else

+	{

@@ -717,3 +635,6 @@
-		if ($edit) {

-			print $formother->selectColor(colorArrayToHex(colorStringToArray((getDolGlobalString('THEME_ELDY_VERMENU_BACK1') ? $conf->global->THEME_ELDY_VERMENU_BACK1 : ''), array()), ''), 'THEME_ELDY_VERMENU_BACK1', '', 1, '', '', 'colorbackvmenu1', $default).' ';

-		} else {

+		if ($edit)

+		{

+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1, array()), ''), 'THEME_ELDY_VERMENU_BACK1', 'formcolor', 1).' ';

+		}

+		else

+		{

@@ -721,5 +642,2 @@
-			if ($color) {

-				print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';

-			} else {

-				print $langs->trans("Default");

-			}

+			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';

+			else print $langs->trans("Default");

@@ -734,2 +652,5 @@
-	if ($foruserprofile) {

-	} else {

+	if ($foruserprofile)

+	{

+	}

+	else

+	{

@@ -741,3 +662,6 @@
-		if ($edit) {

-			print $formother->selectColor(colorArrayToHex(colorStringToArray((getDolGlobalString('THEME_ELDY_TEXTTITLENOTAB') ? $conf->global->THEME_ELDY_TEXTTITLENOTAB : ''), array()), ''), 'THEME_ELDY_TEXTTITLENOTAB', '', 1, '', '', 'colortexttitlenotab', $default).' ';

-		} else {

+		if ($edit)

+		{

+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLENOTAB, array()), ''), 'THEME_ELDY_TEXTTITLENOTAB', 'formcolor', 1).' ';

+		}

+		else

+		{

@@ -754,2 +678,5 @@
-	if ($foruserprofile) {

-	} else {

+	if ($foruserprofile)

+	{

+	}

+	else

+	{

@@ -761,5 +688,8 @@
-		if ($edit) {

-			print $formother->selectColor(colorArrayToHex(colorStringToArray((getDolGlobalString('THEME_ELDY_BACKTITLE1') ? $conf->global->THEME_ELDY_BACKTITLE1 : ''), array()), ''), 'THEME_ELDY_BACKTITLE1', '', 1, '', '', 'colorbacktitle1', $default).' ';

-		} else {

-			print $formother->showColor($conf->global->THEME_ELDY_BACKTITLE1, $langs->trans("Default"));

-		}

+		if ($edit)

+		{

+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKTITLE1, array()), ''), 'THEME_ELDY_BACKTITLE1', 'formcolor', 1).' ';

+		}

+	   	else

+	   	{

+	   		print $formother->showColor($conf->global->THEME_ELDY_BACKTITLE1, $langs->trans("Default"));

+	   	}

@@ -774,2 +704,5 @@
-	if ($foruserprofile) {

-	} else {

+	if ($foruserprofile)

+	{

+	}

+	else

+	{

@@ -781,3 +714,6 @@
-		if ($edit) {

-			print $formother->selectColor(colorArrayToHex(colorStringToArray((getDolGlobalString('THEME_ELDY_TEXTTITLE') ? $conf->global->THEME_ELDY_TEXTTITLE : ''), array()), ''), 'THEME_ELDY_TEXTTITLE', '', 1, '', '', 'colortexttitle', $default).' ';

-		} else {

+		if ($edit)

+		{

+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLE, array()), ''), 'THEME_ELDY_TEXTTITLE', 'formcolor', 1).' ';

+		}

+		else

+		{

@@ -794,3 +730,6 @@
-	if ($foruserprofile) {

-	} else {

-		$default = (empty($colortexttitlelink) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colortexttitlelink)));

+	if ($foruserprofile)

+	{

+	}

+	else

+	{

+		$default=(empty($colortexttitlelink) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colortexttitlelink)));

@@ -801,3 +740,6 @@
-		if ($edit) {

-			print $formother->selectColor(colorArrayToHex(colorStringToArray((getDolGlobalString('THEME_ELDY_TEXTTITLELINK') ? $conf->global->THEME_ELDY_TEXTTITLELINK : ''), array()), ''), 'THEME_ELDY_TEXTTITLELINK', '', 1, '', '', 'colortexttitlelink', $default).' ';

-		} else {

+		if ($edit)

+		{

+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLELINK, array()), ''), 'THEME_ELDY_TEXTTITLELINK', 'formcolor', 1).' ';

+		}

+		else

+		{

@@ -815,2 +757,5 @@
-	if ($foruserprofile) {

-	} else {

+	if ($foruserprofile)

+	{

+	}

+	else

+	{

@@ -822,3 +767,6 @@
-		if ($edit) {

-			print $formother->selectColor(colorArrayToHex(colorStringToArray((getDolGlobalString('THEME_ELDY_LINEIMPAIR1') ? $conf->global->THEME_ELDY_LINEIMPAIR1 : ''), array()), ''), 'THEME_ELDY_LINEIMPAIR1', '', 1, '', '', 'colorbacklineimpair2', $default).' ';

-		} else {

+		if ($edit)

+		{

+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1, array()), ''), 'THEME_ELDY_LINEIMPAIR1', 'formcolor', 1).' ';

+		}

+		else

+		{

@@ -826,5 +774,2 @@
-			if ($color) {

-				print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';

-			} else {

-				print $langs->trans("Default");

-			}

+			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';

+			else print $langs->trans("Default");

@@ -839,2 +784,5 @@
-	if ($foruserprofile) {

-	} else {

+	if ($foruserprofile)

+	{

+	}

+	else

+	{

@@ -846,3 +794,6 @@
-		if ($edit) {

-			print $formother->selectColor(colorArrayToHex(colorStringToArray((getDolGlobalString('THEME_ELDY_LINEPAIR1') ? $conf->global->THEME_ELDY_LINEPAIR1 : ''), array()), ''), 'THEME_ELDY_LINEPAIR1', '', 1, '', '', 'colorbacklinepair2', $default).' ';

-		} else {

+		if ($edit)

+		{

+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1, array()), ''), 'THEME_ELDY_LINEPAIR1', 'formcolor', 1).' ';

+		}

+		else

+		{

@@ -850,5 +801,2 @@
-			if ($color) {

-				print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';

-			} else {

-				print $langs->trans("Default");

-			}

+			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';

+			else print $langs->trans("Default");

@@ -863 +811,2 @@
-	if ($foruserprofile) {

+	if ($foruserprofile)

+	{

@@ -865,20 +814,22 @@
-		 print '<tr class="oddeven">';

-		 print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';

-		 print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TEXTLINK:$langs->trans("Default")).'</td>';

-		 print '<td class="nowrap left" width="20%"><input name="check_THEME_ELDY_TEXTLINK" id="check_THEME_ELDY_TEXTLINK" type="checkbox" '.(!empty($object->conf->THEME_ELDY_TEXTLINK)?" checked":"");

-		 print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"';	// Disabled for demo

-		 print '> '.$langs->trans("UsePersonalValue").'</td>';

-		 print '<td>';

-		 if ($edit)

-		 {

-		 print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK,array()),''),'THEME_ELDY_TEXTLINK','',1).' ';

-		 }

-		 else

-		 {

-		 $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK,array()),'');

-		 if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';

-		 else print '';

-		 }

-			if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';

-			print '</td>';*/

-	} else {

+	     print '<tr class="oddeven">';

+	     print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';

+	     print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TEXTLINK:$langs->trans("Default")).'</td>';

+	     print '<td class="nowrap left" width="20%"><input name="check_THEME_ELDY_TEXTLINK" id="check_THEME_ELDY_TEXTLINK" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TEXTLINK)?" checked":"");

+	     print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"';	// Disabled for demo

+	     print '> '.$langs->trans("UsePersonalValue").'</td>';

+	     print '<td>';

+	     if ($edit)

+	     {

+	     print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK,array()),''),'THEME_ELDY_TEXTLINK','formcolor',1).' ';

+	     }

+	     else

+	     {

+	     $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK,array()),'');

+	     if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';

+	     else print '';

+	     }

+	    	if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';

+	    	print '</td>';*/

+	}

+	else

+	{

@@ -890,3 +841,6 @@
-		if ($edit) {

-			print $formother->selectColor(colorArrayToHex(colorStringToArray((getDolGlobalString('THEME_ELDY_TEXTLINK') ? $conf->global->THEME_ELDY_TEXTLINK : ''), array()), ''), 'THEME_ELDY_TEXTLINK', '', 1, '', '', 'colortextlink', $default).' ';

-		} else {

+		if ($edit)

+		{

+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK, array()), ''), 'THEME_ELDY_TEXTLINK', 'formcolor', 1).' ';

+		}

+		else

+		{

@@ -894,3 +848,3 @@
-			if ($color) {

-				print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';

-			} else {

+			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';

+			else

+			{

@@ -909 +863,2 @@
-	if ($foruserprofile) {

+	if ($foruserprofile)

+	{

@@ -911,10 +866,11 @@
-		 print '<tr class="oddeven">';

-		 print '<td>'.$langs->trans("HighlightLinesOnMouseHover").'</td>';

-		 print '<td><input name="check_THEME_ELDY_USE_HOVER" disabled="disabled" type="checkbox" '.($conf->global->THEME_ELDY_USE_HOVER?" checked":"").'></td>';

-		 print '<td class="nowrap left" width="20%"><input name="check_MAIN_THEME"'.($edit?'':' disabled').' type="checkbox" '.($selected_theme?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';

-		 print '<td><input name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled="disabled"').' type="checkbox" '.($hoverdisabled?"":" checked").'>';

-		 print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';

-		 print '</td>';

-		 print '</tr>';

-		 */

-	} else {

+	     print '<tr class="oddeven">';

+	     print '<td>'.$langs->trans("HighlightLinesOnMouseHover").'</td>';

+	     print '<td><input name="check_THEME_ELDY_USE_HOVER" disabled="disabled" type="checkbox" '.($conf->global->THEME_ELDY_USE_HOVER?" checked":"").'></td>';

+	     print '<td class="nowrap left" width="20%"><input name="check_MAIN_THEME"'.($edit?'':' disabled').' type="checkbox" '.($selected_theme?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';

+	     print '<td><input name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled="disabled"').' type="checkbox" '.($hoverdisabled?"":" checked").'>';

+	     print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';

+	     print '</td>';

+	     print '</tr>';

+	     */

+	}

+	else {

@@ -928,5 +884,14 @@
-		if ($edit) {

-			if (getDolGlobalString('THEME_ELDY_USE_HOVER') == '1') {

-				$color = colorArrayToHex(colorStringToArray($colorbacklinepairhover));

-			} else {

-				$color = colorArrayToHex(colorStringToArray((getDolGlobalString('THEME_ELDY_USE_HOVER') ? $conf->global->THEME_ELDY_USE_HOVER : ''), array()), '');

+		if ($edit)

+		{

+			if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color = colorArrayToHex(colorStringToArray($colorbacklinepairhover));

+			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER, array()), '');

+			print $formother->selectColor($color, 'THEME_ELDY_USE_HOVER', 'formcolor', 1).' ';

+		}

+		else

+		{

+			if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color = colorArrayToHex(colorStringToArray($colorbacklinepairhover));

+			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER, array()), '');

+			if ($color)

+			{

+				if ($color != colorArrayToHex(colorStringToArray($colorbacklinepairhover))) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';

+				else print $langs->trans("Default");

@@ -934,16 +899 @@
-			print $formother->selectColor($color, 'THEME_ELDY_USE_HOVER', '', 1, '', '', 'colorbacklinepairhover', $default).' ';

-		} else {

-			if (getDolGlobalString('THEME_ELDY_USE_HOVER') == '1') {

-				$color = colorArrayToHex(colorStringToArray($colorbacklinepairhover));

-			} else {

-				$color = colorArrayToHex(colorStringToArray((getDolGlobalString('THEME_ELDY_USE_HOVER') ? $conf->global->THEME_ELDY_USE_HOVER : ''), array()), '');

-			}

-			if ($color) {

-				if ($color != colorArrayToHex(colorStringToArray($colorbacklinepairhover))) {

-					print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';

-				} else {

-					print $langs->trans("Default");

-				}

-			} else {

-				print $langs->trans("Default");

-			}

+			else print $langs->trans("Default");

@@ -957 +907,2 @@
-	if ($foruserprofile) {

+	if ($foruserprofile)

+	{

@@ -959,10 +910,12 @@
-		print '<tr class="oddeven">';

-		print '<td>'.$langs->trans("HighlightLinesOnMouseHover").'</td>';

-		print '<td><input name="check_THEME_ELDY_USE_HOVER" disabled="disabled" type="checkbox" '.($conf->global->THEME_ELDY_USE_HOVER?" checked":"").'></td>';

-		print '<td class="nowrap left" width="20%"><input name="check_MAIN_THEME"'.($edit?'':' disabled').' type="checkbox" '.($selected_theme?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';

-		print '<td><input name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled="disabled"').' type="checkbox" '.($hoverdisabled?"":" checked").'>';

-		print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';

-		print '</td>';

-		print '</tr>';

-		*/

-	} else {

+	     print '<tr class="oddeven">';

+	     print '<td>'.$langs->trans("HighlightLinesOnMouseHover").'</td>';

+	     print '<td><input name="check_THEME_ELDY_USE_HOVER" disabled="disabled" type="checkbox" '.($conf->global->THEME_ELDY_USE_HOVER?" checked":"").'></td>';

+	     print '<td class="nowrap left" width="20%"><input name="check_MAIN_THEME"'.($edit?'':' disabled').' type="checkbox" '.($selected_theme?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';

+	     print '<td><input name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled="disabled"').' type="checkbox" '.($hoverdisabled?"":" checked").'>';

+	     print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';

+	     print '</td>';

+	     print '</tr>';

+	     */

+	}

+	else

+	{

@@ -976,5 +929,14 @@
-		if ($edit) {

-			if (getDolGlobalString('THEME_ELDY_USE_CHECKED') == '1') {

-				$color = 'e6edf0';

-			} else {

-				$color = colorArrayToHex(colorStringToArray((getDolGlobalString('THEME_ELDY_USE_CHECKED') ? $conf->global->THEME_ELDY_USE_CHECKED : ''), array()), '');

+		if ($edit)

+		{

+			if ($conf->global->THEME_ELDY_USE_CHECKED == '1') $color = 'e6edf0';

+			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_CHECKED, array()), '');

+			print $formother->selectColor($color, 'THEME_ELDY_USE_CHECKED', 'formcolor', 1).' ';

+		}

+		else

+		{

+			if ($conf->global->THEME_ELDY_USE_CHECKED == '1') $color = 'e6edf0';

+			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_CHECKED, array()), '');

+			if ($color)

+			{

+				if ($color != 'e6edf0') print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';

+				else print $langs->trans("Default");

@@ -982,16 +944 @@
-			print $formother->selectColor($color, 'THEME_ELDY_USE_CHECKED', '', 1, '', '', 'colorbacklinepairchecked', $default).' ';

-		} else {

-			if (getDolGlobalString('THEME_ELDY_USE_CHECKED') == '1') {

-				$color = 'e6edf0';

-			} else {

-				$color = colorArrayToHex(colorStringToArray((getDolGlobalString('THEME_ELDY_USE_CHECKED') ? $conf->global->THEME_ELDY_USE_CHECKED : ''), array()), '');

-			}

-			if ($color) {

-				if ($color != 'e6edf0') {

-					print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';

-				} else {

-					print $langs->trans("Default");

-				}

-			} else {

-				print $langs->trans("Default");

-			}

+			else print $langs->trans("Default");

@@ -1005,92 +951,0 @@
-	// Btn action

-	if ($foruserprofile) {

-		/*

-		 print '<tr class="oddeven">';

-		 print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';

-		 print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_BTNACTION:$langs->trans("Default")).'</td>';

-		 print '<td class="nowrap left" width="20%"><input name="check_THEME_ELDY_BTNACTION" id="check_THEME_ELDY_BTNACTION" type="checkbox" '.(!empty($object->conf->THEME_ELDY_BTNACTION)?" checked":"");

-		 print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"';	// Disabled for demo

-		 print '> '.$langs->trans("UsePersonalValue").'</td>';

-		 print '<td>';

-		 if ($edit)

-		 {

-		 print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BTNACTION,array()),''),'THEME_ELDY_BTNACTION','',1).' ';

-		 }

-		 else

-		 {

-		 $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BTNACTION,array()),'');

-		 if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';

-		 else print '';

-		 }

-			if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';

-			print '</td>';*/

-	} else {

-		$default = (empty($butactionbg) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($butactionbg)));

-

-		print '<tr class="oddeven">';

-		print '<td>'.$langs->trans("BtnActionColor").'</td>';

-		print '<td colspan="'.($colspan - 1).'">';

-		if ($edit) {

-			print $formother->selectColor(colorArrayToHex(colorStringToArray((getDolGlobalString('THEME_ELDY_BTNACTION') ? $conf->global->THEME_ELDY_BTNACTION : ''), array()), ''), 'THEME_ELDY_BTNACTION', '', 1, '', '', 'butactionbg', $default).' ';

-		} else {

-			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BTNACTION, array()), '');

-			if ($color) {

-				print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';

-			} else {

-				//print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$defaultcolor.'" value="'.$langs->trans("Default").'">';

-				//print '<span style="color: #000078">'.$langs->trans("Default").'</span>';

-				print $langs->trans("Default");

-			}

-		}

-		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong><span style="color: #'.$default.'">'.$default.'</span></strong> ';

-		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));

-		print '</td>';

-		print '</tr>';

-	}

-

-	// Text btn action

-	if ($foruserprofile) {

-		/*

-		 print '<tr class="oddeven">';

-		 print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';

-		 print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TEXTBTNACTION:$langs->trans("Default")).'</td>';

-		 print '<td class="nowrap left" width="20%"><input name="check_THEME_ELDY_TEXTBTNACTION" id="check_THEME_ELDY_TEXTBTNACTION" type="checkbox" '.(!empty($object->conf->THEME_ELDY_TEXTBTNACTION)?" checked":"");

-		 print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"'; // Disabled for demo

-		 print '> '.$langs->trans("UsePersonalValue").'</td>';

-		 print '<td>';

-		 if ($edit)

-		 {

-		 print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTBTNACTION,array()),''),'THEME_ELDY_TEXTBTNACTION','',1).' ';

-		 }

-		 else

-		 {

-		 $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BTNACTION,array()),'');

-		 if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';

-		 else print '';

-		 }

-			if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';

-			print '</td>';*/

-	} else {

-		$default = (empty($textbutaction) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($textbutaction)));

-

-		print '<tr class="oddeven">';

-		print '<td>'.$langs->trans("TextBtnActionColor").'</td>';

-		print '<td colspan="'.($colspan - 1).'">';

-		if ($edit) {

-			print $formother->selectColor(colorArrayToHex(colorStringToArray((getDolGlobalString('THEME_ELDY_TEXTBTNACTION') ? $conf->global->THEME_ELDY_TEXTBTNACTION : ''), array()), ''), 'THEME_ELDY_TEXTBTNACTION', '', 1, '', '', 'textbutaction', $default).' ';

-		} else {

-			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTBTNACTION, array()), '');

-			if ($color) {

-				print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';

-			} else {

-				//print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$defaultcolor.'" value="'.$langs->trans("Default").'">';

-				//print '<span style="color: #000078">'.$langs->trans("Default").'</span>';

-				print $langs->trans("Default");

-			}

-		}

-		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong><span style="color: #000">'.$default.'</span></strong> ';

-		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));

-		print '</td>';

-		print '</tr>';

-	}

-

@@ -1098,46 +953,56 @@
-	if ($foruserprofile) {

-		//$default=yn($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER);

-		$default = $langs->trans('No');

-		print '<tr class="oddeven">';

-		print '<td>'.$langs->trans("MAIN_OPTIMIZEFORTEXTBROWSER").'</td>';

-		print '<td colspan="'.($colspan - 1).'">';

-		//print ajax_constantonoff("MAIN_OPTIMIZEFORTEXTBROWSER", array(), null, 0, 0, 1, 0);

-		if ($edit) {

-			print $form->selectyesno('MAIN_OPTIMIZEFORTEXTBROWSER', (isset($fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER) ? $fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER : 0), 1);

-		} else {

-			if (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {

-				print yn(isset($fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER) ? $fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER : 0);

-			} else {

-				print yn(1);

-				if (empty($fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER)) {

-					print ' ('.$langs->trans("ForcedByGlobalSetup").')';

-				}

-			}

-		}

-		print ' &nbsp; <span class="opacitymedium">'.$langs->trans("Default").'</span>: <strong>'.$default.'</strong> ';

-		print $form->textwithpicto('', $langs->trans("MAIN_OPTIMIZEFORTEXTBROWSERDesc"));

-		print '</td>';

-		print '</tr>';

-	} else {

-		//var_dump($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER);

-		/*

-		$default=$langs->trans('No');

-		print '<tr class="oddeven">';

-		print '<td>'.$langs->trans("MAIN_OPTIMIZEFORTEXTBROWSER").'</td>';

-		print '<td colspan="'.($colspan-1).'">';

-		if ($edit) {

-			print $form->selectyesno('MAIN_OPTIMIZEFORTEXTBROWSER', $conf->global->MAIN_OPTIMIZEFORTEXTBROWSER, 1);

-		} else {

-			print yn($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER);

-		}

-		print ' &nbsp; wspan class="opacitymedium">'.$langs->trans("Default").'</span>: <strong>'.$default.'</strong> ';

-		print $form->textwithpicto('', $langs->trans("MAIN_OPTIMIZEFORTEXTBROWSERDesc"));

-		print '</span>';

-		print '</td>';

-		print '</tr>';

-		*/

-	}

-

-

-	// Use MAIN_OPTIMIZEFORCOLORBLIND

-	if ($foruserprofile) {

+	if ($foruserprofile)

+	{

+	    //$default=yn($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER);

+	    $default = $langs->trans('No');

+	    print '<tr class="oddeven">';

+	    print '<td>'.$langs->trans("MAIN_OPTIMIZEFORTEXTBROWSER").'</td>';

+	    print '<td colspan="'.($colspan - 1).'">';

+	    //print ajax_constantonoff("MAIN_OPTIMIZEFORTEXTBROWSER", array(), null, 0, 0, 1, 0);

+   	    if ($edit)

+   	    {

+   	        print $form->selectyesno('MAIN_OPTIMIZEFORTEXTBROWSER', $fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER, 1);

+   	    }

+   	    else

+   	    {

+   	        if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))

+   	        {

+   	            print yn($fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER);

+   	        }

+   	        else

+   	        {

+   	            print yn(1);

+   	            if (empty($fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER)) print ' ('.$langs->trans("ForcedByGlobalSetup").')';

+   	        }

+   	    }

+   	    print ' &nbsp; <span class="opacitymedium">'.$langs->trans("Default").'</span>: <strong>'.$default.'</strong> ';

+	    print $form->textwithpicto('', $langs->trans("MAIN_OPTIMIZEFORTEXTBROWSERDesc"));

+	    print '</td>';

+	    print '</tr>';

+	}

+	else

+	{

+	    /*var_dump($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER);

+	    $default=$langs->trans('No');

+	    print '<tr class="oddeven">';

+	    print '<td>'.$langs->trans("MAIN_OPTIMIZEFORTEXTBROWSER").'</td>';

+	    print '<td colspan="'.($colspan-1).'">';

+	    if ($edit)

+	    {

+	        print $form->selectyesno('MAIN_OPTIMIZEFORTEXTBROWSER', $conf->global->MAIN_OPTIMIZEFORTEXTBROWSER, 1);

+	    }

+	    else

+	    {

+	        print yn($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER);

+	    }

+	    print ' &nbsp; wspan class="opacitymedium">'.$langs->trans("Default").'</span>: <strong>'.$default.'</strong> ';

+	    print $form->textwithpicto('', $langs->trans("MAIN_OPTIMIZEFORTEXTBROWSERDesc"));

+	    print '</span>';

+	    print '</td>';

+	    print '</tr>';

+	    */

+	}

+

+

+	// Use MAIN_OPTIMIZEFORTEXTBROWSER

+	if ($foruserprofile)

+	{

@@ -1158,3 +1023,6 @@
-		if ($edit) {

-			print $form->selectArray('MAIN_OPTIMIZEFORCOLORBLIND', $colorBlindOptions, (isset($fuser->conf->MAIN_OPTIMIZEFORCOLORBLIND) ? $fuser->conf->MAIN_OPTIMIZEFORCOLORBLIND : 0), 0);

-		} else {

+		if ($edit)

+		{

+			print $form->selectArray('MAIN_OPTIMIZEFORCOLORBLIND', $colorBlindOptions, $fuser->conf->MAIN_OPTIMIZEFORCOLORBLIND, 0);

+		}

+		else

+		{

@@ -1163 +1031,2 @@
-			} else {

+			}

+			else {

@@ -1171 +1040,3 @@
-	} else {

+	}

+	else

+	{

@@ -1174 +1044,0 @@
-	print '</div>';

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_vat.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_vat.lib.php
@@ -4 +3,0 @@
- * Copyright (C) 2021       Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>

@@ -35 +34 @@
-	global $db, $langs, $conf;

+    global $db, $langs, $conf;

@@ -37,2 +36,2 @@
-	$tab = 0;

-	$head = array();

+    $tab = 0;

+    $head = array();

@@ -41 +40 @@
-	$head[$tab][1] = $langs->trans('VATDeclaration');

+	$head[$tab][1] = $langs->trans('Card');

@@ -45,5 +44,5 @@
-	// Show more tabs from modules

-	// Entries must be declared in modules descriptor with line

-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

-	// $this->tabs = array('entity:-tabname);   												to remove a tab

-	complete_head_from_modules($conf, $langs, $object, $head, $tab, 'vat');

+    // Show more tabs from modules

+    // Entries must be declared in modules descriptor with line

+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab

+    // $this->tabs = array('entity:-tabname);   												to remove a tab

+    complete_head_from_modules($conf, $langs, $object, $head, $tab, 'vat');

@@ -52 +51 @@
-	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

+    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

@@ -55 +54 @@
-	$nbLinks = Link::count($db, $object->element, $object->id);

+    $nbLinks = Link::count($db, $object->element, $object->id);

@@ -58,3 +57 @@
-	if (($nbFiles + $nbLinks) > 0) {

-		$head[$tab][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

-	}

+	if (($nbFiles + $nbLinks) > 0) $head[$tab][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';

@@ -64,4 +61,4 @@
-	$head[$tab][0] = DOL_URL_ROOT.'/compta/tva/info.php?id='.$object->id;

-	$head[$tab][1] = $langs->trans("Info");

-	$head[$tab][2] = 'info';

-	$tab++;

+    $head[$tab][0] = DOL_URL_ROOT.'/compta/tva/info.php?id='.$object->id;

+    $head[$tab][1] = $langs->trans("Info");

+    $head[$tab][2] = 'info';

+    $tab++;

@@ -69 +66 @@
-	complete_head_from_modules($conf, $langs, $object, $head, $tab, 'vat', 'remove');

+    complete_head_from_modules($conf, $langs, $object, $head, $tab, 'vat', 'remove');

@@ -71 +68 @@
-	return $head;

+    return $head;

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_website.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_website.lib.php
@@ -34,2 +33,0 @@
-	$str = str_replace('<?=', '<?php', $str);

-

@@ -38,5 +36,4 @@
-	// Split on each opening tag

-	//$parts = explode('<?php', $str);

-	$parts = preg_split('/'.preg_quote('<?php', '/').'/i', $str);

-

-	if (!empty($parts)) {

+	//split on each opening tag

+	$parts = explode('<?php', $str);

+	if (!empty($parts))

+	{

@@ -44,2 +41,4 @@
-		foreach ($parts as $part) {

-			if ($i == 0) { 	// The first part is never php code

+		foreach ($parts as $part)

+		{

+			if ($i == 0) 	// The first part is never php code

+			{

@@ -52 +51,2 @@
-			if (!empty($partlings)) {

+			if (!empty($partlings))

+			{

@@ -55,3 +55 @@
-				if (count($partlings) > 1) {

-					$partlings[0] = ''; // Todo why a count > 1 and not >= 1 ?

-				}

+				if (count($partlings) > 1) $partlings[0] = ''; // Todo why a count > 1 and not >= 1 ?

@@ -74 +72 @@
- * @see dolStripPhpCode(), checkPHPCode()

+ * @see dolStripPhpCode()

@@ -78,5 +75,0 @@
-	$str = str_replace('<?=', '<?php', $str);

-	$str = str_replace('<?php', '__LTINTPHP__', $str);

-	$str = str_replace('<?', '<?php', $str);			// replace the short_open_tag. It is recommended to set this is Off in php.ini

-	$str = str_replace('__LTINTPHP__', '<?php', $str);

-

@@ -85,5 +78,4 @@
-	// Split on each opening tag

-	//$parts = explode('<?php', $str);

-	$parts = preg_split('/'.preg_quote('<?php', '/').'/i', $str);

-

-	if (!empty($parts)) {

+	//split on each opening tag

+	$parts = explode('<?php', $str);

+	if (!empty($parts))

+	{

@@ -91,2 +83,4 @@
-		foreach ($parts as $part) {

-			if ($i == 0) { 	// The first part is never php code

+		foreach ($parts as $part)

+		{

+			if ($i == 0) 	// The first part is never php code

+			{

@@ -99 +93,2 @@
-			if (!empty($partlings)) {

+			if (!empty($partlings))

+			{

@@ -101 +96,3 @@
-			} else {

+			}

+			else

+			{

@@ -128 +125 @@
-	// Replace php code. Note $content may come from database and does not contain body tags.

+	// Replace php code. Note $content may come from database and does not contains body tags.

@@ -130,3 +127 @@
-	if ($removephppart) {

-		$replacewith = '';

-	}

+	if ($removephppart) $replacewith = '';

@@ -136,3 +131 @@
-	if ($removephppart) {

-		$replacewith = '';

-	}

+	if ($removephppart) $replacewith = '';

@@ -142,3 +135 @@
-	if ($removephppart) {

-		$replacewith = '';

-	}

+	if ($removephppart) $replacewith = '';

@@ -148,3 +139 @@
-	if ($removephppart) {

-		$replacewith = '';

-	}

+	if ($removephppart) $replacewith = '';

@@ -154,3 +143 @@
-	if ($removephppart) {

-		$replacewith = '';

-	}

+	if ($removephppart) $replacewith = '';

@@ -161,3 +148 @@
-	if ($removephppart) {

-		$replacewith = '';

-	}

+	if ($removephppart) $replacewith = '';

@@ -168,0 +154 @@
+	//var_dump($content);

@@ -172 +157,0 @@
-	$content = str_replace('src="javascript.js.php', 'src="!~!~!~javascript.js.php', $content);

@@ -174 +158,0 @@
-	$content = str_replace('xlink:href="', 'xlink:href="!~!~!~', $content);

@@ -176 +159,0 @@
-	$content = str_replace('src="//', 'src="!~!~!~//', $content);

@@ -226,47 +208,0 @@
- * Converts smiley string into the utf8 sequence.

- * @param	string		$content			Content to replace

- * @return	string							Replacement of all smiley strings with their utf8 code

- * @see dolWebsiteOutput()

- */

-function dolReplaceSmileyCodeWithUTF8($content)

-{

-	$map = array(

-		":face_with_tears_of_joy:" => "\xF0\x9F\x98\x82",

-		":grinning_face_with_smiling_eyes:" => "\xF0\x9F\x98\x81",

-		":smiling_face_with_open_mouth:" => "\xF0\x9F\x98\x83",

-		":smiling_face_with_open_mouth_and_cold_sweat:" => "\xF0\x9F\x98\x85",

-		":smiling_face_with_open_mouth_and_tightly_closed_eyes:" => "\xF0\x9F\x98\x86",

-		":winking_face:" => "\xF0\x9F\x98\x89",

-		":smiling_face_with_smiling_eyes:" => "\xF0\x9F\x98\x8A",

-		":face_savouring_delicious_food:" => "\xF0\x9F\x98\x8B",

-		":relieved_face:" => "\xF0\x9F\x98\x8C",

-		":smiling_face_with_heart_shaped_eyes:" => "\xF0\x9F\x98\x8D",

-		":smiling_face_with_sunglasses:" => "\xF0\x9F\x98\x8E",

-		":smirking_face:" => "\xF0\x9F\x98\x8F",

-		":neutral_face:" => "\xF0\x9F\x98\x90",

-		":expressionless_face:" => "\xF0\x9F\x98\x91",

-		":unamused_face:" => "\xF0\x9F\x98\x92",

-		":face_with_cold_sweat:" => "\xF0\x9F\x98\x93",

-		":pensive_face:" => "\xF0\x9F\x98\x94",

-		":confused_face:" => "\xF0\x9F\x98\x95",

-		":confounded_face:" => "\xF0\x9F\x98\x96",

-		":kissing_face:" => "\xF0\x9F\x98\x97",

-		":face_throwing_a_kiss:" => "\xF0\x9F\x98\x98",

-		":kissing_face_with_smiling_eyes:" => "\xF0\x9F\x98\x99",

-		":kissing_face_with_closed_eyes:" => "\xF0\x9F\x98\x9A",

-		":face_with_stuck_out_tongue:" => "\xF0\x9F\x98\x9B",

-		":face_with_stuck_out_tongue_and_winking_eye:" => "\xF0\x9F\x98\x9C",

-		":face_with_stuck_out_tongue_and_tightly_closed_eyes:" => "\xF0\x9F\x98\x9D",

-		":disappointed_face:" => "\xF0\x9F\x98\x9E",

-		":worried_face:" => "\xF0\x9F\x98\x9F",

-		":angry_face:" => "\xF0\x9F\x98\xA0",

-		":face_with_symbols_on_mouth:" => "\xF0\x9F\x98\xA1",

-	);

-	foreach ($map as $key => $value) {

-		$content = str_replace($key, $value, $content);

-	}

-	return $content;

-}

-

-

-/**

@@ -274 +210 @@
- * Used to ouput the page when viewed from a server (Dolibarr or Apache).

+ * Used to ouput the page when viewed from server (Dolibarr or Apache).

@@ -300 +236,2 @@
-	if (defined('USEDOLIBARREDITOR')) {		// REPLACEMENT OF LINKS When page called from Dolibarr editor

+	if (defined('USEDOLIBARREDITOR'))		// REPLACEMENT OF LINKS When page called from Dolibarr editor

+	{

@@ -302 +239,2 @@
-		if ($contenttype == 'html') {

+		if ($contenttype == 'html')

+		{

@@ -307 +245,3 @@
-	} elseif (defined('USEDOLIBARRSERVER')) {	// REPLACEMENT OF LINKS When page called from Dolibarr server

+	}

+	elseif (defined('USEDOLIBARRSERVER'))	// REPLACEMENT OF LINKS When page called from Dolibarr server

+	{

@@ -309 +248,0 @@
-		$content = str_replace(' async src="/javascript.js', ' async src="javascript.js', $content);

@@ -313 +251,0 @@
-		$content = str_replace('src="javascript.css.php', 'src="!~!~!~javascript.css.php', $content);

@@ -315 +252,0 @@
-		$content = str_replace('xlink:href="', 'xlink:href="!~!~!~', $content);

@@ -317 +253,0 @@
-		$content = str_replace('src="//', 'src="!~!~!~//', $content);

@@ -366 +302,3 @@
-	} else { // REPLACEMENT OF LINKS When page called from virtual host web server

+	}

+	else									// REPLACEMENT OF LINKS When page called from virtual host

+	{

@@ -378 +316,2 @@
-		if (!$symlinktomediaexists) {

+		if (!$symlinktomediaexists)

+		{

@@ -399 +338,3 @@
-		} else {

+		}

+		else

+		{

@@ -423,9 +364,5 @@
-	if (!defined('USEDOLIBARREDITOR')) {

-		$content = str_replace(' contenteditable="true"', ' contenteditable="false"', $content);

-	}

-

-	if (getDolGlobalString('WEBSITE_ADD_CSS_TO_BODY')) {

-		$content = str_replace('<body id="bodywebsite" class="bodywebsite', '<body id="bodywebsite" class="bodywebsite ' . getDolGlobalString('WEBSITE_ADD_CSS_TO_BODY'), $content);

-	}

-

-	$content = dolReplaceSmileyCodeWithUTF8($content);

+	$content = str_replace(' contenteditable="true"', ' contenteditable="false"', $content);

+

+	if (!empty($conf->global->WEBSITE_ADD_CSS_TO_BODY)) {

+		$content = str_replace('<body id="bodywebsite" class="bodywebsite', '<body id="bodywebsite" class="bodywebsite '.$conf->global->WEBSITE_ADD_CSS_TO_BODY, $content);

+	}

@@ -436,34 +372,0 @@
-}

-

-/**

- * Increase the website counter of page access.

- *

- * @param   int		$websiteid			ID of website

- * @param	string	$websitepagetype	Type of page ('blogpost', 'page', ...)

- * @param	int		$websitepageid		ID of page

- * @return  int							Return integer <0 if KO, >0 if OK

- */

-function dolWebsiteIncrementCounter($websiteid, $websitepagetype, $websitepageid)

-{

-	if (!getDolGlobalInt('WEBSITE_PERF_DISABLE_COUNTERS')) {

-		//dol_syslog("dolWebsiteIncrementCounter websiteid=".$websiteid." websitepagetype=".$websitepagetype." websitepageid=".$websitepageid);

-		if (in_array($websitepagetype, array('blogpost', 'page'))) {

-			global $db;

-

-			$tmpnow = dol_getdate(dol_now('gmt'), true, 'gmt');

-

-			$sql = "UPDATE ".$db->prefix()."website SET ";

-			$sql .= " pageviews_total = pageviews_total + 1,";

-			$sql .= " pageviews_month = pageviews_month + 1,";

-			// if last access was done during previous month, we save pageview_month into pageviews_previous_month

-			$sql .= " pageviews_previous_month = ".$db->ifsql("lastaccess < '".$db->idate(dol_mktime(0, 0, 0, $tmpnow['mon'], 1, $tmpnow['year'], 'gmt', 0), 'gmt')."'", 'pageviews_month', 'pageviews_previous_month').",";

-			$sql .= " lastaccess = '".$db->idate(dol_now('gmt'), 'gmt')."'";

-			$sql .= " WHERE rowid = ".((int) $websiteid);

-			$resql = $db->query($sql);

-			if (! $resql) {

-				return -1;

-			}

-		}

-	}

-

-	return 1;

@@ -517 +420,2 @@
-	if ($containeraliasalt) {

+	if ($containeraliasalt)

+	{

@@ -521 +425,2 @@
-		if ($result > 0) {

+		if ($result > 0)

+		{

@@ -523 +428,3 @@
-		} else {

+		}

+		else

+		{

@@ -529 +436,2 @@
-	if (defined('USEDOLIBARREDITOR')) {

+	if (defined('USEDOLIBARREDITOR'))

+	{

@@ -538 +446,2 @@
-	if (defined('USEDOLIBARRSERVER')) {	// When page called from Dolibarr server

+	if (defined('USEDOLIBARRSERVER'))	// When page called from Dolibarr server

+	{

@@ -540 +449,2 @@
-		if (!$containeraliasalt) {	// If containeraliasalt set, we already did the test

+		if (!$containeraliasalt)	// If containeraliasalt set, we already did the test

+		{

@@ -546,2 +456,3 @@
-		if ($result > 0) {

-			$currenturi = $_SERVER["REQUEST_URI"];	// Example: /public/website/index.php?website=mywebsite.com&pageref=mywebsite-home&nocache=1708177483

+		if ($result > 0)

+		{

+			$currenturi = $_SERVER["REQUEST_URI"];

@@ -549,2 +460,4 @@
-			if (preg_match('/&pageref=([^&]+)/', $currenturi, $regtmp)) {

-				if ($regtmp[0] == $containerref) {

+			if (preg_match('/&pageref=([^&]+)/', $currenturi, $regtmp))

+			{

+				if ($regtmp[0] == $containerref)

+				{

@@ -553 +466,3 @@
-				} else {

+				}

+				else

+				{

@@ -556 +471,3 @@
-			} else {

+			}

+			else

+			{

@@ -560 +477,3 @@
-	} else { // When page called from virtual host server

+	}

+	else								// When page called from virtual host server

+	{

@@ -562,4 +481,4 @@
-		$newurl = $newurl.(empty($_SERVER["QUERY_STRING"]) ? '' : '?'.$_SERVER["QUERY_STRING"]);

-	}

-

-	if ($newurl) {

+	}

+

+	if ($newurl)

+	{

@@ -571 +490,3 @@
-	} else {

+	}

+	else

+	{

@@ -593,9 +514,5 @@
-	if (!preg_match('/\.php$/i', $containerref)) {

-		$containerref .= '.php';

-	}

-

-	$fullpathfile = DOL_DATA_ROOT.($conf->entity > 1 ? '/'.$conf->entity : '').'/website/'.$websitekey.'/'.$containerref;

-

-	if (empty($includehtmlcontentopened)) {

-		$includehtmlcontentopened = 0;

-	}

+	if (!preg_match('/\.php$/i', $containerref)) $containerref .= '.php';

+

+	$fullpathfile = DOL_DATA_ROOT.'/website/'.$websitekey.'/'.$containerref;

+

+	if (empty($includehtmlcontentopened)) $includehtmlcontentopened = 0;

@@ -603,2 +520,3 @@
-	if ($includehtmlcontentopened > $MAXLEVEL) {

-		print 'ERROR: RECURSIVE CONTENT LEVEL. Depth of recursive call is more than the limit of '.((int) $MAXLEVEL).".\n";

+	if ($includehtmlcontentopened > $MAXLEVEL)

+	{

+		print 'ERROR: RECURSIVE CONTENT LEVEL. Depth of recursive call is more than the limit of '.$MAXLEVEL.".\n";

@@ -622 +540,2 @@
-	if (!$res) {

+	if (!$res)

+	{

@@ -630,6 +549,4 @@
- * Return HTML content to add structured data for an article, news or Blog Post. Use the json-ld format.

- * Example:

- * <?php getStructureData('blogpost'); ?>

- * <?php getStructureData('software', array('name'=>'Name', 'os'=>'Windows', 'price'=>10)); ?>

- *

- * @param 	string		$type				'blogpost', 'product', 'software', 'organization', 'qa',  ...

+ * Return HTML content to add structured data for an article, news or Blog Post.

+ * Use the json-ld format.

+ *

+ * @param 	string		$type				'blogpost', 'product', 'software', 'organization', ...

@@ -643,5 +560,4 @@
-	$type = strtolower($type);

-

-	if ($type == 'software') {

-		$ret = '<!-- Add structured data for entry in a software annuary -->'."\n";

-		$ret .= '<script nonce="'.getNonce().'" type="application/ld+json">'."\n";

+	if ($type == 'software')

+	{

+		$ret = '<!-- Add structured data for software post -->'."\n";

+		$ret .= '<script type="application/ld+json">'."\n";

@@ -653,10 +569,6 @@
-			"applicationCategory": "https://schema.org/'.dol_escape_json($data['applicationCategory']).'",';

-		if (!empty($data['ratingcount'])) {

-			$ret .= '

-				"aggregateRating": {

-					"@type": "AggregateRating",

-					"ratingValue": "'.dol_escape_json($data['ratingvalue']).'",

-					"ratingCount": "'.dol_escape_json($data['ratingcount']).'"

-				},';

-		}

-		$ret .= '

+			"applicationCategory": "https://schema.org/'.$data['applicationCategory'].'",

+			"aggregateRating": {

+				"@type": "AggregateRating",

+				"ratingValue": "'.$data['ratingvalue'].'",

+				"ratingCount": "'.$data['ratingcount'].'"

+			},

@@ -665,2 +577,2 @@
-				"price": "'.dol_escape_json($data['price']).'",

-				"priceCurrency": "'.dol_escape_json($data['currency'] ? $data['currency'] : $conf->currency).'"

+				"price": "'.$data['price'].'",

+				"priceCurrency": "'.($data['currency'] ? $data['currency'] : $conf->currency).'"

@@ -670 +582,3 @@
-	} elseif ($type == 'organization') {

+	}

+	elseif ($type == 'organization')

+	{

@@ -675 +589 @@
-		$ret .= '<script nonce="'.getNonce().'" type="application/ld+json">'."\n";

+		$ret .= '<script type="application/ld+json">'."\n";

@@ -679,2 +593,2 @@
-			"name": "'.dol_escape_json(!empty($data['name']) ? $data['name'] : $companyname).'",

-			"url": "'.dol_escape_json(!empty($data['url']) ? $data['url'] : $url).'",

+			"name": "'.dol_escape_json($data['name'] ? $data['name'] : $companyname).'",

+			"url": "'.dol_escape_json($data['url'] ? $data['url'] : $url).'",

@@ -685 +599 @@
-				"email": "'.dol_escape_json(!empty($data['email']) ? $data['email'] : $mysoc->email).'"

+				"email": "'.dol_escape_json($data['email'] ? $data['email'] : $mysoc->email).'"

@@ -691 +605 @@
-			foreach ($mysoc->socialnetworks as $key => $value) {

+			foreach($mysoc->socialnetworks as $key => $value) {

@@ -693 +607 @@
-					$ret .= '"https://www.'.$key.'.com/company/'.dol_escape_json($value).'"';

+					$ret.= '"https://www.'.$key.'.com/company/'.dol_escape_json($value).'"';

@@ -695,3 +609,4 @@
-					$ret .= '"https://www.'.$key.'.com/user/'.dol_escape_json($value).'"';

-				} else {

-					$ret .= '"https://www.'.$key.'.com/'.dol_escape_json($value).'"';

+					$ret.= '"https://www.'.$key.'.com/user/'.dol_escape_json($value).'"';

+				}

+				else {

+					$ret.= '"https://www.'.$key.'.com/'.dol_escape_json($value).'"';

@@ -700,3 +615 @@
-				if ($i < count($mysoc->socialnetworks)) {

-					$ret .= ', ';

-				}

+				if ($i < count($mysoc->socialnetworks)) $ret .= ', ';

@@ -708,2 +621,5 @@
-	} elseif ($type == 'blogpost') {

-		if (!empty($websitepage->author_alias)) {

+	}

+	elseif ($type == 'blogpost')

+	{

+		if (!empty($websitepage->author_alias))

+		{

@@ -722 +638 @@
-			$image = '/medias'.(preg_match('/^\//', $image) ? '' : '/').str_replace('__WEBSITE_KEY__', $website->ref, $image);

+			$image = 'medias/'.str_replace('__WEBSITE_KEY__', $website->ref, $image);

@@ -727 +643 @@
-			$ret .= '<script nonce="'.getNonce().'" type="application/ld+json">'."\n";

+			$ret .= '<script type="application/ld+json">'."\n";

@@ -758,2 +674,2 @@
-				foreach ($arrayofkeywords as $keyword) {

-					$ret .= '"'.dol_escape_json($keyword).'"';

+				foreach($arrayofkeywords as $keyword) {

+					$ret.= '"'.dol_escape_json($keyword).'"';

@@ -761,3 +677 @@
-					if ($i < count($arrayofkeywords)) {

-						$ret .= ', ';

-					}

+					if ($i < count($arrayofkeywords)) $ret .= ', ';

@@ -770,4 +684,4 @@
-		} else {

-			$ret = '<!-- no structured data inserted inline inside blogpost because no author_alias defined -->'."\n";

-		}

-	} elseif ($type == 'product') {

+		}

+	}

+	elseif ($type == 'product')

+	{

@@ -775 +689 @@
-		$ret .= '<script nonce="'.getNonce().'" type="application/ld+json">'."\n";

+		$ret .= '<script type="application/ld+json">'."\n";

@@ -797,2 +711,2 @@
-					"priceCurrency": "'.dol_escape_json($data['currency'] ? $data['currency'] : $conf->currency).'",

-					"price": "'.dol_escape_json($data['price']).'",

+					"priceCurrency": "'.($data['currency'] ? $data['currency'] : $conf->currency).'",

+					"price": "'.$data['price'].'",

@@ -808,26 +721,0 @@
-	} elseif ($type == 'qa') {

-		$ret = '<!-- Add structured data for QA -->'."\n";

-		$ret .= '<script nonce="'.getNonce().'" type="application/ld+json">'."\n";

-		$ret .= '{

-				"@context": "https://schema.org/",

-				"@type": "QAPage",

-				"mainEntity": {

-					"@type": "Question",

-					"name": "'.dol_escape_json($data['name']).'",

-					"text": "'.dol_escape_json($data['name']).'",

-					"answerCount": 1,

-					"author": {

-						"@type": "Person",

-						"name": "'.dol_escape_json($data['author']).'"

-					}

-					"acceptedAnswer": {

-						"@type": "Answer",

-						"text": "'.dol_escape_json(dol_string_nohtmltag(dolStripPhpCode($data['description']))).'",

-						"author": {

-							"@type": "Person",

-							"name": "'.dol_escape_json($data['author']).'"

-						}

-					}

-				}

-			}'."\n";

-		$ret .= '</script>'."\n";

@@ -836,75 +723,0 @@
-}

-

-/**

- * Return HTML content to add as header card for an article, news or Blog Post or home page.

- *

- * @param	array	$params					Array of parameters

- * @return  string							HTML content

- */

-function getSocialNetworkHeaderCards($params = null)

-{

-	global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $websitepage, $weblangs; // Very important. Required to have var available when running inluded containers.

-

-	$out = '';

-

-	if ($website->virtualhost) {

-		$pageurl = $websitepage->pageurl;

-		$title = $websitepage->title;

-		$image = $websitepage->image;

-		$companyname = $mysoc->name;

-		$description = $websitepage->description;

-

-		$pageurl = str_replace('__WEBSITE_KEY__', $website->ref, $pageurl);

-		$title = str_replace('__WEBSITE_KEY__', $website->ref, $title);

-		$image = '/medias'.(preg_match('/^\//', $image) ? '' : '/').str_replace('__WEBSITE_KEY__', $website->ref, $image);

-		$companyname = str_replace('__WEBSITE_KEY__', $website->ref, $companyname);

-		$description = str_replace('__WEBSITE_KEY__', $website->ref, $description);

-

-		$shortlangcode = '';

-		if ($websitepage->lang) {

-			$shortlangcode = substr($websitepage->lang, 0, 2); // en_US or en-US -> en

-		}

-		if (empty($shortlangcode)) {

-			$shortlangcode = substr($website->lang, 0, 2); // en_US or en-US -> en

-		}

-

-		$fullurl = $website->virtualhost.'/'.$websitepage->pageurl.'.php';

-		$canonicalurl = $website->virtualhost.(($websitepage->id == $website->fk_default_home) ? '/' : (($shortlangcode != substr($website->lang, 0, 2) ? '/'.$shortlangcode : '').'/'.$websitepage->pageurl.'.php'));

-		$hashtags = trim(join(' #', array_map('trim', explode(',', $websitepage->keywords))));

-

-		// Open Graph

-		$out .= '<meta name="og:type" content="website">'."\n";	// TODO If blogpost, use type article

-		$out .= '<meta name="og:title" content="'.$websitepage->title.'">'."\n";

-		if ($websitepage->image) {

-			$out .= '<meta name="og:image" content="'.$website->virtualhost.$image.'">'."\n";

-		}

-		$out .= '<meta name="og:url" content="'.$canonicalurl.'">'."\n";

-

-		// Twitter

-		$out .= '<meta name="twitter:card" content="summary">'."\n";

-		if (!empty($params) && !empty($params['twitter_account'])) {

-			$out .= '<meta name="twitter:site" content="@'.$params['twitter_account'].'">'."\n";

-			$out .= '<meta name="twitter:creator" content="@'.$params['twitter_account'].'">'."\n";

-		}

-		$out .= '<meta name="twitter:title" content="'.$websitepage->title.'">'."\n";

-		if ($websitepage->description) {

-			$out .= '<meta name="twitter:description" content="'.$websitepage->description.'">'."\n";

-		}

-		if ($websitepage->image) {

-			$out .= '<meta name="twitter:image" content="'.$website->virtualhost.$image.'">'."\n";

-		}

-		//$out .= '<meta name="twitter:domain" content="'.getDomainFromURL($website->virtualhost, 1).'">';

-		/*

-		 $out .= '<meta name="twitter:app:name:iphone" content="">';

-		 $out .= '<meta name="twitter:app:name:ipad" content="">';

-		 $out .= '<meta name="twitter:app:name:googleplay" content="">';

-		 $out .= '<meta name="twitter:app:url:iphone" content="">';

-		 $out .= '<meta name="twitter:app:url:ipad" content="">';

-		 $out .= '<meta name="twitter:app:url:googleplay" content="">';

-		 $out .= '<meta name="twitter:app:id:iphone" content="">';

-		 $out .= '<meta name="twitter:app:id:ipad" content="">';

-		 $out .= '<meta name="twitter:app:id:googleplay" content="">';

-		 */

-	}

-

-	return $out;

@@ -933 +746 @@
-		$out .= '<script nonce="'.getNonce().'">!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?\'http\':\'https\';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+\'://platform.twitter.com/widgets.js\';fjs.parentNode.insertBefore(js,fjs);}}(document, \'script\', \'twitter-wjs\');</script>';

+		$out .= '<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?\'http\':\'https\';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+\'://platform.twitter.com/widgets.js\';fjs.parentNode.insertBefore(js,fjs);}}(document, \'script\', \'twitter-wjs\');</script>';

@@ -938,3 +751,2 @@
-		$out .= '<a href="https://www.reddit.com/submit" target="_blank" rel="noopener noreferrer external" onclick="window.location = \'https://www.reddit.com/submit?url='.$fullurl.'\'; return false">';

-		$out .= '<span class="dol-social-share-reddit-span">Reddit</span>';

-		$out .= '</a>';

+		$out .= '<a href="https://www.reddit.com/submit" target="_blank" onclick="window.location = \'https://www.reddit.com/submit?url='.$fullurl.'\'; return false">';

+		$out .= '<img src="https://www.reddit.com/static/spreddit7.gif" alt="Submit to reddit" border="0" /> </a>';

@@ -946 +758 @@
-		$out .= '<script nonce="'.getNonce().'">(function(d, s, id) {

+		$out .= '<script>(function(d, s, id) {

@@ -964 +776,2 @@
-	} else {

+	}

+	else {

@@ -983,5 +796,3 @@
- * @param	array		$otherfilters		Other filters

- * @param	int			$status				0 or 1, or -1 for both

- * @return  array							Array with results of search

- */

-function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $sortfield = 'date_creation', $sortorder = 'DESC', $langcode = '', $otherfilters = 'null', $status = 1)

+ * @return  string							HTML content

+ */

+function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $sortfield = 'date_creation', $sortorder = 'DESC', $langcode = '')

@@ -994,5 +805,4 @@
-	if (!is_object($weblangs)) {

-		$weblangs = $langs;

-	}

-

-	if (empty($searchstring) && empty($type) && empty($langcode) && empty($otherfilters)) {

+	if (!is_object($weblangs)) $weblangs = $langs;

+

+	if (empty($searchstring))

+	{

@@ -1002 +812,3 @@
-	} elseif ($searchstring && dol_strlen($searchstring) < 2) {

+	}

+	elseif (dol_strlen($searchstring) < 2)

+	{

@@ -1007 +819,3 @@
-	} else {

+	}

+	else

+	{

@@ -1009 +823 @@
-		/*foreach ($tmparrayoftype as $tmptype) {

+		foreach ($tmparrayoftype as $tmptype) {

@@ -1016 +830 @@
-		}*/

+		}

@@ -1022,11 +836,4 @@
-	if (!$error && (empty($max) || ($found < $max)) && (preg_match('/meta/', $algo) || preg_match('/content/', $algo))) {

-		include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';

-

-		$sql = 'SELECT wp.rowid FROM '.MAIN_DB_PREFIX.'website_page as wp';

-		if (is_array($otherfilters) && !empty($otherfilters['category'])) {

-			$sql .= ', '.MAIN_DB_PREFIX.'categorie_website_page as cwp';

-		}

-		$sql .= " WHERE wp.fk_website = ".((int) $website->id);

-		if ($status >= 0) {

-			$sql .= " AND wp.status = ".((int) $status);

-		}

+	if (!$error && (empty($max) || ($found < $max)) && (preg_match('/meta/', $algo) || preg_match('/content/', $algo)))

+	{

+		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'website_page';

+		$sql .= " WHERE fk_website = ".$website->id;

@@ -1034 +841 @@
-			$sql .= " AND wp.lang = '".$db->escape($langcode)."'";

+			$sql .= " AND lang ='".$db->escape($langcode)."'";

@@ -1040,3 +847,3 @@
-				$typestring .= ($typestring ? ", " : "")."'".$db->escape(trim($tmptype))."'";

-			}

-			$sql .= " AND wp.type_container IN (".$db->sanitize($typestring, 1).")";

+				$typestring .= ($typestring ? ", " : "")."'".trim($tmptype)."'";

+			}

+			$sql .= " AND type_container IN (".$typestring.")";

@@ -1046,6 +853,8 @@
-		if (preg_match('/meta/', $algo)) {

-			$searchalgo .= ($searchalgo ? ' OR ' : '')."wp.title LIKE '%".$db->escape($db->escapeforlike($searchstring))."%' OR wp.description LIKE '%".$db->escape($db->escapeforlike($searchstring))."%'";

-			$searchalgo .= ($searchalgo ? ' OR ' : '')."wp.keywords LIKE '".$db->escape($db->escapeforlike($searchstring)).",%' OR wp.keywords LIKE '% ".$db->escape($db->escapeforlike($searchstring))."%'"; // TODO Use a better way to scan keywords

-		}

-		if (preg_match('/content/', $algo)) {

-			$searchalgo .= ($searchalgo ? ' OR ' : '')."wp.content LIKE '%".$db->escape($db->escapeforlike($searchstring))."%'";

+		if (preg_match('/meta/', $algo))

+		{

+			$searchalgo .= ($searchalgo ? ' OR ' : '')."title LIKE '%".$db->escape($searchstring)."%' OR description LIKE '%".$db->escape($searchstring)."%'";

+			$searchalgo .= ($searchalgo ? ' OR ' : '')."keywords LIKE '".$db->escape($searchstring).",%' OR keywords LIKE '% ".$db->escape($searchstring)."%'"; // TODO Use a better way to scan keywords

+		}

+		if (preg_match('/content/', $algo))

+		{

+			$searchalgo .= ($searchalgo ? ' OR ' : '')."content LIKE '%".$db->escape($searchstring)."%'";

@@ -1054,3 +862,0 @@
-		if (is_array($otherfilters) && !empty($otherfilters['category'])) {

-			$sql .= ' AND cwp.fk_website_page = wp.rowid AND cwp.fk_categorie = '.((int) $otherfilters['category']);

-		}

@@ -1060 +865,0 @@
-		//print $sql;

@@ -1063,2 +868,2 @@
-

-		if ($resql) {

+		if ($resql)

+		{

@@ -1066,2 +871,4 @@
-			while (($obj = $db->fetch_object($resql)) && ($i < $max || $max == 0)) {

-				if ($obj->rowid > 0) {

+			while (($obj = $db->fetch_object($resql)) && ($i < $max || $max == 0))

+			{

+				if ($obj->rowid > 0)

+				{

@@ -1070,3 +877 @@
-					if ($tmpwebsitepage->id > 0) {

-						$arrayresult['list'][$obj->rowid] = $tmpwebsitepage;

-					}

+					if ($tmpwebsitepage->id > 0) $arrayresult['list'][$obj->rowid] = $tmpwebsitepage;

@@ -1077 +882,3 @@
-		} else {

+		}

+		else

+		{

@@ -1086 +893,2 @@
-	if (!$error && (empty($max) || ($found < $max)) && (preg_match('/sitefiles/', $algo))) {

+	if (!$error && (empty($max) || ($found < $max)) && (preg_match('/sitefiles/', $algo)))

+	{

@@ -1089 +897 @@
-		$pathofwebsite = $dolibarr_main_data_root.($conf->entity > 1 ? '/'.$conf->entity : '').'/website/'.$website->ref;

+		$pathofwebsite = $dolibarr_main_data_root.'/website/'.$website->ref;

@@ -1099 +907,2 @@
-		if ((empty($max) || ($found < $max)) && preg_match('/'.preg_quote($searchstring, '/').'/', $filecontent)) {

+		if ((empty($max) || ($found < $max)) && preg_match('/'.preg_quote($searchstring, '/').'/', $filecontent))

+		{

@@ -1104 +913,2 @@
-		if ((empty($max) || ($found < $max)) && preg_match('/'.preg_quote($searchstring, '/').'/', $filecontent)) {

+		if ((empty($max) || ($found < $max)) && preg_match('/'.preg_quote($searchstring, '/').'/', $filecontent))

+		{

@@ -1109 +919,2 @@
-		if ((empty($max) || ($found < $max)) && preg_match('/'.preg_quote($searchstring, '/').'/', $filecontent)) {

+		if ((empty($max) || ($found < $max)) && preg_match('/'.preg_quote($searchstring, '/').'/', $filecontent))

+		{

@@ -1114 +925,2 @@
-		if ((empty($max) || ($found < $max)) && preg_match('/'.preg_quote($searchstring, '/').'/', $filecontent)) {

+		if ((empty($max) || ($found < $max)) && preg_match('/'.preg_quote($searchstring, '/').'/', $filecontent))

+		{

@@ -1121,2 +933,4 @@
-	if (!$error) {

-		if ($searchdone) {

+	if (!$error)

+	{

+		if ($searchdone)

+		{

@@ -1124 +938,2 @@
-			if (empty($arrayresult['list'])) {

+			if (empty($arrayresult['list']))

+			{

@@ -1128 +943,3 @@
-		} else {

+		}

+		else

+		{

@@ -1162,3 +979 @@
-	if (preg_match('/\/$/', $urltograb)) {

-		$urltograb .= '.';

-	}

+	if (preg_match('/\/$/', $urltograb)) $urltograb .= '.';

@@ -1171,6 +986,6 @@
-	foreach ($regs[0] as $key => $val) {

-		if (preg_match('/^data:image/i', $regs[2][$key])) {

-			continue; // We do nothing for such images

-		}

-

-		if (preg_match('/^\//', $regs[2][$key])) {

+	foreach ($regs[0] as $key => $val)

+	{

+		if (preg_match('/^data:image/i', $regs[2][$key])) continue; // We do nothing for such images

+

+		if (preg_match('/^\//', $regs[2][$key]))

+		{

@@ -1179 +994,3 @@
-		} else {

+		}

+		else

+		{

@@ -1185,3 +1002 @@
-		if ($grabimagesinto == 'root') {

-			$dirforimages = '';

-		}

+		if ($grabimagesinto == 'root') $dirforimages = '';

@@ -1191 +1006,2 @@
-		if (preg_match('/^http/', $regs[2][$key])) {

+		if (preg_match('/^http/', $regs[2][$key]))

+		{

@@ -1206,4 +1022,7 @@
-		if (empty($alreadygrabbed[$urltograbbis])) {

-			if ($grabimages) {

-				$tmpgeturl = getURLContent($urltograbbis, 'GET', '', 1, array(), array('http', 'https'), 0);

-				if ($tmpgeturl['curl_error_no']) {

+		if (empty($alreadygrabbed[$urltograbbis]))

+		{

+			if ($grabimages)

+			{

+				$tmpgeturl = getURLContent($urltograbbis);

+				if ($tmpgeturl['curl_error_no'])

+				{

@@ -1213 +1032,3 @@
-				} elseif ($tmpgeturl['http_code'] != '200') {

+				}

+				elseif ($tmpgeturl['http_code'] != '200')

+				{

@@ -1217 +1038,3 @@
-				} else {

+				}

+				else

+				{

@@ -1225,6 +1048,8 @@
-					dolChmod($filetosave);

-				}

-			}

-		}

-

-		if ($modifylinks) {

+					if (!empty($conf->global->MAIN_UMASK))

+						@chmod($filetosave, octdec($conf->global->MAIN_UMASK));

+				}

+			}

+		}

+

+		if ($modifylinks)

+		{

@@ -1238,6 +1063,6 @@
-	foreach ($regs[0] as $key => $val) {

-		if (preg_match('/^data:image/i', $regs[2][$key])) {

-			continue; // We do nothing for such images

-		}

-

-		if (preg_match('/^\//', $regs[2][$key])) {

+	foreach ($regs[0] as $key => $val)

+	{

+		if (preg_match('/^data:image/i', $regs[2][$key])) continue; // We do nothing for such images

+

+		if (preg_match('/^\//', $regs[2][$key]))

+		{

@@ -1246 +1071,3 @@
-		} else {

+		}

+		else

+		{

@@ -1253,3 +1080 @@
-		if ($grabimagesinto == 'root') {

-			$dirforimages = '';

-		}

+		if ($grabimagesinto == 'root') $dirforimages = '';

@@ -1259 +1084,2 @@
-		if (preg_match('/^http/', $regs[2][$key])) {

+		if (preg_match('/^http/', $regs[2][$key]))

+		{

@@ -1275,4 +1101,7 @@
-		if (empty($alreadygrabbed[$urltograbbis])) {

-			if ($grabimages) {

-				$tmpgeturl = getURLContent($urltograbbis, 'GET', '', 1, array(), array('http', 'https'), 0);

-				if ($tmpgeturl['curl_error_no']) {

+		if (empty($alreadygrabbed[$urltograbbis]))

+		{

+			if ($grabimages)

+			{

+				$tmpgeturl = getURLContent($urltograbbis);

+				if ($tmpgeturl['curl_error_no'])

+				{

@@ -1282 +1111,3 @@
-				} elseif ($tmpgeturl['http_code'] != '200') {

+				}

+				elseif ($tmpgeturl['http_code'] != '200')

+				{

@@ -1286 +1117,3 @@
-				} else {

+				}

+				else

+				{

@@ -1294,6 +1127,8 @@
-					dolChmod($filetosave);

-				}

-			}

-		}

-

-		if ($modifylinks) {

+					if (!empty($conf->global->MAIN_UMASK))

+						@chmod($filetosave, octdec($conf->global->MAIN_UMASK));

+				}

+			}

+		}

+

+		if ($modifylinks)

+		{

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_website2.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_website2.lib.php
@@ -48,8 +48,9 @@
-	dolChmod($filemaster);

-

-	return $result;

-}

-

-/**

- * Save an alias page on disk (A page that include the reference page).

- * It saves file into the root directory but also into language subdirectory.

+	if (!empty($conf->global->MAIN_UMASK))

+		@chmod($filemaster, octdec($conf->global->MAIN_UMASK));

+

+		return $result;

+}

+

+/**

+ * Save content of a page on disk.

+ * It can save file into root directory or into language subdirectory.

@@ -67 +68 @@
-	// Now create the .tpl file

+	// Now create the .tpl file (duplicate code with actions updatesource or updatecontent but we need this to save new header)

@@ -80,3 +81,5 @@
-	dolChmod($filealias);

-

-	// Save also alias into language subdirectory if it is not a main language

+	if (!empty($conf->global->MAIN_UMASK)) {

+		@chmod($filealias, octdec($conf->global->MAIN_UMASK));

+	}

+

+	// Save also alias into language subdirectory if we have to

@@ -86 +89 @@
-		$filealiassub = $dirname.'/'.$objectpage->lang.'/'.$filename;

+		$filealias = $dirname.'/'.$objectpage->lang.'/'.$filename;

@@ -94 +97 @@
-		$result = file_put_contents($filealiassub, $aliascontent);

+		$result = file_put_contents($filealias, $aliascontent);

@@ -96,37 +99,14 @@
-			dol_syslog("Failed to write file ".$filealiassub, LOG_WARNING);

-		}

-		dolChmod($filealiassub);

-	} elseif (empty($objectpage->lang) || !in_array($objectpage->lang, explode(',', $object->otherlang))) {

-		// Save also alias into all language subdirectories if it is a main language

-		if (!getDolGlobalString('WEBSITE_DISABLE_MAIN_LANGUAGE_INTO_LANGSUBDIR') && !empty($object->otherlang)) {

-			$dirname = dirname($filealias);

-			$filename = basename($filealias);

-			foreach (explode(',', $object->otherlang) as $sublang) {

-				// Avoid to erase main alias file if $sublang is empty string

-				if (empty(trim($sublang))) {

-					continue;

-				}

-				$filealiassub = $dirname.'/'.$sublang.'/'.$filename;

-

-				$aliascontent = '<?php'."\n";

-				$aliascontent .= "// File generated to wrap the alias page - DO NOT MODIFY - It is just a wrapper to real page\n";

-				$aliascontent .= 'global $dolibarr_main_data_root;'."\n";

-				$aliascontent .= 'if (empty($dolibarr_main_data_root)) require \'../page'.$objectpage->id.'.tpl.php\'; ';

-				$aliascontent .= 'else require $dolibarr_main_data_root.\'/website/\'.$website->ref.\'/page'.$objectpage->id.'.tpl.php\';'."\n";

-				$aliascontent .= '?>'."\n";

-				$result = file_put_contents($filealiassub, $aliascontent);

-				if ($result === false) {

-					dol_syslog("Failed to write file ".$filealiassub, LOG_WARNING);

-				}

-				dolChmod($filealiassub);

-			}

-		}

-	}

-

-	return ($result ? true : false);

-}

-

-

-/**

- * Save content of a page on disk (page name is generally ID_of_page.php).

- * Page contents are always saved into "root" directory. Only aliases pages saved with dolSavePageAlias() can be in root or language subdir.

+			dol_syslog("Failed to write file ".$filealias, LOG_WARNING);

+		}

+		if (!empty($conf->global->MAIN_UMASK)) {

+			@chmod($filealias, octdec($conf->global->MAIN_UMASK));

+		}

+	}

+

+	return ($result ?true:false);

+}

+

+

+/**

+ * Save content of a page on disk.

+ * Page contents are always saved into root directory.

@@ -137 +116,0 @@
- * @param	int			$backupold			1=Make a backup of old page

@@ -141 +120 @@
-function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage, $backupold = 0)

+function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage)

@@ -146 +125 @@
-	dol_syslog("dolSavePageContent We regenerate the tpl page filetpl=".$filetpl);

+	dol_syslog("We regenerate the tpl page filetpl=".$filetpl);

@@ -149,12 +128 @@
-

-	if (dol_is_file($filetpl)) {

-		if ($backupold) {

-			dol_delete_file($filetpl.'.old');

-			$result = dol_move($filetpl, $filetpl.'.old', 0, 1, 0, 0);

-			if (! $result) {

-				return false;

-			}

-		} else {

-			dol_delete_file($filetpl);

-		}

-	}

+	dol_delete_file($filetpl);

@@ -163,6 +131 @@
-	if ($objectpage->lang) {

-		$shortlangcode = substr($objectpage->lang, 0, 2); // en_US or en-US -> en

-	}

-	if (empty($shortlangcode)) {

-		$shortlangcode = substr($object->lang, 0, 2); // en_US or en-US -> en

-	}

+	if ($objectpage->lang) $shortlangcode = substr($objectpage->lang, 0, 2); // en_US or en-US -> en

@@ -181 +144,2 @@
-	if (getDolGlobalString('WEBSITE_FORCE_DOCTYPE_HTML5')) {

+	if (!empty($conf->global->WEBSITE_FORCE_DOCTYPE_HTML5))

+	{

@@ -201,0 +166,4 @@
+		// Add myself

+		$tplcontent .= '<?php if ($_SERVER["PHP_SELF"] == "'.(($object->fk_default_home == $objectpage->id) ? '/' : (($shortlangcode != substr($object->lang, 0, 2)) ? '/'.$shortlangcode : '')).'/'.$objectpage->pageurl.'.php") { ?>'."\n";

+		$tplcontent .= '<link rel="alternate" hreflang="'.$shortlangcode.'" href="'.(($object->fk_default_home == $objectpage->id) ? '/' : (($shortlangcode != substr($object->lang, 0, 2)) ? '/'.$shortlangcode : '').'/'.$objectpage->pageurl.'.php').'" />'."\n";

+

@@ -209,6 +177 @@
-				if ($tmppage->lang) {

-					$tmpshortlangcode = preg_replace('/[_-].*$/', '', $tmppage->lang); // en_US or en-US -> en

-				}

-				if (empty($tmpshortlangcode)) {

-					$tmpshortlangcode = preg_replace('/[_-].*$/', '', $object->lang); // en_US or en-US -> en

-				}

+				if ($tmppage->lang) $tmpshortlangcode = preg_replace('/[_-].*$/', '', $tmppage->lang); // en_US or en-US -> en

@@ -216 +179 @@
-					$tplcontent .= '<link rel="alternate" hreflang="'.$tmpshortlangcode.'" href="<?php echo $website->virtualhost; ?>'.($object->fk_default_home == $tmppage->id ? '/' : (($tmpshortlangcode != substr($object->lang, 0, 2)) ? '/'.$tmpshortlangcode : '').'/'.$tmppage->pageurl.'.php').'" />'."\n";

+					$tplcontent .= '<link rel="alternate" hreflang="'.$tmpshortlangcode.'" href="'.($object->fk_default_home == $tmppage->id ? '/' : (($tmpshortlangcode != substr($object->lang, 0, 2)) ? '/'.$tmpshortlangcode : '').'/'.$tmppage->pageurl.'.php').'" />'."\n";

@@ -220 +182,0 @@
-

@@ -222 +184 @@
-		$sql = "SELECT rowid as id, lang, pageurl from ".MAIN_DB_PREFIX.'website_page where fk_page IN ('.$db->sanitize($objectpage->id.($translationof ? ", ".$translationof : '')).")";

+		$sql = 'SELECT rowid as id, lang, pageurl from '.MAIN_DB_PREFIX.'website_page where fk_page IN ('.$objectpage->id.($translationof ? ", ".$translationof : "").")";

@@ -224 +186,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -226,2 +189,4 @@
-			if ($num_rows > 0) {

-				while ($obj = $db->fetch_object($resql)) {

+			if ($num_rows > 0)

+			{

+				while ($obj = $db->fetch_object($resql))

+				{

@@ -229,3 +194 @@
-					if ($obj->lang) {

-						$tmpshortlangcode = preg_replace('/[_-].*$/', '', $obj->lang); // en_US or en-US -> en

-					}

+					if ($obj->lang) $tmpshortlangcode = preg_replace('/[_-].*$/', '', $obj->lang); // en_US or en-US -> en

@@ -233 +196 @@
-						$tplcontent .= '<link rel="alternate" hreflang="'.$tmpshortlangcode.'" href="<?php echo $website->virtualhost; ?>'.($object->fk_default_home == $obj->id ? '/' : (($tmpshortlangcode != substr($object->lang, 0, 2) ? '/'.$tmpshortlangcode : '')).'/'.$obj->pageurl.'.php').'" />'."\n";

+						$tplcontent .= '<link rel="alternate" hreflang="'.$tmpshortlangcode.'" href="'.($object->fk_default_home == $obj->id ? '/' : (($tmpshortlangcode != substr($object->lang, 0, 2) ? '/'.$tmpshortlangcode : '')).'/'.$obj->pageurl.'.php').'" />'."\n";

@@ -237,8 +200,2 @@
-		} else {

-			dol_print_error($db);

-		}

-

-		// Add myself

-		$tplcontent .= '<?php if ($_SERVER["PHP_SELF"] == "'.(($object->fk_default_home == $objectpage->id) ? '/' : (($shortlangcode != substr($object->lang, 0, 2)) ? '/'.$shortlangcode : '')).'/'.$objectpage->pageurl.'.php") { ?>'."\n";

-		$tplcontent .= '<link rel="alternate" hreflang="'.$shortlangcode.'" href="<?php echo $website->virtualhost; ?>'.(($object->fk_default_home == $objectpage->id) ? '/' : (($shortlangcode != substr($object->lang, 0, 2)) ? '/'.$shortlangcode : '').'/'.$objectpage->pageurl.'.php').'" />'."\n";

-

+		}

+		else dol_print_error($db);

@@ -247 +204 @@
-	// Add manifest.json. Do we have to add it only on home page ?

+	// Add manifest.json on homepage

@@ -250 +206,0 @@
-	// Add js

@@ -253,2 +209 @@
-	$tplcontent .= '<script nonce="'.getNonce().'" async src="/javascript.js.php?website=<?php echo $websitekey; ?>"></script>'."\n";

-	// Add headers

+	$tplcontent .= '<script src="/javascript.js.php"></script>'."\n";

@@ -256 +211 @@
-	$tplcontent .= '<?php if (file_exists(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")) include DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html"; ?>'."\n";

+	$tplcontent .= '<?php print preg_replace(\'/<\/?html>/ims\', \'\', file_get_contents(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")); ?>'."\n";

@@ -268 +223 @@
-	$tplcontent .= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "html", '.$objectpage->id.'); dolWebsiteIncrementCounter('.$object->id.', "'.$objectpage->type_container.'", '.$objectpage->id.');'."\n";

+	$tplcontent .= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "html", '.$objectpage->id.');'."\n";

@@ -273,9 +228,9 @@
-

-	dolChmod($filetpl);

-

-	return $result;

-}

-

-

-/**

- * Save content of the index.php and/or the wrapper.php page

+	if (!empty($conf->global->MAIN_UMASK))

+		@chmod($filetpl, octdec($conf->global->MAIN_UMASK));

+

+		return $result;

+}

+

+

+/**

+ * Save content of the index.php and/or wrapper.php page

@@ -285 +240 @@
- * @param	string		$filetpl				File tpl the index.php page redirect to (used only if $fileindex is provided)

+ * @param	string		$filetpl				File tpl the index.php page redirect to

@@ -287 +241,0 @@
- * @param	Website		$object					Object website

@@ -290,3 +244,3 @@
-function dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper, $object = null)

-{

-	global $conf, $db;

+function dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper)

+{

+	global $conf;

@@ -305 +259 @@
-		$indexcontent .= 'if (!empty($_GET[\'pageref\']) || !empty($_GET[\'pagealiasalt\']) || !empty($_GET[\'pageid\'])) {'."\n";

+		$indexcontent .= 'if (! empty($_GET[\'pageref\']) || ! empty($_GET[\'pagealiasalt\']) || ! empty($_GET[\'pageid\'])) {'."\n";

@@ -314,41 +268,5 @@
-

-		dolChmod($fileindex);

-

-		if (is_object($object) && $object->fk_default_home > 0) {

-			$objectpage = new WebsitePage($db);

-			$objectpage->fetch($object->fk_default_home);

-

-			// Create a version for sublanguages

-			if (empty($objectpage->lang) || !in_array($objectpage->lang, explode(',', $object->otherlang))) {

-				if (!getDolGlobalString('WEBSITE_DISABLE_MAIN_LANGUAGE_INTO_LANGSUBDIR') && is_object($object) && !empty($object->otherlang)) {

-					$dirname = dirname($fileindex);

-					foreach (explode(',', $object->otherlang) as $sublang) {

-						// Avoid to erase main alias file if $sublang is empty string

-						if (empty(trim($sublang))) {

-							continue;

-						}

-						$fileindexsub = $dirname.'/'.$sublang.'/index.php';

-

-						// Same indexcontent than previously but with ../ instead of ./ for master and tpl file include/require_once.

-						$relpath = '..';

-						$indexcontent = '<?php'."\n";

-						$indexcontent .= "// BEGIN PHP File generated to provide an index.php as Home Page or alias redirector - DO NOT MODIFY - It is just a generated wrapper.\n";

-						$indexcontent .= '$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;'."\n";

-						$indexcontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once '".$relpath."/master.inc.php'; } // Load master if not already loaded\n";

-						$indexcontent .= 'if (!empty($_GET[\'pageref\']) || !empty($_GET[\'pagealiasalt\']) || !empty($_GET[\'pageid\'])) {'."\n";

-						$indexcontent .= "	require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";

-						$indexcontent .= "	require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";

-						$indexcontent .= '	redirectToContainer($_GET[\'pageref\'], $_GET[\'pagealiasalt\'], $_GET[\'pageid\']);'."\n";

-						$indexcontent .= "}\n";

-						$indexcontent .= "include_once '".$relpath."/".basename($filetpl)."'\n";	// use .. instead of .

-						$indexcontent .= '// END PHP ?>'."\n";

-						$result = file_put_contents($fileindexsub, $indexcontent);

-						if ($result === false) {

-							dol_syslog("Failed to write file ".$fileindexsub, LOG_WARNING);

-						}

-						dolChmod($fileindexsub);

-					}

-				}

-			}

-		}

-	} else {

+		if (!empty($conf->global->MAIN_UMASK)) {

+			@chmod($fileindex, octdec($conf->global->MAIN_UMASK));

+		}

+	}

+	else {

@@ -363 +281,3 @@
-		dolChmod($filewrapper);

+		if (!empty($conf->global->MAIN_UMASK)) {

+			@chmod($filewrapper, octdec($conf->global->MAIN_UMASK));

+		}

@@ -387 +307,2 @@
-	dolChmod($filehtmlheader);

+	if (!empty($conf->global->MAIN_UMASK))

+		@chmod($filehtmlheader, octdec($conf->global->MAIN_UMASK));

@@ -407 +328,2 @@
-	dolChmod($filecss);

+	if (!empty($conf->global->MAIN_UMASK))

+		@chmod($filecss, octdec($conf->global->MAIN_UMASK));

@@ -427 +349,2 @@
-	dolChmod($filejs);

+	if (!empty($conf->global->MAIN_UMASK))

+		@chmod($filejs, octdec($conf->global->MAIN_UMASK));

@@ -447 +370,2 @@
-	dolChmod($filerobot);

+	if (!empty($conf->global->MAIN_UMASK))

+		@chmod($filerobot, octdec($conf->global->MAIN_UMASK));

@@ -467 +391,2 @@
-	dolChmod($filehtaccess);

+	if (!empty($conf->global->MAIN_UMASK))

+		@chmod($filehtaccess, octdec($conf->global->MAIN_UMASK));

@@ -487 +412,2 @@
-	dolChmod($file);

+	if (!empty($conf->global->MAIN_UMASK))

+		@chmod($file, octdec($conf->global->MAIN_UMASK));

@@ -507,24 +433,6 @@
-	dolChmod($file);

-

-	return $result;

-}

-

-/**

- * Save content of a page on disk

- *

- * @param	string		$file				Full path of filename to generate

- * @param	string		$content			Content of file

- * @return	boolean							True if OK

- */

-function dolSaveLicense($file, $content)

-{

-	global $conf, $pathofwebsite;

-

-	dol_syslog("Save LICENSE file into ".$file);

-

-	dol_mkdir($pathofwebsite);

-	$result = file_put_contents($file, $content);

-	dolChmod($file);

-

-	return $result;

-}

+	if (!empty($conf->global->MAIN_UMASK))

+		@chmod($file, octdec($conf->global->MAIN_UMASK));

+

+		return $result;

+}

+

@@ -535 +443 @@
- *	@param	Website		$website		Object website to load the template into

+ *	@param	Website		$website		Object website to load the tempalte into

@@ -540 +448 @@
-	global $conf, $langs, $db, $form, $user;

+	global $conf, $langs, $db, $form;

@@ -543,2 +451,4 @@
-	if (!empty($conf->modules_parts['websitetemplates'])) {		// Using this feature slow down application

-		foreach ($conf->modules_parts['websitetemplates'] as $reldir) {

+	if (!empty($conf->modules_parts['websitetemplates']))		// Using this feature slow down application

+	{

+		foreach ($conf->modules_parts['websitetemplates'] as $reldir)

+		{

@@ -559,4 +468,0 @@
-	print ' ';

-	print '<a href="'.$_SERVER["PHP_SELF"].'?website='.urlencode($website->ref).'&importsite=1" target="_blank" rel="noopener noreferrer external">';

-	print img_picto('', 'refresh');

-	print '</a>';

@@ -566,2 +472,2 @@
-	print '<a href="'.$url.'" target="_blank" rel="noopener noreferrer external">';

-	print img_picto('', 'globe', 'class="pictofixedwidth"').$langs->trans('DownloadMoreSkins');

+	print '<a href="'.$url.'" target="_blank">';

+	print $langs->trans('DownloadMoreSkins');

@@ -573 +479 @@
-	print '<table class="nobordernopadding centpercent"><tr><td><div class="center">';

+	print '<table class="nobordernopadding" width="100%"><tr><td><div class="center">';

@@ -577 +483,2 @@
-		foreach ($dirthemes as $dir) {

+		foreach ($dirthemes as $dir)

+		{

@@ -580 +487,2 @@
-			if (is_dir($dirtheme)) {

+			if (is_dir($dirtheme))

+			{

@@ -582,3 +490,7 @@
-				if (is_resource($handle)) {

-					while (($subdir = readdir($handle)) !== false) {

-						if (is_file($dirtheme."/".$subdir) && substr($subdir, 0, 1) != '.' && substr($subdir, 0, 3) != 'CVS' && preg_match('/\.zip$/i', $subdir)) {

+				if (is_resource($handle))

+				{

+					while (($subdir = readdir($handle)) !== false)

+					{

+						if (is_file($dirtheme."/".$subdir) && substr($subdir, 0, 1) <> '.'

+							&& substr($subdir, 0, 3) <> 'CVS' && preg_match('/\.zip$/i', $subdir))

+						{

@@ -588,6 +500,2 @@
-							if (getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2 && preg_match('/_dev$/i', $subdir)) {

-								continue;

-							}

-							if (getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1 && preg_match('/_exp$/i', $subdir)) {

-								continue;

-							}

+							if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i', $subdir)) continue;

+							if ($conf->global->MAIN_FEATURES_LEVEL < 1 && preg_match('/_exp$/i', $subdir)) continue;

@@ -597 +504,0 @@
-							$templatedir = $dirtheme."/".$subdir;

@@ -601,3 +508 @@
-							if (!file_exists($file)) {

-								$url = DOL_URL_ROOT.'/public/theme/common/nophoto.png';

-							}

+							if (!file_exists($file)) $url = DOL_URL_ROOT.'/public/theme/common/nophoto.png';

@@ -613,5 +518,2 @@
-							if (!empty($urladvanced)) {

-								$ret .= '<a class="'.$urladvanced['css'].'" target="'.$urladvanced['target'].'" mime="'.$urladvanced['mime'].'" href="'.$urladvanced['url'].'">';

-							} else {

-								$ret .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.urlencode($modulepart).'&entity='.((int) $entity).'&file='.urlencode($originalfile).'&cache='.((int) $cache).'">';

-							}

+							if (!empty($urladvanced)) $ret .= '<a class="'.$urladvanced['css'].'" target="'.$urladvanced['target'].'" mime="'.$urladvanced['mime'].'" href="'.$urladvanced['url'].'">';

+							else $ret .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($originalfile).'&cache='.$cache.'">';

@@ -623,7 +525,2 @@
-							print $subdir;

-							print '<br>';

-							print '<span class="opacitymedium">'.dol_print_size(dol_filesize($dirtheme."/".$subdir), 1, 1).' - '.dol_print_date(dol_filemtime($templatedir), 'dayhour', 'tzuserrel').'</span>';

-							if ($user->hasRight('website', 'delete')) {

-								print ' <a href="'.$_SERVER["PHP_SELF"].'?action=deletetemplate&token='.newToken().'&website='.urlencode($website->ref).'&templateuserfile='.urlencode($subdir).'">'.img_picto('', 'delete').'</a>';

-							}

-							print '<br><a href="'.$_SERVER["PHP_SELF"].'?action=importsiteconfirm&token='.newToken().'&website='.urlencode($website->ref).'&templateuserfile='.urlencode($subdir).'" class="button">'.$langs->trans("Load").'</a>';

+							print $subdir.' ('.dol_print_size(dol_filesize($dirtheme."/".$subdir), 1, 1).')';

+							print '<br><a href="'.$_SERVER["PHP_SELF"].'?action=importsiteconfirm&website='.$website->ref.'&templateuserfile='.$subdir.'" class="button">'.$langs->trans("Load").'</a>';

@@ -638 +535,2 @@
-	} else {

+	}

+	else {

@@ -647,90 +544,0 @@
-

-

-/**

- * Check a new string containing only php code (including <php tag)

- * - Block if bad code in the new string.

- * - Block also if user has no permission to change PHP code.

- *

- * @param	string		$phpfullcodestringold		PHP old string. For exemple "<?php echo 'a' ?><php echo 'b' ?>"

- * @param	string		$phpfullcodestring			PHP new string. For exemple "<?php echo 'a' ?><php echo 'c' ?>"

- * @return	int										Error or not

- * @see dolKeepOnlyPhpCode()

- */

-function checkPHPCode($phpfullcodestringold, $phpfullcodestring)

-{

-	global $conf, $langs, $user;

-

-	$error = 0;

-

-	if (empty($phpfullcodestringold) && empty($phpfullcodestring)) {

-		return 0;

-	}

-

-	// First check forbidden commands

-	$forbiddenphpcommands = array();

-	if (!getDolGlobalString('WEBSITE_PHP_ALLOW_EXEC')) {    // If option is not on, we disallow functions to execute commands

-		$forbiddenphpcommands = array("exec", "passthru", "shell_exec", "system", "proc_open", "popen", "eval", "dol_eval", "executeCLI");

-	}

-	if (!getDolGlobalString('WEBSITE_PHP_ALLOW_WRITE')) {    // If option is not on, we disallow functions to write files

-		$forbiddenphpcommands = array_merge($forbiddenphpcommands, array("fopen", "file_put_contents", "fputs", "fputscsv", "fwrite", "fpassthru", "unlink", "mkdir", "rmdir", "symlink", "touch", "umask"));

-	}

-	foreach ($forbiddenphpcommands as $forbiddenphpcommand) {

-		if (preg_match('/'.$forbiddenphpcommand.'\s*\(/ms', $phpfullcodestring)) {

-			$error++;

-			setEventMessages($langs->trans("DynamicPHPCodeContainsAForbiddenInstruction", $forbiddenphpcommand), null, 'errors');

-			break;

-		}

-	}

-	// This char can be used to execute RCE for example using with echo `ls`

-	$forbiddenphpchars = array();

-	if (!getDolGlobalString('WEBSITE_PHP_ALLOW_DANGEROUS_CHARS')) {    // If option is not on, we disallow functions to execute commands

-		$forbiddenphpchars = array("`");

-	}

-	foreach ($forbiddenphpchars as $forbiddenphpchar) {

-		if (preg_match('/'.$forbiddenphpchar.'/ms', $phpfullcodestring)) {

-			$error++;

-			setEventMessages($langs->trans("DynamicPHPCodeContainsAForbiddenInstruction", $forbiddenphpchar), null, 'errors');

-			break;

-		}

-	}

-	// Deny dynamic functions '${a}('  or  '$a[b]('  - So we refuse '}('  and  ']('

-	if (preg_match('/[}\]]\(/ims', $phpfullcodestring)) {

-		$error++;

-		setEventMessages($langs->trans("DynamicPHPCodeContainsAForbiddenInstruction", ']('), null, 'errors');

-	}

-	// Deny dynamic functions $xxx(

-	if (preg_match('/\$[a-z0-9_]+\(/ims', $phpfullcodestring)) {

-		$error++;

-		setEventMessages($langs->trans("DynamicPHPCodeContainsAForbiddenInstruction", '$...('), null, 'errors');

-	}

-

-	if ($phpfullcodestringold != $phpfullcodestring) {

-		if (!$error && !$user->hasRight('website', 'writephp')) {

-			$error++;

-			setEventMessages($langs->trans("NotAllowedToAddDynamicContent"), null, 'errors');

-		}

-		if (!$error) {

-			$dolibarrdataroot = preg_replace('/([\\/]+)$/i', '', DOL_DATA_ROOT);

-			$allowimportsite = true;

-			include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

-			if (dol_is_file($dolibarrdataroot.'/installmodules.lock')) {

-				$allowimportsite = false;

-			}

-

-			if (!$allowimportsite) {

-				$error++;

-				// Blocked by installmodules.lock

-				if (getDolGlobalString('MAIN_MESSAGE_INSTALL_MODULES_DISABLED_CONTACT_US')) {

-					// Show clean corporate message

-					$message = $langs->trans('InstallModuleFromWebHasBeenDisabledContactUs');

-				} else {

-					// Show technical generic message

-					$message = $langs->trans("InstallModuleFromWebHasBeenDisabledByFile", $dolibarrdataroot.'/installmodules.lock');

-				}

-				setEventMessages($message, null, 'errors');

-			}

-		}

-	}

-

-	return $error;

-}

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_ws.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_ws.lib.php
@@ -32 +32 @@
- *  @param  string	$errorlabel			Error string label

+ *  @param  string	$errorlabel		Error string label

@@ -37,2 +37,2 @@
-	global $db, $conf, $langs;

-	global $dolibarr_main_authentication, $dolibarr_auto_user;

+    global $db, $conf, $langs;

+    global $dolibarr_main_authentication, $dolibarr_auto_user;

@@ -40 +40 @@
-	$fuser = new User($db);

+    $fuser = new User($db);

@@ -42,5 +42,5 @@
-	if (!$error && ($authentication['dolibarrkey'] != $conf->global->WEBSERVICES_KEY)) {

-		$error++;

-		$errorcode = 'BAD_VALUE_FOR_SECURITY_KEY';

-		$errorlabel = 'Value provided into dolibarrkey entry field does not match security key defined in Webservice module setup';

-	}

+    if (!$error && ($authentication['dolibarrkey'] != $conf->global->WEBSERVICES_KEY))

+    {

+        $error++;

+        $errorcode = 'BAD_VALUE_FOR_SECURITY_KEY'; $errorlabel = 'Value provided into dolibarrkey entry field does not match security key defined in Webservice module setup';

+    }

@@ -48,5 +48,5 @@
-	if (!$error && !empty($authentication['entity']) && !is_numeric($authentication['entity'])) {

-		$error++;

-		$errorcode = 'BAD_PARAMETERS';

-		$errorlabel = "The entity parameter must be empty (or filled with numeric id of instance if multicompany module is used).";

-	}

+    if (!$error && !empty($authentication['entity']) && !is_numeric($authentication['entity']))

+    {

+        $error++;

+        $errorcode = 'BAD_PARAMETERS'; $errorlabel = "The entity parameter must be empty (or filled with numeric id of instance if multicompany module is used).";

+    }

@@ -54,3 +54,16 @@
-	if (!$error) {

-		$result = $fuser->fetch('', $authentication['login'], '', 0);

-		if ($result < 0) {

+    if (!$error)

+    {

+        $result = $fuser->fetch('', $authentication['login'], '', 0);

+        if ($result < 0)

+        {

+            $error++;

+            $errorcode = 'ERROR_FETCH_USER'; $errorlabel = 'A technical error occurred during fetch of user';

+        }

+        elseif ($result == 0)

+        {

+            $error++;

+            $errorcode = 'BAD_CREDENTIALS'; $errorlabel = 'Bad value for login or password';

+        }

+

+		if (!$error && $fuser->statut == 0)

+		{

@@ -58,6 +71 @@
-			$errorcode = 'ERROR_FETCH_USER';

-			$errorlabel = 'A technical error occurred during fetch of user';

-		} elseif ($result == 0) {

-			$error++;

-			$errorcode = 'BAD_CREDENTIALS';

-			$errorlabel = 'Bad value for login or password';

+			$errorcode = 'ERROR_USER_DISABLED'; $errorlabel = 'This user has been locked or disabled';

@@ -66,8 +74,3 @@
-		if (!$error && $fuser->statut == 0) {

-			$error++;

-			$errorcode = 'ERROR_USER_DISABLED';

-			$errorlabel = 'This user has been locked or disabled';

-		}

-

-		// Validation of login

-		if (!$error) {

+    	// Validation of login

+		if (!$error)

+		{

@@ -76,10 +79,6 @@
-			// Authentication mode

-			if (empty($dolibarr_main_authentication)) {

-				$dolibarr_main_authentication = 'http,dolibarr';

-			}

-			// Authentication mode: forceuser

-			if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) {

-				$dolibarr_auto_user = 'auto';

-			}

-			// Set authmode

-			$authmode = explode(',', $dolibarr_main_authentication);

+        	// Authentication mode

+        	if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication = 'http,dolibarr';

+        	// Authentication mode: forceuser

+        	if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user = 'auto';

+        	// Set authmode

+        	$authmode = explode(',', $dolibarr_main_authentication);

@@ -87,10 +86,6 @@
-			include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';

-			$login = checkLoginPassEntity($authentication['login'], $authentication['password'], $authentication['entity'], $authmode, 'ws');

-			if ($login === '--bad-login-validity--') {

-				$login = '';

-			}

-

-			if (empty($login)) {

-				$error++;

-				$errorcode = 'BAD_CREDENTIALS';

-				$errorlabel = 'Bad value for login or password';

+            include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';

+        	$login = checkLoginPassEntity($authentication['login'], $authentication['password'], $authentication['entity'], $authmode, 'ws');

+			if (empty($login))

+			{

+			    $error++;

+                $errorcode = 'BAD_CREDENTIALS'; $errorlabel = 'Bad value for login or password';

@@ -99 +94 @@
-	}

+    }

@@ -101 +96 @@
-	return $fuser;

+    return $fuser;

--- /tmp/dsg/dolibarr/htdocs/core/lib/github_19.0.3_xcal.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/lib/client_xcal.lib.php
@@ -33 +33 @@
- *  @return     int                         Return integer < 0 if KO, Nb of events in file if OK

+ *  @return     int                         < 0 if ko, Nb of events in file if ok

@@ -41 +41,2 @@
-	if (empty($outputfile)) {

+	if (empty($outputfile))

+	{

@@ -46,2 +46,0 @@
-	$nbevents = 0;

-

@@ -51 +50,2 @@
-	if ($calfileh) {

+	if ($calfileh)

+	{

@@ -57 +57,2 @@
-		if ($format === "vcal") {

+		if ($format === "vcal")

+		{

@@ -74 +75,2 @@
-		if (getDolGlobalString('MAIN_AGENDA_EXPORT_CACHE') && getDolGlobalInt('MAIN_AGENDA_EXPORT_CACHE') > 60) {

+		if (!empty($conf->global->MAIN_AGENDA_EXPORT_CACHE) && $conf->global->MAIN_AGENDA_EXPORT_CACHE > 60)

+		{

@@ -82 +84,2 @@
-		foreach ($events_array as $key => $event) {

+		foreach ($events_array as $key => $event)

+		{

@@ -105 +107,0 @@
-			//print $fulldayevent.' '.dol_print_date($startdate, 'dayhour', 'gmt');

@@ -148,3 +150,2 @@
-			if ($type === "event") {

-				$nbevents++;

-

+			if ($type === "event")

+			{

@@ -154 +155,2 @@
-				if (!empty($email)) {

+				if (!empty($email))

+				{

@@ -159 +161,2 @@
-				if (!empty($url)) {

+				if (!empty($url))

+				{

@@ -163,3 +166,6 @@
-				if (is_array($assignedUsers)) {

-					foreach ($assignedUsers as $assignedUser) {

-						if ($assignedUser->email === $email) {

+				if (is_array($assignedUsers))

+				{

+					foreach ($assignedUsers as $assignedUser)

+					{

+						if ($assignedUser->email === $email)

+						{

@@ -173 +179,2 @@
-				if ($created) {

+				if ($created)

+				{

@@ -177 +184,2 @@
-				if ($modified) {

+				if ($modified)

+				{

@@ -184 +192,2 @@
-				if (!empty($location)) {

+				if (!empty($location))

+				{

@@ -188 +197,2 @@
-				if ($fulldayevent) {

+				if ($fulldayevent)

+				{

@@ -193 +203,2 @@
-				if ($fulldayevent) {

+				if ($fulldayevent)

+				{

@@ -199 +210 @@
-				fwrite($calfileh, "DTSTAMP:".dol_print_date($now, "dayhourxcard", 'gmt')."\n");

+				fwrite($calfileh, "DTSTAMP:".dol_print_date($now, "dayhourxcard", true)."\n");

@@ -203,9 +214,5 @@
-				$startdatef = dol_print_date($startdate, "dayhourxcard", 'gmt');

-

-				if ($fulldayevent) {

-					// For fullday event, date was stored with old version by using the user timezone instead of storing the date at UTC+0

-					// in the timezone of server (so for a PHP timezone of -3, we should store '2023-05-31 21:00:00.000'

-					// Using option MAIN_STORE_FULL_EVENT_IN_GMT=1 change the behaviour to store in GMT for full day event. This must become

-					// the default behaviour but there is no way to change keeping old saved date compatible.

-					$tzforfullday = getDolGlobalString('MAIN_STORE_FULL_EVENT_IN_GMT');

-					// Local time should be used to prevent users in time zones earlier than GMT from being one day earlier

+				$startdatef = dol_print_date($startdate, "dayhourxcard", true);

+

+				if ($fulldayevent)

+				{

+					// Local time

@@ -213,5 +220 @@
-					if ($tzforfullday) {

-						$startdatef = dol_print_date($startdate, "dayxcard", 'gmt');

-					} else {

-						$startdatef = dol_print_date($startdate, "dayxcard", 'tzserver');

-					}

+					$startdatef = dol_print_date($startdate, "dayxcard", false);

@@ -223,5 +226,4 @@
-				if ($fulldayevent) {

-					if (empty($enddate)) {

-						// We add 1 day needed for full day event (DTEND must be next day after event).

-						// This is mention in https://datatracker.ietf.org/doc/html/rfc5545:

-						// "The "DTEND" property for a "VEVENT" calendar component specifies the non-inclusive end of the event."

+				if ($fulldayevent)

+				{

+					if (empty($enddate))

+					{

@@ -230,2 +232,5 @@
-				} else {

-					if (empty($enddate)) {

+				}

+				else

+				{

+					if (empty($enddate))

+					{

@@ -237,3 +242,4 @@
-				$enddatef = dol_print_date($enddate, "dayhourxcard", 'gmt');

-

-				if ($fulldayevent) {

+				$enddatef = dol_print_date($enddate, "dayhourxcard", true);

+

+				if ($fulldayevent)

+				{

@@ -241,4 +247,4 @@
-					// We add 1 second so we reach the +1 day needed for full day event (DTEND must be next day after event)

-					// This is mention in https://datatracker.ietf.org/doc/html/rfc5545:

-					// "The "DTEND" property for a "VEVENT" calendar component specifies the non-inclusive end of the event."

-					$enddatef = dol_print_date($enddate + 1, "dayxcard", 'tzserver');

+					$enddatef = dol_print_date($enddate + 1, "dayxcard", false);

+

+					// Local time

+					//$enddatef .= dol_print_date($enddate+1,"dayhourxcard",false);

@@ -250 +256,2 @@
-				if (!empty($transparency)) {

+				if (!empty($transparency))

+				{

@@ -254 +261,2 @@
-				if (!empty($category)) {

+				if (!empty($category))

+				{

@@ -262,3 +270,2 @@
-			if ($type === "journal") {

-				$nbevents++;

-

+			if ($type === "journal")

+			{

@@ -268 +275,2 @@
-				if (!empty($email)) {

+				if (!empty($email))

+				{

@@ -273 +281,2 @@
-				if (!empty($url)) {

+				if (!empty($url))

+				{

@@ -277,6 +286,8 @@
-				if ($created) {

-					fwrite($calfileh, "CREATED:".dol_print_date($created, "dayhourxcard", 'gmt')."\n");

-				}

-

-				if ($modified) {

-					fwrite($calfileh, "LAST-MODIFIED:".dol_print_date($modified, "dayhourxcard", 'gmt')."\n");

+				if ($created)

+				{

+					fwrite($calfileh, "CREATED:".dol_print_date($created, "dayhourxcard", true)."\n");

+				}

+

+				if ($modified)

+				{

+					fwrite($calfileh, "LAST-MODIFIED:".dol_print_date($modified, "dayhourxcard", true)."\n");

@@ -292 +303 @@
-				fwrite($calfileh, "DTSTAMP:".dol_print_date($startdatef, "dayhourxcard", 'gmt')."\n");

+				fwrite($calfileh, "DTSTAMP:".dol_print_date($startdatef, "dayhourxcard", true)."\n");

@@ -302,2 +313,8 @@
-		dolChmod($outputfile);

-	} else {

+

+		if (!empty($conf->global->MAIN_UMASK))

+		{

+			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));

+		}

+	}

+	else

+	{

@@ -307,2 +323,0 @@
-

-	return $nbevents;

@@ -318 +333 @@
- *  @param      array	$events_array       Array of events ("uid","startdate","summary","url","desc","author","category","image") or Array of WebsitePage

+ *  @param      array	$events_array       Array of events ("uid","startdate","summary","url","desc","author","category") or Array of WebsitePage

@@ -323 +338 @@
- *  @return     int                         Return integer < 0 if KO, Nb of events in file if OK

+ *  @return     int                         < 0 if ko, Nb of events in file if ok

@@ -327 +342 @@
-	global $user, $conf, $langs, $mysoc;

+	global $user, $conf, $langs;

@@ -332,2 +347,3 @@
-	if (empty($outputfile)) {

-		// -1 = error

+	if (empty($outputfile))

+	{

+		 // -1 = error

@@ -337,2 +352,0 @@
-	$nbevents = 0;

-

@@ -341 +355,4 @@
-	if ($fichier) {

+	if ($fichier)

+	{

+		$date = date("r");

+

@@ -350,11 +367,11 @@
-		fwrite($fichier, "<title>".dol_escape_xml($title)."</title>\n");

-		if ($langcode) {

-			fwrite($fichier, "<language>".dol_escape_xml($langcode)."</language>\n");

-		}

-

-		// Define $urlwithroot

-		$urlwithouturlroot = preg_replace("/".preg_quote(DOL_URL_ROOT, "/")."$/i", "", trim($dolibarr_main_url_root));

-		$urlwithroot       = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file

-		//$urlwithroot=DOL_MAIN_URL_ROOT;                       // This is to use same domain name than current

-

-		// Url

+		fwrite($fichier, "<title>".$title."</title>\n");

+		if ($langcode) fwrite($fichier, "<language>".$langcode."</language>\n");

+

+		/*

+        fwrite($fichier, "<description><![CDATA[".$desc.".]]></description>"."\n".

+                // "<language>fr</language>"."\n".

+                "<copyright>Dolibarr</copyright>"."\n".

+                "<lastBuildDate>".$date."</lastBuildDate>"."\n".

+                "<generator>Dolibarr</generator>"."\n");

+        */

+

@@ -361,0 +379,5 @@
+			// Define $urlwithroot

+			$urlwithouturlroot = preg_replace("/".preg_quote(DOL_URL_ROOT, "/")."$/i", "", trim($dolibarr_main_url_root));

+			$urlwithroot       = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file

+			//$urlwithroot=DOL_MAIN_URL_ROOT;                       // This is to use same domain name than current

+

@@ -363,0 +386 @@
+

@@ -366,9 +389,2 @@
-		// Image

-		if (!empty($mysoc->logo_squarred_small)) {

-			$urlimage = $urlwithroot.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_small);

-			if ($urlimage) {

-				fwrite($fichier, "<image><url><![CDATA[".$urlimage."]]></url><title>'.$title.</title></image>\n");

-			}

-		}

-

-		foreach ($events_array as $key => $event) {

+		foreach ($events_array as $key => $event)

+		{

@@ -377 +393,2 @@
-			if ($filter) {

+			if ($filter)

+			{

@@ -383,3 +400,2 @@
-			if ($eventqualified) {

-				$nbevents++;

-

+			if ($eventqualified)

+			{

@@ -396 +412 @@
-					$tmpevent['image'] = $GLOBALS['website']->virtualhost.'/medias/'.$event->image;

+

@@ -404,5 +420,3 @@
-				$author       = $event["author"];

-				$category     = empty($event["category"]) ? null : $event["category"];

-				if (!empty($event["image"])) {

-					$image = $event["image"];

-				}

+				$author = $event["author"];

+				$category = $event["category"];

+

@@ -410,5 +424,5 @@
-				$priority     = $event["priority"];

-				$fulldayevent = $event["fulldayevent"];

-				$location     = $event["location"];

-				$email        = $event["email"];

-				*/

+                $priority     = $event["priority"];

+                $fulldayevent = $event["fulldayevent"];

+                $location     = $event["location"];

+                $email        = $event["email"];

+                */

@@ -422,3 +436 @@
-				if (!empty($category)) {

-					fwrite($fichier, "<category><![CDATA[".$category."]]></category>\n");

-				}

+				fwrite($fichier, "<category><![CDATA[".$category."]]></category>\n");

@@ -426,5 +438,2 @@
-				if (!empty($image)) {

-					fwrite($fichier, '<p><img class="center" src="'.$image.'"/></p>');

-				}

-

-				if ($description) {

+

+				if ($description)

@@ -432 +440,0 @@
-				}

@@ -449,4 +457,6 @@
-		dolChmod($outputfile);

-	}

-

-	return $nbevents;

+

+		if (!empty($conf->global->MAIN_UMASK))

+		{

+			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));

+		}

+	}

@@ -463,0 +474,2 @@
+	global $conf;

+

@@ -466 +478,2 @@
-	if ($format === "vcal") {

+	if ($format === "vcal")

+	{

@@ -470 +483,2 @@
-	if ($format === "ical") {

+	if ($format === "ical")

+	{

@@ -496 +510,2 @@
-	if (function_exists("mb_strlen")) {

+	if (function_exists("mb_strlen"))

+	{

@@ -499 +514,2 @@
-		for ($j = 0; $j < $strlength; $j++) {

+		for ($j = 0; $j < $strlength; $j++)

+		{

@@ -501,3 +517,4 @@
-			$char = dol_substr($line, $j, 1, "UTF-8");

-

-			if ((mb_strlen($newpara, "UTF-8") + mb_strlen($char, "UTF-8")) >= 75) {

+			$char = mb_substr($line, $j, 1, "UTF-8");

+

+			if ((mb_strlen($newpara, "UTF-8") + mb_strlen($char, "UTF-8")) >= 75)

+			{

@@ -514 +531,3 @@
-	} else {

+	}

+	else

+	{

@@ -517 +536,2 @@
-		for ($j = 0; $j < $strlength; $j++) {

+		for ($j = 0; $j < $strlength; $j++)

+		{

@@ -521 +541,2 @@
-			if ((dol_strlen($newpara) + dol_strlen($char)) >= 75) {

+			if ((dol_strlen($newpara) + dol_strlen($char)) >= 75)

+			{

@@ -550 +571,2 @@
-	foreach ($lines as $line) {

+	foreach ($lines as $line)

+	{

@@ -556 +578,2 @@
-		for ($j = 0; $j < $strlength; $j++) {

+		for ($j = 0; $j < $strlength; $j++)

+		{

@@ -560 +583,2 @@
-			if ($ascii < 32 || $ascii === 61 || $ascii > 126) {

+			if ($ascii < 32 || $ascii === 61 || $ascii > 126)

+			{

@@ -565 +589,2 @@
-			if ((strlen($newpara) + strlen($char)) >= 76) {

+			if ((strlen($newpara) + strlen($char)) >= 76)

+			{

@@ -570 +595 @@
-				if ($forcal) {

+				if ($forcal)

@@ -572 +596,0 @@
-				}