--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_CMailFile.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_CMailFile.class.php
@@ -9 +9 @@
- * Copyright (C) 2019-2023  Frédéric France         <frederic.france@netlogic.fr>

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

@@ -33,4 +32,0 @@
-use OAuth\Common\Storage\DoliStorage;

-use OAuth\Common\Consumer\Credentials;

-

-

@@ -39 +35 @@
- *  Usage: $mailfile = new CMailFile($subject,$sendto,$replyto,$message,$filepath,$mimetype,$filename,$cc,$ccc,$deliveryreceipt,$msgishtml,$errors_to,$css,$trackid,$moreinheader,$sendcontext,$replyto);

+ *  Usage: $mailfile = new CMailFile($subject,$sendto,$replyto,$message,$filepath,$mimetype,$filename,$cc,$ccc,$deliveryreceipt,$msgishtml,$errors_to,$css,$trackid,$moreinheader,$sendcontext);

@@ -48,5 +44,2 @@
-	/**

-	 * @var string Subject of email

-	 */

-	public $subject;

-	public $addr_from; // From:		Label and EMail of sender (must include '<>'). For example '<myemail@example.com>' or 'John Doe <myemail@example.com>' or '<myemail+trackingid@example.com>'). Note that with gmail smtps, value here is forced by google to account (but not the reply-to).

+    public $subject; // Topic:       Subject of email

+    public $addr_from; // From:		Label and EMail of sender (must include '<>'). For example '<myemail@example.com>' or 'John Doe <myemail@example.com>' or '<myemail+trackingid@example.com>'). Note that with gmail smtps, value here is forced by google to account (but not the reply-to).

@@ -56,17 +49,14 @@
-	public $reply_to; // Reply-To:	Email where to send replies from mailer software (mailer use From if reply-to not defined, Gmail use gmail account if reply-to not defined)

-	public $errors_to; // Errors-To:	Email where to send errors.

-	public $addr_to;

-	public $addr_cc;

-	public $addr_bcc;

-	public $trackid;

-

-	public $mixed_boundary;

-	public $related_boundary;

-	public $alternative_boundary;

-	public $deliveryreceipt;

-

-	public $atleastonefile;

-

-	public $msg;

-	public $eol;

-	public $eol2;

+    public $reply_to; // Reply-To:	Email where to send replies from mailer software (mailer use From if reply-to not defined, Gmail use gmail account if reply-to not defined)

+    public $errors_to; // Errors-To:	Email where to send errors.

+    public $addr_to;

+    public $addr_cc;

+    public $addr_bcc;

+    public $trackid;

+

+    public $mixed_boundary;

+    public $related_boundary;

+    public $alternative_boundary;

+    public $deliveryreceipt;

+

+    public $eol;

+    public $eol2;

@@ -79,23 +69,2 @@
-	/**

-	 * @var string[] Array of Error code (or message)

-	 */

-	public $errors = array();

-

-

-	/**

-	 * @var SMTPS (if this method is used)

-	 */

-	public $smtps;

-	/**

-	 * @var Swift_Mailer (if the method is used)

-	 */

-	public $mailer;

-

-	/**

-	 * @var Swift_SmtpTransport

-	 */

-	public $transport;

-	/**

-	 * @var Swift_Plugins_Loggers_ArrayLogger

-	 */

-	public $logger;

+    public $smtps; // Contains SMTPs object (if this method is used)

+    public $phpmailer; // Contains PHPMailer object (if this method is used)

@@ -108 +77 @@
-	public $styleCSS;

+    public $styleCSS;

@@ -110,10 +79,6 @@
-	public $bodyCSS;

-

-	/**

-	 * @var string	Message-ID of the email to send (generated)

-	 */

-	public $msgid;

-	public $headers;

-	public $message;

-

-	/**

+    public $bodyCSS;

+

+    public $msgid;

+    public $headers;

+    public $message;

+    /**

@@ -131,4 +95,0 @@
-	/**

-	 * @var array filenames cid

-	 */

-	public $cid_list = array();

@@ -137,8 +98,7 @@
-	public $html;

-	public $msgishtml;

-	public $image_boundary;

-	public $atleastoneimage = 0; // at least one image file with file=xxx.ext into content (TODO Debug this. How can this case be tested. Remove if not used).

-	public $html_images = array();

-	public $images_encoded = array();

-	public $image_types = array(

-		'gif'  => 'image/gif',

+    public $html;

+    public $image_boundary;

+    public $atleastoneimage = 0; // at least one image file with file=xxx.ext into content (TODO Debug this. How can this case be tested. Remove if not used).

+    public $html_images = array();

+    public $images_encoded = array();

+    public $image_types = array(

+        'gif'  => 'image/gif',

@@ -151,2 +111,2 @@
-		'tiff' => 'image/tiff',

-	);

+        'tiff' => 'image/tiff',

+    );

@@ -165 +125 @@
-	 *	@param 	string	$addr_cc             Email cc (Example: 'abc@def.com, ghk@lmn.com')

+	 *	@param 	string	$addr_cc             Email cc

@@ -172,2 +132,2 @@
-	 *  @param  string  $moreinheader        More in header. $moreinheader must contains the "\r\n" (TODO not supported for other MAIL_SEND_MODE different than 'mail' and 'smtps' for the moment)

-	 *  @param  string  $sendcontext      	 'standard', 'emailing', 'ticket', 'password', ... (used to define which sending mode and parameters to use)

+	 *  @param  string  $moreinheader        More in header. $moreinheader must contains the "\r\n" (TODO not supported for other MAIL_SEND_MODE different than 'phpmail' and 'smtps' for the moment)

+	 *  @param  string  $sendcontext      	 'standard', 'emailing', ... (used to define which sending mode and parameters to use)

@@ -175,3 +135,2 @@
-	 *  @param	string	$upload_dir_tmp		 Temporary directory (used to convert images embedded as img src=data:image)

-	 */

-	public function __construct($subject, $to, $from, $msg, $filename_list = array(), $mimetype_list = array(), $mimefilename_list = array(), $addr_cc = "", $addr_bcc = "", $deliveryreceipt = 0, $msgishtml = 0, $errors_to = '', $css = '', $trackid = '', $moreinheader = '', $sendcontext = 'standard', $replyto = '', $upload_dir_tmp = '')

+	 */

+	public function __construct($subject, $to, $from, $msg, $filename_list = array(), $mimetype_list = array(), $mimefilename_list = array(), $addr_cc = "", $addr_bcc = "", $deliveryreceipt = 0, $msgishtml = 0, $errors_to = '', $css = '', $trackid = '', $moreinheader = '', $sendcontext = 'standard', $replyto = '')

@@ -179,5 +138 @@
-		global $conf, $dolibarr_main_data_root, $user;

-

-		dol_syslog("CMailFile::CMailfile: charset=".$conf->file->character_set_client." from=$from, to=$to, addr_cc=$addr_cc, addr_bcc=$addr_bcc, errors_to=$errors_to, replyto=$replyto trackid=$trackid sendcontext=$sendcontext", LOG_DEBUG);

-		dol_syslog("CMailFile::CMailfile: subject=".$subject.", deliveryreceipt=".$deliveryreceipt.", msgishtml=".$msgishtml, LOG_DEBUG);

-

+		global $conf, $dolibarr_main_data_root;

@@ -192,2 +147,17 @@
-		$cid_list = array();

-

+		// Add autocopy to (Note: Adding bcc for specific modules are also done from pages)

+		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)) $addr_bcc .= ($addr_bcc ? ', ' : '').$conf->global->MAIN_MAIL_AUTOCOPY_TO;

+

+        $this->subject = $subject;

+		$this->addr_to = $to;

+		$this->addr_from = $from;

+		$this->msg = $msg;

+		$this->filename_list = $filename_list;

+		$this->mimetype_list = $mimetype_list;

+		$this->mimefilename_list = $mimefilename_list;

+		$this->addr_cc = $addr_cc;

+		$this->addr_bcc = $addr_bcc;

+		$this->deliveryreceipt = $deliveryreceipt;

+		if (empty($replyto)) $replyto = $from;

+		$this->reply_to = $replyto;

+		$this->errors_to = $errors_to;

+		$this->trackid = $trackid;

@@ -195,2 +165,5 @@
-

-		// Define this->sendmode ('mail', 'smtps', 'swiftmailer', ...) according to $sendcontext ('standard', 'emailing', 'ticket', 'password')

+		$this->filename_list = $filename_list;

+		$this->mimetype_list = $mimetype_list;

+		$this->mimefilename_list = $mimefilename_list;

+

+		// Define this->sendmode

@@ -198,10 +171,6 @@
-		if (!empty($this->sendcontext)) {

-			$smtpContextKey = strtoupper($this->sendcontext);

-			$smtpContextSendMode = getDolGlobalString('MAIN_MAIL_SENDMODE_'.$smtpContextKey);

-			if (!empty($smtpContextSendMode) && $smtpContextSendMode != 'default') {

-				$this->sendmode = $smtpContextSendMode;

-			}

-		}

-		if (empty($this->sendmode)) {

-			$this->sendmode = (getDolGlobalString('MAIN_MAIL_SENDMODE') ? $conf->global->MAIN_MAIL_SENDMODE : 'mail');

-		}

+		if ($this->sendcontext == 'emailing' && !empty($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && $conf->global->MAIN_MAIL_SENDMODE_EMAILING != 'default')

+		{

+			$this->sendmode = $conf->global->MAIN_MAIL_SENDMODE_EMAILING;

+		}

+		if (empty($this->sendmode)) $this->sendmode = $conf->global->MAIN_MAIL_SENDMODE;

+		if (empty($this->sendmode)) $this->sendmode = 'mail';

@@ -213 +182,2 @@
-		if (getDolGlobalString('MAIN_FIX_FOR_BUGGED_MTA')) {

+		if (!empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))

+		{

@@ -223 +193 @@
-		$this->related_boundary = 'mul_'.dol_hash(uniqid("dolibarr2"), 3); // Force md5 hash (does not contain special chars)

+		$this->related_boundary = 'mul_'.dol_hash(uniqid("dolibarr2"), 3); // Force md5 hash (does not contains special chars)

@@ -226,3 +196,7 @@
-		$this->alternative_boundary = 'mul_'.dol_hash(uniqid("dolibarr3"), 3); // Force md5 hash (does not contain special chars)

-

-		if (empty($subject)) {

+		$this->alternative_boundary = 'mul_'.dol_hash(uniqid("dolibarr3"), 3); // Force md5 hash (does not contains special chars)

+

+		dol_syslog("CMailFile::CMailfile: sendmode=".$this->sendmode." charset=".$conf->file->character_set_client." from=$from, to=$to, addr_cc=$addr_cc, addr_bcc=$addr_bcc, errors_to=$errors_to, trackid=$trackid sendcontext=$sendcontext", LOG_DEBUG);

+		dol_syslog("CMailFile::CMailfile: subject=".$subject.", deliveryreceipt=".$deliveryreceipt.", msgishtml=".$msgishtml, LOG_DEBUG);

+

+		if (empty($subject))

+		{

@@ -233,3 +207,4 @@
-		if (empty($msg)) {

-			dol_syslog("CMailFile::CMailfile: Try to send an email with empty body");

-			$msg = '.'; // Avoid empty message (with empty message content, you will see a multipart structure)

+		if (empty($msg))

+		{

+		    dol_syslog("CMailFile::CMailfile: Try to send an email with empty body");

+		    $msg = '.'; // Avoid empty message (with empty message content, you will see a multipart structure)

@@ -239 +214,2 @@
-		if ($msgishtml == -1) {

+		if ($msgishtml == -1)

+		{

@@ -241,4 +217,4 @@
-			if (dol_textishtml($msg)) {

-				$this->msgishtml = 1;

-			}

-		} else {

+			if (dol_textishtml($msg)) $this->msgishtml = 1;

+		}

+		else

+		{

@@ -258,3 +234 @@
-		if (getDolGlobalString('MAIN_MAIL_FORCE_CONTENT_TYPE_TO_HTML')) {

-			$this->msgishtml = 1; // To force to send everything with content type html.

-		}

+		if (!empty($conf->global->MAIN_MAIL_FORCE_CONTENT_TYPE_TO_HTML)) $this->msgishtml = 1; // To force to send everything with content type html.

@@ -263 +237,2 @@
-		if ($this->msgishtml) {

+		if ($this->msgishtml)

+		{

@@ -266,6 +241,2 @@
-			$findimg = 0;

-			if (getDolGlobalString('MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS')) {	// Off by default

-				// Search into the body for <img tags of links in medias files to replace them with an embedded file

-				// Note because media links are public, this should be useless, except avoid blocking images with email browser.

-				// This convert an embedd file with src="/viewimage.php?modulepart... into a cid link

-				// TODO Exclude viewimage used for the read tracker ?

+			if (!empty($conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS))

+			{

@@ -273,24 +244,9 @@
-				if ($findimg<0) {

-					dol_syslog("CMailFile::CMailfile: Error on findHtmlImages");

-					$this->error = 'ErrorInAddAttachementsImageBaseOnMedia';

-					return;

-				}

-			}

-

-			if (getDolGlobalString('MAIN_MAIL_ADD_INLINE_IMAGES_IF_DATA')) {

-				// Search into the body for <img src="data:image/ext;base64,..." to replace them with an embedded file

-				// This convert an embedded file with src="data:image... into a cid link + attached file

-				$resultImageData = $this->findHtmlImagesIsSrcData($upload_dir_tmp);

-				if ($resultImageData < 0) {

-					dol_syslog("CMailFile::CMailfile: Error on findHtmlImagesInSrcData code=".$resultImageData." upload_dir_tmp=".$upload_dir_tmp);

-					dol_syslog("CMailFile::CMailfile: ".implode(',', $this->errors));	// Output errors set by findHtmlImagesInSrcData

-					$this->error = 'ErrorInAddAttachementsImageBaseOnMedia';

-					return;

-				}

-				$findimg += $resultImageData;

-			}

-

-			// Set atleastoneimage if there is at least one embedded file (into ->html_images)

-			if ($findimg > 0) {

-				foreach ($this->html_images as $i => $val) {

-					if ($this->html_images[$i]) {

+			}

+

+			// Define if there is at least one file

+			if ($findimg)

+			{

+				foreach ($this->html_images as $i => $val)

+				{

+					if ($this->html_images[$i])

+					{

@@ -298,13 +253,0 @@
-						if ($this->html_images[$i]['type'] == 'cidfromdata') {

-							if (!in_array($this->html_images[$i]['fullpath'], $filename_list)) {

-								// If this file path is not already into the $filename_list, we add it.

-								$posindice = count($filename_list);

-								$filename_list[$posindice] = $this->html_images[$i]['fullpath'];

-								$mimetype_list[$posindice] = $this->html_images[$i]['content_type'];

-								$mimefilename_list[$posindice] = $this->html_images[$i]['name'];

-							} else {

-								$posindice = array_search($this->html_images[$i]['fullpath'], $filename_list);

-							}

-							// We complete the array of cid_list

-							$cid_list[$posindice] = $this->html_images[$i]['cid'];

-						}

@@ -316,7 +259,8 @@
-		//var_dump($filename_list);

-		//var_dump($cid_list);exit;

-

-		// Set atleastoneimage if there is at least one file (into $filename_list array)

-		if (is_array($filename_list)) {

-			foreach ($filename_list as $i => $val) {

-				if ($filename_list[$i]) {

+

+		// Define if there is at least one file

+		if (is_array($filename_list))

+		{

+			foreach ($filename_list as $i => $val)

+			{

+				if ($filename_list[$i])

+				{

@@ -324,73 +268,4 @@
-					dol_syslog("CMailFile::CMailfile: filename_list[$i]=".$filename_list[$i].", mimetype_list[$i]=".$mimetype_list[$i]." mimefilename_list[$i]=".$mimefilename_list[$i]." cid_list[$i]=".$cid_list[$i], LOG_DEBUG);

-				}

-			}

-		}

-

-		// Add auto copy to if not already in $to (Note: Adding bcc for specific modules are also done from pages)

-		// For example MAIN_MAIL_AUTOCOPY_TO can be 'email@example.com, __USER_EMAIL__, ...'

-		if (getDolGlobalString('MAIN_MAIL_AUTOCOPY_TO')) {

-			$listofemailstoadd = explode(',', getDolGlobalString('MAIN_MAIL_AUTOCOPY_TO'));

-			foreach ($listofemailstoadd as $key => $val) {

-				$emailtoadd = $listofemailstoadd[$key];

-				if (trim($emailtoadd) == '__USER_EMAIL__') {

-					if (!empty($user) && !empty($user->email)) {

-						$emailtoadd = $user->email;

-					} else {

-						$emailtoadd = '';

-					}

-				}

-				if ($emailtoadd && preg_match('/'.preg_quote($emailtoadd, '/').'/i', $to)) {

-					$emailtoadd = '';	// Email already in the "To"

-				}

-				if ($emailtoadd) {

-					$listofemailstoadd[$key] = $emailtoadd;

-				} else {

-					unset($listofemailstoadd[$key]);

-				}

-			}

-			if (!empty($listofemailstoadd)) {

-				$addr_bcc .= ($addr_bcc ? ', ' : '').join(', ', $listofemailstoadd);

-			}

-		}

-

-		// We always use a replyto

-		if (empty($replyto)) {

-			$replyto = dol_sanitizeEmail($from);

-		}

-		// We can force the from

-		if (getDolGlobalString('MAIN_MAIL_FORCE_FROM')) {

-			$from = getDolGlobalString('MAIN_MAIL_FORCE_FROM');

-		}

-

-		$this->subject = $subject;

-		$this->addr_to = dol_sanitizeEmail($to);

-		$this->addr_from = dol_sanitizeEmail($from);

-		$this->msg = $msg;

-		$this->addr_cc = dol_sanitizeEmail($addr_cc);

-		$this->addr_bcc = dol_sanitizeEmail($addr_bcc);

-		$this->deliveryreceipt = $deliveryreceipt;

-		$this->reply_to = dol_sanitizeEmail($replyto);

-		$this->errors_to = dol_sanitizeEmail($errors_to);

-		$this->trackid = $trackid;

-		// Set arrays with attached files info

-		$this->filename_list = $filename_list;

-		$this->mimetype_list = $mimetype_list;

-		$this->mimefilename_list = $mimefilename_list;

-		$this->cid_list = $cid_list;

-

-		if (getDolGlobalString('MAIN_MAIL_FORCE_SENDTO')) {

-			$this->addr_to = dol_sanitizeEmail(getDolGlobalString('MAIN_MAIL_FORCE_SENDTO'));

-			$this->addr_cc = '';

-			$this->addr_bcc = '';

-		}

-

-		$keyforsslseflsigned = 'MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED';

-		if (!empty($this->sendcontext)) {

-			$smtpContextKey = strtoupper($this->sendcontext);

-			$smtpContextSendMode = getDolGlobalString('MAIN_MAIL_SENDMODE_'.$smtpContextKey);

-			if (!empty($smtpContextSendMode) && $smtpContextSendMode != 'default') {

-				$keyforsslseflsigned = 'MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_'.$smtpContextKey;

-			}

-		}

-

-		dol_syslog("CMailFile::CMailfile: sendmode=".$this->sendmode." addr_bcc=$addr_bcc, replyto=$replyto", LOG_DEBUG);

+					dol_syslog("CMailFile::CMailfile: filename_list[$i]=".$filename_list[$i].", mimetype_list[$i]=".$mimetype_list[$i]." mimefilename_list[$i]=".$mimefilename_list[$i], LOG_DEBUG);

+				}

+			}

+		}

@@ -400 +275,2 @@
-		if ($this->sendmode == 'mail') {

+		if ($this->sendmode == 'mail')

+		{

@@ -411,3 +287 @@
-			if (!empty($moreinheader)) {

-				$smtp_headers .= $moreinheader; // $moreinheader contains the \r\n

-			}

+			if (!empty($moreinheader)) $smtp_headers .= $moreinheader; // $moreinheader contains the \r\n

@@ -418,2 +292,4 @@
-			if (!empty($this->html)) {

-				if (!empty($css)) {

+			if (!empty($this->html))

+			{

+				if (!empty($css))

+				{

@@ -431,2 +307,3 @@
-			if (!empty($this->atleastonefile)) {

-				$files_encoded = $this->write_files($filename_list, $mimetype_list, $mimefilename_list, $cid_list);

+			if ($this->atleastonefile)

+			{

+				$files_encoded = $this->write_files($filename_list, $mimetype_list, $mimefilename_list);

@@ -445 +322,3 @@
-		} elseif ($this->sendmode == 'smtps') {

+		}

+		elseif ($this->sendmode == 'smtps')

+		{

@@ -454 +333 @@
-			$subjecttouse = $this->subject;

+			$subjecttouse = $subject;

@@ -460,10 +339,118 @@
-			$smtps->setTO($this->getValidAddress($this->addr_to, 0, 1));

-			$smtps->setFrom($this->getValidAddress($this->addr_from, 0, 1));

-			$smtps->setTrackId($this->trackid);

-			$smtps->setReplyTo($this->getValidAddress($this->reply_to, 0, 1));

-

-			if (!empty($moreinheader)) {

-				$smtps->setMoreInHeader($moreinheader);

-			}

-

-			if (!empty($this->html)) {

+			$smtps->setTO($this->getValidAddress($to, 0, 1));

+			$smtps->setFrom($this->getValidAddress($from, 0, 1));

+			$smtps->setTrackId($trackid);

+			$smtps->setReplyTo($this->getValidAddress($replyto, 0, 1));

+

+			if (!empty($moreinheader)) $smtps->setMoreInHeader($moreinheader);

+

+			if (!empty($this->html))

+			{

+				if (!empty($css))

+				{

+					$this->css = $css;

+					$this->buildCSS();

+				}

+				$msg = $this->html;

+				$msg = $this->checkIfHTML($msg);

+			}

+

+			// Replace . alone on a new line with .. to avoid to have SMTP interpret this as end of message

+			$msg = preg_replace('/(\r|\n)\.(\r|\n)/ims', '\1..\2', $msg);

+

+			if ($this->msgishtml) $smtps->setBodyContent($msg, 'html');

+			else $smtps->setBodyContent($msg, 'plain');

+

+			if ($this->atleastoneimage)

+			{

+				foreach ($this->images_encoded as $img)

+				{

+					$smtps->setImageInline($img['image_encoded'], $img['name'], $img['content_type'], $img['cid']);

+				}

+			}

+

+			if ($this->atleastonefile)

+			{

+				foreach ($filename_list as $i => $val)

+				{

+					$content = file_get_contents($filename_list[$i]);

+					$smtps->setAttachment($content, $mimefilename_list[$i], $mimetype_list[$i]);

+				}

+			}

+

+			$smtps->setCC($addr_cc);

+			$smtps->setBCC($addr_bcc);

+			$smtps->setErrorsTo($errors_to);

+			$smtps->setDeliveryReceipt($deliveryreceipt);

+

+			$host = dol_getprefix('email');

+			$this->msgid = time().'.SMTPs-dolibarr-'.$trackid.'@'.$host;

+

+			$this->smtps = $smtps;

+		}

+		elseif ($this->sendmode == 'swiftmailer')

+		{

+			// Use Swift Mailer library

+            $host = dol_getprefix('email');

+

+            require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php';

+

+            // egulias autoloader lib

+            require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/autoload.php';

+

+            require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/swift_required.php';

+

+            // Create the message

+            //$this->message = Swift_Message::newInstance();

+            $this->message = new Swift_Message();

+            //$this->message = new Swift_SignedMessage();

+            // Adding a trackid header to a message

+            $headers = $this->message->getHeaders();

+            $headers->addTextHeader('X-Dolibarr-TRACKID', $trackid.'@'.$host);

+            $this->msgid = time().'.swiftmailer-dolibarr-'.$trackid.'@'.$host;

+            $headerID = $this->msgid;

+            $msgid = $headers->get('Message-ID');

+            $msgid->setId($headerID);

+            $headers->addIdHeader('References', $headerID);

+            // TODO if (! empty($moreinheader)) ...

+

+            // Give the message a subject

+            try {

+                $result = $this->message->setSubject($subject);

+            } catch (Exception $e) {

+                $this->errors[] = $e->getMessage();

+            }

+

+            // Set the From address with an associative array

+            //$this->message->setFrom(array('john@doe.com' => 'John Doe'));

+            if (!empty($from)) {

+                try {

+                    $result = $this->message->setFrom($this->getArrayAddress($from));

+                } catch (Exception $e) {

+                    $this->errors[] = $e->getMessage();

+                }

+            }

+

+            // Set the To addresses with an associative array

+            if (!empty($to)) {

+                try {

+                    $result = $this->message->setTo($this->getArrayAddress($to));

+                } catch (Exception $e) {

+                    $this->errors[] = $e->getMessage();

+                }

+            }

+

+            if (!empty($replyto)) {

+                try {

+                	$result = $this->message->SetReplyTo($this->getArrayAddress($replyto));

+                } catch (Exception $e) {

+                    $this->errors[] = $e->getMessage();

+                }

+            }

+

+            try {

+                $result = $this->message->setCharSet($conf->file->character_set_client);

+            } catch (Exception $e) {

+                $this->errors[] = $e->getMessage();

+            }

+

+            if (!empty($this->html)) {

@@ -475,136 +462,7 @@
-				$msg = $this->checkIfHTML($msg);		// This add a header and a body including custom CSS to the HTML content

-			}

-

-			// Replace . alone on a new line with .. to avoid to have SMTP interpret this as end of message

-			$msg = preg_replace('/(\r|\n)\.(\r|\n)/ims', '\1..\2', $msg);

-

-			if ($this->msgishtml) {

-				$smtps->setBodyContent($msg, 'html');

-			} else {

-				$smtps->setBodyContent($msg, 'plain');

-			}

-

-			if ($this->atleastoneimage) {

-				foreach ($this->images_encoded as $img) {

-					$smtps->setImageInline($img['image_encoded'], $img['name'], $img['content_type'], $img['cid']);

-				}

-			}

-

-			if (!empty($this->atleastonefile)) {

-				foreach ($filename_list as $i => $val) {

-					$content = file_get_contents($filename_list[$i]);

-					$smtps->setAttachment($content, $mimefilename_list[$i], $mimetype_list[$i], $cid_list[$i]);

-				}

-			}

-

-			$smtps->setCC($this->addr_cc);

-			$smtps->setBCC($this->addr_bcc);

-			$smtps->setErrorsTo($this->errors_to);

-			$smtps->setDeliveryReceipt($this->deliveryreceipt);

-			if (!empty($conf->global->$keyforsslseflsigned)) {

-				$smtps->setOptions(array('ssl' => array('verify_peer' => false, 'verify_peer_name' => false, 'allow_self_signed' => true)));

-			}

-

-			$host = dol_getprefix('email');

-			$this->msgid = time().'.SMTPs-dolibarr-'.$this->trackid.'@'.$host;

-

-			$this->smtps = $smtps;

-		} elseif ($this->sendmode == 'swiftmailer') {

-			// Use Swift Mailer library

-			$host = dol_getprefix('email');

-

-			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php';

-

-			// egulias autoloader lib

-			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/autoload.php';

-

-			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/swift_required.php';

-

-			// Create the message

-			//$this->message = Swift_Message::newInstance();

-			$this->message = new Swift_Message();

-			//$this->message = new Swift_SignedMessage();

-			// Adding a trackid header to a message

-			$headers = $this->message->getHeaders();

-

-			$headers->addTextHeader('X-Dolibarr-TRACKID', $this->trackid.'@'.$host);

-			$this->msgid = time().'.swiftmailer-dolibarr-'.$this->trackid.'@'.$host;

-			$headerID = $this->msgid;

-			$msgid = $headers->get('Message-ID');

-			$msgid->setId($headerID);

-

-			// Add 'References:' header

-			//$headers->addIdHeader('References', $headerID);

-

-			// Give the message a subject

-			try {

-				$this->message->setSubject($this->subject);

-			} catch (Exception $e) {

-				$this->errors[] = $e->getMessage();

-			}

-

-			// Set the From address with an associative array

-			//$this->message->setFrom(array('john@doe.com' => 'John Doe'));

-			if (!empty($this->addr_from)) {

-				try {

-					if (getDolGlobalString('MAIN_FORCE_DISABLE_MAIL_SPOOFING')) {

-						// Prevent email spoofing for smtp server with a strict configuration

-						$regexp = '/([a-z0-9_\.\-\+])+\@(([a-z0-9\-])+\.)+([a-z0-9]{2,4})+/i'; // This regular expression extracts all emails from a string

-						$adressEmailFrom = array();

-						$emailMatchs = preg_match_all($regexp, $from, $adressEmailFrom);

-						$adressEmailFrom = reset($adressEmailFrom);

-						if ($emailMatchs !== false && filter_var($conf->global->MAIN_MAIL_SMTPS_ID, FILTER_VALIDATE_EMAIL) && $conf->global->MAIN_MAIL_SMTPS_ID !== $adressEmailFrom) {

-							$this->message->setFrom($conf->global->MAIN_MAIL_SMTPS_ID);

-						} else {

-							$this->message->setFrom($this->getArrayAddress($this->addr_from));

-						}

-					} else {

-						$this->message->setFrom($this->getArrayAddress($this->addr_from));

-					}

-				} catch (Exception $e) {

-					$this->errors[] = $e->getMessage();

-				}

-			}

-

-			// Set the To addresses with an associative array

-			if (!empty($this->addr_to)) {

-				try {

-					$this->message->setTo($this->getArrayAddress($this->addr_to));

-				} catch (Exception $e) {

-					$this->errors[] = $e->getMessage();

-				}

-			}

-

-			if (!empty($this->reply_to)) {

-				try {

-					$this->message->SetReplyTo($this->getArrayAddress($this->reply_to));

-				} catch (Exception $e) {

-					$this->errors[] = $e->getMessage();

-				}

-			}

-

-			if (!empty($this->errors_to)) {

-				try {

-					$headers->addTextHeader('Errors-To', $this->getArrayAddress($this->errors_to));

-				} catch (Exception $e) {

-					$this->errors[] = $e->getMessage();

-				}

-			}

-

-			try {

-				$this->message->setCharSet($conf->file->character_set_client);

-			} catch (Exception $e) {

-				$this->errors[] = $e->getMessage();

-			}

-

-			if (!empty($this->html)) {

-				if (!empty($css)) {

-					$this->css = $css;

-					$this->buildCSS();

-				}

-				$msg = $this->html;

-				$msg = $this->checkIfHTML($msg);		// This add a header and a body including custom CSS to the HTML content

-			}

-

-			if ($this->atleastoneimage) {

-				foreach ($this->images_encoded as $img) {

+				$msg = $this->checkIfHTML($msg);

+			}

+

+			if ($this->atleastoneimage)

+			{

+				foreach ($this->images_encoded as $img)

+				{

@@ -630,2 +488,4 @@
-			if (!empty($this->atleastonefile)) {

-				foreach ($filename_list as $i => $val) {

+			if ($this->atleastonefile)

+			{

+				foreach ($filename_list as $i => $val)

+				{

@@ -634,3 +493,0 @@
-					if (!empty($mimefilename_list[$i])) {

-						$attachment->setFilename($mimefilename_list[$i]);

-					}

@@ -641,23 +498,7 @@
-			if (!empty($this->addr_cc)) {

-				try {

-					$this->message->setCc($this->getArrayAddress($this->addr_cc));

-				} catch (Exception $e) {

-					$this->errors[] = $e->getMessage();

-				}

-			}

-			if (!empty($this->addr_bcc)) {

-				try {

-					$this->message->setBcc($this->getArrayAddress($this->addr_bcc));

-				} catch (Exception $e) {

-					$this->errors[] = $e->getMessage();

-				}

-			}

-			//if (!empty($this->errors_to)) $this->message->setErrorsTo($this->getArrayAddress($this->errors_to));

-			if (isset($this->deliveryreceipt) && $this->deliveryreceipt == 1) {

-				try {

-					$this->message->setReadReceiptTo($this->getArrayAddress($this->addr_from));

-				} catch (Exception $e) {

-					$this->errors[] = $e->getMessage();

-				}

-			}

-		} else {

+			if (!empty($addr_cc)) $this->message->setCc($this->getArrayAddress($addr_cc));

+			if (!empty($addr_bcc)) $this->message->setBcc($this->getArrayAddress($addr_bcc));

+			//if (! empty($errors_to)) $this->message->setErrorsTo($this->getArrayAddress($errors_to);

+			if (isset($deliveryreceipt) && $deliveryreceipt == 1) $this->message->setReadReceiptTo($this->getArrayAddress($from));

+		}

+		else

+		{

@@ -669,0 +511 @@
+

@@ -677 +519 @@
-		global $conf, $db, $langs, $hookmanager;

+		global $conf, $db, $langs;

@@ -684,5 +526,4 @@
-		if (!getDolGlobalString('MAIN_DISABLE_ALL_MAILS')) {

-			if (!is_object($hookmanager)) {

-				include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';

-				$hookmanager = new HookManager($db);

-			}

+		if (empty($conf->global->MAIN_DISABLE_ALL_MAILS))

+		{

+			require_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';

+			$hookmanager = new HookManager($db);

@@ -691,2 +532 @@
-			$parameters = array();

-			$action = '';

+			$parameters = array(); $action = '';

@@ -694 +534,2 @@
-			if ($reshook < 0) {

+			if ($reshook < 0)

+			{

@@ -700 +541,2 @@
-			if ($reshook == 1) {	// Hook replace standard code

+			if ($reshook == 1)	// Hook replace standard code

+			{

@@ -705,22 +547,22 @@
-			if ($this->sendcontext == 'emailing' && getDolGlobalString('MAILING_NO_USING_PHPMAIL') && $sendingmode == 'mail') {

-				// List of sending methods

-				$listofmethods = array();

-				$listofmethods['mail'] = 'PHP mail function';

-				//$listofmethods['simplemail']='Simplemail class';

-				$listofmethods['smtps'] = 'SMTP/SMTPS socket library';

-

-				// EMailing feature may be a spam problem, so when you host several users/instance, having this option may force each user to use their own SMTP agent.

-				// You ensure that every user is using its own SMTP server when using the mass emailing module.

-				$linktoadminemailbefore = '<a href="'.DOL_URL_ROOT.'/admin/mails.php">';

-				$linktoadminemailend = '</a>';

-				$this->error = $langs->trans("MailSendSetupIs", $listofmethods[$sendingmode]);

-				$this->errors[] = $langs->trans("MailSendSetupIs", $listofmethods[$sendingmode]);

-				$this->error .= '<br>'.$langs->trans("MailSendSetupIs2", $linktoadminemailbefore, $linktoadminemailend, $langs->transnoentitiesnoconv("MAIN_MAIL_SENDMODE"), $listofmethods['smtps']);

-				$this->errors[] = $langs->trans("MailSendSetupIs2", $linktoadminemailbefore, $linktoadminemailend, $langs->transnoentitiesnoconv("MAIN_MAIL_SENDMODE"), $listofmethods['smtps']);

-				if (getDolGlobalString('MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS')) {

-					$this->error .= '<br>'.$langs->trans("MailSendSetupIs3", $conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS);

-					$this->errors[] = $langs->trans("MailSendSetupIs3", $conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS);

-				}

-

-				dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_WARNING);

-				return false;

+			if ($this->context == 'emailing' && !empty($conf->global->MAILING_NO_USING_PHPMAIL) && $sendingmode == 'mail')

+			{

+			    // List of sending methods

+			    $listofmethods = array();

+			    $listofmethods['mail'] = 'PHP mail function';

+			    //$listofmethods['simplemail']='Simplemail class';

+			    $listofmethods['smtps'] = 'SMTP/SMTPS socket library';

+

+			    // EMailing feature may be a spam problem, so when you host several users/instance, having this option may force each user to use their own SMTP agent.

+			    // You ensure that every user is using its own SMTP server when using the mass emailing module.

+			    $linktoadminemailbefore = '<a href="'.DOL_URL_ROOT.'/admin/mails.php">';

+			    $linktoadminemailend = '</a>';

+			    $this->error = $langs->trans("MailSendSetupIs", $listofmethods[$sendingmode]);

+			    $this->errors[] = $langs->trans("MailSendSetupIs", $listofmethods[$sendingmode]);

+			    $this->error .= '<br>'.$langs->trans("MailSendSetupIs2", $linktoadminemailbefore, $linktoadminemailend, $langs->transnoentitiesnoconv("MAIN_MAIL_SENDMODE"), $listofmethods['smtps']);

+			    $this->errors[] = $langs->trans("MailSendSetupIs2", $linktoadminemailbefore, $linktoadminemailend, $langs->transnoentitiesnoconv("MAIN_MAIL_SENDMODE"), $listofmethods['smtps']);

+			    if (!empty($conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS))

+			    {

+			        $this->error .= '<br>'.$langs->trans("MailSendSetupIs3", $conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS);

+			        $this->errors[] = $langs->trans("MailSendSetupIs3", $conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS);

+			    }

+                return false;

@@ -730,3 +572 @@
-			if (!getDolGlobalString('MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL')) {

-				$conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL = 10;

-			}

+			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL = 10;

@@ -734 +574,2 @@
-			if (count($tmparray1) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL) {

+			if (count($tmparray1) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)

+			{

@@ -739,3 +580 @@
-			if (!getDolGlobalString('MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL')) {

-				$conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL = 10;

-			}

+			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL = 10;

@@ -743 +582,2 @@
-			if (count($tmparray2) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL) {

+			if (count($tmparray2) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL)

+			{

@@ -748,3 +588 @@
-			if (!getDolGlobalString('MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL')) {

-				$conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL = 10;

-			}

+			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL = 10;

@@ -752 +590,2 @@
-			if (count($tmparray3) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL) {

+			if (count($tmparray3) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL)

+			{

@@ -757,4 +596,3 @@
-			if (!getDolGlobalString('MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL')) {

-				$conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL = 10;

-			}

-			if ((count($tmparray1) + count($tmparray2) + count($tmparray3)) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL) {

+			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL = 10;

+			if ((count($tmparray1) + count($tmparray2) + count($tmparray3)) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)

+			{

@@ -770,2 +607,0 @@
-			$keyforsmtpauthtype = 'MAIN_MAIL_SMTPS_AUTH_TYPE';

-			$keyforsmtpoauthservice = 'MAIN_MAIL_SMTPS_OAUTH_SERVICE';

@@ -774,15 +610,15 @@
-			$keyforsslseflsigned = 'MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED';

-			if (!empty($this->sendcontext)) {

-				$smtpContextKey = strtoupper($this->sendcontext);

-				$smtpContextSendMode = getDolGlobalString('MAIN_MAIL_SENDMODE_'.$smtpContextKey);

-				if (!empty($smtpContextSendMode) && $smtpContextSendMode != 'default') {

-					$keyforsmtpserver = 'MAIN_MAIL_SMTP_SERVER_'.$smtpContextKey;

-					$keyforsmtpport   = 'MAIN_MAIL_SMTP_PORT_'.$smtpContextKey;

-					$keyforsmtpid     = 'MAIN_MAIL_SMTPS_ID_'.$smtpContextKey;

-					$keyforsmtppw     = 'MAIN_MAIL_SMTPS_PW_'.$smtpContextKey;

-					$keyforsmtpauthtype = 'MAIN_MAIL_SMTPS_AUTH_TYPE_'.$smtpContextKey;

-					$keyforsmtpoauthservice = 'MAIN_MAIL_SMTPS_OAUTH_SERVICE_'.$smtpContextKey;

-					$keyfortls        = 'MAIN_MAIL_EMAIL_TLS_'.$smtpContextKey;

-					$keyforstarttls   = 'MAIN_MAIL_EMAIL_STARTTLS_'.$smtpContextKey;

-					$keyforsslseflsigned = 'MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_'.$smtpContextKey;

-				}

+			if ($this->sendcontext == 'emailing' && !empty($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && $conf->global->MAIN_MAIL_SENDMODE_EMAILING != 'default')

+			{

+				$keyforsmtpserver = 'MAIN_MAIL_SMTP_SERVER_EMAILING';

+				$keyforsmtpport  = 'MAIN_MAIL_SMTP_PORT_EMAILING';

+				$keyforsmtpid    = 'MAIN_MAIL_SMTPS_ID_EMAILING';

+				$keyforsmtppw    = 'MAIN_MAIL_SMTPS_PW_EMAILING';

+				$keyfortls       = 'MAIN_MAIL_EMAIL_TLS_EMAILING';

+				$keyforstarttls  = 'MAIN_MAIL_EMAIL_STARTTLS_EMAILING';

+			}

+

+			if (!empty($conf->global->MAIN_MAIL_FORCE_SENDTO))

+			{

+				$this->addr_to = $conf->global->MAIN_MAIL_FORCE_SENDTO;

+				$this->addr_cc = '';

+				$this->addr_bcc = '';

@@ -792 +628,2 @@
-			if ($this->sendmode == 'mail') {

+			if ($this->sendmode == 'mail')

+			{

@@ -796 +633 @@
-				//dol_syslog("CMailFile::sendfile header=\n".$this->headers, LOG_DEBUG);

+				dol_syslog("CMailFile::sendfile header=\n".$this->headers, LOG_DEBUG);

@@ -800,4 +637,3 @@
-				if (isset($_SERVER["WINDIR"])) {

-					if (empty($this->addr_from)) {

-						$this->addr_from = 'robot@example.com';

-					}

+				if (isset($_SERVER["WINDIR"]))

+				{

+					if (empty($this->addr_from)) $this->addr_from = 'robot@example.com';

@@ -808,7 +644,3 @@
-				//dol_syslog("CMailFile::sendfile conf->global->".$keyforsmtpserver."=".getDolGlobalString($keyforsmtpserver)." cpnf->global->".$keyforsmtpport."=".$conf->global->$keyforsmtpport, LOG_DEBUG);

-				if (getDolGlobalString($keyforsmtpserver)) {

-					ini_set('SMTP', getDolGlobalString($keyforsmtpserver));

-				}

-				if (getDolGlobalString($keyforsmtpport)) {

-					ini_set('smtp_port', getDolGlobalString($keyforsmtpport));

-				}

+				//dol_syslog("CMailFile::sendfile conf->global->".$keyforsmtpserver."=".$conf->global->$keyforsmtpserver." cpnf->global->".$keyforsmtpport."=".$conf->global->$keyforsmtpport, LOG_DEBUG);

+				if (!empty($conf->global->$keyforsmtpserver)) ini_set('SMTP', $conf->global->$keyforsmtpserver);

+				if (!empty($conf->global->$keyforsmtpport))   ini_set('smtp_port', $conf->global->$keyforsmtpport);

@@ -817 +649,2 @@
-				if ($res && !$this->subject) {

+				if ($res && !$this->subject)

+				{

@@ -823 +656,2 @@
-				if ($res && !$dest) {

+				if ($res && !$dest)

+				{

@@ -829 +663,2 @@
-				if ($res) {

+				if ($res)

+				{

@@ -831,4 +666,4 @@
-					if (getDolGlobalString('MAIN_MAIL_ALLOW_SENDMAIL_F')) {

-						// When using the phpmail function, the mail command may force the from to the user of the login, for example: linuxuser@myserver.mydomain.com

-						// You can try to set this option to have the command use the From. if it does not work, you can also try the MAIN_MAIL_SENDMAIL_FORCE_BA.

-						// So forcing using the option -f of sendmail is possible if constant MAIN_MAIL_ALLOW_SENDMAIL_F is defined.

+					if (!empty($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F))

+					{

+						// le "Return-Path" (retour des messages bounced) dans les header ne fonctionne pas avec tous les MTA

+						// Le forcage de la valeur grace à l'option -f de sendmail est donc possible si la constante MAIN_MAIL_ALLOW_SENDMAIL_F est definie.

@@ -837 +672 @@
-						$additionnalparam .= ($additionnalparam ? ' ' : '').(getDolGlobalString('MAIN_MAIL_ERRORS_TO') ? '-f'.$this->getValidAddress($conf->global->MAIN_MAIL_ERRORS_TO, 2) : ($this->addr_from != '' ? '-f'.$this->getValidAddress($this->addr_from, 2) : ''));

+						$additionnalparam .= ($additionnalparam ? ' ' : '').(!empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f'.$this->getValidAddress($conf->global->MAIN_MAIL_ERRORS_TO, 2) : ($this->addr_from != '' ? '-f'.$this->getValidAddress($this->addr_from, 2) : ''));

@@ -839 +674,2 @@
-					if (getDolGlobalString('MAIN_MAIL_SENDMAIL_FORCE_BA')) {    // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender

+					if (!empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA))    // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender

+					{

@@ -843,13 +679,3 @@
-					if (getDolGlobalString('MAIN_MAIL_SENDMAIL_FORCE_ADDPARAM')) {

-						$additionnalparam .= ($additionnalparam ? ' ' : '').'-U '.$additionnalparam; // Use -U to add additionnal params

-					}

-

-					$linuxlike = 1;

-					if (preg_match('/^win/i', PHP_OS)) {

-						$linuxlike = 0;

-					}

-					if (preg_match('/^mac/i', PHP_OS)) {

-						$linuxlike = 0;

-					}

-

-					dol_syslog("CMailFile::sendfile: mail start".($linuxlike ? '' : " HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port')).", additionnal_parameters=".$additionnalparam, LOG_DEBUG);

+					if (!empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_ADDPARAM)) $additionnalparam .= ($additionnalparam ? ' ' : '').'-U '.$additionnalparam; // Use -U to add additionnal params

+

+					dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port').", additionnal_parameters=".$additionnalparam, LOG_DEBUG);

@@ -859,3 +685 @@
-					if (getDolGlobalString('MAIN_MAIL_DEBUG')) {

-						$this->dump_mail();

-					}

+					if (!empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();

@@ -869,7 +693,5 @@
-					if (!empty($additionnalparam)) {

-						$res = mail($dest, $subjecttouse, $this->message, $this->headers, $additionnalparam);

-					} else {

-						$res = mail($dest, $subjecttouse, $this->message, $this->headers);

-					}

-

-					if (!$res) {

+					if (!empty($additionnalparam)) $res = mail($dest, $subjecttouse, $this->message, $this->headers, $additionnalparam);

+					else $res = mail($dest, $subjecttouse, $this->message, $this->headers);

+

+					if (!$res)

+					{

@@ -878 +700,5 @@
-						if (!$linuxlike) {

+						$linuxlike = 1;

+						if (preg_match('/^win/i', PHP_OS)) $linuxlike = 0;

+						if (preg_match('/^mac/i', PHP_OS)) $linuxlike = 0;

+						if (!$linuxlike)

+						{

@@ -884,5 +710,3 @@
-

-						if (getDolGlobalString('MAIN_MAIL_DEBUG')) {

-							$this->save_dump_mail_in_err('Mail with topic '.$this->subject);

-						}

-					} else {

+					}

+					else

+					{

@@ -893 +717,2 @@
-				if (isset($_SERVER["WINDIR"])) {

+				if (isset($_SERVER["WINDIR"]))

+				{

@@ -898,9 +723,8 @@
-				if (getDolGlobalString($keyforsmtpserver)) {

-					ini_restore('SMTP');

-				}

-				if (getDolGlobalString($keyforsmtpport)) {

-					ini_restore('smtp_port');

-				}

-			} elseif ($this->sendmode == 'smtps') {

-				if (!is_object($this->smtps)) {

-					$this->error = "Failed to send mail with smtps lib<br>Constructor of object CMailFile was not initialized without errors.";

+				if (!empty($conf->global->$keyforsmtpserver))	ini_restore('SMTP');

+				if (!empty($conf->global->$keyforsmtpport)) 	ini_restore('smtp_port');

+			}

+			elseif ($this->sendmode == 'smtps')

+			{

+				if (!is_object($this->smtps))

+				{

+					$this->error = "Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>Constructor of object CMailFile was not initialized without errors.";

@@ -916,6 +740,2 @@
-				if (empty($conf->global->$keyforsmtpserver)) {

-					$conf->global->$keyforsmtpserver = ini_get('SMTP');

-				}

-				if (empty($conf->global->$keyforsmtpport)) {

-					$conf->global->$keyforsmtpport = ini_get('smtp_port');

-				}

+				if (empty($conf->global->$keyforsmtpserver)) $conf->global->$keyforsmtpserver = ini_get('SMTP');

+				if (empty($conf->global->$keyforsmtpport))   $conf->global->$keyforsmtpport = ini_get('smtp_port');

@@ -924 +744 @@
-				$server = getDolGlobalString($keyforsmtpserver);

+				$server = $conf->global->$keyforsmtpserver;

@@ -926,6 +746,2 @@
-				if (!empty($conf->global->$keyfortls) && function_exists('openssl_open')) {

-					$secure = 'ssl';

-				}

-				if (!empty($conf->global->$keyforstarttls) && function_exists('openssl_open')) {

-					$secure = 'tls';

-				}

+				if (!empty($conf->global->$keyfortls) && function_exists('openssl_open')) $secure = 'ssl';

+				if (!empty($conf->global->$keyforstarttls) && function_exists('openssl_open')) $secure = 'tls';

@@ -934 +750 @@
-				$port = getDolGlobalInt($keyforsmtpport);

+				$port = $conf->global->$keyforsmtpport;

@@ -939,3 +755,3 @@
-				$loginid = '';

-				$loginpass = '';

-				if (!empty($conf->global->$keyforsmtpid)) {

+				$loginid = ''; $loginpass = '';

+				if (!empty($conf->global->$keyforsmtpid))

+				{

@@ -945 +761,2 @@
-				if (!empty($conf->global->$keyforsmtppw)) {

+				if (!empty($conf->global->$keyforsmtppw))

+				{

@@ -950,61 +766,0 @@
-				if (getDolGlobalString($keyforsmtpauthtype) === "XOAUTH2") {

-					require_once DOL_DOCUMENT_ROOT.'/core/lib/oauth.lib.php'; // define $supportedoauth2array

-

-					$supportedoauth2array = getSupportedOauth2Array();

-

-					$keyforsupportedoauth2array = getDolGlobalString($keyforsmtpoauthservice);

-					if (preg_match('/^.*-/', $keyforsupportedoauth2array)) {

-						$keyforprovider = preg_replace('/^.*-/', '', $keyforsupportedoauth2array);

-					} else {

-						$keyforprovider = '';

-					}

-					$keyforsupportedoauth2array = preg_replace('/-.*$/', '', $keyforsupportedoauth2array);

-					$keyforsupportedoauth2array = 'OAUTH_'.$keyforsupportedoauth2array.'_NAME';

-

-					if (!empty($supportedoauth2array)) {

-						$OAUTH_SERVICENAME = (empty($supportedoauth2array[$keyforsupportedoauth2array]['name']) ? 'Unknown' : $supportedoauth2array[$keyforsupportedoauth2array]['name'].($keyforprovider ? '-'.$keyforprovider : ''));

-					} else {

-						$OAUTH_SERVICENAME = 'Unknown';

-					}

-

-					require_once DOL_DOCUMENT_ROOT.'/includes/OAuth/bootstrap.php';

-

-					$storage = new DoliStorage($db, $conf, $keyforprovider);

-					try {

-						$tokenobj = $storage->retrieveAccessToken($OAUTH_SERVICENAME);

-						$expire = false;

-						// Is token expired or will token expire in the next 30 seconds

-						if (is_object($tokenobj)) {

-							$expire = ($tokenobj->getEndOfLife() !== -9002 && $tokenobj->getEndOfLife() !== -9001 && time() > ($tokenobj->getEndOfLife() - 30));

-						}

-						// Token expired so we refresh it

-						if (is_object($tokenobj) && $expire) {

-							$credentials = new Credentials(

-								getDolGlobalString('OAUTH_'.getDolGlobalString('MAIN_MAIL_SMTPS_OAUTH_SERVICE').'_ID'),

-								getDolGlobalString('OAUTH_'.getDolGlobalString('MAIN_MAIL_SMTPS_OAUTH_SERVICE').'_SECRET'),

-								getDolGlobalString('OAUTH_'.getDolGlobalString('MAIN_MAIL_SMTPS_OAUTH_SERVICE').'_URLAUTHORIZE')

-							);

-							$serviceFactory = new \OAuth\ServiceFactory();

-							$oauthname = explode('-', $OAUTH_SERVICENAME);

-							// ex service is Google-Emails we need only the first part Google

-							$apiService = $serviceFactory->createService($oauthname[0], $credentials, $storage, array());

-							// We have to save the token because Google give it only once

-							$refreshtoken = $tokenobj->getRefreshToken();

-							$tokenobj = $apiService->refreshAccessToken($tokenobj);

-							$tokenobj->setRefreshToken($refreshtoken);

-							$storage->storeAccessToken($OAUTH_SERVICENAME, $tokenobj);

-						}

-

-						$tokenobj = $storage->retrieveAccessToken($OAUTH_SERVICENAME);

-						if (is_object($tokenobj)) {

-							$this->smtps->setToken($tokenobj->getAccessToken());

-						} else {

-							$this->error = "Token not found";

-						}

-					} catch (Exception $e) {

-						// Return an error if token not found

-						$this->error = $e->getMessage();

-						dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);

-					}

-				}

-

@@ -1013,2 +769,3 @@
-				if ($res && !$from) {

-					$this->error = "Failed to send mail with smtps lib to HOST=".$server.", PORT=" . getDolGlobalString($keyforsmtpport)." - Sender address '$from' invalid";

+				if ($res && !$from)

+				{

+					$this->error = "Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>Sender address '$from' invalid";

@@ -1019,2 +776,3 @@
-				if ($res && !$dest) {

-					$this->error = "Failed to send mail with smtps lib to HOST=".$server.", PORT=" . getDolGlobalString($keyforsmtpport)." - Recipient address '$dest' invalid";

+				if ($res && !$dest)

+				{

+					$this->error = "Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>Recipient address '$dest' invalid";

@@ -1025,6 +783,3 @@
-				if ($res) {

-					dol_syslog("CMailFile::sendfile: sendMsg, HOST=".$server.", PORT=" . getDolGlobalString($keyforsmtpport), LOG_DEBUG);

-

-					if (getDolGlobalString('MAIN_MAIL_DEBUG')) {

-						$this->smtps->setDebug(true);

-					}

+				if ($res)

+				{

+					if (!empty($conf->global->MAIN_MAIL_DEBUG)) $this->smtps->setDebug(true);

@@ -1033,27 +788,7 @@
-

-					if (getDolGlobalString('MAIN_MAIL_DEBUG')) {

-						$this->dump_mail();

-					}

-

-					$smtperrorcode = 0;

-					if (! $result) {

-						$smtperrorcode = $this->smtps->lastretval;	// SMTP error code

-						dol_syslog("CMailFile::sendfile: mail SMTP error code ".$smtperrorcode, LOG_WARNING);

-

-						if ($smtperrorcode == '421') {	// Try later

-							// TODO Add a delay and try again

-							/*

-							dol_syslog("CMailFile::sendfile: Try later error, so we wait and we retry");

-							sleep(2);

-

-							$result = $this->smtps->sendMsg();

-

-							if (!empty($conf->global->MAIN_MAIL_DEBUG)) {

-								$this->dump_mail();

-							}

-							*/

-						}

-					}

-

-					$result = $this->smtps->getErrors();	// applicative error code (not SMTP error code)

-					if (empty($this->error) && empty($result)) {

+					//print $result;

+

+					if (!empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();

+

+					$result = $this->smtps->getErrors();

+					if (empty($this->error) && empty($result))

+					{

@@ -1062,5 +797,5 @@
-					} else {

-						if (empty($this->error)) {

-							$this->error = $result;

-						}

-						dol_syslog("CMailFile::sendfile: mail end error with smtps lib to HOST=".$server.", PORT=" . getDolGlobalString($keyforsmtpport)." - ".$this->error, LOG_ERR);

+					}

+					else

+					{

+						if (empty($this->error)) $this->error = $result;

+						dol_syslog("CMailFile::sendfile: mail end error with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>".$this->error, LOG_ERR);

@@ -1068,4 +802,0 @@
-

-						if (getDolGlobalString('MAIN_MAIL_DEBUG')) {

-							$this->save_dump_mail_in_err('Mail smtp error '.$smtperrorcode.' with topic '.$this->subject);

-						}

@@ -1074,4 +805,6 @@
-			} elseif ($this->sendmode == 'swiftmailer') {

-				// Use Swift Mailer library

-				// ------------------------------------------

-				require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/swift_required.php';

+			}

+			elseif ($this->sendmode == 'swiftmailer')

+			{

+                // Use Swift Mailer library

+                // ------------------------------------------

+                require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/swift_required.php';

@@ -1080,6 +813,2 @@
-				if (empty($conf->global->$keyforsmtpserver)) {

-					$conf->global->$keyforsmtpserver = ini_get('SMTP');

-				}

-				if (empty($conf->global->$keyforsmtpport)) {

-					$conf->global->$keyforsmtpport = ini_get('smtp_port');

-				}

+				if (empty($conf->global->$keyforsmtpserver)) $conf->global->$keyforsmtpserver = ini_get('SMTP');

+				if (empty($conf->global->$keyforsmtpport))   $conf->global->$keyforsmtpport = ini_get('smtp_port');

@@ -1088 +817 @@
-				$server = getDolGlobalString($keyforsmtpserver);

+				$server = $conf->global->$keyforsmtpserver;

@@ -1090,79 +819,7 @@
-				if (!empty($conf->global->$keyfortls) && function_exists('openssl_open')) {

-					$secure = 'ssl';

-				}

-				if (!empty($conf->global->$keyforstarttls) && function_exists('openssl_open')) {

-					$secure = 'tls';

-				}

-

-				$this->transport = new Swift_SmtpTransport($server, getDolGlobalString($keyforsmtpport), $secure);

-

-				if (!empty($conf->global->$keyforsmtpid)) {

-					$this->transport->setUsername($conf->global->$keyforsmtpid);

-				}

-				if (!empty($conf->global->$keyforsmtppw) && getDolGlobalString($keyforsmtpauthtype) != "XOAUTH2") {

-					$this->transport->setPassword($conf->global->$keyforsmtppw);

-				}

-				if (getDolGlobalString($keyforsmtpauthtype) === "XOAUTH2") {

-					require_once DOL_DOCUMENT_ROOT.'/core/lib/oauth.lib.php';

-

-					$supportedoauth2array = getSupportedOauth2Array();

-

-					$keyforsupportedoauth2array = getDolGlobalString($keyforsmtpoauthservice);

-					if (preg_match('/^.*-/', $keyforsupportedoauth2array)) {

-						$keyforprovider = preg_replace('/^.*-/', '', $keyforsupportedoauth2array);

-					} else {

-						$keyforprovider = '';

-					}

-					$keyforsupportedoauth2array = preg_replace('/-.*$/', '', $keyforsupportedoauth2array);

-					$keyforsupportedoauth2array = 'OAUTH_'.$keyforsupportedoauth2array.'_NAME';

-

-					$OAUTH_SERVICENAME = 'Unknown';

-					if (array_key_exists($keyforsupportedoauth2array, $supportedoauth2array)

-						&& array_key_exists('name', $supportedoauth2array[$keyforsupportedoauth2array])

-						&& !empty($supportedoauth2array[$keyforsupportedoauth2array]['name'])) {

-						$OAUTH_SERVICENAME = $supportedoauth2array[$keyforsupportedoauth2array]['name'].(!empty($keyforprovider) ? '-'.$keyforprovider : '');

-					}

-

-					require_once DOL_DOCUMENT_ROOT.'/includes/OAuth/bootstrap.php';

-

-					$storage = new DoliStorage($db, $conf, $keyforprovider);

-

-					try {

-						$tokenobj = $storage->retrieveAccessToken($OAUTH_SERVICENAME);

-						$expire = false;

-						// Is token expired or will token expire in the next 30 seconds

-						if (is_object($tokenobj)) {

-							$expire = ($tokenobj->getEndOfLife() !== -9002 && $tokenobj->getEndOfLife() !== -9001 && time() > ($tokenobj->getEndOfLife() - 30));

-						}

-						// Token expired so we refresh it

-						if (is_object($tokenobj) && $expire) {

-							$credentials = new Credentials(

-								getDolGlobalString('OAUTH_'.getDolGlobalString('MAIN_MAIL_SMTPS_OAUTH_SERVICE').'_ID'),

-								getDolGlobalString('OAUTH_'.getDolGlobalString('MAIN_MAIL_SMTPS_OAUTH_SERVICE').'_SECRET'),

-								getDolGlobalString('OAUTH_'.getDolGlobalString('MAIN_MAIL_SMTPS_OAUTH_SERVICE').'_URLAUTHORIZE')

-							);

-							$serviceFactory = new \OAuth\ServiceFactory();

-							$oauthname = explode('-', $OAUTH_SERVICENAME);

-							// ex service is Google-Emails we need only the first part Google

-							$apiService = $serviceFactory->createService($oauthname[0], $credentials, $storage, array());

-							// We have to save the token because Google give it only once

-							$refreshtoken = $tokenobj->getRefreshToken();

-							$tokenobj = $apiService->refreshAccessToken($tokenobj);

-							$tokenobj->setRefreshToken($refreshtoken);

-							$storage->storeAccessToken($OAUTH_SERVICENAME, $tokenobj);

-						}

-						if (is_object($tokenobj)) {

-							$this->transport->setAuthMode('XOAUTH2');

-							$this->transport->setPassword($tokenobj->getAccessToken());

-						} else {

-							$this->errors[] = "Token not found";

-						}

-					} catch (Exception $e) {

-						// Return an error if token not found

-						$this->errors[] = $e->getMessage();

-						dol_syslog("CMailFile::sendfile: mail end error=".$e->getMessage(), LOG_ERR);

-					}

-				}

-				if (getDolGlobalString($keyforsslseflsigned)) {

-					$this->transport->setStreamOptions(array('ssl' => array('allow_self_signed' => true, 'verify_peer' => false)));

-				}

+				if (!empty($conf->global->$keyfortls) && function_exists('openssl_open')) $secure = 'ssl';

+				if (!empty($conf->global->$keyforstarttls) && function_exists('openssl_open')) $secure = 'tls';

+

+				$this->transport = new Swift_SmtpTransport($server, $conf->global->$keyforsmtpport, $secure);

+

+				if (!empty($conf->global->$keyforsmtpid)) $this->transport->setUsername($conf->global->$keyforsmtpid);

+				if (!empty($conf->global->$keyforsmtppw)) $this->transport->setPassword($conf->global->$keyforsmtppw);

@@ -1172,2 +829,2 @@
-				$contentEncoderBase64 = new Swift_Mime_ContentEncoder_Base64ContentEncoder();

-				$this->message->setEncoder($contentEncoderBase64);

+                $contentEncoderBase64 = new Swift_Mime_ContentEncoder_Base64ContentEncoder();

+                $this->message->setEncoder($contentEncoderBase64);

@@ -1178,10 +835,10 @@
-				// DKIM SIGN

-				if (getDolGlobalString('MAIN_MAIL_EMAIL_DKIM_ENABLED')) {

-					$privateKey = $conf->global->MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY;

-					$domainName = $conf->global->MAIN_MAIL_EMAIL_DKIM_DOMAIN;

-					$selector = $conf->global->MAIN_MAIL_EMAIL_DKIM_SELECTOR;

-					$signer = new Swift_Signers_DKIMSigner($privateKey, $domainName, $selector);

-					$this->message->attachSigner($signer->ignoreHeader('Return-Path'));

-				}

-

-				if (getDolGlobalString('MAIN_MAIL_DEBUG')) {

+                // DKIM SIGN

+                if ($conf->global->MAIN_MAIL_EMAIL_DKIM_ENABLED) {

+                    $privateKey = $conf->global->MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY;

+                    $domainName = $conf->global->MAIN_MAIL_EMAIL_DKIM_DOMAIN;

+                    $selector = $conf->global->MAIN_MAIL_EMAIL_DKIM_SELECTOR;

+                    $signer = new Swift_Signers_DKIMSigner($privateKey, $domainName, $selector);

+                    $this->message->attachSigner($signer->ignoreHeader('Return-Path'));

+                }

+

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

@@ -1194,3 +850,0 @@
-

-				dol_syslog("CMailFile::sendfile: mailer->send, HOST=".$server.", PORT=" . getDolGlobalString($keyforsmtpport), LOG_DEBUG);

-

@@ -1198 +851,0 @@
-				$failedRecipients = array();

@@ -1200 +853 @@
-					$result = $this->mailer->send($this->message, $failedRecipients);

+					$result = $this->mailer->send($this->message);

@@ -1202,5 +855,3 @@
-					$this->errors[] = $e->getMessage();

-				}

-				if (getDolGlobalString('MAIN_MAIL_DEBUG')) {

-					$this->dump_mail();

-				}

+					$this->error = $e->getMessage();

+				}

+				if (!empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();

@@ -1209,4 +860 @@
-				if (!empty($this->error) || !empty($this->errors) || !$result) {

-					if (!empty($failedRecipients)) {

-						$this->errors[] = 'Transport failed for the following addresses: "' . join('", "', $failedRecipients) . '".';

-					}

+				if (!empty($this->error) || !$result) {

@@ -1215,5 +863,3 @@
-

-					if (getDolGlobalString('MAIN_MAIL_DEBUG')) {

-						$this->save_dump_mail_in_err('Mail with topic '.$this->subject);

-					}

-				} else {

+				}

+				else

+				{

@@ -1222 +868,3 @@
-			} else {

+			}

+			else

+			{

@@ -1229,9 +877 @@
-			// Now we delete image files that were created dynamically to manage data inline files

-			foreach ($this->html_images as $val) {

-				if (!empty($val['type']) && $val['type'] == 'cidfromdata') {

-					//dol_delete($val['fullpath']);

-				}

-			}

-

-			$parameters = array('sent' => $res);

-			$action = '';

+			$parameters = array(); $action = '';

@@ -1239 +879,2 @@
-			if ($reshook < 0) {

+			if ($reshook < 0)

+			{

@@ -1245 +886,3 @@
-		} else {

+		}

+		else

+		{

@@ -1250,0 +894 @@
+

@@ -1266 +910 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -1271 +915 @@
-	 * @return 	int|string			    Return integer <0 if KO, encoded string if OK

+	 * @return 	int					    <0 if KO, encoded string if OK

@@ -1275 +919 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -1278 +922,2 @@
-		if (is_readable($newsourcefile)) {

+		if (is_readable($newsourcefile))

+		{

@@ -1282,3 +927,5 @@
-		} else {

-			$this->error = "Error in _encode_file() method: Can't read file '".$sourcefile."'";

-			dol_syslog("CMailFile::_encode_file: ".$this->error, LOG_ERR);

+		}

+		else

+		{

+			$this->error = "Error: Can't read file '".$sourcefile."' into _encode_file";

+			dol_syslog("CMailFile::encode_file: ".$this->error, LOG_ERR);

@@ -1290 +937 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -1300 +947 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -1303 +950,2 @@
-		if (@is_writeable($dolibarr_main_data_root)) {	// Avoid fatal error on fopen with open_basedir

+		if (@is_writeable($dolibarr_main_data_root))	// Avoid fatal error on fopen with open_basedir

+		{

@@ -1305,3 +953,4 @@
-			$fp = fopen($outputfile, "w");	// overwrite

-

-			if ($this->sendmode == 'mail') {

+			$fp = fopen($outputfile, "w");

+

+			if ($this->sendmode == 'mail')

+			{

@@ -1311 +960,3 @@
-			} elseif ($this->sendmode == 'smtps') {

+			}

+			elseif ($this->sendmode == 'smtps')

+			{

@@ -1313 +964,3 @@
-			} elseif ($this->sendmode == 'swiftmailer') {

+			}

+			elseif ($this->sendmode == 'swiftmailer')

+			{

@@ -1318,52 +971,2 @@
-			dolChmod($outputfile);

-

-			// Move dolibarr_mail.log into a dolibarr_mail.YYYYMMDD.log

-			if (getDolGlobalString('MAIN_MAIL_DEBUG_LOG_WITH_DATE')) {

-				$destfile = $dolibarr_main_data_root."/dolibarr_mail.".dol_print_date(dol_now(), 'dayhourlog', 'gmt').".log";

-

-				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

-				dol_move($outputfile, $destfile, 0, 1, 0, 0);

-			}

-		}

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 *  Save content if mail is in error

-	 *  Used for debugging.

-	 *

-	 *  @param	string		$message		Add also a message

-	 *  @return	void

-	 */

-	public function save_dump_mail_in_err($message = '')

-	{

-		global $dolibarr_main_data_root;

-

-		if (@is_writeable($dolibarr_main_data_root)) {	// Avoid fatal error on fopen with open_basedir

-			$srcfile = $dolibarr_main_data_root."/dolibarr_mail.log";

-

-			// Add message to dolibarr_mail.log. We do not use dol_syslog() on purpose,

-			// to be sure to write into dolibarr_mail.log

-			if ($message) {

-				// Test constant SYSLOG_FILE_NO_ERROR (should stay a constant defined with define('SYSLOG_FILE_NO_ERROR',1);

-				if (defined('SYSLOG_FILE_NO_ERROR')) {

-					$filefd = @fopen($srcfile, 'a+');

-				} else {

-					$filefd = fopen($srcfile, 'a+');

-				}

-				if ($filefd) {

-					fwrite($filefd, $message."\n");

-					fclose($filefd);

-					dolChmod($srcfile);

-				}

-			}

-

-			// Move dolibarr_mail.log into a dolibarr_mail.err or dolibarr_mail.date.err

-			if (getDolGlobalString('MAIN_MAIL_DEBUG_ERR_WITH_DATE')) {

-				$destfile = $dolibarr_main_data_root."/dolibarr_mail.".dol_print_date(dol_now(), 'dayhourlog', 'gmt').".err";

-			} else {

-				$destfile = $dolibarr_main_data_root."/dolibarr_mail.err";

-			}

-

-			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

-			dol_move($srcfile, $destfile, 0, 1, 0, 0);

+			if (!empty($conf->global->MAIN_UMASK))

+				@chmod($outputfile, octdec($conf->global->MAIN_UMASK));

@@ -1382 +985,2 @@
-		if (!preg_match('/^[\s\t]*<html/i', $msg)) {

+		if (!preg_match('/^[\s\t]*<html/i', $msg))

+		{

@@ -1384,3 +988 @@
-			if (!empty($this->styleCSS)) {

-				$out .= $this->styleCSS;

-			}

+			if (!empty($this->styleCSS)) $out .= $this->styleCSS;

@@ -1388,3 +990 @@
-			if (!empty($this->bodyCSS)) {

-				$out .= $this->bodyCSS;

-			}

+			if (!empty($this->bodyCSS)) $out .= $this->bodyCSS;

@@ -1394 +994,3 @@
-		} else {

+		}

+		else

+		{

@@ -1404 +1006 @@
-	 * @return void

+	 * @return string

@@ -1408 +1010,2 @@
-		if (!empty($this->css)) {

+		if (!empty($this->css))

+		{

@@ -1413 +1016,2 @@
-			if ($this->css['bgcolor']) {

+			if ($this->css['bgcolor'])

+			{

@@ -1417 +1021,2 @@
-			if ($this->css['bgimage']) {

+			if ($this->css['bgimage'])

+			{

@@ -1427 +1032 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -1435 +1040 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -1444 +1049,2 @@
-		if (getDolGlobalString('MAIN_MAIL_SENDMAIL_FORCE_BA')) {

+		if (!empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA))

+		{

@@ -1449,6 +1055,2 @@
-		if (isset($this->reply_to) && $this->reply_to) {

-			$out .= "Reply-To: ".$this->getValidAddress($this->reply_to, 2).$this->eol2;

-		}

-		if (isset($this->errors_to) && $this->errors_to) {

-			$out .= "Errors-To: ".$this->getValidAddress($this->errors_to, 2).$this->eol2;

-		}

+		if (isset($this->reply_to) && $this->reply_to)  $out .= "Reply-To: ".$this->getValidAddress($this->reply_to, 2).$this->eol2;

+		if (isset($this->errors_to) && $this->errors_to) $out .= "Errors-To: ".$this->getValidAddress($this->errors_to, 2).$this->eol2;

@@ -1457,6 +1059,2 @@
-		if (isset($this->addr_cc) && $this->addr_cc) {

-			$out .= "Cc: ".$this->getValidAddress($this->addr_cc, 2).$this->eol2;

-		}

-		if (isset($this->addr_bcc) && $this->addr_bcc) {

-			$out .= "Bcc: ".$this->getValidAddress($this->addr_bcc, 2).$this->eol2; // TODO Question: bcc must not be into header, only into SMTP command "RCPT TO". Does php mail support this ?

-		}

+		if (isset($this->addr_cc) && $this->addr_cc)   $out .= "Cc: ".$this->getValidAddress($this->addr_cc, 2).$this->eol2;

+		if (isset($this->addr_bcc) && $this->addr_bcc)  $out .= "Bcc: ".$this->getValidAddress($this->addr_bcc, 2).$this->eol2; // TODO Question: bcc must not be into header, only into SMTP command "RCPT TO". Does php mail support this ?

@@ -1465,3 +1063 @@
-		if (isset($this->deliveryreceipt) && $this->deliveryreceipt == 1) {

-			$out .= "Disposition-Notification-To: ".$this->getValidAddress($this->addr_from, 2).$this->eol2;

-		}

+		if (isset($this->deliveryreceipt) && $this->deliveryreceipt == 1) $out .= "Disposition-Notification-To: ".$this->getValidAddress($this->addr_from, 2).$this->eol2;

@@ -1474 +1070,2 @@
-		if ($trackid) {

+		if ($trackid)

+		{

@@ -1478 +1075 @@
-			//$out .= 'References: <'.$this->msgid.">".$this->eol2;

+			$out .= 'References: <'.$this->msgid.">".$this->eol2;

@@ -1480 +1077,3 @@
-		} else {

+		}

+		else

+		{

@@ -1485,3 +1084 @@
-		if (!empty($_SERVER['REMOTE_ADDR'])) {

-			$out .= "X-RemoteAddr: ".$_SERVER['REMOTE_ADDR'].$this->eol2;

-		}

+		if (!empty($_SERVER['REMOTE_ADDR'])) $out .= "X-RemoteAddr: ".$_SERVER['REMOTE_ADDR'].$this->eol2;

@@ -1501 +1098 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -1511 +1108 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -1515 +1112,2 @@
-		if (is_array($filename_list)) {

+		if (is_array($filename_list))

+		{

@@ -1517,5 +1115,5 @@
-			for ($i = 0; $i < $filename_list_size; $i++) {

-				if ($filename_list[$i]) {

-					if ($mimefilename_list[$i]) {

-						$filename_list[$i] = $mimefilename_list[$i];

-					}

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

+			{

+				if ($filename_list[$i])

+				{

+					if ($mimefilename_list[$i]) $filename_list[$i] = $mimefilename_list[$i];

@@ -1531 +1129 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -1540 +1138 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -1547 +1145,2 @@
-		if ($this->atleastoneimage) {

+		if ($this->atleastoneimage)

+		{

@@ -1555 +1154,2 @@
-		if (getDolGlobalString('MAIN_FIX_FOR_BUGGED_MTA')) {

+		if (!empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))

+		{

@@ -1560 +1160,2 @@
-		if ($this->msgishtml) {

+		if ($this->msgishtml)

+		{

@@ -1563,3 +1164,2 @@
-			// TODO We could replace <img ...> with [Filename.ext] like Gmail do.

-			$strContentAltText = html_entity_decode(strip_tags($strContentAltText));	// Remove any HTML tags

-			$strContentAltText = trim(wordwrap($strContentAltText, 75, !getDolGlobalString('MAIN_FIX_FOR_BUGGED_MTA') ? "\r\n" : "\n"));

+			$strContentAltText = html_entity_decode(strip_tags($strContentAltText));

+			$strContentAltText = trim(wordwrap($strContentAltText, 75, empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA) ? "\r\n" : "\n"));

@@ -1568 +1168 @@
-			$strContent = $this->checkIfHTML($strContent);		// This add a header and a body including custom CSS to the HTML content

+			$strContent = $this->checkIfHTML($strContent);

@@ -1574,4 +1174,6 @@
-		$strContent = rtrim(wordwrap($strContent, 75, !getDolGlobalString('MAIN_FIX_FOR_BUGGED_MTA') ? "\r\n" : "\n")); // TODO Using this method creates unexpected line break on text/plain content.

-

-		if ($this->msgishtml) {

-			if ($this->atleastoneimage) {

+		$strContent = rtrim(wordwrap($strContent, 75, empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA) ? "\r\n" : "\n")); // TODO Using this method creates unexpected line break on text/plain content.

+

+		if ($this->msgishtml)

+		{

+			if ($this->atleastoneimage)

+			{

@@ -1587 +1189,2 @@
-			if (!$this->atleastoneimage && $strContentAltText && getDolGlobalString('MAIN_MAIL_USE_MULTI_PART')) {    // Add plain text message part before html part

+			if (!$this->atleastoneimage && $strContentAltText && !empty($conf->global->MAIN_MAIL_USE_MULTI_PART))    // Add plain text message part before html part

+			{

@@ -1601 +1204,2 @@
-			if (!$this->atleastoneimage && $strContentAltText && getDolGlobalString('MAIN_MAIL_USE_MULTI_PART')) {    // Add plain text message part after html part

+			if (!$this->atleastoneimage && $strContentAltText && !empty($conf->global->MAIN_MAIL_USE_MULTI_PART))    // Add plain text message part after html part

+			{

@@ -1604 +1208,3 @@
-		} else {

+		}

+		else

+		{

@@ -1613 +1219,2 @@
-		if ($this->atleastoneimage) {

+		if ($this->atleastoneimage)

+		{

@@ -1624 +1231 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -1631,4 +1238,3 @@
-	 * @param	array	$cidlist			Array of CID if file must be completed with CID code

-	 * @return	string						String with files encoded

-	 */

-	private function write_files($filename_list, $mimetype_list, $mimefilename_list, $cidlist)

+	 * @return	string						Chaine fichiers encodes

+	 */

+	public function write_files($filename_list, $mimetype_list, $mimefilename_list)

@@ -1636 +1242 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -1640,3 +1246,5 @@
-		for ($i = 0; $i < $filename_list_size; $i++) {

-			if ($filename_list[$i]) {

-				dol_syslog("CMailFile::write_files: i=$i ".$filename_list[$i]);

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

+		{

+			if ($filename_list[$i])

+			{

+				dol_syslog("CMailFile::write_files: i=$i");

@@ -1644,4 +1252,3 @@
-				if ($encoded !== -1) {

-					if ($mimefilename_list[$i]) {

-						$filename_list[$i] = $mimefilename_list[$i];

-					}

+				if ($encoded >= 0)

+				{

+					if ($mimefilename_list[$i]) $filename_list[$i] = $mimefilename_list[$i];

@@ -1657,4 +1263,0 @@
-					if (!empty($cidlist) && is_array($cidlist) && $cidlist[$i]) {

-						$out .= "X-Attachment-Id: ".$cidlist[$i].$this->eol;

-						$out .= "Content-ID: <".$cidlist[$i].'>'.$this->eol;

-					}

@@ -1665 +1268,3 @@
-				} else {

+				}

+				else

+				{

@@ -1675 +1280 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -1684 +1289 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -1687,2 +1292,4 @@
-		if (is_array($images_list)) {

-			foreach ($images_list as $img) {

+		if (is_array($images_list))

+		{

+			foreach ($images_list as $img)

+			{

@@ -1706 +1313 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -1716 +1323 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -1722 +1329,2 @@
-		if (function_exists('fsockopen')) {

+		if (function_exists('fsockopen'))

+		{

@@ -1727,2 +1334,0 @@
-			$keyforsmtpauthtype = 'MAIN_MAIL_SMTPS_AUTH_TYPE';

-			$keyforsmtpoauthservice = 'MAIN_MAIL_SMTPS_OAUTH_SERVICE';

@@ -1731,16 +1337,8 @@
-			$keyforsslseflsigned = 'MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED';

-

-			if (!empty($this->sendcontext)) {

-				$smtpContextKey = strtoupper($this->sendcontext);

-				$smtpContextSendMode = getDolGlobalString('MAIN_MAIL_SENDMODE_'.$smtpContextKey);

-				if (!empty($smtpContextSendMode) && $smtpContextSendMode != 'default') {

-					$keyforsmtpserver = 'MAIN_MAIL_SMTP_SERVER_'.$smtpContextKey;

-					$keyforsmtpport   = 'MAIN_MAIL_SMTP_PORT_'.$smtpContextKey;

-					$keyforsmtpid     = 'MAIN_MAIL_SMTPS_ID_'.$smtpContextKey;

-					$keyforsmtppw     = 'MAIN_MAIL_SMTPS_PW_'.$smtpContextKey;

-					$keyforsmtpauthtype = 'MAIN_MAIL_SMTPS_AUTH_TYPE_'.$smtpContextKey;

-					$keyforsmtpoauthservice = 'MAIN_MAIL_SMTPS_OAUTH_SERVICE_'.$smtpContextKey;

-					$keyfortls        = 'MAIN_MAIL_EMAIL_TLS_'.$smtpContextKey;

-					$keyforstarttls   = 'MAIN_MAIL_EMAIL_STARTTLS_'.$smtpContextKey;

-					$keyforsslseflsigned = 'MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_'.$smtpContextKey;

-				}

+			if ($this->sendcontext == 'emailing' && !empty($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && $conf->global->MAIN_MAIL_SENDMODE_EMAILING != 'default')

+			{

+				$keyforsmtpserver = 'MAIN_MAIL_SMTP_SERVER_EMAILING';

+				$keyforsmtpport  = 'MAIN_MAIL_SMTP_PORT_EMAILING';

+				$keyforsmtpid    = 'MAIN_MAIL_SMTPS_ID_EMAILING';

+				$keyforsmtppw    = 'MAIN_MAIL_SMTPS_PW_EMAILING';

+				$keyfortls       = 'MAIN_MAIL_EMAIL_TLS_EMAILING';

+				$keyforstarttls  = 'MAIN_MAIL_EMAIL_STARTTLS_EMAILING';

@@ -1750,3 +1348 @@
-			if (!empty($conf->global->$keyfortls) && function_exists('openssl_open')) {

-				$host = 'ssl://'.$host;

-			}

+			if (!empty($conf->global->$keyfortls) && function_exists('openssl_open')) $host = 'ssl://'.$host;

@@ -1754,3 +1350,3 @@
-			//if (!empty($conf->global->MAIN_MAIL_EMAIL_STARTTLS) && function_exists('openssl_open')) $host='tls://'.$host;

-

-			dol_syslog("Try socket connection to host=".$host." port=".$port." timeout=".$timeout);

+			//if (! empty($conf->global->MAIN_MAIL_EMAIL_STARTTLS) && function_exists('openssl_open')) $host='tls://'.$host;

+

+			dol_syslog("Try socket connection to host=".$host." port=".$port);

@@ -1758,8 +1354,6 @@
-			$errno = 0;

-			$errstr = '';

-			if ($socket = @fsockopen(

-				$host, // Host to test, IP or domain. Add ssl:// for SSL/TLS.

-				$port, // which Port number to use

-				$errno, // actual system level error

-				$errstr, // and any text that goes with the error

-				$timeout     // timeout for reading/writing data over the socket

+            if ($socket = @fsockopen(

+					$host, // Host to test, IP or domain. Add ssl:// for SSL/TLS.

+					$port, // which Port number to use

+					$errno, // actual system level error

+					$errstr, // and any text that goes with the error

+					$timeout     // timeout for reading/writing data over the socket

@@ -1768,3 +1362 @@
-				if (function_exists('stream_set_timeout')) {

-					stream_set_timeout($socket, $timeout, 0);

-				}

+				if (function_exists('stream_set_timeout')) stream_set_timeout($socket, $timeout, 0);

@@ -1775,5 +1367,5 @@
-				if ($_retVal = $this->server_parse($socket, "220")) {

-					$_retVal = $socket;

-				}

-			} else {

-				$this->error = utf8_check('Error '.$errno.' - '.$errstr) ? 'Error '.$errno.' - '.$errstr : mb_convert_encoding('Error '.$errno.' - '.$errstr, 'UTF-8', 'ISO-8859-1');

+				if ($_retVal = $this->server_parse($socket, "220")) $_retVal = $socket;

+			}

+			else

+			{

+				$this->error = utf8_check('Error '.$errno.' - '.$errstr) ? 'Error '.$errno.' - '.$errstr : utf8_encode('Error '.$errno.' - '.$errstr);

@@ -1785 +1377 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -1796 +1388 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -1800,2 +1392,4 @@
-		while (substr($server_response, 3, 1) != ' ') {

-			if (!($server_response = fgets($socket, 256))) {

+		while (substr($server_response, 3, 1) != ' ')

+		{

+			if (!($server_response = fgets($socket, 256)))

+			{

@@ -1807 +1401,2 @@
-		if (!(substr($server_response, 0, 3) == $response)) {

+		if (!(substr($server_response, 0, 3) == $response))

+		{

@@ -1816 +1411 @@
-	 * Search images into html message and init array this->images_encoded if found

+	 * Seearch images into html message and init array this->images_encoded if found

@@ -1818 +1413 @@
-	 * @param	string	$images_dir		Location of physical images files. For example $dolibarr_main_data_root.'/medias'

+	 * @param	string	$images_dir		Location of physical images files

@@ -1821 +1416 @@
-	private function findHtmlImages($images_dir)

+	public function findHtmlImages($images_dir)

@@ -1823 +1418 @@
-		// Build the array of image extensions

+		// Build the list of image extensions

@@ -1826,3 +1420,0 @@
-		// We search (into mail body this->html), if we find some strings like "... file=xxx.img"

-		// For example when:

-		// <img alt="" src="/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/picture.jpg" style="height:356px; width:1040px" />

@@ -1832 +1424,2 @@
-		if (!empty($matches) && !empty($matches[1])) {

+		if (!empty($matches))

+		{

@@ -1834,4 +1427,4 @@
-			// We are interested in $matches[1] only (the second set of parenthesis into regex)

-			foreach ($matches[1] as $full) {

-				$regs = array();

-				if (preg_match('/file=([A-Za-z0-9_\-\/]+[\.]?[A-Za-z0-9]+)?$/i', $full, $regs)) {   // If xxx is 'file=aaa'

+			foreach ($matches[1] as $full)

+			{

+				if (preg_match('/file=([A-Za-z0-9_\-\/]+[\.]?[A-Za-z0-9]+)?$/i', $full, $regs))   // If xxx is 'file=aaa'

+				{

@@ -1840 +1433,2 @@
-					if (file_exists($images_dir.'/'.$img)) {

+					if (file_exists($images_dir.'/'.$img))

+					{

@@ -1842,0 +1437 @@
+

@@ -1844,0 +1440 @@
+

@@ -1846,0 +1443 @@
+

@@ -1848,3 +1445,3 @@
-						$regext = array();

-						if (preg_match('/^.+\.(\w{3,4})$/', $img, $regext)) {

-							$ext = strtolower($regext[1]);

+						if (preg_match('/^.+\.(\w{3,4})$/', $img, $reg))

+						{

+							$ext = strtolower($reg[1]);

@@ -1852,0 +1450 @@
+

@@ -1854,4 +1452 @@
-						$this->html_images[$i]["cid"] = dol_hash($this->html_images[$i]["fullpath"], 'md5'); // Force md5 hash (does not contain special chars)

-						// type

-						$this->html_images[$i]["type"] = 'cidfromurl';

-

+						$this->html_images[$i]["cid"] = dol_hash(uniqid(time()), 3); // Force md5 hash (does not contains special chars)

@@ -1864 +1459,2 @@
-			if (!empty($this->html_images)) {

+			if (!empty($this->html_images))

+			{

@@ -1869 +1465,2 @@
-				foreach ($this->html_images as $img) {

+				foreach ($this->html_images as $img)

+				{

@@ -1873 +1470,2 @@
-					if (!in_array($fullpath, $inline)) {

+					if (!in_array($fullpath, $inline))

+					{

@@ -1875 +1473,2 @@
-						if ($image = file_get_contents($fullpath)) {

+						if ($image = file_get_contents($fullpath))

+						{

@@ -1877 +1475,0 @@
-							$regs = array();

@@ -1892 +1490,3 @@
-			} else {

+			}

+			else

+			{

@@ -1897,93 +1497,3 @@
-		} else {

-			return 0;

-		}

-	}

-

-	/**

-	 * Seearch images with data:image format into html message.

-	 * If we find some, we create it on disk.

-	 *

-	 * @param	string	$images_dir		Location of where to store physicaly images files. For example $dolibarr_main_data_root.'/medias'

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

-	 */

-	private function findHtmlImagesIsSrcData($images_dir)

-	{

-		global $conf;

-

-		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

-

-		// Build the array of image extensions

-		$extensions = array_keys($this->image_types);

-

-		if (empty($images_dir)) {

-			//$images_dir = $conf->admin->dir_output.'/temp/'.uniqid('cmailfile');

-			$images_dir = $conf->admin->dir_output.'/temp/cmailfile';

-		}

-

-		if ($images_dir && !dol_is_dir($images_dir)) {

-			dol_mkdir($images_dir, DOL_DATA_ROOT);

-		}

-

-		// Uncomment this for debug

-		/*

-		global $dolibarr_main_data_root;

-		$outputfile = $dolibarr_main_data_root."/dolibarr_mail.log";

-		$fp = fopen($outputfile, "w+");

-		fwrite($fp, $this->html);

-		fclose($fp);

-		*/

-

-		// We search (into mail body this->html), if we find some strings like "... file=xxx.img"

-		// For example when:

-		// <img alt="" src="/src="data:image....;base64,...." />

-		$matches = array();

-		preg_match_all('/src="data:image\/('.implode('|', $extensions).');base64,([^"]+)"/Ui', $this->html, $matches); // If "xxx.ext" or 'xxx.ext' found

-

-		if (!empty($matches) && !empty($matches[1])) {

-			if (empty($images_dir)) {

-				// No temp directory provided, so we are not able to support convertion of data:image into physical images.

-				$this->errors[] = 'NoTempDirProvidedInCMailConstructorSoCantConvertDataImgOnDisk';

-				return -1;

-			}

-

-			$i = count($this->html_images);

-			foreach ($matches[1] as $key => $ext) {

-				// We save the image to send in disk

-				$filecontent = $matches[2][$key];

-

-				$cid = 'cid000'.dol_hash($filecontent, 'md5');		// The id must not change if image is same

-

-				$destfiletmp = $images_dir.'/'.$cid.'.'.$ext;

-

-				if (!dol_is_file($destfiletmp)) {	// If file does not exist yet (this is the case for the first email sent with a data:image inside)

-					dol_syslog("write the cid file ".$destfiletmp);

-					$fhandle = @fopen($destfiletmp, 'w');

-					if ($fhandle) {

-						$nbofbyteswrote = fwrite($fhandle, base64_decode($filecontent));

-						fclose($fhandle);

-						dolChmod($destfiletmp);

-					} else {

-						$this->errors[] = "Failed to open file '".$destfiletmp."' for write";

-						return -2;

-					}

-				}

-

-				if (file_exists($destfiletmp)) {

-					// Image full path

-					$this->html_images[$i]["fullpath"] = $destfiletmp;

-					// Image name

-					$this->html_images[$i]["name"] = basename($destfiletmp);

-					// Content type

-					$this->html_images[$i]["content_type"] = $this->image_types[strtolower($ext)];

-					// cid

-					$this->html_images[$i]["cid"] = $cid;

-					// type

-					$this->html_images[$i]["type"] = 'cidfromdata';

-

-					$this->html = str_replace('src="data:image/'.$ext.';base64,'.$filecontent.'"', 'src="cid:'.$this->html_images[$i]["cid"].'"', $this->html);

-				}

-				$i++;

-			}

-

-			return 1;

-		} else {

+		}

+		else

+		{

@@ -2006,2 +1516,2 @@
-	 *                                           If format 5: <a href="mailto:john@doe.com">John Doe</a> or <a href="mailto:john@doe.com">john@doe.com</a> if no label exists

-	 * @see getArrayAddress()

+     *                                           If format 5: <a href="mailto:john@doe.com">John Doe</a> or <a href="mailto:john@doe.com">john@doe.com</a> if no label exists

+     * @see getArrayAddress()

@@ -2019,3 +1529,4 @@
-		foreach ($arrayaddress as $val) {

-			$regs = array();

-			if (preg_match('/^(.*)<(.*)>$/i', trim($val), $regs)) {

+		foreach ($arrayaddress as $val)

+		{

+			if (preg_match('/^(.*)<(.*)>$/i', trim($val), $regs))

+			{

@@ -2024 +1535,3 @@
-			} else {

+			}

+			else

+			{

@@ -2029 +1542,2 @@
-			if ($email) {

+			if ($email)

+			{

@@ -2033 +1547,6 @@
-				if ($format == 5) {

+                if ($format == 5) {

+                    $newemail = $name ? $name : $email;

+                    $newemail = '<a href="mailto:'.$email.'">'.$newemail.'</a>';

+                }

+				if ($format == 4)

+				{

@@ -2035,6 +1554,3 @@
-					$newemail = '<a href="mailto:'.$email.'">'.$newemail.'</a>';

-				}

-				if ($format == 4) {

-					$newemail = $name ? $name : $email;

-				}

-				if ($format == 2) {

+				}

+				if ($format == 2)

+				{

@@ -2043 +1559,2 @@
-				if ($format == 1 || $format == 3) {

+				if ($format == 1 || $format == 3)

+				{

@@ -2046,8 +1563,5 @@
-				if ($format == 0 || $format == 3) {

-					if (getDolGlobalString('MAIN_MAIL_NO_FULL_EMAIL')) {

-						$newemail = '<'.$email.'>';

-					} elseif (!$name) {

-						$newemail = '<'.$email.'>';

-					} else {

-						$newemail = ($format == 3 ? '"' : '').($encode ? self::encodetorfc2822($name) : $name).($format == 3 ? '"' : '').' <'.$email.'>';

-					}

+				if ($format == 0 || $format == 3)

+				{

+					if (!empty($conf->global->MAIN_MAIL_NO_FULL_EMAIL)) $newemail = '<'.$email.'>';

+					elseif (!$name) $newemail = '<'.$email.'>';

+					else $newemail = ($format == 3 ? '"' : '').($encode ?self::encodetorfc2822($name) : $name).($format == 3 ? '"' : '').' <'.$email.'>';

@@ -2059,4 +1573,3 @@
-				if ($maxnumberofemail && $i >= $maxnumberofemail) {

-					if (count($arrayaddress) > $maxnumberofemail) {

-						$ret .= '...';

-					}

+				if ($maxnumberofemail && $i >= $maxnumberofemail)

+				{

+					if (count($arrayaddress) > $maxnumberofemail) $ret .= '...';

@@ -2078 +1591 @@
-	public static function getArrayAddress($address)

+	public function getArrayAddress($address)

@@ -2087,2 +1600,4 @@
-		foreach ($arrayaddress as $val) {

-			if (preg_match('/^(.*)<(.*)>$/i', trim($val), $regs)) {

+		foreach ($arrayaddress as $val)

+		{

+			if (preg_match('/^(.*)<(.*)>$/i', trim($val), $regs))

+			{

@@ -2091 +1606,3 @@
-			} else {

+			}

+			else

+			{

@@ -2096 +1613 @@
-			$ret[$email] = !getDolGlobalString('MAIN_MAIL_NO_FULL_EMAIL') ? $name : null;

+			$ret[$email] = empty($conf->global->MAIN_MAIL_NO_FULL_EMAIL) ? $name : null;

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_CSMSFile.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_CSMSFile.class.php
@@ -32,3 +32,2 @@
- *      Usage:	$smsfile = new CSMSFile($subject,$sendto,$replyto,$message,$filepath,$mimetype,$filename,$cc,$ccc,$deliveryreceipt,$msgishtml,$errors_to);

- *      		$smsfile->socid=...; $smsfile->contact_id=...; $smsfile->member_id=...; $smsfile->fk_project=...;

- *             	$smsfile->sendfile();

+ *      Usage: $smsfile = new CSMSFile($subject,$sendto,$replyto,$message,$filepath,$mimetype,$filename,$cc,$ccc,$deliveryreceipt,$msgishtml,$errors_to);

+ *             $smsfile->sendfile();

@@ -38,6 +37 @@
-	/**

-	 * @var DoliDB Database handler.

-	 */

-	public $db;

-

-	/**

+    /**

@@ -47,10 +40,0 @@
-

-	/**

-	 * @var string[] Array of Error code (or message)

-	 */

-	public $errors = array();

-

-	/**

-	 * @var string end of line character

-	 */

-	public $eol;

@@ -67,2 +51 @@
-	public $contact_id;

-	public $member_id;

+	public $contactid;

@@ -71,2 +53,0 @@
-

-	public $deliveryreceipt;

@@ -92,6 +73,2 @@
-		if (preg_match('/^win/i', PHP_OS)) {

-			$this->eol = "\r\n";

-		}

-		if (preg_match('/^mac/i', PHP_OS)) {

-			$this->eol = "\r";

-		}

+		if (preg_match('/^win/i', PHP_OS)) $this->eol = "\r\n";

+		if (preg_match('/^mac/i', PHP_OS)) $this->eol = "\r";

@@ -100,6 +77,7 @@
-		if (!getDolGlobalString('MAIN_SMS_SENDMODE')) {

-			$this->error = 'No SMS Engine defined';

-			throw new Exception('No SMS Engine defined');

-		}

-

-		dol_syslog("CSMSFile::CSMSFile: MAIN_SMS_SENDMODE=".getDolGlobalString('MAIN_SMS_SENDMODE')." charset=".$conf->file->character_set_client." from=".$from.", to=".$to.", msg length=".strlen($msg), LOG_DEBUG);

+		if (empty($conf->global->MAIN_SMS_SENDMODE))

+		{

+		    $this->error = 'No SMS Engine defined';

+		    return -1;

+		}

+

+		dol_syslog("CSMSFile::CSMSFile: MAIN_SMS_SENDMODE=".$conf->global->MAIN_SMS_SENDMODE." charset=".$conf->file->character_set_client." from=".$from.", to=".$to.", msg length=".count($msg), LOG_DEBUG);

@@ -109,8 +87,7 @@
-		$this->addr_from = $from;

-		$this->addr_to = $to;

-		$this->deferred = $deferred;

-		$this->priority = $priority;

-		$this->class = $class;

-		$this->deliveryreceipt = $deliveryreceipt;

-		$this->message = $msg;

-		$this->nostop = false;

+	    $this->addr_from = $from;

+	    $this->addr_to = $to;

+        $this->deferred = $deferred;

+        $this->priority = $priority;

+        $this->class = $class;

+        $this->message = $msg;

+        $this->nostop = false;

@@ -134,16 +111,32 @@
-		dol_syslog("CSMSFile::sendfile addr_to=".$this->addr_to, LOG_DEBUG);

-		dol_syslog("CSMSFile::sendfile message=\n".$this->message);

-

-		$this->message = stripslashes($this->message);

-

-		if (getDolGlobalString('MAIN_SMS_DEBUG')) {

-			$this->dump_sms();

-		}

-

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

-			// Action according to the choosed sending method

-			if (getDolGlobalString('MAIN_SMS_SENDMODE')) {

-				$sendmode = getDolGlobalString('MAIN_SMS_SENDMODE');	// $conf->global->MAIN_SMS_SENDMODE looks like a value 'module'

-				$classmoduleofsender = getDolGlobalString('MAIN_MODULE_'.strtoupper($sendmode).'_SMS', $sendmode);	// $conf->global->MAIN_MODULE_XXX_SMS looks like a value 'class@module'

-				if ($classmoduleofsender == 'ovh') {

-					$classmoduleofsender = 'ovhsms@ovh';	// For backward compatibility

+        dol_syslog("CSMSFile::sendfile addr_to=".$this->addr_to, LOG_DEBUG);

+        dol_syslog("CSMSFile::sendfile message=\n".$this->message);

+

+        $this->message = stripslashes($this->message);

+

+        if (!empty($conf->global->MAIN_SMS_DEBUG)) $this->dump_sms();

+

+		if (empty($conf->global->MAIN_DISABLE_ALL_SMS))

+		{

+		    // Action according to choosed sending method

+		    if ($conf->global->MAIN_SMS_SENDMODE == 'ovh')    // Backward compatibility    @deprecated

+			{

+				dol_include_once('/ovh/class/ovhsms.class.php');

+				$sms = new OvhSms($this->db);

+				$sms->expe = $this->addr_from;

+				$sms->dest = $this->addr_to;

+				$sms->message = $this->message;

+				$sms->deferred = $this->deferred;

+				$sms->priority = $this->priority;

+                $sms->class = $this->class;

+                $sms->nostop = $this->nostop;

+

+                $sms->socid = $this->socid;

+                $sms->contactid = $this->contactid;

+                $sms->project = $this->fk_project;

+

+                $res = $sms->SmsSend();

+

+				if ($res <= 0)

+				{

+					$this->error = $sms->error;

+					dol_syslog("CSMSFile::sendfile: sms send error=".$this->error, LOG_ERR);

@@ -151,42 +144,5 @@
-

-				$tmp = explode('@', $classmoduleofsender);

-				$classfile = $tmp[0];

-				$module = (empty($tmp[1]) ? $tmp[0] : $tmp[1]);

-				dol_include_once('/'.$module.'/class/'.strtolower($classfile).'.class.php');

-				try {

-					$classname = ucfirst($classfile);

-					if (class_exists($classname)) {

-						$sms = new $classname($this->db);

-						$sms->expe = $this->addr_from;

-						$sms->dest = $this->addr_to;

-						$sms->deferred = $this->deferred;

-						$sms->priority = $this->priority;

-						$sms->class = $this->class;

-						$sms->message = $this->message;

-						$sms->nostop = $this->nostop;

-						$sms->deliveryreceipt = $this->deliveryreceipt;

-

-						$sms->socid = $this->socid;

-						$sms->contact_id = $this->contact_id;

-						$sms->member_id = $this->member_id;

-						$sms->fk_project = $this->fk_project;

-

-						$res = $sms->SmsSend();

-

-						$this->error = $sms->error;

-						$this->errors = $sms->errors;

-						if ($res <= 0) {

-							dol_syslog("CSMSFile::sendfile: sms send error=".$this->error, LOG_ERR);

-						} else {

-							dol_syslog("CSMSFile::sendfile: sms send success with id=".$res, LOG_DEBUG);

-							//var_dump($res);        // 1973128

-							if (getDolGlobalString('MAIN_SMS_DEBUG')) {

-								$this->dump_sms_result($res);

-							}

-						}

-					} else {

-						$sms = new stdClass();

-						$sms->error = 'The SMS manager "'.$classfile.'" defined into SMS setup MAIN_MODULE_'.strtoupper($sendmode).'_SMS is not found';

-					}

-				} catch (Exception $e) {

-					dol_print_error('', 'Error to get list of senders: '.$e->getMessage());

+				else

+				{

+					dol_syslog("CSMSFile::sendfile: sms send success with id=".$res, LOG_DEBUG);

+					//var_dump($res);        // 1973128

+					if (!empty($conf->global->MAIN_SMS_DEBUG)) $this->dump_sms_result($res);

@@ -194 +150,44 @@
-			} else {

+			}

+		    elseif (!empty($conf->global->MAIN_SMS_SENDMODE))    // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'

+		    {

+		        $tmp = explode('@', $conf->global->MAIN_SMS_SENDMODE);

+		        $classfile = $tmp[0]; $module = (empty($tmp[1]) ? $tmp[0] : $tmp[1]);

+		        dol_include_once('/'.$module.'/class/'.$classfile.'.class.php');

+		        try

+		        {

+		            $classname = ucfirst($classfile);

+		            $sms = new $classname($this->db);

+		            $sms->expe = $this->addr_from;

+		            $sms->dest = $this->addr_to;

+		            $sms->deferred = $this->deferred;

+		            $sms->priority = $this->priority;

+		            $sms->class = $this->class;

+		            $sms->message = $this->message;

+		            $sms->nostop = $this->nostop;

+

+		            $sms->socid = $this->socid;

+		            $sms->contactid = $this->contactid;

+		            $sms->fk_project = $this->fk_project;

+

+                    $res = $sms->SmsSend();

+

+                    $this->error = $sms->error;

+                    $this->errors = $sms->errors;

+    				if ($res <= 0)

+    				{

+    					dol_syslog("CSMSFile::sendfile: sms send error=".$this->error, LOG_ERR);

+    				}

+    				else

+    				{

+    					dol_syslog("CSMSFile::sendfile: sms send success with id=".$res, LOG_DEBUG);

+    					//var_dump($res);        // 1973128

+    					if (!empty($conf->global->MAIN_SMS_DEBUG)) $this->dump_sms_result($res);

+    				}

+		        }

+		        catch (Exception $e)

+		        {

+		            dol_print_error('', 'Error to get list of senders: '.$e->getMessage());

+		        }

+		    }

+			else

+			{

@@ -200 +199,3 @@
-		} else {

+		}

+		else

+		{

@@ -211,13 +212,14 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 *  Write content of a SendSms request into a dump file (mode = all)

-	 *  Used for debugging.

-	 *

-	 *  @return	void

-	 */

-	public function dump_sms()

-	{

-		// phpcs:enable

-		global $conf, $dolibarr_main_data_root;

-

-		if (@is_writeable($dolibarr_main_data_root)) {	// Avoid fatal error on fopen with open_basedir

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     *  Write content of a SendSms request into a dump file (mode = all)

+     *  Used for debugging.

+     *

+     *  @return	void

+     */

+    public function dump_sms()

+    {

+        // phpcs:enable

+        global $conf, $dolibarr_main_data_root;

+

+		if (@is_writeable($dolibarr_main_data_root))	// Avoid fatal error on fopen with open_basedir

+		{

@@ -233 +234,0 @@
-			fputs($fp, "DeliveryReceipt: ".$this->deliveryreceipt."\n");

@@ -237 +238,2 @@
-			dolChmod($outputfile);

+			if (!empty($conf->global->MAIN_UMASK))

+			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));

@@ -241,23 +243,25 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 *  Write content of a SendSms result into a dump file (mode = all)

-	 *  Used for debugging.

-	 *

-	 *  @param	int		$result		Result of sms sending

-	 *  @return	void

-	 */

-	public function dump_sms_result($result)

-	{

-		// phpcs:enable

-		global $conf, $dolibarr_main_data_root;

-

-		if (@is_writeable($dolibarr_main_data_root)) {    // Avoid fatal error on fopen with open_basedir

-			$outputfile = $dolibarr_main_data_root."/dolibarr_sms.log";

-			$fp = fopen($outputfile, "a+");

-

-			fputs($fp, "\nResult id=".$result);

-

-			fclose($fp);

-			dolChmod($outputfile);

-		}

-	}

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     *  Write content of a SendSms result into a dump file (mode = all)

+     *  Used for debugging.

+     *

+     *  @param	int		$result		Result of sms sending

+     *  @return	void

+     */

+    public function dump_sms_result($result)

+    {

+        // phpcs:enable

+        global $conf, $dolibarr_main_data_root;

+

+        if (@is_writeable($dolibarr_main_data_root))    // Avoid fatal error on fopen with open_basedir

+        {

+        	$outputfile = $dolibarr_main_data_root."/dolibarr_sms.log";

+            $fp = fopen($outputfile, "a+");

+

+            fputs($fp, "\nResult id=".$result);

+

+            fclose($fp);

+            if (!empty($conf->global->MAIN_UMASK))

+            @chmod($outputfile, octdec($conf->global->MAIN_UMASK));

+        }

+    }

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_antivir.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_antivir.class.php
@@ -48,3 +48,3 @@
-	 * @var DoliDB Database handler.

-	 */

-	public $db;

+     * @var DoliDB Database handler.

+     */

+    public $db;

@@ -62 +62 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -69 +69 @@
-	 *	@return	int					Return integer <0 if KO (-98 if error, -99 if virus), 0 if OK

+	 *	@return	int					<0 if KO (-98 if error, -99 if virus), 0 if OK

@@ -73 +73 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -78,3 +78,4 @@
-		if (preg_match('/\.virus$/i', $file)) {

-			$this->errors[] = 'File has an extension saying file is a virus';

-			return -97;

+		if (preg_match('/\.virus$/i', $file))

+		{

+		    $this->errors[] = 'File has an extension saying file is a virus';

+		    return -97;

@@ -84 +84,0 @@
-		//$fullcommand="/usr/bin/clamdscan --fdpass '/tmp/phpuxoAEo'"

@@ -86 +86 @@
-		//var_dump($fullcommand);

+        $fullcommand .= ' 2>&1'; // This is to get error output

@@ -88 +88,3 @@
-		$safemode = ini_get("safe_mode");

+		$output = array();

+		$return_var = 0;

+        $safemode = ini_get("safe_mode");

@@ -91,4 +93,2 @@
-		// Run CLI command.

-		include_once DOL_DOCUMENT_ROOT.'/core/class/utils.class.php';

-		$utils = new Utils($this->db);

-		$outputfile = $conf->user->dir_temp.'/antivir.tmp';

+		// Run CLI command. If run of Windows, you can get return with echo %ERRORLEVEL%

+		$lastline = exec($fullcommand, $output, $return_var);

@@ -96 +96 @@
-		$result = $utils->executeCLI($fullcommand, $outputfile);

+		if (is_null($output)) $output = array();

@@ -98,3 +98 @@
-		$return_var = $result['result'];

-		$output = $result['output'];

-		$errorstring = $result['error'];

+        //print "x".$lastline." - ".join(',',$output)." - ".$return_var."y";exit;

@@ -102,2 +100,20 @@
-		if (is_null($output)) {

-			$output = array();

+		/*

+        $outputfile=$conf->admin->dir_temp.'/dol_avscan_file.out.'.session_id();

+		$handle = fopen($outputfile, 'w');

+		if ($handle)

+		{

+			$handlein = popen($fullcommand, 'r');

+			while (!feof($handlein))

+			{

+				$read = fgets($handlein);

+				fwrite($handle,$read);

+			}

+			pclose($handlein);

+

+			$errormsg = fgets($handle,2048);

+			$this->output=$errormsg;

+

+			fclose($handle);

+

+			if (! empty($conf->global->MAIN_UMASK))

+				@chmod($outputfile, octdec($conf->global->MAIN_UMASK));

@@ -104,0 +121,8 @@
+		else

+		{

+			$langs->load("errors");

+			dol_syslog("Failed to open file ".$outputfile,LOG_ERR);

+			$this->error="ErrorFailedToWriteInDir";

+			$return=-1;

+		}

+		*/

@@ -106 +130 @@
-		dol_syslog("AntiVir::dol_avscan_file Result return_var=".$return_var." output=".$output);

+		dol_syslog("AntiVir::dol_avscan_file Result return_var=".$return_var." output=".join(',', $output));

@@ -109,2 +133,3 @@
-		if ($return_var == $returncodevirus) {	// Virus found

-			$this->errors = array($errorstring, $output);

+		if ($return_var == $returncodevirus)	// Virus found

+		{

+			$this->errors = $output;

@@ -114,2 +139,3 @@
-		if ($return_var > 0) {					// If other error

-			$this->errors = array($errorstring, $output);

+		if ($return_var > 0)					// If other error

+		{

+			$this->errors = $output;

@@ -151 +177 @@
-		if (!preg_match('/%file/', $conf->global->MAIN_ANTIVIRUS_PARAM)) {

+		if (!preg_match('/%file/', $conf->global->MAIN_ANTIVIRUS_PARAM))

@@ -153 +178,0 @@
-		}

@@ -155,3 +180 @@
-		if (preg_match("/\s/", $command)) {

-			$command = escapeshellarg($command); // Force use of quotes on command. Using escapeshellcmd fails.

-		}

+		if (preg_match("/\s/", $command)) $command = escapeshellarg($command); // Use quotes on command. Using escapeshellcmd fails.

@@ -159,3 +182 @@
-		$forbidden_chars_to_replace = array("*", "?", "\"", "<", ">", "|", "[", "]", ";", '°', '$');

-		$ret = dol_sanitizePathName($command).' '.dol_string_nospecial($param, '_', $forbidden_chars_to_replace);

-

+		$ret = $command.' '.$param;

@@ -163 +184 @@
-		//print "xx".$ret."xx";exit;

+        //print "xx".$ret."xx";exit;

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_canvas.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_canvas.class.php
@@ -32,3 +32,3 @@
-	 * @var DoliDB Database handler.

-	 */

-	public $db;

+     * @var DoliDB Database handler.

+     */

+    public $db;

@@ -48,10 +48,10 @@
-	public $dirmodule; // Module directory

-	public $targetmodule; // Module concerned by canvas (ex: thirdparty, contact, ...)

-	public $canvas; // Name of canvas (ex: company, individual, product, service, ...)

-	public $card; // Tab (sub-canvas)

-

-	public $template_dir; // Initialized by getCanvas with templates directory

-	public $control; // Initialized by getCanvas with controller instance

-

-

-	/**

+    public $dirmodule; // Module directory

+    public $targetmodule; // Module concerned by canvas (ex: thirdparty, contact, ...)

+    public $canvas; // Name of canvas (ex: company, individual, product, service, ...)

+    public $card; // Tab (sub-canvas)

+

+    public $template_dir; // Initialized by getCanvas with templates directory

+    public $control; // Initialized by getCanvas with controller instance

+

+

+    /**

@@ -78,11 +78,5 @@
-		$newaction = $action;

-		if ($newaction == 'add') {

-			$newaction = 'create';

-		}

-		if ($newaction == 'update') {

-			$newaction = 'edit';

-		}

-		if (empty($newaction) || $newaction == 'delete' || $newaction == 'create_user' || $newaction == 'presend' || $newaction == 'send') {

-			$newaction = 'view';

-		}

-		return $newaction;

+	    $newaction = $action;

+	    if ($newaction == 'add')    $newaction = 'create';

+	    if ($newaction == 'update') $newaction = 'edit';

+	    if (empty($newaction) || $newaction == 'delete' || $newaction == 'create_user' || $newaction == 'presend' || $newaction == 'send') $newaction = 'view';

+	    return $newaction;

@@ -105,9 +99,9 @@
-		$this->targetmodule = $module;

-		$this->canvas = $canvas;

-		$this->card = $card;

-		$this->dirmodule = $module;

-		// Correct values if canvas is into an external module

-		$regs = array();

-		if (preg_match('/^([^@]+)@([^@]+)$/i', $canvas, $regs)) {

-			$this->canvas = $regs[1];

-			$this->dirmodule = $regs[2];

+        $this->targetmodule = $module;

+        $this->canvas = $canvas;

+        $this->card = $card;

+        $this->dirmodule = $module;

+        // Correct values if canvas is into an external module

+		if (preg_match('/^([^@]+)@([^@]+)$/i', $canvas, $regs))

+		{

+            $this->canvas = $regs[1];

+		    $this->dirmodule = $regs[2];

@@ -116,5 +110,3 @@
-		if ($this->dirmodule == 'thirdparty') {

-			$this->dirmodule = 'societe';

-		}

-

-		// Control file

+        if ($this->dirmodule == 'thirdparty') { $this->dirmodule = 'societe'; }

+

+        // Control file

@@ -122,7 +114,9 @@
-		if (file_exists($controlclassfile)) {

-			// Include actions class (controller)

-			require_once $controlclassfile;

-

-			// Instantiate actions class (controller)

-			$controlclassname = 'Actions'.ucfirst($this->card).ucfirst($this->canvas);

-			$this->control = new $controlclassname($this->db, $this->dirmodule, $this->targetmodule, $this->canvas, $this->card);

+		if (file_exists($controlclassfile))

+		{

+            // Include actions class (controller)

+            $this->control_file = $controlclassfile;

+            require_once $controlclassfile;

+

+            // Instantiate actions class (controller)

+            $controlclassname = 'Actions'.ucfirst($this->card).ucfirst($this->canvas);

+            $this->control = new $controlclassname($this->db, $this->dirmodule, $this->targetmodule, $this->canvas, $this->card);

@@ -133,10 +127,11 @@
-		if (!is_dir($this->template_dir)) {

-			$this->template_dir = '';

-		}

-

-		//print 'dimodule='.$dirmodule.' canvas='.$this->canvas.'<br>';

-		//print ' => template_dir='.$this->template_dir.'<br>';

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

+        if (!is_dir($this->template_dir))

+        {

+            $this->template_dir = '';

+        }

+

+        //print 'dimodule='.$dirmodule.' canvas='.$this->canvas.'<br>';

+        //print ' => template_dir='.$this->template_dir.'<br>';

+	}

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

@@ -152,8 +147,6 @@
-		// phpcs:enable

-		if (is_object($this->control) && method_exists($this->control, 'assign_values')) {

-			$this->control->assign_values($action, $id, $ref);

-		}

-	}

-

-	/**

-	 *	Return if a template exists to display as canvas (if it exists)

+        // phpcs:enable

+		if (method_exists($this->control, 'assign_values')) $this->control->assign_values($action, $id, $ref);

+	}

+

+    /**

+     *	Return the template to display canvas (if it exists)

@@ -162,17 +155,11 @@
-	 *	@return	int		0=Canvas template file does not exist, 1=Canvas template file exists

-	 */

-	public function displayCanvasExists($action)

-	{

-		// template_dir should be '/'.$this->dirmodule.'/canvas/'.$this->canvas.'/tpl/', for example '/mymodule/canvas/product/tpl'

-		if (empty($this->template_dir)) {

-			return 0;

-		}

-

-		if (file_exists($this->template_dir.(!empty($this->card) ? $this->card.'_' : '').$this->_cleanaction($action).'.tpl.php')) {

-			return 1;

-		} else {

-			return 0;

-		}

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+     *	@return	int		0=Canvas template file does not exist, 1=Canvas template file exists

+     */

+    public function displayCanvasExists($action)

+    {

+        if (empty($this->template_dir)) return 0;

+

+        if (file_exists($this->template_dir.(!empty($this->card) ? $this->card.'_' : '').$this->_cleanaction($action).'.tpl.php')) return 1;

+        else return 0;

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -188 +175 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -198 +185 @@
-	// https://wiki.dolibarr.org/index.php/Canvas_development

+	// http://wiki.dolibarr.org/index.php/Canvas_development

@@ -207 +194 @@
-		return (is_object($this->control));

+        return (is_object($this->control));

@@ -212 +199 @@
-	 *  @deprecated Use the doActions of hooks instead of this.

+     *  @deprecated Use the doActions of hooks instead of this.

@@ -219 +206 @@
-	 * 	@see		https://wiki.dolibarr.org/index.php/Canvas_development

+	 * 	@see		http://wiki.dolibarr.org/index.php/Canvas_development

@@ -223 +210,2 @@
-		if (method_exists($this->control, 'doActions')) {

+		if (method_exists($this->control, 'doActions'))

+		{

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_ccountry.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_ccountry.class.php
@@ -25 +25,3 @@
-require_once DOL_DOCUMENT_ROOT.'/core/class/commondict.class.php';

+//require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';

+//require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';

+//require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';

@@ -31 +33 @@
-class Ccountry extends CommonDict

+class Ccountry // extends CommonObject

@@ -32,0 +35,15 @@
+	/**

+     * @var DoliDB Database handler.

+     */

+    public $db;

+

+	/**

+	 * @var string Error code (or message)

+	 */

+	public $error = '';

+

+	/**

+	 * @var string[] Error codes (or messages)

+	 */

+	public $errors = array();

+

@@ -35,0 +53,6 @@
+    /**

+	 * @var int ID

+	 */

+	public $id;

+

+	public $code;

@@ -36,0 +60,7 @@
+

+	/**

+     * @var string Countries label

+     */

+    public $label;

+

+	public $active;

@@ -43,20 +73,21 @@
-	/**

-	 *  Constructor

-	 *

-	 *  @param      DoliDb		$db      Database handler

-	 */

-	public function __construct($db)

-	{

-		$this->db = $db;

-	}

-

-

-	/**

-	 *  Create object into database

-	 *

-	 *  @param      User	$user        User that create

-	 *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers

-	 *  @return     int      		   	 Return integer <0 if KO, Id of created object if OK

-	 */

-	public function create($user, $notrigger = 0)

-	{

+    /**

+     *  Constructor

+     *

+     *  @param      DoliDb		$db      Database handler

+     */

+    public function __construct($db)

+    {

+        $this->db = $db;

+    }

+

+

+    /**

+     *  Create object into database

+     *

+     *  @param      User	$user        User that create

+     *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers

+     *  @return     int      		   	 <0 if KO, Id of created object if OK

+     */

+    public function create($user, $notrigger = 0)

+    {

+    	global $conf, $langs;

@@ -66,12 +97,4 @@
-		if (isset($this->code)) {

-			$this->code = trim($this->code);

-		}

-		if (isset($this->code_iso)) {

-			$this->code_iso = trim($this->code_iso);

-		}

-		if (isset($this->label)) {

-			$this->label = trim($this->label);

-		}

-		if (isset($this->active)) {

-			$this->active = trim($this->active);

-		}

+		if (isset($this->code)) $this->code = trim($this->code);

+		if (isset($this->code_iso)) $this->code_iso = trim($this->code_iso);

+		if (isset($this->label)) $this->label = trim($this->label);

+		if (isset($this->active)) $this->active = trim($this->active);

@@ -82,2 +105,2 @@
-		// Insert request

-		$sql = "INSERT INTO ".$this->db->prefix()."c_country(";

+        // Insert request

+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_country(";

@@ -89 +112 @@
-		$sql .= ") VALUES (";

+        $sql .= ") VALUES (";

@@ -94 +117 @@
-		$sql .= " ".(!isset($this->active) ? 'NULL' : "'".$this->db->escape($this->active)."'");

+		$sql .= " ".(!isset($this->active) ? 'NULL' : "'".$this->db->escape($this->active)."'")."";

@@ -99,16 +122,16 @@
-		dol_syslog(get_class($this)."::create", LOG_DEBUG);

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

-		if (!$resql) {

-			$error++;

-			$this->errors[] = "Error ".$this->db->lasterror();

-		}

-

-		if (!$error) {

-			$this->id = $this->db->last_insert_id($this->db->prefix()."c_country");

-		}

-

-		// Commit or rollback

-		if ($error) {

-			foreach ($this->errors as $errmsg) {

-				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);

-				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);

+	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);

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

+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }

+

+		if (!$error)

+        {

+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_country");

+        }

+

+        // Commit or rollback

+        if ($error)

+		{

+			foreach ($this->errors as $errmsg)

+			{

+	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);

+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);

@@ -118 +141,3 @@
-		} else {

+		}

+		else

+		{

@@ -120,65 +145,65 @@
-			return $this->id;

-		}

-	}

-

-

-	/**

-	 *  Load object in memory from database

-	 *

-	 *  @param      int		$id    	  Id object

-	 *  @param		string	$code	    Code

-	 *  @param		string	$code_iso	Code ISO

-	 *  @return     int          	>0 if OK, 0 if not found, <0 if KO

-	 */

-	public function fetch($id, $code = '', $code_iso = '')

-	{

-		$sql = "SELECT";

-		$sql .= " t.rowid,";

-		$sql .= " t.code,";

-		$sql .= " t.code_iso,";

-		$sql .= " t.label,";

-		$sql .= " t.active";

-		$sql .= " FROM ".$this->db->prefix()."c_country as t";

-		if ($id) {

-			$sql .= " WHERE t.rowid = ".((int) $id);

-		} elseif ($code) {

-			$sql .= " WHERE t.code = '".$this->db->escape(strtoupper($code))."'";

-		} elseif ($code_iso) {

-			$sql .= " WHERE t.code_iso = '".$this->db->escape(strtoupper($code_iso))."'";

-		}

-

-		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);

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

-		if ($resql) {

-			if ($this->db->num_rows($resql)) {

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

-

-				if ($obj) {

-					$this->id = $obj->rowid;

-					$this->code = $obj->code;

-					$this->code_iso = $obj->code_iso;

-					$this->label = $obj->label;

-					$this->active = $obj->active;

-				}

-

-				$this->db->free($resql);

-				return 1;

-			} else {

-				return 0;

-			}

-		} else {

-			$this->error = "Error ".$this->db->lasterror();

-			return -1;

-		}

-	}

-

-

-	/**

-	 *  Update object into database

-	 *

-	 *  @param      User	$user        User that modify

-	 *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers

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

-	 */

-	public function update($user = null, $notrigger = 0)

-	{

+            return $this->id;

+		}

+    }

+

+

+    /**

+     *  Load object in memory from database

+     *

+     *  @param      int		$id    	  Id object

+     *  @param		string	$code	    Code

+     *  @param		string	$code_iso	Code ISO

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

+     */

+    public function fetch($id, $code = '', $code_iso = '')

+    {

+        $sql = "SELECT";

+  		$sql .= " t.rowid,";

+  		$sql .= " t.code,";

+  		$sql .= " t.code_iso,";

+  		$sql .= " t.label,";

+  		$sql .= " t.active";

+        $sql .= " FROM ".MAIN_DB_PREFIX."c_country as t";

+        if ($id) $sql .= " WHERE t.rowid = ".$id;

+        elseif ($code) $sql .= " WHERE t.code = '".$this->db->escape($code)."'";

+        elseif ($code_iso) $sql .= " WHERE t.code_iso = '".$this->db->escape($code_iso)."'";

+

+    	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);

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

+        if ($resql)

+        {

+            if ($this->db->num_rows($resql))

+            {

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

+

+                $this->id = $obj->rowid;

+				$this->code = $obj->code;

+				$this->code_iso = $obj->code_iso;

+				$this->label = $obj->label;

+				$this->active = $obj->active;

+

+                $this->db->free($resql);

+                return 1;

+            }

+            else {

+                return 0;

+            }

+        }

+        else

+        {

+      	    $this->error = "Error ".$this->db->lasterror();

+            return -1;

+        }

+    }

+

+

+    /**

+     *  Update object into database

+     *

+     *  @param      User	$user        User that modify

+     *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers

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

+     */

+    public function update($user = null, $notrigger = 0)

+    {

+    	global $conf, $langs;

@@ -188,12 +213,4 @@
-		if (isset($this->code)) {

-			$this->code = trim($this->code);

-		}

-		if (isset($this->code_iso)) {

-			$this->code_iso = trim($this->code_iso);

-		}

-		if (isset($this->label)) {

-			$this->label = trim($this->label);

-		}

-		if (isset($this->active)) {

-			$this->active = trim($this->active);

-		}

+		if (isset($this->code)) $this->code = trim($this->code);

+		if (isset($this->code_iso)) $this->code_iso = trim($this->code_iso);

+		if (isset($this->label)) $this->label = trim($this->label);

+		if (isset($this->active)) $this->active = trim($this->active);

@@ -205,2 +222,2 @@
-		// Update request

-		$sql = "UPDATE ".$this->db->prefix()."c_country SET";

+        // Update request

+        $sql = "UPDATE ".MAIN_DB_PREFIX."c_country SET";

@@ -210,2 +227,2 @@
-		$sql .= " active=".(isset($this->active) ? $this->active : "null");

-		$sql .= " WHERE rowid=".((int) $this->id);

+		$sql .= " active=".(isset($this->active) ? $this->active : "null")."";

+        $sql .= " WHERE rowid=".$this->id;

@@ -216,11 +233,10 @@
-		$resql = $this->db->query($sql);

-		if (!$resql) {

-			$error++;

-			$this->errors[] = "Error ".$this->db->lasterror();

-		}

-

-		// Commit or rollback

-		if ($error) {

-			foreach ($this->errors as $errmsg) {

-				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);

-				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);

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

+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }

+

+        // Commit or rollback

+		if ($error)

+		{

+			foreach ($this->errors as $errmsg)

+			{

+	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);

+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);

@@ -230 +246,3 @@
-		} else {

+		}

+		else

+		{

@@ -234,5 +252,5 @@
-	}

-

-

-	/**

-	 *  Delete object in database

+    }

+

+

+ 	/**

+ 	 *  Delete object in database

@@ -240,3 +258,3 @@
-	 *	@param  User	$user        User that delete

-	 *  @param	int		$notrigger	 0=launch triggers after, 1=disable triggers

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

+     *	@param  User	$user        User that delete

+     *  @param	int		$notrigger	 0=launch triggers after, 1=disable triggers

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

@@ -245,0 +264 @@
+		global $conf, $langs;

@@ -248,2 +267,2 @@
-		$sql = "DELETE FROM ".$this->db->prefix()."c_country";

-		$sql .= " WHERE rowid=".((int) $this->id);

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

+		$sql .= " WHERE rowid=".$this->id;

@@ -255,10 +274,9 @@
-		if (!$resql) {

-			$error++;

-			$this->errors[] = "Error ".$this->db->lasterror();

-		}

-

-		// Commit or rollback

-		if ($error) {

-			foreach ($this->errors as $errmsg) {

-				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);

-				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);

+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }

+

+        // Commit or rollback

+		if ($error)

+		{

+			foreach ($this->errors as $errmsg)

+			{

+	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);

+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);

@@ -268 +286,3 @@
-		} else {

+		}

+		else

+		{

@@ -274,15 +294,15 @@
-	/**

-	 *  Return a link to the object card (with optionaly the picto)

-	 *

-	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)

-	 *	@param	string	$option						On what the link point to ('nolink', ...)

-	 *  @param	int  	$notooltip					1=Disable tooltip

-	 *  @param  string  $morecss            		Add more css on link

-	 *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking

-	 *	@return	string								String with URL

-	 */

-	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)

-	{

-		global $langs;

-		return $langs->trans($this->label);

-	}

+    /**

+     *  Return a link to the object card (with optionaly the picto)

+     *

+     *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)

+     *	@param	string	$option						On what the link point to ('nolink', ...)

+     *  @param	int  	$notooltip					1=Disable tooltip

+     *  @param  string  $morecss            		Add more css on link

+     *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking

+     *	@return	string								String with URL

+     */

+    public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)

+    {

+    	global $langs;

+        return $langs->trans($this->label);

+    }

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_comment.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_comment.class.php
@@ -35,7 +35,4 @@
-	 * @var int ID of parent key (it's not the name of a field)

-	 */

-	public $fk_element;

-

-	/**

-	 * @var string element type

-	 */

+	 * @var int Field with ID of parent key if this field has a parent

+	 */

+	public $fk_element = '';

+

@@ -50,4 +47,4 @@
-	 * Date modification record (tms)

-	 *

-	 * @var integer

-	 */

+     * Date modification record (tms)

+     *

+     * @var integer

+     */

@@ -57,9 +54,9 @@
-	 * Date creation record (datec)

-	 *

-	 * @var integer

-	 */

-	public $datec;

-

-	/**

-	 * @var int ID

-	 */

+     * Date creation record (datec)

+     *

+     * @var integer

+     */

+    public $datec;

+

+	/**

+     * @var int ID

+     */

@@ -69,2 +66,2 @@
-	 * @var int ID

-	 */

+     * @var int ID

+     */

@@ -74 +71 @@
-	 * @var int 		Entity

+	 * @var int Entity

@@ -78,3 +74,0 @@
-	/**

-	 * @var string 		Import key

-	 */

@@ -85,3 +78,0 @@
-	/**

-	 * @var Comment 	Object oldcopy

-	 */

@@ -107 +98 @@
-	 *  @return int 		        	Return integer <0 if KO, Id of created object if OK

+	 *  @return int 		        	<0 if KO, Id of created object if OK

@@ -116 +107 @@
-		$sql = "INSERT INTO ".$this->db->prefix().$this->table_element." (";

+		$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";

@@ -131 +122 @@
-		$sql .= ", ".((int) $user->id);

+		$sql .= ", ".$user->id."";

@@ -143,9 +134,8 @@
-		if (!$resql) {

-			$error++;

-			$this->errors[] = "Error ".$this->db->lasterror();

-		}

-

-		if (!$error) {

-			$this->id = $this->db->last_insert_id($this->db->prefix().$this->table_element);

-

-			if (!$notrigger) {

+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }

+

+		if (!$error)

+		{

+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);

+

+			if (!$notrigger)

+			{

@@ -154,3 +144 @@
-				if ($result < 0) {

-					$error++;

-				}

+				if ($result < 0) { $error++; }

@@ -162,2 +150,4 @@
-		if ($error) {

-			foreach ($this->errors as $errmsg) {

+		if ($error)

+		{

+			foreach ($this->errors as $errmsg)

+			{

@@ -169 +159,3 @@
-		} else {

+		}

+		else

+		{

@@ -180,2 +172,2 @@
-	 *  @param	string	$ref		ref object

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

+	 *  @param	int		$ref		ref object

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

@@ -198,2 +190,2 @@
-		$sql .= " FROM ".$this->db->prefix().$this->table_element." as c";

-		$sql .= " WHERE c.rowid = ".((int) $id);

+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as c";

+		$sql .= " WHERE c.rowid = ".$id;

@@ -203 +195,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -206 +199,2 @@
-			if ($num_rows) {

+			if ($num_rows)

+			{

@@ -223,6 +217,5 @@
-			if ($num_rows) {

-				return 1;

-			} else {

-				return 0;

-			}

-		} else {

+			if ($num_rows) return 1;

+			else return 0;

+		}

+		else

+		{

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

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

@@ -248,6 +241,2 @@
-		if (isset($this->fk_element)) {

-			$this->fk_project = (int) trim($this->fk_element);

-		}

-		if (isset($this->description)) {

-			$this->description = trim($this->description);

-		}

+		if (isset($this->fk_element)) $this->fk_project = (int) trim($this->fk_element);

+		if (isset($this->description)) $this->description = trim($this->description);

@@ -257 +246 @@
-		$sql = "UPDATE ".$this->db->prefix().$this->table_element." SET";

+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";

@@ -265 +254 @@
-		$sql .= " WHERE rowid=".((int) $this->id);

+		$sql .= " WHERE rowid=".$this->id;

@@ -271,7 +260,6 @@
-		if (!$resql) {

-			$error++;

-			$this->errors[] = "Error ".$this->db->lasterror();

-		}

-

-		if (!$error) {

-			if (!$notrigger) {

+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }

+

+		if (!$error)

+		{

+			if (!$notrigger)

+			{

@@ -280,3 +268 @@
-				if ($result < 0) {

-					$error++;

-				}

+				if ($result < 0) { $error++; }

@@ -288,2 +274,4 @@
-		if ($error) {

-			foreach ($this->errors as $errmsg) {

+		if ($error)

+		{

+			foreach ($this->errors as $errmsg)

+			{

@@ -290,0 +279,52 @@
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);

+			}

+			$this->db->rollback();

+			return -1 * $error;

+		}

+		else

+		{

+			$this->db->commit();

+			return 1;

+		}

+	}

+

+

+	/**

+	 *	Delete task from database

+	 *

+	 *	@param	User	$user        	User that delete

+	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers

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

+	 */

+	public function delete($user, $notrigger = 0)

+	{

+		global $conf, $langs;

+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

+

+		$error = 0;

+

+		$this->db->begin();

+

+		$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;

+		$sql .= " WHERE rowid=".$this->id;

+

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

+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }

+

+		if (!$error)

+		{

+			if (!$notrigger)

+			{

+				// Call trigger

+				$result = $this->call_trigger('TASK_COMMENT_DELETE', $user);

+				if ($result < 0) { $error++; }

+				// End call triggers

+			}

+		}

+

+		// Commit or rollback

+		if ($error)

+		{

+			foreach ($this->errors as $errmsg)

+			{

+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);

@@ -303,52 +343 @@
-	 *	Delete task from database

-	 *

-	 *	@param	User	$user        	User that delete

-	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers

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

-	 */

-	public function delete($user, $notrigger = 0)

-	{

-		global $conf, $langs;

-		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

-

-		$error = 0;

-

-		$this->db->begin();

-

-		$sql = "DELETE FROM ".$this->db->prefix().$this->table_element;

-		$sql .= " WHERE rowid=".((int) $this->id);

-

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

-		if (!$resql) {

-			$error++;

-			$this->errors[] = "Error ".$this->db->lasterror();

-		}

-

-		if (!$error) {

-			if (!$notrigger) {

-				// Call trigger

-				$result = $this->call_trigger('TASK_COMMENT_DELETE', $user);

-				if ($result < 0) {

-					$error++;

-				}

-				// End call triggers

-			}

-		}

-

-		// Commit or rollback

-		if ($error) {

-			foreach ($this->errors as $errmsg) {

-				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);

-				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);

-			}

-			$this->db->rollback();

-			return -1 * $error;

-		} else {

-			$this->db->commit();

-			return 1;

-		}

-	}

-

-

-	/**

-	 * Load comments linked with current task into ->comments

+	 * Load comments linked with current task

@@ -358 +347 @@
-	 * @return 	int								Result

+	 * @return 	array							Comment array

@@ -363 +351,0 @@
-

@@ -365 +352,0 @@
-

@@ -369,3 +356,3 @@
-			$sql .= " FROM ".$this->db->prefix().$this->table_element." as c";

-			$sql .= " WHERE c.fk_element = ".((int) $fk_element);

-			$sql .= " AND c.element_type = '".$this->db->escape($element_type)."'";

+			$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as c";

+			$sql .= " WHERE c.fk_element = ".$fk_element;

+			$sql .= " AND c.element_type = '".$db->escape($element_type)."'";

@@ -376,5 +363,8 @@
-			$resql = $this->db->query($sql);

-			if ($resql) {

-				$num_rows = $this->db->num_rows($resql);

-				if ($num_rows > 0) {

-					while ($obj = $this->db->fetch_object($resql)) {

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

+			if ($resql)

+			{

+				$num_rows = $db->num_rows($resql);

+				if ($num_rows > 0)

+				{

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

+					{

@@ -386 +376 @@
-				$this->db->free($resql);

+				$db->free($resql);

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_commondocgenerator.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_commondocgenerator.class.php
@@ -7,2 +7,2 @@
- * Copyright (C) 2016-2023  Charlene Benke          <charlene@patas-monkey.com>

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

+ * Copyright (C) 2016       Charlie Benke           <charlie@patas-monkey.com>

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

@@ -10 +9,0 @@
- * Copyright (C) 2024       Mélina Joum			    <melina.joum@altairis.fr>

@@ -35 +34 @@
- *	Parent class for documents (PDF, ODT, ...) generators

+ *	Parent class for documents generators

@@ -40,10 +38,0 @@
-	 * @var string Model name

-	 */

-	public $name = '';

-

-	/**

-	 * @var string Version

-	 */

-	public $version = '';

-

-	/**

@@ -53,0 +43,5 @@
+    /**

+     * @var string[]    Array of error strings

+     */

+    public $errors = array();

+

@@ -55,7 +49,2 @@
-	 * @var string[]    Array of error strings

-	 */

-	public $errors = array();

-

-	/**

-	 * @var DoliDB Database handler.

-	 */

+     * @var DoliDB Database handler.

+     */

@@ -64,3 +53,3 @@
-	/**

-	 * @var Extrafields object

-	 */

+    /**

+     * @var Extrafields object

+     */

@@ -68,104 +56,0 @@
-

-	/**

-	 * @var int	If set to 1, save the fullname of generated file with path as the main doc when generating a doc with this template.

-	 */

-	public $update_main_doc_field;

-

-	/**

-	 * @var string	The name of constant to use to scan ODT files (Exemple: 'COMMANDE_ADDON_PDF_ODT_PATH')

-	 */

-	public $scandir;

-

-	/**

-	 * @var string model description (short text)

-	 */

-	public $description;

-

-	/**

-	 * @var array

-	 */

-	public $format;

-

-	/**

-	 * @var string pdf, odt, etc

-	 */

-	public $type;

-

-	public $page_hauteur;

-	public $page_largeur;

-	public $marge_gauche;

-	public $marge_droite;

-	public $marge_haute;

-	public $marge_basse;

-

-	public $option_logo;

-	public $option_tva;

-	public $option_multilang;

-	public $option_freetext;

-	public $option_draft_watermark;

-	public $watermark;

-

-	public $option_modereg;

-	public $option_condreg;

-	public $option_escompte;

-	public $option_credit_note;

-

-	public $tva;

-	public $tva_array;

-	public $localtax1;

-	public $localtax2;

-

-	/**

-	 * @var int Tab Title Height

-	 */

-	public $tabTitleHeight;

-

-	/**

-	 * @var array default title fields style

-	 */

-	public $defaultTitlesFieldsStyle;

-

-	/**

-	 * @var array default content fields style

-	 */

-	public $defaultContentsFieldsStyle;

-

-	/**

-	 * @var Societe		Issuer of document

-	 */

-	public $emetteur;

-

-	/**

-	 * @var array Minimum version of PHP required by module.

-	 * e.g.: PHP ≥ 7.1 = array(7, 1)

-	 */

-	public $phpmin = array(7, 1);

-

-	/**

-	 * @var array	Array of columns

-	 */

-	public $cols;

-

-	/**

-	 * @var array	Array with result of doc generation. content is array('fullpath'=>$file)

-	 */

-	public $result;

-

-	public $posxlabel;

-	public $posxup;

-	public $posxref;

-	public $posxpicture;	// For picture

-	public $posxdesc;		// For description

-	public $posxqty;

-	public $posxpuht;

-	public $posxtva;

-	public $posxtotalht;

-	public $postotalht;

-	public $posxunit;

-	public $posxdiscount;

-	public $posxworkload;

-	public $posxtimespent;

-	public $posxprogress;

-	public $atleastonephoto;

-	public $atleastoneratenotnull;

-	public $atleastonediscount;

@@ -177,221 +62,170 @@
-	 */

-	public function __construct($db)

-	{

-		$this->db = $db;

-	}

-

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 * Define array with couple substitution key => substitution value

-	 *

-	 * @param   User		$user           User

-	 * @param   Translate	$outputlangs    Language object for output

-	 * @return	array						Array of substitution key->code

-	 */

-	public function get_substitutionarray_user($user, $outputlangs)

-	{

-		// phpcs:enable

-		global $conf, $extrafields;

-

-		$logotouse = $conf->user->dir_output.'/'.get_exdir($user->id, 2, 0, 1, $user, 'user').'/'.$user->photo;

-

-		$array_user = array(

-			'myuser_lastname'=>$user->lastname,

-			'myuser_firstname'=>$user->firstname,

-			'myuser_fullname'=>$user->getFullName($outputlangs, 1),

-			'myuser_login'=>$user->login,

-			'myuser_phone'=>$user->office_phone,

-			'myuser_address'=>$user->address,

-			'myuser_zip'=>$user->zip,

-			'myuser_town'=>$user->town,

-			'myuser_country'=>$user->country,

-			'myuser_country_code'=>$user->country_code,

-			'myuser_state'=>$user->state,

-			'myuser_state_code'=>$user->state_code,

-			'myuser_fax'=>$user->office_fax,

-			'myuser_mobile'=>$user->user_mobile,

-			'myuser_email'=>$user->email,

-			'myuser_logo'=>$logotouse,

-			'myuser_job'=>$user->job,

-			'myuser_web'=>'',	// url not exist in $user object

-			'myuser_birth'=>dol_print_date($user->birth, 'day', 'gmt'),

-			'myuser_dateemployment'=>dol_print_date($user->dateemployment, 'day', 'tzuser'),

-			'myuser_dateemploymentend'=>dol_print_date($user->dateemploymentend, 'day', 'tzuser'),

-			'myuser_gender'=>$user->gender,

-		);

-		// Retrieve extrafields

-		if (is_array($user->array_options) && count($user->array_options)) {

-			$array_user = $this->fill_substitutionarray_with_extrafields($user, $array_user, $extrafields, 'myuser', $outputlangs);

-		}

-		return $array_user;

-	}

-

-

-	/**

-	 * Define array with couple substitution key => substitution value

-	 *

-	 * @param   Adherent	$member         Member

-	 * @param   Translate	$outputlangs    Language object for output

-	 * @return	array						Array of substitution key->code

-	 */

-	public function getSubstitutionarrayMember($member, $outputlangs)

-	{

-		global $conf, $extrafields;

-

-		if ($member->photo) {

-			$logotouse = $conf->adherent->dir_output.'/'.get_exdir(0, 0, 0, 1, $member, 'user').'/photos/'.$member->photo;

-		} else {

-			$logotouse = DOL_DOCUMENT_ROOT.'/public/theme/common/nophoto.png';

-		}

-

-		$array_member = array(

-			'mymember_lastname' => $member->lastname,

-			'mymember_firstname' => $member->firstname,

-			'mymember_fullname' => $member->getFullName($outputlangs, 1),

-			'mymember_login' => $member->login,

-			'mymember_address' => $member->address,

-			'mymember_zip' => $member->zip,

-			'mymember_town' => $member->town,

-			'mymember_country_code' => $member->country_code,

-			'mymember_country' => $member->country,

-			'mymember_state_code' => $member->state_code,

-			'mymember_state' => $member->state,

-			'mymember_phone_perso' => $member->phone_perso,

-			'mymember_phone_pro' => $member->phone,

-			'mymember_phone_mobile' => $member->phone_mobile,

-			'mymember_email' => $member->email,

-			'mymember_logo' => $logotouse,

-			'mymember_gender' => $member->gender,

-			'mymember_birth_locale' => dol_print_date($member->birth, 'day', 'tzuser', $outputlangs),

-			'mymember_birth' => dol_print_date($member->birth, 'day', 'tzuser'),

-		);

-		// Retrieve extrafields

-		if (is_array($member->array_options) && count($member->array_options)) {

-			$array_member = $this->fill_substitutionarray_with_extrafields($member, $array_member, $extrafields, 'mymember', $outputlangs);

-		}

-		return $array_member;

-	}

-

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 * Define array with couple substitution key => substitution value

-	 *

-	 * @param   Societe		$mysoc			Object thirdparty

-	 * @param   Translate	$outputlangs    Language object for output

-	 * @return	array						Array of substitution key->code

-	 */

-	public function get_substitutionarray_mysoc($mysoc, $outputlangs)

-	{

-		// phpcs:enable

-		global $conf;

-

-		if (empty($mysoc->forme_juridique) && !empty($mysoc->forme_juridique_code)) {

-			$mysoc->forme_juridique = getFormeJuridiqueLabel($mysoc->forme_juridique_code);

-		}

-		if (empty($mysoc->country) && !empty($mysoc->country_code)) {

-			$mysoc->country = $outputlangs->transnoentitiesnoconv("Country".$mysoc->country_code);

-		}

-		if (empty($mysoc->state) && !empty($mysoc->state_code)) {

-			$mysoc->state = getState($mysoc->state_code, 0);

-		}

-

-		$logotouse = $conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;

-

-		return array(

-			'mycompany_logo'=>$logotouse,

-			'mycompany_name'=>$mysoc->name,

-			'mycompany_email'=>$mysoc->email,

-			'mycompany_phone'=>$mysoc->phone,

-			'mycompany_fax'=>$mysoc->fax,

-			'mycompany_address'=>$mysoc->address,

-			'mycompany_zip'=>$mysoc->zip,

-			'mycompany_town'=>$mysoc->town,

-			'mycompany_country'=>$mysoc->country,

-			'mycompany_country_code'=>$mysoc->country_code,

-			'mycompany_state'=>$mysoc->state,

-			'mycompany_state_code'=>$mysoc->state_code,

-			'mycompany_web'=>$mysoc->url,

-			'mycompany_juridicalstatus'=>$mysoc->forme_juridique,

-			'mycompany_managers'=>$mysoc->managers,

-			'mycompany_capital'=>$mysoc->capital,

-			'mycompany_barcode'=>$mysoc->barcode,

-			'mycompany_idprof1'=>$mysoc->idprof1,

-			'mycompany_idprof2'=>$mysoc->idprof2,

-			'mycompany_idprof3'=>$mysoc->idprof3,

-			'mycompany_idprof4'=>$mysoc->idprof4,

-			'mycompany_idprof5'=>$mysoc->idprof5,

-			'mycompany_idprof6'=>$mysoc->idprof6,

-			'mycompany_vatnumber'=>$mysoc->tva_intra,

-			'mycompany_socialobject'=>$mysoc->socialobject,

-			'mycompany_note_private'=>$mysoc->note_private,

-			//'mycompany_note_public'=>$mysoc->note_public,        // Only private not exists for "mysoc" but both for thirdparties

-		);

-	}

-

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 * Define array with couple substitution key => substitution value

-	 * For example {company_name}, {company_name_alias}

-	 *

-	 * @param	Societe		$object			Object

-	 * @param   Translate	$outputlangs    Language object for output

-	 * @param   string		$array_key	    Name of the key for return array

-	 * @return	array						Array of substitution key->code

-	 */

-	public function get_substitutionarray_thirdparty($object, $outputlangs, $array_key = 'company')

-	{

-		// phpcs:enable

-		global $extrafields;

-

-		if (empty($object->country) && !empty($object->country_code)) {

-			$object->country = $outputlangs->transnoentitiesnoconv("Country".$object->country_code);

-		}

-		if (empty($object->state) && !empty($object->state_code)) {

-			$object->state = getState($object->state_code, 0);

-		}

-

-		$array_thirdparty = array(

-			'company_name'=>$object->name,

-			'company_name_alias' => $object->name_alias,

-			'company_email'=>$object->email,

-			'company_phone'=>$object->phone,

-			'company_fax'=>$object->fax,

-			'company_address'=>$object->address,

-			'company_zip'=>$object->zip,

-			'company_town'=>$object->town,

-			'company_country'=>$object->country,

-			'company_country_code'=>$object->country_code,

-			'company_state'=>$object->state,

-			'company_state_code'=>$object->state_code,

-			'company_web'=>$object->url,

-			'company_barcode'=>$object->barcode,

-			'company_vatnumber'=>$object->tva_intra,

-			'company_customercode'=>$object->code_client,

-			'company_suppliercode'=>$object->code_fournisseur,

-			'company_customeraccountancycode'=>$object->code_compta,

-			'company_supplieraccountancycode'=>$object->code_compta_fournisseur,

-			'company_juridicalstatus'=>$object->forme_juridique,

-			'company_outstanding_limit'=>$object->outstanding_limit,

-			'company_capital'=>$object->capital,

-			'company_capital_formated'=> price($object->capital, 0, '', 1, -1),

-			'company_idprof1'=>$object->idprof1,

-			'company_idprof2'=>$object->idprof2,

-			'company_idprof3'=>$object->idprof3,

-			'company_idprof4'=>$object->idprof4,

-			'company_idprof5'=>$object->idprof5,

-			'company_idprof6'=>$object->idprof6,

-			'company_note_public'=>$object->note_public,

-			'company_note_private'=>$object->note_private,

-			'company_default_bank_iban'=>(is_object($object->bank_account) ? $object->bank_account->iban : ''),

-			'company_default_bank_bic'=>(is_object($object->bank_account) ? $object->bank_account->bic : '')

-		);

-

-		// Retrieve extrafields

-		if (is_array($object->array_options) && count($object->array_options)) {

-			$object->fetch_optionals();

-

-			$array_thirdparty = $this->fill_substitutionarray_with_extrafields($object, $array_thirdparty, $extrafields, $array_key, $outputlangs);

-		}

+	*/

+    public function __construct($db)

+    {

+        $this->db = $db;

+    }

+

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     * Define array with couple substitution key => substitution value

+     *

+     * @param   User		$user           User

+     * @param   Translate	$outputlangs    Language object for output

+     * @return	array						Array of substitution key->code

+     */

+    public function get_substitutionarray_user($user, $outputlangs)

+    {

+        // phpcs:enable

+        global $conf;

+

+        $logotouse = $conf->user->dir_output.'/'.get_exdir($user->id, 2, 0, 1, $user, 'user').'/'.$user->photo;

+

+        return array(

+            'myuser_lastname'=>$user->lastname,

+            'myuser_firstname'=>$user->firstname,

+            'myuser_fullname'=>$user->getFullName($outputlangs, 1),

+            'myuser_login'=>$user->login,

+            'myuser_phone'=>$user->office_phone,

+       		'myuser_address'=>$user->address,

+       		'myuser_zip'=>$user->zip,

+       		'myuser_town'=>$user->town,

+       		'myuser_country'=>$user->country,

+        	'myuser_country_code'=>$user->country_code,

+       		'myuser_state'=>$user->state,

+        	'myuser_state_code'=>$user->state_code,

+        	'myuser_fax'=>$user->office_fax,

+            'myuser_mobile'=>$user->user_mobile,

+            'myuser_email'=>$user->email,

+        	'myuser_logo'=>$logotouse,

+        	'myuser_job'=>$user->job,

+            'myuser_web'=>''	// url not exist in $user object

+        );

+    }

+

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     * Define array with couple substitution key => substitution value

+     *

+     * @param   Societe		$mysoc			Object thirdparty

+     * @param   Translate	$outputlangs    Language object for output

+     * @return	array						Array of substitution key->code

+     */

+    public function get_substitutionarray_mysoc($mysoc, $outputlangs)

+    {

+        // phpcs:enable

+        global $conf;

+

+        if (empty($mysoc->forme_juridique) && !empty($mysoc->forme_juridique_code))

+        {

+            $mysoc->forme_juridique = getFormeJuridiqueLabel($mysoc->forme_juridique_code);

+        }

+        if (empty($mysoc->country) && !empty($mysoc->country_code))

+        {

+        	$mysoc->country = $outputlangs->transnoentitiesnoconv("Country".$mysoc->country_code);

+        }

+        if (empty($mysoc->state) && !empty($mysoc->state_code))

+        {

+        	$mysoc->state = getState($mysoc->state_code, 0);

+        }

+

+        $logotouse = $conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;

+

+        return array(

+            'mycompany_logo'=>$logotouse,

+            'mycompany_name'=>$mysoc->name,

+            'mycompany_email'=>$mysoc->email,

+            'mycompany_phone'=>$mysoc->phone,

+            'mycompany_fax'=>$mysoc->fax,

+            'mycompany_address'=>$mysoc->address,

+            'mycompany_zip'=>$mysoc->zip,

+            'mycompany_town'=>$mysoc->town,

+            'mycompany_country'=>$mysoc->country,

+            'mycompany_country_code'=>$mysoc->country_code,

+            'mycompany_state'=>$mysoc->state,

+            'mycompany_state_code'=>$mysoc->state_code,

+        	'mycompany_web'=>$mysoc->url,

+            'mycompany_juridicalstatus'=>$mysoc->forme_juridique,

+            'mycompany_managers'=>$mysoc->managers,

+            'mycompany_capital'=>$mysoc->capital,

+            'mycompany_barcode'=>$mysoc->barcode,

+            'mycompany_idprof1'=>$mysoc->idprof1,

+            'mycompany_idprof2'=>$mysoc->idprof2,

+            'mycompany_idprof3'=>$mysoc->idprof3,

+            'mycompany_idprof4'=>$mysoc->idprof4,

+            'mycompany_idprof5'=>$mysoc->idprof5,

+            'mycompany_idprof6'=>$mysoc->idprof6,

+        	'mycompany_vatnumber'=>$mysoc->tva_intra,

+			'mycompany_object'=>$mysoc->object,

+            'mycompany_note_private'=>$mysoc->note_private,

+            //'mycompany_note_public'=>$mysoc->note_public,        // Only private not exists for "mysoc" but both for thirdparties

+        );

+    }

+

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     * Define array with couple substitution key => substitution value

+     *

+     * @param	Societe		$object			Object

+     * @param   Translate	$outputlangs    Language object for output

+     * @param   string		$array_key	    Name of the key for return array

+     * @return	array						Array of substitution key->code

+     */

+    public function get_substitutionarray_thirdparty($object, $outputlangs, $array_key = 'company')

+    {

+        // phpcs:enable

+        global $conf, $extrafields;

+

+        if (empty($object->country) && !empty($object->country_code))

+        {

+        	$object->country = $outputlangs->transnoentitiesnoconv("Country".$object->country_code);

+        }

+        if (empty($object->state) && !empty($object->state_code))

+        {

+        	$object->state = getState($object->state_code, 0);

+        }

+

+        $array_thirdparty = array(

+            'company_name'=>$object->name,

+	        'company_name_alias' => $object->name_alias,

+            'company_email'=>$object->email,

+            'company_phone'=>$object->phone,

+            'company_fax'=>$object->fax,

+            'company_address'=>$object->address,

+            'company_zip'=>$object->zip,

+            'company_town'=>$object->town,

+            'company_country'=>$object->country,

+        	'company_country_code'=>$object->country_code,

+            'company_state'=>$object->state,

+        	'company_state_code'=>$object->state_code,

+        	'company_web'=>$object->url,

+            'company_barcode'=>$object->barcode,

+            'company_vatnumber'=>$object->tva_intra,

+            'company_customercode'=>$object->code_client,

+            'company_suppliercode'=>$object->code_fournisseur,

+            'company_customeraccountancycode'=>$object->code_compta,

+            'company_supplieraccountancycode'=>$object->code_compta_fournisseur,

+            'company_juridicalstatus'=>$object->forme_juridique,

+            'company_outstanding_limit'=>$object->outstanding_limit,

+            'company_capital'=>$object->capital,

+            'company_idprof1'=>$object->idprof1,

+            'company_idprof2'=>$object->idprof2,

+            'company_idprof3'=>$object->idprof3,

+            'company_idprof4'=>$object->idprof4,

+            'company_idprof5'=>$object->idprof5,

+            'company_idprof6'=>$object->idprof6,

+            'company_note_public'=>$object->note_public,

+            'company_note_private'=>$object->note_private,

+        	'company_default_bank_iban'=>(is_object($object->bank_account) ? $object->bank_account->iban : ''),

+        	'company_default_bank_bic'=>(is_object($object->bank_account) ? $object->bank_account->bic : '')

+        );

+

+	    // Retrieve extrafields

+	    if (is_array($object->array_options) && count($object->array_options))

+	    {

+		    $object->fetch_optionals();

+

+		    $array_thirdparty = $this->fill_substitutionarray_with_extrafields($object, $array_thirdparty, $extrafields, $array_key, $outputlangs);

+	    }

@@ -401 +235 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -410,3 +244,3 @@
-	public function get_substitutionarray_contact($object, $outputlangs, $array_key = 'object')

-	{

-		// phpcs:enable

+    public function get_substitutionarray_contact($object, $outputlangs, $array_key = 'object')

+    {

+        // phpcs:enable

@@ -415 +249,2 @@
-		if (empty($object->country) && !empty($object->country_code)) {

+		if (empty($object->country) && !empty($object->country_code))

+		{

@@ -418 +253,2 @@
-		if (empty($object->state) && !empty($object->state_code)) {

+		if (empty($object->state) && !empty($object->state_code))

+		{

@@ -439,0 +276 @@
+			$array_key.'_jabberid' => $object->jabberid, // deprecated

@@ -451,6 +288,7 @@
-		// Retrieve extrafields

-		if (is_array($object->array_options) && count($object->array_options)) {

-			$object->fetch_optionals();

-

-			$array_contact = $this->fill_substitutionarray_with_extrafields($object, $array_contact, $extrafields, $array_key, $outputlangs);

-		}

+	    // Retrieve extrafields

+	    if (is_array($object->array_options) && count($object->array_options))

+	    {

+		    $object->fetch_optionals();

+

+		    $array_contact = $this->fill_substitutionarray_with_extrafields($object, $array_contact, $extrafields, $array_key, $outputlangs);

+	    }

@@ -461 +299,39 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     * Define array with couple substitution key => substitution value

+     *

+     * @param   Translate	$outputlangs    Language object for output

+     * @return	array						Array of substitution key->code

+     */

+    public function get_substitutionarray_other($outputlangs)

+    {

+        // phpcs:enable

+    	global $conf;

+

+    	$now = dol_now('gmt'); // gmt

+    	$array_other = array(

+    	    // Date in default language

+    	    'current_date'=>dol_print_date($now, 'day', 'tzuser'),

+    	    'current_datehour'=>dol_print_date($now, 'dayhour', 'tzuser'),

+   			'current_server_date'=>dol_print_date($now, 'day', 'tzserver'),

+   			'current_server_datehour'=>dol_print_date($now, 'dayhour', 'tzserver'),

+    	    // Date in requested output language

+    	    'current_date_locale'=>dol_print_date($now, 'day', 'tzuser', $outputlangs),

+   			'current_datehour_locale'=>dol_print_date($now, 'dayhour', 'tzuser', $outputlangs),

+   			'current_server_date_locale'=>dol_print_date($now, 'day', 'tzserver', $outputlangs),

+   			'current_server_datehour_locale'=>dol_print_date($now, 'dayhour', 'tzserver', $outputlangs),

+    	);

+

+

+    	foreach ($conf->global as $key => $val)

+    	{

+    		if (preg_match('/(_pass|_pw|password|secret|_key|key$)/i', $key)) $newval = '*****forbidden*****';

+    		else $newval = $val;

+    		$array_other['__['.$key.']__'] = $newval;

+    	}

+

+    	return $array_other;

+    }

+

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -465,41 +340,0 @@
-	 * @param   Translate	$outputlangs    Language object for output

-	 * @return	array						Array of substitution key->code

-	 */

-	public function get_substitutionarray_other($outputlangs)

-	{

-		// phpcs:enable

-		global $conf;

-

-		$now = dol_now('gmt'); // gmt

-		$array_other = array(

-			// Date in default language

-			'current_date'=>dol_print_date($now, 'day', 'tzuser'),

-			'current_datehour'=>dol_print_date($now, 'dayhour', 'tzuser'),

-			'current_server_date'=>dol_print_date($now, 'day', 'tzserver'),

-			'current_server_datehour'=>dol_print_date($now, 'dayhour', 'tzserver'),

-			// Date in requested output language

-			'current_date_locale'=>dol_print_date($now, 'day', 'tzuser', $outputlangs),

-			'current_datehour_locale'=>dol_print_date($now, 'dayhour', 'tzuser', $outputlangs),

-			'current_server_date_locale'=>dol_print_date($now, 'day', 'tzserver', $outputlangs),

-			'current_server_datehour_locale'=>dol_print_date($now, 'dayhour', 'tzserver', $outputlangs),

-		);

-

-

-		foreach ($conf->global as $key => $val) {

-			if (isASecretKey($key)) {

-				$newval = '*****forbidden*****';

-			} else {

-				$newval = $val;

-			}

-			$array_other['__['.$key.']__'] = $newval;

-		}

-

-		return $array_other;

-	}

-

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 * Define array with couple substitution key => substitution value

-	 * Note that vars into substitutions array are formatted.

-	 *

@@ -508 +343 @@
-	 * @param   string		    $array_key	        Name of the key for return array

+     * @param   string		    $array_key	        Name of the key for return array

@@ -513 +348 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -518,2 +353,3 @@
-

-		if ($object->element == 'facture') {

+		$remain_to_pay = 0;

+		if ($object->element == 'facture')

+		{

@@ -521 +357,2 @@
-			if ($object->fk_facture_source > 0) {

+			if ($object->fk_facture_source > 0)

+			{

@@ -528,83 +365,3 @@
-		}

-

-		$date = (isset($object->element) && $object->element == 'contrat' && isset($object->date_contrat)) ? $object->date_contrat : (isset($object->date) ? $object->date : null);

-

-		if (get_class($object) == 'CommandeFournisseur') {

-			/* @var $object CommandeFournisseur*/

-			$object->date_validation =  $object->date_valid;

-			$object->date_commande = $object->date;

-		}

-		$resarray = array(

-			$array_key.'_id'=>$object->id,

-			$array_key.'_ref' => (property_exists($object, 'ref') ? $object->ref : ''),

-			$array_key.'_label' => (property_exists($object, 'label') ? $object->label : ''),

-			$array_key.'_ref_ext' => (property_exists($object, 'ref_ext') ? $object->ref_ext : ''),

-			$array_key.'_ref_customer'=>(!empty($object->ref_client) ? $object->ref_client : (empty($object->ref_customer) ? '' : $object->ref_customer)),

-			$array_key.'_ref_supplier'=>(!empty($object->ref_fournisseur) ? $object->ref_fournisseur : (empty($object->ref_supplier) ? '' : $object->ref_supplier)),

-			$array_key.'_source_invoice_ref'=>((empty($invoice_source) || empty($invoice_source->ref)) ? '' : $invoice_source->ref),

-			// Dates

-			$array_key.'_hour'=>dol_print_date($date, 'hour'),

-			$array_key.'_date'=>dol_print_date($date, 'day'),

-			$array_key.'_date_rfc'=>dol_print_date($date, 'dayrfc'),

-			$array_key.'_date_limit'=>(!empty($object->date_lim_reglement) ? dol_print_date($object->date_lim_reglement, 'day') : ''),

-			$array_key.'_date_limit_rfc'=>(!empty($object->date_lim_reglement) ? dol_print_date($object->date_lim_reglement, 'dayrfc') : ''),

-			$array_key.'_date_end'=>(!empty($object->fin_validite) ? dol_print_date($object->fin_validite, 'day') : ''),

-			$array_key.'_date_creation'=>dol_print_date($object->date_creation, 'day'),

-			$array_key.'_date_modification'=>(!empty($object->date_modification) ? dol_print_date($object->date_modification, 'day') : ''),

-			$array_key.'_date_validation'=>(!empty($object->date_validation) ? dol_print_date($object->date_validation, 'dayhour') : ''),

-			$array_key.'_date_approve'=>(!empty($object->date_approve) ? dol_print_date($object->date_approve, 'day') : ''),

-			$array_key.'_date_delivery_planed'=>(!empty($object->delivery_date) ? dol_print_date($object->delivery_date, 'day') : ''),

-			$array_key.'_date_close'=>(!empty($object->date_cloture) ? dol_print_date($object->date_cloture, 'dayhour') : ''),

-

-			$array_key.'_payment_mode_code'=>$object->mode_reglement_code,

-			$array_key.'_payment_mode'=>($outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code) != 'PaymentType'.$object->mode_reglement_code ? $outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code) : $object->mode_reglement),

-			$array_key.'_payment_term_code'=>$object->cond_reglement_code,

-			$array_key.'_payment_term'=>($outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code) != 'PaymentCondition'.$object->cond_reglement_code ? $outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code) : ($object->cond_reglement_doc ? $object->cond_reglement_doc : $object->cond_reglement)),

-

-			$array_key.'_incoterms' => (method_exists($object, 'display_incoterms') ? $object->display_incoterms() : ''),

-

-			$array_key.'_total_ht_locale'=>price($object->total_ht, 0, $outputlangs),

-			$array_key.'_total_vat_locale'=>(!empty($object->total_vat) ? price($object->total_vat, 0, $outputlangs) : price($object->total_tva, 0, $outputlangs)),

-			$array_key.'_total_localtax1_locale'=>price($object->total_localtax1, 0, $outputlangs),

-			$array_key.'_total_localtax2_locale'=>price($object->total_localtax2, 0, $outputlangs),

-			$array_key.'_total_ttc_locale'=>price($object->total_ttc, 0, $outputlangs),

-

-			$array_key.'_total_ht'=>price2num($object->total_ht),

-			$array_key.'_total_vat'=>(!empty($object->total_vat) ? price2num($object->total_vat) : price2num($object->total_tva)),

-			$array_key.'_total_localtax1'=>price2num($object->total_localtax1),

-			$array_key.'_total_localtax2'=>price2num($object->total_localtax2),

-			$array_key.'_total_ttc'=>price2num($object->total_ttc),

-

-			$array_key.'_multicurrency_code' => $object->multicurrency_code,

-			$array_key.'_multicurrency_tx' => price2num($object->multicurrency_tx),

-			$array_key.'_multicurrency_total_ht' => price2num($object->multicurrency_total_ht),

-			$array_key.'_multicurrency_total_tva' => price2num($object->multicurrency_total_tva),

-			$array_key.'_multicurrency_total_ttc' => price2num($object->multicurrency_total_ttc),

-			$array_key.'_multicurrency_total_ht_locale' => price($object->multicurrency_total_ht, 0, $outputlangs),

-			$array_key.'_multicurrency_total_tva_locale' => price($object->multicurrency_total_tva, 0, $outputlangs),

-			$array_key.'_multicurrency_total_ttc_locale' => price($object->multicurrency_total_ttc, 0, $outputlangs),

-

-			$array_key.'_note_private'=>$object->note_private,

-			$array_key.'_note_public'=>$object->note_public,

-			$array_key.'_note'=>$object->note_public, // For backward compatibility

-

-			// Payments

-			$array_key.'_already_payed_locale'=>price($sumpayed, 0, $outputlangs),

-			$array_key.'_already_payed'=>price2num($sumpayed),

-			$array_key.'_already_deposit_locale'=>price($sumdeposit, 0, $outputlangs),

-			$array_key.'_already_deposit'=>price2num($sumdeposit),

-			$array_key.'_already_creditnote_locale'=>price($sumcreditnote, 0, $outputlangs),

-			$array_key.'_already_creditnote'=>price2num($sumcreditnote),

-

-			$array_key.'_already_payed_all_locale'=>price(price2num($already_payed_all, 'MT'), 0, $outputlangs),

-			$array_key.'_already_payed_all'=> price2num($already_payed_all, 'MT'),

-

-			// Remain to pay with all known information (except open direct debit requests)

-			$array_key.'_remain_to_pay_locale'=>price(price2num($object->total_ttc - $already_payed_all, 'MT'), 0, $outputlangs),

-			$array_key.'_remain_to_pay'=>price2num($object->total_ttc - $already_payed_all, 'MT')

-		);

-

-		if (in_array($object->element, array('facture', 'invoice', 'supplier_invoice', 'facture_fournisseur'))) {

-			$bank_account = null;

-

-			if (property_exists($object, 'fk_account') && $object->fk_account > 0) {

+			$remain_to_pay = $sumpayed - $sumdeposit - $sumcreditnote;

+

+			if ($object->fk_account > 0) {

@@ -615,6 +371,0 @@
-

-			$resarray[$array_key.'_bank_iban'] = (empty($bank_account) ? '' : $bank_account->iban);

-			$resarray[$array_key.'_bank_bic'] = (empty($bank_account) ? '' : $bank_account->bic);

-			$resarray[$array_key.'_bank_label'] = (empty($bank_account) ? '' : $bank_account->label);

-			$resarray[$array_key.'_bank_number'] = (empty($bank_account) ? '' : $bank_account->number);

-			$resarray[$array_key.'_bank_proprio'] =(empty($bank_account) ? '' : $bank_account->proprio);

@@ -623 +374,71 @@
-		if (method_exists($object, 'getTotalDiscount') && in_array(get_class($object), array('Propal', 'Proposal', 'Commande', 'Facture', 'SupplierProposal', 'CommandeFournisseur', 'FactureFournisseur'))) {

+		$date = ($object->element == 'contrat' ? $object->date_contrat : $object->date);

+

+		$resarray = array(

+		$array_key.'_id'=>$object->id,

+		$array_key.'_ref'=>$object->ref,

+		$array_key.'_ref_ext'=>$object->ref_ext,

+		$array_key.'_ref_customer'=>(!empty($object->ref_client) ? $object->ref_client : (empty($object->ref_customer) ? '' : $object->ref_customer)),

+		$array_key.'_ref_supplier'=>(!empty($object->ref_fournisseur) ? $object->ref_fournisseur : (empty($object->ref_supplier) ? '' : $object->ref_supplier)),

+		$array_key.'_source_invoice_ref'=>$invoice_source->ref,

+		// Dates

+        $array_key.'_hour'=>dol_print_date($date, 'hour'),

+		$array_key.'_date'=>dol_print_date($date, 'day'),

+		$array_key.'_date_rfc'=>dol_print_date($date, 'dayrfc'),

+		$array_key.'_date_limit'=>(!empty($object->date_lim_reglement) ?dol_print_date($object->date_lim_reglement, 'day') : ''),

+	    $array_key.'_date_end'=>(!empty($object->fin_validite) ?dol_print_date($object->fin_validite, 'day') : ''),

+		$array_key.'_date_creation'=>dol_print_date($object->date_creation, 'day'),

+		$array_key.'_date_modification'=>(!empty($object->date_modification) ?dol_print_date($object->date_modification, 'day') : ''),

+		$array_key.'_date_validation'=>(!empty($object->date_validation) ?dol_print_date($object->date_validation, 'dayhour') : ''),

+		$array_key.'_date_delivery_planed'=>(!empty($object->date_livraison) ?dol_print_date($object->date_livraison, 'day') : ''),

+		$array_key.'_date_close'=>(!empty($object->date_cloture) ?dol_print_date($object->date_cloture, 'dayhour') : ''),

+

+		$array_key.'_payment_mode_code'=>$object->mode_reglement_code,

+		$array_key.'_payment_mode'=>($outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code) != 'PaymentType'.$object->mode_reglement_code ? $outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code) : $object->mode_reglement),

+		$array_key.'_payment_term_code'=>$object->cond_reglement_code,

+		$array_key.'_payment_term'=>($outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code) != 'PaymentCondition'.$object->cond_reglement_code ? $outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code) : ($object->cond_reglement_doc ? $object->cond_reglement_doc : $object->cond_reglement)),

+

+		$array_key.'_bank_iban'=>$bank_account->iban,

+		$array_key.'_bank_bic'=>$bank_account->bic,

+

+		$array_key.'_total_ht_locale'=>price($object->total_ht, 0, $outputlangs),

+		$array_key.'_total_vat_locale'=>(!empty($object->total_vat) ?price($object->total_vat, 0, $outputlangs) : price($object->total_tva, 0, $outputlangs)),

+		$array_key.'_total_localtax1_locale'=>price($object->total_localtax1, 0, $outputlangs),

+		$array_key.'_total_localtax2_locale'=>price($object->total_localtax2, 0, $outputlangs),

+		$array_key.'_total_ttc_locale'=>price($object->total_ttc, 0, $outputlangs),

+

+		$array_key.'_total_ht'=>price2num($object->total_ht),

+		$array_key.'_total_vat'=>(!empty($object->total_vat) ?price2num($object->total_vat) : price2num($object->total_tva)),

+		$array_key.'_total_localtax1'=>price2num($object->total_localtax1),

+		$array_key.'_total_localtax2'=>price2num($object->total_localtax2),

+		$array_key.'_total_ttc'=>price2num($object->total_ttc),

+

+		$array_key.'_multicurrency_code' => price2num($object->multicurrency_code),

+		$array_key.'_multicurrency_tx' => price2num($object->multicurrency_tx),

+	    $array_key.'_multicurrency_total_ht' => price2num($object->multicurrency_total_ht),

+	    $array_key.'_multicurrency_total_tva' => price2num($object->multicurrency_total_tva),

+		$array_key.'_multicurrency_total_ttc' => price2num($object->multicurrency_total_ttc),

+		$array_key.'_multicurrency_total_ht_locale' => price($object->multicurrency_total_ht, 0, $outputlangs),

+		$array_key.'_multicurrency_total_tva_locale' => price($object->multicurrency_total_tva, 0, $outputlangs),

+		$array_key.'_multicurrency_total_ttc_locale' => price($object->multicurrency_total_ttc, 0, $outputlangs),

+

+		$array_key.'_note_private'=>$object->note,

+		$array_key.'_note_public'=>$object->note_public,

+		$array_key.'_note'=>$object->note_public, // For backward compatibility

+

+		// Payments

+		$array_key.'_already_payed_locale'=>price($sumpayed, 0, $outputlangs),

+		$array_key.'_already_payed'=>price2num($sumpayed),

+		$array_key.'_already_deposit_locale'=>price($sumdeposit, 0, $outputlangs),

+		$array_key.'_already_deposit'=>price2num($sumdeposit),

+		$array_key.'_already_creditnote_locale'=>price($sumcreditnote, 0, $outputlangs),

+		$array_key.'_already_creditnote'=>price2num($sumcreditnote),

+

+		$array_key.'_already_payed_all_locale'=>price(price2num($already_payed_all, 'MT'), 0, $outputlangs),

+		$array_key.'_already_payed_all'=> price2num($already_payed_all, 'MT'),

+

+		// Remain to pay with all know information (except open direct debit requests)

+		$array_key.'_remain_to_pay_locale'=>price(price2num($object->total_ttc - $remain_to_pay, 'MT'), 0, $outputlangs),

+		$array_key.'_remain_to_pay'=>price2num($object->total_ttc - $remain_to_pay, 'MT')

+		);

+

+		if (method_exists($object, 'getTotalDiscount')) {

@@ -632,2 +453,4 @@
-		if ($object->element != "project" && !empty($object->fk_project) && $object->fk_project > 0) {

-			if (!is_object($object->project)) {

+		if ($object->element != "project" && !empty($object->fk_project) && $object->fk_project > 0)

+		{

+			if (!is_object($object->project))

+			{

@@ -642,6 +464,0 @@
-		} else { // empty replacement

-			$resarray[$array_key.'_project_ref'] ='';

-			$resarray[$array_key.'_project_title'] = '';

-			$resarray[$array_key.'_project_description'] = '';

-			$resarray[$array_key.'_project_date_start'] = '';

-			$resarray[$array_key.'_project_date_end'] = '';

@@ -651 +468,2 @@
-		if (is_array($object->lines) && count($object->lines) > 0) {

+		if (is_array($object->lines) && count($object->lines) > 0)

+		{

@@ -653,6 +471,4 @@
-			// Set substitution keys for different VAT rates

-			foreach ($object->lines as $line) {

-				// $line->tva_tx format depends on database field accuracy, no reliable. This is kept for backward compatibility

-				if (empty($resarray[$array_key.'_total_vat_'.$line->tva_tx])) {

-					$resarray[$array_key.'_total_vat_'.$line->tva_tx] = 0;

-				}

+			foreach ($object->lines as $line)

+			{

+			    // $line->tva_tx format depends on database field accuraty, no reliable. This is kept for backward compatibility

+				if (empty($resarray[$array_key.'_total_vat_'.$line->tva_tx])) $resarray[$array_key.'_total_vat_'.$line->tva_tx] = 0;

@@ -661 +477 @@
-				// $vatformated is vat without not expected chars (so 20, or 8.5 or 5.99 for example)

+			    // $vatformated is vat without not expected chars (so 20, or 8.5 or 5.99 for example)

@@ -663,3 +479 @@
-				if (empty($resarray[$array_key.'_total_vat_'.$vatformated])) {

-					$resarray[$array_key.'_total_vat_'.$vatformated] = 0;

-				}

+				if (empty($resarray[$array_key.'_total_vat_'.$vatformated])) $resarray[$array_key.'_total_vat_'.$vatformated] = 0;

@@ -672,2 +486,2 @@
-			// Calculate total up and total discount percentage

-			// Note that this added fields does not match a field into database in Dolibarr (Dolibarr manage discount on lines not as a global property of object)

+			// @GS: Calculate total up and total discount percentage

+			// Note that this added fields correspond to nothing in Dolibarr (Dolibarr manage discount on lines not globally)

@@ -676 +490 @@
-			if (method_exists($object, 'getTotalDiscount') && in_array(get_class($object), array('Propal', 'Proposal', 'Commande', 'Facture', 'SupplierProposal', 'CommandeFournisseur', 'FactureFournisseur'))) {

+			if (method_exists($object, 'getTotalDiscount')) {

@@ -691 +505,2 @@
-		if (is_array($object->array_options) && count($object->array_options)) {

+		if (is_array($object->array_options) && count($object->array_options))

+		{

@@ -700 +515 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -703 +517,0 @@
-	 *  Note that vars into substitutions array are formatted.

@@ -712 +526,3 @@
-		// phpcs:enable

+        // phpcs:enable

+		global $conf;

+

@@ -716,8 +532,4 @@
-

-			'line_product_ref'=>(empty($line->product_ref) ? '' : $line->product_ref),

-			'line_product_ref_fourn'=>(empty($line->ref_fourn) ? '' : $line->ref_fourn), // for supplier doc lines

-			'line_product_label'=>(empty($line->product_label) ? '' : $line->product_label),

-			'line_product_type'=>(empty($line->product_type) ? '' : $line->product_type),

-			'line_product_barcode'=>(empty($line->product_barcode) ? '' : $line->product_barcode),

-			'line_product_desc'=>(empty($line->product_desc) ? '' : $line->product_desc),

-

+			'line_product_ref'=>$line->product_ref,

+			'line_product_ref_fourn'=>$line->ref_fourn, // for supplier doc lines

+			'line_product_label'=>$line->product_label,

+			'line_product_type'=>$line->product_type,

@@ -726,3 +538,3 @@
-			'line_localtax1_rate'=>vatrate($line->localtax1_tx),

-			'line_localtax2_rate'=>vatrate($line->localtax1_tx),

-			'line_up'=>price2num($line->subprice),

+		    'line_localtax1_rate'=>vatrate($line->localtax1_tx),

+		    'line_localtax2_rate'=>vatrate($line->localtax1_tx),

+		    'line_up'=>price2num($line->subprice),

@@ -740 +552 @@
-			// Dates

+		    // Dates

@@ -743,14 +555,14 @@
-			'line_date_start_rfc'=>dol_print_date($line->date_start, 'dayrfc'),

-			'line_date_end'=>dol_print_date($line->date_end, 'day'),

-			'line_date_end_locale'=>dol_print_date($line->date_end, 'day', 'tzserver', $outputlangs),

-			'line_date_end_rfc'=>dol_print_date($line->date_end, 'dayrfc'),

-

-			'line_multicurrency_code' => price2num($line->multicurrency_code),

-			'line_multicurrency_subprice' => price2num($line->multicurrency_subprice),

-			'line_multicurrency_total_ht' => price2num($line->multicurrency_total_ht),

-			'line_multicurrency_total_tva' => price2num($line->multicurrency_total_tva),

-			'line_multicurrency_total_ttc' => price2num($line->multicurrency_total_ttc),

-			'line_multicurrency_subprice_locale' => price($line->multicurrency_subprice, 0, $outputlangs),

-			'line_multicurrency_total_ht_locale' => price($line->multicurrency_total_ht, 0, $outputlangs),

-			'line_multicurrency_total_tva_locale' => price($line->multicurrency_total_tva, 0, $outputlangs),

-			'line_multicurrency_total_ttc_locale' => price($line->multicurrency_total_ttc, 0, $outputlangs),

+		    'line_date_start_rfc'=>dol_print_date($line->date_start, 'dayrfc'),

+		    'line_date_end'=>dol_print_date($line->date_end, 'day'),

+		    'line_date_end_locale'=>dol_print_date($line->date_end, 'day', 'tzserver', $outputlangs),

+		    'line_date_end_rfc'=>dol_print_date($line->date_end, 'dayrfc'),

+

+		    'line_multicurrency_code' => price2num($line->multicurrency_code),

+		    'line_multicurrency_subprice' => price2num($line->multicurrency_subprice),

+		    'line_multicurrency_total_ht' => price2num($line->multicurrency_total_ht),

+		    'line_multicurrency_total_tva' => price2num($line->multicurrency_total_tva),

+		    'line_multicurrency_total_ttc' => price2num($line->multicurrency_total_ttc),

+		    'line_multicurrency_subprice_locale' => price($line->multicurrency_subprice, 0, $outputlangs),

+		    'line_multicurrency_total_ht_locale' => price($line->multicurrency_total_ht, 0, $outputlangs),

+		    'line_multicurrency_total_tva_locale' => price($line->multicurrency_total_tva, 0, $outputlangs),

+		    'line_multicurrency_total_ttc_locale' => price($line->multicurrency_total_ttc, 0, $outputlangs),

@@ -759,5 +571,6 @@
-		// Units

-		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {

-			$resarray['line_unit'] = $outputlangs->trans($line->getLabelOfUnit('long'));

-			$resarray['line_unit_short'] = $outputlangs->trans($line->getLabelOfUnit('short'));

-		}

+        // Units

+		if ($conf->global->PRODUCT_USE_UNITS)

+		{

+		      $resarray['line_unit'] = $outputlangs->trans($line->getLabelOfUnit('long'));

+		      $resarray['line_unit_short'] = $outputlangs->trans($line->getLabelOfUnit('short'));

+        }

@@ -773,9 +586,11 @@
-		$resarray = $this->fill_substitutionarray_with_extrafields($line, $resarray, $extrafields, $array_key, $outputlangs);

-

-		// Check if the current line belongs to a supplier order

-		if (get_class($line) == 'CommandeFournisseurLigne') {

-			// Add the product supplier extrafields to the substitutions

-			$extrafields->fetch_name_optionals_label("product_fournisseur_price");

-			$extralabels = $extrafields->attributes["product_fournisseur_price"]['label'];

-

-			if (!empty($extralabels) && is_array($extralabels)) {

+        $resarray = $this->fill_substitutionarray_with_extrafields($line, $resarray, $extrafields, $array_key, $outputlangs);

+

+        // Check if the current line belongs to a supplier order

+        if (get_class($line) == 'CommandeFournisseurLigne')

+        {

+            // Add the product supplier extrafields to the substitutions

+            $extrafields->fetch_name_optionals_label("product_fournisseur_price");

+            $extralabels = $extrafields->attributes["product_fournisseur_price"]['label'];

+

+			if (!empty($extralabels) && is_array($extralabels))

+			{

@@ -784 +599,2 @@
-				foreach ($extralabels as $key => $label) {

+				foreach ($extralabels as $key)

+				{

@@ -788 +604,2 @@
-				if ($columns != "") {

+				if ($columns != "")

+				{

@@ -790,3 +607,4 @@
-					$resql = $this->db->query("SELECT ".$columns." FROM ".$this->db->prefix()."product_fournisseur_price_extrafields AS ex INNER JOIN ".$this->db->prefix()."product_fournisseur_price AS f ON ex.fk_object = f.rowid WHERE f.ref_fourn = '".$this->db->escape($line->ref_supplier)."'");

-

-					if ($this->db->num_rows($resql) > 0) {

+					$resql = $this->db->query("SELECT $columns FROM ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields AS ex INNER JOIN ".MAIN_DB_PREFIX."product_fournisseur_price AS f ON ex.fk_object = f.rowid WHERE f.ref_fourn = '".$line->ref_supplier."'");

+

+					if ($this->db->num_rows($resql) > 0)

+					{

@@ -795,2 +613,3 @@
-						foreach ($extralabels as $key => $label) {

-							$resarray['line_product_supplier_'.$key] = $resql->$key;

+						foreach ($extralabels as $key)

+						{

+							$resarray['line_product_supplier_'.$key] = $resql->{$key};

@@ -801 +620 @@
-		}

+        }

@@ -804 +623,2 @@
-		if (isset($line->fk_product) && $line->fk_product > 0) {

+		if (isset($line->fk_product) && $line->fk_product > 0)

+		{

@@ -807,15 +627,2 @@
-			if (!empty($tmpproduct->array_options) && is_array($tmpproduct->array_options)) {

-				foreach ($tmpproduct->array_options as $key => $label) {

-					$resarray["line_product_".$key] = $label;

-				}

-			}

-		} else {

-			// Set unused placeholders as blank

-			$extrafields->fetch_name_optionals_label("product");

-			$extralabels = $extrafields->attributes["product"]['label'];

-

-			if (!empty($extralabels) && is_array($extralabels)) {

-				foreach ($extralabels as $key => $label) {

-					$resarray['line_product_options_'.$key] = '';

-				}

-			}

+			foreach ($tmpproduct->array_options as $key=>$label)

+				$resarray["line_product_".$key] = $label;

@@ -827,14 +634,13 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 * Define array with couple substitution key => substitution value

-	 * Note that vars into substitutions array are formatted.

-	 *

-	 * @param   Expedition		$object             Main object to use as data source

-	 * @param   Translate		$outputlangs        Lang object to use for output

-	 * @param   string			$array_key	        Name of the key for return array

-	 * @return	array								Array of substitution

-	 */

-	public function get_substitutionarray_shipment($object, $outputlangs, $array_key = 'object')

-	{

-		// phpcs:enable

-		global $conf, $extrafields;

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     * Define array with couple substitution key => substitution value

+     *

+     * @param   Expedition		$object             Main object to use as data source

+     * @param   Translate		$outputlangs        Lang object to use for output

+     * @param   array			$array_key	        Name of the key for return array

+     * @return	array								Array of substitution

+     */

+    public function get_substitutionarray_shipment($object, $outputlangs, $array_key = 'object')

+    {

+        // phpcs:enable

+    	global $conf, $extrafields;

@@ -845,66 +651,146 @@
-		$array_shipment = array(

-			$array_key.'_id'=>$object->id,

-			$array_key.'_ref'=>$object->ref,

-			$array_key.'_ref_ext'=>$object->ref_ext,

-			$array_key.'_ref_customer'=>$object->ref_customer,

-			$array_key.'_date_delivery'=>dol_print_date($object->date_delivery, 'day'),

-			$array_key.'_hour_delivery'=>dol_print_date($object->date_delivery, 'hour'),

-			$array_key.'_date_creation'=>dol_print_date($object->date_creation, 'day'),

-			$array_key.'_total_ht'=>price($object->total_ht),

-			$array_key.'_total_vat'=>price($object->total_tva),

-			$array_key.'_total_ttc'=>price($object->total_ttc),

-			$array_key.'_total_discount_ht' => price($object->getTotalDiscount()),

-			$array_key.'_note_private'=>$object->note_private,

-			$array_key.'_note'=>$object->note_public,

-			$array_key.'_tracking_number'=>$object->tracking_number,

-			$array_key.'_tracking_url'=>$object->tracking_url,

-			$array_key.'_shipping_method'=>$object->listmeths[0]['libelle'],

-			$array_key.'_weight'=>$object->trueWeight.' '.measuringUnitString(0, 'weight', $object->weight_units),

-			$array_key.'_width'=>$object->trueWidth.' '.measuringUnitString(0, 'size', $object->width_units),

-			$array_key.'_height'=>$object->trueHeight.' '.measuringUnitString(0, 'size', $object->height_units),

-			$array_key.'_depth'=>$object->trueDepth.' '.measuringUnitString(0, 'size', $object->depth_units),

-			$array_key.'_size'=>$calculatedVolume.' '.measuringUnitString(0, 'volume'),

-		);

-

-		// Add vat by rates

-		foreach ($object->lines as $line) {

-			if (empty($array_shipment[$array_key.'_total_vat_'.$line->tva_tx])) {

-				$array_shipment[$array_key.'_total_vat_'.$line->tva_tx] = 0;

-			}

-			$array_shipment[$array_key.'_total_vat_'.$line->tva_tx] += $line->total_tva;

-		}

-

-		// Retrieve extrafields

-		if (is_array($object->array_options) && count($object->array_options)) {

-			$object->fetch_optionals();

-

-			$array_shipment = $this->fill_substitutionarray_with_extrafields($object, $array_shipment, $extrafields, $array_key, $outputlangs);

-		}

-

-		// Add infor from $object->xxx where xxx has been loaded by fetch_origin() of shipment

-		if (!empty($object->commande) && is_object($object->commande)) {

-			$array_shipment['order_ref'] = $object->commande->ref;

-			$array_shipment['order_ref_customer'] = $object->commande->ref_customer;

-		}

-

-		return $array_shipment;

-	}

-

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 * Define array with couple substitution key => substitution value

-	 *

-	 * @param   Object		$object    		Dolibarr Object

-	 * @param   Translate	$outputlangs    Language object for output

-	 * @param   boolean|int	$recursive    	Want to fetch child array or child object.

-	 * @return	array						Array of substitution key->code

-	 */

-	public function get_substitutionarray_each_var_object(&$object, $outputlangs, $recursive = 1)

-	{

-		// phpcs:enable

-		$array_other = array();

-		if (!empty($object)) {

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

-				if (in_array($key, array('db', 'fields', 'lines', 'modelpdf', 'model_pdf'))) {		// discard some properties

-					continue;

+    	$array_shipment = array(

+	    	$array_key.'_id'=>$object->id,

+	    	$array_key.'_ref'=>$object->ref,

+	    	$array_key.'_ref_ext'=>$object->ref_ext,

+	    	$array_key.'_ref_customer'=>$object->ref_customer,

+	    	$array_key.'_date_delivery'=>dol_print_date($object->date_delivery, 'day'),

+	    	$array_key.'_hour_delivery'=>dol_print_date($object->date_delivery, 'hour'),

+	    	$array_key.'_date_creation'=>dol_print_date($object->date_creation, 'day'),

+	    	$array_key.'_total_ht'=>price($object->total_ht),

+	    	$array_key.'_total_vat'=>price($object->total_tva),

+	    	$array_key.'_total_ttc'=>price($object->total_ttc),

+	    	$array_key.'_total_discount_ht' => price($object->getTotalDiscount()),

+	    	$array_key.'_note_private'=>$object->note_private,

+	    	$array_key.'_note'=>$object->note_public,

+	    	$array_key.'_tracking_number'=>$object->tracking_number,

+	    	$array_key.'_tracking_url'=>$object->tracking_url,

+	    	$array_key.'_shipping_method'=>$object->listmeths[0]['libelle'],

+    		$array_key.'_weight'=>$object->trueWeight.' '.measuringUnitString(0, 'weight', $object->weight_units),

+    		$array_key.'_width'=>$object->trueWidth.' '.measuringUnitString(0, 'size', $object->width_units),

+    		$array_key.'_height'=>$object->trueHeight.' '.measuringUnitString(0, 'size', $object->height_units),

+    		$array_key.'_depth'=>$object->trueDepth.' '.measuringUnitString(0, 'size', $object->depth_units),

+	    	$array_key.'_size'=>$calculatedVolume.' '.measuringUnitString(0, 'volume'),

+    	);

+

+    	// Add vat by rates

+    	foreach ($object->lines as $line)

+    	{

+    		if (empty($array_shipment[$array_key.'_total_vat_'.$line->tva_tx])) $array_shipment[$array_key.'_total_vat_'.$line->tva_tx] = 0;

+    		$array_shipment[$array_key.'_total_vat_'.$line->tva_tx] += $line->total_tva;

+    	}

+

+	    // Retrieve extrafields

+	    if (is_array($object->array_options) && count($object->array_options))

+	    {

+		    $object->fetch_optionals();

+

+		    $array_shipment = $this->fill_substitutionarray_with_extrafields($object, $array_shipment, $extrafields, $array_key, $outputlangs);

+	    }

+

+    	return $array_shipment;

+    }

+

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     *  Define array with couple substitution key => substitution value

+     *

+     *	@param  ExpeditionLigne	$line				Object line

+     *	@param  Translate		$outputlangs        Lang object to use for output

+     *	@return	array								Substitution array

+     */

+    public function get_substitutionarray_shipment_lines($line, $outputlangs)

+    {

+        // phpcs:enable

+        global $conf;

+        dol_include_once('/core/lib/product.lib.php');

+

+        $resarray = array(

+	    	'line_fulldesc'=>doc_getlinedesc($line, $outputlangs),

+	    	'line_product_ref'=>$line->product_ref,

+	    	'line_product_label'=>$line->product_label,

+	    	'line_desc'=>$line->desc,

+	    	'line_vatrate'=>vatrate($line->tva_tx, true, $line->info_bits),

+	    	'line_up'=>price($line->subprice),

+            'line_total_up'=>price($line->subprice * $line->qty),

+	    	'line_qty'=>$line->qty,

+	    	'line_qty_shipped'=>$line->qty_shipped,

+	    	'line_qty_asked'=>$line->qty_asked,

+	    	'line_discount_percent'=>($line->remise_percent ? $line->remise_percent.'%' : ''),

+	    	'line_price_ht'=>price($line->total_ht),

+	    	'line_price_ttc'=>price($line->total_ttc),

+	    	'line_price_vat'=>price($line->total_tva),

+        	'line_weight'=>empty($line->weight) ? '' : $line->weight * $line->qty_shipped.' '.measuringUnitString(0, 'weight', $line->weight_units),

+        	'line_length'=>empty($line->length) ? '' : $line->length * $line->qty_shipped.' '.measuringUnitString(0, 'size', $line->length_units),

+        	'line_surface'=>empty($line->surface) ? '' : $line->surface * $line->qty_shipped.' '.measuringUnitString(0, 'surface', $line->surface_units),

+        	'line_volume'=>empty($line->volume) ? '' : $line->volume * $line->qty_shipped.' '.measuringUnitString(0, 'volume', $line->volume_units),

+    	);

+

+        // Retrieve extrafields

+        $extrafieldkey = $line->element;

+        $array_key = "line";

+        require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';

+        $extrafields = new ExtraFields($this->db);

+        $extrafields->fetch_name_optionals_label($extrafieldkey, true);

+        $line->fetch_optionals();

+

+        $resarray = $this->fill_substitutionarray_with_extrafields($line, $resarray, $extrafields, $array_key, $outputlangs);

+

+        return $resarray;

+    }

+

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     * Define array with couple substitution key => substitution value

+     *

+     * @param   Object		$object    		Dolibarr Object

+     * @param   Translate	$outputlangs    Language object for output

+     * @param   boolean		$recursive    	Want to fetch child array or child object

+     * @return	array						Array of substitution key->code

+     */

+    public function get_substitutionarray_each_var_object(&$object, $outputlangs, $recursive = true)

+    {

+        // phpcs:enable

+        $array_other = array();

+        if (!empty($object)) {

+            foreach ($object as $key => $value) {

+                if (!empty($value)) {

+                    if (!is_array($value) && !is_object($value)) {

+                        $array_other['object_'.$key] = $value;

+                    }

+                    if (is_array($value) && $recursive) {

+                        $array_other['object_'.$key] = $this->get_substitutionarray_each_var_object($value, $outputlangs, false);

+                    }

+                }

+            }

+        }

+        return $array_other;

+    }

+

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     *	Fill array with couple extrafield key => extrafield value

+     *

+     *	@param  Object			$object				Object with extrafields (must have $object->array_options filled)

+     *	@param  array			$array_to_fill      Substitution array

+     *  @param  Extrafields		$extrafields        Extrafields object

+     *  @param  string			$array_key	        Prefix for name of the keys into returned array

+     *  @param  Translate		$outputlangs        Lang object to use for output

+     *	@return	array								Substitution array

+     */

+    public function fill_substitutionarray_with_extrafields($object, $array_to_fill, $extrafields, $array_key, $outputlangs)

+    {

+        // phpcs:enable

+		global $conf;

+

+		if (is_array($extrafields->attributes[$object->table_element]['label'])) {

+			foreach ($extrafields->attributes[$object->table_element]['label'] as $key=>$label)

+			{

+				if ($extrafields->attributes[$object->table_element]['type'][$key] == 'price')

+				{

+					$object->array_options['options_'.$key] = price2num($object->array_options['options_'.$key]);

+					$object->array_options['options_'.$key.'_currency'] = price($object->array_options['options_'.$key], 0, $outputlangs, 0, 0, -1, $conf->currency);

+					//Add value to store price with currency

+					$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_currency' => $object->array_options['options_'.$key.'_currency']));

@@ -912,18 +798,3 @@
-				if (!empty($value)) {

-					if (!is_array($value) && !is_object($value)) {

-						$array_other['object_'.$key] = $value;

-					} elseif (is_array($value) && $recursive) {

-						$tmparray = $this->get_substitutionarray_each_var_object($value, $outputlangs, 0);

-						if (!empty($tmparray) && is_array($tmparray)) {

-							foreach ($tmparray as $key2 => $value2) {

-								$array_other['object_'.$key.'_'.preg_replace('/^object_/', '', $key2)] = $value2;

-							}

-						}

-					} elseif (is_object($value) && $recursive) {

-						$tmparray = $this->get_substitutionarray_each_var_object($value, $outputlangs, 0);

-						if (!empty($tmparray) && is_array($tmparray)) {

-							foreach ($tmparray as $key2 => $value2) {

-								$array_other['object_'.$key.'_'.preg_replace('/^object_/', '', $key2)] = $value2;

-							}

-						}

-					}

+				elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'select')

+				{

+					$object->array_options['options_'.$key] = $extrafields->attributes[$object->table_element]['param'][$key]['options'][$object->array_options['options_'.$key]];

@@ -931,44 +802,2 @@
-			}

-		}

-

-		//var_dump($array_other);

-

-		return $array_other;

-	}

-

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 *	Fill array with couple extrafield key => extrafield value

-	 *  Note that vars into substitutions array are formatted.

-	 *

-	 *	@param  Object			$object				Object with extrafields (must have $object->array_options filled)

-	 *	@param  array			$array_to_fill      Substitution array

-	 *  @param  Extrafields		$extrafields        Extrafields object

-	 *  @param  string			$array_key	        Prefix for name of the keys into returned array

-	 *  @param  Translate		$outputlangs        Lang object to use for output

-	 *	@return	array								Substitution array

-	 */

-	public function fill_substitutionarray_with_extrafields($object, $array_to_fill, $extrafields, $array_key, $outputlangs)

-	{

-		// phpcs:enable

-		global $conf;

-

-		if (is_array($extrafields->attributes[$object->table_element]['label'])) {

-			foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label) {

-				$formatedarrayoption = $object->array_options;

-

-				if ($extrafields->attributes[$object->table_element]['type'][$key] == 'price') {

-					$formatedarrayoption['options_'.$key] = price2num($formatedarrayoption['options_'.$key]);

-					$formatedarrayoption['options_'.$key.'_currency'] = price($formatedarrayoption['options_'.$key], 0, $outputlangs, 0, 0, -1, $conf->currency);

-					//Add value to store price with currency

-					$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_currency' => $formatedarrayoption['options_'.$key.'_currency']));

-				} elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'select') {

-					$valueofselectkey = $formatedarrayoption['options_'.$key];

-					if (array_key_exists($valueofselectkey, $extrafields->attributes[$object->table_element]['param'][$key]['options'])) {

-						$formatedarrayoption['options_'.$key] = $extrafields->attributes[$object->table_element]['param'][$key]['options'][$valueofselectkey];

-					} else {

-						$formatedarrayoption['options_'.$key] = '';

-					}

-				} elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'checkbox') {

-					$valArray = explode(',', $formatedarrayoption['options_'.$key]);

+				elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'checkbox') {

+					$valArray = explode(',', $object->array_options['options_'.$key]);

@@ -976 +805 @@
-					foreach ($extrafields->attributes[$object->table_element]['param'][$key]['options'] as $keyopt => $valopt) {

+					foreach ($extrafields->attributes[$object->table_element]['param'][$key]['options'] as $keyopt=>$valopt) {

@@ -981,11 +810,10 @@
-					$formatedarrayoption['options_'.$key] = implode(', ', $output);

-				} elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'date') {

-					if (strlen($formatedarrayoption['options_'.$key]) > 0) {

-						$date = $formatedarrayoption['options_'.$key];

-						$formatedarrayoption['options_'.$key] = dol_print_date($date, 'day'); // using company output language

-						$formatedarrayoption['options_'.$key.'_locale'] = dol_print_date($date, 'day', 'tzserver', $outputlangs); // using output language format

-						$formatedarrayoption['options_'.$key.'_rfc'] = dol_print_date($date, 'dayrfc'); // international format

-					} else {

-						$formatedarrayoption['options_'.$key] = '';

-						$formatedarrayoption['options_'.$key.'_locale'] = '';

-						$formatedarrayoption['options_'.$key.'_rfc'] = '';

+					$object->array_options['options_'.$key] = implode(', ', $output);

+				}

+				elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'date')

+				{

+					if (strlen($object->array_options['options_'.$key]) > 0)

+					{

+						$date = $object->array_options['options_'.$key];

+						$object->array_options['options_'.$key] = dol_print_date($date, 'day'); // using company output language

+						$object->array_options['options_'.$key.'_locale'] = dol_print_date($date, 'day', 'tzserver', $outputlangs); // using output language format

+						$object->array_options['options_'.$key.'_rfc'] = dol_print_date($date, 'dayrfc'); // international format

@@ -993,12 +821,23 @@
-					$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_locale' => $formatedarrayoption['options_'.$key.'_locale']));

-					$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_rfc' => $formatedarrayoption['options_'.$key.'_rfc']));

-				} elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'datetime') {

-					$datetime = $formatedarrayoption['options_'.$key];

-					$formatedarrayoption['options_'.$key] = ($datetime != "0000-00-00 00:00:00" ? dol_print_date($datetime, 'dayhour') : ''); // using company output language

-					$formatedarrayoption['options_'.$key.'_locale'] = ($datetime != "0000-00-00 00:00:00" ? dol_print_date($datetime, 'dayhour', 'tzserver', $outputlangs) : ''); // using output language format

-					$formatedarrayoption['options_'.$key.'_rfc'] = ($datetime != "0000-00-00 00:00:00" ? dol_print_date($datetime, 'dayhourrfc') : ''); // international format

-					$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_locale' => $formatedarrayoption['options_'.$key.'_locale']));

-					$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_rfc' => $formatedarrayoption['options_'.$key.'_rfc']));

-				} elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'link') {

-					$id = $formatedarrayoption['options_'.$key];

-					if ($id != "") {

+					else

+					{

+						$object->array_options['options_'.$key] = '';

+						$object->array_options['options_'.$key.'_locale'] = '';

+						$object->array_options['options_'.$key.'_rfc'] = '';

+					}

+					$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_locale' => $object->array_options['options_'.$key.'_locale']));

+					$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_rfc' => $object->array_options['options_'.$key.'_rfc']));

+				}

+				elseif ($extrafields->attributes[$object->table_element]['label'][$key] == 'datetime')

+				{

+					$datetime = $object->array_options['options_'.$key];

+					$object->array_options['options_'.$key] = ($datetime != "0000-00-00 00:00:00" ?dol_print_date($object->array_options['options_'.$key], 'dayhour') : ''); // using company output language

+					$object->array_options['options_'.$key.'_locale'] = ($datetime != "0000-00-00 00:00:00" ?dol_print_date($object->array_options['options_'.$key], 'dayhour', 'tzserver', $outputlangs) : ''); // using output language format

+					$object->array_options['options_'.$key.'_rfc'] = ($datetime != "0000-00-00 00:00:00" ?dol_print_date($object->array_options['options_'.$key], 'dayhourrfc') : ''); // international format

+					$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_locale' => $object->array_options['options_'.$key.'_locale']));

+					$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_rfc' => $object->array_options['options_'.$key.'_rfc']));

+				}

+				elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'link')

+				{

+					$id = $object->array_options['options_'.$key];

+					if ($id != "")

+					{

@@ -1010 +849,2 @@
-						if (!empty($classpath)) {

+						if (!empty($classpath))

+						{

@@ -1012 +852,2 @@
-							if ($classname && class_exists($classname)) {

+							if ($classname && class_exists($classname))

+							{

@@ -1016 +857 @@
-								$formatedarrayoption['options_'.$key] = $tmpobject->name;

+								$object->array_options['options_'.$key] = $tmpobject->name;

@@ -1022,5 +863 @@
-				if (array_key_exists('options_'.$key, $formatedarrayoption)) {

-					$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key => $formatedarrayoption['options_'.$key]));

-				} else {

-					$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key => ''));

-				}

+				$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key => $object->array_options['options_'.$key]));

@@ -1046 +883,238 @@
-	public function printRect($pdf, $x, $y, $l, $h, $hidetop = 0, $hidebottom = 0)

+    public function printRect($pdf, $x, $y, $l, $h, $hidetop = 0, $hidebottom = 0)

+    {

+        if (empty($hidetop) || $hidetop == -1) $pdf->line($x, $y, $x + $l, $y);

+        $pdf->line($x + $l, $y, $x + $l, $y + $h);

+        if (empty($hidebottom)) $pdf->line($x + $l, $y + $h, $x, $y + $h);

+        $pdf->line($x, $y + $h, $x, $y);

+    }

+

+

+    /**

+     *  uasort callback function to Sort columns fields

+     *

+     *  @param	array			$a    			PDF lines array fields configs

+     *  @param	array			$b    			PDF lines array fields configs

+     *  @return	int								Return compare result

+     */

+    public function columnSort($a, $b)

+    {

+        if (empty($a['rank'])) { $a['rank'] = 0; }

+        if (empty($b['rank'])) { $b['rank'] = 0; }

+        if ($a['rank'] == $b['rank']) {

+            return 0;

+        }

+        return ($a['rank'] > $b['rank']) ? -1 : 1;

+    }

+

+    /**

+     *   	Prepare Array Column Field

+     *

+     *   	@param	object			$object				common object

+     *   	@param	Translate		$outputlangs		langs

+     *      @param	int				$hidedetails		Do not show line details

+     *      @param	int				$hidedesc			Do not show desc

+     *      @param	int				$hideref			Do not show ref

+     *      @return	null

+     */

+    public function prepareArrayColumnField($object, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)

+    {

+        global $conf;

+

+        $this->defineColumnField($object, $outputlangs, $hidedetails, $hidedesc, $hideref);

+

+

+        // Sorting

+        uasort($this->cols, array($this, 'columnSort'));

+

+        // Positionning

+        $curX = $this->page_largeur - $this->marge_droite; // start from right

+

+        // Array width

+        $arrayWidth = $this->page_largeur - $this->marge_droite - $this->marge_gauche;

+

+        // Count flexible column

+        $totalDefinedColWidth = 0;

+        $countFlexCol = 0;

+        foreach ($this->cols as $colKey =>& $colDef)

+        {

+            if (!$this->getColumnStatus($colKey)) continue; // continue if disabled

+

+            if (!empty($colDef['scale'])) {

+                // In case of column width is defined by percentage

+                $colDef['width'] = abs($arrayWidth * $colDef['scale'] / 100);

+            }

+

+            if (empty($colDef['width'])) {

+                $countFlexCol++;

+            }

+            else {

+                $totalDefinedColWidth += $colDef['width'];

+            }

+        }

+

+        foreach ($this->cols as $colKey =>& $colDef)

+        {

+            // setting empty conf with default

+            if (!empty($colDef['title'])) {

+                $colDef['title'] = array_replace($this->defaultTitlesFieldsStyle, $colDef['title']);

+            }

+            else {

+                $colDef['title'] = $this->defaultTitlesFieldsStyle;

+            }

+

+            // setting empty conf with default

+            if (!empty($colDef['content'])) {

+                $colDef['content'] = array_replace($this->defaultContentsFieldsStyle, $colDef['content']);

+            }

+            else {

+                $colDef['content'] = $this->defaultContentsFieldsStyle;

+            }

+

+            if ($this->getColumnStatus($colKey))

+            {

+                // In case of flexible column

+                if (empty($colDef['width'])) {

+                    $colDef['width'] = abs(($arrayWidth - $totalDefinedColWidth)) / $countFlexCol;

+                }

+

+                // Set positions

+                $lastX = $curX;

+                $curX = $lastX - $colDef['width'];

+                $colDef['xStartPos'] = $curX;

+                $colDef['xEndPos']   = $lastX;

+            }

+        }

+    }

+

+    /**

+     *  get column content width from column key

+     *

+     *  @param	string      $colKey     the column key

+     *  @return	float                   width in mm

+     */

+    public function getColumnContentWidth($colKey)

+    {

+        $colDef = $this->cols[$colKey];

+        return  $colDef['width'] - $colDef['content']['padding'][3] - $colDef['content']['padding'][1];

+    }

+

+

+    /**

+     *  get column content X (abscissa) left position from column key

+     *

+     *  @param	string    $colKey    		the column key

+     *  @return	float      X position in mm

+     */

+    public function getColumnContentXStart($colKey)

+    {

+        $colDef = $this->cols[$colKey];

+        return  $colDef['xStartPos'] + $colDef['content']['padding'][3];

+    }

+

+    /**

+     *   	get column position rank from column key

+     *

+     *   	@param	string		$colKey    		the column key

+     *      @return	int         rank on success and -1 on error

+     */

+    public function getColumnRank($colKey)

+    {

+        if (!isset($this->cols[$colKey]['rank'])) return -1;

+        return  $this->cols[$colKey]['rank'];

+    }

+

+    /**

+     *  get column position rank from column key

+     *

+     *  @param	string		$newColKey    	the new column key

+     *  @param	array		$defArray    	a single column definition array

+     *  @param	string		$targetCol    	target column used to place the new column beside

+     *  @param	bool		$insertAfterTarget    	insert before or after target column ?

+     *  @return	int         new rank on success and -1 on error

+     */

+    public function insertNewColumnDef($newColKey, $defArray, $targetCol = false, $insertAfterTarget = false)

+    {

+        // prepare wanted rank

+        $rank = -1;

+

+        // try to get rank from target column

+        if (!empty($targetCol)) {

+            $rank = $this->getColumnRank($targetCol);

+            if ($rank >= 0 && $insertAfterTarget) { $rank++; }

+        }

+

+        // get rank from new column definition

+        if ($rank < 0 && !empty($defArray['rank'])) {

+            $rank = $defArray['rank'];

+        }

+

+        // error: no rank

+        if ($rank < 0) { return -1; }

+

+        foreach ($this->cols as $colKey =>& $colDef)

+        {

+            if ($rank <= $colDef['rank'])

+            {

+                $colDef['rank'] = $colDef['rank'] + 1;

+            }

+        }

+

+        $defArray['rank'] = $rank;

+        $this->cols[$newColKey] = $defArray; // array_replace is used to preserve keys

+

+        return $rank;

+    }

+

+

+    /**

+     *  print standard column content

+     *

+     *  @param	TCPDF		    $pdf    	pdf object

+     *  @param	float		$curY    	curent Y position

+     *  @param	string		$colKey    	the column key

+     *  @param	string		$columnText   column text

+     *  @return	null

+     */

+    public function printStdColumnContent($pdf, &$curY, $colKey, $columnText = '')

+    {

+        global $hookmanager;

+

+        $parameters = array(

+            'curY' => &$curY,

+            'columnText' => $columnText,

+            'colKey' => $colKey

+        );

+        $reshook = $hookmanager->executeHooks('printStdColumnContent', $parameters, $this); // Note that $action and $object may have been modified by hook

+        if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

+        if (!$reshook)

+        {

+            if (empty($columnText)) return;

+            $pdf->SetXY($this->getColumnContentXStart($colKey), $curY); // Set curent position

+            $colDef = $this->cols[$colKey];

+            // save curent cell padding

+			$curentCellPaddinds = $pdf->getCellPaddings();

+            // set cell padding with column content definition

+			$pdf->setCellPaddings($colDef['content']['padding'][3], $colDef['content']['padding'][0], $colDef['content']['padding'][1], $colDef['content']['padding'][2]);

+            $pdf->writeHTMLCell($colDef['width'], 2, $colDef['xStartPos'], $curY, $columnText, 0, 1, 0, true, $colDef['content']['align']);

+

+            // restore cell padding

+			$pdf->setCellPaddings($curentCellPaddinds['L'], $curentCellPaddinds['T'], $curentCellPaddinds['R'], $curentCellPaddinds['B']);

+        }

+    }

+

+

+    /**

+     *  print description column content

+     *

+     *  @param	TCPDF		$pdf    	pdf object

+     *  @param	float		$curY    	curent Y position

+     *  @param	string		$colKey    	the column key

+     *  @param  object      $object CommonObject

+     *  @param  int         $i  the $object->lines array key

+     *  @param  Translate $outputlangs    Output language

+     *  @param  int $hideref hide ref

+     *  @param  int $hidedesc hide desc

+     *  @param  int $issupplierline if object need supplier product

+     *  @return null

+     */

+    public function printColDescContent($pdf, &$curY, $colKey, $object, $i, $outputlangs, $hideref = 0, $hidedesc = 0, $issupplierline = 0)

@@ -1048,447 +1122,178 @@
-		if (empty($hidetop) || $hidetop == -1) {

-			$pdf->line($x, $y, $x + $l, $y);

-		}

-		$pdf->line($x + $l, $y, $x + $l, $y + $h);

-		if (empty($hidebottom)) {

-			$pdf->line($x + $l, $y + $h, $x, $y + $h);

-		}

-		$pdf->line($x, $y + $h, $x, $y);

-	}

-

-

-	/**

-	 *  uasort callback function to Sort columns fields

-	 *

-	 *  @param	array			$a    			PDF lines array fields configs

-	 *  @param	array			$b    			PDF lines array fields configs

-	 *  @return	int								Return compare result

-	 */

-	public function columnSort($a, $b)

-	{

-		if (empty($a['rank'])) {

-			$a['rank'] = 0;

-		}

-		if (empty($b['rank'])) {

-			$b['rank'] = 0;

-		}

-		if ($a['rank'] == $b['rank']) {

-			return 0;

-		}

-		return ($a['rank'] > $b['rank']) ? -1 : 1;

-	}

-

-	/**

-	 *   	Prepare Array Column Field

-	 *

-	 *   	@param	object			$object				common object

-	 *   	@param	Translate		$outputlangs		langs

-	 *      @param	int				$hidedetails		Do not show line details

-	 *      @param	int				$hidedesc			Do not show desc

-	 *      @param	int				$hideref			Do not show ref

-	 *      @return	void

-	 */

-	public function prepareArrayColumnField($object, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)

-	{

-		$this->defineColumnField($object, $outputlangs, $hidedetails, $hidedesc, $hideref);

-

-

-		// Sorting

-		uasort($this->cols, array($this, 'columnSort'));

-

-		// Positionning

-		$curX = $this->page_largeur - $this->marge_droite; // start from right

-

-		// Array width

-		$arrayWidth = $this->page_largeur - $this->marge_droite - $this->marge_gauche;

-

-		// Count flexible column

-		$totalDefinedColWidth = 0;

-		$countFlexCol = 0;

-		foreach ($this->cols as $colKey => & $colDef) {

-			if (!$this->getColumnStatus($colKey)) {

-				continue; // continue if disabled

-			}

-

-			if (!empty($colDef['scale'])) {

-				// In case of column width is defined by percentage

-				$colDef['width'] = abs($arrayWidth * $colDef['scale'] / 100);

-			}

-

-			if (empty($colDef['width'])) {

-				$countFlexCol++;

-			} else {

-				$totalDefinedColWidth += $colDef['width'];

-			}

-		}

-

-		foreach ($this->cols as $colKey => & $colDef) {

-			// setting empty conf with default

-			if (!empty($colDef['title'])) {

-				$colDef['title'] = array_replace($this->defaultTitlesFieldsStyle, $colDef['title']);

-			} else {

-				$colDef['title'] = $this->defaultTitlesFieldsStyle;

-			}

-

-			// setting empty conf with default

-			if (!empty($colDef['content'])) {

-				$colDef['content'] = array_replace($this->defaultContentsFieldsStyle, $colDef['content']);

-			} else {

-				$colDef['content'] = $this->defaultContentsFieldsStyle;

-			}

-

-			if ($this->getColumnStatus($colKey)) {

-				// In case of flexible column

-				if (empty($colDef['width'])) {

-					$colDef['width'] = abs(($arrayWidth - $totalDefinedColWidth)) / $countFlexCol;

-				}

-

-				// Set positions

-				$lastX = $curX;

-				$curX = $lastX - $colDef['width'];

-				$colDef['xStartPos'] = $curX;

-				$colDef['xEndPos']   = $lastX;

-			}

-		}

-	}

-

-	/**

-	 *  get column content width from column key

-	 *

-	 *  @param	string      $colKey     the column key

-	 *  @return	float                   width in mm

-	 */

-	public function getColumnContentWidth($colKey)

-	{

-		$colDef = $this->cols[$colKey];

-		return  $colDef['width'] - $colDef['content']['padding'][3] - $colDef['content']['padding'][1];

-	}

-

-

-	/**

-	 *  get column content X (abscissa) left position from column key

-	 *

-	 *  @param	string    $colKey    		the column key

-	 *  @return	float      X position in mm

-	 */

-	public function getColumnContentXStart($colKey)

-	{

-		$colDef = (isset($this->cols[$colKey]) ? $this->cols[$colKey] : null);

-		return (is_array($colDef) ? ((isset($colDef['xStartPos']) ? $colDef['xStartPos'] : 0) + $colDef['content']['padding'][3]) : 0);

-	}

-

-	/**

-	 *  get column position rank from column key

-	 *

-	 *  @param	string		$colKey    		the column key

-	 *  @return	int         rank on success and -1 on error

-	 */

-	public function getColumnRank($colKey)

-	{

-		if (!isset($this->cols[$colKey]['rank'])) {

-			return -1;

-		}

-		return  $this->cols[$colKey]['rank'];

-	}

-

-	/**

-	 *  get column position rank from column key

-	 *

-	 *  @param	string		$newColKey    		the new column key

-	 *  @param	array		$defArray    		a single column definition array

-	 *  @param	string		$targetCol    		target column used to place the new column beside

-	 *  @param	bool		$insertAfterTarget  insert before or after target column ?

-	 *  @return	int         					new rank on success and -1 on error

-	 */

-	public function insertNewColumnDef($newColKey, $defArray, $targetCol = '', $insertAfterTarget = false)

-	{

-		// prepare wanted rank

-		$rank = -1;

-

-		// try to get rank from target column

-		if (!empty($targetCol)) {

-			$rank = $this->getColumnRank($targetCol);

-			if ($rank >= 0 && $insertAfterTarget) {

-				$rank++;

-			}

-		}

-

-		// get rank from new column definition

-		if ($rank < 0 && !empty($defArray['rank'])) {

-			$rank = $defArray['rank'];

-		}

-

-		// error: no rank

-		if ($rank < 0) {

-			return -1;

-		}

-

-		foreach ($this->cols as $colKey => & $colDef) {

-			if ($rank <= $colDef['rank']) {

-				$colDef['rank'] = $colDef['rank'] + 1;

-			}

-		}

-

-		$defArray['rank'] = $rank;

-		$this->cols[$newColKey] = $defArray; // array_replace is used to preserve keys

-

-		return $rank;

-	}

-

-

-	/**

-	 *  print standard column content

-	 *

-	 *  @param	TCPDF		$pdf    		pdf object

-	 *  @param	float		$curY    		curent Y position

-	 *  @param	string		$colKey    		the column key

-	 *  @param	string		$columnText   	column text

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

-	 */

-	public function printStdColumnContent($pdf, &$curY, $colKey, $columnText = '')

-	{

-		global $hookmanager;

-

-		$parameters = array(

-			'curY' => &$curY,

-			'columnText' => $columnText,

-			'colKey' => $colKey,

-			'pdf' => &$pdf,

-		);

-		$reshook = $hookmanager->executeHooks('printStdColumnContent', $parameters, $this); // Note that $action and $object may have been modified by hook

-		if ($reshook < 0) {

-			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

-		}

-		if (!$reshook) {

-			if (empty($columnText)) {

-				return 0;

-			}

-			$pdf->SetXY($this->getColumnContentXStart($colKey), $curY); // Set curent position

-			$colDef = $this->cols[$colKey];

-			// save curent cell padding

-			$curentCellPaddinds = $pdf->getCellPaddings();

-			// set cell padding with column content definition

-			$pdf->setCellPaddings(isset($colDef['content']['padding'][3]) ? $colDef['content']['padding'][3] : 0, isset($colDef['content']['padding'][0]) ? $colDef['content']['padding'][0] : 0, isset($colDef['content']['padding'][1]) ? $colDef['content']['padding'][1] : 0, isset($colDef['content']['padding'][2]) ? $colDef['content']['padding'][2] : 0);

-			$pdf->writeHTMLCell($colDef['width'], 2, isset($colDef['xStartPos']) ? $colDef['xStartPos'] : 0, $curY, $columnText, 0, 1, 0, true, $colDef['content']['align']);

-

-			// restore cell padding

-			$pdf->setCellPaddings($curentCellPaddinds['L'], $curentCellPaddinds['T'], $curentCellPaddinds['R'], $curentCellPaddinds['B']);

-		}

-

-		return 0;

-	}

-

-

-	/**

-	 *  print description column content

-	 *

-	 *  @param	TCPDF		$pdf    		pdf object

-	 *  @param	float		$curY    		curent Y position

-	 *  @param	string		$colKey    		the column key

-	 *  @param  object      $object 		CommonObject

-	 *  @param  int         $i  			the $object->lines array key

-	 *  @param  Translate 	$outputlangs    Output language

-	 *  @param  int 		$hideref 		hide ref

-	 *  @param  int 		$hidedesc 		hide desc

-	 *  @param  int 		$issupplierline if object need supplier product

-	 *  @return void

-	 */

-	public function printColDescContent($pdf, &$curY, $colKey, $object, $i, $outputlangs, $hideref = 0, $hidedesc = 0, $issupplierline = 0)

-	{

-		// load desc col params

-		$colDef = $this->cols[$colKey];

-		// save curent cell padding

-		$curentCellPaddinds = $pdf->getCellPaddings();

-		// set cell padding with column content definition

-		$pdf->setCellPaddings($colDef['content']['padding'][3], $colDef['content']['padding'][0], $colDef['content']['padding'][1], $colDef['content']['padding'][2]);

-

-		// line description

-		pdf_writelinedesc($pdf, $object, $i, $outputlangs, $colDef['width'], 3, $colDef['xStartPos'], $curY, $hideref, $hidedesc, $issupplierline);

-		$posYAfterDescription = $pdf->GetY() - $colDef['content']['padding'][0];

-

-		// restore cell padding

-		$pdf->setCellPaddings($curentCellPaddinds['L'], $curentCellPaddinds['T'], $curentCellPaddinds['R'], $curentCellPaddinds['B']);

-

-		// Display extrafield if needed

-		$params = array(

-			'display'         => 'list',

-			'printableEnable' => array(3),

-			'printableEnableNotEmpty' => array(4)

-		);

-		$extrafieldDesc = $this->getExtrafieldsInHtml($object->lines[$i], $outputlangs, $params);

-		if (!empty($extrafieldDesc)) {

-			$this->printStdColumnContent($pdf, $posYAfterDescription, $colKey, $extrafieldDesc);

-		}

-	}

-

-	/**

-	 *  get extrafield content for pdf writeHtmlCell compatibility

-	 *  usage for PDF line columns and object note block

-	 *

-	 *  @param	object		$object     		Common object

-	 *  @param	string		$extrafieldKey    	The extrafield key

-	 *  @param	Translate	$outputlangs		The output langs (if value is __(XXX)__ we use it to translate it).

-	 *  @return	string

-	 */

-	public function getExtrafieldContent($object, $extrafieldKey, $outputlangs = null)

-	{

-		global $hookmanager;

-

-		if (empty($object->table_element)) {

-			return '';

-		}

-

-		$extrafieldsKeyPrefix = "options_";

-

-		// Cleanup extrafield key to remove prefix if present

-		$pos = strpos($extrafieldKey, $extrafieldsKeyPrefix);

-		if ($pos === 0) {

-			$extrafieldKey = substr($extrafieldKey, strlen($extrafieldsKeyPrefix));

-		}

-

-		$extrafieldOptionsKey = $extrafieldsKeyPrefix.$extrafieldKey;

-

-

-		// Load extra fields if they haven't been loaded already.

-		if (empty($this->extrafieldsCache)) {

-			$this->extrafieldsCache = new ExtraFields($this->db);

-		}

-		if (empty($this->extrafieldsCache->attributes[$object->table_element])) {

-			$this->extrafieldsCache->fetch_name_optionals_label($object->table_element);

-		}

-		$extrafields = $this->extrafieldsCache;

-

-		$extrafieldOutputContent = '';

-		if (isset($object->array_options[$extrafieldOptionsKey])) {

-			$extrafieldOutputContent = $extrafields->showOutputField($extrafieldKey, $object->array_options[$extrafieldOptionsKey], '', $object->table_element, $outputlangs);

-		}

-

-		// TODO : allow showOutputField to be pdf public friendly, ex: in a link to object, clean getNomUrl to remove link and images... like a getName methode ...

-		if ($extrafields->attributes[$object->table_element]['type'][$extrafieldKey] == 'link') {

-			// for lack of anything better we cleanup all html tags

-			$extrafieldOutputContent = dol_string_nohtmltag($extrafieldOutputContent);

-		}

-

-		$parameters = array(

-			'object' => $object,

-			'extrafields' => $extrafields,

-			'extrafieldKey' => $extrafieldKey,

-			'extrafieldOutputContent' =>& $extrafieldOutputContent

-		);

-		$reshook = $hookmanager->executeHooks('getPDFExtrafieldContent', $parameters, $this); // Note that $action and $object may have been modified by hook

-		if ($reshook < 0) {

-			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

-		}

-		if ($reshook) {

-			$extrafieldOutputContent = $hookmanager->resPrint;

-		}

-

-		return $extrafieldOutputContent;

-	}

-

-

-	/**

-	 *  display extrafields columns content

-	 *

-	 *  @param	object		$object    		line of common object

-	 *  @param 	Translate 	$outputlangs    Output language

-	 *  @param 	array 		$params    		array of additionals parameters

-	 *  @return	string  					Html string

-	 */

-	public function getExtrafieldsInHtml($object, $outputlangs, $params = array())

-	{

-		global $hookmanager;

-

-		if (empty($object->table_element)) {

-			return "";

-		}

-

-		// Load extrafields if not allready done

-		if (empty($this->extrafieldsCache)) {

-			$this->extrafieldsCache = new ExtraFields($this->db);

-		}

-		if (empty($this->extrafieldsCache->attributes[$object->table_element])) {

-			$this->extrafieldsCache->fetch_name_optionals_label($object->table_element);

-		}

-		$extrafields = $this->extrafieldsCache;

-

-		$defaultParams = array(

-			'style'         => '',

-			'display'         => 'auto', // auto, table, list

-			'printableEnable' => array(1),

-			'printableEnableNotEmpty' => array(2),

-

-			'table'         => array(

-				'maxItemsInRow' => 2,

-				'cellspacing'   => 0,

-				'cellpadding'   => 0,

-				'border'        => 0,

-				'labelcolwidth' => '25%',

-				'arrayOfLineBreakType' => array('text', 'html')

-			),

-

-			'list'         => array(

-				'separator' => '<br>'

-			),

-

-			'auto'         => array(

-				'list' => 0, // 0 for default

-				'table' => 4 // if there more than x extrafield to display

-			),

-		);

-

-		$params = $params + $defaultParams;

-

-		/**

-		 * @var ExtraFields $extrafields

-		 */

-

-		$html = '';

-		$fields = array();

-

-		if (!empty($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label'])) {

-			foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label) {

-				// Enable extrafield ?

-				$enabled = 0;

-				$disableOnEmpty = 0;

-				if (!empty($extrafields->attributes[$object->table_element]['printable'][$key])) {

-					$printable = intval($extrafields->attributes[$object->table_element]['printable'][$key]);

-					if (in_array($printable, $params['printableEnable']) || in_array($printable, $params['printableEnableNotEmpty'])) {

-						$enabled = 1;

-					}

-

-					if (in_array($printable, $params['printableEnableNotEmpty'])) {

-						$disableOnEmpty = 1;

-					}

-				}

-

-				if (empty($enabled)) {

-					continue;

-				}

-

-				// Load language if required

-				if (!empty($extrafields->attributes[$object->table_element]['langfile'][$key])) {

-					$outputlangs->load($extrafields->attributes[$object->table_element]['langfile'][$key]);

-				}

-

-				$field = new stdClass();

-				$field->rank = intval($extrafields->attributes[$object->table_element]['pos'][$key]);

-				$field->content = $this->getExtrafieldContent($object, $key, $outputlangs);

-				if (isset($extrafields->attributes[$object->table_element]['langfile'][$key])) {

-					$outputlangs->load($extrafields->attributes[$object->table_element]['langfile'][$key]);

-				}

-				$field->label = $outputlangs->transnoentities($label);

-				$field->type = $extrafields->attributes[$object->table_element]['type'][$key];

-

-				// dont display if empty

-				if ($disableOnEmpty && empty($field->content)) {

-					continue;

-				}

-

-				$fields[] = $field;

-			}

-		}

-

-		if (!empty($fields)) {

-			// Sort extrafields by rank

-			uasort($fields, function ($a, $b) {

-				return  ($a->rank > $b->rank) ? 1 : -1;

+        // load desc col params

+        $colDef = $this->cols[$colKey];

+        // save curent cell padding

+        $curentCellPaddinds = $pdf->getCellPaddings();

+        // set cell padding with column content definition

+        $pdf->setCellPaddings($colDef['content']['padding'][3], $colDef['content']['padding'][0], $colDef['content']['padding'][1], $colDef['content']['padding'][2]);

+

+        // line description

+        pdf_writelinedesc($pdf, $object, $i, $outputlangs, $colDef['width'], 3, $colDef['xStartPos'], $curY, $hideref, $hidedesc, $issupplierline);

+        $posYAfterDescription = $pdf->GetY() - $colDef['content']['padding'][0];

+

+        // restore cell padding

+        $pdf->setCellPaddings($curentCellPaddinds['L'], $curentCellPaddinds['T'], $curentCellPaddinds['R'], $curentCellPaddinds['B']);

+

+        // Display extrafield if needed

+        $params = array(

+            'display'         => 'list',

+            'printableEnable' => array(3),

+            'printableEnableNotEmpty' => array(4)

+        );

+        $extrafieldDesc = $this->getExtrafieldsInHtml($object->lines[$i], $outputlangs, $params);

+        if (!empty($extrafieldDesc)) {

+            $this->printStdColumnContent($pdf, $posYAfterDescription, $colKey, $extrafieldDesc);

+        }

+    }

+

+    /**

+     *  get extrafield content for pdf writeHtmlCell compatibility

+     *  usage for PDF line columns and object note block

+     *

+     *  @param	object		$object     common object

+     *  @param	string		$extrafieldKey    	the extrafield key

+     *  @return	string

+     */

+    public function getExtrafieldContent($object, $extrafieldKey)

+    {

+        global $hookmanager;

+

+        if (empty($object->table_element)) { return; }

+

+        $extrafieldsKeyPrefix = "options_";

+

+        // Cleanup extrafield key to remove prefix if present

+        $pos = strpos($extrafieldKey, $extrafieldsKeyPrefix);

+        if ($pos === 0) {

+            $extrafieldKey = substr($extrafieldKey, strlen($extrafieldsKeyPrefix));

+        }

+

+        $extrafieldOptionsKey = $extrafieldsKeyPrefix.$extrafieldKey;

+

+

+        // Load extrafiels if not allready does

+        if (empty($this->extrafieldsCache)) { $this->extrafieldsCache = new ExtraFields($this->db); }

+        if (empty($this->extrafieldsCache->attributes[$object->table_element])) { $this->extrafieldsCache->fetch_name_optionals_label($object->table_element); }

+        $extrafields = $this->extrafieldsCache;

+

+        $extrafieldOutputContent = $extrafields->showOutputField($extrafieldKey, $object->array_options[$extrafieldOptionsKey], '', $object->table_element);

+

+        // TODO : allow showOutputField to be pdf public friendly, ex: in a link to object, clean getNomUrl to remove link and images... like a getName methode ...

+        if ($extrafields->attributes[$object->table_element]['type'][$extrafieldKey] == 'link') {

+            // for lack of anything better we cleanup all html tags

+            $extrafieldOutputContent = dol_string_nohtmltag($extrafieldOutputContent);

+        }

+

+        $parameters = array(

+            'object' => $object,

+            'extrafields' => $extrafields,

+            'extrafieldKey' => $extrafieldKey,

+            'extrafieldOutputContent' =>& $extrafieldOutputContent

+        );

+        $reshook = $hookmanager->executeHooks('getPDFExtrafieldContent', $parameters, $this); // Note that $action and $object may have been modified by hook

+        if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

+        if ($reshook)

+        {

+            $extrafieldOutputContent = $hookmanager->resPrint;

+        }

+

+        return $extrafieldOutputContent;

+    }

+

+

+    /**

+     *  display extrafields columns content

+     *

+     *  @param	object		$object    	line of common object

+     *  @param Translate $outputlangs    Output language

+     *  @param array $params    array of additionals parameters

+     *  @return	double  max y value

+     */

+    public function getExtrafieldsInHtml($object, $outputlangs, $params = array())

+    {

+        global $hookmanager;

+

+        if (empty($object->table_element)) {

+            return;

+        }

+

+        // Load extrafiels if not allready does

+        if (empty($this->extrafieldsCache)) { $this->extrafieldsCache = new ExtraFields($this->db); }

+        if (empty($this->extrafieldsCache->attributes[$object->table_element])) { $this->extrafieldsCache->fetch_name_optionals_label($object->table_element); }

+        $extrafields = $this->extrafieldsCache;

+

+        $defaultParams = array(

+            'style'         => '',

+            'display'         => 'auto', // auto, table, list

+            'printableEnable' => array(1),

+            'printableEnableNotEmpty' => array(2),

+

+            'table'         => array(

+                'maxItemsInRow' => 2,

+                'cellspacing'   => 0,

+                'cellpadding'   => 0,

+                'border'        => 0,

+                'labelcolwidth' => '25%',

+                'arrayOfLineBreakType' => array('text', 'html')

+            ),

+

+            'list'         => array(

+                'separator' => '<br/>'

+            ),

+

+            'auto'         => array(

+                'list' => 0, // 0 for default

+                'table' => 4 // if there more than x extrafield to display

+            ),

+        );

+

+        $params = $params + $defaultParams;

+

+

+        /**

+         * @var $extrafields ExtraFields

+         */

+

+        $html = '';

+        $fields = array();

+

+        if (is_array($extrafields->attributes[$object->table_element]['label'])) {

+            foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label)

+            {

+                // Enable extrafield ?

+                $enabled = 0;

+                $disableOnEmpty = 0;

+                if (!empty($extrafields->attributes[$object->table_element]['printable'][$key])) {

+                    $printable = intval($extrafields->attributes[$object->table_element]['printable'][$key]);

+                    if (in_array($printable, $params['printableEnable']) || in_array($printable, $params['printableEnableNotEmpty'])) {

+                        $enabled = 1;

+                    }

+

+                    if (in_array($printable, $params['printableEnableNotEmpty'])) {

+                        $disableOnEmpty = 1;

+                    }

+                }

+

+                if (empty($enabled)) {

+                    continue;

+                }

+

+                $field = new stdClass();

+                $field->rank = intval($extrafields->attributes[$object->table_element]['pos'][$key]);

+                $field->content = $this->getExtrafieldContent($object, $key);

+                $field->label = $outputlangs->transnoentities($label);

+                $field->type = $extrafields->attributes[$object->table_element]['type'][$key];

+

+                // dont display if empty

+                if ($disableOnEmpty && empty($field->content)) {

+                    continue;

+                }

+

+                $fields[] = $field;

+            }

+        }

+

+        if (!empty($fields))

+        {

+            // Sort extrafields by rank

+            uasort($fields, function ($a, $b) {

+                return  ($a->rank > $b->rank) ? -1 : 1;

@@ -1497,311 +1302,253 @@
-			// define some HTML content with style

-			$html .= !empty($params['style']) ? '<style>'.$params['style'].'</style>' : '';

-

-			// auto select display format

-			if ($params['display'] == 'auto') {

-				$lastNnumbItems = 0;

-				foreach ($params['auto'] as $display => $numbItems) {

-					if ($lastNnumbItems <= $numbItems && count($fields) > $numbItems) {

-						$lastNnumbItems = $numbItems;

-						$params['display'] = $display;

-					}

-				}

-			}

-

-			if ($params['display'] == 'list') {

-				// Display in list format

-				$i = 0;

-				foreach ($fields as $field) {

-					$html .= !empty($i) ? $params['list']['separator'] : '';

-					$html .= '<strong>'.$field->label.' : </strong>';

-					$html .= $field->content;

-					$i++;

-				}

-			} elseif ($params['display'] == 'table') {

-				// Display in table format

-				$html .= '<table class="extrafield-table" cellspacing="'.$params['table']['cellspacing'].'" cellpadding="'.$params['table']['cellpadding'].'" border="'.$params['table']['border'].'">';

-

-				$html .= "<tr>";

-				$itemsInRow = 0;

-				$maxItemsInRow = $params['table']['maxItemsInRow'];

-				foreach ($fields as $field) {

-					//$html.= !empty($html)?'<br>':'';

-					if ($itemsInRow >= $maxItemsInRow) {

-						// start a new line

-						$html .= "</tr><tr>";

-						$itemsInRow = 0;

-					}

-

-					// for some type we need line break

-					if (in_array($field->type, $params['table']['arrayOfLineBreakType'])) {

-						if ($itemsInRow > 0) {

-							// close table row and empty cols

-							for ($i = $itemsInRow; $i <= $maxItemsInRow; $i++) {

-								$html .= "<td></td><td></td>";

-							}

-							$html .= "</tr>";

-

-							// start a new line

-							$html .= "<tr>";

-						}

-

-						$itemsInRow = $maxItemsInRow;

-						$html .= '<td colspan="'.($maxItemsInRow * 2 - 1).'">';

-						$html .= '<strong>'.$field->label.' :</strong> ';

-						$html .= $field->content;

-						$html .= "</td>";

-					} else {

-						$itemsInRow++;

-						$html .= '<td width="'.$params['table']['labelcolwidth'].'" class="extrafield-label">';

-						$html .= '<strong>'.$field->label.' :</strong>';

-						$html .= "</td>";

-

-

-						$html .= '<td  class="extrafield-content">';

-						$html .= $field->content;

-						$html .= "</td>";

-					}

-				}

-				$html .= "</tr>";

-

-				$html .= '</table>';

-			}

-		}

-

-		return $html;

-	}

-

-

-	/**

-	 *  get column status from column key

-	 *

-	 *  @param	string		$colKey    		the column key

-	 *  @return	boolean						true if column on

-	 */

-	public function getColumnStatus($colKey)

-	{

-		if (!empty($this->cols[$colKey]['status'])) {

-			return true;

-		} else {

-			return  false;

-		}

-	}

-

-	/**

-	 * Print standard column content

-	 *

-	 * @param TCPDI	    $pdf            Pdf object

-	 * @param float     $tab_top        Tab top position

-	 * @param float     $tab_height     Default tab height

-	 * @param Translate $outputlangs    Output language

-	 * @param int       $hidetop        Hide top

-	 * @return float                    Height of col tab titles

-	 */

-	public function pdfTabTitles(&$pdf, $tab_top, $tab_height, $outputlangs, $hidetop = 0)

-	{

-		global $hookmanager, $conf;

-

-		foreach ($this->cols as $colKey => $colDef) {

-			$parameters = array(

-				'colKey' => $colKey,

-				'pdf' => $pdf,

-				'outputlangs' => $outputlangs,

-				'tab_top' => $tab_top,

-				'tab_height' => $tab_height,

-				'hidetop' => $hidetop

-			);

-

-			$reshook = $hookmanager->executeHooks('pdfTabTitles', $parameters, $this); // Note that $object may have been modified by hook

-			if ($reshook < 0) {

-				setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

-			} elseif (empty($reshook)) {

-				if (!$this->getColumnStatus($colKey)) {

-					continue;

-				}

-

-				// get title label

-				$colDef['title']['label'] = !empty($colDef['title']['label']) ? $colDef['title']['label'] : $outputlangs->transnoentities($colDef['title']['textkey']);

-

-				// Add column separator

-				if (!empty($colDef['border-left']) && isset($colDef['xStartPos'])) {

-					$pdf->line($colDef['xStartPos'], $tab_top, $colDef['xStartPos'], $tab_top + $tab_height);

-				}

-

-				if (empty($hidetop)) {

-					// save curent cell padding

-					$curentCellPaddinds = $pdf->getCellPaddings();

-

-					// Add space for lines (more if we need to show a second alternative language)

-					global $outputlangsbis;

-					if (is_object($outputlangsbis)) {

-						// set cell padding with column title definition

-						$pdf->setCellPaddings($colDef['title']['padding'][3], $colDef['title']['padding'][0], $colDef['title']['padding'][1], 0.5);

-					} else {

-						// set cell padding with column title definition

-						$pdf->setCellPaddings($colDef['title']['padding'][3], $colDef['title']['padding'][0], $colDef['title']['padding'][1], $colDef['title']['padding'][2]);

-					}

-					if (isset($colDef['title']['align'])) {

-						$align = $colDef['title']['align'];

-					} else {

-						$align = '';

-					}

-					$pdf->SetXY($colDef['xStartPos'], $tab_top);

-					$textWidth = $colDef['width'];

-					$pdf->MultiCell($textWidth, 2, $colDef['title']['label'], '', $align);

-

-					// Add variant of translation if $outputlangsbis is an object

-					if (is_object($outputlangsbis) && trim($colDef['title']['label'])) {

-						$pdf->setCellPaddings($colDef['title']['padding'][3], 0, $colDef['title']['padding'][1], $colDef['title']['padding'][2]);

-						$pdf->SetXY($colDef['xStartPos'], $pdf->GetY());

-						$textbis = $outputlangsbis->transnoentities($colDef['title']['textkey']);

-						$pdf->MultiCell($textWidth, 2, $textbis, '', $align);

-					}

-

-					$this->tabTitleHeight = max($pdf->GetY() - $tab_top, $this->tabTitleHeight);

-

-					// restore cell padding

-					$pdf->setCellPaddings($curentCellPaddinds['L'], $curentCellPaddinds['T'], $curentCellPaddinds['R'], $curentCellPaddinds['B']);

-				}

-			}

-		}

-

-		return $this->tabTitleHeight;

-	}

-

-

-

-	/**

-	 *  Define Array Column Field for extrafields

-	 *

-	 *  @param	object			$object    		common object det

-	 *  @param	Translate		$outputlangs    langs

-	 *  @param	int			   $hidedetails		Do not show line details

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

-	 */

-	public function defineColumnExtrafield($object, $outputlangs, $hidedetails = 0)

-	{

-		if (!empty($hidedetails)) {

-			return 0;

-		}

-

-		if (empty($object->table_element)) {

-			return 0;

-		}

-

-		// Load extra fields if they haven't been loaded already.

-		if (empty($this->extrafieldsCache)) {

-			$this->extrafieldsCache = new ExtraFields($this->db);

-		}

-		if (empty($this->extrafieldsCache->attributes[$object->table_element])) {

-			$this->extrafieldsCache->fetch_name_optionals_label($object->table_element);

-		}

-		$extrafields = $this->extrafieldsCache;

-

-

-		if (!empty($extrafields->attributes[$object->table_element]) && is_array($extrafields->attributes[$object->table_element]) && array_key_exists('label', $extrafields->attributes[$object->table_element]) && is_array($extrafields->attributes[$object->table_element]['label'])) {

-			foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label) {

-				// Dont display separator yet even is set to be displayed (not compatible yet)

-				if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate') {

-					continue;

-				}

-

-				// Enable extrafield ?

-				$enabled = 0;

-				if (!empty($extrafields->attributes[$object->table_element]['printable'][$key])) {

-					$printable = intval($extrafields->attributes[$object->table_element]['printable'][$key]);

-					if ($printable === 1 || $printable === 2) {

-						$enabled = 1;

-					}

-					// Note : if $printable === 3 or 4 so, it's displayed after line description not in cols

-				}

-

-				if (!$enabled) {

-					continue;

-				} // don't wast resourses if we don't need them...

-

-				// Load language if required

-				if (!empty($extrafields->attributes[$object->table_element]['langfile'][$key])) {

-					$outputlangs->load($extrafields->attributes[$object->table_element]['langfile'][$key]);

-				}

-

-				// TODO : add more extrafield customisation capacities for PDF like width, rank...

-

-				// set column definition

-				$def = array(

-					'rank' => intval($extrafields->attributes[$object->table_element]['pos'][$key]),

-					'width' => 25, // in mm

-					'status' => (bool) $enabled,

-					'title' => array(

-						'label' => $outputlangs->transnoentities($label)

-					),

-					'content' => array(

-						'align' => 'C'

-					),

-					'border-left' => true, // add left line separator

-				);

-

-				$alignTypeRight = array('double', 'int', 'price');

-				if (in_array($extrafields->attributes[$object->table_element]['type'][$key], $alignTypeRight)) {

-					$def['content']['align'] = 'R';

-				}

-

-				$alignTypeLeft = array('text', 'html');

-				if (in_array($extrafields->attributes[$object->table_element]['type'][$key], $alignTypeLeft)) {

-					$def['content']['align'] = 'L';

-				}

-

-

-				// for extrafields we use rank of extrafield to place it on PDF

-				$this->insertNewColumnDef("options_".$key, $def);

-			}

-		}

-

-		return 1;

-	}

-

-	/**

-	 *   Define Array Column Field into $this->cols

-	 *   This method must be implemented by the module that generate the document with its own columns.

-	 *

-	 *   @param		Object			$object    		Common object

-	 *   @param		Translate		$outputlangs    Langs

-	 *   @param		int			   	$hidedetails	Do not show line details

-	 *   @param		int			   	$hidedesc		Do not show desc

-	 *   @param		int			   	$hideref		Do not show ref

-	 *   @return	void

-	 */

-	public function defineColumnField($object, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)

-	{

-		// Default field style for content

-		$this->defaultContentsFieldsStyle = array(

-			'align' => 'R', // R,C,L

-			'padding' => array(1, 0.5, 1, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left

-		);

-

-		// Default field style for content

-		$this->defaultTitlesFieldsStyle = array(

-			'align' => 'C', // R,C,L

-			'padding' => array(0.5, 0, 0.5, 0), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left

-		);

-

-		// Example

-		/*

-		$rank = 0; // do not use negative rank

-		$this->cols['desc'] = array(

-			'rank' => $rank,

-			'width' => false, // only for desc

-			'status' => true,

-			'title' => array(

-				'textkey' => 'Designation', // use lang key is usefull in somme case with module

-				'align' => 'L',

-				// 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label

-				// 'label' => ' ', // the final label

-				'padding' => array(0.5, 0.5, 0.5, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left

-			),

-			'content' => array(

-				'align' => 'L',

-				'padding' => array(1, 0.5, 1, 1.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left

-			),

-		);

-		*/

-	}

+            // define some HTML content with style

+            $html .= !empty($params['style']) ? '<style>'.$params['style'].'</style>' : '';

+

+            // auto select display format

+            if ($params['display'] == 'auto') {

+                $lastNnumbItems = 0;

+                foreach ($params['auto'] as $display => $numbItems) {

+                    if ($lastNnumbItems <= $numbItems && count($fields) > $numbItems) {

+                        $lastNnumbItems = $numbItems;

+                        $params['display'] = $display;

+                    }

+                }

+            }

+

+            if ($params['display'] == 'list') {

+                // Display in list format

+                $i = 0;

+                foreach ($fields as $field) {

+                    $html .= !empty($i) ? $params['list']['separator'] : '';

+                    $html .= '<strong>'.$field->label.' : </strong>';

+                    $html .= $field->content;

+                    $i++;

+                }

+            }

+            elseif ($params['display'] == 'table') {

+                // Display in table format

+                $html .= '<table class="extrafield-table" cellspacing="'.$params['table']['cellspacing'].'" cellpadding="'.$params['table']['cellpadding'].'" border="'.$params['table']['border'].'">';

+

+                $html .= "<tr>";

+                $itemsInRow = 0;

+                $maxItemsInRow = $params['table']['maxItemsInRow'];

+                foreach ($fields as $field) {

+                    //$html.= !empty($html)?'<br/>':'';

+                    if ($itemsInRow >= $maxItemsInRow) {

+                        // start a new line

+                        $html .= "</tr><tr>";

+                        $itemsInRow = 0;

+                    }

+

+                    // for some type we need line break

+                    if (in_array($field->type, $params['table']['arrayOfLineBreakType'])) {

+                        if ($itemsInRow > 0) {

+                            // close table row and empty cols

+                            for ($i = $itemsInRow; $i <= $maxItemsInRow; $i++) {

+                                $html .= "<td ></td><td></td>";

+                            }

+                            $html .= "</tr>";

+

+                            // start a new line

+                            $html .= "<tr>";

+                        }

+

+                        $itemsInRow = $maxItemsInRow;

+                        $html .= '<td colspan="'.($maxItemsInRow * 2 - 1).'">';

+                        $html .= '<strong>'.$field->label.' :</strong> ';

+                        $html .= $field->content;

+                        $html .= "</td>";

+                    } else {

+                        $itemsInRow++;

+                        $html .= '<td width="'.$params['table']['labelcolwidth'].'" class="extrafield-label">';

+                        $html .= '<strong>'.$field->label.' :</strong>';

+                        $html .= "</td>";

+

+

+                        $html .= '<td  class="extrafield-content">';

+                        $html .= $field->content;

+                        $html .= "</td>";

+                    }

+                }

+                $html .= "</tr>";

+

+                $html .= '</table>';

+            }

+        }

+

+        return $html;

+    }

+

+

+    /**

+     *  get column status from column key

+     *

+     *  @param	string			$colKey    		the column key

+     *  @return	float      width in mm

+     */

+    public function getColumnStatus($colKey)

+    {

+        if (!empty($this->cols[$colKey]['status'])) {

+            return true;

+        }

+        else  return  false;

+    }

+

+    /**

+     * Print standard column content

+     *

+     * @param TCPDI	    $pdf            Pdf object

+     * @param float     $tab_top        Tab top position

+     * @param float     $tab_height     Default tab height

+     * @param Translate $outputlangs    Output language

+     * @param int       $hidetop        Hide top

+     * @return float                    Height of col tab titles

+     */

+    public function pdfTabTitles(&$pdf, $tab_top, $tab_height, $outputlangs, $hidetop = 0)

+    {

+        global $hookmanager, $conf;

+

+        foreach ($this->cols as $colKey => $colDef) {

+            $parameters = array(

+                'colKey' => $colKey,

+                'pdf' => $pdf,

+                'outputlangs' => $outputlangs,

+                'tab_top' => $tab_top,

+                'tab_height' => $tab_height,

+                'hidetop' => $hidetop

+            );

+

+            $reshook = $hookmanager->executeHooks('pdfTabTitles', $parameters, $this); // Note that $object may have been modified by hook

+            if ($reshook < 0) {

+                setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

+            } elseif (empty($reshook)) {

+                if (!$this->getColumnStatus($colKey)) continue;

+

+                // get title label

+                $colDef['title']['label'] = !empty($colDef['title']['label']) ? $colDef['title']['label'] : $outputlangs->transnoentities($colDef['title']['textkey']);

+

+                // Add column separator

+                if (!empty($colDef['border-left'])) {

+                    $pdf->line($colDef['xStartPos'], $tab_top, $colDef['xStartPos'], $tab_top + $tab_height);

+                }

+

+                if (empty($hidetop)) {

+                    // save curent cell padding

+                    $curentCellPaddinds = $pdf->getCellPaddings();

+

+                    // Add space for lines (more if we need to show a second alternative language)

+                    global $outputlangsbis;

+                    if (is_object($outputlangsbis)) {

+                        // set cell padding with column title definition

+                        $pdf->setCellPaddings($colDef['title']['padding'][3], $colDef['title']['padding'][0], $colDef['title']['padding'][1], 0.5);

+                    }

+                    else {

+                        // set cell padding with column title definition

+                        $pdf->setCellPaddings($colDef['title']['padding'][3], $colDef['title']['padding'][0], $colDef['title']['padding'][1], $colDef['title']['padding'][2]);

+                    }

+

+                    $pdf->SetXY($colDef['xStartPos'], $tab_top);

+                    $textWidth = $colDef['width'];

+                    $pdf->MultiCell($textWidth, 2, $colDef['title']['label'], '', $colDef['title']['align']);

+

+                    // Add variant of translation if $outputlangsbis is an object

+                    if (is_object($outputlangsbis) && trim($colDef['title']['label'])) {

+                        $pdf->setCellPaddings($colDef['title']['padding'][3], 0, $colDef['title']['padding'][1], $colDef['title']['padding'][2]);

+                    	$pdf->SetXY($colDef['xStartPos'], $pdf->GetY());

+                    	$textbis = $outputlangsbis->transnoentities($colDef['title']['textkey']);

+                    	$pdf->MultiCell($textWidth, 2, $textbis, '', $colDef['title']['align']);

+                    }

+

+                    $this->tabTitleHeight = max($pdf->GetY() - $tab_top, $this->tabTitleHeight);

+

+                    // restore cell padding

+                    $pdf->setCellPaddings($curentCellPaddinds['L'], $curentCellPaddinds['T'], $curentCellPaddinds['R'], $curentCellPaddinds['B']);

+                }

+            }

+        }

+

+        return $this->tabTitleHeight;

+    }

+

+

+

+    /**

+     *  Define Array Column Field for extrafields

+     *

+     *  @param	object			$object    		common object det

+     *  @param	Translate		$outputlangs    langs

+     *  @param	int			   $hidedetails		Do not show line details

+     *  @return	null

+     */

+    public function defineColumnExtrafield($object, $outputlangs, $hidedetails = 0)

+    {

+        global $conf;

+

+        if (!empty($hidedetails)) {

+            return;

+        }

+

+        if (empty($object->table_element)) {

+            return;

+        }

+

+        // Load extrafiels if not allready does

+        if (empty($this->extrafieldsCache)) { $this->extrafieldsCache = new ExtraFields($this->db); }

+        if (empty($this->extrafieldsCache->attributes[$object->table_element])) { $this->extrafieldsCache->fetch_name_optionals_label($object->table_element); }

+        $extrafields = $this->extrafieldsCache;

+

+

+        if (!empty($extrafields->attributes[$object->table_element]) && is_array($extrafields->attributes[$object->table_element]['label'])) {

+            foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label)

+            {

+                // Dont display separator yet even is set to be displayed (not compatible yet)

+                if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate')

+                {

+                    continue;

+                }

+

+                // Enable extrafield ?

+                $enabled = 0;

+                if (!empty($extrafields->attributes[$object->table_element]['printable'][$key])) {

+                    $printable = intval($extrafields->attributes[$object->table_element]['printable'][$key]);

+                    if ($printable === 1 || $printable === 2) {

+                        $enabled = 1;

+                    }

+                    // Note : if $printable === 3 or 4 so, it's displayed after line description not in cols

+                }

+

+                if (!$enabled) { continue; } // don't wast resourses if we don't need them...

+

+                // Load language if required

+                if (!empty($extrafields->attributes[$object->table_element]['langfile'][$key])) $outputlangs->load($extrafields->attributes[$object->table_element]['langfile'][$key]);

+

+                // TODO : add more extrafield customisation capacities for PDF like width, rank...

+

+                // set column definition

+                $def = array(

+                    'rank' => intval($extrafields->attributes[$object->table_element]['pos'][$key]),

+                    'width' => 25, // in mm

+                    'status' => boolval($enabled),

+                    'title' => array(

+                        'label' => $outputlangs->transnoentities($label)

+                    ),

+                    'content' => array(

+                        'align' => 'C'

+                    ),

+                    'border-left' => true, // add left line separator

+                );

+

+                $alignTypeRight = array('double', 'int', 'price');

+                if (in_array($extrafields->attributes[$object->table_element]['type'][$key], $alignTypeRight)) {

+                    $def['content']['align'] = 'R';

+                }

+

+                $alignTypeLeft = array('text', 'html');

+                if (in_array($extrafields->attributes[$object->table_element]['type'][$key], $alignTypeLeft)) {

+                    $def['content']['align'] = 'L';

+                }

+

+

+                // for extrafields we use rank of extrafield to place it on PDF

+                $this->insertNewColumnDef("options_".$key, $def);

+            }

+        }

+    }

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_commoninvoice.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_commoninvoice.class.php
@@ -5 +4,0 @@
- * Copyright (C) 2023		Nick Fragoulis

@@ -28 +26,0 @@
-require_once DOL_DOCUMENT_ROOT.'/core/class/commonincoterm.class.php';

@@ -35,148 +33,30 @@
-	use CommonIncoterm;

-

-	/**

-	 * @var string		Label used as ref for template invoices

-	 */

-	public $title;

-

-	/**

-	 * @var int		Type of invoice (See TYPE_XXX constants)

-	 */

-	public $type = self::TYPE_STANDARD;

-

-	/**

-	 * @var int		Sub type of invoice (A subtype code coming from llx_invoice_subtype table. May be used by some countries like Greece)

-	 */

-	public $subtype;

-

-	/**

-	 * @var int Thirdparty ID

-	 * @deprecated

-	 * @see $socid

-	 */

-	public $fk_soc;

-	/**

-	 * @var int Thirdparty ID

-	 */

-	public $socid;

-

-	public $paye;

-

-	/**

-	 * Invoice date (date)

-	 *

-	 * @var integer

-	 */

-	public $date;

-

-	public $date_lim_reglement;

-

-	public $cond_reglement_id; // Id in llx_c_paiement

-	public $cond_reglement_code; // Code in llx_c_paiement

-	public $cond_reglement_label;

-	public $cond_reglement_doc; // Code in llx_c_paiement

-

-	public $mode_reglement_id;

-	public $mode_reglement_code; // Code in llx_c_paiement

-

-	/**

-	 * @var string

-	 */

-	public $mode_reglement;

-

-	/**

-	 * @var double

-	 */

-	public $revenuestamp;

-

-	public $totalpaid;			// duplicate with sumpayed

-	public $totaldeposits;		// duplicate with sumdeposit

-	public $totalcreditnotes;	// duplicate with sumcreditnote

-

-	public $sumpayed;

-	public $sumpayed_multicurrency;

-	public $sumdeposit;

-	public $sumdeposit_multicurrency;

-	public $sumcreditnote;

-	public $sumcreditnote_multicurrency;

-	public $remaintopay;

-

-	/**

-	 * @var int

-	 */

-	public $stripechargedone;

-

-	/**

-	 * @var int

-	 */

-	public $stripechargeerror;

-

-	/**

-	 * Payment description

-	 * @var string

-	 */

-	public $description;

-

-	/**

-	 * @var string

-	 * @deprecated

-	 * @see $ref_customer

-	 */

-	public $ref_client;

-

-	/**

-	 * @var int Situation cycle reference number

-	 */

-	public $situation_cycle_ref;

-

-	/**

-	 * ! Closing after partial payment: discount_vat, badsupplier, abandon

-	 * ! Closing when no payment: replaced, abandoned

-	 * @var string Close code

-	 */

-	public $close_code;

-

-	/**

-	 * ! Comment if paid without full payment

-	 * @var string Close note

-	 */

-	public $close_note;

-

-

-	/**

-	 * ! Populate by Payment module like stripe

-	 * @var string message return by Online Payment module

-	 */

-	public $postactionmessages;

-

-

-	/**

-	 * Standard invoice

-	 */

-	const TYPE_STANDARD = 0;

-

-	/**

-	 * Replacement invoice

-	 */

-	const TYPE_REPLACEMENT = 1;

-

-	/**

-	 * Credit note invoice

-	 */

-	const TYPE_CREDIT_NOTE = 2;

-

-	/**

-	 * Deposit invoice

-	 */

-	const TYPE_DEPOSIT = 3;

-

-	/**

-	 * Proforma invoice.

-	 * @deprectad Remove this. A "proforma invoice" is an order with a look of invoice, not an invoice !

-	 */

-	const TYPE_PROFORMA = 4;

-

-	/**

-	 * Situation invoice

-	 */

-	const TYPE_SITUATION = 5;

+    /**

+     * Standard invoice

+     */

+    const TYPE_STANDARD = 0;

+

+    /**

+     * Replacement invoice

+     */

+    const TYPE_REPLACEMENT = 1;

+

+    /**

+     * Credit note invoice

+     */

+    const TYPE_CREDIT_NOTE = 2;

+

+    /**

+     * Deposit invoice

+     */

+    const TYPE_DEPOSIT = 3;

+

+    /**

+     * Proforma invoice.

+     * @deprectad Remove this. A "proforma invoice" is an order with a look of invoice, not an invoice !

+     */

+    const TYPE_PROFORMA = 4;

+

+    /**

+     * Situation invoice

+     */

+    const TYPE_SITUATION = 5;

@@ -213 +92,0 @@
-

@@ -219 +98 @@
-	 *	@return		float					Remain of amount to pay

+	 *	@return		double					Remain of amount to pay

@@ -223,10 +102,10 @@
-		$alreadypaid = 0.0;

-		$alreadypaid += $this->getSommePaiement($multicurrency);

-		$alreadypaid += $this->getSumDepositsUsed($multicurrency);

-		$alreadypaid += $this->getSumCreditNotesUsed($multicurrency);

-

-		$remaintopay = price2num($this->total_ttc - $alreadypaid, 'MT');

-		if ($this->statut == self::STATUS_CLOSED && $this->close_code == 'discount_vat') {		// If invoice closed with discount for anticipated payment

-			$remaintopay = 0.0;

-		}

-		return $remaintopay;

+	    $alreadypaid = 0;

+	    $alreadypaid += $this->getSommePaiement($multicurrency);

+	    $alreadypaid += $this->getSumDepositsUsed($multicurrency);

+	    $alreadypaid += $this->getSumCreditNotesUsed($multicurrency);

+

+	    $remaintopay = price2num($this->total_ttc - $alreadypaid, 'MT');

+	    if ($this->statut == self::STATUS_CLOSED && $this->close_code == 'discount_vat') {		// If invoice closed with discount for anticipated payment

+	    	$remaintopay = 0;

+	    }

+	    return $remaintopay;

@@ -239,3 +118,2 @@
-	 *  @param 		int 			$multicurrency 		Return multicurrency_amount instead of amount. -1=Return both.

-	 *	@return		float|int|array						Amount of payment already done, <0 and set ->error if KO

-	 *  @see getSumDepositsUsed(), getSumCreditNotesUsed()

+	 *  @param 		int 	$multicurrency 	Return multicurrency_amount instead of amount

+	 *	@return		int						Amount of payment already done, <0 if KO

@@ -247 +125,2 @@
-		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') {

+		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')

+		{

@@ -252,3 +131,3 @@
-		$sql = "SELECT sum(amount) as amount, sum(multicurrency_amount) as multicurrency_amount";

-		$sql .= " FROM ".$this->db->prefix().$table;

-		$sql .= " WHERE ".$field." = ".((int) $this->id);

+		$sql = 'SELECT sum(amount) as amount, sum(multicurrency_amount) as multicurrency_amount';

+		$sql .= ' FROM '.MAIN_DB_PREFIX.$table;

+		$sql .= ' WHERE '.$field.' = '.$this->id;

@@ -257 +135,0 @@
-

@@ -259 +137,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -261 +139,0 @@
-

@@ -263,17 +141,5 @@
-

-			if ($obj) {

-				if ($multicurrency < 0) {

-					$this->sumpayed = $obj->amount;

-					$this->sumpayed_multicurrency = $obj->multicurrency_amount;

-					return array('alreadypaid'=>(float) $obj->amount, 'alreadypaid_multicurrency'=>(float) $obj->multicurrency_amount);

-				} elseif ($multicurrency) {

-					$this->sumpayed_multicurrency = $obj->multicurrency_amount;

-					return (float) $obj->multicurrency_amount;

-				} else {

-					$this->sumpayed = $obj->amount;

-					return (float) $obj->amount;

-				}

-			} else {

-				return 0;

-			}

-		} else {

+			if ($multicurrency) return $obj->multicurrency_amount;

+			else return $obj->amount;

+		}

+		else

+		{

@@ -286,7 +152,5 @@
-	 *  Return amount (with tax) of all deposits invoices used by invoice.

-	 *  Should always be empty, except if option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS is on for sale invoices (not recommended),

-	 *  of FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS is on for purchase invoices (not recommended).

-	 *

-	 * 	@param 		int 	$multicurrency 		Return multicurrency_amount instead of amount

-	 *	@return		float						Return integer <0 and set ->error if KO, Sum of deposits amount otherwise

-	 *	@see getSommePaiement(), getSumCreditNotesUsed()

+	 *    	Return amount (with tax) of all deposits invoices used by invoice.

+     *      Should always be empty, except if option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS is on (not recommended).

+	 *

+	 * 		@param 		int 	$multicurrency 	Return multicurrency_amount instead of amount

+	 *		@return		int						<0 if KO, Sum of deposits amount otherwise

@@ -296,30 +160,26 @@
-		/*if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') {

-			// FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS was never supported for purchase invoice, so we can return 0 with no need of SQL for this case.

-			return 0.0;

-		}*/

-

-		require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';

-

-		$discountstatic = new DiscountAbsolute($this->db);

-		$result = $discountstatic->getSumDepositsUsed($this, $multicurrency);

-

-		if ($result >= 0) {

-			if ($multicurrency) {

-				$this->sumdeposit_multicurrency = $result;

-			} else {

-				$this->sumdeposit = $result;

-			}

-

-			return $result;

-		} else {

-			$this->error = $discountstatic->error;

-			return -1;

-		}

-	}

-

-	/**

-	 *  Return amount (with tax) of all credit notes invoices + excess received used by invoice

-	 *

-	 * 	@param 		int 	$multicurrency 		Return multicurrency_amount instead of amount

-	 *	@return		float						Return integer <0 and set ->error if KO, Sum of credit notes and deposits amount otherwise

-	 *	@see getSommePaiement(), getSumDepositsUsed()

+		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')

+	    {

+	        // TODO

+	        return 0;

+	    }

+

+	    require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';

+

+	    $discountstatic = new DiscountAbsolute($this->db);

+	    $result = $discountstatic->getSumDepositsUsed($this, $multicurrency);

+	    if ($result >= 0)

+	    {

+	        return $result;

+	    }

+	    else

+	    {

+	        $this->error = $discountstatic->error;

+	        return -1;

+	    }

+	}

+

+	/**

+	 *    	Return amount (with tax) of all credit notes invoices + excess received used by invoice

+	 *

+	 * 		@param 		int 	$multicurrency 	Return multicurrency_amount instead of amount

+	 *		@return		int						<0 if KO, Sum of credit notes and deposits amount otherwise

@@ -329,16 +189,13 @@
-		require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';

-

-		$discountstatic = new DiscountAbsolute($this->db);

-		$result = $discountstatic->getSumCreditNotesUsed($this, $multicurrency);

-		if ($result >= 0) {

-			if ($multicurrency) {

-				$this->sumcreditnote_multicurrency = $result;

-			} else {

-				$this->sumcreditnote = $result;

-			}

-

-			return $result;

-		} else {

-			$this->error = $discountstatic->error;

-			return -1;

-		}

+	    require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';

+

+	    $discountstatic = new DiscountAbsolute($this->db);

+	    $result = $discountstatic->getSumCreditNotesUsed($this, $multicurrency);

+	    if ($result >= 0)

+	    {

+	        return $result;

+	    }

+	    else

+	    {

+	        $this->error = $discountstatic->error;

+	        return -1;

+	    }

@@ -351 +208 @@
-	 *		@return		float						Return integer <0 if KO, Sum of credit notes and deposits amount otherwise

+	 *		@return		int						<0 if KO, Sum of credit notes and deposits amount otherwise

@@ -355,10 +212,13 @@
-		require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';

-

-		$discountstatic = new DiscountAbsolute($this->db);

-		$result = $discountstatic->getSumFromThisCreditNotesNotUsed($this, $multicurrency);

-		if ($result >= 0) {

-			return $result;

-		} else {

-			$this->error = $discountstatic->error;

-			return -1;

-		}

+	    require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';

+

+	    $discountstatic = new DiscountAbsolute($this->db);

+	    $result = $discountstatic->getSumFromThisCreditNotesNotUsed($this, $multicurrency);

+	    if ($result >= 0)

+	    {

+	        return $result;

+	    }

+	    else

+	    {

+	        $this->error = $discountstatic->error;

+	        return -1;

+	    }

@@ -376,4 +236,4 @@
-		$sql = "SELECT rowid";

-		$sql .= " FROM ".$this->db->prefix().$this->table_element;

-		$sql .= " WHERE fk_facture_source = ".((int) $this->id);

-		$sql .= " AND type = 2";

+		$sql = 'SELECT rowid';

+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element;

+		$sql .= ' WHERE fk_facture_source = '.$this->id;

+		$sql .= ' AND type = 2';

@@ -381 +241,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -384 +245,2 @@
-			while ($i < $num) {

+			while ($i < $num)

+			{

@@ -389 +251,3 @@
-		} else {

+		}

+		else

+		{

@@ -399 +263 @@
-	 *	@return		int					Return integer <0 si KO, 0 if no invoice replaces it, id of invoice otherwise

+	 *	@return		int					<0 si KO, 0 if no invoice replaces it, id of invoice otherwise

@@ -403,7 +267,5 @@
-		$sql = "SELECT rowid";

-		$sql .= " FROM ".$this->db->prefix().$this->table_element;

-		$sql .= " WHERE fk_facture_source = ".((int) $this->id);

-		$sql .= " AND type < 2";

-		if ($option == 'validated') {

-			$sql .= ' AND fk_statut = 1';

-		}

+		$sql = 'SELECT rowid';

+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element;

+		$sql .= ' WHERE fk_facture_source = '.$this->id;

+		$sql .= ' AND type < 2';

+		if ($option == 'validated') $sql .= ' AND fk_statut = 1';

@@ -415 +277 @@
-		$sql .= " ORDER BY fk_statut DESC";

+		$sql .= ' ORDER BY fk_statut DESC';

@@ -418 +280,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -420 +283,2 @@
-			if ($obj) {

+			if ($obj)

+			{

@@ -423 +287,3 @@
-			} else {

+			}

+			else

+			{

@@ -427 +293,3 @@
-		} else {

+		}

+		else

+		{

@@ -436 +303,0 @@
-	 *  @param      int     $multicurrency  Return multicurrency_amount instead of amount

@@ -439 +306 @@
-	public function getListOfPayments($filtertype = '', $multicurrency = 0)

+	public function getListOfPayments($filtertype = '')

@@ -447,2 +313,0 @@
-		$field3 = ', p.ref_ext';

-		$field4 = ', p.fk_bank'; // Bank line id

@@ -450 +315,2 @@
-		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') {

+		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')

+		{

@@ -455 +320,0 @@
-			$field3 = '';

@@ -459,4 +324,5 @@
-		$sql = "SELECT p.ref, pf.amount, pf.multicurrency_amount, p.fk_paiement, p.datep, p.num_paiement as num, t.code".$field3 . $field4;

-		$sql .= " FROM ".$this->db->prefix().$table." as pf, ".$this->db->prefix().$table2." as p, ".$this->db->prefix()."c_paiement as t";

-		$sql .= " WHERE pf.".$field." = ".((int) $this->id);

-		$sql .= " AND pf.".$field2." = p.rowid";

+		$sql = 'SELECT p.ref, pf.amount, pf.multicurrency_amount, p.fk_paiement, p.datep, p.num_paiement as num, t.code';

+		$sql .= ' FROM '.MAIN_DB_PREFIX.$table.' as pf, '.MAIN_DB_PREFIX.$table2.' as p, '.MAIN_DB_PREFIX.'c_paiement as t';

+		$sql .= ' WHERE pf.'.$field.' = '.$this->id;

+		//$sql.= ' WHERE pf.'.$field.' = 1';

+		$sql .= ' AND pf.'.$field2.' = p.rowid';

@@ -465,3 +331 @@
-		if ($filtertype) {

-			$sql .= " AND t.code='PRE'";

-		}

+		if ($filtertype) $sql .= " AND t.code='PRE'";

@@ -471 +335,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -474 +339,2 @@
-			while ($i < $num) {

+			while ($i < $num)

+			{

@@ -476,8 +342 @@
-				$tmp = array('amount'=>$obj->amount, 'type'=>$obj->code, 'date'=>$obj->datep, 'num'=>$obj->num, 'ref'=>$obj->ref);

-				if (!empty($field3)) {

-					$tmp['ref_ext'] = $obj->ref_ext;

-				}

-				if (!empty($field4)) {

-					$tmp['fk_bank_line'] = $obj->fk_bank;

-				}

-				$retarray[] = $tmp;

+				$retarray[] = array('amount'=>$obj->amount, 'type'=>$obj->code, 'date'=>$obj->datep, 'num'=>$obj->num, 'ref'=>$obj->ref);

@@ -490,4 +349,5 @@
-			if ($this->element == 'facture' || $this->element == 'invoice') {

-				$sql = "SELECT rc.amount_ttc as amount, rc.multicurrency_amount_ttc as multicurrency_amount, rc.datec as date, f.ref as ref, rc.description as type";

-				$sql .= ' FROM '.$this->db->prefix().'societe_remise_except as rc, '.$this->db->prefix().'facture as f';

-				$sql .= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.((int) $this->id);

+			if ($this->element == 'facture' || $this->element == 'invoice')

+			{

+				$sql = 'SELECT rc.amount_ttc as amount, rc.multicurrency_amount_ttc as multicurrency_amount, rc.datec as date, f.ref as ref, rc.description as type';

+				$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';

+				$sql .= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$this->id;

@@ -495,5 +355,7 @@
-			} elseif ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') {

-				$sql = "SELECT rc.amount_ttc as amount, rc.multicurrency_amount_ttc as multicurrency_amount, rc.datec as date, f.ref as ref, rc.description as type";

-				$sql .= ' FROM '.$this->db->prefix().'societe_remise_except as rc, '.$this->db->prefix().'facture_fourn as f';

-				$sql .= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.((int) $this->id);

-				$sql .= ' AND (f.type = 2 OR f.type = 0 OR f.type = 3)'; // Find discount coming from credit note or excess received or deposits (payments from deposits are always null except if FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS is set)

+			}

+			elseif ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')

+			{

+				$sql = 'SELECT rc.amount_ttc as amount, rc.multicurrency_amount_ttc as multicurrency_amount, rc.datec as date, f.ref as ref, rc.description as type';

+				$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';

+				$sql .= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$this->id;

+				$sql .= ' AND (f.type = 2 OR f.type = 0 OR f.type = 3)'; // Find discount coming from credit note or excess received or deposits (payments from deposits are always null except if FACTURE_DEPOSITS_ARE_JUST_PAYMENTS is set)

@@ -504 +366,2 @@
-				if ($resql) {

+				if ($resql)

+				{

@@ -507 +370,2 @@
-					while ($i < $num) {

+					while ($i < $num)

+					{

@@ -511 +375,2 @@
-						} else {

+						}

+						else {

@@ -516 +381,3 @@
-				} else {

+				}

+				else

+				{

@@ -525 +392,3 @@
-		} else {

+		}

+		else

+		{

@@ -533 +402 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -545,5 +414,5 @@
-	 *  @return    int         Return integer <=0 if no, >0 if yes

-	 */

-	public function is_erasable()

-	{

-		// phpcs:enable

+	 *  @return    int         <=0 if no, >0 if yes

+	 */

+    public function is_erasable()

+    {

+        // phpcs:enable

@@ -555 +424,2 @@
-		if ($this->statut == self::STATUS_DRAFT && $tmppart === 'PROV') { // If draft invoice and ref not yet defined

+		if ($this->statut == self::STATUS_DRAFT && $tmppart === 'PROV') // If draft invoice and ref not yet defined

+		{

@@ -559,3 +429 @@
-		if (getDolGlobalString('INVOICE_CAN_NEVER_BE_REMOVED')) {

-			return 0;

-		}

+		if (!empty($conf->global->INVOICE_CAN_NEVER_BE_REMOVED)) return 0;

@@ -564 +432,2 @@
-		if ($tmppart !== 'PROV') {

+		if ($tmppart !== 'PROV')

+		{

@@ -566,3 +435 @@
-			if ($ventilExportCompta != 0) {

-				return -1;

-			}

+			if ($ventilExportCompta != 0) return -1;

@@ -571,4 +438,3 @@
-			if ($this->element != 'invoice_supplier') {

-				if (empty($this->thirdparty)) {

-					$this->fetch_thirdparty(); // We need to have this->thirdparty defined, in case of numbering rule use tags that depend on thirdparty (like {t} tag).

-				}

+			if ($this->element != 'invoice_supplier')

+			{

+				if (empty($this->thirdparty)) $this->fetch_thirdparty(); // We need to have this->thirdparty defined, in case of numbering rule use tags that depend on thirdparty (like {t} tag).

@@ -579,3 +445 @@
-				if (!getDolGlobalString('INVOICE_CAN_ALWAYS_BE_REMOVED') && $maxref != '' && $maxref != $this->ref) {

-					return -2;

-				}

+				if (empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED) && $maxref != '' && $maxref != $this->ref) return -2;

@@ -586 +450,2 @@
-				if ($this->situation_cycle_ref && method_exists($this, 'is_last_in_cycle')) {

+				if ($this->situation_cycle_ref && method_exists($this, 'is_last_in_cycle'))

+				{

@@ -588,3 +453 @@
-					if (!$last) {

-						return -3;

-					}

+					if (!$last) return -3;

@@ -596,3 +459 @@
-		if (!getDolGlobalString('INVOICE_CAN_ALWAYS_BE_REMOVED') && $this->getSommePaiement() > 0) {

-			return -4;

-		}

+		if (empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED) && $this->getSommePaiement() > 0) return -4;

@@ -606 +467 @@
-	 *	@return     int         Return integer <0 if KO, 0=no, 1=yes

+	 *	@return     int         <0 if KO, 0=no, 1=yes

@@ -613,5 +474,3 @@
-		if ($this->element == 'invoice_supplier') {

-			$type = 'supplier_invoice';

-		}

-

-		$sql = " SELECT COUNT(ab.rowid) as nb FROM ".$this->db->prefix()."accounting_bookkeeping as ab WHERE ab.doc_type='".$this->db->escape($type)."' AND ab.fk_doc = ".((int) $this->id);

+		if ($this->element == 'invoice_supplier') $type = 'supplier_invoice';

+

+		$sql = " SELECT COUNT(ab.rowid) as nb FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab WHERE ab.doc_type='".$type."' AND ab.fk_doc = ".$this->id;

@@ -619 +478,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -621 +481,2 @@
-			if ($obj) {

+			if ($obj)

+			{

@@ -624 +485,3 @@
-		} else {

+		}

+		else

+		{

@@ -629 +492,2 @@
-		if ($alreadydispatched) {

+		if ($alreadydispatched)

+		{

@@ -635,12 +498,0 @@
-	/**

-	 * Return next reference of invoice not already used (or last reference)

-	 *

-	 * @param	 Societe	$soc		Thirdparty object

-	 * @param    string		$mode		'next' for next value or 'last' for last value

-	 * @return   string					free ref or last ref

-	 */

-	public function getNextNumRef($soc, $mode = 'next')

-	{

-		// TODO Must be implemented into main class

-		return '';

-	}

@@ -651,4 +503,3 @@
-	 *	@param		int			$withbadge		1=Add span for badge css, 2=Add span and show short label

-	 *	@return     string        				Label of type of invoice

-	 */

-	public function getLibType($withbadge = 0)

+	 *	@return     string        Label of type of invoice

+	 */

+    public function getLibType()

@@ -657,105 +508,7 @@
-

-		$labellong = "Unknown";

-		if ($this->type == CommonInvoice::TYPE_STANDARD) {

-			$labellong = "InvoiceStandard";

-			$labelshort = "InvoiceStandardShort";

-		} elseif ($this->type == CommonInvoice::TYPE_REPLACEMENT) {

-			$labellong = "InvoiceReplacement";

-			$labelshort = "InvoiceReplacementShort";

-		} elseif ($this->type == CommonInvoice::TYPE_CREDIT_NOTE) {

-			$labellong = "InvoiceAvoir";

-			$labelshort = "CreditNote";

-		} elseif ($this->type == CommonInvoice::TYPE_DEPOSIT) {

-			$labellong = "InvoiceDeposit";

-			$labelshort = "Deposit";

-		} elseif ($this->type == CommonInvoice::TYPE_PROFORMA) {

-			$labellong = "InvoiceProForma"; // Not used.

-			$labelshort = "ProForma";

-		} elseif ($this->type == CommonInvoice::TYPE_SITUATION) {

-			$labellong = "InvoiceSituation";

-			$labelshort = "Situation";

-		}

-

-		$out = '';

-		if ($withbadge) {

-			$out .= '<span class="badgeneutral" title="'.dol_escape_htmltag($langs->trans($labellong)).'">';

-		}

-		$out .= $langs->trans($withbadge == 2 ? $labelshort : $labellong);

-		if ($withbadge) {

-			$out .= '</span>';

-		}

-		return $out;

-	}

-

-	/**

-	 *	Return label of invoice subtype

-	 *

-	 *  @param		string		$table          table of invoice

-	 *	@return     string|int     				Label of invoice subtype or -1 if error

-	 */

-	public function getSubtypeLabel($table = '')

-	{

-		$subtypeLabel = '';

-		if ($table === 'facture' || $table === 'facture_fourn') {

-			$sql = "SELECT s.label FROM " . $this->db->prefix() . $table . " AS f";

-			$sql .= " INNER JOIN " . $this->db->prefix() . "c_invoice_subtype AS s ON f.subtype = s.rowid";

-			$sql .= " WHERE f.ref = '".$this->db->escape($this->ref)."'";

-		} elseif ($table === 'facture_rec' || $table === 'facture_fourn_rec') {

-			$sql = "SELECT s.label FROM " . $this->db->prefix() . $table . " AS f";

-			$sql .= " INNER JOIN " . $this->db->prefix() . "c_invoice_subtype AS s ON f.subtype = s.rowid";

-			$sql .= " WHERE f.titre = '".$this->db->escape($this->title)."'";

-		} else {

-			return -1;

-		}

-

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

-		if ($resql) {

-			while ($obj = $this->db->fetch_object($resql)) {

-				$subtypeLabel = $obj->label;

-			}

-		} else {

-			dol_print_error($this->db);

-			return -1;

-		}

-

-		return $subtypeLabel;

-	}

-

-	/**

-	 *    	Retrieve a list of invoice subtype labels or codes.

-	 *

-	 *		@param	int		$mode		0=Return id+label, 1=Return code+id

-	 *    	@return array      			Array of subtypes

-	 */

-	public function getArrayOfInvoiceSubtypes($mode = 0)

-	{

-		global $mysoc;

-

-		$effs = array();

-

-		$sql = "SELECT rowid, code, label as label";

-		$sql .= " FROM " . MAIN_DB_PREFIX . 'c_invoice_subtype';

-		$sql .= " WHERE active = 1 AND fk_country = ".((int) $mysoc->country_id)." AND entity IN(".getEntity('c_invoice_subtype').")";

-		$sql .= " ORDER by rowid, code";

-		dol_syslog(get_class($this) . '::getArrayOfInvoiceSubtypes', LOG_DEBUG);

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

-		if ($resql) {

-			$num = $this->db->num_rows($resql);

-			$i = 0;

-

-			while ($i < $num) {

-				$objp = $this->db->fetch_object($resql);

-				if (!$mode) {

-					$key = $objp->rowid;

-					$effs[$key] = $objp->label;

-				} else {

-					$key = $objp->code;

-					$effs[$key] = $objp->rowid;

-				}

-

-				$i++;

-			}

-			$this->db->free($resql);

-		}

-

-		return $effs;

+        if ($this->type == CommonInvoice::TYPE_STANDARD) return $langs->trans("InvoiceStandard");

+        elseif ($this->type == CommonInvoice::TYPE_REPLACEMENT) return $langs->trans("InvoiceReplacement");

+        elseif ($this->type == CommonInvoice::TYPE_CREDIT_NOTE) return $langs->trans("InvoiceAvoir");

+        elseif ($this->type == CommonInvoice::TYPE_DEPOSIT) return $langs->trans("InvoiceDeposit");

+        elseif ($this->type == CommonInvoice::TYPE_PROFORMA) return $langs->trans("InvoiceProForma"); // Not used.

+        elseif ($this->type == CommonInvoice::TYPE_SITUATION) return $langs->trans("InvoiceSituation");

+		return $langs->trans("Unknown");

@@ -776 +529 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -784 +537 @@
-	 *	@param		int		$type			Type invoice. If -1, we use $this->type

+	 *	@param		int		$type			Type invoice

@@ -787,4 +540,4 @@
-	public function LibStatut($paye, $status, $mode = 0, $alreadypaid = -1, $type = -1)

-	{

-		// phpcs:enable

-		global $langs, $hookmanager;

+	public function LibStatut($paye, $status, $mode = 0, $alreadypaid = -1, $type = 0)

+	{

+        // phpcs:enable

+		global $langs;

@@ -792,4 +544,0 @@
-

-		if ($type == -1) {

-			$type = $this->type;

-		}

@@ -800,55 +549,42 @@
-			if ($status == 0) {

-				$labelStatus = $langs->transnoentitiesnoconv('BillStatusDraft');

-				$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusDraft');

-			} elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) {

-				if ($status == 3) {

-					$labelStatus = $langs->transnoentitiesnoconv('BillStatusCanceled');

-					$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusCanceled');

-				} else {

-					$labelStatus = $langs->transnoentitiesnoconv('BillStatusClosedUnpaid');

-					$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusClosedUnpaid');

-				}

-				$statusType = 'status5';

-			} elseif (($status == 3 || $status == 2) && $alreadypaid > 0) {

-				$labelStatus = $langs->transnoentitiesnoconv('BillStatusClosedPaidPartially');

-				$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusClosedPaidPartially');

-				$statusType = 'status9';

-			} elseif ($alreadypaid == 0) {

-				$labelStatus = $langs->transnoentitiesnoconv('BillStatusNotPaid');

-				$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusNotPaid');

-				$statusType = 'status1';

-			} else {

-				$labelStatus = $langs->transnoentitiesnoconv('BillStatusStarted');

-				$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusStarted');

-				$statusType = 'status3';

-			}

-		} else {

-			$statusType = 'status6';

-

-			if ($type == self::TYPE_CREDIT_NOTE) {

-				$labelStatus = $langs->transnoentitiesnoconv('BillStatusPaidBackOrConverted'); // credit note

-				$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusPaidBackOrConverted'); // credit note

-			} elseif ($type == self::TYPE_DEPOSIT) {

-				$labelStatus = $langs->transnoentitiesnoconv('BillStatusConverted'); // deposit invoice

-				$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusConverted'); // deposit invoice

-			} else {

-				$labelStatus = $langs->transnoentitiesnoconv('BillStatusPaid');

-				$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusPaid');

-			}

-		}

-

-		$parameters = array(

-			'status'      => $status,

-			'mode'        => $mode,

-			'paye'        => $paye,

-			'alreadypaid' => $alreadypaid,

-			'type'        => $type

-		);

-

-		$reshook = $hookmanager->executeHooks('LibStatut', $parameters, $this); // Note that $action and $object may have been modified by hook

-

-		if ($reshook > 0) {

-			return $hookmanager->resPrint;

-		}

-

-

+		    if ($status == 0) {

+		        $labelStatus = $langs->trans('BillStatusDraft');

+		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusDraft');

+		    }

+		    elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) {

+		        $labelStatus = $langs->trans('BillStatusClosedUnpaid');

+		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusClosedUnpaid');

+		        $statusType = 'status5';

+		    }

+		    elseif (($status == 3 || $status == 2) && $alreadypaid > 0) {

+		        $labelStatus = $langs->trans('BillStatusClosedPaidPartially');

+		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');

+		        $statusType = 'status9';

+		    }

+		    elseif ($alreadypaid <= 0) {

+		        $labelStatus = $langs->trans('BillStatusNotPaid');

+		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusNotPaid');

+		        $statusType = 'status1';

+		    }

+		    else {

+		        $labelStatus = $langs->trans('BillStatusStarted');

+		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusStarted');

+		        $statusType = 'status3';

+		    }

+		}

+		else

+		{

+		    $statusType = 'status6';

+

+		    if ($type == self::TYPE_CREDIT_NOTE) {

+		        $labelStatus = $langs->trans('BillStatusPaidBackOrConverted'); // credit note

+		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted'); // credit note

+		    }

+		    elseif ($type == self::TYPE_DEPOSIT) {

+		        $labelStatus = $langs->trans('BillStatusConverted'); // deposit invoice

+		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusConverted'); // deposit invoice

+		    }

+		    else {

+		        $labelStatus = $langs->trans('BillStatusPaid');

+		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusPaid');

+		    }

+		}

@@ -859 +595 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -865,14 +601,7 @@
-	 *  @return     integer    			       	Date limit of payment if OK, <0 if KO

-	 */

-	public function calculate_date_lim_reglement($cond_reglement = 0)

-	{

-		// phpcs:enable

-		if (!$cond_reglement) {

-			$cond_reglement = $this->cond_reglement_code;

-		}

-		if (!$cond_reglement) {

-			$cond_reglement = $this->cond_reglement_id;

-		}

-		if (!$cond_reglement) {

-			return $this->date;

-		}

+	 *  @return     integer    			       	Date limite de reglement si ok, <0 si ko

+	 */

+    public function calculate_date_lim_reglement($cond_reglement = 0)

+	{

+        // phpcs:enable

+		if (!$cond_reglement) $cond_reglement = $this->cond_reglement_code;

+		if (!$cond_reglement) $cond_reglement = $this->cond_reglement_id;

@@ -881,8 +610,7 @@
-		$cdr_type = 0;

-		$cdr_decalage = 0;

-

-		$sqltemp = "SELECT c.type_cdr, c.nbjour, c.decalage";

-		$sqltemp .= " FROM ".$this->db->prefix()."c_payment_term as c";

-		if (is_numeric($cond_reglement)) {

-			$sqltemp .= " WHERE c.rowid=".((int) $cond_reglement);

-		} else {

+        $cdr_type = 0;

+        $cdr_decalage = 0;

+

+		$sqltemp = 'SELECT c.type_cdr, c.nbjour, c.decalage';

+		$sqltemp .= ' FROM '.MAIN_DB_PREFIX.'c_payment_term as c';

+		if (is_numeric($cond_reglement)) $sqltemp .= " WHERE c.rowid=".$cond_reglement;

+		else {

@@ -890 +618 @@
-			$sqltemp .= " AND c.code = '".$this->db->escape($cond_reglement)."'";

+			$sqltemp .= " AND c.code='".$this->db->escape($cond_reglement)."'";

@@ -895,2 +623,4 @@
-		if ($resqltemp) {

-			if ($this->db->num_rows($resqltemp)) {

+		if ($resqltemp)

+		{

+			if ($this->db->num_rows($resqltemp))

+			{

@@ -902 +632,3 @@
-		} else {

+		}

+		else

+		{

@@ -911 +643,2 @@
-		if ($cdr_type == 0) {

+		if ($cdr_type == 0)

+		{

@@ -915,2 +648,4 @@
-		} elseif ($cdr_type == 1) {

-			// 1 : application of the "end of the month" rule

+		}

+		// 1 : application of the "end of the month" rule

+		elseif ($cdr_type == 1)

+		{

@@ -921 +656,2 @@
-			if ($mois == 12) {

+			if ($mois == 12)

+			{

@@ -924 +660,3 @@
-			} else {

+			}

+			else

+			{

@@ -932,3 +670,5 @@
-		} elseif ($cdr_type == 2 && !empty($cdr_decalage)) {

-			// 2 : application of the rule, the N of the current or next month

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

+		}

+		// 2 : application of the rule, the N of the current or next month

+		elseif ($cdr_type == 2 && !empty($cdr_decalage))

+		{

+		    include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';

@@ -943,8 +683,4 @@
-			if ($diff < 0) {

-				$datelim = $date_lim_current;

-			} else {

-				$datelim = $date_lim_next;

-			}

-		} else {

-			return 'Bad value for type_cdr in database for record cond_reglement = '.$cond_reglement;

-		}

+			if ($diff < 0) $datelim = $date_lim_current;

+			else $datelim = $date_lim_next;

+		}

+		else return 'Bad value for type_cdr in database for record cond_reglement = '.$cond_reglement;

@@ -960,8 +696,7 @@
-	 *	@param      User	$fuser      				User asking the direct debit transfer

-	 *  @param		float	$amount						Amount we request direct debit for

-	 *  @param		string	$type						'direct-debit' or 'bank-transfer'

-	 *  @param		string	$sourcetype					Source ('facture' or 'supplier_invoice')

-	 *  @param		int		$checkduplicateamongall		0=Default (check among open requests only to find if request already exists). 1=Check also among requests completely processed and cancel if at least 1 request exists whatever is its status.

-	 *	@return     int         						Return integer <0 if KO, 0 if a request already exists, >0 if OK

-	 */

-	public function demande_prelevement($fuser, $amount = 0, $type = 'direct-debit', $sourcetype = 'facture', $checkduplicateamongall = 0)

+	 *	@param      User	$fuser      	User asking the direct debit transfer

+	 *  @param		float	$amount			Amount we request direct debit for

+	 *  @param		string	$type			'direct-debit' or 'bank-transfer'

+	 *  @param		string	$sourcetype		Source ('facture' or 'supplier_invoice')

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

+	 */

+	public function demande_prelevement($fuser, $amount = 0, $type = 'direct-debit', $sourcetype = 'facture')

@@ -976 +711,2 @@
-		if ($this->status > self::STATUS_DRAFT && $this->paye == 0) {

+		if ($this->statut > self::STATUS_DRAFT && $this->paye == 0)

+		{

@@ -981,2 +717,2 @@
-			$sql = "SELECT count(rowid) as nb";

-			$sql .= " FROM ".$this->db->prefix()."prelevement_demande";

+			$sql = 'SELECT count(*)';

+			$sql .= ' FROM '.MAIN_DB_PREFIX.'prelevement_facture_demande';

@@ -984 +720 @@
-				$sql .= " WHERE fk_facture_fourn = ".((int) $this->id);

+				$sql .= ' WHERE fk_facture_fourn = '.$this->id;

@@ -986,6 +722,4 @@
-				$sql .= " WHERE fk_facture = ".((int) $this->id);

-			}

-			$sql .= " AND type = 'ban'"; // To exclude record done for some online payments

-			if (empty($checkduplicateamongall)) {

-				$sql .= " AND traite = 0";

-			}

+				$sql .= ' WHERE fk_facture = '.$this->id;

+			}

+			$sql .= ' AND ext_payment_id IS NULL';			// To exclude record done for some online payments

+			$sql .= ' AND traite = 0';

@@ -994 +727,0 @@
-

@@ -996,3 +729,5 @@
-			if ($resql) {

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

-				if ($obj && $obj->nb == 0) {	// If no request found yet

+			if ($resql)

+			{

+				$row = $this->db->fetch_row($resql);

+				if ($row[0] == 0)

+				{

@@ -1001 +736 @@
-					$totalpaid = $this->getSommePaiement();

+					$totalpaye = $this->getSommePaiement();

@@ -1004 +739 @@
-					//print "totalpaid=".$totalpaid." totalcreditnotes=".$totalcreditnotes." totaldeposts=".$totaldeposits;

+					//print "totalpaye=".$totalpaye." totalcreditnotes=".$totalcreditnotes." totaldeposts=".$totaldeposits;

@@ -1008 +743 @@
-					//$resteapayer=bcadd($this->total_ttc,$totalpaid,$conf->global->MAIN_MAX_DECIMALS_TOT);

+					//$resteapayer=bcadd($this->total_ttc,$totalpaye,$conf->global->MAIN_MAX_DECIMALS_TOT);

@@ -1010,6 +745,5 @@
-					if (empty($amount)) {

-						$amount = price2num($this->total_ttc - $totalpaid - $totalcreditnotes - $totaldeposits, 'MT');

-					}

-

-					if (is_numeric($amount) && $amount != 0) {

-						$sql = 'INSERT INTO '.$this->db->prefix().'prelevement_demande(';

+					if (empty($amount)) $amount = price2num($this->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');

+

+					if (is_numeric($amount) && $amount != 0)

+					{

+						$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'prelevement_facture_demande(';

@@ -1021,12 +755,11 @@
-						$sql .= ' amount, date_demande, fk_user_demande, code_banque, code_guichet, number, cle_rib, sourcetype, type, entity)';

-						$sql .= " VALUES (".((int) $this->id);

-						$sql .= ", ".((float) price2num($amount));

-						$sql .= ", '".$this->db->idate($now)."'";

-						$sql .= ", ".((int) $fuser->id);

-						$sql .= ", '".$this->db->escape($bac->code_banque)."'";

-						$sql .= ", '".$this->db->escape($bac->code_guichet)."'";

-						$sql .= ", '".$this->db->escape($bac->number)."'";

-						$sql .= ", '".$this->db->escape($bac->cle_rib)."'";

-						$sql .= ", '".$this->db->escape($sourcetype)."'";

-						$sql .= ", 'ban'";

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

+						$sql .= ' amount, date_demande, fk_user_demande, code_banque, code_guichet, number, cle_rib, sourcetype, entity)';

+						$sql .= ' VALUES ('.$this->id;

+						$sql .= ",'".price2num($amount)."'";

+						$sql .= ",'".$this->db->idate($now)."'";

+						$sql .= ",".$fuser->id;

+						$sql .= ",'".$this->db->escape($bac->code_banque)."'";

+						$sql .= ",'".$this->db->escape($bac->code_guichet)."'";

+						$sql .= ",'".$this->db->escape($bac->number)."'";

+						$sql .= ",'".$this->db->escape($bac->cle_rib)."'";

+						$sql .= ",'".$this->db->escape($sourcetype)."'";

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

@@ -1037 +770,2 @@
-						if (!$resql) {

+						if (!$resql)

+						{

@@ -1042 +776,3 @@
-					} else {

+					}

+					else

+					{

@@ -1048 +784,2 @@
-					if (!$error) {

+					if (!$error)

+					{

@@ -1050,2 +787,3 @@
-						$payment_mode_id = dol_getIdFromCode($this->db, ($type == 'bank-transfer' ? 'VIR' : 'PRE'), 'c_paiement', 'code', 'id', 1);

-						if ($payment_mode_id > 0) {

+						$payment_mode_id = dol_getIdFromCode($this->db, 'PRE', 'c_paiement', 'code', 'id', 1);

+						if ($payment_mode_id > 0)

+						{

@@ -1056,3 +794 @@
-					if ($error) {

-						return -1;

-					}

+					if ($error) return -1;

@@ -1060 +796,3 @@
-				} else {

+				}

+				else

+				{

@@ -1062 +800 @@
-					dol_syslog(get_class($this).'::demandeprelevement Can t create a request to generate a direct debit, a request already exists.');

+					dol_syslog(get_class($this).'::demandeprelevement Impossible de creer une demande, demande deja en cours');

@@ -1065 +803,3 @@
-			} else {

+			}

+			else

+			{

@@ -1067 +807 @@
-				dol_syslog(get_class($this).'::demandeprelevement Error -2');

+				dol_syslog(get_class($this).'::demandeprelevement Erreur -2');

@@ -1070 +810,3 @@
-		} else {

+		}

+		else

+		{

@@ -1072,546 +814 @@
-			dol_syslog(get_class($this)."::demandeprelevement ".$this->error." $this->status, $this->paye, $this->mode_reglement_id");

-			return -3;

-		}

-	}

-

-

-	/**

-	 *  Create a payment with Stripe card

-	 *  Must take amount using Stripe and record an event into llx_actioncomm

-	 *  Record bank payment

-	 *  Send email to customer ?

-	 *

-	 *	@param      User	$fuser      	User asking the direct debit transfer

-	 *  @param		int		$id				Invoice ID with remain to pay

-	 *  @param		string	$sourcetype		Source ('facture' or 'supplier_invoice')

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

-	 */

-	public function makeStripeCardRequest($fuser, $id, $sourcetype = 'facture')

-	{

-		// TODO See in sellyoursaas

-		return 0;

-	}

-

-	/**

-	 *  Create a direct debit order into prelevement_bons for a given prelevement_request, then

-	 *  Send the payment order to the service (for a direct debit order or a credit transfer order) and record an event in llx_actioncomm.

-	 *

-	 *	@param      User	$fuser      	User asking the direct debit transfer

-	 *  @param		int		$did			ID of unitary payment request to pay

-	 *  @param		string	$type			'direct-debit' or 'bank-transfer'

-	 *  @param		string	$sourcetype		Source ('facture' or 'supplier_invoice')

-	 *  @param		string	$service		'StripeTest', 'StripeLive', ...

-	 *  @param		string	$forcestripe	To force another stripe env: 'cus_account@pk_...:sk_...'

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

-	 */

-	public function makeStripeSepaRequest($fuser, $did, $type = 'direct-debit', $sourcetype = 'facture', $service = '', $forcestripe = '')

-	{

-		global $conf, $user, $langs;

-

-		if ($type != 'bank-transfer' && $type != 'credit-transfer' && !getDolGlobalString('STRIPE_SEPA_DIRECT_DEBIT')) {

-			return 0;

-		}

-		if ($type != 'direct-debit' && !getDolGlobalString('STRIPE_SEPA_CREDIT_TRANSFER')) {

-			return 0;

-		}

-		// Set a default value for service if not provided

-		if (empty($service)) {

-			$service = 'StripeTest';

-			if (getDolGlobalString('STRIPE_LIVE') && !GETPOST('forcesandbox', 'alpha')) {

-				$service = 'StripeLive';

-			}

-		}

-

-		$error = 0;

-

-		dol_syslog(get_class($this)."::makeStripeSepaRequest start did=".$did." type=".$type." service=".$service." sourcetype=".$sourcetype." forcestripe=".$forcestripe, LOG_DEBUG);

-

-		if ($this->status > self::STATUS_DRAFT && $this->paye == 0) {

-			// Get the default payment mode for BAN payment of the third party

-			require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';

-			$bac = new CompanyBankAccount($this->db);	// table societe_rib

-			$result = $bac->fetch(0, $this->socid, 1, 'ban');

-			if ($result <= 0 || empty($bac->id)) {

-				$this->error = $langs->trans("ThirdpartyHasNoDefaultBanAccount");

-				$this->errors[] = $this->error;

-				dol_syslog(get_class($this)."::makeStripeSepaRequest ".$this->error);

-				return -1;

-			}

-

-			// Load the pending payment request to process (with rowid=$did)

-			$sql = "SELECT rowid, date_demande, amount, fk_facture, fk_facture_fourn, fk_salary, fk_prelevement_bons";

-			$sql .= " FROM ".$this->db->prefix()."prelevement_demande";

-			$sql .= " WHERE rowid = ".((int) $did);

-			if ($type != 'bank-transfer' && $type != 'credit-transfer') {

-				$sql .= " AND fk_facture = ".((int) $this->id);				// Add a protection to not pay another invoice than current one

-			}

-			if ($type != 'direct-debit') {

-				if ($sourcetype == 'salary') {

-					$sql .= " AND fk_salary = ".((int) $this->id);			// Add a protection to not pay another salary than current one

-				} else {

-					$sql .= " AND fk_facture_fourn = ".((int) $this->id);	// Add a protection to not pay another invoice than current one

-				}

-			}

-			$sql .= " AND traite = 0";	// To not process payment request that were already converted into a direct debit or credit transfer order (Note: fk_prelevement_bons is also empty when traite = 0)

-

-			dol_syslog(get_class($this)."::makeStripeSepaRequest load requests to process", LOG_DEBUG);

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

-			if ($resql) {

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

-				if (!$obj) {

-					dol_print_error($this->db, 'CantFindRequestWithId');

-					return -2;

-				}

-

-				// amount to pay

-				$amount = $obj->amount;

-

-				if (is_numeric($amount) && $amount != 0) {

-					require_once DOL_DOCUMENT_ROOT.'/societe/class/companypaymentmode.class.php';

-					$companypaymentmode = new CompanyPaymentMode($this->db);	// table societe_rib

-					$companypaymentmode->fetch($bac->id);

-

-					$this->stripechargedone = 0;

-					$this->stripechargeerror = 0;

-

-					$now = dol_now();

-

-					$currency = $conf->currency;

-

-					$errorforinvoice = 0;     // We reset the $errorforinvoice at each invoice loop

-

-					$this->fetch_thirdparty();

-

-					dol_syslog("makeStripeSepaRequest Process payment request amount=".$amount." thirdparty_id=" . $this->thirdparty->id . ", thirdparty_name=" . $this->thirdparty->name . " ban id=" . $bac->id, LOG_DEBUG);

-

-					//$alreadypayed = $this->getSommePaiement();

-					//$amount_credit_notes_included = $this->getSumCreditNotesUsed();

-					//$amounttopay = $this->total_ttc - $alreadypayed - $amount_credit_notes_included;

-					$amounttopay = $amount;

-

-					// Correct the amount according to unit of currency

-					// See https://support.stripe.com/questions/which-zero-decimal-currencies-does-stripe-support

-					$arrayzerounitcurrency = ['BIF', 'CLP', 'DJF', 'GNF', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'VND', 'VUV', 'XAF', 'XOF', 'XPF'];

-					$amountstripe = $amounttopay;

-					if (!in_array($currency, $arrayzerounitcurrency)) {

-						$amountstripe = $amountstripe * 100;

-					}

-

-					$fk_bank_account = getDolGlobalInt('STRIPE_BANK_ACCOUNT_FOR_PAYMENTS');		// Bank account used for SEPA direct debit or credit transfer. Must be the Stripe account in Dolibarr.

-					if (!($fk_bank_account > 0)) {

-						$error++;

-						$errorforinvoice++;

-						dol_syslog("makeStripeSepaRequest Error no bank account defined for Stripe payments", LOG_ERR);

-						$this->errors[] = "Error bank account for Stripe payments not defined into Stripe module";

-					}

-

-					$this->db->begin();

-

-					// Create a prelevement_bon

-					require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';

-					$bon = new BonPrelevement($this->db);

-					if (!$error) {

-						if (empty($obj->fk_prelevement_bons)) {

-							// This creates a record into llx_prelevement_bons and updates link with llx_prelevement_demande

-							$nbinvoices = $bon->create(0, 0, 'real', 'ALL', '', 0, $type, $did, $fk_bank_account);

-							if ($nbinvoices <= 0) {

-								$error++;

-								$errorforinvoice++;

-								dol_syslog("makeStripeSepaRequest Error on BonPrelevement creation", LOG_ERR);

-								$this->errors[] = "Error on BonPrelevement creation";

-							}

-							/*

-							if (!$error) {

-								// Update the direct debit payment request of the processed request to save the id of the prelevement_bon

-								$sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_demande SET";

-								$sql .= " fk_prelevement_bons = ".((int) $bon->id);

-								$sql .= " WHERE rowid = ".((int) $did);

-

-								$result = $this->db->query($sql);

-								if ($result < 0) {

-									$error++;

-									$this->errors[] = "Error on updateing fk_prelevement_bons to ".$bon->id;

-								}

-							}

-							*/

-						} else {

-							$error++;

-							$errorforinvoice++;

-							dol_syslog("makeStripeSepaRequest Error Line already part of a bank payment order", LOG_ERR);

-							$this->errors[] = "The line is already included into a bank payment order. Delete the bank payment order first.";

-						}

-					}

-

-					if (!$error) {

-						if ($amountstripe > 0) {

-							try {

-								global $savstripearrayofkeysbyenv;

-								global $stripearrayofkeysbyenv;

-								$servicestatus = 0;

-								if ($service == 'StripeLive') {

-									$servicestatus = 1;

-								}

-

-								//var_dump($companypaymentmode);

-								dol_syslog("makeStripeSepaRequest We will try to pay with companypaymentmodeid=" . $companypaymentmode->id . " stripe_card_ref=" . $companypaymentmode->stripe_card_ref . " mode=" . $companypaymentmode->status, LOG_DEBUG);

-

-								$thirdparty = new Societe($this->db);

-								$resultthirdparty = $thirdparty->fetch($this->socid);

-

-								include_once DOL_DOCUMENT_ROOT . '/stripe/class/stripe.class.php';        // This include the include of htdocs/stripe/config.php

-								// So it inits or erases the $stripearrayofkeysbyenv

-								$stripe = new Stripe($this->db);

-

-								if (empty($savstripearrayofkeysbyenv)) {

-									$savstripearrayofkeysbyenv = $stripearrayofkeysbyenv;

-								}

-								dol_syslog("makeStripeSepaRequest Current Stripe environment is " . $stripearrayofkeysbyenv[$servicestatus]['publishable_key']);

-								dol_syslog("makeStripeSepaRequest Current Saved Stripe environment is ".$savstripearrayofkeysbyenv[$servicestatus]['publishable_key']);

-

-								$foundalternativestripeaccount = '';

-

-								// Force stripe to another value (by default this value is empty)

-								if (! empty($forcestripe)) {

-									dol_syslog("makeStripeSepaRequest A dedicated stripe account was forced, so we switch to it.");

-

-									$tmparray = explode('@', $forcestripe);

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

-										$tmparray2 = explode(':', $tmparray[1]);

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

-											$stripearrayofkeysbyenv[$servicestatus]["publishable_key"] = $tmparray2[0];

-											$stripearrayofkeysbyenv[$servicestatus]["secret_key"] = $tmparray2[1];

-

-											$stripearrayofkeys = $stripearrayofkeysbyenv[$servicestatus];

-											\Stripe\Stripe::setApiKey($stripearrayofkeys['secret_key']);

-

-											$foundalternativestripeaccount = $tmparray[0];    // Store the customer id

-

-											dol_syslog("makeStripeSepaRequest We use now customer=".$foundalternativestripeaccount." publishable_key=".$stripearrayofkeys['publishable_key'], LOG_DEBUG);

-										}

-									}

-

-									if (! $foundalternativestripeaccount) {

-										$stripearrayofkeysbyenv = $savstripearrayofkeysbyenv;

-

-										$stripearrayofkeys = $savstripearrayofkeysbyenv[$servicestatus];

-										\Stripe\Stripe::setApiKey($stripearrayofkeys['secret_key']);

-										dol_syslog("makeStripeSepaRequest We found a bad value for Stripe Account for thirdparty id=".$thirdparty->id.", so we ignore it and keep using the global one, so ".$stripearrayofkeys['publishable_key'], LOG_WARNING);

-									}

-								} else {

-									$stripearrayofkeysbyenv = $savstripearrayofkeysbyenv;

-

-									$stripearrayofkeys = $savstripearrayofkeysbyenv[$servicestatus];

-									\Stripe\Stripe::setApiKey($stripearrayofkeys['secret_key']);

-									dol_syslog("makeStripeSepaRequest No dedicated Stripe Account requested, so we use global one, so ".$stripearrayofkeys['publishable_key'], LOG_DEBUG);

-								}

-

-								$stripeacc = $stripe->getStripeAccount($service, $this->socid);								// Get Stripe OAuth connect account if it exists (no network access here)

-

-								if ($foundalternativestripeaccount) {

-									if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage

-										$customer = \Stripe\Customer::retrieve(array('id'=>"$foundalternativestripeaccount", 'expand[]'=>'sources'));

-									} else {

-										$customer = \Stripe\Customer::retrieve(array('id'=>"$foundalternativestripeaccount", 'expand[]'=>'sources'), array("stripe_account" => $stripeacc));

-									}

-								} else {

-									$customer = $stripe->customerStripe($thirdparty, $stripeacc, $servicestatus, 0);

-									if (empty($customer) && ! empty($stripe->error)) {

-										$this->errors[] = $stripe->error;

-									}

-									/*if (!empty($customer) && empty($customer->sources)) {

-									 $customer = null;

-									 $this->errors[] = '\Stripe\Customer::retrieve did not returned the sources';

-									 }*/

-								}

-

-								// $nbhoursbetweentries = (empty($conf->global->SELLYOURSAAS_NBHOURSBETWEENTRIES) ? 49 : $conf->global->SELLYOURSAAS_NBHOURSBETWEENTRIES);				// Must have more that 48 hours + 1 between each try (so 1 try every 3 daily batch)

-								// $nbdaysbeforeendoftries = (empty($conf->global->SELLYOURSAAS_NBDAYSBEFOREENDOFTRIES) ? 35 : $conf->global->SELLYOURSAAS_NBDAYSBEFOREENDOFTRIES);

-								$postactionmessages = [];

-

-								if ($resultthirdparty > 0 && !empty($customer)) {

-									if (!$error) {	// Payment was not canceled

-										$stripecard = null;

-										if ($companypaymentmode->type == 'ban') {

-											// Check into societe_rib if a payment mode for Stripe and ban payment exists

-											// To make a Stripe SEPA payment request, we must have the payment mode source already saved into societe_rib and retreived with ->sepaStripe

-											// The payment mode source is created when we create the bank account on Stripe with paymentmodes.php?action=create

-											$stripecard = $stripe->sepaStripe($customer, $companypaymentmode, $stripeacc, $servicestatus, 0);

-										} else {

-											$error++;

-											$this->error = 'The payment mode type is not "ban"';

-										}

-

-										if ($stripecard) {  // Can be src_... (for sepa) or pm_... (new card mode). Note that card_... (old card mode) should not happen here.

-											$FULLTAG = 'DID='.$did.'-INV=' . $this->id . '-CUS=' . $thirdparty->id;

-											$description = 'Stripe payment from makeStripeSepaRequest: ' . $FULLTAG . ' did='.$did.' ref=' . $this->ref;

-

-											$stripefailurecode = '';

-											$stripefailuremessage = '';

-											$stripefailuredeclinecode = '';

-

-											// Using new SCA method

-											dol_syslog("* Create payment on SEPA " . $stripecard->id . ", amounttopay=" . $amounttopay . ", amountstripe=" . $amountstripe . ", FULLTAG=" . $FULLTAG, LOG_DEBUG);

-

-											// Create payment intent and charge payment (confirmnow = true)

-											$paymentintent = $stripe->getPaymentIntent($amounttopay, $currency, $FULLTAG, $description, $this, $customer->id, $stripeacc, $servicestatus, 0, 'automatic', true, $stripecard->id, 1, 1, $did);

-

-											$charge = new stdClass();

-

-											if ($paymentintent->status === 'succeeded' || $paymentintent->status === 'processing') {

-												$charge->status = 'ok';

-												$charge->id = $paymentintent->id;

-												$charge->customer = $customer->id;

-											} elseif ($paymentintent->status === 'requires_action') {

-												//paymentintent->status may be => 'requires_action' (no error in such a case)

-												dol_syslog(var_export($paymentintent, true), LOG_DEBUG);

-

-												$charge->status = 'failed';

-												$charge->customer = $customer->id;

-												$charge->failure_code = $stripe->code;

-												$charge->failure_message = $stripe->error;

-												$charge->failure_declinecode = $stripe->declinecode;

-												$stripefailurecode = $stripe->code;

-												$stripefailuremessage = 'Action required. Contact the support at ';// . $conf->global->SELLYOURSAAS_MAIN_EMAIL;

-												$stripefailuredeclinecode = $stripe->declinecode;

-											} else {

-												dol_syslog(var_export($paymentintent, true), LOG_DEBUG);

-

-												$charge->status = 'failed';

-												$charge->customer = $customer->id;

-												$charge->failure_code = $stripe->code;

-												$charge->failure_message = $stripe->error;

-												$charge->failure_declinecode = $stripe->declinecode;

-												$stripefailurecode = $stripe->code;

-												$stripefailuremessage = $stripe->error;

-												$stripefailuredeclinecode = $stripe->declinecode;

-											}

-

-											//var_dump("stripefailurecode=".$stripefailurecode." stripefailuremessage=".$stripefailuremessage." stripefailuredeclinecode=".$stripefailuredeclinecode);

-											//exit;

-

-

-											// Return $charge = array('id'=>'ch_XXXX', 'status'=>'succeeded|pending|failed', 'failure_code'=>, 'failure_message'=>...)

-											if (empty($charge) || $charge->status == 'failed') {

-												dol_syslog('Failed to charge payment mode ' . $stripecard->id . ' stripefailurecode=' . $stripefailurecode . ' stripefailuremessage=' . $stripefailuremessage . ' stripefailuredeclinecode=' . $stripefailuredeclinecode, LOG_WARNING);

-

-												// Save a stripe payment was in error

-												$this->stripechargeerror++;

-

-												$error++;

-												$errorforinvoice++;

-												$errmsg = $langs->trans("FailedToChargeCard");

-												if (!empty($charge)) {

-													if ($stripefailuredeclinecode == 'authentication_required') {

-														$errauthenticationmessage = $langs->trans("ErrSCAAuthentication");

-														$errmsg = $errauthenticationmessage;

-													} elseif (in_array($stripefailuredeclinecode, ['insufficient_funds', 'generic_decline'])) {

-														$errmsg .= ': ' . $charge->failure_code;

-														$errmsg .= ($charge->failure_message ? ' - ' : '') . ' ' . $charge->failure_message;

-														if (empty($stripefailurecode)) {

-															$stripefailurecode = $charge->failure_code;

-														}

-														if (empty($stripefailuremessage)) {

-															$stripefailuremessage = $charge->failure_message;

-														}

-													} else {

-														$errmsg .= ': failure_code=' . $charge->failure_code;

-														$errmsg .= ($charge->failure_message ? ' - ' : '') . ' failure_message=' . $charge->failure_message;

-														if (empty($stripefailurecode)) {

-															$stripefailurecode = $charge->failure_code;

-														}

-														if (empty($stripefailuremessage)) {

-															$stripefailuremessage = $charge->failure_message;

-														}

-													}

-												} else {

-													$errmsg .= ': ' . $stripefailurecode . ' - ' . $stripefailuremessage;

-													$errmsg .= ($stripefailuredeclinecode ? ' - ' . $stripefailuredeclinecode : '');

-												}

-

-												$description = 'Stripe payment ERROR from makeStripeSepaRequest: ' . $FULLTAG;

-												$postactionmessages[] = $errmsg . ' (' . $stripearrayofkeys['publishable_key'] . ')';

-												$this->errors[] = $errmsg;

-											} else {

-												dol_syslog('Successfuly request '.$type.' '.$stripecard->id);

-

-												$postactionmessages[] = 'Success to request '.$type.' (' . $charge->id . ' with ' . $stripearrayofkeys['publishable_key'] . ')';

-

-												// Save a stripe payment was done in realy life so later we will be able to force a commit on recorded payments

-												// even if in batch mode (method doTakePaymentStripe), we will always make all action in one transaction with a forced commit.

-												$this->stripechargedone++;

-

-												// Default description used for label of event. Will be overwrite by another value later.

-												$description = 'Stripe payment request OK (' . $charge->id . ') from makeStripeSepaRequest: ' . $FULLTAG;

-											}

-

-											$object = $this;

-

-											// Track an event

-											if (empty($charge) || $charge->status == 'failed') {

-												$actioncode = 'PAYMENT_STRIPE_KO';

-												$extraparams = $stripefailurecode;

-												$extraparams .= (($extraparams && $stripefailuremessage) ? ' - ' : '') . $stripefailuremessage;

-												$extraparams .= (($extraparams && $stripefailuredeclinecode) ? ' - ' : '') . $stripefailuredeclinecode;

-											} else {

-												$actioncode = 'PAYMENT_STRIPE_OK';

-												$extraparams = '';

-											}

-										} else {

-											$error++;

-											$errorforinvoice++;

-											dol_syslog("No ban payment method found for this stripe customer " . $customer->id, LOG_WARNING);

-											$this->errors[] = 'Failed to get direct debit payment method for stripe customer = ' . $customer->id;

-

-											$description = 'Failed to find or use the payment mode - no ban defined for the thirdparty account';

-											$stripefailurecode = 'BADPAYMENTMODE';

-											$stripefailuremessage = 'Failed to find or use the payment mode - no ban defined for the thirdparty account';

-											$postactionmessages[] = $description . ' (' . $stripearrayofkeys['publishable_key'] . ')';

-

-											$object = $this;

-

-											$actioncode = 'PAYMENT_STRIPE_KO';

-											$extraparams = '';

-										}

-									} else {

-										// If error because payment was canceled for a logical reason, we do nothing (no event added)

-										$description = '';

-										$stripefailurecode = '';

-										$stripefailuremessage = '';

-

-										$object = $this;

-

-										$actioncode = '';

-										$extraparams = '';

-									}

-								} else {	// Else of the   if ($resultthirdparty > 0 && ! empty($customer)) {

-									if ($resultthirdparty <= 0) {

-										dol_syslog('SellYourSaasUtils Failed to load customer for thirdparty_id = ' . $thirdparty->id, LOG_WARNING);

-										$this->errors[] = 'Failed to load Stripe account for thirdparty_id = ' . $thirdparty->id;

-									} else { // $customer stripe not found

-										dol_syslog('SellYourSaasUtils Failed to get Stripe customer id for thirdparty_id = ' . $thirdparty->id . " in mode " . $servicestatus . " in Stripe env " . $stripearrayofkeysbyenv[$servicestatus]['publishable_key'], LOG_WARNING);

-										$this->errors[] = 'Failed to get Stripe account id for thirdparty_id = ' . $thirdparty->id . " in mode " . $servicestatus . " in Stripe env " . $stripearrayofkeysbyenv[$servicestatus]['publishable_key'];

-									}

-									$error++;

-									$errorforinvoice++;

-

-									$description = 'Failed to find or use your payment mode (no payment mode for this customer id)';

-									$stripefailurecode = 'BADPAYMENTMODE';

-									$stripefailuremessage = 'Failed to find or use your payment mode (no payment mode for this customer id)';

-									$postactionmessages = [];

-

-									$object = $this;

-

-									$actioncode = 'PAYMENT_STRIPE_KO';

-									$extraparams = '';

-								}

-

-								if ($description) {

-									dol_syslog("* Record event for credit transfer or direct debit request result - " . $description);

-									require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';

-

-									// Insert record of payment (success or error)

-									$actioncomm = new ActionComm($this->db);

-

-									$actioncomm->type_code = 'AC_OTH_AUTO';		// Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)

-									$actioncomm->code = 'AC_' . $actioncode;

-									$actioncomm->label = $description;

-									$actioncomm->note_private = join(",\n", $postactionmessages);

-									$actioncomm->fk_project = $this->fk_project;

-									$actioncomm->datep = $now;

-									$actioncomm->datef = $now;

-									$actioncomm->percentage = -1;   // Not applicable

-									$actioncomm->socid = $thirdparty->id;

-									$actioncomm->contactid = 0;

-									$actioncomm->authorid = $user->id;   // User saving action

-									$actioncomm->userownerid = $user->id;	// Owner of action

-									// Fields when action is a real email (content is already into note)

-									/*$actioncomm->email_msgid = $object->email_msgid;

-									 $actioncomm->email_from  = $object->email_from;

-									 $actioncomm->email_sender= $object->email_sender;

-									 $actioncomm->email_to    = $object->email_to;

-									 $actioncomm->email_tocc  = $object->email_tocc;

-									 $actioncomm->email_tobcc = $object->email_tobcc;

-									 $actioncomm->email_subject = $object->email_subject;

-									 $actioncomm->errors_to   = $object->errors_to;*/

-									$actioncomm->fk_element = $this->id;

-									$actioncomm->elementtype = $this->element;

-									$actioncomm->extraparams = dol_trunc($extraparams, 250);

-

-									$actioncomm->create($user);

-								}

-

-								$this->description = $description;

-								$this->postactionmessages = $postactionmessages;

-							} catch (Exception $e) {

-								$error++;

-								$errorforinvoice++;

-								dol_syslog('Error ' . $e->getMessage(), LOG_ERR);

-								$this->errors[] = 'Error ' . $e->getMessage();

-							}

-						} else {	// If remain to pay is null

-							$error++;

-							$errorforinvoice++;

-							dol_syslog("Remain to pay is null for the invoice " . $this->id . " " . $this->ref . ". Why is the invoice not classified 'Paid' ?", LOG_WARNING);

-							$this->errors[] = "Remain to pay is null for the invoice " . $this->id . " " . $this->ref . ". Why is the invoice not classified 'Paid' ?";

-						}

-					}

-

-					// Set status of the order to "Transferred" with method 'api'

-					if (!$error && !$errorforinvoice) {

-						$result = $bon->set_infotrans($user, $now, 3);

-						if ($result < 0) {

-							$error++;

-							$errorforinvoice++;

-							dol_syslog("Error on BonPrelevement creation", LOG_ERR);

-							$this->errors[] = "Error on BonPrelevement creation";

-						}

-					}

-

-					if (!$error && !$errorforinvoice) {

-						// Update the direct debit payment request of the processed invoice to save the id of the prelevement_bon

-						$sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_demande SET";

-						$sql .= " ext_payment_id = '".$this->db->escape($paymentintent->id)."',";

-						$sql .= " ext_payment_site = '".$this->db->escape($service)."'";

-						$sql .= " WHERE rowid = ".((int) $did);

-

-						dol_syslog(get_class($this)."::makeStripeSepaRequest update to save stripe paymentintent ids", LOG_DEBUG);

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

-						if (!$resql) {

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

-							dol_syslog(get_class($this).'::makeStripeSepaRequest Erreur');

-							$error++;

-						}

-					}

-

-					if (!$error && !$errorforinvoice) {

-						$this->db->commit();

-					} else {

-						$this->db->rollback();

-					}

-				} else {

-					$this->error = 'WithdrawRequestErrorNilAmount';

-					dol_syslog(get_class($this).'::makeStripeSepaRequest WithdrawRequestErrorNilAmount');

-					$error++;

-				}

-

-				/*

-				if (!$error) {

-					// Force payment mode of the invoice to withdraw

-					$payment_mode_id = dol_getIdFromCode($this->db, ($type == 'bank-transfer' ? 'VIR' : 'PRE'), 'c_paiement', 'code', 'id', 1);

-					if ($payment_mode_id > 0) {

-						$result = $this->setPaymentMethods($payment_mode_id);

-					}

-				}*/

-

-				if ($error) {

-					return -1;

-				}

-				return 1;

-			} else {

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

-				dol_syslog(get_class($this).'::makeStripeSepaRequest Erreur -2');

-				return -2;

-			}

-		} else {

-			$this->error = "Status of invoice does not allow this";

-			dol_syslog(get_class($this)."::makeStripeSepaRequest ".$this->error." ".$this->status." ,".$this->paye.", ".$this->mode_reglement_id, LOG_WARNING);

+			dol_syslog(get_class($this)."::demandeprelevement ".$this->error." $this->statut, $this->paye, $this->mode_reglement_id");

@@ -1628 +825 @@
-	 *  @return	int					Return integer <0 if OK, >0 if KO

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

@@ -1633,2 +830,2 @@
-		$sql = 'DELETE FROM '.$this->db->prefix().'prelevement_demande';

-		$sql .= ' WHERE rowid = '.((int) $did);

+		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'prelevement_facture_demande';

+		$sql .= ' WHERE rowid = '.$did;

@@ -1636 +833,2 @@
-		if ($this->db->query($sql)) {

+		if ($this->db->query($sql))

+		{

@@ -1638 +836,3 @@
-		} else {

+		}

+		else

+		{

@@ -1643,175 +842,0 @@
-	}

-

-

-	/**

-	 * Build string for ZATCA QR Code (Arabi Saudia)

-	 *

-	 * @return	string			String for ZATCA QR Code

-	 */

-	public function buildZATCAQRString()

-	{

-		global $conf, $mysoc;

-

-		$tmplang = new Translate('', $conf);

-		$tmplang->setDefaultLang('en_US');

-		$tmplang->load("main");

-

-		$datestring = dol_print_date($this->date, 'dayhourrfc');

-		//$pricewithtaxstring = price($this->total_ttc, 0, $tmplang, 0, -1, 2);

-		//$pricetaxstring = price($this->total_tva, 0, $tmplang, 0, -1, 2);

-		$pricewithtaxstring = price2num($this->total_ttc, 2, 1);

-		$pricetaxstring = price2num($this->total_tva, 2, 1);

-

-		/*

-		$name = implode(unpack("H*", $this->thirdparty->name));

-		$vatnumber = implode(unpack("H*", $this->thirdparty->tva_intra));

-		$date = implode(unpack("H*", $datestring));

-		$pricewithtax = implode(unpack("H*", price2num($pricewithtaxstring, 2)));

-		$pricetax = implode(unpack("H*", $pricetaxstring));

-

-		//var_dump(strlen($this->thirdparty->name));

-		//var_dump(str_pad(dechex('9'), 2, '0', STR_PAD_LEFT));

-		//var_dump($this->thirdparty->name);

-		//var_dump(implode(unpack("H*", $this->thirdparty->name)));

-		//var_dump(price($this->total_tva, 0, $tmplang, 0, -1, 2));

-

-		$s = '01'.str_pad(dechex(strlen($this->thirdparty->name)), 2, '0', STR_PAD_LEFT).$name;

-		$s .= '02'.str_pad(dechex(strlen($this->thirdparty->tva_intra)), 2, '0', STR_PAD_LEFT).$vatnumber;

-		$s .= '03'.str_pad(dechex(strlen($datestring)), 2, '0', STR_PAD_LEFT).$date;

-		$s .= '04'.str_pad(dechex(strlen($pricewithtaxstring)), 2, '0', STR_PAD_LEFT).$pricewithtax;

-		$s .= '05'.str_pad(dechex(strlen($pricetaxstring)), 2, '0', STR_PAD_LEFT).$pricetax;

-		$s .= '';					// Hash of xml invoice

-		$s .= '';					// ecda signature

-		$s .= '';					// ecda public key

-		$s .= '';					// ecda signature of public key stamp

-		*/

-

-		// Using TLV format

-		$s = pack('C1', 1).pack('C1', strlen($mysoc->name)).$mysoc->name;

-		$s .= pack('C1', 2).pack('C1', strlen($mysoc->tva_intra)).$mysoc->tva_intra;

-		$s .= pack('C1', 3).pack('C1', strlen($datestring)).$datestring;

-		$s .= pack('C1', 4).pack('C1', strlen($pricewithtaxstring)).$pricewithtaxstring;

-		$s .= pack('C1', 5).pack('C1', strlen($pricetaxstring)).$pricetaxstring;

-		$s .= '';					// Hash of xml invoice

-		$s .= '';					// ecda signature

-		$s .= '';					// ecda public key

-		$s .= '';					// ecda signature of public key stamp

-

-		$s = base64_encode($s);

-

-		return $s;

-	}

-

-

-	/**

-	 * Build string for QR-Bill (Switzerland)

-	 *

-	 * @return	string			String for Switzerland QR Code if QR-Bill

-	 */

-	public function buildSwitzerlandQRString()

-	{

-		global $conf, $mysoc;

-

-		$tmplang = new Translate('', $conf);

-		$tmplang->setDefaultLang('en_US');

-		$tmplang->load("main");

-

-		$pricewithtaxstring = price2num($this->total_ttc, 2, 1);

-		$pricetaxstring = price2num($this->total_tva, 2, 1);

-

-		$complementaryinfo = '';

-		/*

-		 Example: //S1/10/10201409/11/190512/20/1400.000-53/30/106017086/31/180508/32/7.7/40/2:10;0:30

-		 /10/ Numéro de facture – 10201409

-		 /11/ Date de facture – 12.05.2019

-		 /20/ Référence client – 1400.000-53

-		 /30/ Numéro IDE pour la TVA – CHE-106.017.086 TVA

-		 /31/ Date de la prestation pour la comptabilisation de la TVA – 08.05.2018

-		 /32/ Taux de TVA sur le montant total de la facture – 7.7%

-		 /40/ Conditions – 2% d’escompte à 10 jours, paiement net à 30 jours

-		 */

-		$datestring = dol_print_date($this->date, '%y%m%d');

-		//$pricewithtaxstring = price($this->total_ttc, 0, $tmplang, 0, -1, 2);

-		//$pricetaxstring = price($this->total_tva, 0, $tmplang, 0, -1, 2);

-		$complementaryinfo = '//S1/10/'.str_replace('/', '', $this->ref).'/11/'.$datestring;

-		if ($this->ref_client) {

-			$complementaryinfo .= '/20/'.$this->ref_client;

-		}

-		if ($this->thirdparty->tva_intra) {

-			$complementaryinfo .= '/30/'.$this->thirdparty->tva_intra;

-		}

-

-		include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';

-		$bankaccount = new Account($this->db);

-

-		// Header

-		$s = '';

-		$s .= "SPC\n";

-		$s .= "0200\n";

-		$s .= "1\n";

-		// Info Seller ("Compte / Payable à")

-		if ($this->fk_account > 0) {

-			// Bank BAN if country is LI or CH.  TODO Add a test to check than IBAN start with CH or LI

-			$bankaccount->fetch($this->fk_account);

-			$s .= $bankaccount->iban."\n";

-		} else {

-			$s .= "\n";

-		}

-		if ($bankaccount->id > 0 && getDolGlobalString('PDF_SWISS_QRCODE_USE_OWNER_OF_ACCOUNT_AS_CREDITOR')) {

-			// If a bank account is prodived and we ask to use it as creditor, we use the bank address

-			// TODO In a future, we may always use this address, and if name/address/zip/town/country differs from $mysoc, we can use the address of $mysoc into the final seller field ?

-			$s .= "S\n";

-			$s .= dol_trunc($bankaccount->proprio, 70, 'right', 'UTF-8', 1)."\n";

-			$addresslinearray = explode("\n", $bankaccount->owner_address);

-			$s .= dol_trunc(empty($addresslinearray[1]) ? '' : $addresslinearray[1], 70, 'right', 'UTF-8', 1)."\n";		// address line 1

-			$s .= dol_trunc(empty($addresslinearray[2]) ? '' : $addresslinearray[2], 70, 'right', 'UTF-8', 1)."\n";		// address line 2

-			/*$s .= dol_trunc($mysoc->zip, 16, 'right', 'UTF-8', 1)."\n";

-			$s .= dol_trunc($mysoc->town, 35, 'right', 'UTF-8', 1)."\n";

-			$s .= dol_trunc($mysoc->country_code, 2, 'right', 'UTF-8', 1)."\n";*/

-		} else {

-			$s .= "S\n";

-			$s .= dol_trunc($mysoc->name, 70, 'right', 'UTF-8', 1)."\n";

-			$addresslinearray = explode("\n", $mysoc->address);

-			$s .= dol_trunc(empty($addresslinearray[1]) ? '' : $addresslinearray[1], 70, 'right', 'UTF-8', 1)."\n";		// address line 1

-			$s .= dol_trunc(empty($addresslinearray[2]) ? '' : $addresslinearray[2], 70, 'right', 'UTF-8', 1)."\n";		// address line 2

-			$s .= dol_trunc($mysoc->zip, 16, 'right', 'UTF-8', 1)."\n";

-			$s .= dol_trunc($mysoc->town, 35, 'right', 'UTF-8', 1)."\n";

-			$s .= dol_trunc($mysoc->country_code, 2, 'right', 'UTF-8', 1)."\n";

-		}

-		// Final seller (Ultimate seller) ("Créancier final" = "En faveur de")

-		$s .= "\n";

-		$s .= "\n";

-		$s .= "\n";

-		$s .= "\n";

-		$s .= "\n";

-		$s .= "\n";

-		$s .= "\n";

-		// Amount of payment (to do?)

-		$s .= price($pricewithtaxstring, 0, 'none', 0, 0, 2)."\n";

-		$s .= ($this->multicurrency_code ? $this->multicurrency_code : $conf->currency)."\n";

-		// Buyer

-		$s .= "S\n";

-		$s .= dol_trunc($this->thirdparty->name, 70, 'right', 'UTF-8', 1)."\n";

-		$addresslinearray = explode("\n", $this->thirdparty->address);

-		$s .= dol_trunc(empty($addresslinearray[1]) ? '' : $addresslinearray[1], 70, 'right', 'UTF-8', 1)."\n";		// address line 1

-		$s .= dol_trunc(empty($addresslinearray[2]) ? '' : $addresslinearray[2], 70, 'right', 'UTF-8', 1)."\n";		// address line 2

-		$s .= dol_trunc($this->thirdparty->zip, 16, 'right', 'UTF-8', 1)."\n";

-		$s .= dol_trunc($this->thirdparty->town, 35, 'right', 'UTF-8', 1)."\n";

-		$s .= dol_trunc($this->thirdparty->country_code, 2, 'right', 'UTF-8', 1)."\n";

-		// ID of payment

-		$s .= "NON\n";			// NON or QRR

-		$s .= "\n";				// QR Code reference if previous field is QRR

-		// Free text

-		if ($complementaryinfo) {

-			$s .= $complementaryinfo."\n";

-		} else {

-			$s .= "\n";

-		}

-		$s .= "EPD\n";

-		// More text, complementary info

-		if ($complementaryinfo) {

-			$s .= $complementaryinfo."\n";

-		}

-		$s .= "\n";

-		//var_dump($s);exit;

-		return $s;

@@ -1831,15 +856,10 @@
-	 * Custom label of line. Not used by default.

-	 * @deprecated

-	 */

-	public $label;

-

-	/**

-	 * @deprecated

-	 * @see $product_ref

-	 */

-	public $ref; // Product ref (deprecated)

-	/**

-	 * @deprecated

-	 * @see $product_label

-	 */

-	public $libelle; // Product label (deprecated)

+	 * Quantity

+	 * @var double

+	 */

+	public $qty;

+

+	/**

+	 * Unit price before taxes

+	 * @var float

+	 */

+	public $subprice;

@@ -1854,37 +873,0 @@
-	 * Product ref

-	 * @var string

-	 */

-	public $product_ref;

-

-	/**

-	 * Product label

-	 * @var string

-	 */

-	public $product_label;

-

-	/**

-	 * Product description

-	 * @var string

-	 */

-	public $product_desc;

-

-	/**

-	 * Quantity

-	 * @var double

-	 */

-	public $qty;

-

-	/**

-	 * Unit price before taxes

-	 * @var float

-	 */

-	public $subprice;

-

-	/**

-	 * Unit price before taxes

-	 * @var float

-	 * @deprecated

-	 */

-	public $price;

-

-	/**

@@ -1921,12 +903,0 @@
-	 * Local tax 1 type

-	 * @var string

-	 */

-	public $localtax1_type;

-

-	/**

-	 * Local tax 2 type

-	 * @var string

-	 */

-	public $localtax2_type;

-

-	/**

@@ -1939,7 +909,0 @@
-	 * Fixed discount

-	 * @var float

-	 * @deprecated

-	 */

-	public $remise;

-

-	/**

@@ -1975,10 +938,0 @@
-	public $date_start_fill; // If set to 1, when invoice is created from a template invoice, it will also auto set the field date_start at creation

-	public $date_end_fill; // If set to 1, when invoice is created from a template invoice, it will also auto set the field date_end at creation

-

-	public $buy_price_ht;

-	public $buyprice; // For backward compatibility

-	public $pa_ht; // For backward compatibility

-

-	public $marge_tx;

-	public $marque_tx;

-

@@ -1987 +941 @@
-	 * Bit 0:	0 for common VAT - 1 if VAT french NPR

+	 * Bit 0:	0 si TVA normal - 1 si TVA NPR

@@ -1993,6 +947,9 @@
-	public $special_code = 0;

-

-	public $fk_user_author;

-	public $fk_user_modif;

-

-	public $fk_accounting_account;

+	/**

+	 *  Constructor

+	 *

+	 *  @param	DoliDB		$db		Database handler

+	 */

+	public function __construct(DoliDB $db)

+	{

+		$this->db = $db;

+	}

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_commonobject.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_commonobject.class.php
@@ -4 +4 @@
- * Copyright (C) 2010-2020 Juanjo Menent        <jmenent@2byte.es>

+ * Copyright (C) 2010-2015 Juanjo Menent        <jmenent@2byte.es>

@@ -6 +6 @@
- * Copyright (C) 2011-2022 Philippe Grand       <philippe.grand@atoo-net.com>

+ * Copyright (C) 2011-2019 Philippe Grand       <philippe.grand@atoo-net.com>

@@ -10 +10 @@
- * Copyright (C) 2015-2022 Alexandre Spangaro   <aspangaro@open-dsi.fr>

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

@@ -14,2 +14,2 @@
- * Copyright (C) 2017      Rui Strecht          <rui.strecht@aliartalentos.com>

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

+ * Copyright (C) 2017      Rui Strecht		    <rui.strecht@aliartalentos.com>

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

@@ -17,3 +16,0 @@
- * Copyright (C) 2023      Gauthier VERDOL      <gauthier.verdol@atm-consulting.fr>

- * Copyright (C) 2021      Grégory Blémand      <gregory.blemand@atm-consulting.fr>

- * Copyright (C) 2023      Lenin Rivas      	<lenin.rivas777@gmail.com>

@@ -47,7 +43,0 @@
-	const TRIGGER_PREFIX = ''; // to be overriden in child class implementations, i.e. 'BILL', 'TASK', 'PROPAL', etc.

-

-	/**

-	 * @var string ID of module.

-	 */

-	public $module;

-

@@ -60 +50 @@
-	 * @var int 		The object identifier

+	 * @var int The object identifier

@@ -63,5 +52,0 @@
-

-	/**

-	 * @var int 		The environment ID when using a multicompany module

-	 */

-	public $entity;

@@ -76,5 +60,0 @@
-	 * @var string 		Error string that is hidden but can be used to store complementatry technical code.

-	 */

-	public $errorhidden;

-

-	/**

@@ -86,6 +66 @@
-	 * @var array   	To store error results of ->validateField()

-	 */

-	private $validateFieldsErrors = array();

-

-	/**

-	 * @var string 		ID to identify managed object

+	 * @var string ID to identify managed object

@@ -96,12 +71 @@
-	 * @var string    Fieldname with ID of parent key if this field has a parent

-	 */

-	public $fk_element;

-

-	/**

-	 * @var string 		Name to use for 'features' parameter to check module permissions user->rights->feature with restrictedArea().

-	 * 					Undefined means same value than $element. Can be use to force a check on another element for example for class of line, we mention here the parent element.

-	 */

-	public $element_for_permission;

-

-	/**

-	 * @var string 		Name of table without prefix where object is stored

+	 * @var string Name of table without prefix where object is stored

@@ -112 +76 @@
-	 * @var string 		Name of subtable line

+	 * @var string    Name of subtable line

@@ -117,5 +80,0 @@
-	 * @var int 		0=No test on entity, 1=Test with field entity, 'field@table'=Test with link by field@table

-	 */

-	public $ismultientitymanaged;

-

-	/**

@@ -132,5 +90,0 @@
-	 * @var array  		Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.

-	 */

-	public $fields = array();

-

-	/**

@@ -142,10 +95,0 @@
-	 * @var array		To store result of ->liste_contact()

-	 */

-	public $contacts_ids;

-

-	/**

-	 * @var mixed		Array of linked objects, set and used when calling ->create() to be able to create links during the creation of object

-	 */

-	public $linked_objects;

-

-	/**

@@ -162,6 +106 @@
-	 * @var boolean[]	Array of boolean with object id as key and value as true if linkedObjects full loaded for object id. Loaded by ->fetchObjectLinked. Important for pdf generation time reduction.

-	 */

-	private $linkedObjectsFullLoaded = array();

-

-	/**

-	 * @var CommonObject To store a cloned copy of object before to edit it and keep track of old properties

+	 * @var Object      To store a cloned copy of object before to edit it and keep track of old properties

@@ -172,5 +110,0 @@
-	 * @var string To store old value of a modified ref

-	 */

-	public $oldref;

-

-	/**

@@ -181,4 +114,0 @@
-	/**

-	 * @var integer 	0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user

-	 */

-	public $restrictiononfksoc = 0;

@@ -194,4 +123,0 @@
-	// Properties set and used by Agenda trigger

-	public $actionmsg;

-	public $actionmsg2;

-

@@ -204 +130 @@
-	 * @var Project 	The related project object

+	 * @var Project The related project

@@ -210 +136 @@
-	 * @var int 		The related project ID

+	 * @var int The related project ID

@@ -216 +141,0 @@
-	 * @var Project 	The related project object

@@ -223,7 +148 @@
-	 * @deprecated

-	 * @see $fk_project

-	 */

-	public $fk_projet;

-

-	/**

-	 * @var Contact 	A related contact object

+	 * @var Contact a related contact

@@ -235 +154 @@
-	 * @var int 		The related contact ID

+	 * @var int The related contact ID

@@ -241 +160 @@
-	 * @var Societe 	A related thirdparty object

+	 * @var Societe A related thirdparty

@@ -247 +166 @@
-	 * @var User 		A related user

+	 * @var User A related user

@@ -253 +172 @@
-	 * @var string 		The type of originating object ('commande', 'facture', ...). Note: on some object this field is called $origin_type

+	 * @var string 	The type of originating object ('commande', 'facture', ...)

@@ -259 +178 @@
-	 * @var int 		The id of originating object

+	 * @var int 	The id of originating object

@@ -265,16 +184 @@
-	 * @var	Object		Origin object. This is set by fetch_origin() from this->origin and this->origin_id.

-	 */

-	public $origin_object;

-

-	// TODO Remove this. Has been replaced with ->origin_object.

-	// This is set by fetch_origin() from this->origin and this->origin_id

-	/** @deprecated */

-	public $expedition;

-	/** @deprecated */

-	public $livraison;

-	/** @deprecated */

-	public $commandeFournisseur;

-

-

-	/**

-	 * @var string 		The object's reference

+	 * @var string The object's reference

@@ -285 +189,11 @@
-	 * @var string 		An external reference for the object

+	 * @var string The object's previous reference

+	 */

+	public $ref_previous;

+

+	/**

+	 * @var string The object's next reference

+	 */

+	public $ref_next;

+

+	/**

+	 * @var string An external reference for the object

@@ -290,17 +204 @@
-	 * @var string 		The object's previous reference

-	 */

-	public $ref_previous;

-

-	/**

-	 * @var string 		The object's next reference

-	 */

-	public $ref_next;

-

-	/**

-	 * @var string 		Ref to store on object to save the new ref to use for example when making a validate() of an object

-	 */

-	public $newref;

-

-	/**

-	 * @var int 		The object's status. Prefer use of status.

-	 * @deprecated

+	 * @var int The object's status

@@ -310,7 +207,0 @@
-

-	/**

-	 * @var int 		The object's status

-	 * @see setStatut()

-	 */

-	public $status;

-

@@ -331 +222 @@
-	 * @var string		The ISO country code on 2 chars.

+	 * @var string

@@ -334,3 +225,3 @@
-	public $country_code;

-

-	/**

+    public $country_code;

+

+    /**

@@ -350,11 +241,5 @@
-	 * @see getFullAddress(), $state

-	 */

-	public $state_code;

-

-	/**

-	 * @var int

-	 * @see getFullAddress(), $region_code, $region

-	 */

-	public $region_id;

-

-	/**

+	 * @see getFullAddress(), state

+	 */

+    public $state_code;

+

+    /**

@@ -362,3 +247,3 @@
-	 * @see getFullAddress(), $region_id, $region

-	 */

-	public $region_code;

+	 * @see getFullAddress(), region

+	 */

+	public $region;

@@ -368,4 +253,3 @@
-	 * @see getFullAddress(), $region_id, $region_code

-	 */

-	public $region;

-

+	 * @see getFullAddress(), region

+	 */

+    public $region_code;

@@ -398 +282 @@
-	 * @var int 		Payment method ID (cheque, cash, ...)

+	 * @var int Payment method ID (cheque, cash, ...)

@@ -404 +288 @@
-	 * @var int 		Payment terms ID

+	 * @var int Payment terms ID

@@ -410,12 +294 @@
-	 * @var int 		Demand reason ID

-	 */

-	public $demand_reason_id;

-

-	/**

-	 * @var int 		Transport mode ID (For module intracomm report)

-	 * @see setTransportMode()

-	 */

-	public $transport_mode_id;

-

-	/**

-	 * @var int 		Payment terms ID

+	 * @var int Payment terms ID

@@ -428 +301 @@
-	 * @var int 		Delivery address ID

+	 * @var int Delivery address ID

@@ -435 +308 @@
-	 * @var int 		Shipping method ID

+	 * @var int Shipping method ID

@@ -439,47 +311,0 @@
-

-	/**

-	 * @var string 		Shipping method label

-	 * @see setShippingMethod()

-	 */

-	public $shipping_method;

-

-	// Multicurrency

-	/**

-	 * @var int ID

-	 */

-	public $fk_multicurrency;

-

-	/**

-	 * @var string Multicurrency code

-	 */

-	public $multicurrency_code;

-

-	/**

-	 * @var float Multicurrency rate

-	 */

-	public $multicurrency_tx;

-

-	/**

-	 * @var float Multicurrency total without tax

-	 */

-	public $multicurrency_total_ht;

-

-	/**

-	 * @var float Multicurrency total vat

-	 */

-	public $multicurrency_total_tva;

-

-	/**

-	 * @var float Multicurrency total with tax

-	 */

-	public $multicurrency_total_ttc;

-

-	/**

-	 * @var float Multicurrency total localta1

-	 */

-	public $multicurrency_total_localtax1;	// not in database

-

-	/**

-	 * @var float Multicurrency total localtax2

-	 */

-	public $multicurrency_total_localtax2;	// not in database

@@ -491,7 +316,0 @@
-	public $model_pdf;

-

-	/**

-	 * @var string

-	 * @deprecated

-	 * @see $model_pdf

-	 */

@@ -507,8 +326 @@
-	 * @var int 		Bank account ID sometimes, ID of record into llx_bank sometimes

-	 * @deprecated

-	 * @see $fk_account

-	 */

-	public $fk_bank;

-

-	/**

-	 * @var int 		Bank account ID

+	 * @var int Bank account ID

@@ -520 +332 @@
-	 * @var string 		Public note

+	 * @var string Public note

@@ -526 +338 @@
-	 * @var string 		Private note

+	 * @var string Private note

@@ -538 +350 @@
-	 * @var float 		Total amount before taxes

+	 * @var float Total amount before taxes

@@ -544 +356 @@
-	 * @var float 		Total VAT amount

+	 * @var float Total VAT amount

@@ -550 +362 @@
-	 * @var float 		Total local tax 1 amount

+	 * @var float Total local tax 1 amount

@@ -556 +368 @@
-	 * @var float 		Total local tax 2 amount

+	 * @var float Total local tax 2 amount

@@ -562 +374 @@
-	 * @var float 		Total amount with taxes

+	 * @var float Total amount with taxes

@@ -579 +391,19 @@
-	 * @var string 		The name

+	 * @var int

+	 * @see setIncoterms()

+	 */

+	public $fk_incoterms;

+

+	/**

+	 * @var string

+	 * @see SetIncoterms()

+	 */

+	public $label_incoterms;

+

+	/**

+	 * @var string

+	 * @see display_incoterms()

+	 */

+	public $location_incoterms;

+

+	/**

+	 * @var string The name

@@ -583,3 +413,3 @@
-	/**

-	 * @var string 		The lastname

-	 */

+    /**

+     * @var string The lastname

+     */

@@ -588,3 +418,3 @@
-	/**

-	 * @var string 		The firstname

-	 */

+    /**

+     * @var string The firstname

+     */

@@ -593,3 +423,3 @@
-	/**

-	 * @var string 		The civility code, not an integer

-	 */

+    /**

+     * @var string The civility code, not an integer

+     */

@@ -600,2 +430,2 @@
-	 * @var integer|string date_creation

-	 */

+     * @var integer|string date_creation

+     */

@@ -614,62 +443,0 @@
-	/**

-	 * @var integer|string $date_modification;

-	 * @deprecated 		Use date_modification

-	 */

-	public $date_update;

-

-	/**

-	 * @var integer|string $date_cloture;

-	 */

-	public $date_cloture; // Date closing (tms field)

-

-	/**

-	 * @var User	User author/creation

-	 * @deprecated	Store only id in user_creation_id

-	 */

-	public $user_author;

-

-	/**

-	 * @var User	User author/creation

-	 * @deprecated

-	 */

-	public $user_creation;

-

-	/**

-	 * @var int			User id author/creation

-	 */

-	public $user_creation_id;

-

-	/**

-	 * @var User	User of validation

-	 * @deprecated

-	 */

-	public $user_valid;

-

-	/**

-	 * @var User	User of validation

-	 * @deprecated

-	 */

-	public $user_validation;

-

-	/**

-	 * @var int			User id of validation

-	 */

-	public $user_validation_id;

-

-	/**

-	 * @var int			User id closing object

-	 */

-	public $user_closing_id;

-

-	/**

-	 * @var User	User last modifier

-	 * @deprecated

-	 */

-	public $user_modification;

-

-	/**

-	 * @var int			User id last modifier

-	 */

-	public $user_modification_id;

-

-

@@ -679,62 +447 @@
-	 * @var int 1 if object is specimen

-	 */

-	public $specimen = 0;

-

-	/**

-	 * @var	int			Id of contact to send object (used by the trigger of module Agenda)

-	 */

-	public $sendtoid;

-

-	/**

-	 * @var	float		Amount already paid from getSommePaiement() (used to show correct status)

-	 * @deprecated		Duplicate of $totalpaid

-	 */

-	public $alreadypaid;

-	/**

-	 * @var	float		Amount already paid from getSommePaiement() (used to show correct status)

-	 */

-	public $totalpaid;

-

-	/**

-	 * @var array		Array with label of status

-	 */

-	public $labelStatus = array();

-

-	/**

-	 * @var array		Array with short label of status

-	 */

-	public $labelStatusShort = array();

-

-	/**

-	 * @var array		Array to store list of tpl

-	 */

-	public $tpl;

-

-

-	/**

-	 * @var int 		show photo on popup

-	 */

-	public $showphoto_on_popup;

-

-	/**

-	 * @var array 		nb used in load_stateboard

-	 */

-	public $nb = array();

-

-	/**

-	 * @var int			used for the return of show_photos()

-	 */

-	public $nbphoto;

-

-	/**

-	 * @var string output

-	 */

-	public $output;

-

-	/**

-	 * @var array 		extra parameters

-	 */

-	public $extraparams = array();

-

-	/**

-	 * @var array		List of child tables. To test if we can delete object.

+	 * @var array	List of child tables. To test if we can delete object.

@@ -746,2 +453,2 @@
-	 *               If name is like '@ClassName:FilePathClass:ParentFkFieldName', it will

-	 *               call method deleteByParentField(parentId, ParentFkFieldName) to fetch and delete child object.

+	 *               If name matches '@ClassNAme:FilePathClass;ParentFkFieldName' it will

+	 *               call method deleteByParentField(parentId, ParentFkFieldName) to fetch and delete child object

@@ -751,25 +457,0 @@
-	/**

-	 * @var Product Populate by fetch_product()

-	 */

-	public $product;

-

-	/**

-	 * @var int Populate by setPaymentTerms()

-	 */

-	public $cond_reglement_supplier_id;

-

-	/**

-	 * @var string Populate by setPaymentTerms()

-	 */

-	public $deposit_percent;

-

-

-	/**

-	 * @var string Populate by setRetainedWarrantyPaymentTerms()

-	 */

-	public $retained_warranty_fk_cond_reglement;

-

-	/**

-	 * @var int Populate by setWarehouse()

-	 */

-	public $warehouse_id;

@@ -778,2 +459,0 @@
-

-

@@ -788 +468 @@
-	 *  @return int     			Return integer <0 if KO, 0 if OK but not found, >0 if OK and exists

+	 *  @return int     			<0 if KO, 0 if OK but not found, >0 if OK and exists

@@ -795 +475 @@
-		$sql .= " FROM ".$db->prefix().$element;

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

@@ -798,7 +478,4 @@
-		if ($id > 0) {

-			$sql .= " AND rowid = ".((int) $id);

-		} elseif ($ref) {

-			$sql .= " AND ref = '".$db->escape($ref)."'";

-		} elseif ($ref_ext) {

-			$sql .= " AND ref_ext = '".$db->escape($ref_ext)."'";

-		} else {

+		if ($id > 0) $sql .= " AND rowid = ".$db->escape($id);

+		elseif ($ref) $sql .= " AND ref = '".$db->escape($ref)."'";

+		elseif ($ref_ext) $sql .= " AND ref_ext = '".$db->escape($ref_ext)."'";

+		else {

@@ -809,3 +486 @@
-		if ($ref || $ref_ext) {		// Because the same ref can exists in 2 different entities, we force the current one in priority

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

-		}

+		if ($ref || $ref_ext) $sql .= " AND entity = ".$conf->entity;

@@ -815 +490,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -817,5 +493,2 @@
-			if ($num > 0) {

-				return 1;

-			} else {

-				return 0;

-			}

+			if ($num > 0) return 1;

+			else return 0;

@@ -825,106 +497,0 @@
-

-	/**

-	 * setErrorsFromObject

-	 *

-	 * @param CommonObject $object commonobject

-	 * @return void

-	 */

-	public function setErrorsFromObject($object)

-	{

-		if (!empty($object->error)) {

-			$this->error = $object->error;

-		}

-		if (!empty($object->errors)) {

-			$this->errors = array_merge($this->errors, $object->errors);

-		}

-	}

-

-	/**

-	 * Return array of datas to show into a tooltip. This method must be implemented in each object class.

-	 *

-	 * @since v18

-	 * @param array $params params to construct tooltip data

-	 * @return array

-	 */

-	public function getTooltipContentArray($params)

-	{

-		return [];

-	}

-

-	/**

-	 * getTooltipContent

-	 *

-	 * @param array $params params

-	 * @since v18

-	 * @return string

-	 */

-	public function getTooltipContent($params)

-	{

-		global $action, $extrafields, $langs, $hookmanager;

-

-		// If there is too much extrafields, we do not include them into tooltip

-		$MAX_EXTRAFIELDS_TO_SHOW_IN_TOOLTIP = getDolGlobalInt('MAX_EXTRAFIELDS_TO_SHOW_IN_TOOLTIP', 3);

-

-		$datas = $this->getTooltipContentArray($params);

-		$count = 0;

-

-		// Add extrafields

-		if (!empty($extrafields->attributes[$this->table_element]['label'])) {

-			$datas['opendivextra'] = '<div class="centpercent wordbreak divtooltipextra">';

-			foreach ($extrafields->attributes[$this->table_element]['label'] as $key => $val) {

-				if ($extrafields->attributes[$this->table_element]['type'][$key] == 'separate') {

-					continue;

-				}

-				if ($count >= abs($MAX_EXTRAFIELDS_TO_SHOW_IN_TOOLTIP)) {

-					$datas['more_extrafields'] = '<br>...';

-					break;

-				}

-				$enabled = 1;

-				if ($enabled && isset($extrafields->attributes[$this->table_element]['enabled'][$key])) {

-					$enabled = dol_eval($extrafields->attributes[$this->table_element]['enabled'][$key], 1, 1, '2');

-				}

-				if ($enabled && isset($extrafields->attributes[$this->table_element]['list'][$key])) {

-					$enabled = dol_eval($extrafields->attributes[$this->table_element]['list'][$key], 1, 1, '2');

-				}

-				$perms = 1;

-				if ($perms && isset($extrafields->attributes[$this->table_element]['perms'][$key])) {

-					$perms = dol_eval($extrafields->attributes[$this->table_element]['perms'][$key], 1, 1, '2');

-				}

-				if (empty($enabled)) {

-					continue; // 0 = Never visible field

-				}

-				if (abs($enabled) != 1 && abs($enabled) != 3 && abs($enabled) != 5 && abs($enabled) != 4) {

-					continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list <> 4 = not visible at the creation

-				}

-				if (empty($perms)) {

-					continue; // 0 = Not visible

-				}

-				if (!empty($extrafields->attributes[$this->table_element]['langfile'][$key])) {

-					$langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);

-				}

-				$labelextra = $langs->trans((string) $extrafields->attributes[$this->table_element]['label'][$key]);

-				if ($extrafields->attributes[$this->table_element]['type'][$key] == 'separate') {

-					$datas[$key]= '<br><b><u>'. $labelextra . '</u></b>';

-				} else {

-					$value = (empty($this->array_options['options_' . $key]) ? '' : $this->array_options['options_' . $key]);

-					$datas[$key]= '<br><b>'. $labelextra . ':</b> ' . $extrafields->showOutputField($key, $value, '', $this->table_element);

-					$count++;

-				}

-			}

-			$datas['closedivextra'] = '</div>';

-		}

-

-		$hookmanager->initHooks(array($this->element . 'dao'));

-		$parameters = array(

-			'tooltipcontentarray' => &$datas,

-			'params' => $params,

-		);

-		// Note that $action and $object may have been modified by some hooks

-		$hookmanager->executeHooks('getTooltipContent', $parameters, $this, $action);

-

-		//var_dump($datas);

-		$label = implode($datas);

-

-		return $label;

-	}

-

@@ -951,9 +518,10 @@
-		global $hookmanager;

-

-		$parameters = array('objref'=>$objref);

-		$action = '';

-		$reshook = $hookmanager->executeHooks('getFormatedCustomerRef', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks

-		if ($reshook > 0) {

-			return $hookmanager->resArray['objref'];

-		}

-		return $objref.(isset($hookmanager->resArray['objref']) ? $hookmanager->resArray['objref'] : '');

+	    global $hookmanager;

+

+	    $parameters = array('objref'=>$objref);

+	    $action = '';

+	    $reshook = $hookmanager->executeHooks('getFormatedCustomerRef', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks

+	    if ($reshook > 0)

+	    {

+	        return $hookmanager->resArray['objref'];

+	    }

+	    return $objref.(isset($hookmanager->resArray['objref']) ? $hookmanager->resArray['objref'] : '');

@@ -970,9 +538,60 @@
-		global $hookmanager;

-

-		$parameters = array('objref'=>$objref);

-		$action = '';

-		$reshook = $hookmanager->executeHooks('getFormatedSupplierRef', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks

-		if ($reshook > 0) {

-			return $hookmanager->resArray['objref'];

-		}

-		return $objref.(isset($hookmanager->resArray['objref']) ? $hookmanager->resArray['objref'] : '');

+	    global $hookmanager;

+

+	    $parameters = array('objref'=>$objref);

+	    $action = '';

+	    $reshook = $hookmanager->executeHooks('getFormatedSupplierRef', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks

+	    if ($reshook > 0)

+	    {

+	        return $hookmanager->resArray['objref'];

+	    }

+	    return $objref.(isset($hookmanager->resArray['objref']) ? $hookmanager->resArray['objref'] : '');

+	}

+

+	/**

+	 *	Return full name (civility+' '+name+' '+lastname)

+	 *

+	 *	@param	Translate	$langs			Language object for translation of civility (used only if option is 1)

+	 *	@param	int			$option			0=No option, 1=Add civility

+	 * 	@param	int			$nameorder		-1=Auto, 0=Lastname+Firstname, 1=Firstname+Lastname, 2=Firstname, 3=Firstname if defined else lastname

+	 * 	@param	int			$maxlen			Maximum length

+	 * 	@return	string						String with full name

+	 */

+	public function getFullName($langs, $option = 0, $nameorder = -1, $maxlen = 0)

+	{

+		//print "lastname=".$this->lastname." name=".$this->name." nom=".$this->nom."<br>\n";

+		$lastname = $this->lastname;

+		$firstname = $this->firstname;

+		if (empty($lastname))  $lastname = (isset($this->lastname) ? $this->lastname : (isset($this->name) ? $this->name : (isset($this->nom) ? $this->nom : (isset($this->societe) ? $this->societe : (isset($this->company) ? $this->company : '')))));

+

+		$ret = '';

+		if ($option && $this->civility_code)

+		{

+			if ($langs->transnoentitiesnoconv("Civility".$this->civility_code) != "Civility".$this->civility_code) $ret .= $langs->transnoentitiesnoconv("Civility".$this->civility_code).' ';

+			else $ret .= $this->civility_code.' ';

+		}

+

+		$ret .= dolGetFirstLastname($firstname, $lastname, $nameorder);

+

+		return dol_trunc($ret, $maxlen);

+	}

+

+	/**

+	 *	Return clicable link of object (with eventually picto)

+	 *

+	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)

+	 *  @return		string								HTML Code for Kanban thumb.

+	 */

+	public function getKanbanView($option = '')

+	{

+		$return = '<div class="box-flex-item">';

+		$return .= '<div class="info-box info-box-sm">';

+		$return .= '<span class="info-box-icon bg-infobox-action">';

+		$return .= '<i class="fa fa-dol-action"></i>'; // Can be image

+		$return .= '</span>';

+		$return .= '<div class="info-box-content">';

+		$return .= '<span class="info-box-title">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).'</span>';

+		$return .= '</div>';

+		$return .= '</div>';

+		$return .= '</div>';

+

+		return $return;

@@ -992 +611,2 @@
-		if ($withcountry && $this->country_id && (empty($this->country_code) || empty($this->country))) {

+		if ($withcountry && $this->country_id && (empty($this->country_code) || empty($this->country)))

+		{

@@ -999,3 +619,4 @@
-		if ($withregion && $this->state_id && (empty($this->state_code) || empty($this->state) || empty($this->region) || empty($this->region_code))) {

-			require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';

-			$tmparray = getState($this->state_id, 'all', 0, 1);

+        if ($withregion && $this->state_id && (empty($this->state_code) || empty($this->state) || empty($this->region) || empty($this->region_code)))

+    	{

+    		require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';

+    		$tmparray = getState($this->state_id, 'all', 0, 1);

@@ -1006 +627 @@
-		}

+        }

@@ -1010,0 +632,165 @@
+

+	/**

+	 * 	Return full address for banner

+	 *

+	 * 	@param		string		$htmlkey            HTML id to make banner content unique

+	 *  @param      Object      $object				Object (thirdparty, thirdparty of contact for contact, null for a member)

+	 *	@return		string							Full address string

+	 */

+	public function getBannerAddress($htmlkey, $object)

+	{

+		global $conf, $langs, $form, $extralanguages;

+

+		$countriesusingstate = array('AU', 'US', 'IN', 'GB', 'ES', 'UK', 'TR'); // See also option MAIN_FORCE_STATE_INTO_ADDRESS

+

+		$contactid = 0;

+		$thirdpartyid = 0;

+		$elementforaltlanguage = $this->element;

+		if ($this->element == 'societe')

+		{

+			$thirdpartyid = $this->id;

+		}

+		if ($this->element == 'contact')

+		{

+			$contactid = $this->id;

+			$thirdpartyid = $object->fk_soc;

+		}

+		if ($this->element == 'user')

+		{

+			$contactid = $this->contact_id;

+			$thirdpartyid = $object->fk_soc;

+		}

+

+		$out = '';

+

+		$outdone = 0;

+		$coords = $this->getFullAddress(1, ', ', $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT);

+		if ($coords)

+		{

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

+			{

+				// Add picto with tooltip on map

+				$namecoords = '';

+				if ($this->element == 'contact' && !empty($conf->global->MAIN_SHOW_COMPANY_NAME_IN_BANNER_ADDRESS))

+				{

+					$namecoords .= $object->name.'<br>';

+				}

+				$namecoords .= $this->getFullName($langs, 1).'<br>'.$coords;

+				// hideonsmatphone because copyToClipboard call jquery dialog that does not work with jmobile

+				$out .= '<a href="#" class="hideonsmartphone" onclick="return copyToClipboard(\''.dol_escape_js($namecoords).'\',\''.dol_escape_js($langs->trans("HelpCopyToClipboard")).'\');">';

+				$out .= img_picto($langs->trans("Address"), 'map-marker-alt');

+				$out .= '</a> ';

+			}

+			$out .= dol_print_address($coords, 'address_'.$htmlkey.'_'.$this->id, $this->element, $this->id, 1, ', '); $outdone++;

+			$outdone++;

+

+			// List of extra languages

+			$arrayoflangcode = array();

+			if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE)) $arrayoflangcode[] = $conf->global->PDF_USE_ALSO_LANGUAGE_CODE;

+

+			if (is_array($arrayoflangcode) && count($arrayoflangcode)) {

+				if (!is_object($extralanguages)) {

+					include_once DOL_DOCUMENT_ROOT.'/core/class/extralanguages.class.php';

+					$extralanguages = new ExtraLanguages($this->db);

+				}

+				$extralanguages->fetch_name_extralanguages($elementforaltlanguage);

+

+				if (!empty($extralanguages->attributes[$elementforaltlanguage]['address']) || !empty($extralanguages->attributes[$elementforaltlanguage]['town']))

+				{

+					$out .= "<!-- alternatelanguage for '".$elementforaltlanguage."' set to fields '".join(',', $extralanguages->attributes[$elementforaltlanguage]). "' -->\n";

+					$this->fetchValuesForExtraLanguages();

+					if (!is_object($form)) $form = new Form($this->db);

+					$htmltext = '';

+					// If there is extra languages

+					foreach ($arrayoflangcode as $extralangcode) {

+						$s = picto_from_langcode($extralangcode, 'class="pictoforlang paddingright"');

+						$coords = $this->getFullAddress(1, ', ', $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT, $extralangcode);

+						$htmltext .= $s.dol_print_address($coords, 'address_'.$htmlkey.'_'.$this->id, $this->element, $this->id, 1, ', ');

+					}

+					$out .= $form->textwithpicto('', $htmltext, -1, 'language', 'opacitymedium paddingleft');

+				}

+			}

+		}

+

+		if (!in_array($this->country_code, $countriesusingstate) && empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)   // If MAIN_FORCE_STATE_INTO_ADDRESS is on, state is already returned previously with getFullAddress

+				&& empty($conf->global->SOCIETE_DISABLE_STATE) && $this->state)

+		{

+            if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 && $this->region) {

+                $out .= ($outdone ? ' - ' : '').$this->region.' - '.$this->state;

+            }

+            else {

+                $out .= ($outdone ? ' - ' : '').$this->state;

+            }

+			$outdone++;

+		}

+

+		if (!empty($this->phone) || !empty($this->phone_pro) || !empty($this->phone_mobile) || !empty($this->phone_perso) || !empty($this->fax) || !empty($this->office_phone) || !empty($this->user_mobile) || !empty($this->office_fax)) $out .= ($outdone ? '<br>' : '');

+		if (!empty($this->phone) && empty($this->phone_pro)) {		// For objects that store pro phone into ->phone

+			$out .= dol_print_phone($this->phone, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePro")); $outdone++;

+		}

+		if (!empty($this->phone_pro)) {

+			$out .= dol_print_phone($this->phone_pro, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePro")); $outdone++;

+		}

+		if (!empty($this->phone_mobile)) {

+			$out .= dol_print_phone($this->phone_mobile, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'mobile', $langs->trans("PhoneMobile")); $outdone++;

+		}

+		if (!empty($this->phone_perso)) {

+			$out .= dol_print_phone($this->phone_perso, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePerso")); $outdone++;

+		}

+		if (!empty($this->office_phone)) {

+			$out .= dol_print_phone($this->office_phone, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePro")); $outdone++;

+		}

+		if (!empty($this->user_mobile)) {

+			$out .= dol_print_phone($this->user_mobile, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'mobile', $langs->trans("PhoneMobile")); $outdone++;

+		}

+		if (!empty($this->fax)) {

+			$out .= dol_print_phone($this->fax, $this->country_code, $contactid, $thirdpartyid, 'AC_FAX', '&nbsp;', 'fax', $langs->trans("Fax")); $outdone++;

+		}

+		if (!empty($this->office_fax)) {

+			$out .= dol_print_phone($this->office_fax, $this->country_code, $contactid, $thirdpartyid, 'AC_FAX', '&nbsp;', 'fax', $langs->trans("Fax")); $outdone++;

+		}

+

+		if ($out) $out .= '<div style="clear: both;"></div>';

+		$outdone = 0;

+		if (!empty($this->email))

+		{

+			$out .= dol_print_email($this->email, $this->id, $object->id, 'AC_EMAIL', 0, 0, 1);

+			$outdone++;

+		}

+		if (!empty($this->url))

+		{

+            //$out.=dol_print_url($this->url,'_goout',0,1);//steve changed to blank

+		    $out .= dol_print_url($this->url, '_blank', 0, 1);

+			$outdone++;

+		}

+

+		if (!empty($conf->socialnetworks->enabled))

+		{

+			$outsocialnetwork = '';

+

+			if (is_array($this->socialnetworks) && count($this->socialnetworks) > 0) {

+				foreach ($this->socialnetworks as $key => $value) {

+					$outsocialnetwork .= dol_print_socialnetworks($value, $this->id, $object->id, $key);

+					$outdone++;

+				}

+			} else {

+				if ($this->skype) $outsocialnetwork .= dol_print_socialnetworks($this->skype, $this->id, $object->id, 'skype');

+				$outdone++;

+				if ($this->jabberid) $outsocialnetwork .= dol_print_socialnetworks($this->jabberid, $this->id, $object->id, 'jabber');

+				$outdone++;

+				if ($this->twitter) $outsocialnetwork .= dol_print_socialnetworks($this->twitter, $this->id, $object->id, 'twitter');

+				$outdone++;

+				if ($this->facebook) $outsocialnetwork .= dol_print_socialnetworks($this->facebook, $this->id, $object->id, 'facebook');

+				$outdone++;

+				if ($this->linkedin) $outsocialnetwork .= dol_print_socialnetworks($this->linkedin, $this->id, $object->id, 'linkedin');

+				$outdone++;

+			}

+

+			if ($outsocialnetwork) {

+				$out .= '<div style="clear: both;">'.$outsocialnetwork.'</div>';

+			}

+		}

+

+		if ($out) return '<!-- BEGIN part to show address block -->'."\n".$out.'<!-- END Part to show address block -->'."\n";

+		else return '';

+	}

@@ -1024 +810,2 @@
-		if (empty($this->last_main_doc)) {

+		if (empty($this->last_main_doc))

+		{

@@ -1031 +818,2 @@
-		if ($result < 0) {

+		if ($result < 0)

+		{

@@ -1037 +825,2 @@
-		if (empty($ecmfile->id)) {

+		if (empty($ecmfile->id))

+		{

@@ -1039 +828,2 @@
-			if ($initsharekey) {

+			if ($initsharekey)

+			{

@@ -1041,2 +831 @@
-

-				// TODO We can't, we dont' have full path of file, only last_main_doc and ->element, so we must first rebuild full path $destfull

+				// TODO We can't, we dont' have full path of file, only last_main_doc adn ->element, so we must rebuild full path first

@@ -1050 +839 @@
-				$ecmfile->keywords = '';        // keyword content

+				$ecmfile->keyword = '';        // keyword content

@@ -1059,4 +848,5 @@
-			} else {

-				return '';

-			}

-		} elseif (empty($ecmfile->share)) {

+			}

+			else return '';

+		}

+		elseif (empty($ecmfile->share))

+		{

@@ -1064 +854,2 @@
-			if ($initsharekey) {

+			if ($initsharekey)

+			{

@@ -1068,3 +859,2 @@
-			} else {

-				return '';

-			}

+			}

+			else return '';

@@ -1083,2 +873,2 @@
-		//if (!empty($modulepart)) $paramlink.=($paramlink?'&':'').'modulepart='.$modulepart;		// For sharing with hash (so public files), modulepart is not required.

-		//if (!empty($ecmfile->entity)) $paramlink.='&entity='.$ecmfile->entity; 					// For sharing with hash (so public files), entity is not required.

+		//if (! empty($modulepart)) $paramlink.=($paramlink?'&':'').'modulepart='.$modulepart;		// For sharing with hash (so public files), modulepart is not required.

+		//if (! empty($ecmfile->entity)) $paramlink.='&entity='.$ecmfile->entity; 					// For sharing with hash (so public files), entity is not required.

@@ -1086,8 +876,5 @@
-		if (!empty($ecmfile->share)) {

-			$paramlink .= ($paramlink ? '&' : '').'hashp='.$ecmfile->share; // Hash for public share

-		}

-		if ($forcedownload) {

-			$paramlink .= ($paramlink ? '&' : '').'attachment=1';

-		}

-

-		if ($relativelink) {

+		if (!empty($ecmfile->share)) $paramlink .= ($paramlink ? '&' : '').'hashp='.$ecmfile->share; // Hash for public share

+		if ($forcedownload) $paramlink .= ($paramlink ? '&' : '').'attachment=1';

+

+		if ($relativelink)

+		{

@@ -1095 +882,3 @@
-		} else {

+		}

+		else

+		{

@@ -1104 +893 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -1108,5 +897,5 @@
-	 *  @param	int			$fk_socpeople       Id of thirdparty contact (if source = 'external') or id of user (if souce = 'internal') to link

-	 *  @param 	int|string	$type_contact 		Type of contact (code or id). Must be id or code found into table llx_c_type_contact. For example: SALESREPFOLL

-	 *  @param  string		$source             external=Contact extern (llx_socpeople), internal=Contact intern (llx_user)

-	 *  @param  int			$notrigger			Disable all triggers

-	 *  @return int         	        		Return integer <0 if KO, 0 if already added or code not valid, >0 if OK

+	 *  @param	int		$fk_socpeople       Id of thirdparty contact (if source = 'external') or id of user (if souce = 'internal') to link

+	 *  @param 	int		$type_contact 		Type of contact (code or id). Must be id or code found into table llx_c_type_contact. For example: SALESREPFOLL

+	 *  @param  string	$source             external=Contact extern (llx_socpeople), internal=Contact intern (llx_user)

+	 *  @param  int		$notrigger			Disable all triggers

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

@@ -1116 +905 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -1123 +912,2 @@
-		if ($fk_socpeople <= 0) {

+		if ($fk_socpeople <= 0)

+		{

@@ -1129 +919,2 @@
-		if (!$type_contact) {

+		if (!$type_contact)

+		{

@@ -1137 +928,2 @@
-		if (is_numeric($type_contact)) {

+		if (is_numeric($type_contact))

+		{

@@ -1139 +931,3 @@
-		} else {

+		}

+		else

+		{

@@ -1142 +936 @@
-			$sql .= " FROM ".$this->db->prefix()."c_type_contact as tc";

+			$sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";

@@ -1148 +942,2 @@
-			if ($resql) {

+			if ($resql)

+			{

@@ -1150,7 +945,7 @@
-				if ($obj) {

-					$id_type_contact = $obj->rowid;

-				}

-			}

-		}

-

-		if ($id_type_contact == 0) {

+				if ($obj) $id_type_contact = $obj->rowid;

+			}

+		}

+

+		if ($id_type_contact == 0)

+		{

+			$this->error = 'CODE_NOT_VALID_FOR_THIS_ELEMENT';

@@ -1158 +953 @@
-			return 0;

+			return -3;

@@ -1179 +974 @@
-			$sql = "INSERT INTO ".$this->db->prefix()."element_contact";

+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_contact";

@@ -1181 +976 @@
-			$sql .= " VALUES (".$this->id.", ".((int) $fk_socpeople)." , ";

+			$sql .= " VALUES (".$this->id.", ".$fk_socpeople." , ";

@@ -1183 +978 @@
-			$sql .= ", 4, ".((int) $id_type_contact);

+			$sql .= ", 4, ".$id_type_contact;

@@ -1187,2 +982,4 @@
-			if ($resql) {

-				if (!$notrigger) {

+			if ($resql)

+			{

+				if (!$notrigger)

+				{

@@ -1190 +987,2 @@
-					if ($result < 0) {

+					if ($result < 0)

+					{

@@ -1198,2 +996,5 @@
-			} else {

-				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {

+			}

+			else

+			{

+				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')

+				{

@@ -1201,0 +1003 @@
+					echo 'err rollback';

@@ -1203,2 +1005,4 @@
-				} else {

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

+				}

+				else

+				{

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

@@ -1209,6 +1013,4 @@
-		} else {

-			return 0;

-		}

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+		} else return 0;

+	}

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -1224 +1026 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -1226,2 +1028,5 @@
-		foreach ($contacts as $contact) {

-			if ($this->add_contact($contact['id'], $contact['fk_c_type_contact'], $contact['source']) < 0) {

+		foreach ($contacts as $contact)

+		{

+			if ($this->add_contact($contact['id'], $contact['fk_c_type_contact'], $contact['source']) < 0)

+			{

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

@@ -1234 +1039 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

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

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

@@ -1246 +1051 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -1248 +1053 @@
-		$sql = "UPDATE ".$this->db->prefix()."element_contact set";

+		$sql = "UPDATE ".MAIN_DB_PREFIX."element_contact set";

@@ -1250,7 +1055,3 @@
-		if ($type_contact_id) {

-			$sql .= ", fk_c_type_contact = ".((int) $type_contact_id);

-		}

-		if ($fk_socpeople) {

-			$sql .= ", fk_socpeople = ".((int) $fk_socpeople);

-		}

-		$sql .= " where rowid = ".((int) $rowid);

+		if ($type_contact_id) $sql .= ", fk_c_type_contact = '".$type_contact_id."'";

+		if ($fk_socpeople) $sql .= ", fk_socpeople = '".$fk_socpeople."'";

+		$sql .= " where rowid = ".$rowid;

@@ -1258 +1059,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -1260 +1062,3 @@
-		} else {

+		}

+		else

+		{

@@ -1266 +1070 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -1276 +1080 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -1279 +1082,0 @@
-		$error = 0;

@@ -1283,24 +1086,12 @@
-		if (!$error && empty($notrigger)) {

-			// Call trigger

-			$this->context['contact_id'] = ((int) $rowid);

-			$result = $this->call_trigger(strtoupper($this->element).'_DELETE_CONTACT', $user);

-			if ($result < 0) {

-				$error++;

-			}

-			// End call triggers

-		}

-

-		if (!$error) {

-			dol_syslog(get_class($this)."::delete_contact", LOG_DEBUG);

-

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

-			$sql .= " WHERE rowid = ".((int) $rowid);

-

-			$result = $this->db->query($sql);

-			if (!$result) {

-				$error++;

-				$this->errors[] = $this->db->lasterror();

-			}

-		}

-

-		if (!$error) {

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

+		$sql .= " WHERE rowid =".$rowid;

+

+		dol_syslog(get_class($this)."::delete_contact", LOG_DEBUG);

+		if ($this->db->query($sql))

+		{

+			if (!$notrigger)

+			{

+				$result = $this->call_trigger(strtoupper($this->element).'_DELETE_CONTACT', $user);

+				if ($result < 0) { $this->db->rollback(); return -1; }

+			}

+

@@ -1309 +1100,3 @@
-		} else {

+		}

+		else

+		{

@@ -1316,3 +1109,3 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 *    Delete all links between an object $this and all its contacts in llx_element_contact

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+	/**

+	 *    Delete all links between an object $this and all its contacts

@@ -1322 +1115 @@
-	 *    @return   int					Return integer <0 if KO, 0=Nothing done, >0 if OK

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

@@ -1326,2 +1119 @@
-		// phpcs:enable

-		$listId = '';

+        // phpcs:enable

@@ -1331,16 +1123,10 @@
-		if (!empty($typeContact)) {

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

-				array_push($temp, $key);

-			}

-			$listId = implode(",", $temp);

-		}

-

-		// If $listId is empty, we have not criteria on fk_c_type_contact so we will delete record on element_id for

-		// any type or record instead of only the ones of the current object. So we do nothing in such a case.

-		if (empty($listId)) {

-			return 0;

-		}

-

-		$sql = "DELETE FROM ".$this->db->prefix()."element_contact";

-		$sql .= " WHERE element_id = ".((int) $this->id);

-		$sql .= " AND fk_c_type_contact IN (".$this->db->sanitize($listId).")";

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

+		{

+			array_push($temp, $key);

+		}

+		$listId = implode(",", $temp);

+

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

+		$sql .= " WHERE element_id = ".$this->id;

+		if ($listId)

+			$sql .= " AND fk_c_type_contact IN (".$listId.")";

@@ -1349 +1135,2 @@
-		if ($this->db->query($sql)) {

+		if ($this->db->query($sql))

+		{

@@ -1351 +1138,3 @@
-		} else {

+		}

+		else

+		{

@@ -1357 +1146 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -1361,11 +1150,9 @@
-	 *    @param	int			$statusoflink	Status of links to get (-1=all). Not used.

-	 *    @param	string		$source			Source of contact: 'external' or 'thirdparty' (llx_socpeople) or 'internal' (llx_user)

-	 *    @param	int         $list       	0:Returned array contains all properties, 1:Return array contains just id

-	 *    @param    string      $code       	Filter on this code of contact type ('SHIPPING', 'BILLING', ...)

-	 *    @param	int			$status			Status of user or company

-	 *    @param	array		$arrayoftcids	Array with ID of type of contacts. If we provide this, we can make a ec.fk_c_type_contact in ($arrayoftcids) to avoid link on tc table. TODO Not implemented.

-	 *    @return	array|int		        	Array of contacts, -1 if error

-	 */

-	public function liste_contact($statusoflink = -1, $source = 'external', $list = 0, $code = '', $status = -1, $arrayoftcids = array())

-	{

-		// phpcs:enable

+	 *    @param	int			$status		Status of links to get (-1=all)

+	 *    @param	string		$source		Source of contact: 'external' or 'thirdparty' (llx_socpeople) or 'internal' (llx_user)

+	 *    @param	int         $list       0:Return array contains all properties, 1:Return array contains just id

+	 *    @param    string      $code       Filter on this code of contact type ('SHIPPING', 'BILLING', ...)

+	 *    @return	array|int		        Array of contacts, -1 if error

+	 */

+	public function liste_contact($status = -1, $source = 'external', $list = 0, $code = '')

+	{

+        // phpcs:enable

@@ -1377,6 +1164,2 @@
-		if ($source == 'internal') {

-			$sql .= ", '-1' as socid, t.statut as statuscontact, t.login, t.photo";

-		}

-		if ($source == 'external' || $source == 'thirdparty') {

-			$sql .= ", t.fk_soc as socid, t.statut as statuscontact";

-		}

+		if ($source == 'internal') $sql .= ", '-1' as socid, t.statut as statuscontact, t.login, t.photo";

+		if ($source == 'external' || $source == 'thirdparty') $sql .= ", t.fk_soc as socid, t.statut as statuscontact";

@@ -1384,31 +1167,13 @@
-		$sql .= ", tc.source, tc.element, tc.code, tc.libelle as type_label";

-		$sql .= " FROM ".$this->db->prefix()."c_type_contact tc,";

-		$sql .= " ".$this->db->prefix()."element_contact ec";

-		if ($source == 'internal') {	// internal contact (user)

-			$sql .= " LEFT JOIN ".$this->db->prefix()."user t on ec.fk_socpeople = t.rowid";

-		}

-		if ($source == 'external' || $source == 'thirdparty') {	// external contact (socpeople)

-			$sql .= " LEFT JOIN ".$this->db->prefix()."socpeople t on ec.fk_socpeople = t.rowid";

-		}

-		$sql .= " WHERE ec.element_id = ".((int) $this->id);

-		$sql .= " AND ec.fk_c_type_contact = tc.rowid";

-		$sql .= " AND tc.element = '".$this->db->escape($this->element)."'";

-		if ($code) {

-			$sql .= " AND tc.code = '".$this->db->escape($code)."'";

-		}

-		if ($source == 'internal') {

-			$sql .= " AND tc.source = 'internal'";

-			if ($status >= 0) {

-				$sql .= " AND t.statut = ".((int) $status);

-			}

-		}

-		if ($source == 'external' || $source == 'thirdparty') {

-			$sql .= " AND tc.source = 'external'";

-			if ($status >= 0) {

-				$sql .= " AND t.statut = ".((int) $status);	// t is llx_socpeople

-			}

-		}

-		$sql .= " AND tc.active = 1";

-		if ($statusoflink >= 0) {

-			$sql .= " AND ec.statut = ".((int) $statusoflink);

-		}

+		$sql .= ", tc.source, tc.element, tc.code, tc.libelle";

+		$sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact tc";

+		$sql .= ", ".MAIN_DB_PREFIX."element_contact ec";

+		if ($source == 'internal') $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user t on ec.fk_socpeople = t.rowid";

+		if ($source == 'external' || $source == 'thirdparty') $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople t on ec.fk_socpeople = t.rowid";

+		$sql .= " WHERE ec.element_id =".$this->id;

+		$sql .= " AND ec.fk_c_type_contact=tc.rowid";

+		$sql .= " AND tc.element='".$this->db->escape($this->element)."'";

+		if ($code) $sql .= " AND tc.code = '".$this->db->escape($code)."'";

+		if ($source == 'internal') $sql .= " AND tc.source = 'internal'";

+		if ($source == 'external' || $source == 'thirdparty') $sql .= " AND tc.source = 'external'";

+		$sql .= " AND tc.active=1";

+		if ($status >= 0) $sql .= " AND ec.statut = ".$status;

@@ -1419 +1184,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -1422 +1188,2 @@
-			while ($i < $num) {

+			while ($i < $num)

+			{

@@ -1425 +1192,2 @@
-				if (!$list) {

+				if (!$list)

+				{

@@ -1427,21 +1195,8 @@
-					$libelle_type = ($langs->trans($transkey) != $transkey ? $langs->trans($transkey) : $obj->type_label);

-					$tab[$i] = array(

-						'parentId' => $this->id,

-						'source' => $obj->source,

-						'socid' => $obj->socid,

-						'id' => $obj->id,

-						'nom' => $obj->lastname, // For backward compatibility

-						'civility' => $obj->civility,

-						'lastname' => $obj->lastname,

-						'firstname' => $obj->firstname,

-						'email'=>$obj->email,

-						'login'=> (empty($obj->login) ? '' : $obj->login),

-						'photo' => (empty($obj->photo) ? '' : $obj->photo),

-						'statuscontact' => $obj->statuscontact,

-						'rowid' => $obj->rowid,

-						'code' => $obj->code,

-						'libelle' => $libelle_type,

-						'status' => $obj->statuslink,

-						'fk_c_type_contact' => $obj->fk_c_type_contact

-					);

-				} else {

+					$libelle_type = ($langs->trans($transkey) != $transkey ? $langs->trans($transkey) : $obj->libelle);

+					$tab[$i] = array('source'=>$obj->source, 'socid'=>$obj->socid, 'id'=>$obj->id,

+								   'nom'=>$obj->lastname, // For backward compatibility

+								   'civility'=>$obj->civility, 'lastname'=>$obj->lastname, 'firstname'=>$obj->firstname, 'email'=>$obj->email, 'login'=>$obj->login, 'photo'=>$obj->photo, 'statuscontact'=>$obj->statuscontact,

+								   'rowid'=>$obj->rowid, 'code'=>$obj->code, 'libelle'=>$libelle_type, 'status'=>$obj->statuslink, 'fk_c_type_contact'=>$obj->fk_c_type_contact);

+				}

+				else

+				{

@@ -1455 +1210,3 @@
-		} else {

+		}

+		else

+		{

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

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

@@ -1472,3 +1229,5 @@
-		$sql .= " tc.code, tc.libelle as type_label";

-		$sql .= " FROM (".$this->db->prefix()."element_contact as ec, ".$this->db->prefix()."c_type_contact as tc)";

-		$sql .= " WHERE ec.rowid =".((int) $rowid);

+		$sql .= " tc.code, tc.libelle";

+		//$sql.= ", s.fk_soc";

+		$sql .= " FROM (".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as tc)";

+		//$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as s ON ec.fk_socpeople=s.rowid";	// Si contact de type external, alors il est lie a une societe

+		$sql .= " WHERE ec.rowid =".$rowid;

@@ -1480 +1239,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -1486 +1246,3 @@
-		} else {

+		}

+		else

+		{

@@ -1493 +1255 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -1506 +1268 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -1509,6 +1271,2 @@
-		if (empty($order)) {

-			$order = 'position';

-		}

-		if ($order == 'position') {

-			$order .= ',code';

-		}

+		if (empty($order)) $order = 'position';

+		if ($order == 'position') $order .= ',code';

@@ -1517,2 +1275,2 @@
-		$sql = "SELECT DISTINCT tc.rowid, tc.code, tc.libelle as type_label, tc.position";

-		$sql .= " FROM ".$this->db->prefix()."c_type_contact as tc";

+		$sql = "SELECT DISTINCT tc.rowid, tc.code, tc.libelle, tc.position";

+		$sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";

@@ -1520,9 +1278,3 @@
-		if ($activeonly == 1) {

-			$sql .= " AND tc.active=1"; // only the active types

-		}

-		if (!empty($source) && $source != 'all') {

-			$sql .= " AND tc.source='".$this->db->escape($source)."'";

-		}

-		if (!empty($code)) {

-			$sql .= " AND tc.code='".$this->db->escape($code)."'";

-		}

+		if ($activeonly == 1) $sql .= " AND tc.active=1"; // only the active types

+		if (!empty($source) && $source != 'all') $sql .= " AND tc.source='".$this->db->escape($source)."'";

+		if (!empty($code)) $sql .= " AND tc.code='".$this->db->escape($code)."'";

@@ -1533 +1285,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -1536 +1289,2 @@
-			while ($i < $num) {

+			while ($i < $num)

+			{

@@ -1540,6 +1294,3 @@
-				$libelle_type = ($langs->trans($transkey) != $transkey ? $langs->trans($transkey) : $obj->type_label);

-				if (empty($option)) {

-					$tab[$obj->rowid] = $libelle_type;

-				} else {

-					$tab[$obj->code] = $libelle_type;

-				}

+				$libelle_type = ($langs->trans($transkey) != $transkey ? $langs->trans($transkey) : $obj->libelle);

+				if (empty($option)) $tab[$obj->rowid] = $libelle_type;

+				else $tab[$obj->code] = $libelle_type;

@@ -1549 +1300,3 @@
-		} else {

+		}

+		else

+		{

@@ -1555,0 +1309 @@
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -1568,0 +1323 @@
+		// phpcs:enable

@@ -1571,2 +1325,0 @@
-		$langs->loadLangs(array('bills', 'contracts', 'interventions', 'orders', 'projects', 'propal', 'ticket', 'agenda'));

-

@@ -1575,2 +1328,2 @@
-		$sql = "SELECT DISTINCT tc.rowid, tc.code, tc.libelle as type_label, tc.position, tc.element";

-		$sql .= " FROM ".$this->db->prefix()."c_type_contact as tc";

+		$sql = "SELECT DISTINCT tc.rowid, tc.code, tc.libelle, tc.position, tc.element";

+		$sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";

@@ -1586 +1339 @@
-		if ($activeonly == 1) {

+		if ($activeonly == 1)

@@ -1588,3 +1341,2 @@
-		}

-

-		if (!empty($source) && $source != 'all') {

+

+		if (!empty($source) && $source != 'all')

@@ -1592,3 +1344,2 @@
-		}

-

-		if (!empty($code)) {

+

+		if (!empty($code))

@@ -1596 +1346,0 @@
-		}

@@ -1609,2 +1358,0 @@
-				$langs->loadLangs(array("propal", "orders", "bills", "suppliers", "contracts", "supplier_proposal"));

-

@@ -1624 +1372 @@
-					if (!empty($conf->{$modulename}->enabled)) {

+					if ($conf->{$modulename}->enabled) {

@@ -1626,4 +1374,3 @@
-						$tmpelement = $obj->element;

-						$transkey = "TypeContact_".$tmpelement."_".$source."_".$obj->code;

-						$libelle_type = ($langs->trans($transkey) != $transkey ? $langs->trans($transkey) : $obj->type_label);

-						if (empty($option)) {

+						$transkey = "TypeContact_".$obj->element."_".$source."_".$obj->code;

+						$libelle_type = ($langs->trans($transkey) != $transkey ? $langs->trans($transkey) : $obj->libelle);

+						if (empty($option))

@@ -1631,3 +1378 @@
-						} else {

-							$tab[$obj->rowid] = $libelle_element.' - '.$libelle_type;

-						}

+						else $tab[$obj->rowid] = $libelle_element.' - '.$libelle_type;

@@ -1638 +1383,3 @@
-		} else {

+		}

+		else

+		{

@@ -1674,9 +1421,5 @@
-		$sql .= " FROM ".$this->db->prefix()."element_contact as ec,";

-		if ($source == 'internal') {

-			$sql .= " ".$this->db->prefix()."user as c,";

-		}

-		if ($source == 'external') {

-			$sql .= " ".$this->db->prefix()."socpeople as c,";

-		}

-		$sql .= " ".$this->db->prefix()."c_type_contact as tc";

-		$sql .= " WHERE ec.element_id = ".((int) $id);

+		$sql .= " FROM ".MAIN_DB_PREFIX."element_contact as ec,";

+		if ($source == 'internal') $sql .= " ".MAIN_DB_PREFIX."user as c,";

+		if ($source == 'external') $sql .= " ".MAIN_DB_PREFIX."socpeople as c,";

+		$sql .= " ".MAIN_DB_PREFIX."c_type_contact as tc";

+		$sql .= " WHERE ec.element_id = ".$id;

@@ -1684,6 +1427,2 @@
-		if ($source == 'internal') {

-			$sql .= " AND c.entity IN (".getEntity('user').")";

-		}

-		if ($source == 'external') {

-			$sql .= " AND c.entity IN (".getEntity('societe').")";

-		}

+		if ($source == 'internal') $sql .= " AND c.entity IN (".getEntity('user').")";

+		if ($source == 'external') $sql .= " AND c.entity IN (".getEntity('societe').")";

@@ -1691,5 +1430,3 @@
-		$sql .= " AND tc.element = '".$this->db->escape($element)."'";

-		$sql .= " AND tc.source = '".$this->db->escape($source)."'";

-		if ($code) {

-			$sql .= " AND tc.code = '".$this->db->escape($code)."'";

-		}

+		$sql .= " AND tc.element = '".$element."'";

+		$sql .= " AND tc.source = '".$source."'";

+		if ($code) $sql .= " AND tc.code = '".$code."'";

@@ -1697,3 +1434 @@
-		if ($status) {

-			$sql .= " AND ec.statut = ".((int) $status);

-		}

+		if ($status) $sql .= " AND ec.statut = ".$status;

@@ -1703,2 +1438,4 @@
-		if ($resql) {

-			while ($obj = $this->db->fetch_object($resql)) {

+		if ($resql)

+		{

+			while ($obj = $this->db->fetch_object($resql))

+			{

@@ -1708 +1445,3 @@
-		} else {

+		}

+		else

+		{

@@ -1716,6 +1455,6 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 *		Load object contact with id=$this->contact_id into $this->contact

-	 *

-	 *		@param	int		$contactid      Id du contact. Use this->contact_id if empty.

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

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+	/**

+	 *		Load object contact with id=$this->contactid into $this->contact

+	 *

+	 *		@param	int		$contactid      Id du contact. Use this->contactid if empty.

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

@@ -1725,8 +1464,4 @@
-		// phpcs:enable

-		if (empty($contactid)) {

-			$contactid = $this->contact_id;

-		}

-

-		if (empty($contactid)) {

-			return 0;

-		}

+        // phpcs:enable

+		if (empty($contactid)) $contactid = $this->contactid;

+

+		if (empty($contactid)) return 0;

@@ -1741 +1476 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -1746 +1481 @@
-	 *		@return		int								Return integer <0 if KO, >0 if OK

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

@@ -1750,2 +1485,4 @@
-		// phpcs:enable

-		if (empty($this->socid) && empty($this->fk_soc) && empty($force_thirdparty_id)) {

+        // phpcs:enable

+		global $conf;

+

+		if (empty($this->socid) && empty($this->fk_soc) && empty($this->fk_thirdparty) && empty($force_thirdparty_id))

@@ -1753 +1489,0 @@
-		}

@@ -1757,2 +1493,2 @@
-		$idtofetch = isset($this->socid) ? $this->socid : (isset($this->fk_soc) ? $this->fk_soc : 0);

-		if ($force_thirdparty_id) {

+		$idtofetch = isset($this->socid) ? $this->socid : (isset($this->fk_soc) ? $this->fk_soc : $this->fk_thirdparty);

+		if ($force_thirdparty_id)

@@ -1760 +1495,0 @@
-		}

@@ -1765,3 +1499,0 @@
-			if ($result<0) {

-				$this->errors=array_merge($this->errors, $thirdparty->errors);

-			}

@@ -1771 +1503 @@
-			if (getDolGlobalString('PRODUIT_MULTIPRICES') && empty($this->thirdparty->price_level)) {

+			if (!empty($conf->global->PRODUIT_MULTIPRICES) && empty($this->thirdparty->price_level)) {

@@ -1776 +1508 @@
-		} else {

+		} else

@@ -1778 +1509,0 @@
-		}

@@ -1786,2 +1517,2 @@
-	 * @param 	string 	$ref 	Wildcard

-	 * @return 	int 			>1 = OK, 0 = Not found or table_ref_field not defined, <0 = KO

+	 * @param string $ref Wildcard

+	 * @return int >1 = OK, 0 = Not found or table_ref_field not defined, <0 = KO

@@ -1795,3 +1526 @@
-		$sql = "SELECT rowid FROM ".$this->db->prefix().$this->table_element;

-		$sql .= " WHERE ".$this->table_ref_field." LIKE '".$this->db->escape($ref)."'";	// no escapeforlike here

-		$sql .= " LIMIT 1";

+		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE '.$this->table_ref_field.' LIKE "'.$this->db->escape($ref).'" LIMIT 1';

@@ -1807,11 +1536,4 @@
-		if (method_exists($this, 'fetch')) {

-			return $this->fetch($result->rowid);

-		} else {

-			$this->error = 'Fetch method not implemented on '.get_class($this);

-			dol_syslog(get_class($this).'::fetchOneLike Error='.$this->error, LOG_ERR);

-			array_push($this->errors, $this->error);

-			return -1;

-		}

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+		return $this->fetch($result->rowid);

+	}

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -1823 +1545 @@
-	 *	@return		int			Return integer <0 if KO, 0 if can't guess type of barcode (ISBN, EAN13...), >0 if OK (all barcode properties loaded)

+	 *	@return		int			<0 if KO, 0 if can't guess type of barcode (ISBN, EAN13...), >0 if OK (all barcode properties loaded)

@@ -1827 +1549 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -1833,12 +1555,11 @@
-		if (empty($idtype) && $idtype != '0') {	// If type of barcode no set, we try to guess. If set to '0' it means we forced to have type remain not defined

-			if ($this->element == 'product' && getDolGlobalString('PRODUIT_DEFAULT_BARCODE_TYPE')) {

-				$idtype = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;

-			} elseif ($this->element == 'societe') {

-				$idtype = $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY;

-			} else {

-				dol_syslog('Call fetch_barcode with barcode_type not defined and cant be guessed', LOG_WARNING);

-			}

-		}

-

-		if ($idtype > 0) {

-			if (empty($this->barcode_type) || empty($this->barcode_type_code) || empty($this->barcode_type_label) || empty($this->barcode_type_coder)) {    // If data not already loaded

+		if (empty($idtype) && $idtype != '0')	// If type of barcode no set, we try to guess. If set to '0' it means we forced to have type remain not defined

+		{

+			if ($this->element == 'product')      $idtype = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;

+			elseif ($this->element == 'societe') $idtype = $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY;

+			else dol_syslog('Call fetch_barcode with barcode_type not defined and cant be guessed', LOG_WARNING);

+		}

+

+		if ($idtype > 0)

+		{

+			if (empty($this->barcode_type) || empty($this->barcode_type_code) || empty($this->barcode_type_label) || empty($this->barcode_type_coder))    // If data not already loaded

+			{

@@ -1846,2 +1567,2 @@
-				$sql .= " FROM ".$this->db->prefix()."c_barcode_type";

-				$sql .= " WHERE rowid = ".((int) $idtype);

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

+				$sql .= " WHERE rowid = ".$idtype;

@@ -1850 +1571,2 @@
-				if ($resql) {

+				if ($resql)

+				{

@@ -1857 +1579,3 @@
-				} else {

+				}

+				else

+				{

@@ -1866 +1590 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -1870,13 +1594 @@
-	 *		@return		int			Return integer <0 if KO, >=0 if OK

-	 */

-	public function fetch_project()

-	{

-		// phpcs:enable

-		return $this->fetch_projet();

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 *		Load the project with id $this->fk_project into this->project

-	 *

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

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

@@ -1886 +1598 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -1889,6 +1601,2 @@
-		if (empty($this->fk_project) && !empty($this->fk_projet)) {

-			$this->fk_project = $this->fk_projet; // For backward compatibility

-		}

-		if (empty($this->fk_project)) {

-			return 0;

-		}

+		if (empty($this->fk_project) && !empty($this->fk_projet)) $this->fk_project = $this->fk_projet; // For backward compatibility

+		if (empty($this->fk_project)) return 0;

@@ -1904 +1612 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

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

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

@@ -1912 +1620 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -1915,3 +1623 @@
-		if (empty($this->fk_product)) {

-			return 0;

-		}

+		if (empty($this->fk_product)) return 0;

@@ -1926 +1632 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -1931 +1637 @@
-	 *		@return	int						Return integer <0 if KO, >0 if OK

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

@@ -1935 +1641 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -1942,5 +1648,3 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 *	Read linked origin object.

-	 *	Set ->origin_object

-	 *	Set also ->expedition or ->livraison or ->commandFournisseur (deprecated)

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+	/**

+	 *	Read linked origin object

@@ -1952,10 +1656,4 @@
-		// phpcs:enable

-		if ($this->origin == 'shipping') {

-			$this->origin = 'expedition';

-		}

-		if ($this->origin == 'delivery') {

-			$this->origin = 'livraison';

-		}

-		if ($this->origin == 'order_supplier' || $this->origin == 'supplier_order') {

-			$this->origin = 'commandeFournisseur';

-		}

+        // phpcs:enable

+		if ($this->origin == 'shipping') $this->origin = 'expedition';

+		if ($this->origin == 'delivery') $this->origin = 'livraison';

+        if ($this->origin == 'order_supplier') $this->origin = 'commandeFournisseur';

@@ -1966,16 +1664,13 @@
-		$this->origin_object = new $classname($this->db);

-		$this->origin_object->fetch($this->origin_id);

-

-		// TODO Remove this line

-		$this->$origin = $this->origin_object;

-	}

-

-	/**

-	 *  Load object from specific field

-	 *

-	 *  @param	string	$table		Table element or element line

-	 *  @param	string	$field		Field selected

-	 *  @param	string	$key		Import key

-	 *  @param	string	$element	Element name

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

-	 */

+		$this->$origin = new $classname($this->db);

+		$this->$origin->fetch($this->origin_id);

+	}

+

+	/**

+     *  Load object from specific field

+     *

+     *  @param	string	$table		Table element or element line

+     *  @param	string	$field		Field selected

+     *  @param	string	$key		Import key

+     *  @param	string	$element	Element name

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

+     */

@@ -1988,2 +1683,2 @@
-		$sql = "SELECT rowid FROM ".$this->db->prefix().$table;

-		$sql .= " WHERE ".$field." = '".$this->db->escape($key)."'";

+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX.$table;

+		$sql .= " WHERE ".$field." = '".$key."'";

@@ -1993 +1688 @@
-			$sql .= " AND entity = ".((int) $conf->entity);

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

@@ -1998,2 +1693,3 @@
-		if ($resql) {

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

+		if ($resql)

+		{

+			$row = $this->db->fetch_row($resql);

@@ -2001,9 +1697,2 @@
-			if ($obj) {

-				if (method_exists($this, 'fetch')) {

-					return $this->fetch($obj->rowid);

-				} else {

-					$this->error = 'fetch() method not implemented on '.get_class($this);

-					dol_syslog(get_class($this).'::fetchOneLike Error='.$this->error, LOG_ERR);

-					array_push($this->errors, $this->error);

-					return -1;

-				}

+			if ($row[0] > 0) {

+				$result = $this->fetch($row[0]);

@@ -2022 +1711 @@
-	 *	@return	int					Return integer <0 if KO, >0 if OK

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

@@ -2028,2 +1717,2 @@
-			$sql = "SELECT ".$field." FROM ".$this->db->prefix().$table;

-			$sql .= " WHERE rowid = ".((int) $id);

+			$sql = "SELECT ".$field." FROM ".MAIN_DB_PREFIX.$table;

+			$sql .= " WHERE rowid = ".$id;

@@ -2033 +1722,2 @@
-			if ($resql) {

+			if ($resql)

+			{

@@ -2049 +1739 @@
-	 *	@param	string		$format			Data format ('text', 'int', 'date'). 'text' is used if not defined

+	 *	@param	string		$format			Data format ('text', 'date'). 'text' is used if not defined

@@ -2054 +1744 @@
-	 *	@return	int							Return integer <0 if KO, >0 if OK

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

@@ -2059,14 +1749,10 @@
-		global $user;

-

-		if (empty($table)) {

-			$table = $this->table_element;

-		}

-		if (empty($id)) {

-			$id = $this->id;

-		}

-		if (empty($format)) {

-			$format = 'text';

-		}

-		if (empty($id_field)) {

-			$id_field = 'rowid';

-		}

+		global $user, $langs, $conf;

+

+		if (empty($table)) 	  $table = $this->table_element;

+		if (empty($id))    	  $id = $this->id;

+		if (empty($format))   $format = 'text';

+		if (empty($id_field)) $id_field = 'rowid';

+

+		$error = 0;

+

+		$this->db->begin();

@@ -2075,61 +1761,18 @@
-		if ($table == 'product' && $field == 'note_private') {

-			$field = 'note';

-		}

-

-		if (in_array($table, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))) {

-			$fk_user_field = 'fk_user_mod';

-		}

-		if (in_array($table, array('prelevement_bons'))) {	// TODO Add a field fk_user_modif into llx_prelevement_bons

-			$fk_user_field = '';

-		}

-

-		if ($trigkey) {

-			$oldvalue = null;

-

-			$sql = "SELECT " . $field;

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

-			$sql .= " WHERE " . $id_field . " = " . ((int) $id);

-

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

-			if ($resql) {

-				if ($obj = $this->db->fetch_object($resql)) {

-					if ($format == 'date') {

-						$oldvalue = $this->db->jdate($obj->$field);

-					} else {

-						$oldvalue = $obj->$field;

-					}

-				}

-			} else {

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

-				return -1;

-			}

-		}

-

-		$error = 0;

-

-		dol_syslog(__METHOD__, LOG_DEBUG);

-

-		$this->db->begin();

-

-		$sql = "UPDATE ".$this->db->prefix().$table." SET ";

-

-		if ($format == 'text') {

-			$sql .= $field." = '".$this->db->escape($value)."'";

-		} elseif ($format == 'int') {

-			$sql .= $field." = ".((int) $value);

-		} elseif ($format == 'date') {

-			$sql .= $field." = ".($value ? "'".$this->db->idate($value)."'" : "null");

-		} elseif ($format == 'dategmt') {

-			$sql .= $field." = ".($value ? "'".$this->db->idate($value, 'gmt')."'" : "null");

-		}

-

-		if ($fk_user_field) {

-			if (!empty($fuser) && is_object($fuser)) {

-				$sql .= ", ".$fk_user_field." = ".((int) $fuser->id);

-			} elseif (empty($fuser) || $fuser != 'none') {

-				$sql .= ", ".$fk_user_field." = ".((int) $user->id);

-			}

-		}

-

-		$sql .= " WHERE ".$id_field." = ".((int) $id);

-

+		if ($table == 'product' && $field == 'note_private') $field = 'note';

+		if (in_array($table, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))) $fk_user_field = 'fk_user_mod';

+

+		$sql = "UPDATE ".MAIN_DB_PREFIX.$table." SET ";

+

+		if ($format == 'text') $sql .= $field." = '".$this->db->escape($value)."'";

+		elseif ($format == 'int') $sql .= $field." = ".$this->db->escape($value);

+		elseif ($format == 'date') $sql .= $field." = ".($value ? "'".$this->db->idate($value)."'" : "null");

+

+		if ($fk_user_field)

+		{

+			if (!empty($fuser) && is_object($fuser)) $sql .= ", ".$fk_user_field." = ".$fuser->id;

+			elseif (empty($fuser) || $fuser != 'none') $sql .= ", ".$fk_user_field." = ".$user->id;

+		}

+

+		$sql .= " WHERE ".$id_field." = ".$id;

+

+		dol_syslog(__METHOD__."", LOG_DEBUG);

@@ -2137,2 +1780,4 @@
-		if ($resql) {

-			if ($trigkey) {

+		if ($resql)

+		{

+			if ($trigkey)

+			{

@@ -2140 +1785,2 @@
-				if (method_exists($this, 'fetch')) {

+				if (empty($this->fields) && method_exists($this, 'fetch'))

+				{

@@ -2142 +1788,3 @@
-				} else {

+				}

+				else

+				{

@@ -2145,17 +1793,7 @@
-				$this->oldcopy = clone $this;

-				if (property_exists($this->oldcopy, $field)) {

-					$this->oldcopy->$field = $oldvalue;

-				}

-

-				if ($result >= 0) {

-					$result = $this->call_trigger($trigkey, (!empty($fuser) && is_object($fuser)) ? $fuser : $user); // This may set this->errors

-				}

-				if ($result < 0) {

-					$error++;

-				}

-			}

-

-			if (!$error) {

-				if (property_exists($this, $field)) {

-					$this->$field = $value;

-				}

+				if ($result >= 0) $result = $this->call_trigger($trigkey, (!empty($fuser) && is_object($fuser)) ? $fuser : $user); // This may set this->errors

+				if ($result < 0) $error++;

+			}

+

+			if (!$error)

+			{

+				if (property_exists($this, $field)) $this->$field = $value;

@@ -2164 +1802,3 @@
-			} else {

+			}

+			else

+			{

@@ -2168,6 +1808,4 @@
-		} else {

-			if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {

-				$this->error = 'DB_ERROR_RECORD_ALREADY_EXISTS';

-			} else {

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

-			}

+		}

+		else

+		{

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

@@ -2179 +1817 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -2183,2 +1821 @@
-	 *      @param	string	$filter		Optional SQL filter. Example: "(t.field1 = 'aa' OR t.field2 = 'bb')". Do not allow user input data here.

-	 *      							Use SQL and not Universal Search Filter. @TODO Replace this with an USF string after changing all ->next_prev_filter

+	 *      @param	string	$filter		Optional filter. Example: " AND (t.field1 = 'aa' OR t.field2 = 'bb')"

@@ -2187 +1824 @@
-	 *      @return int         		Return integer <0 if KO, >0 if OK

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

@@ -2191 +1828 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -2194 +1831,2 @@
-		if (!$this->table_element) {

+		if (!$this->table_element)

+		{

@@ -2198,8 +1836 @@
-		if ($fieldid == 'none') {

-			return 1;

-		}

-

-		// For backward compatibility

-		if (in_array($this->table_element, array('facture_rec', 'facture_fourn_rec')) && $fieldid == 'title') {

-			$fieldid = 'titre';

-		}

+		if ($fieldid == 'none') return 1;

@@ -2209,3 +1840 @@
-		if ($user->socid > 0) {

-			$socid = $user->socid;

-		}

+		if ($user->socid > 0) $socid = $user->socid;

@@ -2216,4 +1845,2 @@
-		if ($this->element == 'societe') {

-			$aliastablesociete = 'te'; // te as table_element

-		}

-		$restrictiononfksoc = empty($this->restrictiononfksoc) ? 0 : $this->restrictiononfksoc;

+		if ($this->element == 'societe') $aliastablesociete = 'te'; // te as table_element

+

@@ -2221 +1848,4 @@
-		$sql .= " FROM ".(empty($nodbprefix) ? $this->db->prefix() : '').$this->table_element." as te";

+		$sql .= " FROM ".(empty($nodbprefix) ?MAIN_DB_PREFIX:'').$this->table_element." as te";

+		if ($this->element == 'user' && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

+			$sql .= ",".MAIN_DB_PREFIX."usergroup_user as ug";

+		}

@@ -2224,24 +1854,11 @@
-			$sql .= ", ".$this->db->prefix().$tmparray[1]." as ".($tmparray[1] == 'societe' ? 's' : 'parenttable'); // If we need to link to this table to limit select to entity

-		} elseif ($restrictiononfksoc == 1 && $this->element != 'societe' && !$user->hasRight('societe', 'client', 'voir') && !$socid) {

-			$sql .= ", ".$this->db->prefix()."societe as s"; // If we need to link to societe to limit select to socid

-		} elseif ($restrictiononfksoc == 2 && $this->element != 'societe' && !$user->hasRight('societe', 'client', 'voir') && !$socid) {

-			$sql .= " LEFT JOIN ".$this->db->prefix()."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid

-		}

-		if ($restrictiononfksoc && !$user->hasRight('societe', 'client', 'voir') && !$socid) {

-			$sql .= " LEFT JOIN ".$this->db->prefix()."societe_commerciaux as sc ON ".$aliastablesociete.".rowid = sc.fk_soc";

-		}

-		if ($fieldid == 'rowid') {

-			$sql .= " WHERE te.".$fieldid." < ".((int) $this->id);

-		} else {

-			$sql .= " WHERE te.".$fieldid." < '".$this->db->escape($this->ref)."'"; // ->ref must always be defined (set to id if field does not exists)

-		}

-		if ($restrictiononfksoc == 1 && !$user->hasRight('societe', 'client', 'voir') && !$socid) {

-			$sql .= " AND sc.fk_user = ".((int) $user->id);

-		}

-		if ($restrictiononfksoc == 2 && !$user->hasRight('societe', 'client', 'voir') && !$socid) {

-			$sql .= " AND (sc.fk_user = ".((int) $user->id).' OR te.fk_soc IS NULL)';

-		}

-		if (!empty($filter)) {

-			if (!preg_match('/^\s*AND/i', $filter)) {

-				$sql .= " AND ";

-			}

+			$sql .= ", ".MAIN_DB_PREFIX.$tmparray[1]." as ".($tmparray[1] == 'societe' ? 's' : 'parenttable'); // If we need to link to this table to limit select to entity

+		}

+		elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid

+		elseif ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid

+		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid)  $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$aliastablesociete.".rowid = sc.fk_soc";

+		$sql .= " WHERE te.".$fieldid." < '".$this->db->escape($this->ref)."'"; // ->ref must always be defined (set to id if field does not exists)

+		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND sc.fk_user = ".$user->id;

+		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND (sc.fk_user = ".$user->id.' OR te.fk_soc IS NULL)';

+		if (!empty($filter))

+		{

+			if (!preg_match('/^\s*AND/i', $filter)) $sql .= " AND "; // For backward compatibility

@@ -2252,4 +1869,3 @@
-			$sql .= " AND te.".$tmparray[0]." = ".($tmparray[1] == "societe" ? "s" : "parenttable").".rowid"; // If we need to link to this table to limit select to entity

-		} elseif ($restrictiononfksoc == 1 && $this->element != 'societe' && !$user->hasRight('societe', 'client', 'voir') && !$socid) {

-			$sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to socid

-		}

+			$sql .= ' AND te.'.$tmparray[0].' = '.($tmparray[1] == 'societe' ? 's' : 'parenttable').'.rowid'; // If we need to link to this table to limit select to entity

+		}

+		elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to socid

@@ -2257 +1873 @@
-			if ($this->element == 'user' && getDolGlobalInt('MULTICOMPANY_TRANSVERSE_MODE')) {

+			if ($this->element == 'user' && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

@@ -2261 +1877,2 @@
-					$sql .= " AND te.rowid IN (SELECT ug.fk_user FROM ".$this->db->prefix()."usergroup_user as ug WHERE ug.entity IN (".getEntity('usergroup')."))";

+					$sql .= " AND ug.fk_user = te.rowid";

+					$sql .= " AND ug.entity IN (".getEntity($this->element).")";

@@ -2271,10 +1888,4 @@
-		if ($restrictiononfksoc == 1 && $socid && $this->element != 'societe') {

-			$sql .= ' AND te.fk_soc = '.((int) $socid);

-		}

-		if ($restrictiononfksoc == 2 && $socid && $this->element != 'societe') {

-			$sql .= ' AND (te.fk_soc = '.((int) $socid).' OR te.fk_soc IS NULL)';

-		}

-		if ($restrictiononfksoc && $socid && $this->element == 'societe') {

-			$sql .= ' AND te.rowid = '.((int) $socid);

-		}

-		//print 'socid='.$socid.' restrictiononfksoc='.$restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";

+		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql .= ' AND te.fk_soc = '.$socid;

+		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql .= ' AND (te.fk_soc = '.$socid.' OR te.fk_soc IS NULL)';

+		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql .= ' AND te.rowid = '.$socid;

+		//print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";

@@ -2283 +1894,2 @@
-		if (!$result) {

+		if (!$result)

+		{

@@ -2289,0 +1902 @@
+

@@ -2291,27 +1904,14 @@
-		$sql .= " FROM ".(empty($nodbprefix) ? $this->db->prefix() : '').$this->table_element." as te";

-		if (isset($this->ismultientitymanaged) && !is_numeric($this->ismultientitymanaged)) {

-			$tmparray = explode('@', $this->ismultientitymanaged);

-			$sql .= ", ".$this->db->prefix().$tmparray[1]." as ".($tmparray[1] == 'societe' ? 's' : 'parenttable'); // If we need to link to this table to limit select to entity

-		} elseif ($restrictiononfksoc == 1 && $this->element != 'societe' && !$user->hasRight('societe', 'client', 'voir') && !$socid) {

-			$sql .= ", ".$this->db->prefix()."societe as s"; // If we need to link to societe to limit select to socid

-		} elseif ($restrictiononfksoc == 2 && $this->element != 'societe' && !$user->hasRight('societe', 'client', 'voir') && !$socid) {

-			$sql .= " LEFT JOIN ".$this->db->prefix()."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid

-		}

-		if ($restrictiononfksoc && !$user->hasRight('societe', 'client', 'voir') && !$socid) {

-			$sql .= " LEFT JOIN ".$this->db->prefix()."societe_commerciaux as sc ON ".$aliastablesociete.".rowid = sc.fk_soc";

-		}

-		if ($fieldid == 'rowid') {

-			$sql .= " WHERE te.".$fieldid." > ".((int) $this->id);

-		} else {

-			$sql .= " WHERE te.".$fieldid." > '".$this->db->escape($this->ref)."'"; // ->ref must always be defined (set to id if field does not exists)

-		}

-		if ($restrictiononfksoc == 1 && !$user->hasRight('societe', 'client', 'voir') && !$socid) {

-			$sql .= " AND sc.fk_user = ".((int) $user->id);

-		}

-		if ($restrictiononfksoc == 2 && !$user->hasRight('societe', 'client', 'voir') && !$socid) {

-			$sql .= " AND (sc.fk_user = ".((int) $user->id).' OR te.fk_soc IS NULL)';

-		}

-		if (!empty($filter)) {

-			if (!preg_match('/^\s*AND/i', $filter)) {

-				$sql .= " AND "; // For backward compatibility

-			}

+		$sql .= " FROM ".(empty($nodbprefix) ?MAIN_DB_PREFIX:'').$this->table_element." as te";

+		if ($this->element == 'user' && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

+			$sql .= ",".MAIN_DB_PREFIX."usergroup_user as ug";

+		}

+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 'fk_soc@societe') $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to entity

+		elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid

+		elseif ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid

+		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$aliastablesociete.".rowid = sc.fk_soc";

+		$sql .= " WHERE te.".$fieldid." > '".$this->db->escape($this->ref)."'"; // ->ref must always be defined (set to id if field does not exists)

+		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND sc.fk_user = ".$user->id;

+		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND (sc.fk_user = ".$user->id.' OR te.fk_soc IS NULL)';

+		if (!empty($filter))

+		{

+			if (!preg_match('/^\s*AND/i', $filter)) $sql .= " AND "; // For backward compatibility

@@ -2320,6 +1920,2 @@
-		if (isset($this->ismultientitymanaged) && !is_numeric($this->ismultientitymanaged)) {

-			$tmparray = explode('@', $this->ismultientitymanaged);

-			$sql .= " AND te.".$tmparray[0]." = ".($tmparray[1] == "societe" ? "s" : "parenttable").".rowid"; // If we need to link to this table to limit select to entity

-		} elseif ($restrictiononfksoc == 1 && $this->element != 'societe' && !$user->hasRight('societe', 'client', 'voir') && !$socid) {

-			$sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to socid

-		}

+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 'fk_soc@societe') $sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to entity

+		elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to socid

@@ -2327 +1923 @@
-			if ($this->element == 'user' && getDolGlobalInt('MULTICOMPANY_TRANSVERSE_MODE')) {

+			if ($this->element == 'user' && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

@@ -2331 +1927,2 @@
-					$sql .= " AND te.rowid IN (SELECT ug.fk_user FROM ".$this->db->prefix()."usergroup_user as ug WHERE ug.entity IN (".getEntity('usergroup')."))";

+					$sql .= " AND ug.fk_user = te.rowid";

+					$sql .= " AND ug.entity IN (".getEntity($this->element).")";

@@ -2337,14 +1934,4 @@
-		if (isset($this->ismultientitymanaged) && !is_numeric($this->ismultientitymanaged) && $this->element != 'societe') {

-			$tmparray = explode('@', $this->ismultientitymanaged);

-			$sql .= ' AND parenttable.entity IN ('.getEntity($tmparray[1]).')';

-		}

-		if ($restrictiononfksoc == 1 && $socid && $this->element != 'societe') {

-			$sql .= ' AND te.fk_soc = '.((int) $socid);

-		}

-		if ($restrictiononfksoc == 2 && $socid && $this->element != 'societe') {

-			$sql .= ' AND (te.fk_soc = '.((int) $socid).' OR te.fk_soc IS NULL)';

-		}

-		if ($restrictiononfksoc && $socid && $this->element == 'societe') {

-			$sql .= ' AND te.rowid = '.((int) $socid);

-		}

-		//print 'socid='.$socid.' restrictiononfksoc='.$restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";

+		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql .= ' AND te.fk_soc = '.$socid;

+		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql .= ' AND (te.fk_soc = '.$socid.' OR te.fk_soc IS NULL)';

+		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql .= ' AND te.rowid = '.$socid;

+		//print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";

@@ -2354 +1941,2 @@
-		if (!$result) {

+		if (!$result)

+		{

@@ -2378,6 +1966,4 @@
-		while ($i < $num) {

-			if ($source == 'thirdparty') {

-				$contactAlreadySelected[$i] = $tab[$i]['socid'];

-			} else {

-				$contactAlreadySelected[$i] = $tab[$i]['id'];

-			}

+		while ($i < $num)

+		{

+			if ($source == 'thirdparty') $contactAlreadySelected[$i] = $tab[$i]['socid'];

+			else  $contactAlreadySelected[$i] = $tab[$i]['id'];

@@ -2394,9 +1980,6 @@
-	 *  @param		int		$notrigger		Disable the trigger

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

-	 */

-	public function setProject($projectid, $notrigger = 0)

-	{

-		global $user;

-		$error = 0;

-

-		if (!$this->table_element) {

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

+	 */

+	public function setProject($projectid)

+	{

+		if (!$this->table_element)

+		{

@@ -2407,25 +1990,19 @@
-		$sql = "UPDATE ".$this->db->prefix().$this->table_element;

-		if (!empty($this->fields['fk_project'])) {		// Common case

-			if ($projectid) {

-				$sql .= " SET fk_project = ".((int) $projectid);

-			} else {

-				$sql .= " SET fk_project = NULL";

-			}

-			$sql .= ' WHERE rowid = '.((int) $this->id);

-		} elseif ($this->table_element == 'actioncomm') {	// Special case for actioncomm

-			if ($projectid) {

-				$sql .= " SET fk_project = ".((int) $projectid);

-			} else {

-				$sql .= " SET fk_project = NULL";

-			}

-			$sql .= ' WHERE id = '.((int) $this->id);

-		} else { // Special case for old architecture objects

-			if ($projectid) {

-				$sql .= ' SET fk_projet = '.((int) $projectid);

-			} else {

-				$sql .= ' SET fk_projet = NULL';

-			}

-			$sql .= " WHERE rowid = ".((int) $this->id);

-		}

-

-		$this->db->begin();

+		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;

+		if (!empty($this->fields['fk_project']))		// Common case

+		{

+			if ($projectid) $sql .= ' SET fk_project = '.$projectid;

+			else $sql .= ' SET fk_project = NULL';

+			$sql .= ' WHERE rowid = '.$this->id;

+		}

+		elseif ($this->table_element == 'actioncomm')	// Special case for actioncomm

+		{

+			if ($projectid) $sql .= ' SET fk_project = '.$projectid;

+			else $sql .= ' SET fk_project = NULL';

+			$sql .= ' WHERE id = '.$this->id;

+		}

+		else											// Special case for old architecture objects

+		{

+			if ($projectid) $sql .= ' SET fk_projet = '.$projectid;

+			else $sql .= ' SET fk_projet = NULL';

+			$sql .= ' WHERE rowid = '.$this->id;

+		}

@@ -2434,3 +2011,7 @@
-		if ($this->db->query($sql)) {

-			$this->fk_project = ((int) $projectid);

-		} else {

+		if ($this->db->query($sql))

+		{

+			$this->fk_project = $projectid;

+			return 1;

+		}

+		else

+		{

@@ -2438,16 +2018,0 @@
-			$error++;

-		}

-

-		// Triggers

-		if (!$error && !$notrigger) {

-			// Call triggers

-			$result = $this->call_trigger(strtoupper($this->element) . '_MODIFY', $user);

-			if ($result < 0) {

-				$error++;

-			} //Do also here what you must do to rollback action if trigger fail

-			// End call triggers

-		}

-

-		// Commit or rollback

-		if ($error) {

-			$this->db->rollback();

@@ -2455,3 +2019,0 @@
-		} else {

-			$this->db->commit();

-			return 1;

@@ -2469,5 +2030,0 @@
-		global $user;

-

-		$error = 0;

-		$notrigger = 0;

-

@@ -2475,2 +2032,2 @@
-

-		if ($this->statut >= 0 || $this->element == 'societe') {

+		if ($this->statut >= 0 || $this->element == 'societe')

+		{

@@ -2479,18 +2036,9 @@
-			if ($this->element == 'societe') {

-				$fieldname = 'mode_reglement';

-			}

-			if (get_class($this) == 'Fournisseur') {

-				$fieldname = 'mode_reglement_supplier';

-			}

-			if (get_class($this) == 'Tva') {

-				$fieldname = 'fk_typepayment';

-			}

-			if (get_class($this) == 'Salary') {

-				$fieldname = 'fk_typepayment';

-			}

-

-			$sql = "UPDATE ".$this->db->prefix().$this->table_element;

-			$sql .= " SET ".$fieldname." = ".(($id > 0 || $id == '0') ? ((int) $id) : 'NULL');

-			$sql .= ' WHERE rowid='.((int) $this->id);

-

-			if ($this->db->query($sql)) {

+			if ($this->element == 'societe') $fieldname = 'mode_reglement';

+			if (get_class($this) == 'Fournisseur') $fieldname = 'mode_reglement_supplier';

+

+			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;

+			$sql .= ' SET '.$fieldname.' = '.(($id > 0 || $id == '0') ? $id : 'NULL');

+			$sql .= ' WHERE rowid='.$this->id;

+

+			if ($this->db->query($sql))

+			{

@@ -2499,16 +2047 @@
-				if (get_class($this) == 'Fournisseur') {

-					$this->mode_reglement_supplier_id = $id;

-				}

-				// Triggers

-				if (!$error && !$notrigger) {

-					// Call triggers

-					if (get_class($this) == 'Commande') {

-						$result = $this->call_trigger('ORDER_MODIFY', $user);

-					} else {

-						$result = $this->call_trigger(strtoupper(get_class($this)).'_MODIFY', $user);

-					}

-					if ($result < 0) {

-						$error++;

-					}

-					// End call triggers

-				}

+				if (get_class($this) == 'Fournisseur') $this->mode_reglement_supplier_id = $id;

@@ -2516,2 +2049,4 @@
-			} else {

-				dol_syslog(get_class($this).'::setPaymentMethods Error '.$this->db->error());

+			}

+			else

+			{

+				dol_syslog(get_class($this).'::setPaymentMethods Erreur '.$sql.' - '.$this->db->error());

@@ -2521 +2056,3 @@
-		} else {

+		}

+		else

+		{

@@ -2537 +2074,2 @@
-		if ($this->statut >= 0 || $this->element == 'societe') {

+		if ($this->statut >= 0 || $this->element == 'societe')

+		{

@@ -2540,5 +2078,6 @@
-			$sql = 'UPDATE '.$this->db->prefix().$this->table_element;

-			$sql .= " SET ".$fieldname." = '".$this->db->escape($code)."'";

-			$sql .= ' WHERE rowid='.((int) $this->id);

-

-			if ($this->db->query($sql)) {

+			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;

+			$sql .= ' SET '.$fieldname." = '".$this->db->escape($code)."'";

+			$sql .= ' WHERE rowid='.$this->id;

+

+			if ($this->db->query($sql))

+			{

@@ -2548,3 +2087 @@
-				if ($rate) {

-					$this->setMulticurrencyRate($rate, 2);

-				}

+				if ($rate) $this->setMulticurrencyRate($rate, 2);

@@ -2553,2 +2090,4 @@
-			} else {

-				dol_syslog(get_class($this).'::setMulticurrencyCode Error '.$sql.' - '.$this->db->error());

+			}

+			else

+			{

+				dol_syslog(get_class($this).'::setMulticurrencyCode Erreur '.$sql.' - '.$this->db->error());

@@ -2558 +2097,3 @@
-		} else {

+		}

+		else

+		{

@@ -2575 +2116,2 @@
-		if ($this->statut >= 0 || $this->element == 'societe') {

+		if ($this->statut >= 0 || $this->element == 'societe')

+		{

@@ -2578,5 +2120,6 @@
-			$sql = 'UPDATE '.$this->db->prefix().$this->table_element;

-			$sql .= " SET ".$fieldname." = ".((float) $rate);

-			$sql .= ' WHERE rowid='.((int) $this->id);

-

-			if ($this->db->query($sql)) {

+			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;

+			$sql .= ' SET '.$fieldname.' = '.$rate;

+			$sql .= ' WHERE rowid='.$this->id;

+

+			if ($this->db->query($sql))

+			{

@@ -2586,2 +2129,4 @@
-				if (!empty($this->lines)) {

-					foreach ($this->lines as &$line) {

+				if (!empty($this->lines))

+				{

+					foreach ($this->lines as &$line)

+					{

@@ -2600,2 +2144,0 @@
-								/** @var Propal $this */

-								/** @var PropaleLigne $line */

@@ -2603,22 +2146,4 @@
-									$line->id,

-									$line->subprice,

-									$line->qty,

-									$line->remise_percent,

-									$line->tva_tx,

-									$line->localtax1_tx,

-									$line->localtax2_tx,

-									($line->description ? $line->description : $line->desc),

-									'HT',

-									$line->info_bits,

-									$line->special_code,

-									$line->fk_parent_line,

-									$line->skip_update_total,

-									$line->fk_fournprice,

-									$line->pa_ht,

-									$line->label,

-									$line->product_type,

-									$line->date_start,

-									$line->date_end,

-									$line->array_options,

-									$line->fk_unit,

-									$line->multicurrency_subprice

+									$line->id, $line->subprice, $line->qty, $line->remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx,

+									($line->description ? $line->description : $line->desc), 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line,

+									$line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label, $line->product_type, $line->date_start,

+									$line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice

@@ -2628,2 +2152,0 @@
-								/** @var Commande $this */

-								/** @var OrderLine $line */

@@ -2631,22 +2154,4 @@
-									$line->id,

-									($line->description ? $line->description : $line->desc),

-									$line->subprice,

-									$line->qty,

-									$line->remise_percent,

-									$line->tva_tx,

-									$line->localtax1_tx,

-									$line->localtax2_tx,

-									'HT',

-									$line->info_bits,

-									$line->date_start,

-									$line->date_end,

-									$line->product_type,

-									$line->fk_parent_line,

-									$line->skip_update_total,

-									$line->fk_fournprice,

-									$line->pa_ht,

-									$line->label,

-									$line->special_code,

-									$line->array_options,

-									$line->fk_unit,

-									$line->multicurrency_subprice

+									$line->id, ($line->description ? $line->description : $line->desc), $line->subprice, $line->qty, $line->remise_percent,

+									$line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->date_start, $line->date_end,

+									$line->product_type, $line->fk_parent_line, $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label,

+									$line->special_code, $line->array_options, $line->fk_unit, $line->multicurrency_subprice

@@ -2656,2 +2160,0 @@
-								/** @var Facture $this */

-								/** @var FactureLigne $line */

@@ -2659,23 +2162,4 @@
-									$line->id,

-									($line->description ? $line->description : $line->desc),

-									$line->subprice,

-									$line->qty,

-									$line->remise_percent,

-									$line->date_start,

-									$line->date_end,

-									$line->tva_tx,

-									$line->localtax1_tx,

-									$line->localtax2_tx,

-									'HT',

-									$line->info_bits,

-									$line->product_type,

-									$line->fk_parent_line,

-									$line->skip_update_total,

-									$line->fk_fournprice,

-									$line->pa_ht,

-									$line->label,

-									$line->special_code,

-									$line->array_options,

-									$line->situation_percent,

-									$line->fk_unit,

-									$line->multicurrency_subprice

+									$line->id, ($line->description ? $line->description : $line->desc), $line->subprice, $line->qty, $line->remise_percent,

+									$line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits,

+									$line->product_type, $line->fk_parent_line, $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label,

+									$line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit, $line->multicurrency_subprice

@@ -2685,2 +2168,0 @@
-								/** @var SupplierProposal $this */

-								/** @var SupplierProposalLine $line */

@@ -2688,20 +2170,4 @@
-									$line->id,

-									$line->subprice,

-									$line->qty,

-									$line->remise_percent,

-									$line->tva_tx,

-									$line->localtax1_tx,

-									$line->localtax2_tx,

-									($line->description ? $line->description : $line->desc),

-									'HT',

-									$line->info_bits,

-									$line->special_code,

-									$line->fk_parent_line,

-									$line->skip_update_total,

-									$line->fk_fournprice,

-									$line->pa_ht,

-									$line->label,

-									$line->product_type,

-									$line->array_options,

-									$line->ref_fourn,

-									$line->multicurrency_subprice

+									$line->id, $line->subprice, $line->qty, $line->remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx,

+									($line->description ? $line->description : $line->desc), 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line,

+									$line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label, $line->product_type, $line->array_options,

+									$line->ref_fourn, $line->multicurrency_subprice

@@ -2711,2 +2176,0 @@
-								/** @var CommandeFournisseur $this */

-								/** @var CommandeFournisseurLigne $line */

@@ -2714,18 +2178,3 @@
-									$line->id,

-									($line->description ? $line->description : $line->desc),

-									$line->subprice,

-									$line->qty,

-									$line->remise_percent,

-									$line->tva_tx,

-									$line->localtax1_tx,

-									$line->localtax2_tx,

-									'HT',

-									$line->info_bits,

-									$line->product_type,

-									false,

-									$line->date_start,

-									$line->date_end,

-									$line->array_options,

-									$line->fk_unit,

-									$line->multicurrency_subprice,

-									$line->ref_supplier

+									$line->id, ($line->description ? $line->description : $line->desc), $line->subprice, $line->qty, $line->remise_percent,

+									$line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, false,

+									$line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice

@@ -2735,2 +2183,0 @@
-								/** @var FactureFournisseur $this */

-								/** @var SupplierInvoiceLine $line */

@@ -2738,19 +2185,3 @@
-									$line->id,

-									($line->description ? $line->description : $line->desc),

-									$line->subprice,

-									$line->tva_tx,

-									$line->localtax1_tx,

-									$line->localtax2_tx,

-									$line->qty,

-									0,

-									'HT',

-									$line->info_bits,

-									$line->product_type,

-									$line->remise_percent,

-									false,

-									$line->date_start,

-									$line->date_end,

-									$line->array_options,

-									$line->fk_unit,

-									$line->multicurrency_subprice,

-									$line->ref_supplier

+									$line->id, ($line->description ? $line->description : $line->desc), $line->subprice, $line->tva_tx, $line->localtax1_tx,

+									$line->localtax2_tx, $line->qty, 0, 'HT', $line->info_bits, $line->product_type, $line->remise_percent, false,

+									$line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice

@@ -2767,2 +2198,4 @@
-			} else {

-				dol_syslog(get_class($this).'::setMulticurrencyRate Error '.$sql.' - '.$this->db->error());

+			}

+			else

+			{

+				dol_syslog(get_class($this).'::setMulticurrencyRate Erreur '.$sql.' - '.$this->db->error());

@@ -2772 +2205,3 @@
-		} else {

+		}

+		else

+		{

@@ -2782,8 +2217,8 @@
-	 *  @param		int		$id					Id of new payment terms

-	 *  @param		string	$deposit_percent	% of deposit if needed by payment terms

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

-	 */

-	public function setPaymentTerms($id, $deposit_percent = null)

-	{

-		dol_syslog(get_class($this).'::setPaymentTerms('.$id.', '.var_export($deposit_percent, true).')');

-		if ($this->statut >= 0 || $this->element == 'societe') {

+	 *  @param		int		$id		Id of new payment terms

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

+	 */

+	public function setPaymentTerms($id)

+	{

+		dol_syslog(get_class($this).'::setPaymentTerms('.$id.')');

+		if ($this->statut >= 0 || $this->element == 'societe')

+		{

@@ -2792,23 +2227,9 @@
-			if ($this->element == 'societe') {

-				$fieldname = 'cond_reglement';

-			}

-			if (get_class($this) == 'Fournisseur') {

-				$fieldname = 'cond_reglement_supplier';

-			}

-

-			if (empty($deposit_percent) || $deposit_percent < 0) {

-				$deposit_percent = getDictionaryValue('c_payment_term', 'deposit_percent', $id);

-			}

-

-			if ($deposit_percent > 100) {

-				$deposit_percent = 100;

-			}

-

-			$sql = 'UPDATE '.$this->db->prefix().$this->table_element;

-			$sql .= " SET ".$fieldname." = ".(($id > 0 || $id == '0') ? ((int) $id) : 'NULL');

-			if (in_array($this->table_element, array('propal', 'commande', 'societe'))) {

-				$sql .= " , deposit_percent = " . (empty($deposit_percent) ? 'NULL' : "'".$this->db->escape($deposit_percent)."'");

-			}

-			$sql .= ' WHERE rowid='.((int) $this->id);

-

-			if ($this->db->query($sql)) {

+			if ($this->element == 'societe') $fieldname = 'cond_reglement';

+			if (get_class($this) == 'Fournisseur') $fieldname = 'cond_reglement_supplier';

+

+			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;

+			$sql .= ' SET '.$fieldname.' = '.(($id > 0 || $id == '0') ? $id : 'NULL');

+			$sql .= ' WHERE rowid='.$this->id;

+

+			if ($this->db->query($sql))

+			{

@@ -2817,3 +2238 @@
-				if (get_class($this) == 'Fournisseur') {

-					$this->cond_reglement_supplier_id = $id;

-				}

+				if (get_class($this) == 'Fournisseur') $this->cond_reglement_supplier_id = $id;

@@ -2821 +2239,0 @@
-				$this->deposit_percent = $deposit_percent;

@@ -2823,2 +2241,4 @@
-			} else {

-				dol_syslog(get_class($this).'::setPaymentTerms Error '.$sql.' - '.$this->db->error());

+			}

+			else

+			{

+				dol_syslog(get_class($this).'::setPaymentTerms Erreur '.$sql.' - '.$this->db->error());

@@ -2828 +2248,3 @@
-		} else {

+		}

+		else

+		{

@@ -2835,40 +2256,0 @@
-	/**

-	 *  Change the transport mode methods

-	 *

-	 *  @param		int		$id		Id of transport mode

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

-	 */

-	public function setTransportMode($id)

-	{

-		dol_syslog(get_class($this).'::setTransportMode('.$id.')');

-		if ($this->statut >= 0 || $this->element == 'societe') {

-			$fieldname = 'fk_transport_mode';

-			if ($this->element == 'societe') {

-				$fieldname = 'transport_mode';

-			}

-			if (get_class($this) == 'Fournisseur') {

-				$fieldname = 'transport_mode_supplier';

-			}

-

-			$sql = 'UPDATE '.$this->db->prefix().$this->table_element;

-			$sql .= " SET ".$fieldname." = ".(($id > 0 || $id == '0') ? ((int) $id) : 'NULL');

-			$sql .= ' WHERE rowid='.((int) $this->id);

-

-			if ($this->db->query($sql)) {

-				$this->transport_mode_id = $id;

-				// for supplier

-				if (get_class($this) == 'Fournisseur') {

-					$this->transport_mode_supplier_id = $id;

-				}

-				return 1;

-			} else {

-				dol_syslog(get_class($this).'::setTransportMode Error '.$sql.' - '.$this->db->error());

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

-				return -1;

-			}

-		} else {

-			dol_syslog(get_class($this).'::setTransportMode, status of the object is incompatible');

-			$this->error = 'Status of the object is incompatible '.$this->statut;

-			return -2;

-		}

-	}

@@ -2884,21 +2266,27 @@
-		dol_syslog(get_class($this).'::setRetainedWarrantyPaymentTerms('.$id.')');

-		if ($this->statut >= 0 || $this->element == 'societe') {

-			$fieldname = 'retained_warranty_fk_cond_reglement';

-

-			$sql = 'UPDATE '.$this->db->prefix().$this->table_element;

-			$sql .= " SET ".$fieldname." = ".((int) $id);

-			$sql .= ' WHERE rowid='.((int) $this->id);

-

-			if ($this->db->query($sql)) {

-				$this->retained_warranty_fk_cond_reglement = $id;

-				return 1;

-			} else {

-				dol_syslog(get_class($this).'::setRetainedWarrantyPaymentTerms Error '.$sql.' - '.$this->db->error());

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

-				return -1;

-			}

-		} else {

-			dol_syslog(get_class($this).'::setRetainedWarrantyPaymentTerms, status of the object is incompatible');

-			$this->error = 'Status of the object is incompatible '.$this->statut;

-			return -2;

-		}

+	    dol_syslog(get_class($this).'::setRetainedWarrantyPaymentTerms('.$id.')');

+	    if ($this->statut >= 0 || $this->element == 'societe')

+	    {

+	        $fieldname = 'retained_warranty_fk_cond_reglement';

+

+	        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;

+	        $sql .= ' SET '.$fieldname.' = '.$id;

+	        $sql .= ' WHERE rowid='.$this->id;

+

+	        if ($this->db->query($sql))

+	        {

+	            $this->retained_warranty_fk_cond_reglement = $id;

+	            return 1;

+	        }

+	        else

+	        {

+	            dol_syslog(get_class($this).'::setRetainedWarrantyPaymentTerms Erreur '.$sql.' - '.$this->db->error());

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

+	            return -1;

+	        }

+	    }

+	    else

+	    {

+	        dol_syslog(get_class($this).'::setRetainedWarrantyPaymentTerms, status of the object is incompatible');

+	        $this->error = 'Status of the object is incompatible '.$this->statut;

+	        return -2;

+	    }

@@ -2912 +2300 @@
-	 *	@return     int				Return integer <0 si ko, >0 si ok

+	 *	@return     int				<0 si ko, >0 si ok

@@ -2917,8 +2305,7 @@
-		if ($this->element == 'delivery' || $this->element == 'shipping') {

-			$fieldname = 'fk_address';

-		}

-

-		$sql = "UPDATE ".$this->db->prefix().$this->table_element." SET ".$fieldname." = ".((int) $id);

-		$sql .= " WHERE rowid = ".((int) $this->id)." AND fk_statut = 0";

-

-		if ($this->db->query($sql)) {

+		if ($this->element == 'delivery' || $this->element == 'shipping') $fieldname = 'fk_address';

+

+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET ".$fieldname." = ".$id;

+		$sql .= " WHERE rowid = ".$this->id." AND fk_statut = 0";

+

+		if ($this->db->query($sql))

+		{

@@ -2927 +2314,3 @@
-		} else {

+		}

+		else

+		{

@@ -2929 +2318 @@
-			dol_syslog(get_class($this).'::setDeliveryAddress Error '.$this->error);

+			dol_syslog(get_class($this).'::setDeliveryAddress Erreur '.$sql.' - '.$this->error);

@@ -2948,3 +2337 @@
-		if (empty($userused)) {

-			$userused = $user;

-		}

+		if (empty($userused)) $userused = $user;

@@ -2961,3 +2348 @@
-		if ($shipping_method_id < 0) {

-			$shipping_method_id = 'NULL';

-		}

+		if ($shipping_method_id < 0) $shipping_method_id = 'NULL';

@@ -2966,3 +2351,3 @@
-		$sql = "UPDATE ".$this->db->prefix().$this->table_element;

-		$sql .= " SET fk_shipping_method = ".((int) $shipping_method_id);

-		$sql .= " WHERE rowid=".((int) $this->id);

+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;

+		$sql .= " SET fk_shipping_method = ".$shipping_method_id;

+		$sql .= " WHERE rowid=".$this->id;

@@ -2975 +2360,2 @@
-			if (!$notrigger) {

+			if (!$notrigger)

+			{

@@ -2979,3 +2365 @@
-				if ($result < 0) {

-					$error++;

-				}

+				if ($result < 0) $error++;

@@ -2985 +2369,2 @@
-		if ($error) {

+		if ($error)

+		{

@@ -2989 +2374 @@
-			$this->shipping_method_id = ($shipping_method_id == 'NULL') ? null : $shipping_method_id;

+			$this->shipping_method_id = ($shipping_method_id == 'NULL') ?null:$shipping_method_id;

@@ -3008,3 +2393 @@
-		if ($warehouse_id < 0) {

-			$warehouse_id = 'NULL';

-		}

+		if ($warehouse_id < 0) $warehouse_id = 'NULL';

@@ -3013,3 +2396,3 @@
-		$sql = "UPDATE ".$this->db->prefix().$this->table_element;

-		$sql .= " SET fk_warehouse = ".((int) $warehouse_id);

-		$sql .= " WHERE rowid=".((int) $this->id);

+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;

+		$sql .= " SET fk_warehouse = ".$warehouse_id;

+		$sql .= " WHERE rowid=".$this->id;

@@ -3018 +2401 @@
-			$this->warehouse_id = ($warehouse_id == 'NULL') ? null : $warehouse_id;

+			$this->warehouse_id = ($warehouse_id == 'NULL') ?null:$warehouse_id;

@@ -3033 +2416 @@
-	 *		@return		int					Return integer <0 if KO, >0 if OK

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

@@ -3037 +2420,2 @@
-		if (!$this->table_element) {

+		if (!$this->table_element)

+		{

@@ -3044 +2428 @@
-		$sql = "UPDATE ".$this->db->prefix().$this->table_element;

+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;

@@ -3046 +2430,3 @@
-		$sql .= " WHERE rowid = ".((int) $this->id);

+		$sql .= " WHERE rowid = ".$this->id;

+		// if ($this->element == 'facture') $sql.= " AND fk_statut < 2";

+		// if ($this->element == 'propal')  $sql.= " AND fk_statut = 0";

@@ -3050,2 +2436,3 @@
-		if ($resql) {

-			$this->model_pdf = $modelpdf;

+		if ($resql)

+		{

+			$this->modelpdf = $modelpdf;

@@ -3053 +2440,3 @@
-		} else {

+		}

+		else

+		{

@@ -3072,3 +2461 @@
-		if (empty($userused)) {

-			$userused = $user;

-		}

+		if (empty($userused)) $userused = $user;

@@ -3084,3 +2471 @@
-		if ($fk_account < 0) {

-			$fk_account = 'NULL';

-		}

+		if ($fk_account < 0) $fk_account = 'NULL';

@@ -3089,3 +2474,3 @@
-		$sql = "UPDATE ".$this->db->prefix().$this->table_element;

-		$sql .= " SET fk_account = ".((int) $fk_account);

-		$sql .= " WHERE rowid=".((int) $this->id);

+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;

+		$sql .= " SET fk_account = ".$fk_account;

+		$sql .= " WHERE rowid=".$this->id;

@@ -3094 +2479,2 @@
-		if (!$resql) {

+		if (!$resql)

+		{

@@ -3098,2 +2484,5 @@
-		} else {

-			if (!$notrigger) {

+		}

+		else

+		{

+			if (!$notrigger)

+			{

@@ -3101,10 +2490,3 @@
-				$this->context['bankaccountupdate'] = 1;

-				$triggerName = strtoupper(get_class($this)).'_MODIFY';

-				// Special cases

-				if ($triggerName == 'FACTUREREC_MODIFY') {

-					$triggerName = 'BILLREC_MODIFY';

-				}

-				$result = $this->call_trigger($triggerName, $userused);

-				if ($result < 0) {

-					$error++;

-				}

+				$this->context = array('bankaccountupdate'=>1);

+				$result = $this->call_trigger(strtoupper(get_class($this)).'_MODIFY', $userused);

+				if ($result < 0) $error++;

@@ -3114 +2496,2 @@
-		if ($error) {

+		if ($error)

+		{

@@ -3117,2 +2500,4 @@
-		} else {

-			$this->fk_account = ($fk_account == 'NULL') ? null : $fk_account;

+		}

+		else

+		{

+			$this->fk_account = ($fk_account == 'NULL') ?null:$fk_account;

@@ -3127 +2512 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -3135 +2520 @@
-	 * 	@return		int                            Return integer <0 if KO, >0 if OK

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

@@ -3139,2 +2524,3 @@
-		// phpcs:enable

-		if (!$this->table_element_line) {

+        // phpcs:enable

+		if (!$this->table_element_line)

+		{

@@ -3144 +2530,2 @@
-		if (!$this->fk_element) {

+		if (!$this->fk_element)

+		{

@@ -3149,5 +2535,0 @@
-		$fieldposition = 'rang'; // @todo Rename 'rang' into 'position'

-		if (in_array($this->table_element_line, array('bom_bomline', 'ecm_files', 'emailcollector_emailcollectoraction', 'product_attribute_value'))) {

-			$fieldposition = 'position';

-		}

-

@@ -3156,8 +2538,4 @@
-		$sql = "SELECT count(rowid) FROM ".$this->db->prefix().$this->table_element_line;

-		$sql .= " WHERE ".$this->fk_element." = ".((int) $this->id);

-		if (!$renum) {

-			$sql .= " AND " . $fieldposition . " = 0";

-		}

-		if ($renum) {

-			$sql .= " AND " . $fieldposition . " <> 0";

-		}

+		$sql = 'SELECT count(rowid) FROM '.MAIN_DB_PREFIX.$this->table_element_line;

+		$sql .= ' WHERE '.$this->fk_element.'='.$this->id;

+		if (!$renum) $sql .= ' AND rang = 0';

+		if ($renum) $sql .= ' AND rang <> 0';

@@ -3167 +2545,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -3170,5 +2549,6 @@
-		} else {

-			dol_print_error($this->db);

-		}

-		if ($nl > 0) {

-			// The goal of this part is to reorder all lines, with all children lines sharing the same counter that parents.

+		}

+		else dol_print_error($this->db);

+		if ($nl > 0)

+		{

+			// The goal of this part is to reorder all lines, with all children lines sharing the same

+			// counter that parents.

@@ -3178,6 +2558,4 @@
-			$sql = "SELECT rowid FROM ".$this->db->prefix().$this->table_element_line;

-			$sql .= " WHERE ".$this->fk_element." = ".((int) $this->id);

-			if ($fk_parent_line) {

-				$sql .= ' AND fk_parent_line IS NULL';

-			}

-			$sql .= " ORDER BY " . $fieldposition . " ASC, rowid " . $rowidorder;

+			$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;

+			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;

+			if ($fk_parent_line) $sql .= ' AND fk_parent_line IS NULL';

+			$sql .= ' ORDER BY rang ASC, rowid '.$rowidorder;

@@ -3187 +2565,2 @@
-			if ($resql) {

+			if ($resql)

+			{

@@ -3190 +2569,2 @@
-				while ($i < $num) {

+				while ($i < $num)

+				{

@@ -3194,2 +2574,4 @@
-					if (!empty($childrens)) {

-						foreach ($childrens as $child) {

+					if (!empty($childrens))

+					{

+						foreach ($childrens as $child)

+						{

@@ -3203,2 +2585,4 @@
-				if (!empty($rows)) {

-					foreach ($rows as $key => $row) {

+				if (!empty($rows))

+				{

+					foreach ($rows as $key => $row)

+					{

@@ -3208 +2592,3 @@
-			} else {

+			}

+			else

+			{

@@ -3218,11 +2604,5 @@
-	 * 	@param	int		$id		            Id of parent line

-	 * 	@param	int		$includealltree		0 = 1st level child, 1 = All level child

-	 * 	@return	array			            Array with list of children lines id

-	 */

-	public function getChildrenOfLine($id, $includealltree = 0)

-	{

-		$fieldposition = 'rang'; // @todo Rename 'rang' into 'position'

-		if (in_array($this->table_element_line, array('bom_bomline', 'ecm_files', 'emailcollector_emailcollectoraction', 'product_attribute_value'))) {

-			$fieldposition = 'position';

-		}

-

+	 * 	@param	int		$id		Id of parent line

+	 * 	@return	array			Array with list of children lines id

+	 */

+	public function getChildrenOfLine($id)

+	{

@@ -3231,6 +2611,6 @@
-		$sql = "SELECT rowid FROM ".$this->db->prefix().$this->table_element_line;

-		$sql .= " WHERE ".$this->fk_element." = ".((int) $this->id);

-		$sql .= ' AND fk_parent_line = '.((int) $id);

-		$sql .= " ORDER BY " . $fieldposition . " ASC";

-

-		dol_syslog(get_class($this)."::getChildrenOfLine search children lines for line ".$id, LOG_DEBUG);

+		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;

+		$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;

+		$sql .= ' AND fk_parent_line = '.$id;

+		$sql .= ' ORDER BY rang ASC';

+

+		dol_syslog(get_class($this)."::getChildrenOfLine search children lines for line ".$id."", LOG_DEBUG);

@@ -3238,10 +2618,12 @@
-		if ($resql) {

-			if ($this->db->num_rows($resql) > 0) {

-				while ($row = $this->db->fetch_row($resql)) {

-					$rows[] = $row[0];

-					if (!empty($includealltree)) {

-						$rows = array_merge($rows, $this->getChildrenOfLine($row[0], $includealltree));

-					}

-				}

-			}

-		}

+		if ($resql)

+		{

+			$i = 0;

+			$num = $this->db->num_rows($resql);

+			while ($i < $num)

+			{

+				$row = $this->db->fetch_row($resql);

+				$rows[$i] = $row[0];

+				$i++;

+			}

+		}

+

@@ -3251 +2633 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -3261 +2643 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -3271 +2653 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -3281 +2663 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -3296,46 +2677,0 @@
-	 *

-	 * 	@param	int		$rowid		Id of line

-	 * 	@param	int		$rang		Position

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

-	 */

-	public function updateRangOfLine($rowid, $rang)

-	{

-		global $hookmanager;

-		$fieldposition = 'rang'; // @todo Rename 'rang' into 'position'

-		if (in_array($this->table_element_line, array('bom_bomline', 'ecm_files', 'emailcollector_emailcollectoraction', 'product_attribute_value'))) {

-			$fieldposition = 'position';

-		}

-

-		$sql = "UPDATE ".$this->db->prefix().$this->table_element_line." SET ".$fieldposition." = ".((int) $rang);

-		$sql .= ' WHERE rowid = '.((int) $rowid);

-

-		dol_syslog(get_class($this)."::updateRangOfLine", LOG_DEBUG);

-		if (!$this->db->query($sql)) {

-			dol_print_error($this->db);

-			return -1;

-		} else {

-			$parameters=array('rowid'=>$rowid, 'rang'=>$rang, 'fieldposition' => $fieldposition);

-			$action='';

-			$reshook = $hookmanager->executeHooks('afterRankOfLineUpdate', $parameters, $this, $action);

-			return 1;

-		}

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 * 	Update position of line with ajax (rang)

-	 *

-	 * 	@param	array	$rows	Array of rows

-	 * 	@return	void

-	 */

-	public function line_ajaxorder($rows)

-	{

-		// phpcs:enable

-		$num = count($rows);

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

-			$this->updateRangOfLine($rows[$i], ($i + 1));

-		}

-	}

-

-	/**

-	 * 	Update position of line up (rang)

@@ -3346,0 +2683,39 @@
+	public function updateRangOfLine($rowid, $rang)

+	{

+		$fieldposition = 'rang'; // @todo Rename 'rang' into 'position'

+		if (in_array($this->table_element_line, array('bom_bomline', 'ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';

+

+		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;

+		$sql .= ' WHERE rowid = '.$rowid;

+

+		dol_syslog(get_class($this)."::updateRangOfLine", LOG_DEBUG);

+		if (!$this->db->query($sql))

+		{

+			dol_print_error($this->db);

+		}

+	}

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+	/**

+	 * 	Update position of line with ajax (rang)

+	 *

+	 * 	@param	array	$rows	Array of rows

+	 * 	@return	void

+	 */

+	public function line_ajaxorder($rows)

+	{

+        // phpcs:enable

+		$num = count($rows);

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

+		{

+			$this->updateRangOfLine($rows[$i], ($i + 1));

+		}

+	}

+

+	/**

+	 * 	Update position of line up (rang)

+	 *

+	 * 	@param	int		$rowid		Id of line

+	 * 	@param	int		$rang		Position

+	 * 	@return	void

+	 */

@@ -3349 +2724,2 @@
-		if ($rang > 1) {

+		if ($rang > 1)

+		{

@@ -3351,11 +2727,11 @@
-			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction', 'product_attribute_value'))) {

-				$fieldposition = 'position';

-			}

-

-			$sql = "UPDATE ".$this->db->prefix().$this->table_element_line." SET ".$fieldposition." = ".((int) $rang);

-			$sql .= " WHERE ".$this->fk_element." = ".((int) $this->id);

-			$sql .= " AND " . $fieldposition . " = " . ((int) ($rang - 1));

-			if ($this->db->query($sql)) {

-				$sql = "UPDATE ".$this->db->prefix().$this->table_element_line." SET ".$fieldposition." = ".((int) ($rang - 1));

-				$sql .= ' WHERE rowid = '.((int) $rowid);

-				if (!$this->db->query($sql)) {

+			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';

+

+			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;

+			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;

+			$sql .= ' AND rang = '.($rang - 1);

+			if ($this->db->query($sql))

+			{

+				$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.($rang - 1);

+				$sql .= ' WHERE rowid = '.$rowid;

+				if (!$this->db->query($sql))

+				{

@@ -3364 +2740,3 @@
-			} else {

+			}

+			else

+			{

@@ -3380 +2758,2 @@
-		if ($rang < $max) {

+		if ($rang < $max)

+		{

@@ -3382,11 +2761,11 @@
-			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction', 'product_attribute_value'))) {

-				$fieldposition = 'position';

-			}

-

-			$sql = "UPDATE ".$this->db->prefix().$this->table_element_line." SET ".$fieldposition." = ".((int) $rang);

-			$sql .= " WHERE ".$this->fk_element." = ".((int) $this->id);

-			$sql .= " AND " . $fieldposition . " = " . ((int) ($rang + 1));

-			if ($this->db->query($sql)) {

-				$sql = "UPDATE ".$this->db->prefix().$this->table_element_line." SET ".$fieldposition." = ".((int) ($rang + 1));

-				$sql .= ' WHERE rowid = '.((int) $rowid);

-				if (!$this->db->query($sql)) {

+			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';

+

+			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;

+			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;

+			$sql .= ' AND rang = '.($rang + 1);

+			if ($this->db->query($sql))

+			{

+				$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.($rang + 1);

+				$sql .= ' WHERE rowid = '.$rowid;

+				if (!$this->db->query($sql))

+				{

@@ -3395 +2774,3 @@
-			} else {

+			}

+			else

+			{

@@ -3409,7 +2790,2 @@
-		$fieldposition = 'rang';

-		if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction', 'product_attribute_value'))) {

-			$fieldposition = 'position';

-		}

-

-		$sql = "SELECT " . $fieldposition . " FROM ".$this->db->prefix().$this->table_element_line;

-		$sql .= " WHERE rowid = ".((int) $rowid);

+		$sql = 'SELECT rang FROM '.MAIN_DB_PREFIX.$this->table_element_line;

+		$sql .= ' WHERE rowid ='.$rowid;

@@ -3419 +2795,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -3423,2 +2799,0 @@
-

-		return 0;

@@ -3435,8 +2810,3 @@
-		$fieldposition = 'rang';

-		if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction', 'product_attribute_value'))) {

-			$fieldposition = 'position';

-		}

-

-		$sql = "SELECT rowid FROM ".$this->db->prefix().$this->table_element_line;

-		$sql .= " WHERE ".$this->fk_element." = ".((int) $this->id);

-		$sql .= " AND " . $fieldposition . " = ".((int) $rang);

+		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;

+		$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;

+		$sql .= ' AND rang = '.$rang;

@@ -3444 +2814,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -3448,5 +2819,3 @@
-

-		return 0;

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+	}

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -3461,5 +2830,3 @@
-		// phpcs:enable

-		$positionfield = 'rang';

-		if (in_array($this->table_element, array('bom_bom', 'product_attribute'))) {

-			$positionfield = 'position';

-		}

+        // phpcs:enable

+        $positionfield = 'rang';

+		if ($this->table_element == 'bom') $positionfield = 'position';

@@ -3468,4 +2835,5 @@
-		if ($fk_parent_line) {

-			$sql = "SELECT max(".$positionfield.") FROM ".$this->db->prefix().$this->table_element_line;

-			$sql .= " WHERE ".$this->fk_element." = ".((int) $this->id);

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

+		if ($fk_parent_line)

+		{

+			$sql = 'SELECT max('.$positionfield.') FROM '.MAIN_DB_PREFIX.$this->table_element_line;

+			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;

+			$sql .= ' AND fk_parent_line = '.$fk_parent_line;

@@ -3475 +2843,2 @@
-			if ($resql) {

+			if ($resql)

+			{

@@ -3477 +2846,2 @@
-				if (!empty($row[0])) {

+				if (!empty($row[0]))

+				{

@@ -3479 +2849,3 @@
-				} else {

+				}

+				else

+				{

@@ -3483,4 +2855,6 @@
-		} else {

-			// If not, search the last rang of element

-			$sql = "SELECT max(".$positionfield.") FROM ".$this->db->prefix().$this->table_element_line;

-			$sql .= " WHERE ".$this->fk_element." = ".((int) $this->id);

+		}

+		// If not, search the last rang of element

+		else

+		{

+			$sql = 'SELECT max('.$positionfield.') FROM '.MAIN_DB_PREFIX.$this->table_element_line;

+			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;

@@ -3490 +2864,2 @@
-			if ($resql) {

+			if ($resql)

+			{

@@ -3495,5 +2870,3 @@
-

-		return 0;

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+	}

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -3504 +2877 @@
-	 *  @return     int      		   		Return integer <0 if KO, >0 if OK

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

@@ -3508,2 +2881,3 @@
-		// phpcs:enable

-		if (!$this->table_element) {

+        // phpcs:enable

+		if (!$this->table_element)

+		{

@@ -3514 +2888 @@
-		$sql = "UPDATE ".$this->db->prefix().$this->table_element;

+		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;

@@ -3516 +2890 @@
-		$sql .= " WHERE ".(isset($this->table_rowid) ? $this->table_rowid : 'rowid')." = ".((int) $this->id);

+		$sql .= " WHERE ".(isset($this->table_rowid) ? $this->table_rowid : 'rowid')." = ".$this->id;

@@ -3519 +2893,2 @@
-		if ($this->db->query($sql)) {

+		if ($this->db->query($sql))

+		{

@@ -3522 +2897,3 @@
-		} else {

+		}

+		else

+		{

@@ -3528 +2905 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -3534,6 +2911,5 @@
-	 *  @param      int         $notrigger  1=Does not execute triggers, 0=execute triggers

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

-	 */

-	public function update_note($note, $suffix = '', $notrigger = 0)

-	{

-		// phpcs:enable

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

+	 */

+	public function update_note($note, $suffix = '')

+	{

+        // phpcs:enable

@@ -3542 +2918,2 @@
-		if (!$this->table_element) {

+		if (!$this->table_element)

+		{

@@ -3547 +2924,2 @@
-		if (!in_array($suffix, array('', '_public', '_private'))) {

+		if (!in_array($suffix, array('', '_public', '_private')))

+		{

@@ -3552,3 +2929,0 @@
-

-		$newsuffix = $suffix;

-

@@ -3556,14 +2931,7 @@
-		if ($this->table_element == 'product' && $newsuffix == '_private') {

-			$newsuffix = '';

-		}

-		if (in_array($this->table_element, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))) {

-			$fieldusermod =  "fk_user_mod";

-		} elseif ($this->table_element == 'ecm_files') {

-			$fieldusermod = "fk_user_m";

-		} else {

-			$fieldusermod = "fk_user_modif";

-		}

-		$sql = "UPDATE ".$this->db->prefix().$this->table_element;

-		$sql .= " SET note".$newsuffix." = ".(!empty($note) ? ("'".$this->db->escape($note)."'") : "NULL");

-		$sql .= ", ".$fieldusermod." = ".((int) $user->id);

-		$sql .= " WHERE rowid = ".((int) $this->id);

+		//var_dump($this->table_element);exit;

+		if ($this->table_element == 'product') $suffix = '';

+

+		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;

+		$sql .= " SET note".$suffix." = ".(!empty($note) ? ("'".$this->db->escape($note)."'") : "NULL");

+		$sql .= " ,".(in_array($this->table_element, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment')) ? "fk_user_mod" : "fk_user_modif")." = ".$user->id;

+		$sql .= " WHERE rowid =".$this->id;

@@ -3572,6 +2940,6 @@
-		if ($this->db->query($sql)) {

-			if ($suffix == '_public') {

-				$this->note_public = $note;

-			} elseif ($suffix == '_private') {

-				$this->note_private = $note;

-			} else {

+		if ($this->db->query($sql))

+		{

+			if ($suffix == '_public') $this->note_public = $note;

+			elseif ($suffix == '_private') $this->note_private = $note;

+			else

+			{

@@ -3581,28 +2948,0 @@
-			if (empty($notrigger)) {

-				switch ($this->element) {

-					case 'societe':

-						$trigger_name = 'COMPANY_MODIFY';

-						break;

-					case 'commande':

-						$trigger_name = 'ORDER_MODIFY';

-						break;

-					case 'facture':

-						$trigger_name = 'BILL_MODIFY';

-						break;

-					case 'invoice_supplier':

-						$trigger_name = 'BILL_SUPPLIER_MODIFY';

-						break;

-					case 'facturerec':

-						$trigger_name = 'BILLREC_MODIFIY';

-						break;

-					case 'expensereport':

-						$trigger_name = 'EXPENSE_REPORT_MODIFY';

-						break;

-					default:

-						$trigger_name = strtoupper($this->element) . '_MODIFY';

-				}

-				$ret = $this->call_trigger($trigger_name, $user);

-				if ($ret < 0) {

-					return -1;

-				}

-			}

@@ -3610 +2950,3 @@
-		} else {

+		}

+		else

+		{

@@ -3616 +2958 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -3621 +2963 @@
-	 * @return     int      		   		Return integer <0 if KO, >0 if OK

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

@@ -3627 +2969 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -3631 +2973 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -3637,4 +2979,4 @@
-	 *  @param  string	$roundingadjust    	'none'=Do nothing, 'auto'=Use default method (MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND if defined, or '0'), '0'=Force mode Total of rounding, '1'=Force mode Rounding of total

-	 *  @param	int		$nodatabaseupdate	1=Do not update database total fields of the main object. Update only properties in memory. Can be used to save SQL when this method is called several times, so we can do it only once at end.

-	 *  @param	Societe	$seller				If roundingadjust is '0' or '1' or maybe 'auto', it means we recalculate total for lines before calculating total for object and for this, we need seller object (used to analyze lines to check corrupted data).

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

+	 *  @param  string	$roundingadjust    	'none'=Do nothing, 'auto'=Use default method (MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND if defined, or '0'), '0'=Force mode total of rounding, '1'=Force mode rounding of total

+	 *  @param	int		$nodatabaseupdate	1=Do not update database. Update only properties of object.

+	 *  @param	Societe	$seller				If roundingadjust is '0' or '1' or maybe 'auto', it means we recalculate total for lines before calculating total for object and for this, we need seller object.

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

@@ -3644 +2986 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -3647,7 +2989,7 @@
-		$parameters = array('exclspec' => $exclspec, 'roundingadjust' => $roundingadjust, 'nodatabaseupdate' => $nodatabaseupdate, 'seller' => $seller);

-		$reshook = $hookmanager->executeHooks('updateTotalPrice', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks

-		if ($reshook > 0) {

-			return 1; // replacement code

-		} elseif ($reshook < 0) {

-			return -1; // failure

-		} // reshook = 0 => execute normal code

+        $parameters = array('exclspec' => $exclspec, 'roundingadjust' => $roundingadjust, 'nodatabaseupdate' => $nodatabaseupdate, 'seller' => $seller);

+        $reshook = $hookmanager->executeHooks('updateTotalPrice', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks

+        if ($reshook > 0) {

+            return 1; // replacement code

+        } elseif ($reshook < 0) {

+            return -1; // failure

+        } // reshook = 0 => execute normal code

@@ -3657 +2999 @@
-		if ($this->element == 'propal') {

+		if ($this->element == 'propal')

@@ -3659 +3001 @@
-		} elseif ($this->element == 'commande' || $this->element == 'order') {

+		elseif ($this->element == 'commande' || $this->element == 'order')

@@ -3661 +3003 @@
-		} elseif ($this->element == 'facture' || $this->element == 'invoice') {

+		elseif ($this->element == 'facture' || $this->element == 'invoice')

@@ -3663 +3005 @@
-		} elseif ($this->element == 'facture_fourn' || $this->element == 'supplier_invoice' || $this->element == 'invoice_supplier' || $this->element == 'invoice_supplier_rec') {

+		elseif ($this->element == 'facture_fourn' || $this->element == 'supplier_invoice' || $this->element == 'invoice_supplier')

@@ -3665 +3007 @@
-		} elseif ($this->element == 'order_supplier' || $this->element == 'supplier_order') {

+		elseif ($this->element == 'order_supplier' || $this->element == 'supplier_order')

@@ -3667 +3009 @@
-		} elseif ($this->element == 'supplier_proposal') {

+		elseif ($this->element == 'supplier_proposal')

@@ -3669 +3010,0 @@
-		}

@@ -3672,2 +3013,2 @@
-			if (getDolGlobalString($MODULE)) {

-				$modsactivated = explode(',', getDolGlobalString($MODULE));

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

+				$modsactivated = explode(',', $conf->global->$MODULE);

@@ -3675 +3016 @@
-					if (isModEnabled($mod)) {

+					if ($conf->$mod->enabled)

@@ -3677 +3017,0 @@
-					}

@@ -3683,0 +3024,2 @@
+		if ($roundingadjust == '-1') $roundingadjust = 'auto'; // For backward compatibility

+

@@ -3685,5 +3027,2 @@
-		if ($forcedroundingmode == 'auto' && isset($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) {

-			$forcedroundingmode = getDolGlobalString('MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND');

-		} elseif ($forcedroundingmode == 'auto') {

-			$forcedroundingmode = '0';

-		}

+		if ($forcedroundingmode == 'auto' && isset($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) $forcedroundingmode = $conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;

+		elseif ($forcedroundingmode == 'auto') $forcedroundingmode = '0';

@@ -3695 +3034 @@
-		// Define constants to find lines to sum (field name int the table_element_line not into table_element)

+		// Define constants to find lines to sum

@@ -3700 +3039,2 @@
-		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') {

+		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')

+		{

@@ -3704,4 +3044,2 @@
-		if ($this->element == 'invoice_supplier_rec') {

-			$fieldup = 'pu_ht';

-		}

-		if ($this->element == 'expensereport') {

+		if ($this->element == 'expensereport')

+		{

@@ -3711 +3049 @@
-		$sql = "SELECT rowid, qty, ".$fieldup." as up, remise_percent, total_ht, ".$fieldtva." as total_tva, total_ttc, ".$fieldlocaltax1." as total_localtax1, ".$fieldlocaltax2." as total_localtax2,";

+		$sql = 'SELECT rowid, qty, '.$fieldup.' as up, remise_percent, total_ht, '.$fieldtva.' as total_tva, total_ttc, '.$fieldlocaltax1.' as total_localtax1, '.$fieldlocaltax2.' as total_localtax2,';

@@ -3713,3 +3051 @@
-		if ($this->table_element_line == 'facturedet') {

-			$sql .= ', situation_percent';

-		}

+		if ($this->table_element_line == 'facturedet') $sql .= ', situation_percent';

@@ -3717,3 +3053,4 @@
-		$sql .= " FROM ".$this->db->prefix().$this->table_element_line;

-		$sql .= " WHERE ".$this->fk_element." = ".((int) $this->id);

-		if ($exclspec) {

+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line;

+		$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;

+		if ($exclspec)

+		{

@@ -3721,6 +3058,2 @@
-			if ($this->table_element_line == 'contratdet') {

-				$product_field = ''; // contratdet table has no product_type field

-			}

-			if ($product_field) {

-				$sql .= " AND ".$product_field." <> 9";

-			}

+			if ($this->table_element_line == 'contratdet') $product_field = ''; // contratdet table has no product_type field

+			if ($product_field) $sql .= ' AND '.$product_field.' <> 9';

@@ -3731 +3063,0 @@
-

@@ -3733 +3065,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -3746,2 +3078,0 @@
-			$this->db->begin();

-

@@ -3750 +3081,2 @@
-			while ($i < $num) {

+			while ($i < $num)

+			{

@@ -3757 +3089,2 @@
-				if (empty($reshook) && $forcedroundingmode == '0') {	// Check if data on line are consistent. This may solve lines that were not consistent because set with $forcedroundingmode='auto'

+				if (empty($reshook) && $forcedroundingmode == '0')	// Check if data on line are consistent. This may solve lines that were not consistent because set with $forcedroundingmode='auto'

+				{

@@ -3762 +3095 @@
-					$diff_when_using_price_ht = price2num($tmpcal[1] - $obj->total_tva, 'MT', 1); // If price was set with tax price and unit price HT has a low number of digits, then we may have a diff on recalculation from unit price HT.

+					$diff_when_using_price_ht = price2num($tmpcal[1] - $obj->total_tva, 'MT', 1); // If price was set with tax price adn unit price HT has a low number of digits, then we may have a diff on recalculation from unit price HT.

@@ -3764 +3097 @@
-					//var_dump($obj->total_ht.' '.$obj->total_tva.' '.$obj->total_localtax1.' '.$obj->total_localtax2.' => '.$obj->total_ttc);

+					//var_dump($obj->total_ht.' '.$obj->total_tva.' '.$obj->total_localtax1.' '.$obj->total_localtax2.' =? '.$obj->total_ttc);

@@ -3767,4 +3100,4 @@
-					if ($diff_on_current_total) {

-						// This should not happen, we should always have in table: total_ttc = total_ht + total_vat + total_localtax1 + total_localtax2

-						$sqlfix = "UPDATE ".$this->db->prefix().$this->table_element_line." SET ".$fieldtva." = ".price2num((float) $tmpcal[1]).", total_ttc = ".price2num((float) $tmpcal[2])." WHERE rowid = ".((int) $obj->rowid);

-						dol_syslog('We found unconsistent data into detailed line (diff_on_current_total = '.$diff_on_current_total.') for line rowid = '.$obj->rowid." (ht=".$obj->total_ht." vat=".$obj->total_tva." tax1=".$obj->total_localtax1." tax2=".$obj->total_localtax2." ttc=".$obj->total_ttc."). We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix, LOG_WARNING);

+					if ($diff_when_using_price_ht && $diff_on_current_total)

+					{

+						$sqlfix = "UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".$tmpcal[1].", total_ttc = ".$tmpcal[2]." WHERE rowid = ".$obj->rowid;

+						dol_syslog('We found unconsistent data into detailed line (diff_when_using_price_ht = '.$diff_when_using_price_ht.' and diff_on_current_total = '.$diff_on_current_total.') for line rowid = '.$obj->rowid." (total vat of line calculated=".$tmpcal[1].", database=".$obj->total_tva."). We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix, LOG_WARNING);

@@ -3772,14 +3105 @@
-						if (!$resqlfix) {

-							dol_print_error($this->db, 'Failed to update line');

-						}

-						$obj->total_tva = $tmpcal[1];

-						$obj->total_ttc = $tmpcal[2];

-					} elseif ($diff_when_using_price_ht && $roundingadjust == '0') {

-						// After calculation from HT, total is consistent but we have found a difference between VAT part in calculation and into database and

-						// we ask to force the use of rounding on line (like done on calculation) so we force update of line

-						$sqlfix = "UPDATE ".$this->db->prefix().$this->table_element_line." SET ".$fieldtva." = ".price2num((float) $tmpcal[1]).", total_ttc = ".price2num((float) $tmpcal[2])." WHERE rowid = ".((int) $obj->rowid);

-						dol_syslog('We found a line with different rounding data into detailed line (diff_when_using_price_ht = '.$diff_when_using_price_ht.' and diff_on_current_total = '.$diff_on_current_total.') for line rowid = '.$obj->rowid." (total vat of line calculated=".$tmpcal[1].", database=".$obj->total_tva."). We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix);

-						$resqlfix = $this->db->query($sqlfix);

-						if (!$resqlfix) {

-							dol_print_error($this->db, 'Failed to update line');

-						}

+						if (!$resqlfix) dol_print_error($this->db, 'Failed to update line');

@@ -3800,9 +3120,3 @@
-				if (!isset($total_ht_by_vats[$obj->vatrate])) {

-					$total_ht_by_vats[$obj->vatrate] = 0;

-				}

-				if (!isset($total_tva_by_vats[$obj->vatrate])) {

-					$total_tva_by_vats[$obj->vatrate] = 0;

-				}

-				if (!isset($total_ttc_by_vats[$obj->vatrate])) {

-					$total_ttc_by_vats[$obj->vatrate] = 0;

-				}

+				if (!isset($total_ht_by_vats[$obj->vatrate]))  $total_ht_by_vats[$obj->vatrate] = 0;

+				if (!isset($total_tva_by_vats[$obj->vatrate])) $total_tva_by_vats[$obj->vatrate] = 0;

+				if (!isset($total_ttc_by_vats[$obj->vatrate])) $total_ttc_by_vats[$obj->vatrate] = 0;

@@ -3813 +3127,2 @@
-				if ($forcedroundingmode == '1') {	// Check if we need adjustement onto line for vat. TODO This works on the company currency but not on foreign currency

+				if ($forcedroundingmode == '1')	// Check if we need adjustement onto line for vat. TODO This works on the company currency but not on multicurrency

+				{

@@ -3817,4 +3132,4 @@
-					if ($diff) {

-						if (abs($diff) > (10 * pow(10, -1 * getDolGlobalInt('MAIN_MAX_DECIMALS_TOT', 0)))) {

-							// If error is more than 10 times the accurancy of rounding. This should not happen.

-							$errmsg = 'A rounding difference was detected into TOTAL but is too high to be corrected. Some data in your lines may be corrupted. Try to edit each line manually to fix this before restarting.';

+					if ($diff)

+					{

+						if (abs($diff) > 0.1) {

+							$errmsg = 'A rounding difference was detected into TOTAL but is too high to be corrected. Some data in your line may be corrupted. Try to edit each line manually.';

@@ -3822,3 +3137,2 @@
-							$this->error = $errmsg;

-							$error++;

-							break;

+							dol_print_error('', $errmsg);

+							exit;

@@ -3826 +3140 @@
-						$sqlfix = "UPDATE ".$this->db->prefix().$this->table_element_line." SET ".$fieldtva." = ".price2num($obj->total_tva - $diff).", total_ttc = ".price2num($obj->total_ttc - $diff)." WHERE rowid = ".((int) $obj->rowid);

+						$sqlfix = "UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".($obj->total_tva - $diff).", total_ttc = ".($obj->total_ttc - $diff)." WHERE rowid = ".$obj->rowid;

@@ -3828,11 +3142,6 @@
-

-						$resqlfix = $this->db->query($sqlfix);

-

-						if (!$resqlfix) {

-							dol_print_error($this->db, 'Failed to update line');

-						}

-

-						$this->total_tva = (float) price2num($this->total_tva - $diff, '', 1);

-						$this->total_ttc = (float) price2num($this->total_ttc - $diff, '', 1);

-						$total_tva_by_vats[$obj->vatrate] = (float) price2num($total_tva_by_vats[$obj->vatrate] - $diff, '', 1);

-						$total_ttc_by_vats[$obj->vatrate] = (float) price2num($total_ttc_by_vats[$obj->vatrate] - $diff, '', 1);

+								$resqlfix = $this->db->query($sqlfix);

+								if (!$resqlfix) dol_print_error($this->db, 'Failed to update line');

+								$this->total_tva -= $diff;

+								$this->total_ttc -= $diff;

+								$total_tva_by_vats[$obj->vatrate] -= $diff;

+								$total_ttc_by_vats[$obj->vatrate] -= $diff;

@@ -3850,24 +3159,15 @@
-			if (!empty($this->situation_cycle_ref) && !empty($this->situation_counter) && $this->situation_counter > 1 && method_exists($this, 'get_prev_sits')) {

-				include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';

-				if ($this->type != Facture::TYPE_CREDIT_NOTE) {	// @phpstan-ignore-line

-					$prev_sits = $this->get_prev_sits();

-

-					foreach ($prev_sits as $sit) {				// $sit is an object Facture loaded with a fetch.

-						$this->total_ht -= $sit->total_ht;

-						$this->total_tva -= $sit->total_tva;

-						$this->total_localtax1 -= $sit->total_localtax1;

-						$this->total_localtax2 -= $sit->total_localtax2;

-						$this->total_ttc -= $sit->total_ttc;

-						$this->multicurrency_total_ht -= $sit->multicurrency_total_ht;

-						$this->multicurrency_total_tva -= $sit->multicurrency_total_tva;

-						$this->multicurrency_total_ttc -= $sit->multicurrency_total_ttc;

-					}

-				}

-			}

-

-			// Clean total

-			$this->total_ht = (float) price2num($this->total_ht);

-			$this->total_tva = (float) price2num($this->total_tva);

-			$this->total_localtax1 = (float) price2num($this->total_localtax1);

-			$this->total_localtax2 = (float) price2num($this->total_localtax2);

-			$this->total_ttc = (float) price2num($this->total_ttc);

+			if ($this->situation_cycle_ref && $this->situation_counter > 1 && method_exists($this, 'get_prev_sits') && $this->type != $this::TYPE_CREDIT_NOTE)

+			{

+				$prev_sits = $this->get_prev_sits();

+

+				foreach ($prev_sits as $sit) {				// $sit is an object Facture loaded with a fetch.

+					$this->total_ht -= $sit->total_ht;

+					$this->total_tva -= $sit->total_tva;

+					$this->total_localtax1 -= $sit->total_localtax1;

+					$this->total_localtax2 -= $sit->total_localtax2;

+					$this->total_ttc -= $sit->total_ttc;

+					$this->multicurrency_total_ht -= $sit->multicurrency_total_ht;

+					$this->multicurrency_total_tva -= $sit->multicurrency_total_tva;

+					$this->multicurrency_total_ttc -= $sit->multicurrency_total_ttc;

+				}

+			}

@@ -3877 +3177 @@
-			// Now update global fields total_ht, total_ttc, total_tva, total_localtax1, total_localtax2, multicurrency_total_* of main object

+			// Now update global field total_ht, total_ttc and tva

@@ -3884,15 +3184,19 @@
-			if (in_array($this->element, array('propal', 'commande', 'facture', 'facturerec', 'supplier_proposal', 'order_supplier', 'facture_fourn', 'invoice_supplier', 'invoice_supplier_rec', 'expensereport'))) {

-				$fieldtva = 'total_tva';

-			}

-

-			if (!$error && empty($nodatabaseupdate)) {

-				$sql = "UPDATE ".$this->db->prefix().$this->table_element.' SET';

-				$sql .= " ".$fieldht." = ".((float) price2num($this->total_ht, 'MT', 1)).",";

-				$sql .= " ".$fieldtva." = ".((float) price2num($this->total_tva, 'MT', 1)).",";

-				$sql .= " ".$fieldlocaltax1." = ".((float) price2num($this->total_localtax1, 'MT', 1)).",";

-				$sql .= " ".$fieldlocaltax2." = ".((float) price2num($this->total_localtax2, 'MT', 1)).",";

-				$sql .= " ".$fieldttc." = ".((float) price2num($this->total_ttc, 'MT', 1));

-				$sql .= ", multicurrency_total_ht = ".((float) price2num($this->multicurrency_total_ht, 'MT', 1));

-				$sql .= ", multicurrency_total_tva = ".((float) price2num($this->multicurrency_total_tva, 'MT', 1));

-				$sql .= ", multicurrency_total_ttc = ".((float) price2num($this->multicurrency_total_ttc, 'MT', 1));

-				$sql .= " WHERE rowid = ".((int) $this->id);

+			if ($this->element == 'facture' || $this->element == 'facturerec')             $fieldht = 'total';

+			if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') $fieldtva = 'total_tva';

+			if ($this->element == 'propal')                                                $fieldttc = 'total';

+			if ($this->element == 'expensereport')                                         $fieldtva = 'total_tva';

+			if ($this->element == 'supplier_proposal')                                     $fieldttc = 'total';

+

+			if (empty($nodatabaseupdate))

+			{

+				$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET';

+				$sql .= " ".$fieldht."='".price2num($this->total_ht)."',";

+				$sql .= " ".$fieldtva."='".price2num($this->total_tva)."',";

+				$sql .= " ".$fieldlocaltax1."='".price2num($this->total_localtax1)."',";

+				$sql .= " ".$fieldlocaltax2."='".price2num($this->total_localtax2)."',";

+				$sql .= " ".$fieldttc."='".price2num($this->total_ttc)."'";

+						$sql .= ", multicurrency_total_ht='".price2num($this->multicurrency_total_ht, 'MT', 1)."'";

+						$sql .= ", multicurrency_total_tva='".price2num($this->multicurrency_total_tva, 'MT', 1)."'";

+						$sql .= ", multicurrency_total_ttc='".price2num($this->multicurrency_total_ttc, 'MT', 1)."'";

+				$sql .= ' WHERE rowid = '.$this->id;

+

@@ -3902,2 +3206,2 @@
-

-				if (!$resql) {

+				if (!$resql)

+				{

@@ -3910,2 +3214,2 @@
-			if (!$error) {

-				$this->db->commit();

+			if (!$error)

+			{

@@ -3913,2 +3217,3 @@
-			} else {

-				$this->db->rollback();

+			}

+			else

+			{

@@ -3917 +3222,3 @@
-		} else {

+		}

+		else

+		{

@@ -3925 +3232 @@
-	 *	Add an object link into llx_element_element.

+	 *	Add objects linked in llx_element_element.

@@ -3929,3 +3236 @@
-	 * 	@param		User	$f_user		User that create

-	 * 	@param		int		$notrigger	1=Does not execute triggers, 0=execute triggers

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

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

@@ -3934 +3239 @@
-	public function add_object_linked($origin = null, $origin_id = null, $f_user = null, $notrigger = 0)

+	public function add_object_linked($origin = null, $origin_id = null)

@@ -3937 +3241,0 @@
-		global $user, $hookmanager, $action;

@@ -3940 +3243,0 @@
-		$f_user = isset($f_user) ? $f_user : $user;

@@ -3943,28 +3246,4 @@
-		if ($origin == 'order') {

-			$origin = 'commande';

-		}

-		if ($origin == 'invoice') {

-			$origin = 'facture';

-		}

-		if ($origin == 'invoice_template') {

-			$origin = 'facturerec';

-		}

-		if ($origin == 'supplierorder') {

-			$origin = 'order_supplier';

-		}

-

-		// Elements of the core modules which have `$module` property but may to which we don't want to prefix module part to the element name for finding the linked object in llx_element_element.

-		// It's because an entry for this element may be exist in llx_element_element before this modification (version <=14.2) and ave named only with their element name in fk_source or fk_target.

-		$coremodule = array('knowledgemanagement', 'partnership', 'workstation', 'ticket', 'recruitment', 'eventorganization', 'asset');

-		// Add module part to target type if object has $module property and isn't in core modules.

-		$targettype = ((!empty($this->module) && ! in_array($this->module, $coremodule)) ? $this->module.'_' : '').$this->element;

-

-		$parameters = array('targettype'=>$targettype);

-		// Hook for explicitly set the targettype if it must be differtent than $this->element

-		$reshook = $hookmanager->executeHooks('setLinkedObjectSourceTargetType', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks

-		if ($reshook > 0) {

-			if (!empty($hookmanager->resArray['targettype'])) {

-				$targettype = $hookmanager->resArray['targettype'];

-			}

-		}

-

+		if ($origin == 'order') $origin = 'commande';

+		if ($origin == 'invoice') $origin = 'facture';

+		if ($origin == 'invoice_template') $origin = 'facturerec';

+		if ($origin == 'supplierorder') $origin = 'order_supplier';

@@ -3972,3 +3251,2 @@
-		$error = 0;

-

-		$sql = "INSERT INTO " . $this->db->prefix() . "element_element (";

+

+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";

@@ -3980,4 +3258,4 @@
-		$sql .= ((int) $origin_id);

-		$sql .= ", '" . $this->db->escape($origin) . "'";

-		$sql .= ", " . ((int) $this->id);

-		$sql .= ", '" . $this->db->escape($targettype) . "'";

+		$sql .= $origin_id;

+		$sql .= ", '".$this->db->escape($origin)."'";

+		$sql .= ", ".$this->id;

+		$sql .= ", '".$this->db->escape($this->element)."'";

@@ -3986,18 +3264,3 @@
-		dol_syslog(get_class($this) . "::add_object_linked", LOG_DEBUG);

-		if ($this->db->query($sql)) {

-			if (!$notrigger) {

-				// Call trigger

-				$this->context['link_origin'] = $origin;

-				$this->context['link_origin_id'] = $origin_id;

-				$result = $this->call_trigger('OBJECT_LINK_INSERT', $f_user);

-				if ($result < 0) {

-					$error++;

-				}

-				// End call triggers

-			}

-		} else {

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

-			$error++;

-		}

-

-		if (!$error) {

+		dol_syslog(get_class($this)."::add_object_linked", LOG_DEBUG);

+		if ($this->db->query($sql))

+		{

@@ -4006 +3269,4 @@
-		} else {

+		}

+		else

+		{

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

@@ -4014,2 +3280,2 @@
-	 *		this->linkedObjectsIds array +

-	 *		this->linkedObjects array if $loadalsoobjects = 1 or $loadalsoobjects = type

+	 *		this->linkedObjectsIds array and

+	 *		this->linkedObjects array if $loadalsoobjects = 1

@@ -4018,14 +3284,14 @@
-	 *  - source id+type -> will get list of targets linked to source

-	 *  - target id+type -> will get list of sources linked to target

-	 *  - source id+type + target type -> will get list of targets of the type linked to source

-	 *  - target id+type + source type -> will get list of sources of the type linked to target

-	 *

-	 *	@param	int			$sourceid			Object source id (if not defined, $this->id)

-	 *	@param  string		$sourcetype			Object source type (if not defined, $this->element)

-	 *	@param  int			$targetid			Object target id (if not defined, $this->id)

-	 *	@param  string		$targettype			Object target type (if not defined, $this->element)

-	 *	@param  string		$clause				'OR' or 'AND' clause used when both source id and target id are provided

-	 *  @param  int			$alsosametype		0=Return only links to object that differs from source type. 1=Include also link to objects of same type.

-	 *  @param  string		$orderby			SQL 'ORDER BY' clause

-	 *  @param	int|string	$loadalsoobjects	Load also the array $this->linkedObjects. Use 0 to not load (increase performances), Use 1 to load all, Use value of type ('facture', 'facturerec', ...) to load only a type of object.

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

+	 *  - source id+type -> will get target list linked to source

+	 *  - target id+type -> will get source list linked to target

+	 *  - source id+type + target type -> will get target list of the type

+	 *  - target id+type + target source -> will get source list of the type

+	 *

+	 *	@param	int		$sourceid			Object source id (if not defined, id of object)

+	 *	@param  string	$sourcetype			Object source type (if not defined, element name of object)

+	 *	@param  int		$targetid			Object target id (if not defined, id of object)

+	 *	@param  string	$targettype			Object target type (if not defined, elemennt name of object)

+	 *	@param  string	$clause				'OR' or 'AND' clause used when both source id and target id are provided

+	 *  @param  int		$alsosametype		0=Return only links to object that differs from source type. 1=Include also link to objects of same type.

+	 *  @param  string	$orderby			SQL 'ORDER BY' clause

+	 *  @param	int		$loadalsoobjects	Load also array this->linkedObjects (Use 0 to increase performances)

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

@@ -4036,8 +3302 @@
-		global $conf, $hookmanager, $action;

-

-		// Important for pdf generation time reduction

-		// This boolean is true if $this->linkedObjects has already been loaded with all objects linked without filter

-		// If you need to force the reload, you can call clearObjectLinkedCache() before calling fetchObjectLinked()

-		if ($this->id > 0 && !empty($this->linkedObjectsFullLoaded[$this->id])) {

-			return 1;

-		}

+		global $conf;

@@ -4053,19 +3312,2 @@
-		$parameters = array('sourcetype'=>$sourcetype, 'sourceid'=>$sourceid, 'targettype'=>$targettype, 'targetid'=>$targetid);

-		// Hook for explicitly set the targettype if it must be differtent than $this->element

-		$reshook = $hookmanager->executeHooks('setLinkedObjectSourceTargetType', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks

-		if ($reshook > 0) {

-			if (!empty($hookmanager->resArray['sourcetype'])) {

-				$sourcetype = $hookmanager->resArray['sourcetype'];

-			}

-			if (!empty($hookmanager->resArray['sourceid'])) {

-				$sourceid = $hookmanager->resArray['sourceid'];

-			}

-			if (!empty($hookmanager->resArray['targettype'])) {

-				$targettype = $hookmanager->resArray['targettype'];

-			}

-			if (!empty($hookmanager->resArray['targetid'])) {

-				$targetid = $hookmanager->resArray['targetid'];

-			}

-		}

-

-		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid)) {

+		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid))

+		{

@@ -4073,5 +3315,4 @@
-			if (!empty($targettype)) {

-				$withtargettype = true;

-			}

-		}

-		if (!empty($targetid) && !empty($targettype) && empty($sourceid)) {

+			if (!empty($targettype)) $withtargettype = true;

+		}

+		if (!empty($targetid) && !empty($targettype) && empty($sourceid))

+		{

@@ -4079,3 +3320 @@
-			if (!empty($sourcetype)) {

-				$withsourcetype = true;

-			}

+			if (!empty($sourcetype)) $withsourcetype = true;

@@ -4096,2 +3335,2 @@
-		$sql = "SELECT rowid, fk_source, sourcetype, fk_target, targettype";

-		$sql .= " FROM ".$this->db->prefix()."element_element";

+		$sql = 'SELECT rowid, fk_source, sourcetype, fk_target, targettype';

+		$sql .= ' FROM '.MAIN_DB_PREFIX.'element_element';

@@ -4099,20 +3338,19 @@
-		if ($justsource || $justtarget) {

-			if ($justsource) {

-				$sql .= "fk_source = ".((int) $sourceid)." AND sourcetype = '".$this->db->escape($sourcetype)."'";

-				if ($withtargettype) {

-					$sql .= " AND targettype = '".$this->db->escape($targettype)."'";

-				}

-			} elseif ($justtarget) {

-				$sql .= "fk_target = ".((int) $targetid)." AND targettype = '".$this->db->escape($targettype)."'";

-				if ($withsourcetype) {

-					$sql .= " AND sourcetype = '".$this->db->escape($sourcetype)."'";

-				}

-			}

-		} else {

-			$sql .= "(fk_source = ".((int) $sourceid)." AND sourcetype = '".$this->db->escape($sourcetype)."')";

-			$sql .= " ".$clause." (fk_target = ".((int) $targetid)." AND targettype = '".$this->db->escape($targettype)."')";

-			if ($loadalsoobjects && $this->id > 0 && $sourceid == $this->id && $sourcetype == $this->element && $targetid == $this->id && $targettype == $this->element && $clause == 'OR') {

-				$this->linkedObjectsFullLoaded[$this->id] = true;

-			}

-		}

-		$sql .= " ORDER BY ".$orderby;

+		if ($justsource || $justtarget)

+		{

+			if ($justsource)

+			{

+				$sql .= "fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."'";

+				if ($withtargettype) $sql .= " AND targettype = '".$targettype."'";

+			}

+			elseif ($justtarget)

+			{

+				$sql .= "fk_target = ".$targetid." AND targettype = '".$targettype."'";

+				if ($withsourcetype) $sql .= " AND sourcetype = '".$sourcetype."'";

+			}

+		}

+		else

+		{

+			$sql .= "(fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."')";

+			$sql .= " ".$clause." (fk_target = ".$targetid." AND targettype = '".$targettype."')";

+		}

+		$sql .= ' ORDER BY '.$orderby;

@@ -4122 +3360,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -4125 +3364,2 @@
-			while ($i < $num) {

+			while ($i < $num)

+			{

@@ -4127,2 +3367,4 @@
-				if ($justsource || $justtarget) {

-					if ($justsource) {

+				if ($justsource || $justtarget)

+				{

+					if ($justsource)

+					{

@@ -4130 +3372,3 @@
-					} elseif ($justtarget) {

+					}

+					elseif ($justtarget)

+					{

@@ -4133,2 +3377,5 @@
-				} else {

-					if ($obj->fk_source == $sourceid && $obj->sourcetype == $sourcetype) {

+				}

+				else

+				{

+					if ($obj->fk_source == $sourceid && $obj->sourcetype == $sourcetype)

+					{

@@ -4137 +3384,2 @@
-					if ($obj->fk_target == $targetid && $obj->targettype == $targettype) {

+					if ($obj->fk_target == $targetid && $obj->targettype == $targettype)

+					{

@@ -4144 +3392,2 @@
-			if (!empty($this->linkedObjectsIds)) {

+			if (!empty($this->linkedObjectsIds))

+			{

@@ -4146 +3395,2 @@
-				foreach ($tmparray as $objecttype => $objectids) {       // $objecttype is a module name ('facture', 'mymodule', ...) or a module name with a suffix ('project_task', 'mymodule_myobj', ...)

+				foreach ($tmparray as $objecttype => $objectids)       // $objecttype is a module name ('facture', 'mymodule', ...) or a module name with a suffix ('project_task', 'mymodule_myobj', ...)

+				{

@@ -4149 +3398,0 @@
-					$regs = array();

@@ -4151 +3400,2 @@
-						&& preg_match('/^([^_]+)_([^_]+)/i', $objecttype, $regs)) {

+						&& preg_match('/^([^_]+)_([^_]+)/i', $objecttype, $regs))

+					{

@@ -4160,4 +3410,5 @@
-					} elseif ($objecttype == 'facturerec') {

-						$classpath = 'compta/facture/class';

-						$module = 'facture';

-					} elseif ($objecttype == 'propal') {

+					}

+					elseif ($objecttype == 'facturerec') {

+						$classpath = 'compta/facture/class'; $module = 'facture';

+					}

+					elseif ($objecttype == 'propal') {

@@ -4165 +3416,2 @@
-					} elseif ($objecttype == 'supplier_proposal') {

+					}

+					elseif ($objecttype == 'supplier_proposal') {

@@ -4167,21 +3419,20 @@
-					} elseif ($objecttype == 'shipping') {

-						$classpath = 'expedition/class';

-						$subelement = 'expedition';

-						$module = 'expedition';

-					} elseif ($objecttype == 'delivery') {

-						$classpath = 'delivery/class';

-						$subelement = 'delivery';

-						$module = 'delivery_note';

-					} elseif ($objecttype == 'invoice_supplier' || $objecttype == 'order_supplier') {

-						$classpath = 'fourn/class';

-						$module = 'fournisseur';

-					} elseif ($objecttype == 'fichinter') {

-						$classpath = 'fichinter/class';

-						$subelement = 'fichinter';

-						$module = 'ficheinter';

-					} elseif ($objecttype == 'subscription') {

-						$classpath = 'adherents/class';

-						$module = 'adherent';

-					} elseif ($objecttype == 'contact') {

-						$module = 'societe';

-					}

+					}

+					elseif ($objecttype == 'shipping') {

+						$classpath = 'expedition/class'; $subelement = 'expedition'; $module = 'expedition_bon';

+					}

+					elseif ($objecttype == 'delivery') {

+						$classpath = 'livraison/class'; $subelement = 'livraison'; $module = 'livraison_bon';

+					}

+					elseif ($objecttype == 'invoice_supplier' || $objecttype == 'order_supplier') {

+						$classpath = 'fourn/class'; $module = 'fournisseur';

+					}

+					elseif ($objecttype == 'fichinter') {

+						$classpath = 'fichinter/class'; $subelement = 'fichinter'; $module = 'ficheinter';

+					}

+					elseif ($objecttype == 'subscription') {

+						$classpath = 'adherents/class'; $module = 'adherent';

+					}

+					elseif ($objecttype == 'contact') {

+						 $module = 'societe';

+					}

+

@@ -4189,2 +3440 @@
-					$classfile = strtolower($subelement);

-					$classname = ucfirst($subelement);

+					$classfile = strtolower($subelement); $classname = ucfirst($subelement);

@@ -4193,41 +3443,26 @@
-						$classfile = 'commande';

-						$classname = 'Commande';

-					} elseif ($objecttype == 'invoice_supplier') {

-						$classfile = 'fournisseur.facture';

-						$classname = 'FactureFournisseur';

-					} elseif ($objecttype == 'order_supplier') {

-						$classfile = 'fournisseur.commande';

-						$classname = 'CommandeFournisseur';

-					} elseif ($objecttype == 'supplier_proposal') {

-						$classfile = 'supplier_proposal';

-						$classname = 'SupplierProposal';

-					} elseif ($objecttype == 'facturerec') {

-						$classfile = 'facture-rec';

-						$classname = 'FactureRec';

-					} elseif ($objecttype == 'subscription') {

-						$classfile = 'subscription';

-						$classname = 'Subscription';

-					} elseif ($objecttype == 'project' || $objecttype == 'projet') {

-						$classpath = 'projet/class';

-						$classfile = 'project';

-						$classname = 'Project';

-					} elseif ($objecttype == 'conferenceorboothattendee') {

-						$classpath = 'eventorganization/class';

-						$classfile = 'conferenceorboothattendee';

-						$classname = 'ConferenceOrBoothAttendee';

-						$module = 'eventorganization';

-					} elseif ($objecttype == 'conferenceorbooth') {

-						$classpath = 'eventorganization/class';

-						$classfile = 'conferenceorbooth';

-						$classname = 'ConferenceOrBooth';

-						$module = 'eventorganization';

-					} elseif ($objecttype == 'mo') {

-						$classpath = 'mrp/class';

-						$classfile = 'mo';

-						$classname = 'Mo';

-						$module = 'mrp';

-					}

-

-					// Here $module, $classfile and $classname are set, we can use them.

-					if (isModEnabled($module) && (($element != $this->element) || $alsosametype)) {

-						if ($loadalsoobjects && (is_numeric($loadalsoobjects) || ($loadalsoobjects === $objecttype))) {

+						$classfile = 'commande'; $classname = 'Commande';

+					}

+					elseif ($objecttype == 'invoice_supplier') {

+						$classfile = 'fournisseur.facture'; $classname = 'FactureFournisseur';

+					}

+					elseif ($objecttype == 'order_supplier') {

+						$classfile = 'fournisseur.commande'; $classname = 'CommandeFournisseur';

+					}

+					elseif ($objecttype == 'supplier_proposal') {

+						$classfile = 'supplier_proposal'; $classname = 'SupplierProposal';

+					}

+					elseif ($objecttype == 'facturerec') {

+						$classfile = 'facture-rec'; $classname = 'FactureRec';

+					}

+					elseif ($objecttype == 'subscription') {

+						$classfile = 'subscription'; $classname = 'Subscription';

+					}

+					elseif ($objecttype == 'project' || $objecttype == 'projet') {

+						$classpath = 'projet/class'; $classfile = 'project'; $classname = 'Project';

+					}

+

+					// Here $module, $classfile and $classname are set

+					if ($conf->$module->enabled && (($element != $this->element) || $alsosametype))

+					{

+						if ($loadalsoobjects)

+						{

@@ -4236,2 +3471,4 @@
-							if (class_exists($classname)) {

-								foreach ($objectids as $i => $objectid) {	// $i is rowid into llx_element_element

+							if (class_exists($classname))

+							{

+								foreach ($objectids as $i => $objectid)	// $i is rowid into llx_element_element

+								{

@@ -4240 +3477,2 @@
-									if ($ret >= 0) {

+									if ($ret >= 0)

+									{

@@ -4246 +3484,3 @@
-					} else {

+					}

+					else

+					{

@@ -4252 +3492,3 @@
-		} else {

+		}

+		else

+		{

@@ -4256,15 +3497,0 @@
-	}

-

-	/**

-	 *	Clear the cache saying that all linked object were already loaded. So next fetchObjectLinked will reload all links.

-	 *

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

-	 *  @see	fetchObjectLinked()

-	 */

-	public function clearObjectLinkedCache()

-	{

-		if ($this->id > 0 && !empty($this->linkedObjectsFullLoaded[$this->id])) {

-			unset($this->linkedObjectsFullLoaded[$this->id]);

-		}

-

-		return 1;

@@ -4280,2 +3506,0 @@
-	 * 	@param	User	$f_user			User that create

-	 * 	@param	int		$notrigger		1=Does not execute triggers, 0= execute triggers

@@ -4285,3 +3510,2 @@
-	public function updateObjectLinked($sourceid = null, $sourcetype = '', $targetid = null, $targettype = '', $f_user = null, $notrigger = 0)

-	{

-		global $user;

+	public function updateObjectLinked($sourceid = null, $sourcetype = '', $targetid = null, $targettype = '')

+	{

@@ -4290,39 +3514,27 @@
-		$f_user = isset($f_user) ? $f_user : $user;

-

-		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid) && empty($targettype)) {

-			$updatesource = true;

-		} elseif (empty($sourceid) && empty($sourcetype) && !empty($targetid) && !empty($targettype)) {

-			$updatetarget = true;

-		}

-

-		$this->db->begin();

-		$error = 0;

-

-		$sql = "UPDATE " . $this->db->prefix() . "element_element SET ";

-		if ($updatesource) {

-			$sql .= "fk_source = " . ((int) $sourceid);

-			$sql .= ", sourcetype = '" . $this->db->escape($sourcetype) . "'";

-			$sql .= " WHERE fk_target = " . ((int) $this->id);

-			$sql .= " AND targettype = '" . $this->db->escape($this->element) . "'";

-		} elseif ($updatetarget) {

-			$sql .= "fk_target = " . ((int) $targetid);

-			$sql .= ", targettype = '" . $this->db->escape($targettype) . "'";

-			$sql .= " WHERE fk_source = " . ((int) $this->id);

-			$sql .= " AND sourcetype = '" . $this->db->escape($this->element) . "'";

-		}

-

-		dol_syslog(get_class($this) . "::updateObjectLinked", LOG_DEBUG);

-		if ($this->db->query($sql)) {

-			if (!$notrigger) {

-				// Call trigger

-				$this->context['link_source_id'] = $sourceid;

-				$this->context['link_source_type'] = $sourcetype;

-				$this->context['link_target_id'] = $targetid;

-				$this->context['link_target_type'] = $targettype;

-				$result = $this->call_trigger('OBJECT_LINK_MODIFY', $f_user);

-				if ($result < 0) {

-					$error++;

-				}

-				// End call triggers

-			}

-		} else {

+

+		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid) && empty($targettype)) $updatesource = true;

+		elseif (empty($sourceid) && empty($sourcetype) && !empty($targetid) && !empty($targettype)) $updatetarget = true;

+

+		$sql = "UPDATE ".MAIN_DB_PREFIX."element_element SET ";

+		if ($updatesource)

+		{

+			$sql .= "fk_source = ".$sourceid;

+			$sql .= ", sourcetype = '".$this->db->escape($sourcetype)."'";

+			$sql .= " WHERE fk_target = ".$this->id;

+			$sql .= " AND targettype = '".$this->db->escape($this->element)."'";

+		}

+		elseif ($updatetarget)

+		{

+			$sql .= "fk_target = ".$targetid;

+			$sql .= ", targettype = '".$this->db->escape($targettype)."'";

+			$sql .= " WHERE fk_source = ".$this->id;

+			$sql .= " AND sourcetype = '".$this->db->escape($this->element)."'";

+		}

+

+		dol_syslog(get_class($this)."::updateObjectLinked", LOG_DEBUG);

+		if ($this->db->query($sql))

+		{

+			return 1;

+		}

+		else

+		{

@@ -4330,8 +3541,0 @@
-			$error++;

-		}

-

-		if (!$error) {

-			$this->db->commit();

-			return 1;

-		} else {

-			$this->db->rollback();

@@ -4350,2 +3553,0 @@
-	 * 	@param	User	$f_user			User that create

-	 * 	@param	int		$notrigger		1=Does not execute triggers, 0= execute triggers

@@ -4355,3 +3557,2 @@
-	public function deleteObjectLinked($sourceid = null, $sourcetype = '', $targetid = null, $targettype = '', $rowid = 0, $f_user = null, $notrigger = 0)

-	{

-		global $user;

+	public function deleteObjectLinked($sourceid = null, $sourcetype = '', $targetid = null, $targettype = '', $rowid = '')

+	{

@@ -4360,7 +3561,3 @@
-		$f_user = isset($f_user) ? $f_user : $user;

-

-		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid) && empty($targettype)) {

-			$deletesource = true;

-		} elseif (empty($sourceid) && empty($sourcetype) && !empty($targetid) && !empty($targettype)) {

-			$deletetarget = true;

-		}

+

+		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid) && empty($targettype)) $deletesource = true;

+		elseif (empty($sourceid) && empty($sourcetype) && !empty($targetid) && !empty($targettype)) $deletetarget = true;

@@ -4372,46 +3569,30 @@
-		$this->db->begin();

-		$error = 0;

-

-		if (!$notrigger) {

-			// Call trigger

-			$this->context['link_id'] = $rowid;

-			$this->context['link_source_id'] = $sourceid;

-			$this->context['link_source_type'] = $sourcetype;

-			$this->context['link_target_id'] = $targetid;

-			$this->context['link_target_type'] = $targettype;

-			$result = $this->call_trigger('OBJECT_LINK_DELETE', $f_user);

-			if ($result < 0) {

-				$error++;

-			}

-			// End call triggers

-		}

-

-		if (!$error) {

-			$sql = "DELETE FROM " . $this->db->prefix() . "element_element";

-			$sql .= " WHERE";

-			if ($rowid > 0) {

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

-			} else {

-				if ($deletesource) {

-					$sql .= " fk_source = " . ((int) $sourceid) . " AND sourcetype = '" . $this->db->escape($sourcetype) . "'";

-					$sql .= " AND fk_target = " . ((int) $this->id) . " AND targettype = '" . $this->db->escape($this->element) . "'";

-				} elseif ($deletetarget) {

-					$sql .= " fk_target = " . ((int) $targetid) . " AND targettype = '" . $this->db->escape($targettype) . "'";

-					$sql .= " AND fk_source = " . ((int) $this->id) . " AND sourcetype = '" . $this->db->escape($this->element) . "'";

-				} else {

-					$sql .= " (fk_source = " . ((int) $this->id) . " AND sourcetype = '" . $this->db->escape($this->element) . "')";

-					$sql .= " OR";

-					$sql .= " (fk_target = " . ((int) $this->id) . " AND targettype = '" . $this->db->escape($this->element) . "')";

-				}

-			}

-

-			dol_syslog(get_class($this) . "::deleteObjectLinked", LOG_DEBUG);

-			if (!$this->db->query($sql)) {

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

-				$this->errors[] = $this->error;

-				$error++;

-			}

-		}

-

-		if (!$error) {

-			$this->db->commit();

+

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

+		$sql .= " WHERE";

+		if ($rowid > 0)

+		{

+			$sql .= " rowid = ".$rowid;

+		}

+		else

+		{

+			if ($deletesource)

+			{

+				$sql .= " fk_source = ".$sourceid." AND sourcetype = '".$this->db->escape($sourcetype)."'";

+				$sql .= " AND fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."'";

+			}

+			elseif ($deletetarget)

+			{

+				$sql .= " fk_target = ".$targetid." AND targettype = '".$this->db->escape($targettype)."'";

+				$sql .= " AND fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."'";

+			}

+			else

+			{

+				$sql .= " (fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."')";

+				$sql .= " OR";

+				$sql .= " (fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."')";

+			}

+		}

+

+		dol_syslog(get_class($this)."::deleteObjectLinked", LOG_DEBUG);

+		if ($this->db->query($sql))

+		{

@@ -4419,18 +3600,5 @@
-		} else {

-			$this->db->rollback();

-			return 0;

-		}

-	}

-

-	/**

-	 * Function used to get an array with all items linked to an object id in association table

-	 *

-	 * @param	int		$fk_object_where		id of object we need to get linked items

-	 * @param	string	$field_select			name of field we need to get a list

-	 * @param	string	$field_where			name of field of object we need to get linked items

-	 * @param	string	$table_element			name of association table

-	 * @return 	array|int						Array of record, -1 if empty

-	 */

-	public static function getAllItemsLinkedByObjectID($fk_object_where, $field_select, $field_where, $table_element)

-	{

-		if (empty($fk_object_where) || empty($field_where) || empty($table_element)) {

+		}

+		else

+		{

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

+			$this->errors[] = $this->error;

@@ -4439,76 +3607,4 @@
-		if (!preg_match('/^[_a-zA-Z0-9]+$/', $field_select)) {

-			dol_syslog('Invalid value $field_select for parameter '.$field_select.' in call to getAllItemsLinkedByObjectID(). Must be a single field name.', LOG_ERR);

-		}

-

-		global $db;

-

-		$sql = "SELECT ".$field_select." FROM ".$db->prefix().$table_element." WHERE ".$field_where." = ".((int) $fk_object_where);

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

-

-		$TRes = array();

-		if (!empty($resql)) {

-			while ($res = $db->fetch_object($resql)) {

-				$TRes[] = $res->{$field_select};

-			}

-		}

-

-		return $TRes;

-	}

-

-	/**

-	 * Count items linked to an object id in association table

-	 *

-	 * @param	int		$fk_object_where		id of object we need to get linked items

-	 * @param	string	$field_where			name of field of object we need to get linked items

-	 * @param	string	$table_element			name of association table

-	 * @return 	array|int						Array of record, -1 if empty

-	 */

-	public static function getCountOfItemsLinkedByObjectID($fk_object_where, $field_where, $table_element)

-	{

-		if (empty($fk_object_where) || empty($field_where) || empty($table_element)) {

-			return -1;

-		}

-

-		global $db;

-

-		$sql = "SELECT COUNT(*) as nb FROM ".$db->prefix().$table_element." WHERE ".$field_where." = ".((int) $fk_object_where);

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

-		$n = 0;

-		if ($resql) {

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

-			if ($res) {

-				$n = $res->nb;

-			}

-		}

-

-		return $n;

-	}

-

-	/**

-	 * Function used to remove all items linked to an object id in association table

-	 *

-	 * @param	int		$fk_object_where		id of object we need to remove linked items

-	 * @param	string	$field_where			name of field of object we need to delete linked items

-	 * @param	string	$table_element			name of association table

-	 * @return 	int								Return integer <0 if KO, 0 if nothing done, >0 if OK and something done

-	 */

-	public static function deleteAllItemsLinkedByObjectID($fk_object_where, $field_where, $table_element)

-	{

-		if (empty($fk_object_where) || empty($field_where) || empty($table_element)) {

-			return -1;

-		}

-

-		global $db;

-

-		$sql = "DELETE FROM ".$db->prefix().$table_element." WHERE ".$field_where." = ".((int) $fk_object_where);

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

-

-		if (empty($resql)) {

-			return 0;

-		}

-

-		return 1;

-	}

-

-	/**

-	 *      Set status of an object.

+	}

+

+	/**

+	 *      Set status of an object

@@ -4517 +3613 @@
-	 *      @param	int		$elementId		Id of element to force (use this->id by default if null)

+	 *      @param	int		$elementId		Id of element to force (use this->id by default)

@@ -4519,5 +3615,4 @@
-	 *      @param	string	$trigkey		Trigger key to use for trigger. Use '' means automatic but it is not recommended and is deprecated.

-	 *      @param	string	$fieldstatus	Name of status field in this->table_element

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

-	 */

-	public function setStatut($status, $elementId = null, $elementType = '', $trigkey = '', $fieldstatus = 'fk_statut')

+	 *      @param	string	$trigkey		Trigger key to use for trigger

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

+	 */

+	public function setStatut($status, $elementId = null, $elementType = '', $trigkey = '')

@@ -4534,27 +3629,11 @@
-		if ($elementTable == 'facture_rec') {

-			$fieldstatus = "suspended";

-		}

-		if ($elementTable == 'mailing') {

-			$fieldstatus = "statut";

-		}

-		if ($elementTable == 'cronjob') {

-			$fieldstatus = "status";

-		}

-		if ($elementTable == 'user') {

-			$fieldstatus = "statut";

-		}

-		if ($elementTable == 'expensereport') {

-			$fieldstatus = "fk_statut";

-		}

-		if ($elementTable == 'commande_fournisseur_dispatch') {

-			$fieldstatus = "status";

-		}

-		if ($elementTable == 'prelevement_bons') {

-			$fieldstatus = "statut";

-		}

-		if (isset($this->fields) && is_array($this->fields) && array_key_exists('status', $this->fields)) {

-			$fieldstatus = 'status';

-		}

-

-		$sql = "UPDATE ".$this->db->prefix().$elementTable;

-		$sql .= " SET ".$fieldstatus." = ".((int) $status);

+		$fieldstatus = "fk_statut";

+		if ($elementTable == 'facture_rec') $fieldstatus = "suspended";

+		if ($elementTable == 'mailing') $fieldstatus = "statut";

+		if ($elementTable == 'cronjob') $fieldstatus = "status";

+		if ($elementTable == 'user') $fieldstatus = "statut";

+		if ($elementTable == 'expensereport') $fieldstatus = "fk_statut";

+		if ($elementTable == 'commande_fournisseur_dispatch') $fieldstatus = "status";

+		if (is_array($this->fields) && array_key_exists('status', $this->fields)) $fieldstatus = 'status';

+

+		$sql = "UPDATE ".MAIN_DB_PREFIX.$elementTable;

+		$sql .= " SET ".$fieldstatus." = ".$status;

@@ -4562,12 +3641,2 @@
-		// TODO Replace the test on $elementTable by doing a test on existence of the field in $this->fields

-		if ($status == 1 && in_array($elementTable, array('expensereport', 'inventory'))) {

-			$sql .= ", fk_user_valid = ".((int) $user->id);

-		}

-		if ($status == 1 && in_array($elementTable, array('expensereport'))) {

-			$sql .= ", date_valid = '".$this->db->idate(dol_now())."'";

-		}

-		if ($status == 1 && in_array($elementTable, array('inventory'))) {

-			$sql .= ", date_validation = '".$this->db->idate(dol_now())."'";

-		}

-		$sql .= " WHERE rowid = ".((int) $elementId);

-		$sql .= " AND ".$fieldstatus." <> ".((int) $status);	// We avoid update if status already correct

+		if ($status == 1 && $elementTable == 'expensereport') $sql .= ", fk_user_valid = ".$user->id;

+		$sql .= " WHERE rowid=".$elementId;

@@ -4576,2 +3645,2 @@
-		$resql = $this->db->query($sql);

-		if ($resql) {

+		if ($this->db->query($sql))

+		{

@@ -4580,38 +3649,21 @@
-			$nb_rows_affected = $this->db->affected_rows($resql);	// should be 1 or 0 if status was already correct

-

-			if ($nb_rows_affected > 0) {

-				if (empty($trigkey)) {

-					// Try to guess trigkey (for backward compatibility, now we should have trigkey defined into the call of setStatus)

-					if ($this->element == 'supplier_proposal' && $status == 2) {

-						$trigkey = 'SUPPLIER_PROPOSAL_SIGN'; // 2 = SupplierProposal::STATUS_SIGNED. Can't use constant into this generic class

-					}

-					if ($this->element == 'supplier_proposal' && $status == 3) {

-						$trigkey = 'SUPPLIER_PROPOSAL_REFUSE'; // 3 = SupplierProposal::STATUS_REFUSED. Can't use constant into this generic class

-					}

-					if ($this->element == 'supplier_proposal' && $status == 4) {

-						$trigkey = 'SUPPLIER_PROPOSAL_CLOSE'; // 4 = SupplierProposal::STATUS_CLOSED. Can't use constant into this generic class

-					}

-					if ($this->element == 'fichinter' && $status == 3) {

-						$trigkey = 'FICHINTER_CLASSIFY_DONE';

-					}

-					if ($this->element == 'fichinter' && $status == 2) {

-						$trigkey = 'FICHINTER_CLASSIFY_BILLED';

-					}

-					if ($this->element == 'fichinter' && $status == 1) {

-						$trigkey = 'FICHINTER_CLASSIFY_UNBILLED';

-					}

-				}

-

-				if ($trigkey) {

-					// Call trigger

-					$result = $this->call_trigger($trigkey, $user);

-					if ($result < 0) {

-						$error++;

-					}

-					// End call triggers

-				}

-			} else {

-				// The status was probably already good. We do nothing more, no triggers.

-			}

-

-			if (!$error) {

+			// Try autoset of trigkey

+			if (empty($trigkey))

+			{

+				if ($this->element == 'supplier_proposal' && $status == 2) $trigkey = 'SUPPLIER_PROPOSAL_SIGN'; // 2 = SupplierProposal::STATUS_SIGNED. Can't use constant into this generic class

+				if ($this->element == 'supplier_proposal' && $status == 3) $trigkey = 'SUPPLIER_PROPOSAL_REFUSE'; // 3 = SupplierProposal::STATUS_REFUSED. Can't use constant into this generic class

+				if ($this->element == 'supplier_proposal' && $status == 4) $trigkey = 'SUPPLIER_PROPOSAL_CLOSE'; // 4 = SupplierProposal::STATUS_CLOSED. Can't use constant into this generic class

+				if ($this->element == 'fichinter' && $status == 3) $trigkey = 'FICHINTER_CLASSIFY_DONE';

+				if ($this->element == 'fichinter' && $status == 2) $trigkey = 'FICHINTER_CLASSIFY_BILLED';

+				if ($this->element == 'fichinter' && $status == 1) $trigkey = 'FICHINTER_CLASSIFY_UNBILLED';

+			}

+

+			if ($trigkey)

+			{

+				// Call trigger

+				$result = $this->call_trigger($trigkey, $user);

+				if ($result < 0) $error++;

+				// End call triggers

+			}

+

+			if (!$error)

+			{

@@ -4620,10 +3672,4 @@
-				if (empty($savElementId)) {

-					// If the element we update is $this (so $elementId was provided as null)

-					if ($fieldstatus == 'tosell') {

-						$this->status = $status;

-					} elseif ($fieldstatus == 'tobuy') {

-						$this->status_buy = $status;	// @phpstan-ignore-line

-					} else {

-						$this->statut = $status;

-						$this->status = $status;

-					}

+				if (empty($savElementId))    // If the element we update was $this (so $elementId is null)

+				{

+					$this->statut = $status;

+					$this->status = $status;

@@ -4633 +3679,3 @@
-			} else {

+			}

+			else

+			{

@@ -4638 +3686,3 @@
-		} else {

+		}

+		else

+		{

@@ -4651 +3701 @@
-	 *  @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

@@ -4657,6 +3707,2 @@
-		if (empty($id) && empty($ref)) {

-			return 0;

-		}

-		if (getDolGlobalString('MAIN_DISABLE_CANVAS')) {

-			return 0; // To increase speed. Not enabled by default.

-		}

+		if (empty($id) && empty($ref)) return 0;

+		if (!empty($conf->global->MAIN_DISABLE_CANVAS)) return 0; // To increase speed. Not enabled by default.

@@ -4668 +3714 @@
-		$sql .= " FROM ".$this->db->prefix().$this->table_element;

+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;

@@ -4670,6 +3716,2 @@
-		if (!empty($id)) {

-			$sql .= " AND rowid = ".((int) $id);

-		}

-		if (!empty($ref)) {

-			$sql .= " AND ref = '".$this->db->escape($ref)."'";

-		}

+		if (!empty($id))  $sql .= " AND rowid = ".$id;

+		if (!empty($ref)) $sql .= " AND ref = '".$this->db->escape($ref)."'";

@@ -4678 +3720,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -4680 +3723,2 @@
-			if ($obj) {

+			if ($obj)

+			{

@@ -4683,4 +3727,5 @@
-			} else {

-				return 0;

-			}

-		} else {

+			}

+			else return 0;

+		}

+		else

+		{

@@ -4701,2 +3746,2 @@
-		$sql = "SELECT special_code FROM ".$this->db->prefix().$this->table_element_line;

-		$sql .= " WHERE rowid = ".((int) $lineid);

+		$sql = 'SELECT special_code FROM '.MAIN_DB_PREFIX.$this->table_element_line;

+		$sql .= ' WHERE rowid = '.$lineid;

@@ -4704 +3749,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -4706,8 +3752,6 @@
-			return (!empty($row[0]) ? $row[0] : 0);

-		}

-

-		return 0;

-	}

-

-	/**

-	 *  Function to check if an object is used by others (by children).

+			return $row[0];

+		}

+	}

+

+	/**

+	 *  Function to check if an object is used by others.

@@ -4717,4 +3761,3 @@
-	 *  @param	int		$entity		Force entity to check

-	 *  @return	int					Return integer <0 if KO, 0 if not used, >0 if already used

-	 */

-	public function isObjectUsed($id = 0, $entity = 0)

+	 *  @return	int					<0 if KO, 0 if not used, >0 if already used

+	 */

+	public function isObjectUsed($id = 0)

@@ -4724,3 +3767 @@
-		if (empty($id)) {

-			$id = $this->id;

-		}

+		if (empty($id)) $id = $this->id;

@@ -4729 +3770,2 @@
-		if (!isset($this->childtables) || !is_array($this->childtables) || count($this->childtables) == 0) {

+		if (!isset($this->childtables) || !is_array($this->childtables) || count($this->childtables) == 0)

+		{

@@ -4734,2 +3776,2 @@
-		$arraytoscan = $this->childtables;		// array('tablename'=>array('fk_element'=>'parentfield'), ...) or array('tablename'=>array('parent'=>table_parent, 'parentkey'=>'nameoffieldforparentfkkey'), ...)

-		// For backward compatibility, we check if array is old format array('tablename1', 'tablename2', ...)

+		$arraytoscan = $this->childtables;

+		// For backward compatibility, we check if array is old format array('table1', 'table2', ...)

@@ -4737 +3779,2 @@
-		if (is_numeric($tmparray[0])) {

+		if (is_numeric($tmparray[0]))

+		{

@@ -4743 +3786,2 @@
-		foreach ($arraytoscan as $table => $element) {

+		foreach ($arraytoscan as $table => $elementname)

+		{

@@ -4745,25 +3789,3 @@
-			// Check if element can be deleted

-			$sql = "SELECT COUNT(*) as nb";

-			$sql.= " FROM ".$this->db->prefix().$table." as c";

-			if (!empty($element['parent']) && !empty($element['parentkey'])) {

-				$sql.= ", ".$this->db->prefix().$element['parent']." as p";

-			}

-			if (!empty($element['fk_element'])) {

-				$sql.= " WHERE c.".$element['fk_element']." = ".((int) $id);

-			} else {

-				$sql.= " WHERE c.".$this->fk_element." = ".((int) $id);

-			}

-			if (!empty($element['parent']) && !empty($element['parentkey'])) {

-				$sql.= " AND c.".$element['parentkey']." = p.rowid";

-			}

-			if (!empty($element['parent']) && !empty($element['parenttypefield']) && !empty($element['parenttypevalue'])) {

-				$sql.= " AND c.".$element['parenttypefield']." = '".$this->db->escape($element['parenttypevalue'])."'";

-			}

-			if (!empty($entity)) {

-				if (!empty($element['parent']) && !empty($element['parentkey'])) {

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

-				} else {

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

-				}

-			}

-

+			// Check if third party can be deleted

+			$sql = "SELECT COUNT(*) as nb from ".MAIN_DB_PREFIX.$table;

+			$sql .= " WHERE ".$this->fk_element." = ".$id;

@@ -4771 +3793,2 @@
-			if ($resql) {

+			if ($resql)

+			{

@@ -4773 +3796,2 @@
-				if ($obj->nb > 0) {

+				if ($obj->nb > 0)

+				{

@@ -4777,6 +3801,7 @@
-					if (is_numeric($element)) {	// very old usage array('table1', 'table2', ...)

-						$this->errors[] = $langs->transnoentitiesnoconv("ErrorRecordHasAtLeastOneChildOfType", method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref, $table);

-					} elseif (is_string($element)) { // old usage array('table1' => 'TranslateKey1', 'table2' => 'TranslateKey2', ...)

-						$this->errors[] = $langs->transnoentitiesnoconv("ErrorRecordHasAtLeastOneChildOfType", method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref, $langs->transnoentitiesnoconv($element));

-					} else { // new usage: $element['name']=Translation key

-						$this->errors[] = $langs->transnoentitiesnoconv("ErrorRecordHasAtLeastOneChildOfType", method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref, $langs->transnoentitiesnoconv($element['name']));

+					if (is_numeric($elementname))	// old usage

+					{

+						$this->errors[] = $langs->trans("ErrorRecordHasAtLeastOneChildOfType", $table);

+					}

+					else	// new usage: $elementname=Translation key

+					{

+						$this->errors[] = $langs->trans("ErrorRecordHasAtLeastOneChildOfType", $langs->transnoentitiesnoconv($elementname));

@@ -4786 +3811,3 @@
-			} else {

+			}

+			else

+			{

@@ -4791 +3818,2 @@
-		if ($haschild > 0) {

+		if ($haschild > 0)

+		{

@@ -4794,3 +3822,2 @@
-		} else {

-			return 0;

-		}

+		}

+		else return 0;

@@ -4803 +3830 @@
-	 *  @return	int						Return integer <0 if KO, 0 if no predefined products, nb of lines with predefined products if found

+	 *  @return	int						<0 if KO, 0 if no predefined products, nb of lines with predefined products if found

@@ -4809 +3836,2 @@
-		foreach ($this->lines as $key => $val) {

+		foreach ($this->lines as $key => $val)

+		{

@@ -4811,18 +3839,6 @@
-			if ($predefined == -1) {

-				$qualified = 1;

-			}

-			if ($predefined == 1 && $val->fk_product > 0) {

-				$qualified = 1;

-			}

-			if ($predefined == 0 && $val->fk_product <= 0) {

-				$qualified = 1;

-			}

-			if ($predefined == 2 && $val->fk_product > 0 && $val->product_type == 0) {

-				$qualified = 1;

-			}

-			if ($predefined == 3 && $val->fk_product > 0 && $val->product_type == 1) {

-				$qualified = 1;

-			}

-			if ($qualified) {

-				$nb++;

-			}

+			if ($predefined == -1) $qualified = 1;

+			if ($predefined == 1 && $val->fk_product > 0) $qualified = 1;

+			if ($predefined == 0 && $val->fk_product <= 0) $qualified = 1;

+			if ($predefined == 2 && $val->fk_product > 0 && $val->product_type == 0) $qualified = 1;

+			if ($predefined == 3 && $val->fk_product > 0 && $val->product_type == 1) $qualified = 1;

+			if ($qualified) $nb++;

@@ -4837 +3853 @@
-	 * @return 	float|string			Total amout of discount

+	 * @return 	float

@@ -4841,31 +3857,29 @@
-		if (!empty($this->table_element_line)) {

-			$total_discount = 0.00;

-

-			$sql = "SELECT subprice as pu_ht, qty, remise_percent, total_ht";

-			$sql .= " FROM ".$this->db->prefix().$this->table_element_line;

-			$sql .= " WHERE ".$this->fk_element." = ".((int) $this->id);

-

-			dol_syslog(get_class($this).'::getTotalDiscount', LOG_DEBUG);

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

-			if ($resql) {

-				$num = $this->db->num_rows($resql);

-				$i = 0;

-				while ($i < $num) {

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

-

-					$pu_ht = $obj->pu_ht;

-					$qty = $obj->qty;

-					$total_ht = $obj->total_ht;

-

-					$total_discount_line = (float) price2num(($pu_ht * $qty) - $total_ht, 'MT');

-					$total_discount += $total_discount_line;

-

-					$i++;

-				}

-			}

-

-			//print $total_discount; exit;

-			return price2num($total_discount);

-		}

-

-		return null;

+		$total_discount = 0.00;

+

+		$sql = "SELECT subprice as pu_ht, qty, remise_percent, total_ht";

+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element."det";

+		$sql .= " WHERE ".$this->fk_element." = ".$this->id;

+

+		dol_syslog(get_class($this).'::getTotalDiscount', LOG_DEBUG);

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

+		if ($resql)

+		{

+			$num = $this->db->num_rows($resql);

+			$i = 0;

+			while ($i < $num)

+			{

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

+

+				$pu_ht = $obj->pu_ht;

+				$qty = $obj->qty;

+				$total_ht = $obj->total_ht;

+

+				$total_discount_line = floatval(price2num(($pu_ht * $qty) - $total_ht, 'MT'));

+				$total_discount += $total_discount_line;

+

+				$i++;

+			}

+		}

+

+		//print $total_discount; exit;

+		return price2num($total_discount);

@@ -4890,5 +3904,5 @@
-		foreach ($this->lines as $line) {

-			if (isset($line->qty_asked)) {

-				if (empty($totalOrdered)) {

-					$totalOrdered = 0; // Avoid warning because $totalOrdered is ''

-				}

+		foreach ($this->lines as $line)

+		{

+			if (isset($line->qty_asked))

+			{

+				if (empty($totalOrdered)) $totalOrdered = 0; // Avoid warning because $totalOrdered is ''

@@ -4897,4 +3911,3 @@
-			if (isset($line->qty_shipped)) {

-				if (empty($totalToShip)) {

-					$totalToShip = 0; // Avoid warning because $totalToShip is ''

-				}

+			if (isset($line->qty_shipped))

+			{

+				if (empty($totalToShip)) $totalToShip = 0; // Avoid warning because $totalToShip is ''

@@ -4902,4 +3915,4 @@
-			} elseif ($line->element == 'commandefournisseurdispatch' && isset($line->qty)) {

-				if (empty($totalToShip)) {

-					$totalToShip = 0;

-				}

+			}

+			elseif ($line->element == 'commandefournisseurdispatch' && isset($line->qty))

+			{

+				if (empty($totalToShip)) $totalToShip = 0;

@@ -4913 +3926,2 @@
-			} else {

+			}

+			else {

@@ -4917,3 +3931,3 @@
-			$weight = !empty($line->weight) ? $line->weight : 0;

-			($weight == 0 && !empty($line->product->weight)) ? $weight = $line->product->weight : 0;

-			$volume = !empty($line->volume) ? $line->volume : 0;

+			$weight = $line->weight ? $line->weight : 0;

+            ($weight == 0 && !empty($line->product->weight)) ? $weight = $line->product->weight : 0;

+			$volume = $line->volume ? $line->volume : 0;

@@ -4922 +3936 @@
-			$weight_units = !empty($line->weight_units) ? $line->weight_units : 0;

+			$weight_units = $line->weight_units;

@@ -4924 +3938 @@
-			$volume_units = !empty($line->volume_units) ? $line->volume_units : 0;

+			$volume_units = $line->volume_units;

@@ -4929,13 +3943,5 @@
-			if (!empty($weight_units)) {

-				$weightUnit = $weight_units;

-			}

-			if (!empty($volume_units)) {

-				$volumeUnit = $volume_units;

-			}

-

-			if (empty($totalWeight)) {

-				$totalWeight = 0; // Avoid warning because $totalWeight is ''

-			}

-			if (empty($totalVolume)) {

-				$totalVolume = 0; // Avoid warning because $totalVolume is ''

-			}

+			if (!empty($weight_units)) $weightUnit = $weight_units;

+			if (!empty($volume_units)) $volumeUnit = $volume_units;

+

+			if (empty($totalWeight)) $totalWeight = 0; // Avoid warning because $totalWeight is ''

+			if (empty($totalVolume)) $totalVolume = 0; // Avoid warning because $totalVolume is ''

@@ -4944 +3950,2 @@
-			if ($weight_units < 50) {   // < 50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)

+			if ($weight_units < 50)   // < 50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)

+			{

@@ -4947 +3954,2 @@
-			} else {

+			}

+			else {

@@ -4956 +3964,2 @@
-				} else {

+				}

+				else {

@@ -4960 +3969,2 @@
-			if ($volume_units < 50) {   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)

+			if ($volume_units < 50)   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)

+			{

@@ -4965 +3975,3 @@
-			} else {

+			}

+			else

+			{

@@ -4977 +3989 @@
-	 *	@return	int      Return integer <0 if KO, >0 if OK

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

@@ -4985 +3997 @@
-		$sql = "UPDATE ".$this->db->prefix().$this->table_element;

+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;

@@ -4987 +3999 @@
-		$sql .= " WHERE rowid = ".((int) $this->id);

+		$sql .= " WHERE rowid = ".$this->id;

@@ -4991 +4003,2 @@
-		if (!$resql) {

+		if (!$resql)

+		{

@@ -4995 +4008,3 @@
-		} else {

+		}

+		else

+		{

@@ -4998,0 +4014,98 @@
+	}

+

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+	/**

+	 *    Return incoterms informations

+	 *    TODO Use a cache for label get

+	 *

+	 *    @return	string	incoterms info

+	 */

+	public function display_incoterms()

+	{

+        // phpcs:enable

+		$out = '';

+		$this->label_incoterms = '';

+		if (!empty($this->fk_incoterms))

+		{

+			$sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'c_incoterms WHERE rowid = '.(int) $this->fk_incoterms;

+			$result = $this->db->query($sql);

+			if ($result)

+			{

+				$res = $this->db->fetch_object($result);

+				$out .= $res->code;

+			}

+		}

+

+		$out .= (($res->code && $this->location_incoterms) ? ' - ' : '').$this->location_incoterms;

+

+		return $out;

+	}

+

+	/**

+	 *    Return incoterms informations for pdf display

+	 *

+	 *    @return	string		incoterms info

+	 */

+	public function getIncotermsForPDF()

+	{

+		$sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'c_incoterms WHERE rowid = '.(int) $this->fk_incoterms;

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

+		if ($resql)

+		{

+			$num = $this->db->num_rows($resql);

+			if ($num > 0)

+			{

+				$res = $this->db->fetch_object($resql);

+				return 'Incoterm : '.$res->code.' - '.$this->location_incoterms;

+			}

+			else

+			{

+				return '';

+			}

+		}

+		else

+		{

+			$this->errors[] = $this->db->lasterror();

+			return false;

+		}

+	}

+

+	/**

+	 *    Define incoterms values of current object

+	 *

+	 *    @param	int		$id_incoterm     Id of incoterm to set or '' to remove

+	 * 	  @param 	string  $location		 location of incoterm

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

+	 */

+	public function setIncoterms($id_incoterm, $location)

+	{

+		if ($this->id && $this->table_element)

+		{

+			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;

+			$sql .= " SET fk_incoterms = ".($id_incoterm > 0 ? $id_incoterm : "null");

+			$sql .= ", location_incoterms = ".($id_incoterm > 0 ? "'".$this->db->escape($location)."'" : "null");

+			$sql .= " WHERE rowid = ".$this->id;

+			dol_syslog(get_class($this).'::setIncoterms', LOG_DEBUG);

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

+			if ($resql)

+			{

+				$this->fk_incoterms = $id_incoterm;

+				$this->location_incoterms = $location;

+

+				$sql = 'SELECT libelle FROM '.MAIN_DB_PREFIX.'c_incoterms WHERE rowid = '.(int) $this->fk_incoterms;

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

+				if ($res)

+				{

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

+					$this->label_incoterms = $obj->libelle;

+				}

+				return 1;

+			}

+			else

+			{

+				$this->errors[] = $this->db->lasterror();

+				return -1;

+			}

+		}

+		else return -1;

@@ -5019 +4132,2 @@
-		global $conf, $user, $langs, $object, $hookmanager, $extrafields, $form;

+		global $conf, $user, $langs, $object, $hookmanager, $extrafields;

+		global $form;

@@ -5022 +4136,2 @@
-		if (!is_object($extrafields)) {

+		if (!is_object($extrafields))

+		{

@@ -5032,2 +4147,4 @@
-		foreach ($dirtpls as $module => $reldir) {

-			if (!empty($module)) {

+		foreach ($dirtpls as $module => $reldir)

+		{

+			if (!empty($module))

+			{

@@ -5035 +4152,3 @@
-			} else {

+			}

+			else

+			{

@@ -5044,3 +4163 @@
-			if ($res) {

-				break;

-			}

+			if ($res) break;

@@ -5062,3 +4179,3 @@
-	 *	@param  Societe		$seller            	Object of seller third party

-	 *	@param  Societe  	$buyer             	Object of buyer third party

-	 *	@param	int			$selected		   	ID line selected

+	 *	@param  string		$seller            	Object of seller third party

+	 *	@param  string  	$buyer             	Object of buyer third party

+	 *	@param	int			$selected		   	Object line selected

@@ -5077,3 +4194 @@
-		if (isModEnabled('margin') && !empty($this->element) && in_array($this->element, array('facture', 'facturerec', 'propal', 'commande'))) {

-			$usemargins = 1;

-		}

+		if (!empty($conf->margin->enabled) && !empty($this->element) && in_array($this->element, array('facture', 'facturerec', 'propal', 'commande'))) $usemargins = 1;

@@ -5084 +4199,2 @@
-		if (!is_object($extrafields)) {

+		if (!is_object($extrafields))

+		{

@@ -5092 +4208,2 @@
-		if (empty($reshook)) {

+		if (empty($reshook))

+		{

@@ -5097,3 +4214,4 @@
-			foreach ($dirtpls as $module => $reldir) {

-				$res = 0;

-				if (!empty($module)) {

+			foreach ($dirtpls as $module => $reldir)

+			{

+				if (!empty($module))

+				{

@@ -5100,0 +4219,7 @@
+				}

+				else

+				{

+					$tpl = DOL_DOCUMENT_ROOT.$reldir.'/objectline_title.tpl.php';

+				}

+				if (empty($conf->file->strict_mode)) {

+					$res = @include $tpl;

@@ -5102,12 +4227,3 @@
-					$tpl = DOL_DOCUMENT_ROOT.$reldir.'/objectline_title.tpl.php';

-				}

-				if (file_exists($tpl)) {

-					if (empty($conf->file->strict_mode)) {

-						$res = @include $tpl;

-					} else {

-						$res = include $tpl; // for debug

-					}

-				}

-				if ($res) {

-					break;

-				}

+					$res = include $tpl; // for debug

+				}

+				if ($res) break;

@@ -5120 +4236,2 @@
-		foreach ($this->lines as $line) {

+		foreach ($this->lines as $line)

+		{

@@ -5124,4 +4241,6 @@
-			//if (is_object($hookmanager) && (($line->product_type == 9 && !empty($line->special_code)) || !empty($line->fk_parent_line)))

-			if (is_object($hookmanager)) {   // Old code is commented on preceding line.

-				if (empty($line->fk_parent_line)) {

-					$parameters = array('line'=>$line, 'num'=>$num, 'i'=>$i, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer, 'selected'=>$selected, 'table_element_line'=>$line->table_element, 'defaulttpldir'=>$defaulttpldir);

+			//if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))

+			if (is_object($hookmanager))   // Old code is commented on preceding line.

+			{

+				if (empty($line->fk_parent_line))

+				{

+					$parameters = array('line'=>$line, 'num'=>$num, 'i'=>$i, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer, 'selected'=>$selected, 'table_element_line'=>$line->table_element);

@@ -5129,2 +4248,4 @@
-				} else {

-					$parameters = array('line'=>$line, 'num'=>$num, 'i'=>$i, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer, 'selected'=>$selected, 'table_element_line'=>$line->table_element, 'fk_parent_line'=>$line->fk_parent_line, 'defaulttpldir'=>$defaulttpldir);

+				}

+				else

+				{

+					$parameters = array('line'=>$line, 'num'=>$num, 'i'=>$i, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer, 'selected'=>$selected, 'table_element_line'=>$line->table_element, 'fk_parent_line'=>$line->fk_parent_line);

@@ -5134 +4255,2 @@
-			if (empty($reshook)) {

+			if (empty($reshook))

+			{

@@ -5149 +4271 @@
-	 *	@param  string	    		$var               	Not used

+	 *	@param  string	    		$var               	Is it a an odd line (true)

@@ -5153,3 +4275,3 @@
-	 *	@param  Societe	    		$seller            	Object of seller third party

-	 *	@param  Societe	    		$buyer             	Object of buyer third party

-	 *	@param	int					$selected		   	ID line selected

+	 *	@param  string	    		$seller            	Object of seller third party

+	 *	@param  string	    		$buyer             	Object of buyer third party

+	 *	@param	int					$selected		   	Object line selected

@@ -5168,3 +4290,3 @@
-		// var used into tpl

-		$text = '';

-		$description = '';

+		$element = $this->element;

+

+		$text = ''; $description = '';

@@ -5173 +4295,2 @@
-		if ($action != 'editline' || $selected != $line->id) {

+		if ($action != 'editline' || $selected != $line->id)

+		{

@@ -5175 +4298,2 @@
-			if (!empty($line->fk_product) && $line->fk_product > 0) {

+			if ($line->fk_product > 0)

+			{

@@ -5180 +4304 @@
-				$product_static->label = !empty($line->label) ? $line->label : ""; //can change label in hook

+				$product_static->label = $line->label; //can change label in hook

@@ -5185,2 +4309,4 @@
-				if (getDolGlobalInt('MAIN_MULTILANGS')) {

-					if (property_exists($this, 'socid') && !is_object($this->thirdparty)) {

+				if (!empty($conf->global->MAIN_MULTILANGS))

+				{

+					if (property_exists($this, 'socid') && !is_object($this->thirdparty))

+					{

@@ -5196,7 +4322,4 @@
-					if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {

-						$newlang = GETPOST('lang_id', 'aZ09');

-					}

-					if (getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE') && empty($newlang) && is_object($this->thirdparty)) {

-						$newlang = $this->thirdparty->default_lang; // To use language of customer

-					}

-					if (!empty($newlang)) {

+					if (empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');

+					if (!empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && empty($newlang) && is_object($this->thirdparty)) $newlang = $this->thirdparty->default_lang; // To use language of customer

+					if (!empty($newlang))

+					{

@@ -5208 +4331,3 @@
-				} else {

+				}

+				else

+				{

@@ -5213,4 +4338,4 @@
-				$description .= (getDolGlobalInt('PRODUIT_DESC_IN_FORM_ACCORDING_TO_DEVICE') ? '' : (!empty($line->description) ? dol_htmlentitiesbr($line->description) : '')); // Description is what to show on popup. We shown nothing if already into desc.

-			}

-

-			$line->pu_ttc = price2num((!empty($line->subprice) ? $line->subprice : 0) * (1 + ((!empty($line->tva_tx) ? $line->tva_tx : 0) / 100)), 'MU');

+				$description .= (!empty($conf->global->PRODUIT_DESC_IN_FORM) ? '' : dol_htmlentitiesbr($line->description)); // Description is what to show on popup. We shown nothing if already into desc.

+			}

+

+			$line->pu_ttc = price2num($line->subprice * (1 + ($line->tva_tx / 100)), 'MU');

@@ -5222,3 +4347,4 @@
-			foreach ($dirtpls as $module => $reldir) {

-				$res = 0;

-				if (!empty($module)) {

+			foreach ($dirtpls as $module => $reldir)

+			{

+				if (!empty($module))

+				{

@@ -5225,0 +4352,8 @@
+				}

+				else

+				{

+					$tpl = DOL_DOCUMENT_ROOT.$reldir.'/objectline_view.tpl.php';

+				}

+

+				if (empty($conf->file->strict_mode)) {

+					$res = @include $tpl;

@@ -5227,13 +4361,3 @@
-					$tpl = DOL_DOCUMENT_ROOT.$reldir.'/objectline_view.tpl.php';

-				}

-				//var_dump($tpl);

-				if (file_exists($tpl)) {

-					if (empty($conf->file->strict_mode)) {

-						$res = @include $tpl;

-					} else {

-						$res = include $tpl; // for debug

-					}

-				}

-				if ($res) {

-					break;

-				}

+					$res = include $tpl; // for debug

+				}

+				if ($res) break;

@@ -5244 +4368,2 @@
-		if ($this->statut == 0 && $action == 'editline' && $selected == $line->id) {

+		if ($this->statut == 0 && $action == 'editline' && $selected == $line->id)

+		{

@@ -5253,2 +4378,4 @@
-			foreach ($dirtpls as $module => $reldir) {

-				if (!empty($module)) {

+			foreach ($dirtpls as $module => $reldir)

+			{

+				if (!empty($module))

+				{

@@ -5256 +4383,3 @@
-				} else {

+				}

+				else

+				{

@@ -5265,3 +4394 @@
-				if ($res) {

-					break;

-				}

+				if ($res) break;

@@ -5288 +4415 @@
-		global $langs, $hookmanager, $conf, $form, $action;

+		global $langs, $hookmanager, $conf, $form;

@@ -5291,15 +4418,13 @@
-		print '<td class="linecolref">'.$langs->trans('Ref').'</td>';

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

-		print '<td class="linecolvat right">'.$langs->trans('VATRate').'</td>';

-		print '<td class="linecoluht right">'.$langs->trans('PriceUHT').'</td>';

-		if (isModEnabled("multicurrency")) {

-			print '<td class="linecoluht_currency right">'.$langs->trans('PriceUHTCurrency').'</td>';

-		}

-		print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';

-		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {

-			print '<td class="linecoluseunit left">'.$langs->trans('Unit').'</td>';

-		}

-		print '<td class="linecoldiscount right">'.$langs->trans('ReductionShort').'</td>';

-		print '<td class="linecolht right">'.$langs->trans('TotalHT').'</td>';

-		print '<td class="center">'.$form->showCheckAddButtons('checkforselect', 1).'</td>';

-		print '</tr>';

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

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

+		print '<td class="right">'.$langs->trans('VATRate').'</td>';

+		print '<td class="right">'.$langs->trans('PriceUHT').'</td>';

+		if (!empty($conf->multicurrency->enabled)) print '<td class="right">'.$langs->trans('PriceUHTCurrency').'</td>';

+		print '<td class="right">'.$langs->trans('Qty').'</td>';

+		if ($conf->global->PRODUCT_USE_UNITS)

+		{

+			print '<td class="left">'.$langs->trans('Unit').'</td>';

+		}

+		print '<td class="right">'.$langs->trans('ReductionShort').'</td>';

+        print '<td class="center">'.$form->showCheckAddButtons('checkforselect', 1).'</td>';

+        print '</tr>';

@@ -5308,12 +4433,15 @@
-		if (!empty($this->lines)) {

-			foreach ($this->lines as $line) {

-				$reshook = 0;

-				//if (is_object($hookmanager) && (($line->product_type == 9 && !empty($line->special_code)) || !empty($line->fk_parent_line))) {

-				if (is_object($hookmanager)) {   // Old code is commented on preceding line.

-					$parameters = array('line'=>$line, 'i'=>$i, 'restrictlist'=>$restrictlist, 'selectedLines'=> $selectedLines);

-					if (!empty($line->fk_parent_line)) {

-						$parameters['fk_parent_line'] = $line->fk_parent_line;

-					}

-					$reshook = $hookmanager->executeHooks('printOriginObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks

-				}

-				if (empty($reshook)) {

+		if (!empty($this->lines))

+		{

+			foreach ($this->lines as $line)

+			{

+				if (is_object($hookmanager) && (($line->product_type == 9 && !empty($line->special_code)) || !empty($line->fk_parent_line)))

+				{

+					if (empty($line->fk_parent_line))

+					{

+						$parameters = array('line'=>$line, 'i'=>$i);

+						$action = '';

+						$hookmanager->executeHooks('printOriginObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks

+					}

+				}

+				else

+				{

@@ -5335 +4463 @@
-	 * 	@param	string				$var				Not used

+	 * 	@param	string				$var				Var

@@ -5346 +4474,2 @@
-		if (!empty($line->date_start)) {

+		if (!empty($line->date_start))

+		{

@@ -5348 +4477,3 @@
-		} else {

+		}

+		else

+		{

@@ -5350,5 +4481,4 @@
-			if ($line->date_debut_reel) {

-				$date_start = $line->date_debut_reel;

-			}

-		}

-		if (!empty($line->date_end)) {

+			if ($line->date_debut_reel) $date_start = $line->date_debut_reel;

+		}

+		if (!empty($line->date_end))

+		{

@@ -5356 +4486,3 @@
-		} else {

+		}

+		else

+		{

@@ -5358,6 +4490,4 @@
-			if ($line->date_fin_reel) {

-				$date_end = $line->date_fin_reel;

-			}

-		}

-

-		$this->tpl['id'] = $line->id;

+			if ($line->date_fin_reel) $date_end = $line->date_fin_reel;

+		}

+

+        $this->tpl['id'] = $line->id;

@@ -5366,5 +4496,4 @@
-		if (!empty($line->fk_parent_line)) {

-			$this->tpl['label'] .= img_picto('', 'rightarrow');

-		}

-

-		if (($line->info_bits & 2) == 2) {  // TODO Not sure this is used for source object

+		if (!empty($line->fk_parent_line)) $this->tpl['label'] .= img_picto('', 'rightarrow');

+

+		if (($line->info_bits & 2) == 2)  // TODO Not sure this is used for source object

+		{

@@ -5372,3 +4501 @@
-			if (property_exists($this, 'socid')) {

-				$discount->fk_soc = $this->socid;

-			}

+			$discount->fk_soc = $this->socid;

@@ -5376 +4503,3 @@
-		} elseif (!empty($line->fk_product)) {

+		}

+		elseif (!empty($line->fk_product))

+		{

@@ -5389 +4518,2 @@
-			if ($line->product_type == 1 && ($date_start || $date_end)) {

+			if ($line->product_type == 1 && ($date_start || $date_end))

+			{

@@ -5392 +4522,3 @@
-		} else {

+		}

+		else

+		{

@@ -5401 +4533,2 @@
-			if ($line->product_type == 1 && ($date_start || $date_end)) {

+			if ($line->product_type == 1 && ($date_start || $date_end))

+			{

@@ -5406,2 +4539,4 @@
-		if (!empty($line->desc)) {

-			if ($line->desc == '(CREDIT_NOTE)') {  // TODO Not sure this is used for source object

+		if (!empty($line->desc))

+		{

+			if ($line->desc == '(CREDIT_NOTE)')  // TODO Not sure this is used for source object

+			{

@@ -5411 +4546,3 @@
-			} elseif ($line->desc == '(DEPOSIT)') {  // TODO Not sure this is used for source object

+			}

+			elseif ($line->desc == '(DEPOSIT)')  // TODO Not sure this is used for source object

+			{

@@ -5415 +4552,3 @@
-			} elseif ($line->desc == '(EXCESS RECEIVED)') {

+			}

+			elseif ($line->desc == '(EXCESS RECEIVED)')

+			{

@@ -5419 +4558,3 @@
-			} elseif ($line->desc == '(EXCESS PAID)') {

+			}

+			elseif ($line->desc == '(EXCESS PAID)')

+			{

@@ -5423 +4564,3 @@
-			} else {

+			}

+			else

+			{

@@ -5426 +4569,3 @@
-		} else {

+		}

+		else

+		{

@@ -5430,6 +4575,4 @@
-		// VAT Rate

-		$this->tpl['vat_rate'] = vatrate($line->tva_tx, true);

-		$this->tpl['vat_rate'] .= (($line->info_bits & 1) == 1) ? '*' : '';

-		if (!empty($line->vat_src_code) && !preg_match('/\(/', $this->tpl['vat_rate'])) {

-			$this->tpl['vat_rate'] .= ' ('.$line->vat_src_code.')';

-		}

+        // VAT Rate

+        $this->tpl['vat_rate'] = vatrate($line->tva_tx, true);

+        $this->tpl['vat_rate'] .= (($line->info_bits & 1) == 1) ? '*' : '';

+        if (!empty($line->vat_src_code) && !preg_match('/\(/', $this->tpl['vat_rate'])) $this->tpl['vat_rate'] .= ' ('.$line->vat_src_code.')';

@@ -5438 +4580,0 @@
-		$this->tpl['total_ht'] = price($line->total_ht);

@@ -5441,3 +4583 @@
-		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {

-			$this->tpl['unit'] = $langs->transnoentities($line->getLabelOfUnit('long'));

-		}

+		if ($conf->global->PRODUCT_USE_UNITS) $this->tpl['unit'] = $langs->transnoentities($line->getLabelOfUnit('long'));

@@ -5448,3 +4588 @@
-		if ($restrictlist == 'services' && $line->product_type != Product::TYPE_SERVICE) {

-			$this->tpl['strike'] = 1;

-		}

+		if ($restrictlist == 'services' && $line->product_type != Product::TYPE_SERVICE) $this->tpl['strike'] = 1;

@@ -5455,2 +4593,4 @@
-		foreach ($dirtpls as $module => $reldir) {

-			if (!empty($module)) {

+		foreach ($dirtpls as $module => $reldir)

+		{

+			if (!empty($module))

+			{

@@ -5458 +4598,3 @@
-			} else {

+			}

+			else

+			{

@@ -5467,8 +4609,6 @@
-			if ($res) {

-				break;

-			}

-		}

-	}

-

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+			if ($res) break;

+		}

+	}

+

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

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

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

@@ -5487 +4627 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -5490 +4630 @@
-		$sql = "INSERT INTO ".$this->db->prefix()."element_resources (";

+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_resources (";

@@ -5498 +4638 @@
-		$sql .= ((int) $resource_id);

+		$sql .= $resource_id;

@@ -5507 +4647,2 @@
-		if ($this->db->query($sql)) {

+		if ($this->db->query($sql))

+		{

@@ -5510 +4651,3 @@
-		} else {

+		}

+		else

+		{

@@ -5517 +4660 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -5528 +4671 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -5533,2 +4676,2 @@
-		$sql = "DELETE FROM ".$this->db->prefix()."element_resources";

-		$sql .= " WHERE rowid = ".((int) $rowid);

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

+		$sql .= " WHERE rowid=".$rowid;

@@ -5539 +4682,2 @@
-		if (!$resql) {

+		if (!$resql)

+		{

@@ -5543,2 +4687,5 @@
-		} else {

-			if (!$notrigger) {

+		}

+		else

+		{

+			if (!$notrigger)

+			{

@@ -5546,4 +4693 @@
-				if ($result < 0) {

-					$this->db->rollback();

-					return -1;

-				}

+				if ($result < 0) { $this->db->rollback(); return -1; }

@@ -5565 +4709,2 @@
-		if (isset($this->lines) && is_array($this->lines)) {

+		if (isset($this->lines) && is_array($this->lines))

+		{

@@ -5567,4 +4712,3 @@
-			for ($i = 0; $i < $nboflines; $i++) {

-				if (is_object($this->lines[$i])) {

-					$this->lines[$i] = clone $this->lines[$i];

-				}

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

+			{

+				$this->lines[$i] = clone $this->lines[$i];

@@ -5579 +4723 @@
-	 * @param 	string 		$modele 		Generator to use. Caller must set it to obj->model_pdf or GETPOST('model_pdf','alpha') for example.

+	 * @param 	string 		$modele 		Generator to use. Caller must set it to obj->modelpdf or GETPOST('modelpdf','alpha') for example.

@@ -5597,293 +4741,251 @@
-		if (!empty($reshook)) {

-			return $reshook;

-		}

-

-		dol_syslog("commonGenerateDocument modele=".$modele." outputlangs->defaultlang=".(is_object($outputlangs) ? $outputlangs->defaultlang : 'null'));

-

-		if (empty($modele)) {

-			$this->error = 'BadValueForParameterModele';

-			return -1;

-		}

-

-		// Increase limit for PDF build

-		$err = error_reporting();

-		error_reporting(0);

-		@set_time_limit(120);

-		error_reporting($err);

-

-		// If selected model is a filename template (then $modele="modelname" or "modelname:filename")

-		$tmp = explode(':', $modele, 2);

-		$saved_model = $modele;

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

-			$modele = $tmp[0];

-			$srctemplatepath = $tmp[1];

-		}

-

-		// Search template files

-		$file = '';

-		$classname = '';

-		$filefound = '';

-		$dirmodels = array('/');

-		if (is_array($conf->modules_parts['models'])) {

-			$dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);

-		}

-		foreach ($dirmodels as $reldir) {

-			foreach (array('doc', 'pdf') as $prefix) {

-				if (in_array(get_class($this), array('Adherent'))) {

-					// Member module use prefix_modele.class.php

-					$file = $prefix."_".$modele.".class.php";

-				} else {

-					// Other module use prefix_modele.modules.php

-					$file = $prefix."_".$modele.".modules.php";

-				}

-

-				$file = dol_sanitizeFileName($file);

-

-				// We chack if file exists

-				$file = dol_buildpath($reldir.$modelspath.$file, 0);

-				if (file_exists($file)) {

-					$filefound = $file;

-					$classname = $prefix.'_'.$modele;

-					break;

-				}

-			}

-			if ($filefound) {

-				break;

-			}

-		}

-

-		if (!$filefound) {

-			$this->error = $langs->trans("Error").' Failed to load doc generator with modelpaths='.$modelspath.' - modele='.$modele;

-			$this->errors[] = $this->error;

-			dol_syslog($this->error, LOG_ERR);

-			return -1;

-		}

-

-		// Sanitize $filefound

-		$filefound = dol_sanitizePathName($filefound);

-

-		// If generator was found

-		global $db; // Required to solve a conception default making an include of some code that uses $db instead of $this->db just after.

-

-		require_once $filefound;

-

-		$obj = new $classname($this->db);

-

-		// If generator is ODT, we must have srctemplatepath defined, if not we set it.

-		if ($obj->type == 'odt' && empty($srctemplatepath)) {

-			$varfortemplatedir = $obj->scandir;

-			if ($varfortemplatedir && getDolGlobalString($varfortemplatedir)) {

-				$dirtoscan = getDolGlobalString($varfortemplatedir);

-

-				$listoffiles = array();

-

-				// Now we add first model 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)) {

-						$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.od(s|t)$', '', 'name', SORT_ASC, 0);

-						if (count($tmpfiles)) {

-							$listoffiles = array_merge($listoffiles, $tmpfiles);

-						}

-					}

-				}

-

-				if (count($listoffiles)) {

-					foreach ($listoffiles as $record) {

-						$srctemplatepath = $record['fullname'];

-						break;

-					}

-				}

-			}

-

-			if (empty($srctemplatepath)) {

-				$this->error = 'ErrorGenerationAskedForOdtTemplateWithSrcFileNotDefined';

-				return -1;

-			}

-		}

-

-		if ($obj->type == 'odt' && !empty($srctemplatepath)) {

-			if (!dol_is_file($srctemplatepath)) {

-				dol_syslog("Failed to locate template file ".$srctemplatepath, LOG_WARNING);

-				$this->error = 'ErrorGenerationAskedForOdtTemplateWithSrcFileNotFound';

-				return -1;

-			}

-		}

-

-		// We save charset_output to restore it because write_file can change it if needed for

-		// output format that does not support UTF8.

-		$sav_charset_output = empty($outputlangs->charset_output) ? '' : $outputlangs->charset_output;

-

-		// update model_pdf in object

-		$this->model_pdf = $saved_model;

-

-		if (in_array(get_class($this), array('Adherent'))) {

-			$resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, 'member', 1, 'tmp_cards', $moreparams);

-		} else {

-			$resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref, $moreparams);

-		}

-		// After call of write_file $obj->result['fullpath'] is set with generated file. It will be used to update the ECM database index.

-

-		if ($resultwritefile > 0) {

-			$outputlangs->charset_output = $sav_charset_output;

-

-			// We delete old preview

-			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

-			dol_delete_preview($this);

-

-			// Index file in database

-			if (!empty($obj->result['fullpath'])) {

-				$destfull = $obj->result['fullpath'];

-

-				// Update the last_main_doc field into main object (if document generator has property ->update_main_doc_field set)

-				$update_main_doc_field = 0;

-				if (!empty($obj->update_main_doc_field)) {

-					$update_main_doc_field = 1;

-				}

-

-				// Check that the file exists, before indexing it.

-				// Hint: It does not exist, if we create a PDF and auto delete the ODT File

-				if (dol_is_file($destfull)) {

-					$this->indexFile($destfull, $update_main_doc_field);

-				}

-			} else {

-				dol_syslog('Method ->write_file was called on object '.get_class($obj).' and return a success but the return array ->result["fullpath"] was not set.', LOG_WARNING);

-			}

-

-			// Success in building document. We build meta file.

-			dol_meta_create($this);

-

-			return 1;

-		} else {

-			$outputlangs->charset_output = $sav_charset_output;

-			$this->error = $obj->error;

-			$this->errors = $obj->errors;

-			dol_syslog("Error generating document for ".__CLASS__.". Error: ".$obj->error, LOG_ERR);

-			return -1;

-		}

-	}

-

-	/**

-	 * Index a file into the ECM database

-	 *

-	 * @param	string	$destfull				Full path of file to index

-	 * @param	int		$update_main_doc_field	Update field main_doc fied into the table of object.

-	 * 											This param is set when called for a document generation if document generator hase

-	 * 											->update_main_doc_field set and returns ->result['fullpath'].

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

-	 */

-	public function indexFile($destfull, $update_main_doc_field)

-	{

-		global $conf, $user;

-

-		$upload_dir = dirname($destfull);

-		$destfile = basename($destfull);

-		$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $upload_dir);

-

-		if (!preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir)) {     // If not a tmp dir

-			$filename = basename($destfile);

-			$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);

-			$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);

-

-			include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';

-			$ecmfile = new EcmFiles($this->db);

-			$result = $ecmfile->fetch(0, '', ($rel_dir ? $rel_dir.'/' : '').$filename);

-

-			// Set the public "share" key

-			$setsharekey = false;

-			if ($this->element == 'propal' || $this->element == 'proposal') {

-				if (getDolGlobalInt("PROPOSAL_ALLOW_ONLINESIGN")) {

-					$setsharekey = true;	// feature to make online signature is not set or set to on (default)

-				}

-				if (getDolGlobalInt("PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD")) {

-					$setsharekey = true;

-				}

-			}

-			if ($this->element == 'commande' && getDolGlobalInt("ORDER_ALLOW_EXTERNAL_DOWNLOAD")) {

-				$setsharekey = true;

-			}

-			if ($this->element == 'facture' && getDolGlobalInt("INVOICE_ALLOW_EXTERNAL_DOWNLOAD")) {

-				$setsharekey = true;

-			}

-			if ($this->element == 'bank_account' && getDolGlobalInt("BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD")) {

-				$setsharekey = true;

-			}

-			if ($this->element == 'product' && getDolGlobalInt("PRODUCT_ALLOW_EXTERNAL_DOWNLOAD")) {

-				$setsharekey = true;

-			}

-			if ($this->element == 'contrat' && getDolGlobalInt("CONTRACT_ALLOW_EXTERNAL_DOWNLOAD")) {

-				$setsharekey = true;

-			}

-			if ($this->element == 'fichinter' && getDolGlobalInt("FICHINTER_ALLOW_EXTERNAL_DOWNLOAD")) {

-				$setsharekey = true;

-			}

-			if ($this->element == 'supplier_proposal' && getDolGlobalInt("SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD")) {

-				$setsharekey = true;

-			}

-			if ($this->element == 'societe_rib' && getDolGlobalInt("SOCIETE_RIB_ALLOW_ONLINESIGN")) {

-				$setsharekey = true;

-			}

-

-			if ($setsharekey) {

-				if (empty($ecmfile->share)) {	// Because object not found or share not set yet

-					require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';

-					$ecmfile->share = getRandomPassword(true);

-				}

-			}

-

-			if ($result > 0) {

-				$ecmfile->label = md5_file(dol_osencode($destfull)); // hash of file content

-				$ecmfile->fullpath_orig = '';

-				$ecmfile->gen_or_uploaded = 'generated';

-				$ecmfile->description = ''; // indexed content

-				$ecmfile->keywords = ''; // keyword content

-				$result = $ecmfile->update($user);

-				if ($result < 0) {

-					setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');

-					return -1;

-				}

-			} else {

-				$ecmfile->entity = $conf->entity;

-				$ecmfile->filepath = $rel_dir;

-				$ecmfile->filename = $filename;

-				$ecmfile->label = md5_file(dol_osencode($destfull)); // hash of file content

-				$ecmfile->fullpath_orig = '';

-				$ecmfile->gen_or_uploaded = 'generated';

-				$ecmfile->description = ''; // indexed content

-				$ecmfile->keywords = ''; // keyword content

-				$ecmfile->src_object_type = $this->table_element;	// $this->table_name is 'myobject' or 'mymodule_myobject'.

-				$ecmfile->src_object_id   = $this->id;

-

-				$result = $ecmfile->create($user);

-				if ($result < 0) {

-					setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');

-					return -1;

-				}

-			}

-

-			/*$this->result['fullname']=$destfull;

-			 $this->result['filepath']=$ecmfile->filepath;

-			 $this->result['filename']=$ecmfile->filename;*/

-			//var_dump($obj->update_main_doc_field);exit;

-

-			if ($update_main_doc_field && !empty($this->table_element)) {

-				$sql = "UPDATE ".$this->db->prefix().$this->table_element." SET last_main_doc = '".$this->db->escape($ecmfile->filepath."/".$ecmfile->filename)."'";

-				$sql .= " WHERE rowid = ".((int) $this->id);

-

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

-				if (!$resql) {

-					dol_print_error($this->db);

-					return -1;

-				} else {

-					$this->last_main_doc = $ecmfile->filepath.'/'.$ecmfile->filename;

-				}

-			}

-		}

-

-		return 1;

+		if (empty($reshook))

+		{

+		    dol_syslog("commonGenerateDocument modele=".$modele." outputlangs->defaultlang=".(is_object($outputlangs) ? $outputlangs->defaultlang : 'null'));

+

+		    // Increase limit for PDF build

+		    $err = error_reporting();

+		    error_reporting(0);

+		    @set_time_limit(120);

+		    error_reporting($err);

+

+		    // If selected model is a filename template (then $modele="modelname" or "modelname:filename")

+		    $tmp = explode(':', $modele, 2);

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

+		    {

+			    $modele = $tmp[0];

+			    $srctemplatepath = $tmp[1];

+		    }

+

+		    // Search template files

+			$file = '';

+			$classname = '';

+			$filefound = '';

+		    $dirmodels = array('/');

+		    if (is_array($conf->modules_parts['models'])) $dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);

+		    foreach ($dirmodels as $reldir)

+		    {

+			    foreach (array('doc', 'pdf') as $prefix)

+			    {

+				    if (in_array(get_class($this), array('Adherent'))) $file = $prefix."_".$modele.".class.php"; // Member module use prefix_module.class.php

+				    else $file = $prefix."_".$modele.".modules.php";

+

+				    // On verifie l'emplacement du modele

+				    $file = dol_buildpath($reldir.$modelspath.$file, 0);

+				    if (file_exists($file))

+				    {

+					    $filefound = $file;

+					    $classname = $prefix.'_'.$modele;

+					    break;

+				    }

+			    }

+			    if ($filefound) break;

+		    }

+

+		    // If generator was found

+		    if ($filefound)

+		    {

+			    global $db; // Required to solve a conception default making an include of code using $db instead of $this->db just after.

+

+			    require_once $file;

+

+			    $obj = new $classname($this->db);

+

+			    // If generator is ODT, we must have srctemplatepath defined, if not we set it.

+			    if ($obj->type == 'odt' && empty($srctemplatepath))

+			    {

+				    $varfortemplatedir = $obj->scandir;

+				    if ($varfortemplatedir && !empty($conf->global->$varfortemplatedir))

+				    {

+					    $dirtoscan = $conf->global->$varfortemplatedir;

+

+					    $listoffiles = array();

+

+					    // Now we add first model 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))

+						    {

+							    $tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.od(s|t)$', '', 'name', SORT_ASC, 0);

+							    if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);

+						    }

+					    }

+

+					    if (count($listoffiles))

+					    {

+						    foreach ($listoffiles as $record)

+						    {

+							    $srctemplatepath = $record['fullname'];

+							    break;

+						    }

+					    }

+				    }

+

+				    if (empty($srctemplatepath))

+				    {

+					    $this->error = 'ErrorGenerationAskedForOdtTemplateWithSrcFileNotDefined';

+					    return -1;

+				    }

+			    }

+

+			    if ($obj->type == 'odt' && !empty($srctemplatepath))

+			    {

+				    if (!dol_is_file($srctemplatepath))

+				    {

+				    	dol_syslog("Failed to locate template file ".$srctemplatepath, LOG_WARNING);

+					    $this->error = 'ErrorGenerationAskedForOdtTemplateWithSrcFileNotFound';

+					    return -1;

+				    }

+			    }

+

+			    // We save charset_output to restore it because write_file can change it if needed for

+			    // output format that does not support UTF8.

+			    $sav_charset_output = $outputlangs->charset_output;

+

+			    if (in_array(get_class($this), array('Adherent')))

+			    {

+				    $arrayofrecords = array(); // The write_file of templates of adherent class need this var

+				    $resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, 'member', 1, $moreparams);

+			    }

+			    else

+			    {

+				     $resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref, $moreparams);

+			    }

+			    // After call of write_file $obj->result['fullpath'] is set with generated file. It will be used to update the ECM database index.

+

+			    if ($resultwritefile > 0)

+			    {

+				    $outputlangs->charset_output = $sav_charset_output;

+

+				    // We delete old preview

+				    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

+				    dol_delete_preview($this);

+

+				    // Index file in database

+				    if (!empty($obj->result['fullpath']))

+				    {

+					    $destfull = $obj->result['fullpath'];

+					    $upload_dir = dirname($destfull);

+					    $destfile = basename($destfull);

+					    $rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $upload_dir);

+

+					    if (!preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir

+					    {

+						    $filename = basename($destfile);

+						    $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);

+						    $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);

+

+						    include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';

+						    $ecmfile = new EcmFiles($this->db);

+						    $result = $ecmfile->fetch(0, '', ($rel_dir ? $rel_dir.'/' : '').$filename);

+

+						     // Set the public "share" key

+						    $setsharekey = false;

+						    if ($this->element == 'propal')

+						    {

+							    $useonlinesignature = $conf->global->MAIN_FEATURES_LEVEL; // Replace this with 1 when feature to make online signature is ok

+							    if ($useonlinesignature) $setsharekey = true;

+							    if (!empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) $setsharekey = true;

+						    }

+						    if ($this->element == 'commande' && !empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD)) {

+							    $setsharekey = true;

+						    }

+						    if ($this->element == 'facture' && !empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD)) {

+							    $setsharekey = true;

+						    }

+						    if ($this->element == 'bank_account' && !empty($conf->global->BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD)) {

+							    $setsharekey = true;

+						    }

+

+						    if ($setsharekey) {

+							    if (empty($ecmfile->share))	// Because object not found or share not set yet

+							    {

+								    require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';

+								    $ecmfile->share = getRandomPassword(true);

+							    }

+						    }

+

+						    if ($result > 0)

+						     {

+							    $ecmfile->label = md5_file(dol_osencode($destfull)); // hash of file content

+							    $ecmfile->fullpath_orig = '';

+							    $ecmfile->gen_or_uploaded = 'generated';

+							    $ecmfile->description = ''; // indexed content

+							    $ecmfile->keyword = ''; // keyword content

+							    $result = $ecmfile->update($user);

+							    if ($result < 0) {

+								    setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');

+							    }

+						    }

+						    else

+						    {

+							    $ecmfile->entity = $conf->entity;

+							    $ecmfile->filepath = $rel_dir;

+							    $ecmfile->filename = $filename;

+							    $ecmfile->label = md5_file(dol_osencode($destfull)); // hash of file content

+							    $ecmfile->fullpath_orig = '';

+							    $ecmfile->gen_or_uploaded = 'generated';

+							    $ecmfile->description = ''; // indexed content

+							    $ecmfile->keyword = ''; // keyword content

+							    $ecmfile->src_object_type = $this->table_element;

+							    $ecmfile->src_object_id   = $this->id;

+

+							    $result = $ecmfile->create($user);

+							    if ($result < 0) {

+								    setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');

+							    }

+						    }

+

+						    /*$this->result['fullname']=$destfull;

+						    $this->result['filepath']=$ecmfile->filepath;

+						    $this->result['filename']=$ecmfile->filename;*/

+						    //var_dump($obj->update_main_doc_field);exit;

+

+						    // Update the last_main_doc field into main object (if documenent generator has property ->update_main_doc_field set)

+						    $update_main_doc_field = 0;

+						    if (!empty($obj->update_main_doc_field)) $update_main_doc_field = 1;

+						    if ($update_main_doc_field && !empty($this->table_element))

+						    {

+							    $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element." SET last_main_doc = '".$this->db->escape($ecmfile->filepath.'/'.$ecmfile->filename)."'";

+							    $sql .= ' WHERE rowid = '.$this->id;

+

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

+							    if (!$resql) {

+									dol_print_error($this->db);

+								} else {

+							        $this->last_main_doc = $ecmfile->filepath.'/'.$ecmfile->filename;

+							    }

+						    }

+					    }

+				    }

+				    else

+				    {

+					    dol_syslog('Method ->write_file was called on object '.get_class($obj).' and return a success but the return array ->result["fullpath"] was not set.', LOG_WARNING);

+				    }

+

+				    // Success in building document. We build meta file.

+				    dol_meta_create($this);

+

+				    return 1;

+			    }

+			    else

+			    {

+				    $outputlangs->charset_output = $sav_charset_output;

+				    dol_print_error($this->db, "Error generating document for ".__CLASS__.". Error: ".$obj->error, $obj->errors);

+				    return -1;

+			    }

+		    } else {

+		    	if (! $filefound) {

+			    	$this->error = $langs->trans("Error").' Failed to load doc generator with modelpaths='.$modelspath.' - modele='.$modele;

+			    	dol_print_error('', $this->error);

+		    	} else {

+		    		$this->error = $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $filefound);

+		    		dol_print_error('', $this->error);

+		    	}

+			    return -1;

+		    }

+		}

+		else return $reshook;

@@ -5900,0 +5003,4 @@
+		global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini, $quality;

+

+		require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; // This define also $maxwidthsmall, $quality, ...

+

@@ -5902,12 +5008,2 @@
-

-		if (file_exists($file_osencoded)) {

-			require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';

-

-			$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

-

+		if (file_exists($file_osencoded))

+		{

@@ -5922,15 +5017,0 @@
-	}

-

-	/**

-	 *  Delete thumbs

-	 *  @todo Move this into files.lib.php

-	 *

-	 *  @param      string	$file           Path file in UTF8 to original file to delete thumbs.

-	 *	@return		void

-	 */

-	public function delThumbs($file)

-	{

-		$imgThumbName = getImageFileNameForSize($file, '_small'); // Full path of thumb file

-		dol_delete_file($imgThumbName);

-		$imgThumbName = getImageFileNameForSize($file, '_mini'); // Full path of thumb file

-		dol_delete_file($imgThumbName);

@@ -5954 +5034,0 @@
-	 * @param   string              $type    			Type of data

@@ -5957 +5037 @@
-	public function getDefaultCreateValueFor($fieldname, $alternatevalue = null, $type = 'alphanohtml')

+	public function getDefaultCreateValueFor($fieldname, $alternatevalue = null)

@@ -5962,7 +5042,3 @@
-		if (GETPOSTISSET($fieldname)) {

-			return GETPOST($fieldname, $type, 3);

-		}

-

-		if (isset($alternatevalue)) {

-			return $alternatevalue;

-		}

+		if (GETPOSTISSET($fieldname)) return GETPOST($fieldname, 'alphanohtml', 3);

+

+		if (isset($alternatevalue)) return $alternatevalue;

@@ -5971,7 +5047,4 @@
-		if ($newelement == 'facture') {

-			$newelement = 'invoice';

-		}

-		if ($newelement == 'commande') {

-			$newelement = 'order';

-		}

-		if (empty($newelement)) {

+		if ($newelement == 'facture') $newelement = 'invoice';

+		if ($newelement == 'commande') $newelement = 'order';

+		if (empty($newelement))

+		{

@@ -5984,3 +5057 @@
-		if (getDolGlobalString($keyforfieldname)) {

-			return getDolGlobalString($keyforfieldname);

-		}

+		if (isset($conf->global->$keyforfieldname)) return $conf->global->$keyforfieldname;

@@ -5989,3 +5059,0 @@
-		// store content into $conf->cache['overwrite_default']

-

-		return '';

@@ -6014,5 +5082 @@
-		if (!empty(self::TRIGGER_PREFIX) && strpos($triggerName, self::TRIGGER_PREFIX . '_') !== 0) {

-			dol_print_error('', 'The trigger "' . $triggerName . '" does not start with "' . self::TRIGGER_PREFIX . '_" as required.');

-			exit;

-		}

-		if (!is_object($langs)) {	// If lang was not defined, we set it. It is required by run_triggers().

+		if (!is_object($langs)) {	// If lang was not defined, we set it. It is required by run_triggers.

@@ -6027,2 +5091,4 @@
-		if ($result < 0) {

-			if (!empty($this->errors)) {

+		if ($result < 0)

+		{

+			if (!empty($this->errors))

+			{

@@ -6030 +5096,3 @@
-			} else {

+			}

+			else

+			{

@@ -6045 +5113 @@
-	 *  @return	int						Return integer <0 if error, 0 if no values of alternative languages to find nor found, 1 if a value was found and loaded

+	 *  @return	int						<0 if error, 0 if no values of alternative languages to find nor found, 1 if a value was found and loaded

@@ -6064,3 +5132 @@
-		if ($element == 'categorie') {

-			$element = 'categories'; // For compatibility

-		}

+		if ($element == 'categorie') $element = 'categories'; // For compatibility

@@ -6070,3 +5136,3 @@
-		$sql .= " FROM ".$this->db->prefix()."object_lang";

-		$sql .= " WHERE type_object = '".$this->db->escape($element)."'";

-		$sql .= " AND fk_object = ".((int) $this->id);

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

+		$sql .= " WHERE type_object = '".$element."'";

+		$sql .= " AND fk_object = ".$this->id;

@@ -6076 +5142,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -6078 +5145,2 @@
-			if ($numrows) {

+			if ($numrows)

+			{

@@ -6088 +5156,2 @@
-					if (preg_match('/date/', $type)) {

+					if (preg_match('/date/', $type))

+					{

@@ -6090 +5159,3 @@
-					} else {

+					}

+					else

+					{

@@ -6100,6 +5171,5 @@
-			if ($numrows) {

-				return $numrows;

-			} else {

-				return 0;

-			}

-		} else {

+			if ($numrows) return $numrows;

+			else return 0;

+		}

+		else

+		{

@@ -6124,3 +5194 @@
-			if ($tmparray[0] != 'field') {

-				continue;

-			}

+			if ($tmparray[0] != 'field') continue;

@@ -6133,6 +5201,2 @@
-			if (!empty($onlykey) && $key != $onlykey) {

-				continue;

-			}

-			if ($element != $this->element) {

-				continue;

-			}

+			if (!empty($onlykey) && $key != $onlykey) continue;

+			if ($element != $this->element) continue;

@@ -6143,2 +5207,3 @@
-			if (isset($this->fields[$key]['enabled'])) {

-				$enabled = dol_eval($this->fields[$key]['enabled'], 1, 1, '1');

+			if (isset($this->fields[$key]['enabled']))

+			{

+				$enabled = dol_eval($this->fields[$key]['enabled'], 1);

@@ -6149 +5214 @@
-				$perms = dol_eval($this->fields[$key]['perms'], 1, 1, '1');

+				$perms = dol_eval($this->fields[$key]['perms'], 1);

@@ -6151,3 +5216 @@
-			if (empty($enabled)) {

-				continue;

-			}

+			if (empty($enabled)) continue;

@@ -6156 +5219,2 @@
-			if (in_array($key_type, array('date'))) {

+			if (in_array($key_type, array('date')))

+			{

@@ -6159,2 +5223,4 @@
-				$value_key = dol_mktime(0, 0, 0, GETPOST($postfieldkey."month", 'int'), GETPOST($postfieldkey."day", 'int'), GETPOST($postfieldkey."year", 'int'));

-			} elseif (in_array($key_type, array('datetime'))) {

+				$value_key = dol_mktime(0, 0, 0, $_POST[$postfieldkey."month"], $_POST[$postfieldkey."day"], $_POST[$postfieldkey."year"]);

+			}

+			elseif (in_array($key_type, array('datetime')))

+			{

@@ -6163,2 +5229,4 @@
-				$value_key = dol_mktime(GETPOST($postfieldkey."hour", 'int'), GETPOST($postfieldkey."min", 'int'), 0, GETPOST($postfieldkey."month", 'int'), GETPOST($postfieldkey."day", 'int'), GETPOST($postfieldkey."year", 'int'));

-			} elseif (in_array($key_type, array('checkbox', 'chkbxlst'))) {

+				$value_key = dol_mktime($_POST[$postfieldkey."hour"], $_POST[$postfieldkey."min"], 0, $_POST[$postfieldkey."month"], $_POST[$postfieldkey."day"], $_POST[$postfieldkey."year"]);

+			}

+			elseif (in_array($key_type, array('checkbox', 'chkbxlst')))

+			{

@@ -6167 +5235 @@
-					$value_key = implode(',', $value_arr);

+					$value_key = implode($value_arr, ',');

@@ -6171 +5239,3 @@
-			} elseif (in_array($key_type, array('price', 'double'))) {

+			}

+			elseif (in_array($key_type, array('price', 'double')))

+			{

@@ -6174 +5244,3 @@
-			} else {

+			}

+			else

+			{

@@ -6176,3 +5248 @@
-				if (in_array($key_type, array('link')) && $value_key == '-1') {

-					$value_key = '';

-				}

+				if (in_array($key_type, array('link')) && $value_key == '-1') $value_key = '';

@@ -6209 +5279 @@
-		$ret = $this->fetch($id);	/* @phpstan-ignore-line */

+		$ret = $this->fetch($id);

@@ -6223 +5293 @@
-	 *  @return	int						Return integer <0 if error, 0 if no values of extrafield to find nor found, 1 if an attribute is found and value loaded

+	 *  @return	int						<0 if error, 0 if no values of extrafield to find nor found, 1 if an attribute is found and value loaded

@@ -6231,6 +5301,2 @@
-		if (empty($rowid)) {

-			$rowid = $this->id;

-		}

-		if (empty($rowid) && isset($this->rowid)) {

-			$rowid = $this->rowid; // deprecated

-		}

+		if (empty($rowid)) $rowid = $this->id;

+		if (empty($rowid)) $rowid = $this->rowid;

@@ -6245 +5311,2 @@
-		if (!is_array($optionsArray)) {

+		if (!is_array($optionsArray))

+		{

@@ -6247 +5314,2 @@
-			if (!isset($extrafields) || !is_object($extrafields)) {

+			if (!isset($extrafields) || !is_object($extrafields))

+			{

@@ -6253 +5321,2 @@
-			if (empty($extrafields->attributes[$this->table_element]['loaded'])) {

+			if (empty($extrafields->attributes[$this->table_element]['loaded']))

+			{

@@ -6257 +5326,3 @@
-		} else {

+		}

+		else

+		{

@@ -6263,3 +5334 @@
-		if ($table_element == 'categorie') {

-			$table_element = 'categories'; // For compatibility

-		}

+		if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility

@@ -6268 +5337,2 @@
-		if (is_array($optionsArray) && count($optionsArray) > 0) {

+		if (is_array($optionsArray) && count($optionsArray) > 0)

+		{

@@ -6270,2 +5340,4 @@
-			foreach ($optionsArray as $name => $label) {

-				if (empty($extrafields->attributes[$this->table_element]['type'][$name]) || $extrafields->attributes[$this->table_element]['type'][$name] != 'separate') {

+			foreach ($optionsArray as $name => $label)

+			{

+				if (empty($extrafields->attributes[$this->table_element]['type'][$name]) || $extrafields->attributes[$this->table_element]['type'][$name] != 'separate')

+				{

@@ -6275,2 +5347,2 @@
-			$sql .= " FROM ".$this->db->prefix().$table_element."_extrafields";

-			$sql .= " WHERE fk_object = ".((int) $rowid);

+			$sql .= " FROM ".MAIN_DB_PREFIX.$table_element."_extrafields";

+			$sql .= " WHERE fk_object = ".$rowid;

@@ -6280 +5352,2 @@
-			if ($resql) {

+			if ($resql)

+			{

@@ -6282 +5355,2 @@
-				if ($numrows) {

+				if ($numrows)

+				{

@@ -6285 +5359,2 @@
-					foreach ($tab as $key => $value) {

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

+					{

@@ -6287 +5362,2 @@
-						if ($key != 'rowid' && $key != 'tms' && $key != 'fk_member' && !is_int($key)) {

+						if ($key != 'rowid' && $key != 'tms' && $key != 'fk_member' && !is_int($key))

+						{

@@ -6289 +5365,2 @@
-							if (!empty($extrafields->attributes[$this->table_element]) && in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date', 'datetime'))) {

+							if (!empty($extrafields) && in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date', 'datetime')))

+							{

@@ -6292 +5369,3 @@
-							} else {

+							}

+							else

+							{

@@ -6298,3 +5377,9 @@
-						if (!empty($extrafields->attributes[$this->table_element]['type'][$key]) && $extrafields->attributes[$this->table_element]['type'][$key] == 'password') {

-							if (!empty($value) && preg_match('/^dolcrypt:/', $value)) {

-								$this->array_options["options_".$key] = dolDecrypt($value);

+					}

+

+					// If field is a computed field, value must become result of compute

+					foreach ($tab as $key => $value) {

+						if (!empty($extrafields) && !empty($extrafields->attributes[$this->table_element]['computed'][$key]))

+						{

+							//var_dump($conf->disable_compute);

+							if (empty($conf->disable_compute)) {

+								$this->array_options["options_".$key] = dol_eval($extrafields->attributes[$this->table_element]['computed'][$key], 1, 0);

@@ -6306,15 +5390,0 @@
-				// If field is a computed field, value must become result of compute (regardless of whether a row exists

-				// in the element's extrafields table)

-				if (is_array($extrafields->attributes[$this->table_element]['label'])) {

-					foreach ($extrafields->attributes[$this->table_element]['label'] as $key => $val) {

-						if (!empty($extrafields->attributes[$this->table_element]) && !empty($extrafields->attributes[$this->table_element]['computed'][$key])) {

-							//var_dump($conf->disable_compute);

-							if (empty($conf->disable_compute)) {

-								global $objectoffield;        // We set a global variable to $objectoffield so

-								$objectoffield = $this;        // we can use it inside computed formula

-								$this->array_options['options_' . $key] = dol_eval($extrafields->attributes[$this->table_element]['computed'][$key], 1, 0, '2');

-							}

-						}

-					}

-				}

-

@@ -6323,7 +5393,6 @@
-				if ($numrows) {

-					return $numrows;

-				} else {

-					return 0;

-				}

-			} else {

-				$this->errors[]=$this->db->lasterror;

+				if ($numrows) return $numrows;

+				else return 0;

+			}

+			else

+			{

+				dol_print_error($this->db);

@@ -6339 +5408 @@
-	 *  @return	int		Return integer <0 if KO, >0 if OK

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

@@ -6346,3 +5415 @@
-		if (getDolGlobalString('MAIN_EXTRAFIELDS_DISABLED')) {

-			return 0;

-		}

+		if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;

@@ -6353,4 +5420,3 @@
-		if ($table_element == 'categorie') {

-			$table_element = 'categories'; // For compatibility

-		}

-

+		if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility

+

+		$sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".$this->id;

@@ -6358,3 +5423,0 @@
-

-		$sql_del = "DELETE FROM ".$this->db->prefix().$table_element."_extrafields WHERE fk_object = ".((int) $this->id);

-

@@ -6362 +5425,2 @@
-		if (!$resql) {

+		if (!$resql)

+		{

@@ -6366 +5430,3 @@
-		} else {

+		}

+		else

+		{

@@ -6386,7 +5452,3 @@
-		if (getDolGlobalString('MAIN_EXTRAFIELDS_DISABLED')) {

-			return 0;

-		}

-

-		if (empty($userused)) {

-			$userused = $user;

-		}

+		if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;

+

+		if (empty($userused)) $userused = $user;

@@ -6396 +5458,2 @@
-		if (!empty($this->array_options)) {

+		if (!empty($this->array_options))

+		{

@@ -6403 +5466 @@
-			// Eliminate copied source object extra fields that do not exist in target object

+			//Eliminate copied source object extra_fields that do not exist in target object

@@ -6406 +5469 @@
-				if (in_array(substr($key, 8), array_keys($target_extrafields))) {	// We remove the 'options_' from $key for test

+				if (in_array(substr($key, 8), array_keys($target_extrafields)))	// We remove the 'options_' from $key for test

@@ -6408 +5471 @@
-				} elseif (in_array($key, array_keys($target_extrafields))) {		// We test on $key that does not contain the 'options_' prefix

+				elseif (in_array($key, array_keys($target_extrafields)))		// We test on $key that does not contains the 'options_' prefix

@@ -6410,10 +5473,9 @@
-				}

-			}

-

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

-				$attributeKey      = substr($key, 8); // Remove 'options_' prefix

-				$attributeType     = $extrafields->attributes[$this->table_element]['type'][$attributeKey];

-				$attributeLabel    = $langs->transnoentities($extrafields->attributes[$this->table_element]['label'][$attributeKey]);

-				$attributeParam    = $extrafields->attributes[$this->table_element]['param'][$attributeKey];

-				$attributeRequired = $extrafields->attributes[$this->table_element]['required'][$attributeKey];

-				$attributeUnique   = $extrafields->attributes[$this->table_element]['unique'][$attributeKey];

+			}

+

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

+			{

+			   	$attributeKey      = substr($key, 8); // Remove 'options_' prefix

+			   	$attributeType     = $extrafields->attributes[$this->table_element]['type'][$attributeKey];

+			   	$attributeLabel    = $extrafields->attributes[$this->table_element]['label'][$attributeKey];

+			   	$attributeParam    = $extrafields->attributes[$this->table_element]['param'][$attributeKey];

+			   	$attributeRequired = $extrafields->attributes[$this->table_element]['required'][$attributeKey];

@@ -6422,16 +5484,12 @@
-				// If we clone, we have to clean unique extrafields to prevent duplicates.

-				// This behaviour can be prevented by external code by changing $this->context['createfromclone'] value in createFrom hook

-				if (!empty($this->context['createfromclone']) && $this->context['createfromclone'] == 'createfromclone' && !empty($attributeUnique)) {

-					$new_array_options[$key] = null;

-				}

-

-				// Similar code than into insertExtraFields

-				if ($attributeRequired) {

-					$v = $this->array_options[$key];

-					if (ExtraFields::isEmptyValue($v, $attributeType)) {

-						$langs->load("errors");

-						dol_syslog("Mandatory field '".$key."' is empty during create and set to required into definition of extrafields");

-						$this->errors[] = $langs->trans('ErrorFieldRequired', $attributeLabel);

-						return -1;

-					}

-				}

+			   	if ($attributeRequired)

+			   	{

+			   		$mandatorypb = false;

+			   		if ($attributeType == 'link' && $this->array_options[$key] == '-1') $mandatorypb = true;

+			   		if ($this->array_options[$key] === '') $mandatorypb = true;

+			   		if ($mandatorypb)

+			   		{

+			   		    dol_syslog("Mandatory extra field ".$key." is empty");

+			   			$this->errors[] = $langs->trans('ErrorFieldRequired', $attributeLabel);

+			   			return -1;

+			   		}

+			   	}

@@ -6442,6 +5500,10 @@
-				if (!empty($attrfieldcomputed)) {

-					if (getDolGlobalString('MAIN_STORE_COMPUTED_EXTRAFIELDS')) {

-						$value = dol_eval($attrfieldcomputed, 1, 0, '2');

-						dol_syslog($langs->trans("Extrafieldcomputed")." on ".$attributeLabel."(".$value.")", LOG_DEBUG);

-						$new_array_options[$key] = $value;

-					} else {

+				if (!empty($attrfieldcomputed))

+				{

+					if (!empty($conf->global->MAIN_STORE_COMPUTED_EXTRAFIELDS))

+					{

+						$value = dol_eval($attrfieldcomputed, 1, 0);

+					    dol_syslog($langs->trans("Extrafieldcomputed")." sur ".$attributeLabel."(".$value.")", LOG_DEBUG);

+					    $new_array_options[$key] = $value;

+					}

+					else

+					{

@@ -6452,3 +5514,18 @@
-				switch ($attributeType) {

-					case 'int':

-						if (!is_numeric($value) && $value != '') {

+			   	switch ($attributeType)

+			   	{

+			   		case 'int':

+			  			if (!is_numeric($value) && $value != '')

+			   			{

+			   				$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);

+			   				return -1;

+			  			}

+			   			elseif ($value == '')

+			   			{

+			   				$new_array_options[$key] = null;

+			   			}

+			 			break;

+					case 'double':

+						$value = price2num($value);

+						if (!is_numeric($value) && $value != '')

+						{

+							dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);

@@ -6457 +5534,3 @@
-						} elseif ($value == '') {

+						}

+						elseif ($value == '')

+						{

@@ -6459,11 +5537,0 @@
-						}

-						break;

-					case 'price':

-					case 'double':

-						$value = price2num($value);

-						if (!is_numeric($value) && $value != '') {

-							dol_syslog($langs->trans("ExtraFieldHasWrongValue")." for ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);

-							$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);

-							return -1;

-						} elseif ($value == '') {

-							$value = null;

@@ -6474,40 +5542,30 @@
-					/*case 'select':	// Not required, we chosed value='0' for undefined values

-						 if ($value=='-1')

-						 {

-							 $this->array_options[$key] = null;

-						 }

-						 break;*/

-					case 'password':

-						$algo = '';

-						if ($this->array_options[$key] != '' && is_array($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options'])) {

-							// If there is an encryption choice, we use it to crypt data before insert

-							$tmparrays = array_keys($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options']);

-							$algo = reset($tmparrays);

-							if ($algo != '') {

-								//global $action;		// $action may be 'create', 'update', 'update_extras'...

-								//var_dump($action);

-								//var_dump($this->oldcopy);exit;

-								if (is_object($this->oldcopy)) {	// If this->oldcopy is not defined, we can't know if we change attribute or not, so we must keep value

-									//var_dump('iii'.$algo.' '.$this->oldcopy->array_options[$key].' -> '.$this->array_options[$key]);

-									if (isset($this->oldcopy->array_options[$key]) && $this->array_options[$key] == $this->oldcopy->array_options[$key]) {

-										// If old value crypted in database is same than submited new value, it means we don't change it, so we don't update.

-										if ($algo == 'dolcrypt') {	// dolibarr reversible encryption

-											if (!preg_match('/^dolcrypt:/', $this->array_options[$key])) {

-												$new_array_options[$key] = dolEncrypt($this->array_options[$key]);	// warning, must be called when on the master

-											} else {

-												$new_array_options[$key] = $this->array_options[$key]; // Value is kept

-											}

-										} else {

-											$new_array_options[$key] = $this->array_options[$key]; // Value is kept

-										}

-									} else {

-										// If value has changed

-										if ($algo == 'dolcrypt') {	// dolibarr reversible encryption

-											if (!preg_match('/^dolcrypt:/', $this->array_options[$key])) {

-												$new_array_options[$key] = dolEncrypt($this->array_options[$key]);	// warning, must be called when on the master

-											} else {

-												$new_array_options[$key] = $this->array_options[$key]; // Value is kept

-											}

-										} else {

-											$new_array_options[$key] = dol_hash($this->array_options[$key], $algo);

-										}

+			 		/*case 'select':	// Not required, we chosed value='0' for undefined values

+             			if ($value=='-1')

+             			{

+             				$this->array_options[$key] = null;

+             			}

+             			break;*/

+			   		case 'password':

+			   			$algo = '';

+			   			if ($this->array_options[$key] != '' && is_array($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options']))

+			   			{

+			   				// If there is an encryption choice, we use it to crypt data before insert

+			   				$tmparrays = array_keys($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options']);

+			   				$algo = reset($tmparrays);

+			   				if ($algo != '')

+			   				{

+			   					//global $action;		// $action may be 'create', 'update', 'update_extras'...

+			   					//var_dump($action);

+			   					//var_dump($this->oldcopy);exit;

+			   					if (is_object($this->oldcopy))		// If this->oldcopy is not defined, we can't know if we change attribute or not, so we must keep value

+			   					{

+			   						//var_dump($this->oldcopy->array_options[$key]); var_dump($this->array_options[$key]);

+				   					if ($this->array_options[$key] == $this->oldcopy->array_options[$key])	// If old value crypted in database is same than submited new value, it means we don't change it, so we don't update.

+				   					{

+				   						$new_array_options[$key] = $this->array_options[$key]; // Value is kept

+				   					}

+									else

+									{

+										// var_dump($algo);

+										$newvalue = dol_hash($this->array_options[$key], $algo);

+										$new_array_options[$key] = $newvalue;

@@ -6515,16 +5573,14 @@
-								} else {

-									//var_dump('jjj'.$algo.' '.$this->oldcopy->array_options[$key].' -> '.$this->array_options[$key]);

-									// If this->oldcopy is not defined, we can't know if we change attribute or not, so we must keep value

-									if ($algo == 'dolcrypt' && !preg_match('/^dolcrypt:/', $this->array_options[$key])) {	// dolibarr reversible encryption

-										$new_array_options[$key] = dolEncrypt($this->array_options[$key]);	// warning, must be called when on the master

-									} else {

-										$new_array_options[$key] = $this->array_options[$key]; // Value is kept

-									}

-								}

-							} else {

-								// No encryption

-								$new_array_options[$key] = $this->array_options[$key]; // Value is kept

-							}

-						} else { // Common usage

-							$new_array_options[$key] = $this->array_options[$key]; // Value is kept

-						}

+			   					}

+			   					else

+			   					{

+			   						$new_array_options[$key] = $this->array_options[$key]; // Value is kept

+			   					}

+			   				}

+			   			}

+			   			else	// Common usage

+			   			{

+			   				$new_array_options[$key] = $this->array_options[$key];

+			   			}

+			   			break;

+			   		case 'price':

+						$new_array_options[$key] = price2num($this->array_options[$key]);

@@ -6535 +5591 @@
-						if (!is_numeric($this->array_options[$key]) || $this->array_options[$key] != intval($this->array_options[$key])) {

+						if (!is_int($this->array_options[$key])) {

@@ -6540,8 +5596 @@
-					case 'datetimegmt':

-						// If data is a string instead of a timestamp, we convert it

-						if (!is_numeric($this->array_options[$key]) || $this->array_options[$key] != intval($this->array_options[$key])) {

-							$this->array_options[$key] = strtotime($this->array_options[$key]);

-						}

-						$new_array_options[$key] = $this->db->idate($this->array_options[$key], 'gmt');

-						break;

-					case 'link':

+		   			case 'link':

@@ -6553,2 +5602,4 @@
-						if ($InfoFieldList[0] && class_exists($InfoFieldList[0])) {

-							if ($value == '-1') {	// -1 is key for no defined in combo list of objects

+						if ($InfoFieldList[0] && class_exists($InfoFieldList[0]))

+						{

+							if ($value == '-1')	// -1 is key for no defined in combo list of objects

+							{

@@ -6556 +5607,3 @@
-							} elseif ($value) {

+							}

+							elseif ($value)

+							{

@@ -6558,9 +5611,6 @@
-								if (is_numeric($value)) {

-									$res = $object->fetch($value); // Common case

-								} else {

-									$res = $object->fetch('', $value); // For compatibility

-								}

-

-								if ($res > 0) {

-									$new_array_options[$key] = $object->id;

-								} else {

+								if (is_numeric($value)) $res = $object->fetch($value);

+								else $res = $object->fetch('', $value);

+

+								if ($res > 0) $new_array_options[$key] = $object->id;

+								else

+								{

@@ -6567,0 +5618 @@
+									$this->db->rollback();

@@ -6571 +5622,3 @@
-						} else {

+						}

+						else

+						{

@@ -6575,9 +5628 @@
-					case 'checkbox':

-					case 'chkbxlst':

-						if (is_array($this->array_options[$key])) {

-							$new_array_options[$key] = implode(',', $this->array_options[$key]);

-						} else {

-							$new_array_options[$key] = $this->array_options[$key];

-						}

-						break;

-				}

+			   	}

@@ -6589,3 +5634 @@
-			if ($table_element == 'categorie') {

-				$table_element = 'categories'; // For compatibility

-			}

+			if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility

@@ -6595 +5638 @@
-			$sql_del = "DELETE FROM ".$this->db->prefix().$table_element."_extrafields WHERE fk_object = ".((int) $this->id);

+			$sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".$this->id;

@@ -6598,2 +5641,3 @@
-			$sql = "INSERT INTO ".$this->db->prefix().$table_element."_extrafields (fk_object";

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

+			$sql = "INSERT INTO ".MAIN_DB_PREFIX.$table_element."_extrafields (fk_object";

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

+			{

@@ -6602 +5646 @@
-				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') { // Only for other type than separator

+				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator

@@ -6604 +5647,0 @@
-				}

@@ -6607,6 +5650,9 @@
-			if (!empty($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities']) && is_array($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'])) {

-				foreach ($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as $tmpkey => $tmpval) {

-					if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey])) {    // If field not already added previously

-						$sql .= ",".$tmpkey;

-					}

-				}

+			if (is_array($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities']))

+			{

+    			foreach ($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as  $tmpkey => $tmpval)

+    			{

+    			    if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey]))    // If field not already added previously

+    			    {

+    			        $sql .= ",".$tmpkey;

+    			    }

+    			}

@@ -6616 +5662,2 @@
-			foreach ($new_array_options as $key => $value) {

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

+			{

@@ -6619,2 +5666,4 @@
-				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') { // Only for other type than separator)

-					if ($new_array_options[$key] != '' || $new_array_options[$key] == '0') {

+				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator)

+				{

+					if ($new_array_options[$key] != '' || $new_array_options[$key] == '0')

+					{

@@ -6622 +5671,3 @@
-					} else {

+					}

+					else

+					{

@@ -6628,10 +5679,10 @@
-			if (!empty($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities']) && is_array($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'])) {

-				foreach ($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as $tmpkey => $tmpval) {

-					if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey])) {   // If field not already added previously

-						if (in_array($tmpval, array('int', 'double', 'price'))) {

-							$sql .= ", 0";

-						} else {

-							$sql .= ", ''";

-						}

-					}

-				}

+			if (is_array($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities']))

+			{

+			    foreach ($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as  $tmpkey => $tmpval)

+    			{

+    			    if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey]))    // If field not already added previously

+    			    {

+                        if (in_array($tmpval, array('int', 'double'))) $sql .= ", 0";

+                        else $sql .= ", ''";

+    			    }

+    			}

@@ -6643 +5694,3 @@
-			if (!$resql) {

+

+			if (!$resql)

+			{

@@ -6648 +5701,2 @@
-			if (!$error && $trigger) {

+			if (!$error && $trigger)

+			{

@@ -6652,3 +5706 @@
-				if ($result < 0) {

-					$error++;

-				}

+				if ($result < 0) $error++;

@@ -6658 +5710,2 @@
-			if ($error) {

+			if ($error)

+			{

@@ -6661 +5714,3 @@
-			} else {

+			}

+			else

+			{

@@ -6665,3 +5720,2 @@
-		} else {

-			return 0;

-		}

+		}

+		else return 0;

@@ -6684,3 +5738 @@
-		if (empty($userused)) {

-			$userused = $user;

-		}

+		if (empty($userused)) $userused = $user;

@@ -6690,5 +5742,4 @@
-		if (getDolGlobalString('MAIN_EXTRALANGUAGES_DISABLED')) {

-			return 0; // For avoid conflicts if trigger used

-		}

-

-		if (is_array($this->array_languages)) {

+		if (!empty($conf->global->MAIN_EXTRALANGUAGES_DISABLED)) return 0; // For avoid conflicts if trigger used

+

+		if (is_array($this->array_languages))

+		{

@@ -6697 +5748,2 @@
-			foreach ($new_array_languages as $key => $value) {

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

+			{

@@ -6705 +5757,2 @@
-				switch ($attributeType) {

+				switch ($attributeType)

+				{

@@ -6707 +5760,2 @@
-						if (!is_numeric($value) && $value != '') {

+						if (!is_numeric($value) && $value != '')

+						{

@@ -6710 +5764,3 @@
-						} elseif ($value == '') {

+						}

+						elseif ($value == '')

+						{

@@ -6716 +5772,2 @@
-						if (!is_numeric($value) && $value != '') {

+						if (!is_numeric($value) && $value != '')

+						{

@@ -6720 +5777,3 @@
-						} elseif ($value == '') {

+						}

+						elseif ($value == '')

+						{

@@ -6722,2 +5780,0 @@
-						} else {

-							$new_array_languages[$key] = $value;

@@ -6724,0 +5782,2 @@
+						//dol_syslog("double value"." sur ".$attributeLabel."(".$value." is '".$attributeType."')", LOG_DEBUG);

+						$new_array_languages[$key] = $value;

@@ -6738,3 +5797 @@
-			if ($table_element == 'categorie') {	// TODO Rename table llx_categories_extrafields into llx_categorie_extrafields so we can remove this.

-				$table_element = 'categories'; // For compatibility

-			}

+			if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility

@@ -6746,2 +5803,2 @@
-					$sql_del = "DELETE FROM ".$this->db->prefix()."object_lang";

-					$sql_del .= " WHERE fk_object = ".((int) $this->id)." AND property = '".$this->db->escape($key)."' AND type_object = '".$this->db->escape($table_element)."'";

+					$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."object_lang";

+					$sql_del .= " WHERE fk_object = ".$this->id." AND property = '".$this->db->escape($key)."' AND type_object = '".$this->db->escape($table_element)."'";

@@ -6752 +5809 @@
-						$sql = "INSERT INTO ".$this->db->prefix()."object_lang (fk_object, property, type_object, lang, value";

+						$sql = "INSERT INTO ".MAIN_DB_PREFIX."object_lang (fk_object, property, type_object, lang, value";

@@ -6757 +5814,2 @@
-						if (!$resql) {

+						if (!$resql)

+						{

@@ -6766 +5824,2 @@
-			if (!$error && $trigger) {

+			if (!$error && $trigger)

+			{

@@ -6770,3 +5829 @@
-				if ($result < 0) {

-					$error++;

-				}

+				if ($result < 0) $error++;

@@ -6776 +5833,2 @@
-			if ($error) {

+			if ($error)

+			{

@@ -6779 +5837,3 @@
-			} else {

+			}

+			else

+			{

@@ -6783,7 +5843,6 @@
-		} else {

-			return 0;

-		}

-	}

-

-	/**

-	 *	Update 1 extra field value for the current object. Keep other fields unchanged.

+		}

+		else return 0;

+	}

+

+	/**

+	 *	Update an extra field value for the current object.

@@ -6800,9 +5859,5 @@
-		global $conf, $langs, $user, $hookmanager;

-

-		if (getDolGlobalString('MAIN_EXTRAFIELDS_DISABLED')) {

-			return 0;

-		}

-

-		if (empty($userused)) {

-			$userused = $user;

-		}

+		global $conf, $langs, $user;

+

+		if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;

+

+		if (empty($userused)) $userused = $user;

@@ -6812 +5867,2 @@
-		if (!empty($this->array_options) && isset($this->array_options["options_".$key])) {

+		if (!empty($this->array_options) && isset($this->array_options["options_".$key]))

+		{

@@ -6821 +5876,0 @@
-			$attributeKey      = $key;

@@ -6826,22 +5880,0 @@
-			$attributeUnique   = $extrafields->attributes[$this->table_element]['unique'][$attributeKey];

-			$attrfieldcomputed = $extrafields->attributes[$this->table_element]['computed'][$key];

-

-			// Similar code than into insertExtraFields

-			if ($attributeRequired) {

-				$mandatorypb = false;

-				if ($attributeType == 'link' && $this->array_options["options_".$key] == '-1') {

-					$mandatorypb = true;

-				}

-				if ($this->array_options["options_".$key] === '') {

-					$mandatorypb = true;

-				}

-				if ($mandatorypb) {

-					$langs->load("errors");

-					dol_syslog("Mandatory field 'options_".$key."' is empty during update and set to required into definition of extrafields");

-					$this->errors[] = $langs->trans('ErrorFieldRequired', $attributeLabel);

-					return -1;

-				}

-			}

-

-			// $new_array_options will be used for direct update, so must contains formated data for the UPDATE.

-			$new_array_options = $this->array_options;

@@ -6851,16 +5884,3 @@
-			if (!empty($attrfieldcomputed)) {

-				if (getDolGlobalString('MAIN_STORE_COMPUTED_EXTRAFIELDS')) {

-					$value = dol_eval($attrfieldcomputed, 1, 0, '2');

-					dol_syslog($langs->trans("Extrafieldcomputed")." sur ".$attributeLabel."(".$value.")", LOG_DEBUG);

-

-					$new_array_options["options_".$key] = $value;

-

-					$this->array_options["options_".$key] = $new_array_options["options_".$key];

-				} else {

-					$new_array_options["options_".$key] = null;

-

-					$this->array_options["options_".$key] = $new_array_options["options_".$key];

-				}

-			}

-

-			switch ($attributeType) {

+

+			switch ($attributeType)

+			{

@@ -6868 +5888,2 @@
-					if (!is_numeric($value) && $value != '') {

+					if (!is_numeric($value) && $value != '')

+					{

@@ -6871,4 +5892,4 @@
-					} elseif ($value === '') {

-						$new_array_options["options_".$key] = null;

-

-						$this->array_options["options_".$key] = $new_array_options["options_".$key];

+					}

+					elseif ($value === '')

+					{

+						$this->array_options["options_".$key] = null;

@@ -6877 +5897,0 @@
-				case 'price':

@@ -6880 +5900,2 @@
-					if (!is_numeric($value) && $value != '') {

+					if (!is_numeric($value) && $value != '')

+					{

@@ -6884,2 +5905,4 @@
-					} elseif ($value === '') {

-						$value = null;

+					}

+					elseif ($value === '')

+					{

+						$this->array_options["options_".$key] = null;

@@ -6888,3 +5911 @@
-					$new_array_options["options_".$key] = $value;

-

-					$this->array_options["options_".$key] = $new_array_options["options_".$key];

+					$this->array_options["options_".$key] = $value;

@@ -6892,58 +5913,8 @@
-				/*case 'select':	// Not required, we chosed value='0' for undefined values

-					 if ($value=='-1')

-					 {

-						$new_array_options["options_".$key] = $value;

-

-						$this->array_options["options_".$key] = $new_array_options["options_".$key];

-					 }

-					 break;*/

-				case 'password':

-					$algo = '';

-					if ($this->array_options["options_".$key] != '' && is_array($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options'])) {

-						// If there is an encryption choice, we use it to crypt data before insert

-						$tmparrays = array_keys($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options']);

-						$algo = reset($tmparrays);

-						if ($algo != '') {

-							//global $action;		// $action may be 'create', 'update', 'update_extras'...

-							//var_dump($action);

-							//var_dump($this->oldcopy);exit;

-							//var_dump($key.' '.$this->array_options["options_".$key].' '.$algo);

-							if (is_object($this->oldcopy)) {		// If this->oldcopy is not defined, we can't know if we change attribute or not, so we must keep value

-								//var_dump($this->oldcopy->array_options["options_".$key]); var_dump($this->array_options["options_".$key]);

-								if (isset($this->oldcopy->array_options["options_".$key]) && $this->array_options["options_".$key] == $this->oldcopy->array_options["options_".$key]) {	// If old value crypted in database is same than submited new value, it means we don't change it, so we don't update.

-									if ($algo == 'dolcrypt') {	// dolibarr reversible encryption

-										if (!preg_match('/^dolcrypt:/', $this->array_options["options_".$key])) {

-											$new_array_options["options_".$key] = dolEncrypt($this->array_options["options_".$key]);	// warning, must be called when on the master

-										} else {

-											$new_array_options["options_".$key] = $this->array_options["options_".$key]; // Value is kept

-										}

-									} else {

-										$new_array_options["options_".$key] = $this->array_options["options_".$key]; // Value is kept

-									}

-								} else {

-									if ($algo == 'dolcrypt') {	// dolibarr reversible encryption

-										if (!preg_match('/^dolcrypt:/', $this->array_options["options_".$key])) {

-											$new_array_options["options_".$key] = dolEncrypt($this->array_options["options_".$key]);

-										} else {

-											$new_array_options["options_".$key] = $this->array_options["options_".$key]; // Value is kept

-										}

-									} else {

-										$new_array_options["options_".$key] = dol_hash($this->array_options["options_".$key], $algo);

-									}

-								}

-							} else {

-								if ($algo == 'dolcrypt' && !preg_match('/^dolcrypt:/', $this->array_options["options_".$key])) {	// dolibarr reversible encryption

-									$new_array_options["options_".$key] = dolEncrypt($this->array_options["options_".$key]);	// warning, must be called when on the master

-								} else {

-									$new_array_options["options_".$key] = $this->array_options["options_".$key]; // Value is kept

-								}

-							}

-						} else {

-							// No encryption

-							$new_array_options["options_".$key] = $this->array_options["options_".$key]; // Value is kept

-						}

-					} else { // Common usage

-						$new_array_options["options_".$key] = $this->array_options["options_".$key]; // Value is kept

-					}

-

-					$this->array_options["options_".$key] = $new_array_options["options_".$key];

+			 	/*case 'select':	// Not required, we chosed value='0' for undefined values

+             		if ($value=='-1')

+             		{

+             			$this->array_options[$key] = null;

+             		}

+             		break;*/

+				case 'price':

+					$this->array_options["options_".$key] = price2num($this->array_options["options_".$key]);

@@ -6951,0 +5923,2 @@
+					$this->array_options["options_".$key] = $this->db->idate($this->array_options["options_".$key]);

+					break;

@@ -6953,7 +5926 @@
-					if (empty($this->array_options["options_".$key])) {

-						$new_array_options["options_".$key] = null;

-

-						$this->array_options["options_".$key] = $new_array_options["options_".$key];

-					} else {

-						$new_array_options["options_".$key] = $this->db->idate($this->array_options["options_".$key]);

-					}

+					$this->array_options["options_".$key] = $this->db->idate($this->array_options["options_".$key]);

@@ -6961,24 +5927,0 @@
-				case 'datetimegmt':

-					if (empty($this->array_options["options_".$key])) {

-						$new_array_options["options_".$key] = null;

-

-						$this->array_options["options_".$key] = $new_array_options["options_".$key];

-					} else {

-						$new_array_options["options_".$key] = $this->db->idate($this->array_options["options_".$key], 'gmt');

-					}

-					break;

-				case 'boolean':

-					if (empty($this->array_options["options_".$key])) {

-						$new_array_options["options_".$key] = null;

-

-						$this->array_options["options_".$key] = $new_array_options["options_".$key];

-					}

-					break;

-				case 'link':

-					if ($this->array_options["options_".$key] === '') {

-						$new_array_options["options_".$key] = null;

-

-						$this->array_options["options_".$key] = $new_array_options["options_".$key];

-					}

-					break;

-				/*

@@ -6991 +5934 @@
-					if ($InfoFieldList[0] && class_exists($InfoFieldList[0]))

+					if ($value)

@@ -6993,17 +5936,3 @@
-						if ($value == '-1')	// -1 is key for no defined in combo list of objects

-						{

-							$new_array_options[$key] = '';

-						} elseif ($value) {

-							$object = new $InfoFieldList[0]($this->db);

-							if (is_numeric($value)) $res = $object->fetch($value);	// Common case

-							else $res = $object->fetch('', $value);					// For compatibility

-

-							if ($res > 0) $new_array_options[$key] = $object->id;

-							else {

-								$this->error = "Id/Ref '".$value."' for object '".$object->element."' not found";

-								$this->db->rollback();

-								return -1;

-							}

-						}

-					} else {

-						dol_syslog('Error bad setup of extrafield', LOG_WARNING);

+						$object = new $InfoFieldList[0]($this->db);

+						$object->fetch(0, $value);

+						$this->array_options["options_".$key] = $object->id;

@@ -7012,12 +5940,0 @@
-				*/

-				case 'checkbox':

-				case 'chkbxlst':

-					$new_array_options = array();

-					if (is_array($this->array_options["options_".$key])) {

-						$new_array_options["options_".$key] = implode(',', $this->array_options["options_".$key]);

-					} else {

-						$new_array_options["options_".$key] = $this->array_options["options_".$key];

-					}

-

-					$this->array_options["options_".$key] = $new_array_options["options_".$key];

-					break;

@@ -7027,10 +5944,2 @@
-

-			$linealreadyfound = 0;

-

-			// Check if there is already a line for this object (in most cases, it is, but sometimes it is not, for example when extra field has been created after), so we must keep this overload)

-			$table_element = $this->table_element;

-			if ($table_element == 'categorie') {	// TODO Rename table llx_categories_extrafields into llx_categorie_extrafields so we can remove this.

-				$table_element = 'categories'; // For compatibility

-			}

-

-			$sql = "SELECT COUNT(rowid) as nb FROM ".$this->db->prefix().$table_element."_extrafields WHERE fk_object = ".((int) $this->id);

+			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element."_extrafields SET ".$key."='".$this->db->escape($this->array_options["options_".$key])."'";

+			$sql .= " WHERE fk_object = ".$this->id;

@@ -7038,37 +5947,8 @@
-			if ($resql) {

-				$tmpobj = $this->db->fetch_object($resql);

-				if ($tmpobj) {

-					$linealreadyfound = $tmpobj->nb;

-				}

-			}

-

-			//var_dump('linealreadyfound='.$linealreadyfound.' sql='.$sql); exit;

-			if ($linealreadyfound) {

-				if ($this->array_options["options_".$key] === null) {

-					$sql = "UPDATE ".$this->db->prefix().$table_element."_extrafields SET ".$key." = null";

-				} else {

-					$sql = "UPDATE ".$this->db->prefix().$table_element."_extrafields SET ".$key." = '".$this->db->escape($new_array_options["options_".$key])."'";

-				}

-				$sql .= " WHERE fk_object = ".((int) $this->id);

-

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

-				if (!$resql) {

-					$error++;

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

-				}

-			} else {

-				$result = $this->insertExtraFields('', $user);

-				if ($result < 0) {

-					$error++;

-				}

-			}

-

-			if (!$error) {

-				$parameters = array('key'=>$key);

-				$reshook = $hookmanager->executeHooks('updateExtraFieldBeforeCommit', $parameters, $this, $action);

-				if ($reshook < 0) {

-					setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

-				}

-			}

-

-			if (!$error && $trigger) {

+			if (!$resql)

+			{

+				$error++;

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

+			}

+

+			if (!$error && $trigger)

+			{

@@ -7078,3 +5958 @@
-				if ($result < 0) {

-					$error++;

-				}

+				if ($result < 0) $error++;

@@ -7084 +5962,2 @@
-			if ($error) {

+			if ($error)

+			{

@@ -7088 +5967,3 @@
-			} else {

+			}

+			else

+			{

@@ -7092,3 +5973,2 @@
-		} else {

-			return 0;

-		}

+		}

+		else return 0;

@@ -7105 +5985 @@
-	 *  @see updateExtraField(), insertExtraLanguages()

+	 *  @see updateExtraFields(), insertExtraLanguages()

@@ -7111,3 +5991 @@
-		if (empty($userused)) {

-			$userused = $user;

-		}

+		if (empty($userused)) $userused = $user;

@@ -7117,3 +5995 @@
-		if (getDolGlobalString('MAIN_EXTRALANGUAGES_DISABLED')) {

-			return 0; // For avoid conflicts if trigger used

-		}

+		if (!empty($conf->global->MAIN_EXTRALANGUAGES_DISABLED)) return 0; // For avoid conflicts if trigger used

@@ -7129 +6005 @@
-	 * @param  array|null	$val	       Array of properties for field to show (used only if ->fields not defined)

+	 * @param  array   		$val	       Array of properties for field to show (used only if ->fields not defined)

@@ -7131 +6007 @@
-	 * @param  string|array	$value         Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value, for array type must be array)

+	 * @param  string  		$value         Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value)

@@ -7143 +6019,2 @@
-		if (!is_object($form)) {

+		if (!is_object($form))

+		{

@@ -7152,10 +6028,0 @@
-		// Validation tests and output

-		$fieldValidationErrorMsg = '';

-		$validationClass = '';

-		$fieldValidationErrorMsg = $this->getFieldError($key);

-		if (!empty($fieldValidationErrorMsg)) {

-			$validationClass = ' --error'; // the -- is use as class state in css :  .--error can't be be defined alone it must be define with another class like .my-class.--error or input.--error

-		} else {

-			$validationClass = ' --success'; // the -- is use as class state in css :  .--success can't be be defined alone it must be define with another class like .my-class.--success or input.--success

-		}

-

@@ -7163,46 +6030,32 @@
-		$type = '';

-		$isDependList = 0;

-		$param = array();

-		$param['options'] = array();

-		$reg = array();

-		$size = !empty($this->fields[$key]['size']) ? $this->fields[$key]['size'] : 0;

-		// Because we work on extrafields

-		if (preg_match('/^(integer|link):(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {

-			$param['options'] = array($reg[2].':'.$reg[3].':'.$reg[4].':'.$reg[5] => 'N');

-			$type = 'link';

-		} elseif (preg_match('/^(integer|link):(.*):(.*):(.*)/i', $val['type'], $reg)) {

-			$param['options'] = array($reg[2].':'.$reg[3].':'.$reg[4] => 'N');

-			$type = 'link';

-		} elseif (preg_match('/^(integer|link):(.*):(.*)/i', $val['type'], $reg)) {

-			$param['options'] = array($reg[2].':'.$reg[3] => 'N');

-			$type = 'link';

-		} elseif (preg_match('/^(sellist):(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {

-			$param['options'] = array($reg[2].':'.$reg[3].':'.$reg[4].':'.$reg[5] => 'N');

-			$type = 'sellist';

-		} elseif (preg_match('/^(sellist):(.*):(.*):(.*)/i', $val['type'], $reg)) {

-			$param['options'] = array($reg[2].':'.$reg[3].':'.$reg[4] => 'N');

-			$type = 'sellist';

-		} elseif (preg_match('/^(sellist):(.*):(.*)/i', $val['type'], $reg)) {

-			$param['options'] = array($reg[2].':'.$reg[3] => 'N');

-			$type = 'sellist';

-		} elseif (preg_match('/^chkbxlst:(.*)/i', $val['type'], $reg)) {

-			$param['options'] = array($reg[1] => 'N');

-			$type = 'chkbxlst';

-		} elseif (preg_match('/varchar\((\d+)\)/', $val['type'], $reg)) {

-			$param['options'] = array();

-			$type = 'varchar';

-			$size = $reg[1];

-		} elseif (preg_match('/varchar/', $val['type'])) {

-			$param['options'] = array();

-			$type = 'varchar';

-		} else {

-			$param['options'] = array();

-			$type = $this->fields[$key]['type'];

-		}

-		//var_dump($type); var_dump($param['options']);

-

-		// Special case that force options and type ($type can be integer, varchar, ...)

-		if (!empty($this->fields[$key]['arrayofkeyval']) && is_array($this->fields[$key]['arrayofkeyval'])) {

-			$param['options'] = $this->fields[$key]['arrayofkeyval'];

-			$type = (($this->fields[$key]['type']=='checkbox') ? $this->fields[$key]['type'] : 'select');

-		}

+        $type = '';

+        $param = array();

+        $param['options'] = array();

+        $reg = array();

+        $size = $this->fields[$key]['size'];

+        // Because we work on extrafields

+        if (preg_match('/^(integer|link):(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {

+        	$param['options'] = array($reg[2].':'.$reg[3].':'.$reg[4].':'.$reg[5] => 'N');

+        	$type = 'link';

+        } elseif (preg_match('/^(integer|link):(.*):(.*):(.*)/i', $val['type'], $reg)) {

+        	$param['options'] = array($reg[2].':'.$reg[3].':'.$reg[4] => 'N');

+        	$type = 'link';

+        } elseif (preg_match('/^(integer|link):(.*):(.*)/i', $val['type'], $reg)) {

+            $param['options'] = array($reg[2].':'.$reg[3] => 'N');

+            $type = 'link';

+        } elseif (preg_match('/^sellist:(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {

+            $param['options'] = array($reg[1].':'.$reg[2].':'.$reg[3].':'.$reg[4] => 'N');

+            $type = 'sellist';

+        } elseif (preg_match('/varchar\((\d+)\)/', $val['type'], $reg)) {

+            $param['options'] = array();

+            $type = 'varchar';

+            $size = $reg[1];

+        } elseif (preg_match('/varchar/', $val['type'])) {

+            $param['options'] = array();

+            $type = 'varchar';

+        } elseif (is_array($this->fields[$key]['arrayofkeyval'])) {

+            $param['options'] = $this->fields[$key]['arrayofkeyval'];

+            $type = 'select';

+        } else {

+            $param['options'] = array();

+            $type = $this->fields[$key]['type'];

+        }

@@ -7212,8 +6065,8 @@
-		$default = (!empty($this->fields[$key]['default']) ? $this->fields[$key]['default'] : '');

-		$computed = (!empty($this->fields[$key]['computed']) ? $this->fields[$key]['computed'] : '');

-		$unique = (!empty($this->fields[$key]['unique']) ? $this->fields[$key]['unique'] : 0);

-		$required = (!empty($this->fields[$key]['required']) ? $this->fields[$key]['required'] : 0);

-		$autofocusoncreate = (!empty($this->fields[$key]['autofocusoncreate']) ? $this->fields[$key]['autofocusoncreate'] : 0);

-

-		$langfile = (!empty($this->fields[$key]['langfile']) ? $this->fields[$key]['langfile'] : '');

-		$list = (!empty($this->fields[$key]['list']) ? $this->fields[$key]['list'] : 0);

+		$default = $this->fields[$key]['default'];

+		$computed = $this->fields[$key]['computed'];

+		$unique = $this->fields[$key]['unique'];

+		$required = $this->fields[$key]['required'];

+		$autofocusoncreate = $this->fields[$key]['autofocusoncreate'];

+

+		$langfile = $this->fields[$key]['langfile'];

+		$list = $this->fields[$key]['list'];

@@ -7224,6 +6077,4 @@
-		if ($computed) {

-			if (!preg_match('/^search_/', $keyprefix)) {

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

-			} else {

-				return '';

-			}

+		if ($computed)

+		{

+			if (!preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';

+			else return '';

@@ -7233,4 +6084,8 @@
-		if (empty($morecss) && !empty($val['css'])) {

-			$morecss = $val['css'];

-		} elseif (empty($morecss)) {

-			if ($type == 'date') {

+		if (empty($morecss) && !empty($val['css']))

+		{

+		    $morecss = $val['css'];

+		}

+		elseif (empty($morecss))

+		{

+			if ($type == 'date')

+			{

@@ -7238 +6093,3 @@
-			} elseif ($type == 'datetime' || $type == 'link') {	// link means an foreign key to another primary id

+			}

+			elseif ($type == 'datetime' || $type == 'link')	// link means an foreign key to another primary id

+			{

@@ -7240 +6097,3 @@
-			} elseif (in_array($type, array('int', 'integer', 'price')) || preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type)) {

+			}

+			elseif (in_array($type, array('int', 'integer', 'price')) || preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type))

+			{

@@ -7244 +6103,3 @@
-			} elseif ($type == 'boolean') {

+			}

+			elseif ($type == 'boolean')

+			{

@@ -7246,2 +6107,5 @@
-			} else {

-				if (round($size) < 12) {

+			}

+			else

+			{

+				if (round($size) < 12)

+				{

@@ -7249 +6113,3 @@
-				} elseif (round($size) <= 48) {

+				}

+				elseif (round($size) <= 48)

+				{

@@ -7251 +6117,3 @@
-				} else {

+				}

+				else

+				{

@@ -7257,6 +6125,2 @@
-		// Add validation state class

-		if (!empty($validationClass)) {

-			$morecss.= $validationClass;

-		}

-

-		if (in_array($type, array('date'))) {

+		if (in_array($type, array('date', 'datetime')))

+		{

@@ -7265 +6129,2 @@
-			$showtime = 0;

+

+			$showtime = in_array($type, array('datetime')) ? 1 : 0;

@@ -7268,3 +6133 @@
-			if (!$required && $value == '') {

-				$value = '-1';

-			}

+			if (!$required && $value == '') $value = '-1';

@@ -7274 +6137,7 @@
-		} elseif (in_array($type, array('datetime'))) {

+		}

+		elseif (in_array($type, array('duration')))

+		{

+			$out = $form->select_duration($keyprefix.$key.$keysuffix, $value, 0, 'text', 0, 1);

+		}

+		elseif (in_array($type, array('int', 'integer')))

+		{

@@ -7277,23 +6146,18 @@
-			$showtime = 1;

-

-			// Do not show current date when field not required (see selectDate() method)

-			if (!$required && $value == '') {

-				$value = '-1';

-			}

-

-			// TODO Must also support $moreparam

-			$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1, '', '', '', 1, '', '', 'tzuserrel');

-		} elseif (in_array($type, array('duration'))) {

-			$out = $form->select_duration($keyprefix.$key.$keysuffix, $value, 0, 'text', 0, 1);

-		} elseif (in_array($type, array('int', 'integer'))) {

-			$tmp = explode(',', $size);

-			$newsize = $tmp[0];

-			$out = '<input type="text" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'"'.($newsize > 0 ? ' maxlength="'.$newsize.'"' : '').' value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').($autofocusoncreate ? ' autofocus' : '').'>';

-		} elseif (in_array($type, array('real'))) {

-			$out = '<input type="text" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').($autofocusoncreate ? ' autofocus' : '').'>';

-		} elseif (preg_match('/varchar/', $type)) {

-			$out = '<input type="text" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'"'.($size > 0 ? ' maxlength="'.$size.'"' : '').' value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').($autofocusoncreate ? ' autofocus' : '').'>';

-		} elseif (in_array($type, array('email', 'mail', 'phone', 'url', 'ip'))) {

-			$out = '<input type="text" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').($autofocusoncreate ? ' autofocus' : '').'>';

-		} elseif (preg_match('/^text/', $type)) {

-			if (!preg_match('/search_/', $keyprefix)) {		// If keyprefix is search_ or search_options_, we must just use a simple text field

+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').($autofocusoncreate ? ' autofocus' : '').'>';

+		}

+		elseif (in_array($type, array('real')))

+		{

+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').($autofocusoncreate ? ' autofocus' : '').'>';

+		}

+		elseif (preg_match('/varchar/', $type))

+		{

+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').($autofocusoncreate ? ' autofocus' : '').'>';

+		}

+		elseif (in_array($type, array('mail', 'phone', 'url')))

+		{

+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').($autofocusoncreate ? ' autofocus' : '').'>';

+		}

+		elseif ($type == 'text')

+		{

+			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field

+			{

@@ -7303 +6167,3 @@
-			} else {

+			}

+			else

+			{

@@ -7306,2 +6172,5 @@
-		} elseif (preg_match('/^html/', $type)) {

-			if (!preg_match('/search_/', $keyprefix)) {		// If keyprefix is search_ or search_options_, we must just use a simple text field

+		}

+		elseif ($type == 'html')

+		{

+			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field

+			{

@@ -7309,3 +6178,5 @@
-				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, isModEnabled('fckeditor') && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');

-				$out = $doleditor->Create(1, '', true, '', '', $moreparam, $morecss);

-			} else {

+				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');

+				$out = $doleditor->Create(1);

+			}

+			else

+			{

@@ -7314 +6185,3 @@
-		} elseif ($type == 'boolean') {

+		}

+		elseif ($type == 'boolean')

+		{

@@ -7322 +6195,3 @@
-		} elseif ($type == 'price') {

+		}

+		elseif ($type == 'price')

+		{

@@ -7327 +6202,3 @@
-		} elseif (preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type)) {

+		}

+		elseif (preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type))

+		{

@@ -7332 +6209,3 @@
-		} elseif ($type == 'select') {	// combo list

+		}

+		elseif ($type == 'select')

+		{

@@ -7334 +6213,2 @@
-			if (!empty($conf->use_javascript_ajax) && !getDolGlobalString('MAIN_EXTRAFIELDS_DISABLE_SELECT2')) {

+			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))

+			{

@@ -7340,15 +6220,7 @@
-			if ((!isset($this->fields[$key]['default'])) || ($this->fields[$key]['notnull'] != 1)) {

-				$out .= '<option value="0">&nbsp;</option>';

-			}

-			foreach ($param['options'] as $keyb => $valb) {

-				if ((string) $keyb == '') {

-					continue;

-				}

-				if (strpos($valb, "|") !== false) {

-					list($valb, $parent) = explode('|', $valb);

-				}

-				$out .= '<option value="'.$keyb.'"';

-				$out .= (((string) $value == (string) $keyb) ? ' selected' : '');

-				if (!empty($parent)) {

-					$isDependList = 1;

-				}

+                if ((!isset($this->fields[$key]['default'])) || ($this->fields[$key]['notnull'] != 1))$out .= '<option value="0">&nbsp;</option>';

+			foreach ($param['options'] as $key => $val)

+			{

+				if ((string) $key == '') continue;

+				list($val, $parent) = explode('|', $val);

+				$out .= '<option value="'.$key.'"';

+				$out .= (((string) $value == (string) $key) ? ' selected' : '');

@@ -7356 +6228 @@
-				$out .= '>'.$langs->trans($valb).'</option>';

+				$out .= '>'.$val.'</option>';

@@ -7359 +6231,3 @@
-		} elseif ($type == 'sellist') {

+		}

+		elseif ($type == 'sellist')

+		{

@@ -7361 +6235,2 @@
-			if (!empty($conf->use_javascript_ajax) && !getDolGlobalString('MAIN_EXTRAFIELDS_DISABLE_SELECT2')) {

+			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))

+			{

@@ -7367 +6242,2 @@
-			if (is_array($param['options'])) {

+			if (is_array($param['options']))

+			{

@@ -7369,22 +6245 @@
-				$InfoFieldList = explode(":", $param_list[0], 5);

-				if (! empty($InfoFieldList[4])) {

-					$pos = 0;

-					$parenthesisopen = 0;

-					while (substr($InfoFieldList[4], $pos, 1) !== '' && ($parenthesisopen || $pos == 0 || substr($InfoFieldList[4], $pos, 1) != ':')) {

-						if (substr($InfoFieldList[4], $pos, 1) == '(') {

-							$parenthesisopen++;

-						}

-						if (substr($InfoFieldList[4], $pos, 1) == ')') {

-							$parenthesisopen--;

-						}

-						$pos++;

-					}

-					$tmpbefore = substr($InfoFieldList[4], 0, $pos);

-					$tmpafter = substr($InfoFieldList[4], $pos+1);

-					//var_dump($InfoFieldList[4].' -> '.$pos); var_dump($tmpafter);

-					$InfoFieldList[4] = $tmpbefore;

-					if ($tmpafter !== '') {

-						$InfoFieldList = array_merge($InfoFieldList, explode(':', $tmpafter));

-					}

-					//var_dump($InfoFieldList);

-				}

+				$InfoFieldList = explode(":", $param_list[0]);

@@ -7393 +6247,0 @@
-

@@ -7399,3 +6252,0 @@
-				// 5 : id category type

-				// 6 : ids categories list separated by comma for category root

-				// 7 : sort field

@@ -7404,2 +6255,5 @@
-				if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4])) {

-					if (strpos($InfoFieldList[4], 'extra.') !== false) {

+

+				if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4]))

+				{

+					if (strpos($InfoFieldList[4], 'extra.') !== false)

+					{

@@ -7411 +6265,2 @@
-				if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3])) {

+				if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3]))

+				{

@@ -7416,21 +6271,70 @@
-				$filter_categorie = false;

-				if (count($InfoFieldList) > 5) {

-					if ($InfoFieldList[0] == 'categorie') {

-						$filter_categorie = true;

-					}

-				}

-

-				if ($filter_categorie === false) {

-					$fields_label = explode('|', $InfoFieldList[1]);

-					if (is_array($fields_label)) {

-						$keyList .= ', ';

-						$keyList .= implode(', ', $fields_label);

-					}

-

-					$sqlwhere = '';

-					$sql = "SELECT " . $keyList;

-					$sql .= " FROM " . $this->db->prefix() . $InfoFieldList[0];

-					if (!empty($InfoFieldList[4])) {

-						// can use SELECT request

-						if (strpos($InfoFieldList[4], '$SEL$') !== false) {

-							$InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);

+				$fields_label = explode('|', $InfoFieldList[1]);

+				if (is_array($fields_label))

+				{

+					$keyList .= ', ';

+					$keyList .= implode(', ', $fields_label);

+				}

+

+				$sqlwhere = '';

+				$sql = 'SELECT '.$keyList;

+				$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];

+				if (!empty($InfoFieldList[4]))

+				{

+					// can use SELECT request

+					if (strpos($InfoFieldList[4], '$SEL$') !== false) {

+						$InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);

+					}

+

+					// current object id can be use into filter

+					if (strpos($InfoFieldList[4], '$ID$') !== false && !empty($objectid)) {

+						$InfoFieldList[4] = str_replace('$ID$', $objectid, $InfoFieldList[4]);

+					} else {

+						$InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);

+					}

+					//We have to join on extrafield table

+					if (strpos($InfoFieldList[4], 'extra') !== false)

+					{

+						$sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';

+						$sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];

+					}

+					else

+					{

+						$sqlwhere .= ' WHERE '.$InfoFieldList[4];

+					}

+				}

+				else

+				{

+					$sqlwhere .= ' WHERE 1=1';

+				}

+				// Some tables may have field, some other not. For the moment we disable it.

+				if (in_array($InfoFieldList[0], array('tablewithentity')))

+				{

+					$sqlwhere .= ' AND entity = '.$conf->entity;

+				}

+				$sql .= $sqlwhere;

+				//print $sql;

+

+				$sql .= ' ORDER BY '.implode(', ', $fields_label);

+

+				dol_syslog(get_class($this).'::showInputField type=sellist', LOG_DEBUG);

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

+				if ($resql)

+				{

+					$out .= '<option value="0">&nbsp;</option>';

+					$num = $this->db->num_rows($resql);

+					$i = 0;

+					while ($i < $num)

+					{

+						$labeltoshow = '';

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

+

+						// Several field into label (eq table:code|libelle:rowid)

+						$notrans = false;

+						$fields_label = explode('|', $InfoFieldList[1]);

+						if (count($fields_label) > 1)

+						{

+							$notrans = true;

+							foreach ($fields_label as $field_toshow)

+							{

+								$labeltoshow .= $obj->$field_toshow.' ';

+							}

@@ -7438,6 +6342,3 @@
-

-						// current object id can be use into filter

-						if (strpos($InfoFieldList[4], '$ID$') !== false && !empty($objectid)) {

-							$InfoFieldList[4] = str_replace('$ID$', $objectid, $InfoFieldList[4]);

-						} else {

-							$InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);

+						else

+						{

+							$labeltoshow = $obj->{$InfoFieldList[1]};

@@ -7445,9 +6346,14 @@
-

-						// We have to join on extrafield table

-						$errstr = '';

-						if (strpos($InfoFieldList[4], 'extra') !== false) {

-							$sql .= " as main, " . $this->db->prefix() . $InfoFieldList[0] . "_extrafields as extra";

-							$sqlwhere .= " WHERE extra.fk_object=main." . $InfoFieldList[2];

-							$sqlwhere .= " AND " . forgeSQLFromUniversalSearchCriteria($InfoFieldList[4], $errstr, 1);

-						} else {

-							$sqlwhere .= " WHERE " . forgeSQLFromUniversalSearchCriteria($InfoFieldList[4], $errstr, 1);

+						$labeltoshow = dol_trunc($labeltoshow, 45);

+

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

+						{

+							foreach ($fields_label as $field_toshow)

+							{

+								$translabel = $langs->trans($obj->$field_toshow);

+								if ($translabel != $obj->$field_toshow) {

+									$labeltoshow = dol_trunc($translabel, 18).' ';

+								} else {

+									$labeltoshow = dol_trunc($obj->$field_toshow, 18).' ';

+								}

+							}

+							$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';

@@ -7455,34 +6361,7 @@
-					} else {

-						$sqlwhere .= ' WHERE 1=1';

-					}

-					// Some tables may have field, some other not. For the moment we disable it.

-					if (in_array($InfoFieldList[0], array('tablewithentity'))) {

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

-					}

-					$sql .= $sqlwhere;

-					//print $sql;

-

-					// Note: $InfoFieldList can be 'sellist:TableName:LabelFieldName[:KeyFieldName[:KeyFieldParent[:Filter[:CategoryIdType[:CategoryIdList[:Sortfield]]]]]]'

-					if (isset($InfoFieldList[7]) && preg_match('/^[a-z0-9_\-,]+$/i', $InfoFieldList[7])) {

-						$sql .= " ORDER BY ".$this->db->escape($InfoFieldList[7]);

-					} else {

-						$sql .= " ORDER BY ".$this->db->sanitize(implode(', ', $fields_label));

-					}

-

-					dol_syslog(get_class($this) . '::showInputField type=sellist', LOG_DEBUG);

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

-					if ($resql) {

-						$out .= '<option value="0">&nbsp;</option>';

-						$num = $this->db->num_rows($resql);

-						$i = 0;

-						while ($i < $num) {

-							$labeltoshow = '';

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

-

-							// Several field into label (eq table:code|libelle:rowid)

-							$notrans = false;

-							$fields_label = explode('|', $InfoFieldList[1]);

-							if (count($fields_label) > 1) {

-								$notrans = true;

-								foreach ($fields_label as $field_toshow) {

-									$labeltoshow .= $obj->$field_toshow . ' ';

+						else

+						{

+							if (!$notrans)

+							{

+								$translabel = $langs->trans($obj->{$InfoFieldList[1]});

+								if ($translabel != $obj->{$InfoFieldList[1]}) {

+									$labeltoshow = dol_trunc($translabel, 18);

@@ -7490,2 +6369,3 @@
-							} else {

-								$labeltoshow = $obj->{$InfoFieldList[1]};

+								else {

+									$labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);

+								}

@@ -7493,37 +6373,4 @@
-							$labeltoshow = dol_trunc($labeltoshow, 45);

-

-							if ($value == $obj->rowid) {

-								foreach ($fields_label as $field_toshow) {

-									$translabel = $langs->trans($obj->$field_toshow);

-									if ($translabel != $obj->$field_toshow) {

-										$labeltoshow = dol_trunc($translabel) . ' ';

-									} else {

-										$labeltoshow = dol_trunc($obj->$field_toshow) . ' ';

-									}

-								}

-								$out .= '<option value="' . $obj->rowid . '" selected>' . $labeltoshow . '</option>';

-							} else {

-								if (!$notrans) {

-									$translabel = $langs->trans($obj->{$InfoFieldList[1]});

-									if ($translabel != $obj->{$InfoFieldList[1]}) {

-										$labeltoshow = dol_trunc($translabel, 18);

-									} else {

-										$labeltoshow = dol_trunc($obj->{$InfoFieldList[1]});

-									}

-								}

-								if (empty($labeltoshow)) {

-									$labeltoshow = '(not defined)';

-								}

-								if ($value == $obj->rowid) {

-									$out .= '<option value="' . $obj->rowid . '" selected>' . $labeltoshow . '</option>';

-								}

-

-								if (!empty($InfoFieldList[3]) && $parentField) {

-									$parent = $parentName . ':' . $obj->{$parentField};

-									$isDependList = 1;

-								}

-

-								$out .= '<option value="' . $obj->rowid . '"';

-								$out .= ($value == $obj->rowid ? ' selected' : '');

-								$out .= (!empty($parent) ? ' parent="' . $parent . '"' : '');

-								$out .= '>' . $labeltoshow . '</option>';

+							if (empty($labeltoshow)) $labeltoshow = '(not defined)';

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

+							{

+								$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';

@@ -7532 +6379,9 @@
-							$i++;

+							if (!empty($InfoFieldList[3]) && $parentField)

+							{

+								$parent = $parentName.':'.$obj->{$parentField};

+							}

+

+							$out .= '<option value="'.$obj->rowid.'"';

+							$out .= ($value == $obj->rowid ? ' selected' : '');

+							$out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');

+							$out .= '>'.$labeltoshow.'</option>';

@@ -7534,13 +6389,7 @@
-						$this->db->free($resql);

-					} else {

-						print 'Error in request ' . $sql . ' ' . $this->db->lasterror() . '. Check setup of extra parameters.<br>';

-					}

-				} else {

-					require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';

-					$data = $form->select_all_categories(Categorie::$MAP_ID_TO_CODE[$InfoFieldList[5]], '', 'parent', 64, $InfoFieldList[6], 1, 1);

-					$out .= '<option value="0">&nbsp;</option>';

-					foreach ($data as $data_key => $data_value) {

-						$out .= '<option value="' . $data_key . '"';

-						$out .= ($value == $data_key ? ' selected' : '');

-						$out .= '>' . $data_value . '</option>';

-					}

+

+						$i++;

+					}

+					$this->db->free($resql);

+				}

+				else {

+					print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';

@@ -7550 +6399,3 @@
-		} elseif ($type == 'checkbox') {

+		}

+		elseif ($type == 'checkbox')

+		{

@@ -7552,2 +6403,4 @@
-			$out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ? null : $param['options']), $value_arr, '', 0, $morecss, 0, '100%');

-		} elseif ($type == 'radio') {

+			$out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ?null:$param['options']), $value_arr, '', 0, '', 0, '100%');

+		}

+		elseif ($type == 'radio')

+		{

@@ -7555 +6408,2 @@
-			foreach ($param['options'] as $keyopt => $valopt) {

+			foreach ($param['options'] as $keyopt => $val)

+			{

@@ -7560,3 +6414,5 @@
-				$out .= '/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$valopt.'</label><br>';

-			}

-		} elseif ($type == 'chkbxlst') {

+				$out .= '/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';

+			}

+		}

+		elseif ($type == 'chkbxlst')

+		{

@@ -7565 +6421,2 @@
-			} else {

+			}

+			else {

@@ -7579,2 +6435,0 @@
-				// 5 : id category type

-				// 6 : ids categories list separated by comma for category root

@@ -7584 +6439 @@
-					list($parentName, $parentField) = explode('|', $InfoFieldList[3]);

+					list ($parentName, $parentField) = explode('|', $InfoFieldList[3]);

@@ -7595,21 +6450,63 @@
-				$filter_categorie = false;

-				if (count($InfoFieldList) > 5) {

-					if ($InfoFieldList[0] == 'categorie') {

-						$filter_categorie = true;

-					}

-				}

-

-				if ($filter_categorie === false) {

-					$fields_label = explode('|', $InfoFieldList[1]);

-					if (is_array($fields_label)) {

-						$keyList .= ', ';

-						$keyList .= implode(', ', $fields_label);

-					}

-

-					$sqlwhere = '';

-					$sql = "SELECT " . $keyList;

-					$sql .= ' FROM ' . $this->db->prefix() . $InfoFieldList[0];

-					if (!empty($InfoFieldList[4])) {

-						// can use SELECT request

-						if (strpos($InfoFieldList[4], '$SEL$') !== false) {

-							$InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);

+				$fields_label = explode('|', $InfoFieldList[1]);

+				if (is_array($fields_label)) {

+					$keyList .= ', ';

+					$keyList .= implode(', ', $fields_label);

+				}

+

+				$sqlwhere = '';

+				$sql = 'SELECT '.$keyList;

+				$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];

+				if (!empty($InfoFieldList[4])) {

+					// can use SELECT request

+					if (strpos($InfoFieldList[4], '$SEL$') !== false) {

+						$InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);

+					}

+

+					// current object id can be use into filter

+					if (strpos($InfoFieldList[4], '$ID$') !== false && !empty($objectid)) {

+						$InfoFieldList[4] = str_replace('$ID$', $objectid, $InfoFieldList[4]);

+					} else {

+						$InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);

+					}

+

+					// We have to join on extrafield table

+					if (strpos($InfoFieldList[4], 'extra') !== false) {

+						$sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';

+						$sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];

+					} else {

+						$sqlwhere .= ' WHERE '.$InfoFieldList[4];

+					}

+				} else {

+					$sqlwhere .= ' WHERE 1=1';

+				}

+				// Some tables may have field, some other not. For the moment we disable it.

+				if (in_array($InfoFieldList[0], array('tablewithentity')))

+				{

+					$sqlwhere .= ' AND entity = '.$conf->entity;

+				}

+				// $sql.=preg_replace('/^ AND /','',$sqlwhere);

+				// print $sql;

+

+				$sql .= $sqlwhere;

+				dol_syslog(get_class($this).'::showInputField type=chkbxlst', LOG_DEBUG);

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

+				if ($resql) {

+					$num = $this->db->num_rows($resql);

+					$i = 0;

+

+					$data = array();

+

+					while ($i < $num) {

+						$labeltoshow = '';

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

+

+						$notrans = false;

+						// Several field into label (eq table:code|libelle:rowid)

+						$fields_label = explode('|', $InfoFieldList[1]);

+						if (count($fields_label) > 1) {

+							$notrans = true;

+							foreach ($fields_label as $field_toshow) {

+								$labeltoshow .= $obj->$field_toshow.' ';

+							}

+						} else {

+							$labeltoshow = $obj->{$InfoFieldList[1]};

@@ -7617,4 +6514,13 @@
-

-						// current object id can be use into filter

-						if (strpos($InfoFieldList[4], '$ID$') !== false && !empty($objectid)) {

-							$InfoFieldList[4] = str_replace('$ID$', $objectid, $InfoFieldList[4]);

+						$labeltoshow = dol_trunc($labeltoshow, 45);

+

+						if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {

+							foreach ($fields_label as $field_toshow) {

+								$translabel = $langs->trans($obj->$field_toshow);

+								if ($translabel != $obj->$field_toshow) {

+									$labeltoshow = dol_trunc($translabel, 18).' ';

+								} else {

+									$labeltoshow = dol_trunc($obj->$field_toshow, 18).' ';

+								}

+							}

+

+							$data[$obj->rowid] = $labeltoshow;

@@ -7622,40 +6528,6 @@
-							$InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);

-						}

-

-						// We have to join on extrafield table

-						if (strpos($InfoFieldList[4], 'extra') !== false) {

-							$sql .= ' as main, ' . $this->db->prefix() . $InfoFieldList[0] . '_extrafields as extra';

-							$sqlwhere .= " WHERE extra.fk_object=main." . $InfoFieldList[2] . " AND " . $InfoFieldList[4];

-						} else {

-							$sqlwhere .= " WHERE " . $InfoFieldList[4];

-						}

-					} else {

-						$sqlwhere .= ' WHERE 1=1';

-					}

-					// Some tables may have field, some other not. For the moment we disable it.

-					if (in_array($InfoFieldList[0], array('tablewithentity'))) {

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

-					}

-					// $sql.=preg_replace('/^ AND /','',$sqlwhere);

-					// print $sql;

-

-					$sql .= $sqlwhere;

-					dol_syslog(get_class($this) . '::showInputField type=chkbxlst', LOG_DEBUG);

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

-					if ($resql) {

-						$num = $this->db->num_rows($resql);

-						$i = 0;

-

-						$data = array();

-

-						while ($i < $num) {

-							$labeltoshow = '';

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

-

-							$notrans = false;

-							// Several field into label (eq table:code|libelle:rowid)

-							$fields_label = explode('|', $InfoFieldList[1]);

-							if (count($fields_label) > 1) {

-								$notrans = true;

-								foreach ($fields_label as $field_toshow) {

-									$labeltoshow .= $obj->$field_toshow . ' ';

+							if (!$notrans) {

+								$translabel = $langs->trans($obj->{$InfoFieldList[1]});

+								if ($translabel != $obj->{$InfoFieldList[1]}) {

+									$labeltoshow = dol_trunc($translabel, 18);

+								} else {

+									$labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);

@@ -7663,2 +6534,0 @@
-							} else {

-								$labeltoshow = $obj->{$InfoFieldList[1]};

@@ -7666 +6536,3 @@
-							$labeltoshow = dol_trunc($labeltoshow, 45);

+							if (empty($labeltoshow)) {

+								$labeltoshow = '(not defined)';

+							}

@@ -7669,32 +6540,0 @@
-								foreach ($fields_label as $field_toshow) {

-									$translabel = $langs->trans($obj->$field_toshow);

-									if ($translabel != $obj->$field_toshow) {

-										$labeltoshow = dol_trunc($translabel, 18) . ' ';

-									} else {

-										$labeltoshow = dol_trunc($obj->$field_toshow, 18) . ' ';

-									}

-								}

-

-								$data[$obj->rowid] = $labeltoshow;

-							} else {

-								if (!$notrans) {

-									$translabel = $langs->trans($obj->{$InfoFieldList[1]});

-									if ($translabel != $obj->{$InfoFieldList[1]}) {

-										$labeltoshow = dol_trunc($translabel, 18);

-									} else {

-										$labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);

-									}

-								}

-								if (empty($labeltoshow)) {

-									$labeltoshow = '(not defined)';

-								}

-

-								if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {

-									$data[$obj->rowid] = $labeltoshow;

-								}

-

-								if (!empty($InfoFieldList[3]) && $parentField) {

-									$parent = $parentName . ':' . $obj->{$parentField};

-									$isDependList = 1;

-								}

-

@@ -7704 +6544,5 @@
-							$i++;

+							if (!empty($InfoFieldList[3]) && $parentField) {

+								$parent = $parentName.':'.$obj->{$parentField};

+							}

+

+							$data[$obj->rowid] = $labeltoshow;

@@ -7706,6 +6550,6 @@
-						$this->db->free($resql);

-

-						$out = $form->multiselectarray($keyprefix . $key . $keysuffix, $data, $value_arr, '', 0, $morecss, 0, '100%');

-					} else {

-						print 'Error in request ' . $sql . ' ' . $this->db->lasterror() . '. Check setup of extra parameters.<br>';

-					}

+

+						$i++;

+					}

+					$this->db->free($resql);

+

+					$out = $form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');

@@ -7713,11 +6557,8 @@
-					require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';

-					$data = $form->select_all_categories(Categorie::$MAP_ID_TO_CODE[$InfoFieldList[5]], '', 'parent', 64, $InfoFieldList[6], 1, 1);

-					$out = $form->multiselectarray($keyprefix . $key . $keysuffix, $data, $value_arr, '', 0, $morecss, 0, '100%');

-				}

-			}

-		} elseif ($type == 'link') {

-			// $param_list='ObjectName:classPath[:AddCreateButtonOrNot[:Filter[:Sortfield]]]'

-			// Filter can contains some ':' inside.

-			$param_list = array_keys($param['options']);

-			$param_list_array = explode(':', $param_list[0], 4);

-

+					print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';

+				}

+			}

+		}

+		elseif ($type == 'link')

+		{

+			$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath[:AddCreateButtonOrNot[:Filter]]'

+			$param_list_array = explode(':', $param_list[0]);

@@ -7725,37 +6566,23 @@
-

-			if (!preg_match('/search_/', $keyprefix)) {

-				if (!empty($param_list_array[2])) {		// If the entry into $fields is set to add a create button

-					if (!empty($this->fields[$key]['picto'])) {

-						$morecss .= ' widthcentpercentminusxx';

-					} else {

-						$morecss .= ' widthcentpercentminusx';

-					}

-				} else {

-					if (!empty($this->fields[$key]['picto'])) {

-						$morecss .= ' widthcentpercentminusx';

-					}

-				}

-			}

-			$objectfield = $this->element.($this->module ? '@'.$this->module : '').':'.$key.$keysuffix;

-			$out = $form->selectForForms($param_list_array[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', $morecss, $moreparam, 0, (empty($val['disabled']) ? 0 : 1), '', $objectfield);

-

-			if (!empty($param_list_array[2])) {		// If the entry into $fields is set, we must add a create button

-				if ((!GETPOSTISSET('backtopage') || strpos(GETPOST('backtopage'), $_SERVER['PHP_SELF']) === 0)	// // To avoid to open several times the 'Plus' button (we accept only one level)

-					&& empty($val['disabled']) && empty($nonewbutton)) {	// and to avoid to show the button if the field is protected by a "disabled".

-					list($class, $classfile) = explode(':', $param_list[0]);

-					if (file_exists(dol_buildpath(dirname(dirname($classfile)).'/card.php'))) {

-						$url_path = dol_buildpath(dirname(dirname($classfile)).'/card.php', 1);

-					} else {

-						$url_path = dol_buildpath(dirname(dirname($classfile)).'/'.strtolower($class).'_card.php', 1);

-					}

-					$paramforthenewlink = '';

-					$paramforthenewlink .= (GETPOSTISSET('action') ? '&action='.GETPOST('action', 'aZ09') : '');

-					$paramforthenewlink .= (GETPOSTISSET('id') ? '&id='.GETPOST('id', 'int') : '');

-					$paramforthenewlink .= (GETPOSTISSET('origin') ? '&origin='.GETPOST('origin', 'aZ09') : '');

-					$paramforthenewlink .= (GETPOSTISSET('originid') ? '&originid='.GETPOST('originid', 'int') : '');

-					$paramforthenewlink .= '&fk_'.strtolower($class).'=--IDFORBACKTOPAGE--';

-					// TODO Add Javascript code to add input fields already filled into $paramforthenewlink so we won't loose them when going back to main page

-					$out .= '<a class="butActionNew" title="'.$langs->trans("New").'" href="'.$url_path.'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF'].($paramforthenewlink ? '?'.$paramforthenewlink : '')).'"><span class="fa fa-plus-circle valignmiddle"></span></a>';

-				}

-			}

-		} elseif ($type == 'password') {

+			if (!empty($param_list_array[2])) {		// If the entry into $fields is set to add a create button

+				$morecss .= ' widthcentpercentminusx';

+			}

+

+			$out = $form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', $morecss, $moreparam, 0, empty($val['disabled']) ? 0 : 1);

+

+			if (!empty($param_list_array[2])) {		// If the entry into $fields is set to add a create button

+				if (!GETPOSTISSET('backtopage') && empty($val['disabled']) && empty($nonewbutton))	// To avoid to open several times the 'Create Object' button and to avoid to have button if field is protected by a "disabled".

+				{

+		   			list($class, $classfile) = explode(':', $param_list[0]);

+		   			if (file_exists(dol_buildpath(dirname(dirname($classfile)).'/card.php'))) $url_path = dol_buildpath(dirname(dirname($classfile)).'/card.php', 1);

+		   			else $url_path = dol_buildpath(dirname(dirname($classfile)).'/'.strtolower($class).'_card.php', 1);

+		   			$paramforthenewlink = '';

+		   			$paramforthenewlink .= (GETPOSTISSET('action') ? '&action='.GETPOST('action', 'aZ09') : '');

+		   			$paramforthenewlink .= (GETPOSTISSET('id') ? '&id='.GETPOST('id', 'int') : '');

+		   			$paramforthenewlink .= '&fk_'.strtolower($class).'=--IDFORBACKTOPAGE--';

+		   			// TODO Add Javascript code to add input fields already filled into $paramforthenewlink so we won't loose them when going back to main page

+		   			$out .= '<a class="butActionNew" title="'.$langs->trans("New").'" href="'.$url_path.'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF'].($paramforthenewlink ? '?'.$paramforthenewlink : '')).'"><span class="fa fa-plus-circle valignmiddle"></span></a>';

+				}

+			}

+		}

+		elseif ($type == 'password')

+		{

@@ -7763,7 +6590,4 @@
-			if ($keyprefix.$key.$keysuffix == 'pass_crypted') {

-				$out = '<input type="'.($keyprefix == 'search_' ? 'text' : 'password').'" class="flat '.$morecss.'" name="pass" id="pass" value="" '.($moreparam ? $moreparam : '').'>';

-				$out .= '<input type="hidden" name="pass_crypted" id="pass_crypted" value="'.$value.'" '.($moreparam ? $moreparam : '').'>';

-			} else {

-				$out = '<input type="'.($keyprefix == 'search_' ? 'text' : 'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'>';

-			}

-		} elseif ($type == 'array') {

+			$out = '<input type="'.($keyprefix == 'search_' ? 'text' : 'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'>';

+		}

+		elseif ($type == 'array')

+		{

@@ -7773,0 +6598,2 @@
+

+			$inputs = array();

@@ -7779,0 +6606 @@
+

@@ -7787 +6614 @@
-					<script nonce="'.getNonce().'">

+					<script>

@@ -7803,4 +6629,0 @@
-

-		if ($isDependList == 1) {

-			$out .= $this->getJSListDependancies('_common');

-		}

@@ -7811,6 +6633,0 @@
-

-		// Display error message for field

-		if (!empty($fieldValidationErrorMsg) && function_exists('getFieldErrorIcon')) {

-			$out .= ' '.getFieldErrorIcon($fieldValidationErrorMsg);

-		}

-

@@ -7824,7 +6641,7 @@
-	 * @param  array   	$val		       	Array of properties of field to show

-	 * @param  string  	$key            	Key of attribute

-	 * @param  string  	$value          	Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value)

-	 * @param  string  	$moreparam      	To add more parameters on html tag

-	 * @param  string  	$keysuffix      	Prefix string to add into name and id of field (can be used to avoid duplicate names)

-	 * @param  string  	$keyprefix      	Suffix string to add into name and id of field (can be used to avoid duplicate names)

-	 * @param  mixed   	$morecss        	Value for CSS to use (Old usage: May also be a numeric to define a size).

+	 * @param  array   $val		       Array of properties of field to show

+	 * @param  string  $key            Key of attribute

+	 * @param  string  $value          Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value)

+	 * @param  string  $moreparam      To add more parametes on html input tag

+	 * @param  string  $keysuffix      Prefix string to add into name and id of field (can be used to avoid duplicate names)

+	 * @param  string  $keyprefix      Suffix string to add into name and id of field (can be used to avoid duplicate names)

+	 * @param  mixed   $morecss        Value for css to define size. May also be a numeric.

@@ -7837 +6654,2 @@
-		if (!is_object($form)) {

+		if (!is_object($form))

+		{

@@ -7842,3 +6660,4 @@
-		$label = empty($val['label']) ? '' : $val['label'];

-		$type  = empty($val['type']) ? '' : $val['type'];

-		$size  = empty($val['css']) ? '' : $val['css'];

+		$objectid = $this->id;

+		$label = $val['label'];

+		$type  = $val['type'];

+		$size  = $val['css'];

@@ -7848 +6667,2 @@
-		if (preg_match('/varchar\((\d+)\)/', $type, $reg)) {

+		if (preg_match('/varchar\((\d+)\)/', $type, $reg))

+		{

@@ -7851,14 +6671,9 @@
-		} elseif (preg_match('/varchar/', $type)) {

-			$type = 'varchar'; // convert varchar(xx) int varchar

-		}

-		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {

-			$type = (($this->fields[$key]['type']=='checkbox') ? $this->fields[$key]['type'] : 'select');

-		}

-		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) {

-			$type = 'link';

-		}

-

-		$default = empty($val['default']) ? '' : $val['default'];

-		$computed = empty($val['computed']) ? '' : $val['computed'];

-		$unique = empty($val['unique']) ? '' : $val['unique'];

-		$required = empty($val['required']) ? '' : $val['required'];

+		}

+		elseif (preg_match('/varchar/', $type)) $type = 'varchar'; // convert varchar(xx) int varchar

+		if (is_array($val['arrayofkeyval'])) $type = 'select';

+		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) $type = 'link';

+

+		$default = $val['default'];

+		$computed = $val['computed'];

+		$unique = $val['unique'];

+		$required = $val['required'];

@@ -7868,4 +6683,3 @@
-		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {

-			$param['options'] = $val['arrayofkeyval'];

-		}

-		if (preg_match('/^integer:([^:]*):([^:]*)/i', $val['type'], $reg)) {	// ex: integer:User:user/class/user.class.php

+		if (is_array($val['arrayofkeyval'])) $param['options'] = $val['arrayofkeyval'];

+		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg))

+		{

@@ -7873,23 +6687,10 @@
-			$stringforoptions = $reg[1].':'.$reg[2];

-			// Special case: Force addition of getnomurlparam1 to -1 for users

-			if ($reg[1] == 'User') {

-				$stringforoptions .= ':#getnomurlparam1=-1';

-			}

-			$param['options'] = array($stringforoptions => $stringforoptions);

-		} elseif (preg_match('/^sellist:(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {

-			$param['options'] = array($reg[1].':'.$reg[2].':'.$reg[3].':'.$reg[4] => 'N');

-			$type = 'sellist';

-		} elseif (preg_match('/^sellist:(.*):(.*):(.*)/i', $val['type'], $reg)) {

-			$param['options'] = array($reg[1].':'.$reg[2].':'.$reg[3] => 'N');

-			$type = 'sellist';

-		} elseif (preg_match('/^sellist:(.*):(.*)/i', $val['type'], $reg)) {

-			$param['options'] = array($reg[1].':'.$reg[2] => 'N');

-			$type = 'sellist';

-		} elseif (preg_match('/^chkbxlst:(.*)/i', $val['type'], $reg)) {

-			$param['options'] = array($reg[1] => 'N');

-			$type = 'chkbxlst';

-		}

-

-		$langfile = empty($val['langfile']) ? '' : $val['langfile'];

-		$list = (empty($val['list']) ? '' : $val['list']);

-		$help = (empty($val['help']) ? '' : $val['help']);

+			$param['options'] = array($reg[1].':'.$reg[2]=>$reg[1].':'.$reg[2]);

+		}

+        elseif (preg_match('/^sellist:(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {

+            $param['options'] = array($reg[1].':'.$reg[2].':'.$reg[3].':'.$reg[4] => 'N');

+            $type = 'sellist';

+        }

+

+		$langfile = $val['langfile'];

+		$list = $val['list'];

+		$help = $val['help'];

@@ -7898,3 +6699 @@
-		if ($hidden) {

-			return '';

-		}

+		if ($hidden) return '';

@@ -7903 +6702,2 @@
-		if ($computed) {

+		if ($computed)

+		{

@@ -7906,5 +6706,7 @@
-			$value = dol_eval($computed, 1, 0, '2');

-		}

-

-		if (empty($morecss)) {

-			if ($type == 'date') {

+			$value = dol_eval($computed, 1, 0);

+		}

+

+		if (empty($morecss))

+		{

+			if ($type == 'date')

+			{

@@ -7912 +6714,3 @@
-			} elseif ($type == 'datetime' || $type == 'timestamp') {

+			}

+			elseif ($type == 'datetime' || $type == 'timestamp')

+			{

@@ -7914 +6718,3 @@
-			} elseif (in_array($type, array('int', 'double', 'price'))) {

+			}

+			elseif (in_array($type, array('int', 'double', 'price')))

+			{

@@ -7916 +6722,3 @@
-			} elseif ($type == 'url') {

+			}

+			elseif ($type == 'url')

+			{

@@ -7918 +6726,3 @@
-			} elseif ($type == 'boolean') {

+			}

+			elseif ($type == 'boolean')

+			{

@@ -7920,2 +6730,5 @@
-			} else {

-				if (is_numeric($size) && round($size) < 12) {

+			}

+			else

+			{

+				if (round($size) < 12)

+				{

@@ -7923 +6736,3 @@
-				} elseif (is_numeric($size) && round($size) <= 48) {

+				}

+				elseif (round($size) <= 48)

+				{

@@ -7925 +6740,3 @@
-				} else {

+				}

+				else

+				{

@@ -7932,7 +6749,4 @@
-		if (in_array($key, array('rowid', 'ref')) && method_exists($this, 'getNomUrl')) {

-			if ($key != 'rowid' || empty($this->fields['ref'])) {	// If we want ref field or if we want ID and there is no ref field, we show the link.

-				$value = $this->getNomUrl(1, '', 0, '', 1);

-			}

-		} elseif ($key == 'status' && method_exists($this, 'getLibStatut')) {

-			$value = $this->getLibStatut(3);

-		} elseif ($type == 'date') {

+		if ($key == 'ref' && method_exists($this, 'getNomUrl')) $value = $this->getNomUrl(1, '', 0, '', 1);

+		elseif ($key == 'status' && method_exists($this, 'getLibStatut')) $value = $this->getLibStatut(3);

+		elseif ($type == 'date')

+		{

@@ -7940 +6754 @@
-				$value = dol_print_date($value, 'day');	// We suppose dates without time are always gmt (storage of course + output)

+				$value = dol_print_date($value, 'day');

@@ -7944 +6758,3 @@
-		} elseif ($type == 'datetime' || $type == 'timestamp') {

+		}

+		elseif ($type == 'datetime' || $type == 'timestamp')

+		{

@@ -7946 +6762 @@
-				$value = dol_print_date($value, 'dayhour', 'tzuserrel');

+				$value = dol_print_date($value, 'dayhour');

@@ -7950 +6766,3 @@
-		} elseif ($type == 'duration') {

+		}

+		elseif ($type == 'duration')

+		{

@@ -7955 +6773,3 @@
-		} elseif ($type == 'double' || $type == 'real') {

+		}

+		elseif ($type == 'double' || $type == 'real')

+		{

@@ -7959 +6779,3 @@
-		} elseif ($type == 'boolean') {

+		}

+		elseif ($type == 'boolean')

+		{

@@ -7965 +6787,3 @@
-		} elseif ($type == 'mail' || $type == 'email') {

+		}

+		elseif ($type == 'mail')

+		{

@@ -7967 +6791,3 @@
-		} elseif ($type == 'url') {

+		}

+		elseif ($type == 'url')

+		{

@@ -7969,5 +6795,7 @@
-		} elseif ($type == 'phone') {

-			$value = dol_print_phone($value, '', 0, 0, '', '&nbsp;', 'phone');

-		} elseif ($type == 'ip') {

-			$value = dol_print_ip($value, 0);

-		} elseif ($type == 'price') {

+		}

+		elseif ($type == 'phone')

+		{

+			$value = dol_print_phone($value, '', 0, 0, '', '&nbsp;', 1);

+		}

+		elseif ($type == 'price')

+		{

@@ -7977,6 +6805,7 @@
-		} elseif ($type == 'select') {

-			$value = isset($param['options'][$value]) ? $param['options'][$value] : '';

-			if (strpos($value, "|") !== false) {

-				$value = $langs->trans(explode('|', $value)[0]);

-			}

-		} elseif ($type == 'sellist') {

+		}

+		elseif ($type == 'select')

+		{

+			$value = $param['options'][$value];

+		}

+		elseif ($type == 'sellist')

+		{

@@ -7989 +6818,2 @@
-			if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4])) {

+			if (count($InfoFieldList) >= 3)

+			{

@@ -8000,9 +6830,97 @@
-			$filter_categorie = false;

-			if (count($InfoFieldList) > 5) {

-				if ($InfoFieldList[0] == 'categorie') {

-					$filter_categorie = true;

-				}

-			}

-

-			$sql = "SELECT ".$keyList;

-			$sql .= ' FROM '.$this->db->prefix().$InfoFieldList[0];

+			$sql = 'SELECT '.$keyList;

+			$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];

+			if (strpos($InfoFieldList[4], 'extra') !== false)

+			{

+				$sql .= ' as main';

+			}

+			if ($selectkey == 'rowid' && empty($value)) {

+				$sql .= " WHERE ".$selectkey."=0";

+			} elseif ($selectkey == 'rowid') {

+				$sql .= " WHERE ".$selectkey."=".$this->db->escape($value);

+			} else {

+				$sql .= " WHERE ".$selectkey."='".$this->db->escape($value)."'";

+			}

+

+			//$sql.= ' AND entity = '.$conf->entity;

+

+			dol_syslog(get_class($this).':showOutputField:$type=sellist', LOG_DEBUG);

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

+			if ($resql)

+			{

+				$value = ''; // value was used, so now we reste it to use it to build final output

+

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

+

+				// Several field into label (eq table:code|libelle:rowid)

+				$fields_label = explode('|', $InfoFieldList[1]);

+

+				if (is_array($fields_label) && count($fields_label) > 1)

+				{

+					foreach ($fields_label as $field_toshow)

+					{

+						$translabel = '';

+						if (!empty($obj->$field_toshow)) {

+							$translabel = $langs->trans($obj->$field_toshow);

+						}

+						if ($translabel != $field_toshow) {

+							$value .= dol_trunc($translabel, 18).' ';

+						} else {

+							$value .= $obj->$field_toshow.' ';

+						}

+					}

+				}

+				else

+				{

+					$translabel = '';

+					if (!empty($obj->{$InfoFieldList[1]})) {

+						$translabel = $langs->trans($obj->{$InfoFieldList[1]});

+					}

+					if ($translabel != $obj->{$InfoFieldList[1]}) {

+						$value = dol_trunc($translabel, 18);

+					} else {

+						$value = $obj->{$InfoFieldList[1]};

+					}

+				}

+			}

+			else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);

+		}

+		elseif ($type == 'radio')

+		{

+			$value = $param['options'][$value];

+		}

+		elseif ($type == 'checkbox')

+		{

+			$value_arr = explode(',', $value);

+			$value = '';

+			if (is_array($value_arr) && count($value_arr) > 0)

+			{

+				$toprint = array();

+				foreach ($value_arr as $keyval=>$valueval) {

+					$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$param['options'][$valueval].'</li>';

+				}

+				$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';

+			}

+		}

+		elseif ($type == 'chkbxlst')

+		{

+			$value_arr = explode(',', $value);

+

+			$param_list = array_keys($param['options']);

+			$InfoFieldList = explode(":", $param_list[0]);

+

+			$selectkey = "rowid";

+			$keyList = 'rowid';

+

+			if (count($InfoFieldList) >= 3) {

+				$selectkey = $InfoFieldList[2];

+				$keyList = $InfoFieldList[2].' as rowid';

+			}

+

+			$fields_label = explode('|', $InfoFieldList[1]);

+			if (is_array($fields_label)) {

+				$keyList .= ', ';

+				$keyList .= implode(', ', $fields_label);

+			}

+

+			$sql = 'SELECT '.$keyList;

+			$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];

@@ -8012,11 +6930,4 @@
-			if ($selectkey == 'rowid' && empty($value)) {

-				$sql .= " WHERE ".$selectkey." = 0";

-			} elseif ($selectkey == 'rowid') {

-				$sql .= " WHERE ".$selectkey." = ".((int) $value);

-			} else {

-				$sql .= " WHERE ".$selectkey." = '".$this->db->escape($value)."'";

-			}

-

-			//$sql.= ' AND entity = '.$conf->entity;

-

-			dol_syslog(get_class($this).':showOutputField:$type=sellist', LOG_DEBUG);

+			// $sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";

+			// $sql.= ' AND entity = '.$conf->entity;

+

+			dol_syslog(get_class($this).':showOutputField:$type=chkbxlst', LOG_DEBUG);

@@ -8025,9 +6936,6 @@
-				if ($filter_categorie === false) {

-					$value = ''; // value was used, so now we reste it to use it to build final output

-					$numrows = $this->db->num_rows($resql);

-					if ($numrows) {

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

-

-						// Several field into label (eq table:code|libelle:rowid)

-						$fields_label = explode('|', $InfoFieldList[1]);

-

+				$value = ''; // value was used, so now we reste it to use it to build final output

+				$toprint = array();

+				while ($obj = $this->db->fetch_object($resql)) {

+					// Several field into label (eq table:code|libelle:rowid)

+					$fields_label = explode('|', $InfoFieldList[1]);

+					if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {

@@ -8041 +6949 @@
-									$value .= dol_trunc($translabel, 18) . ' ';

+									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';

@@ -8043 +6951 @@
-									$value .= $obj->$field_toshow . ' ';

+									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->$field_toshow.'</li>';

@@ -8052 +6960 @@
-								$value = dol_trunc($translabel, 18);

+								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';

@@ -8054,117 +6962 @@
-								$value = $obj->{$InfoFieldList[1]};

-							}

-						}

-					}

-				} else {

-					require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';

-

-					$toprint = array();

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

-					$c = new Categorie($this->db);

-					$c->fetch($obj->rowid);

-					$ways = $c->print_all_ways(); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formatted text

-					foreach ($ways as $way) {

-						$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"' . ($c->color ? ' style="background: #' . $c->color . ';"' : ' style="background: #aaa"') . '>' . img_object('', 'category') . ' ' . $way . '</li>';

-					}

-					$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';

-				}

-			} else {

-				dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);

-			}

-		} elseif ($type == 'radio') {

-			$value = $param['options'][$value];

-		} elseif ($type == 'checkbox') {

-			$value_arr = explode(',', $value);

-			$value = '';

-			if (is_array($value_arr) && count($value_arr) > 0) {

-				$toprint = array();

-				foreach ($value_arr as $keyval => $valueval) {

-					if (!empty($valueval)) {

-						$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">' . $param['options'][$valueval] . '</li>';

-					}

-				}

-				if (!empty($toprint)) {

-					$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';

-				}

-			}

-		} elseif ($type == 'chkbxlst') {

-			$value_arr = explode(',', $value);

-

-			$param_list = array_keys($param['options']);

-			$InfoFieldList = explode(":", $param_list[0]);

-

-			$selectkey = "rowid";

-			$keyList = 'rowid';

-

-			if (count($InfoFieldList) >= 3) {

-				$selectkey = $InfoFieldList[2];

-				$keyList = $InfoFieldList[2].' as rowid';

-			}

-

-			$fields_label = explode('|', $InfoFieldList[1]);

-			if (is_array($fields_label)) {

-				$keyList .= ', ';

-				$keyList .= implode(', ', $fields_label);

-			}

-

-			$filter_categorie = false;

-			if (count($InfoFieldList) > 5) {

-				if ($InfoFieldList[0] == 'categorie') {

-					$filter_categorie = true;

-				}

-			}

-

-			$sql = "SELECT ".$keyList;

-			$sql .= ' FROM '.$this->db->prefix().$InfoFieldList[0];

-			if (strpos($InfoFieldList[4], 'extra') !== false) {

-				$sql .= ' as main';

-			}

-			// $sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";

-			// $sql.= ' AND entity = '.$conf->entity;

-

-			dol_syslog(get_class($this).':showOutputField:$type=chkbxlst', LOG_DEBUG);

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

-			if ($resql) {

-				if ($filter_categorie === false) {

-					$value = ''; // value was used, so now we reste it to use it to build final output

-					$toprint = array();

-					while ($obj = $this->db->fetch_object($resql)) {

-						// Several field into label (eq table:code|libelle:rowid)

-						$fields_label = explode('|', $InfoFieldList[1]);

-						if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {

-							if (is_array($fields_label) && count($fields_label) > 1) {

-								foreach ($fields_label as $field_toshow) {

-									$translabel = '';

-									if (!empty($obj->$field_toshow)) {

-										$translabel = $langs->trans($obj->$field_toshow);

-									}

-									if ($translabel != $field_toshow) {

-										$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">' . dol_trunc($translabel, 18) . '</li>';

-									} else {

-										$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">' . $obj->$field_toshow . '</li>';

-									}

-								}

-							} else {

-								$translabel = '';

-								if (!empty($obj->{$InfoFieldList[1]})) {

-									$translabel = $langs->trans($obj->{$InfoFieldList[1]});

-								}

-								if ($translabel != $obj->{$InfoFieldList[1]}) {

-									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">' . dol_trunc($translabel, 18) . '</li>';

-								} else {

-									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">' . $obj->{$InfoFieldList[1]} . '</li>';

-								}

-							}

-						}

-					}

-				} else {

-					require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';

-

-					$toprint = array();

-					while ($obj = $this->db->fetch_object($resql)) {

-						if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {

-							$c = new Categorie($this->db);

-							$c->fetch($obj->rowid);

-							$ways = $c->print_all_ways(); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formatted text

-							foreach ($ways as $way) {

-								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"' . ($c->color ? ' style="background: #' . $c->color . ';"' : ' style="background: #aaa"') . '>' . img_object('', 'category') . ' ' . $way . '</li>';

+								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->{$InfoFieldList[1]}.'</li>';

@@ -8179 +6971,3 @@
-		} elseif ($type == 'link') {

+		}

+		elseif ($type == 'link')

+		{

@@ -8183,4 +6977,3 @@
-			if ($value) {

-				$param_list = array_keys($param['options']);

-				// Example: $param_list='ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter[:Sortfield]]]'

-				// Example: $param_list='ObjectClass:PathToClass:#getnomurlparam1=-1#getnomurlparam2=customer'

+			if ($value)

+			{

+				$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'

@@ -8189 +6981,0 @@
-

@@ -8192,13 +6984,3 @@
-

-				// Set $getnomurlparam1 et getnomurlparam2

-				$getnomurlparam = 3;

-				$getnomurlparam2 = '';

-				$regtmp = array();

-				if (preg_match('/#getnomurlparam1=([^#]*)/', $param_list[0], $regtmp)) {

-					$getnomurlparam = $regtmp[1];

-				}

-				if (preg_match('/#getnomurlparam2=([^#]*)/', $param_list[0], $regtmp)) {

-					$getnomurlparam2 = $regtmp[1];

-				}

-

-				if (!empty($classpath)) {

+				$getnomurlparam = (empty($InfoFieldList[2]) ? 3 : $InfoFieldList[2]);

+				if (!empty($classpath))

+				{

@@ -8206,12 +6988,2 @@
-

-					if ($classname && !class_exists($classname)) {

-						// from V19 of Dolibarr, In some cases link use element instead of class, example project_task

-						// TODO use newObjectByElement() introduce in V20 by PR #30036 for better errors management

-						$element_prop = getElementProperties($classname);

-						if ($element_prop) {

-							$classname = $element_prop['classname'];

-						}

-					}

-

-

-					if ($classname && class_exists($classname)) {

+					if ($classname && class_exists($classname))

+					{

@@ -8219,33 +6991,6 @@
-						if ($object->element === 'product') {	// Special case for product because default valut of fetch are wrong

-							$result = $object->fetch($value, '', '', '', 0, 1, 1);

-						} else {

-							$result = $object->fetch($value);

-						}

-						if ($result > 0) {

-							if ($object->element === 'product') {

-								$get_name_url_param_arr = array($getnomurlparam, $getnomurlparam2, 0, -1, 0, '', 0);

-								if (isset($val['get_name_url_params'])) {

-									$get_name_url_params = explode(':', $val['get_name_url_params']);

-									if (!empty($get_name_url_params)) {

-										$param_num_max = count($get_name_url_param_arr) - 1;

-										foreach ($get_name_url_params as $param_num => $param_value) {

-											if ($param_num > $param_num_max) {

-												break;

-											}

-											$get_name_url_param_arr[$param_num] = $param_value;

-										}

-									}

-								}

-

-								/**

-								 * @var Product $object

-								 */

-								$value = $object->getNomUrl($get_name_url_param_arr[0], $get_name_url_param_arr[1], $get_name_url_param_arr[2], $get_name_url_param_arr[3], $get_name_url_param_arr[4], $get_name_url_param_arr[5], $get_name_url_param_arr[6]);

-							} else {

-								$value = $object->getNomUrl($getnomurlparam, $getnomurlparam2);

-							}

-						} else {

-							$value = '';

-						}

-					}

-				} else {

+						$object->fetch($value);

+						$value = $object->getNomUrl($getnomurlparam);

+					}

+				}

+				else

+				{

@@ -8255,4 +7000,9 @@
-			} else {

-				$value = '';

-			}

-		} elseif ($type == 'password') {

+			}

+			else $value = '';

+		}

+		elseif ($type == 'text' || $type == 'html')

+		{

+			$value = dol_htmlentitiesbr($value);

+		}

+		elseif ($type == 'password')

+		{

@@ -8260 +7010,3 @@
-		} elseif ($type == 'array') {

+		}

+		elseif ($type == 'array')

+		{

@@ -8262,5 +7014,3 @@
-		} else {	// text|html|varchar

-			$value = dol_htmlentitiesbr($value);

-		}

-

-		//print $type.'-'.$size.'-'.$value;

+		}

+

+		//print $type.'-'.$size;

@@ -8272,254 +7021,0 @@
-	/**

-	 * clear validation message result for a field

-	 *

-	 * @param string $fieldKey Key of attribute to clear

-	 * @return void

-	 */

-	public function clearFieldError($fieldKey)

-	{

-		$this->error = '';

-		unset($this->validateFieldsErrors[$fieldKey]);

-	}

-

-	/**

-	 * set validation error message a field

-	 *

-	 * @param string $fieldKey Key of attribute

-	 * @param string $msg the field error message

-	 * @return void

-	 */

-	public function setFieldError($fieldKey, $msg = '')

-	{

-		global $langs;

-		if (empty($msg)) {

-			$msg = $langs->trans("UnknowError");

-		}

-

-		$this->error = $this->validateFieldsErrors[$fieldKey] = $msg;

-	}

-

-	/**

-	 * get field error message

-	 *

-	 * @param  string  $fieldKey            Key of attribute

-	 * @return string						Error message of validation ('' if no error)

-	 */

-	public function getFieldError($fieldKey)

-	{

-		if (!empty($this->validateFieldsErrors[$fieldKey])) {

-			return $this->validateFieldsErrors[$fieldKey];

-		}

-		return '';

-	}

-

-	/**

-	 * Return validation test result for a field

-	 *

-	 * @param  array   $fields	       		Array of properties of field to show

-	 * @param  string  $fieldKey            Key of attribute

-	 * @param  string  $fieldValue          value of attribute

-	 * @return bool return false if fail true on success, see $this->error for error message

-	 */

-	public function validateField($fields, $fieldKey, $fieldValue)

-	{

-		global $langs;

-

-		if (!class_exists('Validate')) {

-			require_once DOL_DOCUMENT_ROOT . '/core/class/validate.class.php';

-		}

-

-		$this->clearFieldError($fieldKey);

-

-		if (!isset($fields[$fieldKey])) {

-			$this->setFieldError($fieldKey, $langs->trans('FieldNotFoundInObject'));

-			return false;

-		}

-

-		$val = $fields[$fieldKey];

-

-		$param = array();

-		$param['options'] = array();

-		$type  = $val['type'];

-

-		$required = false;

-		if (isset($val['notnull']) && $val['notnull'] === 1) {

-			// 'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).

-			$required = true;

-		}

-

-		$maxSize = 0;

-		$minSize = 0;

-

-		//

-		// PREPARE Elements

-		//

-		$reg = array();

-

-		// Convert var to be able to share same code than showOutputField of extrafields

-		if (preg_match('/varchar\((\d+)\)/', $type, $reg)) {

-			$type = 'varchar'; // convert varchar(xx) int varchar

-			$maxSize = $reg[1];

-		} elseif (preg_match('/varchar/', $type)) {

-			$type = 'varchar'; // convert varchar(xx) int varchar

-		}

-

-		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {

-			$type = 'select';

-		}

-

-		if (!empty($val['type']) && preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) {

-			$type = 'link';

-		}

-

-		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {

-			$param['options'] = $val['arrayofkeyval'];

-		}

-

-		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) {

-			$type = 'link';

-			$param['options'] = array($reg[1].':'.$reg[2]=>$reg[1].':'.$reg[2]);

-		} elseif (preg_match('/^sellist:(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {

-			$param['options'] = array($reg[1].':'.$reg[2].':'.$reg[3].':'.$reg[4] => 'N');

-			$type = 'sellist';

-		} elseif (preg_match('/^sellist:(.*):(.*):(.*)/i', $val['type'], $reg)) {

-			$param['options'] = array($reg[1].':'.$reg[2].':'.$reg[3] => 'N');

-			$type = 'sellist';

-		} elseif (preg_match('/^sellist:(.*):(.*)/i', $val['type'], $reg)) {

-			$param['options'] = array($reg[1].':'.$reg[2] => 'N');

-			$type = 'sellist';

-		}

-

-		//

-		// TEST Value

-		//

-

-		// Use Validate class to allow external Modules to use data validation part instead of concentrate all test here (factoring) or just for reuse

-		$validate = new Validate($this->db, $langs);

-

-

-		// little trick : to perform tests with good performances sort tests by quick to low

-

-		//

-		// COMMON TESTS

-		//

-

-		// Required test and empty value

-		if ($required && !$validate->isNotEmptyString($fieldValue)) {

-			$this->setFieldError($fieldKey, $validate->error);

-			return false;

-		} elseif (!$required && !$validate->isNotEmptyString($fieldValue)) {

-			// if no value sent and the field is not mandatory, no need to perform tests

-			return true;

-		}

-

-		// MAX Size test

-		if (!empty($maxSize) && !$validate->isMaxLength($fieldValue, $maxSize)) {

-			$this->setFieldError($fieldKey, $validate->error);

-			return false;

-		}

-

-		// MIN Size test

-		if (!empty($minSize) && !$validate->isMinLength($fieldValue, $minSize)) {

-			$this->setFieldError($fieldKey, $validate->error);

-			return false;

-		}

-

-		//

-		// TESTS for TYPE

-		//

-

-		if (in_array($type, array('date', 'datetime', 'timestamp'))) {

-			if (!$validate->isTimestamp($fieldValue)) {

-				$this->setFieldError($fieldKey, $validate->error);

-				return false;

-			} else {

-				return true;

-			}

-		} elseif ($type == 'duration') {

-			if (!$validate->isDuration($fieldValue)) {

-				$this->setFieldError($fieldKey, $validate->error);

-				return false;

-			} else {

-				return true;

-			}

-		} elseif (in_array($type, array('double', 'real', 'price'))) {

-			// is numeric

-			if (!$validate->isNumeric($fieldValue)) {

-				$this->setFieldError($fieldKey, $validate->error);

-				return false;

-			} else {

-				return true;

-			}

-		} elseif ($type == 'boolean') {

-			if (!$validate->isBool($fieldValue)) {

-				$this->setFieldError($fieldKey, $validate->error);

-				return false;

-			} else {

-				return true;

-			}

-		} elseif ($type == 'mail') {

-			if (!$validate->isEmail($fieldValue)) {

-				$this->setFieldError($fieldKey, $validate->error);

-				return false;

-			}

-		} elseif ($type == 'url') {

-			if (!$validate->isUrl($fieldValue)) {

-				$this->setFieldError($fieldKey, $validate->error);

-				return false;

-			} else {

-				return true;

-			}

-		} elseif ($type == 'phone') {

-			if (!$validate->isPhone($fieldValue)) {

-				$this->setFieldError($fieldKey, $validate->error);

-				return false;

-			} else {

-				return true;

-			}

-		} elseif ($type == 'select' || $type == 'radio') {

-			if (!isset($param['options'][$fieldValue])) {

-				$this->error = $langs->trans('RequireValidValue');

-				return false;

-			} else {

-				return true;

-			}

-		} elseif ($type == 'sellist' || $type == 'chkbxlst') {

-			$param_list = array_keys($param['options']);

-			$InfoFieldList = explode(":", $param_list[0]);

-			$value_arr = explode(',', $fieldValue);

-			$value_arr = array_map(array($this->db, 'escape'), $value_arr);

-

-			$selectkey = "rowid";

-			if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4])) {

-				$selectkey = $InfoFieldList[2];

-			}

-

-			if (!$validate->isInDb($value_arr, $InfoFieldList[0], $selectkey)) {

-				$this->setFieldError($fieldKey, $validate->error);

-				return false;

-			} else {

-				return true;

-			}

-		} elseif ($type == 'link') {

-			$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'

-			$InfoFieldList = explode(":", $param_list[0]);

-			$classname = $InfoFieldList[0];

-			$classpath = $InfoFieldList[1];

-			if (!$validate->isFetchable($fieldValue, $classname, $classpath)) {

-				$lastIsFetchableError = $validate->error;

-

-				// from V19 of Dolibarr, In some cases link use element instead of class, example project_task

-				if ($validate->isFetchableElement($fieldValue, $classname)) {

-					return true;

-				}

-

-				$this->setFieldError($fieldKey, $lastIsFetchableError);

-				return false;

-			} else {

-				return true;

-			}

-		}

-

-		// if no test failled all is ok

-		return true;

-	}

@@ -8529 +7025 @@
-	 * This function is responsible to output the <tr> and <td> according to correct number of columns received into $params['colspan'] or <div> according to $display_type

+	 * This function is responsible to output the <tr> and <td> according to correct number of columns received into $params['colspan']

@@ -8536,18 +7032,8 @@
-	 * @param	string		$onetrtd		All fields in same tr td. Used by objectline_create.tpl.php for example.

-	 * @param	string		$display_type	"card" for form display, "line" for document line display (extrafields on propal line, order line, etc...)

-	 * @return 	string						String with html content to show

-	 */

-	public function showOptionals($extrafields, $mode = 'view', $params = null, $keysuffix = '', $keyprefix = '', $onetrtd = '', $display_type = 'card')

-	{

-		global $db, $conf, $langs, $action, $form, $hookmanager;

-

-		if (!is_object($form)) {

-			$form = new Form($db);

-		}

-		if (!is_object($extrafields)) {

-			dol_syslog('Bad parameter extrafields for showOptionals', LOG_ERR);

-			return 'Bad parameter extrafields for showOptionals';

-		}

-		if (!is_array($extrafields->attributes[$this->table_element])) {

-			dol_syslog("extrafields->attributes was not loaded with extrafields->fetch_name_optionals_label(table_element);", LOG_WARNING);

-		}

+	 * @param	string		$onetrtd		All fields in same tr td (TODO field not used ?)

+	 * @return 	string

+	 */

+	public function showOptionals($extrafields, $mode = 'view', $params = null, $keysuffix = '', $keyprefix = '', $onetrtd = 0)

+	{

+		global $db, $conf, $langs, $action, $form;

+

+		if (!is_object($form)) $form = new Form($db);

@@ -8557,68 +7043,71 @@
-		$parameters = array('mode'=>$mode, 'params'=>$params, 'keysuffix'=>$keysuffix, 'keyprefix'=>$keyprefix, 'display_type'=>$display_type);

-		$reshook = $hookmanager->executeHooks('showOptionals', $parameters, $this, $action); // Note that $action and $object may have been modified by hook

-

-		if (empty($reshook)) {

-			if (is_array($extrafields->attributes[$this->table_element]) && key_exists('label', $extrafields->attributes[$this->table_element]) && is_array($extrafields->attributes[$this->table_element]['label']) && count($extrafields->attributes[$this->table_element]['label']) > 0) {

-				$out .= "\n";

-				$out .= '<!-- commonobject:showOptionals --> ';

-				$out .= "\n";

-

-				$nbofextrafieldsshown = 0;

-				$e = 0;	// var to manage the modulo (odd/even)

-

-				$lastseparatorkeyfound = '';

-				$extrafields_collapse_num = '';

-				$extrafields_collapse_num_old = '';

-				$i = 0;

-

-				foreach ($extrafields->attributes[$this->table_element]['label'] as $key => $label) {

-					$i++;

-

-					// Show only the key field in params

-					if (is_array($params) && array_key_exists('onlykey', $params) && $key != $params['onlykey']) {

-						continue;

-					}

-

-					// Test on 'enabled' ('enabled' is different than 'list' = 'visibility')

-					$enabled = 1;

-					if ($enabled && isset($extrafields->attributes[$this->table_element]['enabled'][$key])) {

-						$enabled = dol_eval($extrafields->attributes[$this->table_element]['enabled'][$key], 1, 1, '2');

-					}

-					if (empty($enabled)) {

-						continue;

-					}

-

-					$visibility = 1;

-					if ($visibility && isset($extrafields->attributes[$this->table_element]['list'][$key])) {

-						$visibility = dol_eval($extrafields->attributes[$this->table_element]['list'][$key], 1, 1, '2');

-					}

-

-					$perms = 1;

-					if ($perms && isset($extrafields->attributes[$this->table_element]['perms'][$key])) {

-						$perms = dol_eval($extrafields->attributes[$this->table_element]['perms'][$key], 1, 1, '2');

-					}

-

-					if (($mode == 'create') && abs($visibility) != 1 && abs($visibility) != 3) {

-						continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list

-					} elseif (($mode == 'edit') && abs($visibility) != 1 && abs($visibility) != 3 && abs($visibility) != 4) {

-						continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list and <> 4 = not visible at the creation

-					} elseif ($mode == 'view' && empty($visibility)) {

-						continue;

-					}

-					if (empty($perms)) {

-						continue;

-					}

-

-					// Load language if required

-					if (!empty($extrafields->attributes[$this->table_element]['langfile'][$key])) {

-						$langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);

-					}

-

-					$colspan = 0;

-					if (is_array($params) && count($params) > 0 && $display_type=='card') {

-						if (array_key_exists('cols', $params)) {

-							$colspan = $params['cols'];

-						} elseif (array_key_exists('colspan', $params)) {	// For backward compatibility. Use cols instead now.

-							$reg = array();

-							if (preg_match('/colspan="(\d+)"/', $params['colspan'], $reg)) {

-								$colspan = $reg[1];

+		if (is_array($extrafields->attributes[$this->table_element]['label']) && count($extrafields->attributes[$this->table_element]['label']) > 0)

+		{

+			$out .= "\n";

+			$out .= '<!-- showOptionalsInput --> ';

+			$out .= "\n";

+

+            $extrafields_collapse_num = '';

+			$e = 0;

+			foreach ($extrafields->attributes[$this->table_element]['label'] as $key=>$label)

+			{

+				// Show only the key field in params

+				if (is_array($params) && array_key_exists('onlykey', $params) && $key != $params['onlykey']) continue;

+

+				// @todo Add test also on 'enabled' (different than 'list' that is 'visibility')

+				$enabled = 1;

+				if ($enabled && isset($extrafields->attributes[$this->table_element]['enabled'][$key]))

+				{

+                    $enabled = dol_eval($extrafields->attributes[$this->table_element]['enabled'][$key], 1);

+                }

+				if (empty($enabled)) continue;

+

+				$visibility = 1;

+				if ($visibility && isset($extrafields->attributes[$this->table_element]['list'][$key]))

+				{

+				    $visibility = dol_eval($extrafields->attributes[$this->table_element]['list'][$key], 1);

+				}

+

+				$perms = 1;

+				if ($perms && isset($extrafields->attributes[$this->table_element]['perms'][$key]))

+				{

+					$perms = dol_eval($extrafields->attributes[$this->table_element]['perms'][$key], 1);

+				}

+

+				if (($mode == 'create') && abs($visibility) != 1 && abs($visibility) != 3) continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list

+				elseif (($mode == 'edit') && abs($visibility) != 1 && abs($visibility) != 3 && abs($visibility) != 4) continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list and <> 4 = not visible at the creation

+				elseif ($mode == 'view' && empty($visibility)) continue;

+				if (empty($perms)) continue;

+				// Load language if required

+				if (!empty($extrafields->attributes[$this->table_element]['langfile'][$key])) {

+					$langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);

+				}

+

+				$colspan = '';

+				if (is_array($params) && count($params) > 0) {

+					if (array_key_exists('cols', $params)) {

+						$colspan = $params['cols'];

+					}

+					elseif (array_key_exists('colspan', $params)) {	// For backward compatibility. Use cols instead now.

+						$reg = array();

+						if (preg_match('/colspan="(\d+)"/', $params['colspan'], $reg)) {

+							$colspan = $reg[1];

+						}

+						else {

+							$colspan = $params['colspan'];

+						}

+					}

+				}

+

+				switch ($mode) {

+					case "view":

+						$value = $this->array_options["options_".$key.$keysuffix];

+						break;

+					case "create":

+                    case "edit":

+                        $getposttemp = GETPOST($keyprefix.'options_'.$key.$keysuffix, 'none'); // GETPOST can get value from GET, POST or setup of default values.

+                        // GETPOST("options_" . $key) can be 'abc' or array(0=>'abc')

+						if (is_array($getposttemp) || $getposttemp != '' || GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix))

+						{

+							if (is_array($getposttemp)) {

+								// $getposttemp is an array but following code expects a comma separated string

+								$value = implode(",", $getposttemp);

@@ -8626 +7115 @@
-								$colspan = $params['colspan'];

+								$value = $getposttemp;

@@ -8627,0 +7117,2 @@
+						} else {

+							$value = $this->array_options["options_".$key]; // No GET, no POST, no default value, so we take value of object.

@@ -8629,2 +7120,93 @@
-					}

-					$colspan = intval($colspan);

+						//var_dump($keyprefix.' - '.$key.' - '.$keysuffix.' - '.$keyprefix.'options_'.$key.$keysuffix.' - '.$this->array_options["options_".$key.$keysuffix].' - '.$getposttemp.' - '.$value);

+						break;

+				}

+

+				if ($extrafields->attributes[$this->table_element]['type'][$key] == 'separate')

+				{

+                    $extrafields_collapse_num = '';

+                    $extrafield_param = $extrafields->attributes[$this->table_element]['param'][$key];

+                    if (!empty($extrafield_param) && is_array($extrafield_param)) {

+                        $extrafield_param_list = array_keys($extrafield_param['options']);

+

+                        if (count($extrafield_param_list) > 0) {

+                            $extrafield_collapse_display_value = intval($extrafield_param_list[0]);

+

+                            if ($extrafield_collapse_display_value == 1 || $extrafield_collapse_display_value == 2) {

+                                $extrafields_collapse_num = $extrafields->attributes[$this->table_element]['pos'][$key];

+                            }

+                        }

+                    }

+

+					$out .= $extrafields->showSeparator($key, $this, ($colspan + 1));

+				}

+				else

+				{

+					$class = (!empty($extrafields->attributes[$this->table_element]['hidden'][$key]) ? 'hideobject ' : '');

+					$csstyle = '';

+					if (is_array($params) && count($params) > 0) {

+						if (array_key_exists('class', $params)) {

+							$class .= $params['class'].' ';

+						}

+						if (array_key_exists('style', $params)) {

+							$csstyle = $params['style'];

+						}

+					}

+

+					// add html5 elements

+					$domData  = ' data-element="extrafield"';

+					$domData .= ' data-targetelement="'.$this->element.'"';

+					$domData .= ' data-targetid="'.$this->id.'"';

+

+					$html_id = (empty($this->id) ? '' : 'extrarow-'.$this->element.'_'.$key.'_'.$this->id);

+

+					if (!empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0) { $colspan = '0'; }

+

+					if ($action == 'selectlines') { $colspan++; }

+

+					// Convert date into timestamp format (value in memory must be a timestamp)

+					if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date', 'datetime')))

+					{

+						$datenotinstring = $this->array_options['options_'.$key];

+						if (!is_numeric($this->array_options['options_'.$key]))	// For backward compatibility

+						{

+							$datenotinstring = $this->db->jdate($datenotinstring);

+						}

+						$value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix) ?dol_mktime(GETPOST($keyprefix.'options_'.$key.$keysuffix."hour", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."min", 'int', 3), 0, GETPOST($keyprefix.'options_'.$key.$keysuffix."month", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."day", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."year", 'int', 3)) : $datenotinstring;

+					}

+					// Convert float submited string into real php numeric (value in memory must be a php numeric)

+					if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('price', 'double')))

+					{

+						$value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix) ?price2num(GETPOST($keyprefix.'options_'.$key.$keysuffix, 'alpha', 3)) : $this->array_options['options_'.$key];

+					}

+					// HTML, select, integer and text add default value

+					if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('html', 'text', 'select', 'int')))

+					{

+						if ($action == 'create') $value = $extrafields->attributes[$this->table_element]['default'][$key];

+						else $value = $this->array_options['options_'.$key];

+					}

+

+					$labeltoshow = $langs->trans($label);

+					$helptoshow = $langs->trans($extrafields->attributes[$this->table_element]['help'][$key]);

+

+					$out .= '<tr '.($html_id ? 'id="'.$html_id.'" ' : '').$csstyle.' class="'.$class.$this->element.'_extras_'.$key.' trextrafields_collapse'.$extrafields_collapse_num.'" '.$domData.' >';

+					$out .= '<td class="';

+					//$out .= "titlefield";

+					//if (GETPOST('action', 'none') == 'create') $out.='create';

+					// BUG #11554 : For public page, use red dot for required fields, instead of bold label

+					$tpl_context = isset($params["tpl_context"]) ? $params["tpl_context"] : "none";

+					if ($tpl_context == "public") {	// Public page : red dot instead of fieldrequired characters

+						$out .= '">';

+						if (!empty($extrafields->attributes[$this->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $helptoshow);

+						else $out .= $labeltoshow;

+						if ($mode != 'view' && !empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= '&nbsp;<font color="red">*</font>';

+					} else {

+						if ($mode != 'view' && !empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= ' fieldrequired';

+						$out .= '">';

+						if (!empty($extrafields->attributes[$this->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $helptoshow);

+						else $out .= $labeltoshow;

+					}

+					$out .= '</td>';

+

+					$html_id = !empty($this->id) ? $this->element.'_extras_'.$key.'_'.$this->id : '';

+

+					$out .= '<td '.($html_id ? 'id="'.$html_id.'" ' : '').'class="'.$this->element.'_extras_'.$key.'" '.($colspan ? ' colspan="'.$colspan.'"' : '').'>';

@@ -8634 +7216 @@
-							$value = ((!empty($this->array_options) && array_key_exists("options_".$key.$keysuffix, $this->array_options)) ? $this->array_options["options_".$key.$keysuffix] : null); // Value may be cleaned or formated later

+							$out .= $extrafields->showOutputField($key, $value);

@@ -8636,7 +7218,33 @@
-						case "create":

-						case "edit":

-							// We get the value of property found with GETPOST so it takes into account:

-							// default values overwrite, restore back to list link, ... (but not 'default value in database' of field)

-							$check = 'alphanohtml';

-							if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('html', 'text'))) {

-								$check = 'restricthtml';

+                        case "create":

+                        case "edit":

+							$out .= $extrafields->showInputField($key, $value, '', $keysuffix, '', 0, $this->id, $this->table_element);

+							break;

+					}

+

+					$out .= '</td>';

+

+					/*for($ii = 0; $ii < ($colspan - 1); $ii++)

+					{

+						$out .='<td class="'.$this->element.'_extras_'.$key.'"></td>';

+					}*/

+

+					if (!empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) $out .= '</tr>';

+					else $out .= '</tr>';

+					$e++;

+				}

+			}

+			$out .= "\n";

+			// Add code to manage list depending on others

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

+				$out .= '

+				<script>

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

+				    	function showOptions(child_list, parent_list)

+				    	{

+				    		var val = $("select[name=\""+parent_list+"\"]").val();

+				    		var parentVal = parent_list + ":" + val;

+							if(val > 0) {

+					    		$("select[name=\""+child_list+"\"] option[parent]").hide();

+					    		$("select[name=\""+child_list+"\"] option[parent=\""+parentVal+"\"]").show();

+							} else {

+								$("select[name=\""+child_list+"\"] option").show();

@@ -8644,242 +7252,4 @@
-							$getposttemp = GETPOST($keyprefix.'options_'.$key.$keysuffix, $check, 3); // GETPOST can get value from GET, POST or setup of default values overwrite.

-							// GETPOST("options_" . $key) can be 'abc' or array(0=>'abc')

-							if (is_array($getposttemp) || $getposttemp != '' || GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix)) {

-								if (is_array($getposttemp)) {

-									// $getposttemp is an array but following code expects a comma separated string

-									$value = implode(",", $getposttemp);

-								} else {

-									$value = $getposttemp;

-								}

-							} elseif (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('int'))) {

-								$value =( !empty($this->array_options["options_".$key]) || $this->array_options["options_".$key] === '0' ) ? $this->array_options["options_".$key] : '';

-							} else {

-								$value = (!empty($this->array_options["options_".$key]) ? $this->array_options["options_".$key] : ''); // No GET, no POST, no default value, so we take value of object.

-							}

-							//var_dump($keyprefix.' - '.$key.' - '.$keysuffix.' - '.$keyprefix.'options_'.$key.$keysuffix.' - '.$this->array_options["options_".$key.$keysuffix].' - '.$getposttemp.' - '.$value);

-							break;

-					}

-

-					$nbofextrafieldsshown++;

-

-					// Output value of the current field

-					if ($extrafields->attributes[$this->table_element]['type'][$key] == 'separate') {

-						$extrafields_collapse_num = $key;

-						/*

-						$extrafield_param = $extrafields->attributes[$this->table_element]['param'][$key];

-						if (!empty($extrafield_param) && is_array($extrafield_param)) {

-							$extrafield_param_list = array_keys($extrafield_param['options']);

-

-							if (count($extrafield_param_list) > 0) {

-								$extrafield_collapse_display_value = intval($extrafield_param_list[0]);

-

-								if ($extrafield_collapse_display_value == 1 || $extrafield_collapse_display_value == 2) {

-									//$extrafields_collapse_num = $extrafields->attributes[$this->table_element]['pos'][$key];

-									$extrafields_collapse_num = $key;

-								}

-							}

-						}

-						*/

-

-						// if colspan=0 or 1, the second column is not extended, so the separator must be on 2 columns

-						$out .= $extrafields->showSeparator($key, $this, ($colspan ? $colspan + 1 : 2), $display_type, $mode);

-

-						$lastseparatorkeyfound = $key;

-					} else {

-						$collapse_group = $extrafields_collapse_num.(!empty($this->id) ? '_'.$this->id : '');

-

-						$class = (!empty($extrafields->attributes[$this->table_element]['hidden'][$key]) ? 'hideobject ' : '');

-						$csstyle = '';

-						if (is_array($params) && count($params) > 0) {

-							if (array_key_exists('class', $params)) {

-								$class .= $params['class'].' ';

-							}

-							if (array_key_exists('style', $params)) {

-								$csstyle = $params['style'];

-							}

-						}

-

-						// add html5 elements

-						$domData  = ' data-element="extrafield"';

-						$domData .= ' data-targetelement="'.$this->element.'"';

-						$domData .= ' data-targetid="'.$this->id.'"';

-

-						$html_id = (empty($this->id) ? '' : 'extrarow-'.$this->element.'_'.$key.'_'.$this->id);

-						if ($display_type=='card') {

-							if (getDolGlobalString('MAIN_EXTRAFIELDS_USE_TWO_COLUMS') && ($e % 2) == 0) {

-								$colspan = 0;

-							}

-

-							if ($action == 'selectlines') {

-								$colspan++;

-							}

-						}

-

-						// Convert date into timestamp format (value in memory must be a timestamp)

-						if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date'))) {

-							$datenotinstring = null;

-							if (array_key_exists('options_'.$key, $this->array_options)) {

-								$datenotinstring = $this->array_options['options_'.$key];

-								if (!is_numeric($this->array_options['options_'.$key])) {	// For backward compatibility

-									$datenotinstring = $this->db->jdate($datenotinstring);

-								}

-							}

-							$datekey = $keyprefix.'options_'.$key.$keysuffix;

-							$value = (GETPOSTISSET($datekey)) ? dol_mktime(12, 0, 0, GETPOST($datekey.'month', 'int', 3), GETPOST($datekey.'day', 'int', 3), GETPOST($datekey.'year', 'int', 3)) : $datenotinstring;

-						}

-						if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('datetime'))) {

-							$datenotinstring = null;

-							if (array_key_exists('options_'.$key, $this->array_options)) {

-								$datenotinstring = $this->array_options['options_'.$key];

-								if (!is_numeric($this->array_options['options_'.$key])) {	// For backward compatibility

-									$datenotinstring = $this->db->jdate($datenotinstring);

-								}

-							}

-							$timekey = $keyprefix.'options_'.$key.$keysuffix;

-							$value = (GETPOSTISSET($timekey)) ? dol_mktime(GETPOST($timekey.'hour', 'int', 3), GETPOST($timekey.'min', 'int', 3), GETPOST($timekey.'sec', 'int', 3), GETPOST($timekey.'month', 'int', 3), GETPOST($timekey.'day', 'int', 3), GETPOST($timekey.'year', 'int', 3), 'tzuserrel') : $datenotinstring;

-						}

-						// Convert float submited string into real php numeric (value in memory must be a php numeric)

-						if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('price', 'double'))) {

-							if (GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix) || $value) {

-								$value = price2num($value);

-							} elseif (isset($this->array_options['options_'.$key])) {

-								$value = $this->array_options['options_'.$key];

-							}

-						}

-

-						// HTML, text, select, integer and varchar: take into account default value in database if in create mode

-						if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('html', 'text', 'varchar', 'select', 'radio', 'int', 'boolean'))) {

-							if ($action == 'create' || $mode == 'create') {

-								$value = (GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix) || $value) ? $value : $extrafields->attributes[$this->table_element]['default'][$key];

-							}

-						}

-

-						$labeltoshow = $langs->trans($label);

-						$helptoshow = $langs->trans($extrafields->attributes[$this->table_element]['help'][$key]);

-

-						if ($display_type == 'card') {

-							$out .= '<tr '.($html_id ? 'id="'.$html_id.'" ' : '').$csstyle.' class="field_options_'.$key.' '.$class.$this->element.'_extras_'.$key.' trextrafields_collapse'.$collapse_group.'" '.$domData.' >';

-							if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER') && ($action == 'view' || $action == 'valid' || $action == 'editline' || $action == 'confirm_valid' || $action == 'confirm_cancel')) {

-								$out .= '<td></td>';

-							}

-							$out .= '<td class="'.(empty($params['tdclass']) ? 'titlefieldcreate' : $params['tdclass']).' wordbreak';

-						} elseif ($display_type == 'line') {

-							$out .= '<div '.($html_id ? 'id="'.$html_id.'" ' : '').$csstyle.' class="fieldline_options_'.$key.' '.$class.$this->element.'_extras_'.$key.' trextrafields_collapse'.$collapse_group.'" '.$domData.' >';

-							$out .= '<div style="display: inline-block; padding-right:4px" class="wordbreak';

-						}

-						//$out .= "titlefield";

-						//if (GETPOST('action', 'restricthtml') == 'create') $out.='create';

-						// BUG #11554 : For public page, use red dot for required fields, instead of bold label

-						$tpl_context = isset($params["tpl_context"]) ? $params["tpl_context"] : "none";

-						if ($tpl_context != "public") {	// Public page : red dot instead of fieldrequired characters

-							if ($mode != 'view' && !empty($extrafields->attributes[$this->table_element]['required'][$key])) {

-								$out .= ' fieldrequired';

-							}

-						}

-						$out .= '">';

-						if ($tpl_context == "public") {	// Public page : red dot instead of fieldrequired characters

-							if (!empty($extrafields->attributes[$this->table_element]['help'][$key])) {

-								$out .= $form->textwithpicto($labeltoshow, $helptoshow);

-							} else {

-								$out .= $labeltoshow;

-							}

-							if ($mode != 'view' && !empty($extrafields->attributes[$this->table_element]['required'][$key])) {

-								$out .= '&nbsp;<span style="color: red">*</span>';

-							}

-						} else {

-							if (!empty($extrafields->attributes[$this->table_element]['help'][$key])) {

-								$out .= $form->textwithpicto($labeltoshow, $helptoshow);

-							} else {

-								$out .= $labeltoshow;

-							}

-						}

-

-						$out .= ($display_type == 'card' ? '</td>' : '</div>');

-

-						$html_id = !empty($this->id) ? $this->element.'_extras_'.$key.'_'.$this->id : '';

-						if ($display_type == 'card') {

-							// a first td column was already output (and may be another on before if MAIN_VIEW_LINE_NUMBER set), so this td is the next one

-							$out .= '<td '.($html_id ? 'id="'.$html_id.'" ' : '').' class="valuefieldcreate '.$this->element.'_extras_'.$key.'" '.($colspan ? ' colspan="'.$colspan.'"' : '').'>';

-						} elseif ($display_type == 'line') {

-							$out .= '<div '.($html_id ? 'id="'.$html_id.'" ' : '').' style="display: inline-block" class="valuefieldcreate '.$this->element.'_extras_'.$key.' extra_inline_'.$extrafields->attributes[$this->table_element]['type'][$key].'">';

-						}

-

-						switch ($mode) {

-							case "view":

-								$out .= $extrafields->showOutputField($key, $value, '', $this->table_element);

-								break;

-							case "create":

-								$out .= $extrafields->showInputField($key, $value, '', $keysuffix, '', 0, $this->id, $this->table_element);

-								break;

-							case "edit":

-								$out .= $extrafields->showInputField($key, $value, '', $keysuffix, '', 0, $this->id, $this->table_element);

-								break;

-						}

-

-						$out .= ($display_type=='card' ? '</td>' : '</div>');

-

-						if (getDolGlobalString('MAIN_EXTRAFIELDS_USE_TWO_COLUMS') && (($e % 2) == 1)) {

-							$out .= ($display_type=='card' ? '</tr>' : '</div>');

-						} else {

-							$out .= ($display_type=='card' ? '</tr>' : '</div>');

-						}

-

-						$e++;

-					}

-				}

-				$out .= "\n";

-				// Add code to manage list depending on others

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

-					$out .= $this->getJSListDependancies();

-				}

-

-				$out .= '<!-- commonobject:showOptionals end --> '."\n";

-

-				if (empty($nbofextrafieldsshown)) {

-					$out = '';

-				}

-			}

-		}

-

-		$out .= $hookmanager->resPrint;

-

-		return $out;

-	}

-

-	/**

-	 * @param 	string 	$type	Type for prefix

-	 * @return 	string			Javacript code to manage dependency

-	 */

-	public function getJSListDependancies($type = '_extra')

-	{

-		$out = '

-					<script nonce="'.getNonce().'">

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

-						function showOptions'.$type.'(child_list, parent_list, orig_select)

-						{

-							var val = $("select[name=\""+parent_list+"\"]").val();

-							var parentVal = parent_list + ":" + val;

-							if(typeof val == "string"){

-								if(val != "") {

-									var options = orig_select.find("option[parent=\""+parentVal+"\"]").clone();

-									$("select[name=\""+child_list+"\"] option[parent]").remove();

-									$("select[name=\""+child_list+"\"]").append(options);

-								} else {

-									var options = orig_select.find("option[parent]").clone();

-									$("select[name=\""+child_list+"\"] option[parent]").remove();

-									$("select[name=\""+child_list+"\"]").append(options);

-								}

-							} else if(val > 0) {

-								var options = orig_select.find("option[parent=\""+parentVal+"\"]").clone();

-								$("select[name=\""+child_list+"\"] option[parent]").remove();

-								$("select[name=\""+child_list+"\"]").append(options);

-							} else {

-								var options = orig_select.find("option[parent]").clone();

-								$("select[name=\""+child_list+"\"] option[parent]").remove();

-								$("select[name=\""+child_list+"\"]").append(options);

-							}

-						}

-						function setListDependencies'.$type.'() {

-							jQuery("select option[parent]").parent().each(function() {

-								var orig_select = {};

-								var child_list = $(this).attr("name");

-								orig_select[child_list] = $(this).clone();

+				    	}

+						function setListDependencies() {

+					    	jQuery("select option[parent]").parent().each(function() {

+					    		var child_list = $(this).attr("name");

@@ -8889,13 +7259,2 @@
-

-								//Hide daughters lists

-								if ($("#"+child_list).val() == 0 && $("#"+parent_list).val() == 0){

-									$("#"+child_list).hide();

-								//Show mother lists

-								} else if ($("#"+parent_list).val() != 0){

-									$("#"+parent_list).show();

-								}

-								//Show the child list if the parent list value is selected

-								$("select[name=\""+parent_list+"\"]").click(function() {

-									if ($(this).val() != 0){

-										$("#"+child_list).show()

-									}

+								$("select[name=\""+parent_list+"\"]").change(function() {

+									showOptions(child_list, parent_list);

@@ -8903,12 +7262 @@
-

-								//When we change parent list

-								$("select[name=\""+parent_list+"\"]").change(function() {

-									showOptions'.$type.'(child_list, parent_list, orig_select[child_list]);

-									//Select the value 0 on child list after a change on the parent list

-									$("#"+child_list).val(0).trigger("change");

-									//Hide child lists if the parent value is set to 0

-									if ($(this).val() == 0){

-								   		$("#"+child_list).hide();

-									}

-								});

-							});

+					    	});

@@ -8917,3 +7265,6 @@
-						setListDependencies'.$type.'();

-					});

-					</script>'."\n";

+						setListDependencies();

+				    });

+				</script>'."\n";

+				$out .= '<!-- /showOptionalsInput --> '."\n";

+			}

+		}

@@ -8922,0 +7274 @@
+

@@ -8925,2 +7277 @@
-	 *

-	 * @return stdClass		Object of permission for the module

+	 * @return stdClass

@@ -8932 +7282,0 @@
-		$module = empty($this->module) ? '' : $this->module;

@@ -8934,11 +7284,3 @@
-

-		if ($element == 'facturerec') {

-			$element = 'facture';

-		} elseif ($element == 'invoice_supplier_rec') {

-			return !$user->hasRight('fournisseur', 'facture') ? null : $user->hasRight('fournisseur', 'facture');

-		} elseif ($module && $user->hasRight($module, $element)) {

-			// for modules built with ModuleBuilder

-			return $user->hasRight($module, $element);

-		}

-

-		return $user->rights->$element;

+		if ($element == 'facturerec') $element = 'facture';

+

+		return $user->rights->{$element};

@@ -8949 +7291 @@
-	 * This function is meant to be called from replaceThirdparty with the appropriate tables

+	 * This function is meant to be called from replaceThirdparty with the appropiate tables

@@ -8952 +7294 @@
-	 * @param  DoliDB 	   $dbs			  Database handler

+	 * @param  DoliDB 	   $db 			  Database handler

@@ -8959,9 +7301,9 @@
-	public static function commonReplaceThirdparty(DoliDB $dbs, $origin_id, $dest_id, array $tables, $ignoreerrors = 0)

-	{

-		foreach ($tables as $table) {

-			$sql = 'UPDATE '.$dbs->prefix().$table.' SET fk_soc = '.((int) $dest_id).' WHERE fk_soc = '.((int) $origin_id);

-

-			if (!$dbs->query($sql)) {

-				if ($ignoreerrors) {

-					return true; // TODO Not enough. If there is A-B on kept thirdparty and B-C on old one, we must get A-B-C after merge. Not A-B.

-				}

+	public static function commonReplaceThirdparty(DoliDB $db, $origin_id, $dest_id, array $tables, $ignoreerrors = 0)

+	{

+		foreach ($tables as $table)

+		{

+			$sql = 'UPDATE '.MAIN_DB_PREFIX.$table.' SET fk_soc = '.$dest_id.' WHERE fk_soc = '.$origin_id;

+

+			if (!$db->query($sql))

+			{

+				if ($ignoreerrors) return true; // TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B.

@@ -8977,29 +7318,0 @@
-	 * Function used to replace a product id with another one.

-	 * This function is meant to be called from replaceProduct with the appropriate tables

-	 * Column name fk_product MUST be used to identify products

-	 *

-	 * @param  DoliDB 	   $dbs			  Database handler

-	 * @param  int 		   $origin_id     Old product id (the product to delete)

-	 * @param  int 		   $dest_id       New product id (the product that will received element of the other)

-	 * @param  string[]    $tables        Tables that need to be changed

-	 * @param  int         $ignoreerrors  Ignore errors. Return true even if errors. We need this when replacement can fails like for categories (categorie of old product may already exists on new one)

-	 * @return bool						  True if success, False if error

-	 */

-	public static function commonReplaceProduct(DoliDB $dbs, $origin_id, $dest_id, array $tables, $ignoreerrors = 0)

-	{

-		foreach ($tables as $table) {

-			$sql = 'UPDATE '.MAIN_DB_PREFIX.$table.' SET fk_product = '.((int) $dest_id).' WHERE fk_product = '.((int) $origin_id);

-

-			if (!$dbs->query($sql)) {

-				if ($ignoreerrors) {

-					return true; // TODO Not enough. If there is A-B on kept product and B-C on old one, we must get A-B-C after merge. Not A-B.

-				}

-				//$this->errors = $db->lasterror();

-				return false;

-			}

-		}

-

-		return true;

-	}

-

-	/**

@@ -9008,2 +7321,2 @@
-	 *   elseif calculation MARGIN_TYPE = 'costprice' and costprice is defined, use costprice as buyprice

-	 *	 elseif calculation MARGIN_TYPE = 'pmp' and pmp is calculated, use pmp as buyprice

+	 *   else if calculation MARGIN_TYPE = 'costprice' and costprice is defined, use costprice as buyprice

+	 *	 else if calculation MARGIN_TYPE = 'pmp' and pmp is calculated, use pmp as buyprice

@@ -9015 +7328 @@
-	 * @return	float                    Return integer <0 if KO, buyprice if OK

+	 * @return	float                    <0 if KO, buyprice if OK

@@ -9023,2 +7336,2 @@
-		if (($unitPrice > 0) && (isset($conf->global->ForceBuyingPriceIfNull) && getDolGlobalInt('ForceBuyingPriceIfNull') > 0)) {

-			// When ForceBuyingPriceIfNull is set

+		if (($unitPrice > 0) && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)) // In most cases, test here is false

+		{

@@ -9026 +7339,3 @@
-		} else {

+		}

+		else

+		{

@@ -9028,2 +7343,4 @@
-			if (!empty($fk_product) && $fk_product > 0) {

-				if (getDolGlobalString('MARGIN_TYPE') == 'costprice') {

+			if (!empty($fk_product))

+			{

+				if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'costprice')

+				{

@@ -9033 +7350,2 @@
-					if ($result <= 0) {

+					if ($result <= 0)

+					{

@@ -9037 +7355,2 @@
-					if ($product->cost_price > 0) {

+					if ($product->cost_price > 0)

+					{

@@ -9039 +7358,3 @@
-					} elseif ($product->pmp > 0) {

+					}

+					elseif ($product->pmp > 0)

+					{

@@ -9042 +7363,3 @@
-				} elseif (getDolGlobalString('MARGIN_TYPE') == 'pmp') {

+				}

+				elseif (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'pmp')

+				{

@@ -9046 +7369,2 @@
-					if ($result <= 0) {

+					if ($result <= 0)

+					{

@@ -9050 +7374,2 @@
-					if ($product->pmp > 0) {

+					if ($product->pmp > 0)

+					{

@@ -9055 +7380,2 @@
-				if (empty($buyPrice) && isset($conf->global->MARGIN_TYPE) && in_array($conf->global->MARGIN_TYPE, array('1', 'pmp', 'costprice'))) {

+				if (empty($buyPrice) && isset($conf->global->MARGIN_TYPE) && in_array($conf->global->MARGIN_TYPE, array('1', 'pmp', 'costprice')))

+				{

@@ -9058 +7384,2 @@
-					if (($result = $productFournisseur->find_min_price_product_fournisseur($fk_product)) > 0) {

+					if (($result = $productFournisseur->find_min_price_product_fournisseur($fk_product)) > 0)

+					{

@@ -9060 +7387,3 @@
-					} elseif ($result < 0) {

+					}

+					elseif ($result < 0)

+					{

@@ -9070 +7399 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -9074,19 +7403,17 @@
-	 *  @param		string		$modulepart		'product', 'ticket', ...

-	 *  @param      string		$sdir        	Directory to scan (full absolute path)

-	 *  @param      int			$size        	0=original size, 1='small' use thumbnail if possible

-	 *  @param      int			$nbmax       	Nombre maximum de photos (0=pas de max)

-	 *  @param      int			$nbbyrow     	Number of image per line or -1 to use div separator or 0 to use no separator. Used only if size=1 or 'small'.

-	 * 	@param		int			$showfilename	1=Show filename

-	 * 	@param		int			$showaction		1=Show icon with action links (resize, delete)

-	 * 	@param		int			$maxHeight		Max height of original image when size='small' (so we can use original even if small requested). If 0, always use 'small' thumb image.

-	 * 	@param		int			$maxWidth		Max width of original image when size='small'

-	 *  @param      int     	$nolink         Do not add a href link to view enlarged imaged into a new tab

-	 *  @param      int|string  $overwritetitle Do not add title tag on image

-	 *  @param		int			$usesharelink	Use the public shared link of image (if not available, the 'nophoto' image will be shown instead)

-	 *  @param		string		$cache			A string if we want to use a cached version of image

-	 *  @param		string		$addphotorefcss	Add CSS to img of photos

-	 *  @return     string						Html code to show photo. Number of photos shown is saved in this->nbphoto

-	 */

-	public function show_photos($modulepart, $sdir, $size = 0, $nbmax = 0, $nbbyrow = 5, $showfilename = 0, $showaction = 0, $maxHeight = 120, $maxWidth = 160, $nolink = 0, $overwritetitle = 0, $usesharelink = 0, $cache = '', $addphotorefcss = 'photoref')

-	{

-		// phpcs:enable

+	 *  @param		string	$modulepart		'product', 'ticket', ...

+	 *  @param      string	$sdir        	Directory to scan (full absolute path)

+	 *  @param      int		$size        	0=original size, 1='small' use thumbnail if possible

+	 *  @param      int		$nbmax       	Nombre maximum de photos (0=pas de max)

+	 *  @param      int		$nbbyrow     	Number of image per line or -1 to use div. Used only if size=1.

+	 * 	@param		int		$showfilename	1=Show filename

+	 * 	@param		int		$showaction		1=Show icon with action links (resize, delete)

+	 * 	@param		int		$maxHeight		Max height of original image when size='small' (so we can use original even if small requested). If 0, always use 'small' thumb image.

+	 * 	@param		int		$maxWidth		Max width of original image when size='small'

+	 *  @param      int     $nolink         Do not add a href link to view enlarged imaged into a new tab

+	 *  @param      int     $notitle        Do not add title tag on image

+	 *  @param		int		$usesharelink	Use the public shared link of image (if not available, the 'nophoto' image will be shown instead)

+	 *  @return     string					Html code to show photo. Number of photos shown is saved in this->nbphoto

+	 */

+	public function show_photos($modulepart, $sdir, $size = 0, $nbmax = 0, $nbbyrow = 5, $showfilename = 0, $showaction = 0, $maxHeight = 120, $maxWidth = 160, $nolink = 0, $notitle = 0, $usesharelink = 0)

+	{

+        // phpcs:enable

@@ -9104,2 +7431,2 @@
-		$dir .= get_exdir(0, 0, 0, 0, $this, $modulepart);

-		$pdir .= get_exdir(0, 0, 0, 0, $this, $modulepart);

+		$dir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->ref.'/';

+		$pdir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->ref.'/';

@@ -9108,5 +7435,4 @@
-		if ($modulepart == 'product') {

-			if (getDolGlobalInt('PRODUCT_USE_OLD_PATH_FOR_PHOTO')) {

-				$dir = $sdir.'/'.get_exdir($this->id, 2, 0, 0, $this, $modulepart).$this->id."/photos/";

-				$pdir = '/'.get_exdir($this->id, 2, 0, 0, $this, $modulepart).$this->id."/photos/";

-			}

+		if ($modulepart == 'product' && !empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))

+		{

+			$dir = $sdir.'/'.get_exdir($this->id, 2, 0, 0, $this, $modulepart).$this->id."/photos/";

+			$pdir = '/'.get_exdir($this->id, 2, 0, 0, $this, $modulepart).$this->id."/photos/";

@@ -9117 +7443,2 @@
-		if ($dir) {

+		if ($dir)

+		{

@@ -9129,3 +7456,3 @@
-		$filearray = dol_dir_list($dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ? SORT_DESC : SORT_ASC), 1);

-

-		/*if (getDolGlobalInt('PRODUCT_USE_OLD_PATH_FOR_PHOTO'))    // For backward compatiblity, we scan also old dirs

+		$filearray = dol_dir_list($dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);

+

+		/*if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))    // For backward compatiblity, we scan also old dirs

@@ -9139,2 +7466,4 @@
-		if (count($filearray)) {

-			if ($sortfield && $sortorder) {

+		if (count($filearray))

+		{

+			if ($sortfield && $sortorder)

+			{

@@ -9144 +7473,2 @@
-			foreach ($filearray as $key => $val) {

+			foreach ($filearray as $key => $val)

+			{

@@ -9147,0 +7478,2 @@
+				//if (! utf8_check($file)) $file=utf8_encode($file);	// To be sure file is stored in UTF8 in memory

+

@@ -9149 +7481,2 @@
-				if (image_format_supported($file) >= 0) {

+				if (image_format_supported($file) >= 0)

+				{

@@ -9157,6 +7490 @@
-						if (!dol_is_file($dirthumb.$photo_vignette)) {

-							// The thumb does not exists, so we will use the original file

-							$dirthumb = $dir;

-							$pdirthumb = $pdir;

-							$photo_vignette = basename($file);

-						}

+						if (!dol_is_file($dirthumb.$photo_vignette)) $photo_vignette = '';

@@ -9167,11 +7495,6 @@
-						if ($nbbyrow > 0) {

-							if ($nbphoto == 1) {

-								$return .= '<table class="valigntop center centpercent" style="border: 0; padding: 2px; border-spacing: 2px; border-collapse: separate;">';

-							}

-

-							if ($nbphoto % $nbbyrow == 1) {

-								$return .= '<tr class="center valignmiddle" style="border: 1px">';

-							}

-							$return .= '<td style="width: '.ceil(100 / $nbbyrow).'%" class="photo">'."\n";

-						} elseif ($nbbyrow < 0) {

-							$return .= '<div class="inline-block">'."\n";

+						if ($nbbyrow > 0)

+						{

+							if ($nbphoto == 1) $return .= '<table class="valigntop center centpercent" style="border: 0; padding: 2px; border-spacing: 2px; border-collapse: separate;">';

+

+							if ($nbphoto % $nbbyrow == 1) $return .= '<tr class="center valignmiddle" style="border: 1px">';

+							$return .= '<td style="width: '.ceil(100 / $nbbyrow).'%" class="photo">';

@@ -9178,0 +7502,3 @@
+						elseif ($nbbyrow < 0) $return .= '<div class="inline-block">';

+

+						$return .= "\n";

@@ -9181 +7507,2 @@
-						if (empty($nolink)) {

+						if (empty($nolink))

+						{

@@ -9183,5 +7510,2 @@
-							if ($urladvanced) {

-								$return .= '<a href="'.$urladvanced.'">';

-							} else {

-								$return .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" class="aphoto" target="_blank" rel="noopener noreferrer">';

-							}

+							if ($urladvanced) $return .= '<a href="'.$urladvanced.'">';

+							else $return .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" class="aphoto" target="_blank">';

@@ -9194,5 +7518,20 @@
-						if ($overwritetitle) {

-							if (is_numeric($overwritetitle)) {

-								$alt = '';

-							} else {

-								$alt = $overwritetitle;

+						if ($notitle) $alt = '';

+

+						if ($usesharelink)

+						{

+							if ($val['share'])

+							{

+								if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)

+								{

+									$return .= '<!-- Show original file (thumb not yet available with shared links) -->';

+									$return .= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';

+								}

+								else {

+									$return .= '<!-- Show original file -->';

+									$return .= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';

+								}

+							}

+							else

+							{

+								$return .= '<!-- Show nophoto file (because file is not shared) -->';

+								$return .= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png" title="'.dol_escape_htmltag($alt).'">';

@@ -9201,13 +7540,6 @@
-

-						if ($usesharelink) {

-							if ($val['share']) {

-								if (empty($maxHeight) || ($photo_vignette && $imgarray['height'] > $maxHeight)) {

-									$return .= '<!-- Show original file (thumb not yet available with shared links) -->';

-									$return .= '<img class="photo photowithmargin'.($addphotorefcss ? ' '.$addphotorefcss : '').'"'.($maxHeight ? ' height="'.$maxHeight.'"' : '').' src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).($cache ? '&cache='.urlencode($cache) : '').'" title="'.dol_escape_htmltag($alt).'">';

-								} else {

-									$return .= '<!-- Show original file -->';

-									$return .= '<img class="photo photowithmargin'.($addphotorefcss ? ' '.$addphotorefcss : '').'" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).($cache ? '&cache='.urlencode($cache) : '').'" title="'.dol_escape_htmltag($alt).'">';

-								}

-							} else {

-								$return .= '<!-- Show nophoto file (because file is not shared) -->';

-								$return .= '<img class="photo photowithmargin'.($addphotorefcss ? ' '.$addphotorefcss : '').'" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png" title="'.dol_escape_htmltag($alt).'">';

+						else

+						{

+							if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)

+							{

+								$return .= '<!-- Show thumb -->';

+								$return .= '<img class="photo photowithmargin"  height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdirthumb.$photo_vignette).'" title="'.dol_escape_htmltag($alt).'">';

@@ -9215,5 +7547 @@
-						} else {

-							if (empty($maxHeight) || ($photo_vignette && $imgarray['height'] > $maxHeight)) {

-								$return .= '<!-- Show thumb -->';

-								$return .= '<img class="photo photowithmargin'.($addphotorefcss ? ' '.$addphotorefcss : '').' maxwidth150onsmartphone maxwidth200"'.($maxHeight ? ' height="'.$maxHeight.'"' : '').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.($cache ? '&cache='.urlencode($cache) : '').'&file='.urlencode($pdirthumb.$photo_vignette).'" title="'.dol_escape_htmltag($alt).'">';

-							} else {

+							else {

@@ -9221 +7549 @@
-								$return .= '<img class="photo photowithmargin'.($addphotorefcss ? ' '.$addphotorefcss : '').'" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.($cache ? '&cache='.urlencode($cache) : '').'&file='.urlencode($pdir.$photo).'" title="'.dol_escape_htmltag($alt).'">';

+								$return .= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" title="'.dol_escape_htmltag($alt).'">';

@@ -9225,8 +7553,6 @@
-						if (empty($nolink)) {

-							$return .= '</a>';

-						}

-

-						if ($showfilename) {

-							$return .= '<br>'.$viewfilename;

-						}

-						if ($showaction) {

+						if (empty($nolink)) $return .= '</a>';

+						$return .= "\n";

+

+						if ($showfilename) $return .= '<br>'.$viewfilename;

+						if ($showaction)

+						{

@@ -9234,3 +7560,4 @@
-							// If $photo_vignette set, we add link to generate thumbs if file is an image and ->imgWidth or->imgHeight higher than limits

-							if ($photo_vignette && (image_format_supported($photo) > 0) && ((isset($this->imgWidth) && $this->imgWidth > $maxWidth) || (isset($this->imgHeight) && $this->imgHeight > $maxHeight))) {

-								$return .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&action=addthumb&token='.newToken().'&file='.urlencode($pdir.$viewfilename).'">'.img_picto($langs->trans('GenerateThumb'), 'refresh').'&nbsp;&nbsp;</a>';

+							// On propose la generation de la vignette si elle n'existe pas et si la taille est superieure aux limites

+							if ($photo_vignette && (image_format_supported($photo) > 0) && ($this->imgWidth > $maxWidth || $this->imgHeight > $maxHeight))

+							{

+								$return .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=addthumb&amp;file='.urlencode($pdir.$viewfilename).'">'.img_picto($langs->trans('GenerateThumb'), 'refresh').'&nbsp;&nbsp;</a>';

@@ -9239 +7566,2 @@
-							if ($modulepart == 'product' && ($user->hasRight('produit', 'creer') || $user->hasRight('service', 'creer'))) {

+							if ($modulepart == 'product' && ($user->rights->produit->creer || $user->rights->service->creer))

+							{

@@ -9241 +7569 @@
-								$return .= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';

+								$return .= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';

@@ -9244 +7572 @@
-								$return .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&action=delete&token='.newToken().'&file='.urlencode($pdir.$viewfilename).'">';

+								$return .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';

@@ -9250 +7578,2 @@
-						if ($nbbyrow > 0) {

+						if ($nbbyrow > 0)

+						{

@@ -9252,5 +7581 @@
-							if (($nbphoto % $nbbyrow) == 0) {

-								$return .= '</tr>';

-							}

-						} elseif ($nbbyrow < 0) {

-							$return .= '</div>'."\n";

+							if (($nbphoto % $nbbyrow) == 0) $return .= '</tr>';

@@ -9257,0 +7583 @@
+						elseif ($nbbyrow < 0) $return .= '</div>';

@@ -9263,4 +7589,3 @@
-						if ($showfilename) {

-							$return .= '<br>'.$viewfilename;

-						}

-						if ($showaction) {

+						if ($showfilename) $return .= '<br>'.$viewfilename;

+						if ($showaction)

+						{

@@ -9268 +7593,2 @@
-							if ($modulepart == 'product' && ($user->hasRight('produit', 'creer') || $user->hasRight('service', 'creer'))) {

+							if ($modulepart == 'product' && ($user->rights->produit->creer || $user->rights->service->creer))

+							{

@@ -9270 +7596 @@
-								$return .= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';

+								$return .= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';

@@ -9273 +7599 @@
-								$return .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&action=delete&token='.newToken().'&file='.urlencode($pdir.$viewfilename).'">';

+								$return .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';

@@ -9280,8 +7606,8 @@
-					if ($nbmax && $nbphoto >= $nbmax) {

-						break;

-					}

-				}

-			}

-

-			if ($size == 1 || $size == 'small') {

-				if ($nbbyrow > 0) {

+					if ($nbmax && $nbphoto >= $nbmax) break;

+				}

+			}

+

+			if ($size == 1 || $size == 'small')

+			{

+				if ($nbbyrow > 0)

+				{

@@ -9289 +7615,2 @@
-					while ($nbphoto % $nbbyrow) {

+					while ($nbphoto % $nbbyrow)

+					{

@@ -9294,3 +7621 @@
-					if ($nbphoto) {

-						$return .= '</table>';

-					}

+					if ($nbphoto) $return .= '</table>';

@@ -9315,6 +7640,4 @@
-		if (is_array($info)) {

-			if (isset($info['type']) && $info['type'] == 'array') {

-				return true;

-			} else {

-				return false;

-			}

+		if (is_array($info))

+		{

+			if (isset($info['type']) && $info['type'] == 'array') return true;

+			else return false;

@@ -9333,3 +7656 @@
-		if (isset($info['type']) && ($info['type'] == 'date' || $info['type'] == 'datetime' || $info['type'] == 'timestamp')) {

-			return true;

-		}

+		if (isset($info['type']) && ($info['type'] == 'date' || $info['type'] == 'datetime' || $info['type'] == 'timestamp')) return true;

@@ -9347,9 +7668,6 @@
-		if (is_array($info)) {

-			if (isset($info['type']) && ($info['type'] == 'duration')) {

-				return true;

-			} else {

-				return false;

-			}

-		} else {

-			return false;

-		}

+		if (is_array($info))

+		{

+			if (isset($info['type']) && ($info['type'] == 'duration')) return true;

+			else return false;

+		}

+		else return false;

@@ -9366,9 +7684,6 @@
-		if (is_array($info)) {

-			if (isset($info['type']) && (preg_match('/(^int|int$)/i', $info['type']))) {

-				return true;

-			} else {

-				return false;

-			}

-		} else {

-			return false;

-		}

+		if (is_array($info))

+		{

+			if (isset($info['type']) && ($info['type'] == 'int' || preg_match('/^integer/i', $info['type']))) return true;

+			else return false;

+		}

+		else return false;

@@ -9385,6 +7700,4 @@
-		if (is_array($info)) {

-			if (isset($info['type']) && (preg_match('/^(double|real|price)/i', $info['type']))) {

-				return true;

-			} else {

-				return false;

-			}

+		if (is_array($info))

+		{

+			if (isset($info['type']) && (preg_match('/^(double|real|price)/i', $info['type']))) return true;

+			else return false;

@@ -9403,6 +7716,4 @@
-		if (is_array($info)) {

-			if (isset($info['type']) && $info['type'] == 'text') {

-				return true;

-			} else {

-				return false;

-			}

+		if (is_array($info))

+		{

+			if (isset($info['type']) && $info['type'] == 'text') return true;

+			else return false;

@@ -9421,6 +7732,4 @@
-		if (is_array($info)) {

-			if (isset($info['notnull']) && $info['notnull'] != '1') {

-				return true;

-			} else {

-				return false;

-			}

+		if (is_array($info))

+		{

+			if (isset($info['notnull']) && $info['notnull'] != '1') return true;

+			else return false;

@@ -9439,6 +7748,4 @@
-		if (is_array($info)) {

-			if (isset($info['notnull']) && $info['notnull'] == '-1') {

-				return true;

-			} else {

-				return false;

-			}

+		if (is_array($info))

+		{

+			if (isset($info['notnull']) && $info['notnull'] == '-1') return true;

+			else return false;

@@ -9457,6 +7764,4 @@
-		if (is_array($info)) {

-			if (isset($info['index']) && $info['index'] == true) {

-				return true;

-			} else {

-				return false;

-			}

+		if (is_array($info))

+		{

+			if (isset($info['index']) && $info['index'] == true) return true;

+			else return false;

@@ -9469,6 +7774,5 @@
-	 * Function to return the array of data key-value from the ->fields and all the ->properties of an object.

-	 *

-	 * Note: $this->${field} are set by the page that make the createCommon() or the updateCommon().

-	 * $this->${field} should be a clean and string value (so date are formated for SQL insert).

-	 *

-	 * @return array		Array with all values of each properties to update

+	 * Function to prepare a part of the query for insert.

+	 * Note $this->${field} are set by the page that make the createCommon or the updateCommon.

+	 * $this->${field} should be a clean value. The page can run

+	 *

+	 * @return array

@@ -9481 +7785,2 @@
-		foreach ($this->fields as $field => $info) {	// Loop on definition of fields

+		foreach ($this->fields as $field => $info)	// Loop on definition of fields

+		{

@@ -9483,2 +7788,4 @@
-			if ($this->isDate($info)) {

-				if (empty($this->{$field})) {

+			if ($this->isDate($info))

+			{

+				if (empty($this->{$field}))

+				{

@@ -9486 +7793,3 @@
-				} else {

+				}

+				else

+				{

@@ -9489,12 +7798,8 @@
-			} elseif ($this->isDuration($info)) {

-				// $this->{$field} may be null, '', 0, '0', 123, '123'

-				if ((isset($this->{$field}) && $this->{$field} != '') || !empty($info['notnull'])) {

-					if (!isset($this->{$field})) {

-						if (!empty($info['default'])) {

-							$queryarray[$field] = $info['default'];

-						} else {

-							$queryarray[$field] = 0;

-						}

-					} else {

-						$queryarray[$field] = (int) $this->{$field};		// If '0', it may be set to null later if $info['notnull'] == -1

-					}

+			}

+			elseif ($this->isArray($info))

+			{

+				if (!empty($this->{$field})) {

+					if (!is_array($this->{$field})) {

+						$this->{$field} = array($this->{$field});

+					}

+					$queryarray[$field] = serialize($this->{$field});

@@ -9504,3 +7809,53 @@
-			} elseif ($this->isInt($info) || $this->isFloat($info)) {

-				if ($field == 'entity' && is_null($this->{$field})) {

-					$queryarray[$field] = ((int) $conf->entity);

+			}

+			elseif ($this->isDuration($info))

+			{

+				// $this->{$field} may be null, '', 0, '0', 123, '123'

+				if ($this->{$field} != '' || !empty($info['notnull'])) $queryarray[$field] = (int) $this->{$field};		// If '0', it may be set to null later if $info['notnull'] == -1

+				else $queryarray[$field] = null;

+			}

+			elseif ($this->isInt($info) || $this->isFloat($info))

+			{

+				if ($field == 'entity' && is_null($this->{$field})) $queryarray[$field] = $conf->entity;

+				else

+				{

+					// $this->{$field} may be null, '', 0, '0', 123, '123'

+					if ($this->{$field} != '' || !empty($info['notnull'])) {

+						if ($this->isInt($info)) $queryarray[$field] = (int) $this->{$field};	// If '0', it may be set to null later if $info['notnull'] == -1

+						if ($this->isFloat($info)) $queryarray[$field] = (double) $this->{$field};	// If '0', it may be set to null later if $info['notnull'] == -1

+					}

+					else $queryarray[$field] = null;

+				}

+			}

+			else

+			{

+				$queryarray[$field] = $this->{$field};

+			}

+

+			if ($info['type'] == 'timestamp' && empty($queryarray[$field])) unset($queryarray[$field]);

+			if (!empty($info['notnull']) && $info['notnull'] == -1 && empty($queryarray[$field])) $queryarray[$field] = null; // May force 0 to null

+		}

+

+		return $queryarray;

+	}

+

+	/**

+	 * Function to load data from a SQL pointer into properties of current object $this

+	 *

+	 * @param   stdClass    $obj    Contain data of object from database

+     * @return void

+	 */

+	public function setVarsFromFetchObj(&$obj)

+	{

+		foreach ($this->fields as $field => $info)

+		{

+			if ($this->isDate($info))

+			{

+				if (empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') $this->{$field} = 0;

+				else $this->{$field} = strtotime($obj->{$field});

+			}

+			elseif ($this->isArray($info))

+			{

+				if (!empty($obj->{$field})) {

+					$this->{$field} = @unserialize($obj->{$field});

+					// Hack for data not in UTF8

+					if ($this->{$field } === false) @unserialize(utf8_decode($obj->{$field}));

@@ -9508,8 +7863,19 @@
-					// $this->{$field} may be null, '', 0, '0', 123, '123'

-					if ((isset($this->{$field}) && ((string) $this->{$field}) != '') || !empty($info['notnull'])) {

-						if (!isset($this->{$field})) {

-							$queryarray[$field] = 0;

-						} elseif ($this->isInt($info)) {

-							$queryarray[$field] = (int) $this->{$field};	// If '0', it may be set to null later if $info['notnull'] == -1

-						} elseif ($this->isFloat($info)) {

-							$queryarray[$field] = (float) $this->{$field};	// If '0', it may be set to null later if $info['notnull'] == -1

+					$this->{$field} = array();

+				}

+			}

+			elseif ($this->isInt($info))

+			{

+				if ($field == 'rowid') $this->id = (int) $obj->{$field};

+				else

+				{

+					if ($this->isForcedToNullIfZero($info))

+					{

+						if (empty($obj->{$field})) $this->{$field} = null;

+						else $this->{$field} = (double) $obj->{$field};

+					}

+					else

+					{

+						if (!is_null($obj->{$field}) || (isset($info['notnull']) && $info['notnull'] == 1)) {

+							$this->{$field} = (int) $obj->{$field};

+						} else {

+							$this->{$field} = null;

@@ -9516,0 +7883,14 @@
+					}

+				}

+			}

+			elseif ($this->isFloat($info))

+			{

+				if ($this->isForcedToNullIfZero($info))

+				{

+					if (empty($obj->{$field})) $this->{$field} = null;

+					else $this->{$field} = (double) $obj->{$field};

+				}

+				else

+				{

+					if (!is_null($obj->{$field}) || (isset($info['notnull']) && $info['notnull'] == 1)) {

+						$this->{$field} = (double) $obj->{$field};

@@ -9518,71 +7898,7 @@
-						$queryarray[$field] = null;

-					}

-				}

-			} else {

-				// Note: If $this->{$field} is not defined, it means there is a bug into definition of ->fields or a missing declaration of property

-				// We should keep the warning generated by this because it is a bug somewhere else in code, not here.

-				$queryarray[$field] = $this->{$field};

-			}

-

-			if ($info['type'] == 'timestamp' && empty($queryarray[$field])) {

-				unset($queryarray[$field]);

-			}

-			if (!empty($info['notnull']) && $info['notnull'] == -1 && empty($queryarray[$field])) {

-				$queryarray[$field] = null; // May force 0 to null

-			}

-		}

-

-		return $queryarray;

-	}

-

-	/**

-	 * Function to load data from a SQL pointer into properties of current object $this

-	 *

-	 * @param   stdClass    $obj    Contain data of object from database

-	 * @return void

-	 */

-	public function setVarsFromFetchObj(&$obj)

-	{

-		global $db;

-

-		foreach ($this->fields as $field => $info) {

-			if ($this->isDate($info)) {

-				if (!isset($obj->$field) || is_null($obj->$field) || $obj->$field === '' || $obj->$field === '0000-00-00 00:00:00' || $obj->$field === '1000-01-01 00:00:00') {

-					$this->$field = '';

-				} else {

-					$this->$field = $db->jdate($obj->$field);

-				}

-			} elseif ($this->isInt($info)) {

-				if ($field == 'rowid') {

-					$this->id = (int) $obj->$field;

-				} else {

-					if ($this->isForcedToNullIfZero($info)) {

-						if (empty($obj->$field)) {

-							$this->$field = null;

-						} else {

-							$this->$field = (float) $obj->$field;

-						}

-					} else {

-						if (isset($obj->$field) && (!is_null($obj->$field) || (isset($info['notnull']) && $info['notnull'] == 1))) {

-							$this->$field = (int) $obj->$field;

-						} else {

-							$this->$field = null;

-						}

-					}

-				}

-			} elseif ($this->isFloat($info)) {

-				if ($this->isForcedToNullIfZero($info)) {

-					if (empty($obj->$field)) {

-						$this->$field = null;

-					} else {

-						$this->$field = (float) $obj->$field;

-					}

-				} else {

-					if (isset($obj->$field) && (!is_null($obj->$field) || (isset($info['notnull']) && $info['notnull'] == 1))) {

-						$this->$field = (float) $obj->$field;

-					} else {

-						$this->$field = null;

-					}

-				}

-			} else {

-				$this->$field = isset($obj->$field) ? $obj->$field : null;

+						$this->{$field} = null;

+					}

+				}

+			}

+			else

+			{

+				$this->{$field} = $obj->{$field};

@@ -9593,14 +7909 @@
-		if (!isset($this->fields['ref']) && isset($this->id)) {

-			$this->ref = $this->id;

-		}

-	}

-

-	/**

-	 * Sets all object fields to null. Useful for example in lists, when printing multiple lines and a different object os fetched for each line.

-	 * @return void

-	 */

-	public function emtpyObjectVars()

-	{

-		foreach ($this->fields as $field => $arr) {

-			$this->$field = null;

-		}

+		if (!isset($this->fields['ref']) && isset($this->id)) $this->ref = $this->id;

@@ -9612,5 +7915,3 @@
-	 * @param   string  $alias   		String of alias of table for fields. For example 't'. It is recommended to use '' and set alias into fields defintion.

-	 * @param	array	$excludefields	Array of fields to exclude

-	 * @return  string					List of alias fields

-	 */

-	public function getFieldList($alias = '', $excludefields = array())

+	 * @return string

+	 */

+	protected function getFieldList()

@@ -9619,14 +7920 @@
-		if (!empty($alias)) {

-			$keys_with_alias = array();

-			foreach ($keys as $fieldname) {

-				if (!empty($excludefields)) {

-					if (in_array($fieldname, $excludefields)) {	// The field is excluded and must not be in output

-						continue;

-					}

-				}

-				$keys_with_alias[] = $alias . '.' . $fieldname;

-			}

-			return implode(',', $keys_with_alias);

-		} else {

-			return implode(',', $keys);

-		}

+		return implode(',', $keys);

@@ -9644,15 +7932,7 @@
-		if (is_null($value)) {

-			return 'NULL';

-		} elseif (preg_match('/^(int|double|real|price)/i', $fieldsentry['type'])) {

-			return price2num("$value");

-		} elseif (preg_match('/int$/i', $fieldsentry['type'])) {

-			return (int) $value;

-		} elseif ($fieldsentry['type'] == 'boolean') {

-			if ($value) {

-				return 'true';

-			} else {

-				return 'false';

-			}

-		} else {

-			return "'".$this->db->escape($value)."'";

-		}

+		if (is_null($value)) return 'NULL';

+		elseif (preg_match('/^(int|double|real|price)/i', $fieldsentry['type'])) return $this->db->escape("$value");

+		elseif ($fieldsentry['type'] == 'boolean') {

+		    if ($value) return 'true';

+		    else return 'false';

+        }

+		else return "'".$this->db->escape($value)."'";

@@ -9667 +7947 @@
-	 * @return int             Return integer <0 if KO, Id of created object if OK

+	 * @return int             <0 if KO, Id of created object if OK

@@ -9672 +7951,0 @@
-

@@ -9681,9 +7960,2 @@
-		if (array_key_exists('date_creation', $fieldvalues) && empty($fieldvalues['date_creation'])) {

-			$fieldvalues['date_creation'] = $this->db->idate($now);

-		}

-		if (array_key_exists('fk_user_creat', $fieldvalues) && !($fieldvalues['fk_user_creat'] > 0)) {

-			$fieldvalues['fk_user_creat'] = $user->id;

-		}

-		if (array_key_exists('pass_crypted', $fieldvalues) && property_exists($this, 'pass')) {

-			$fieldvalues['pass_crypted'] = dol_hash($this->pass);

-		}

+		if (array_key_exists('date_creation', $fieldvalues) && empty($fieldvalues['date_creation'])) $fieldvalues['date_creation'] = $this->db->idate($now);

+		if (array_key_exists('fk_user_creat', $fieldvalues) && !($fieldvalues['fk_user_creat'] > 0)) $fieldvalues['fk_user_creat'] = $user->id;

@@ -9691,3 +7963 @@
-		if (array_key_exists('ref', $fieldvalues)) {

-			$fieldvalues['ref'] = dol_string_nospecial($fieldvalues['ref']); // If field is a ref, we sanitize data

-		}

+		if (array_key_exists('ref', $fieldvalues)) $fieldvalues['ref'] = dol_string_nospecial($fieldvalues['ref']); // If field is a ref, we sanitize data

@@ -9696 +7966 @@
-		$values = array(); // Array to store string forged for SQL syntax

+		$values = array();

@@ -9700 +7970 @@
-			$values[$k] = $this->quote($v, $value); // May return string 'NULL' if $value is null

+			$values[$k] = $this->quote($v, $value);

@@ -9704,10 +7974,9 @@
-		foreach ($keys as $key) {

-			// If field is an implicit foreign key field (so type = 'integer:...')

-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') {

-				$values[$key] = '';

-			}

-			if (!empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') {

-				$values[$key] = '';

-			}

-

-			if (isset($this->fields[$key]['notnull']) && $this->fields[$key]['notnull'] == 1 && (!isset($values[$key]) || $values[$key] === 'NULL') && is_null($this->fields[$key]['default'])) {

+		foreach ($keys as $key)

+		{

+			// If field is an implicit foreign key field

+			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key] = '';

+			if (!empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key] = '';

+

+			//var_dump($key.'-'.$values[$key].'-'.($this->fields[$key]['notnull'] == 1));

+			if (isset($this->fields[$key]['notnull']) && $this->fields[$key]['notnull'] == 1 && !isset($values[$key]) && is_null($this->fields[$key]['default']))

+			{

@@ -9715,2 +7983,0 @@
-				$langs->load("errors");

-				dol_syslog("Mandatory field '".$key."' is empty and required into ->fields definition of class");

@@ -9720,6 +7987 @@
-			// If value is null and there is a default value for field

-			if (isset($this->fields[$key]['notnull']) && $this->fields[$key]['notnull'] == 1 && (!isset($values[$key]) || $values[$key] === 'NULL') && !is_null($this->fields[$key]['default'])) {

-				$values[$key] = $this->quote($this->fields[$key]['default'], $this->fields[$key]);

-			}

-

-			// If field is an implicit foreign key field (so type = 'integer:...')

+			// If field is an implicit foreign key field

@@ -9727,14 +7989,7 @@
-				if (isset($this->fields[$key]['default'])) {

-					$values[$key] = ((int) $this->fields[$key]['default']);

-				} else {

-					$values[$key] = 'null';

-				}

-			}

-			if (!empty($this->fields[$key]['foreignkey']) && empty($values[$key])) {

-				$values[$key] = 'null';

-			}

-		}

-

-		if ($error) {

-			return -1;

-		}

+				if (isset($this->fields[$key]['default'])) $values[$key] = $this->fields[$key]['default'];

+				else $values[$key] = 'null';

+			}

+			if (!empty($this->fields[$key]['foreignkey']) && empty($values[$key])) $values[$key] = 'null';

+		}

+

+		if ($error) return -1;

@@ -9744,4 +7999,5 @@
-		if (!$error) {

-			$sql = "INSERT INTO ".$this->db->prefix().$this->table_element;

-			$sql .= " (".implode(", ", $keys).')';

-			$sql .= " VALUES (".implode(", ", $values).")";		// $values can contains 'abc' or 123

+		if (!$error)

+		{

+			$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element;

+			$sql .= ' ('.implode(", ", $keys).')';

+			$sql .= ' VALUES ('.implode(", ", $values).')';

@@ -9750 +8006 @@
-			if (!$res) {

+			if ($res === false) {

@@ -9752,10 +8008,7 @@
-				if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {

-					$this->errors[] = "ErrorRefAlreadyExists";

-				} else {

-					$this->errors[] = $this->db->lasterror();

-				}

-			}

-		}

-

-		if (!$error) {

-			$this->id = $this->db->last_insert_id($this->db->prefix().$this->table_element);

+				$this->errors[] = $this->db->lasterror();

+			}

+		}

+

+		if (!$error)

+		{

+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);

@@ -9765,12 +8018,15 @@
-		if (!$error) {

-			if (key_exists('ref', $this->fields) && key_exists('notnull', $this->fields['ref']) && $this->fields['ref']['notnull'] > 0 && key_exists('default', $this->fields['ref']) && $this->fields['ref']['default'] == '(PROV)') {

-				$sql = "UPDATE ".$this->db->prefix().$this->table_element." SET ref = '(PROV".((int) $this->id).")' WHERE (ref = '(PROV)' OR ref = '') AND rowid = ".((int) $this->id);

-				$resqlupdate = $this->db->query($sql);

-

-				if ($resqlupdate === false) {

-					$error++;

-					$this->errors[] = $this->db->lasterror();

-				} else {

-					$this->ref = '(PROV'.$this->id.')';

-				}

-			}

+		if (!$error)

+		{

+		    if (key_exists('ref', $this->fields) && $this->fields['ref']['notnull'] > 0 && !is_null($this->fields['ref']['default']) && $this->fields['ref']['default'] == '(PROV)')

+		    {

+		        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET ref = '(PROV".$this->id.")' WHERE (ref = '(PROV)' OR ref = '') AND rowid = ".$this->id;

+		        $resqlupdate = $this->db->query($sql);

+

+		        if ($resqlupdate === false)

+		        {

+		            $error++;

+		            $this->errors[] = $this->db->lasterror();

+		        } else {

+		        	$this->ref = '(PROV'.$this->id.')';

+		        }

+		    }

@@ -9780 +8036,2 @@
-		if (!$error) {

+		if (!$error)

+		{

@@ -9782,3 +8039 @@
-			if ($result < 0) {

-				$error++;

-			}

+			if ($result < 0) $error++;

@@ -9788,2 +8043,7 @@
-		if (!empty($this->table_element_line) && !empty($this->fk_element)) {

-			foreach ($this->lines as $line) {

+		if (!empty($this->table_element_line) && !empty($this->fk_element))

+		{

+			$num = (is_array($this->lines) ? count($this->lines) : 0);

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

+			{

+				$line = $this->lines[$i];

+

@@ -9795,12 +8055,6 @@
-				if (!is_object($line)) {

-					$line = (object) $line;

-				}

-

-				$result = 0;

-				if (method_exists($line, 'insert')) {

-					$result = $line->insert($user, 1);

-				} elseif (method_exists($line, 'create')) {

-					$result = $line->create($user, 1);

-				}

-				if ($result < 0) {

-					$this->error = $line->error;

+				if (!is_object($line)) $line = (object) $line;

+

+				$result = $line->create($user, 1);

+				if ($result < 0)

+				{

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

@@ -9814 +8068,2 @@
-		if (!$error && !$notrigger) {

+		if (!$error && !$notrigger)

+		{

@@ -9817,3 +8072 @@
-			if ($result < 0) {

-				$error++;

-			}

+			if ($result < 0) { $error++; }

@@ -9835,4 +8088,4 @@
-	 * Load object in memory from the database. This does not load line. This is done by parent fetch() that call fetchCommon

-	 *

-	 * @param	int    	$id				Id object

-	 * @param	string 	$ref			Ref

+	 * Load object in memory from the database

+	 *

+	 * @param	int    $id				Id object

+	 * @param	string $ref				Ref

@@ -9840,30 +8093,14 @@
-	 * @param	int		$noextrafields	0=Default to load extrafields, 1=No extrafields

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

-	 */

-	public function fetchCommon($id, $ref = null, $morewhere = '', $noextrafields = 0)

-	{

-		if (empty($id) && empty($ref) && empty($morewhere)) {

-			return -1;

-		}

-

-		$fieldlist = $this->getFieldList('t');

-		if (empty($fieldlist)) {

-			return 0;

-		}

-

-		$sql = "SELECT ".$fieldlist;

-		$sql .= " FROM ".$this->db->prefix().$this->table_element.' as t';

-

-		if (!empty($id)) {

-			$sql .= ' WHERE t.rowid = '.((int) $id);

-		} elseif (!empty($ref)) {

-			$sql .= " WHERE t.ref = '".$this->db->escape($ref)."'";

-		} else {

-			$sql .= ' WHERE 1 = 1'; // usage with empty id and empty ref is very rare

-		}

-		if (empty($id) && isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {

-			$sql .= ' AND t.entity IN ('.getEntity($this->element).')';

-		}

-		if ($morewhere) {

-			$sql .= $morewhere;

-		}

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

+	 */

+	public function fetchCommon($id, $ref = null, $morewhere = '')

+	{

+		if (empty($id) && empty($ref) && empty($morewhere)) return -1;

+

+		$sql = 'SELECT '.$this->getFieldList();

+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element;

+

+		if (!empty($id))  $sql .= ' WHERE rowid = '.$id;

+		elseif (!empty($ref)) $sql .= " WHERE ref = ".$this->quote($ref, $this->fields['ref']);

+		else $sql .= ' WHERE 1 = 1'; // usage with empty id and empty ref is very rare

+		if (empty($id) && isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql .= ' AND entity IN ('.getEntity($this->table_element).')';

+		if ($morewhere)   $sql .= $morewhere;

@@ -9873 +8110,2 @@
-		if ($res) {

+		if ($res)

+		{

@@ -9875 +8113,2 @@
-			if ($obj) {

+			if ($obj)

+			{

@@ -9878 +8117 @@
-				// Retrieve all extrafield

+				// Retreive all extrafield

@@ -9880,8 +8119 @@
-				if (empty($noextrafields)) {

-					$result = $this->fetch_optionals();

-					if ($result < 0) {

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

-						$this->errors[] = $this->error;

-						return -4;

-					}

-				}

+				$this->fetch_optionals();

@@ -9890 +8122,3 @@
-			} else {

+			}

+			else

+			{

@@ -9893 +8127,3 @@
-		} else {

+		}

+		else

+		{

@@ -9904,4 +8140,3 @@
-	 * @param	int		$noextrafields	0=Default to load extrafields, 1=No extrafields

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

-	 */

-	public function fetchLinesCommon($morewhere = '', $noextrafields = 0)

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

+	 */

+	public function fetchLinesCommon($morewhere = '')

@@ -9910 +8145,2 @@
-		if (!class_exists($objectlineclassname)) {

+		if (!class_exists($objectlineclassname))

+		{

@@ -9917,9 +8153,4 @@
-		$sql = "SELECT ".$objectline->getFieldList('l');

-		$sql .= " FROM ".$this->db->prefix().$objectline->table_element." as l";

-		$sql .= " WHERE l.fk_".$this->db->escape($this->element)." = ".((int) $this->id);

-		if ($morewhere) {

-			$sql .= $morewhere;

-		}

-		if (isset($objectline->fields['position'])) {

-			$sql .= $this->db->order('position', 'ASC');

-		}

+		$sql = 'SELECT '.$objectline->getFieldList();

+		$sql .= ' FROM '.MAIN_DB_PREFIX.$objectline->table_element;

+		$sql .= ' WHERE fk_'.$this->element.' = '.$this->id;

+		if ($morewhere)   $sql .= $morewhere;

@@ -9928 +8159,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -9931 +8163,2 @@
-			while ($i < $num_rows) {

+			while ($i < $num_rows)

+			{

@@ -9933 +8166,2 @@
-				if ($obj) {

+				if ($obj)

+				{

@@ -9937,6 +8170,0 @@
-					// Note: extrafields load of line not yet supported

-					/*

-					if (empty($noextrafields)) {

-						// Load extrafields of line

-					}*/

-

@@ -9949 +8177,3 @@
-		} else {

+		}

+		else

+		{

@@ -9961 +8191 @@
-	 * @return int             	Return integer <0 if KO, >0 if OK

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

@@ -9964,0 +8195 @@
+		global $conf, $langs;

@@ -9971,5 +8201,0 @@
-		// $this->oldcopy should have been set by the caller of update

-		//if (empty($this->oldcopy)) {

-		//	$this->oldcopy = dol_clone($this);

-		//}

-

@@ -9978,6 +8204,2 @@
-		if (array_key_exists('date_modification', $fieldvalues) && empty($fieldvalues['date_modification'])) {

-			$fieldvalues['date_modification'] = $this->db->idate($now);

-		}

-		if (array_key_exists('fk_user_modif', $fieldvalues) && !($fieldvalues['fk_user_modif'] > 0)) {

-			$fieldvalues['fk_user_modif'] = $user->id;

-		}

+		if (array_key_exists('date_modification', $fieldvalues) && empty($fieldvalues['date_modification'])) $fieldvalues['date_modification'] = $this->db->idate($now);

+		if (array_key_exists('fk_user_modif', $fieldvalues) && !($fieldvalues['fk_user_modif'] > 0)) $fieldvalues['fk_user_modif'] = $user->id;

@@ -9985,5 +8207,2 @@
-		if (array_key_exists('ref', $fieldvalues)) {

-			$fieldvalues['ref'] = dol_string_nospecial($fieldvalues['ref']); // If field is a ref, we sanitize data

-		}

-

-		// Add quotes and escape on fields with type string

+		if (array_key_exists('ref', $fieldvalues)) $fieldvalues['ref'] = dol_string_nospecial($fieldvalues['ref']); // If field is a ref, we sanitize data

+

@@ -10000,8 +8219,5 @@
-		// Clean and check mandatory fields

-		foreach ($keys as $key) {

-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') {

-				$values[$key] = ''; // This is an implicit foreign key field

-			}

-			if (!empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') {

-				$values[$key] = ''; // This is an explicit foreign key field

-			}

+		// Clean and check mandatory

+		foreach ($keys as $key)

+		{

+			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key] = ''; // This is an implicit foreign key field

+			if (!empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key] = ''; // This is an explicit foreign key field

@@ -10018 +8234 @@
-		$sql = 'UPDATE '.$this->db->prefix().$this->table_element.' SET '.implode(', ', $tmp).' WHERE rowid='.((int) $this->id);

+		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET '.implode(',', $tmp).' WHERE rowid='.$this->id;

@@ -10021,2 +8237,2 @@
-

-		if (!$error) {

+		if (!$error)

+		{

@@ -10024 +8240,2 @@
-			if (!$res) {

+			if ($res === false)

+			{

@@ -10031,3 +8248,5 @@
-		if (!$error) {

-			$result = $this->insertExtraFields();	// This delete and reinsert extrafields

-			if ($result < 0) {

+		if (!$error)

+		{

+			$result = $this->insertExtraFields();

+			if ($result < 0)

+			{

@@ -10039 +8258,2 @@
-		if (!$error && !$notrigger) {

+		if (!$error && !$notrigger)

+		{

@@ -10042,3 +8262 @@
-			if ($result < 0) {

-				$error++;

-			} //Do also here what you must do to rollback action if trigger fail

+			if ($result < 0) { $error++; } //Do also here what you must do to rollback action if trigger fail

@@ -10064 +8282 @@
-	 * @return 	int             				Return integer <0 if KO, 0=Nothing done because object has child, >0 if OK

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

@@ -10074,3 +8292,5 @@
-		if ($forcechilddeletion) {	// Force also delete of childtables that should lock deletion in standard case when option force is off

-			foreach ($this->childtables as $table) {

-				$sql = "DELETE FROM ".$this->db->prefix().$table." WHERE ".$this->fk_element." = ".((int) $this->id);

+		if ($forcechilddeletion)	// Force also delete of childtables that should lock deletion in standard case when option force is off

+		{

+			foreach ($this->childtables as $table)

+			{

+				$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$table.' WHERE '.$this->fk_element.' = '.$this->id;

@@ -10078 +8298,2 @@
-				if (!$resql) {

+				if (!$resql)

+				{

@@ -10085 +8306,3 @@
-		} elseif (!empty($this->childtables)) {	// If object has childs linked with a foreign key field, we check all child tables.

+		}

+		elseif (!empty($this->fk_element) && !empty($this->childtables))	// If object has childs linked with a foreign key field, we check all child tables.

+		{

@@ -10087 +8310,2 @@
-			if (!empty($objectisused)) {

+			if (!empty($objectisused))

+			{

@@ -10098,15 +8322,12 @@
-			foreach ($this->childtablesoncascade as $table) {

-				$deleteFromObject = explode(':', $table);

-				if (count($deleteFromObject) >= 2) {

-					$className = str_replace('@', '', $deleteFromObject[0]);

-					$filePath = $deleteFromObject[1];

-					$columnName = $deleteFromObject[2];

-					$TMoreSQL = array();

-					if (!empty($deleteFromObject[3])) {

-						$TMoreSQL['customsql'] = $deleteFromObject[3];

-					}

-					if (dol_include_once($filePath)) {

-						$childObject = new $className($this->db);

-						if (method_exists($childObject, 'deleteByParentField')) {

-							$result = $childObject->deleteByParentField($this->id, $columnName, $TMoreSQL);

-							if ($result < 0) {

+            foreach ($this->childtablesoncascade as $table)

+            {

+	            $deleteFromObject = explode(':', $table);

+	            if (count($deleteFromObject)>=2) {

+		            $className = str_replace('@', '', $deleteFromObject[0]);

+		            $filePath = $deleteFromObject[1];

+		            $columnName = $deleteFromObject[2];

+		            if (dol_include_once($filePath)) {

+			            $childObject = new $className($this->db);

+			            if (method_exists($childObject, 'deleteByParentField')) {

+				            $result = $childObject->deleteByParentField($this->id, $columnName);

+				            if ($result < 0) {

@@ -10114,4 +8335,4 @@
-								$this->errors[] = $childObject->error;

-								break;

-							}

-						} else {

+					            $this->errors[] = $childObject->error;

+					            break;

+				            }

+			            } else {

@@ -10122 +8343,11 @@
-					} else {

+		            } else {

+			            $error++;

+						$this->errors[] = 'Cannot include child class file ' .$filePath;

+			            break;

+		            }

+	            } else {

+	            	// Delete record in child table

+	            	$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $table . ' WHERE ' . $this->fk_element . ' = ' . $this->id;

+

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

+		            if (!$resql) {

@@ -10124 +8355,2 @@
-						$this->errors[] = 'Cannot include child class file '.$filePath;

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

+			            $this->errors[] = $this->error;

@@ -10126,15 +8358,4 @@
-					}

-				} else {

-					// Delete record in child table

-					$sql = "DELETE FROM ".$this->db->prefix().$table." WHERE ".$this->fk_element." = ".((int) $this->id);

-

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

-					if (!$resql) {

-						$error++;

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

-						$this->errors[] = $this->error;

-						break;

-					}

-				}

-			}

-		}

+		            }

+	            }

+            }

+        }

@@ -10146,3 +8367 @@
-				if ($result < 0) {

-					$error++;

-				} // Do also here what you must do to rollback action if trigger fail

+				if ($result < 0) { $error++; } // Do also here what you must do to rollback action if trigger fail

@@ -10153,15 +8372,2 @@
-		// Delete llx_ecm_files

-		if (!$error) {

-			$res = $this->deleteEcmFiles(1); // Deleting files physically is done later with the dol_delete_dir_recursive

-			if (!$res) {

-				$error++;

-			}

-		}

-

-		// Delete linked object

-		$res = $this->deleteObjectLinked();

-		if ($res < 0) {

-			$error++;

-		}

-

-		if (!$error && !empty($this->isextrafieldmanaged)) {

+		if (!$error && !empty($this->isextrafieldmanaged))

+		{

@@ -10169,10 +8375,9 @@
-			if ($result < 0) {

-				$error++;

-			}

-		}

-

-		if (!$error) {

-			$sql = 'DELETE FROM '.$this->db->prefix().$this->table_element.' WHERE rowid='.((int) $this->id);

-

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

-			if (!$resql) {

+			if ($result < 0) { $error++; }

+		}

+

+		if (!$error)

+		{

+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE rowid='.$this->id;

+

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

+			if ($res === false) {

@@ -10199,3 +8404 @@
-	 * @param 		array 	$filter		an array filter

-	 * @param		string	$filtermode	AND or OR

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

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

@@ -10204 +8407 @@
-	public function deleteByParentField($parentId = 0, $parentField = '', $filter = array(), $filtermode = "AND")

+	public function deleteByParentField($parentId = 0, $parentField = '')

@@ -10214,19 +8417,2 @@
-			$sql = "SELECT rowid FROM ".$this->db->prefix().$this->table_element;

-			$sql .= " WHERE ".$parentField." = ".(int) $parentId;

-

-			// Manage filters

-			$sqlwhere = array();

-			if (count($filter) > 0) {

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

-					if ($key == 'customsql') {

-						$sqlwhere[] = $value;

-					} elseif (strpos($value, '%') === false) {

-						$sqlwhere[] = $key." IN (".$this->db->sanitize($this->db->escape($value)).")";

-					} else {

-						$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";

-					}

-				}

-			}

-			if (count($sqlwhere) > 0) {

-				$sql .= " AND (".implode(" ".$filtermode." ", $sqlwhere).")";

-			}

+			$sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . $this->table_element;

+			$sql .= ' WHERE '.$parentField.' = ' . (int) $parentId;

@@ -10240 +8426 @@
-					$result = $this->fetch($obj->rowid);	// @phpstan-ignore-line

+					$result = $this->fetch($obj->rowid);

@@ -10245 +8431,5 @@
-						$result = $this->delete($user);	// @phpstan-ignore-line

+						if (get_class($this) == 'Contact') { // TODO special code because delete() for contact has not been standardized like other delete.

+							$result = $this->delete();

+						} else {

+							$result = $this->delete($user);

+						}

@@ -10286,2 +8475,0 @@
-		$this->db->begin();

-

@@ -10290 +8478,13 @@
-		if ($result < 0) {

+		if ($result < 0) return -1;

+		// End call triggers

+

+		$this->db->begin();

+

+		$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element_line;

+		$sql .= " WHERE rowid=".$idline;

+

+		dol_syslog(get_class($this)."::deleteLineCommon", LOG_DEBUG);

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

+		if (!$resql)

+		{

+			$this->error = "Error ".$this->db->lasterror();

@@ -10292,12 +8491,0 @@
-		}

-		// End call triggers

-

-		if (empty($error)) {

-			$sql = "DELETE FROM ".$this->db->prefix().$this->table_element_line;

-			$sql .= " WHERE rowid = ".((int) $idline);

-

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

-			if (!$resql) {

-				$this->error = "Error ".$this->db->lasterror();

-				$error++;

-			}

@@ -10308,2 +8496,3 @@
-			$tmpobjectline = new $tmpforobjectlineclass($this->db);

-			if (!isset($tmpobjectline->isextrafieldmanaged) || !empty($tmpobjectline->isextrafieldmanaged)) {

+			if (!$error)

+			{

+				$tmpobjectline = new $tmpforobjectlineclass($this->db);

@@ -10312 +8501,2 @@
-				if ($result < 0) {

+				if ($result < 0)

+				{

@@ -10337 +8527 @@
-	 *	@return	int						Return integer <0 if KO, >0 if OK

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

@@ -10345,11 +8535,8 @@
-		$statusfield = 'status';

-		if (in_array($this->element, array('don', 'donation', 'shipping'))) {

-			$statusfield = 'fk_statut';

-		}

-

-		$sql = "UPDATE ".$this->db->prefix().$this->table_element;

-		$sql .= " SET ".$statusfield." = ".((int) $status);

-		$sql .= " WHERE rowid = ".((int) $this->id);

-

-		if ($this->db->query($sql)) {

-			if (!$error) {

+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;

+		$sql .= " SET status = ".$status;

+		$sql .= " WHERE rowid = ".$this->id;

+

+		if ($this->db->query($sql))

+		{

+			if (!$error)

+			{

@@ -10362,3 +8549 @@
-				if ($result < 0) {

-					$error++;

-				}

+				if ($result < 0) $error++;

@@ -10375 +8560,3 @@
-		} else {

+		}

+		else

+		{

@@ -10387 +8574 @@
-	 * @return int

+	 * @return void

@@ -10391 +8578 @@
-		global $user;

+	    global $user;

@@ -10394,35 +8581,9 @@
-		$this->specimen = 1;

-		$fields = array(

-			'label' => 'This is label',

-			'ref' => 'ABCD1234',

-			'description' => 'This is a description',

-			'qty' => 123.12,

-			'note_public' => 'Public note',

-			'note_private' => 'Private note',

-			'date_creation' => (dol_now() - 3600 * 48),

-			'date_modification' => (dol_now() - 3600 * 24),

-			'fk_user_creat' => $user->id,

-			'fk_user_modif' => $user->id,

-			'date' => dol_now(),

-		);

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

-			if (array_key_exists($key, $this->fields)) {

-				$this->{$key} = $value;		// @phpstan-ignore-line

-			}

-		}

-

-		// Force values to default values when known

-		if (property_exists($this, 'fields')) {

-			foreach ($this->fields as $key => $value) {

-				// If fields are already set, do nothing

-				if (array_key_exists($key, $fields)) {

-					continue;

-				}

-

-				if (!empty($value['default'])) {

-					$this->$key = $value['default'];

-				}

-			}

-		}

-

-		return 1;

+		if (array_key_exists('label', $this->fields)) $this->label = 'This is label';

+		if (array_key_exists('note_public', $this->fields)) $this->note_public = 'Public note';

+		if (array_key_exists('note_private', $this->fields)) $this->note_private = 'Private note';

+		if (array_key_exists('date_creation', $this->fields)) $this->date_creation = (dol_now() - 3600 * 24);

+		if (array_key_exists('date_modification', $this->fields)) $this->date_modification = (dol_now() - 3600 * 24);

+		if (array_key_exists('fk_user_creat', $this->fields)) $this->fk_user_creat = $user->id;

+		if (array_key_exists('fk_user_modif', $this->fields)) $this->fk_user_modif = $user->id;

+		if (array_key_exists('date', $this->fields)) $this->date = dol_now();

+		// ...

@@ -10453,138 +8614,34 @@
-	/**

-	 * Return nb comments already posted

-	 *

-	 * @return int

-	 */

-	public function getNbComments()

-	{

-		return count($this->comments);

-	}

-

-	/**

-	 * Trim object parameters

-	 *

-	 * @param string[] $parameters array of parameters to trim

-	 * @return void

-	 */

-	public function trimParameters($parameters)

-	{

-		if (!is_array($parameters)) {

-			return;

-		}

-		foreach ($parameters as $parameter) {

-			if (isset($this->$parameter)) {

-				$this->$parameter = trim($this->$parameter);

-			}

-		}

-	}

-

-	/* Part for categories/tags */

-

-	/**

-	 * Sets object to given categories.

-	 *

-	 * Deletes object from existing categories not supplied.

-	 * Adds it to non existing supplied categories.

-	 * Existing categories are left untouch.

-	 *

-	 * @param 	string 		$type_categ 	Category type ('customer', 'supplier', 'website_page', ...)

-	 * @return	int							Array of category objects or < 0 if KO

-	 */

-	public function getCategoriesCommon($type_categ)

-	{

-		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';

-

-		// Get current categories

-		$c = new Categorie($this->db);

-		$existing = $c->containing($this->id, $type_categ, 'id');

-

-		return $existing;

-	}

-

-	/**

-	 * Sets object to given categories.

-	 *

-	 * Adds it to non existing supplied categories.

-	 * Deletes object from existing categories not supplied (if remove_existing==true).

-	 * Existing categories are left untouch.

-	 *

-	 * @param 	int[]|int 	$categories 		Category ID or array of Categories IDs

-	 * @param 	string 		$type_categ 		Category type ('customer', 'supplier', 'website_page', ...) definied into const class Categorie type

-	 * @param 	boolean		$remove_existing 	True: Remove existings categories from Object if not supplies by $categories, False: let them

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

-	 */

-	public function setCategoriesCommon($categories, $type_categ = '', $remove_existing = true)

-	{

-		// Handle single category

-		if (!is_array($categories)) {

-			$categories = array($categories);

-		}

-

-		dol_syslog(get_class($this)."::setCategoriesCommon Oject Id:".$this->id.' type_categ:'.$type_categ.' nb tag add:'.count($categories), LOG_DEBUG);

-

-		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';

-

-		if (empty($type_categ)) {

-			dol_syslog(__METHOD__.': Type '.$type_categ.'is an unknown category type. Done nothing.', LOG_ERR);

-			return -1;

-		}

-

-		// Get current categories

-		$c = new Categorie($this->db);

-		$existing = $c->containing($this->id, $type_categ, 'id');

-		if ($remove_existing) {

-			// Diff

-			if (is_array($existing)) {

-				$to_del = array_diff($existing, $categories);

-				$to_add = array_diff($categories, $existing);

-			} else {

-				$to_del = array(); // Nothing to delete

-				$to_add = $categories;

-			}

-		} else {

-			$to_del = array(); // Nothing to delete

-			$to_add = array_diff($categories, $existing);

-		}

-

-		$error = 0;

-		$ok = 0;

-

-		// Process

-		foreach ($to_del as $del) {

-			if ($c->fetch($del) > 0) {

-				$result=$c->del_type($this, $type_categ);

-				if ($result < 0) {

-					$error++;

-					$this->error = $c->error;

-					$this->errors = $c->errors;

-					break;

-				} else {

-					$ok += $result;

-				}

-			}

-		}

-		foreach ($to_add as $add) {

-			if ($c->fetch($add) > 0) {

-				$result = $c->add_type($this, $type_categ);

-				if ($result < 0) {

-					$error++;

-					$this->error = $c->error;

-					$this->errors = $c->errors;

-					break;

-				} else {

-					$ok += $result;

-				}

-			}

-		}

-

-		return $error ? (-1 * $error) : $ok;

-	}

-

-	/**

-	 * Copy related categories to another object

-	 *

-	 * @param  int		$fromId	Id object source

-	 * @param  int		$toId	Id object cible

-	 * @param  string	$type	Type of category ('product', ...)

-	 * @return int      Return integer < 0 if error, > 0 if ok

-	 */

+    /**

+     * Return nb comments already posted

+     *

+     * @return int

+     */

+    public function getNbComments()

+    {

+        return count($this->comments);

+    }

+

+    /**

+     * Trim object parameters

+     * @param string[] $parameters array of parameters to trim

+     *

+     * @return void

+     */

+    public function trimParameters($parameters)

+    {

+        if (!is_array($parameters)) return;

+        foreach ($parameters as $parameter) {

+            if (isset($this->$parameter)) {

+                $this->$parameter = trim($this->$parameter);

+            }

+        }

+    }

+

+    /**

+     *  copy related categories to another object

+     *

+     * @param  int		$fromId	Id object source

+     * @param  int		$toId	Id object cible

+     * @param  string	$type	Type of category ('product', ...)

+     * @return int      < 0 si erreur, > 0 si ok

+     */

@@ -10595,3 +8652 @@
-		if (empty($type)) {

-			$type = $this->table_element;

-		}

+		if (empty($type)) $type = $this->table_element;

@@ -10602,5 +8657,6 @@
-		$sql = "INSERT INTO ".$this->db->prefix()."categorie_".(empty($categorystatic->MAP_CAT_TABLE[$type]) ? $type : $categorystatic->MAP_CAT_TABLE[$type])." (fk_categorie, fk_product)";

-		$sql .= " SELECT fk_categorie, $toId FROM ".$this->db->prefix()."categorie_".(empty($categorystatic->MAP_CAT_TABLE[$type]) ? $type : $categorystatic->MAP_CAT_TABLE[$type]);

-		$sql .= " WHERE fk_product = ".((int) $fromId);

-

-		if (!$this->db->query($sql)) {

+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_".(empty($categorystatic->MAP_CAT_TABLE[$type]) ? $type : $categorystatic->MAP_CAT_TABLE[$type])." (fk_categorie, fk_product)";

+		$sql .= " SELECT fk_categorie, $toId FROM ".MAIN_DB_PREFIX."categorie_".(empty($categorystatic->MAP_CAT_TABLE[$type]) ? $type : $categorystatic->MAP_CAT_TABLE[$type]);

+		$sql .= " WHERE fk_product = '".$fromId."'";

+

+		if (!$this->db->query($sql))

+		{

@@ -10615,94 +8670,0 @@
-

-	/**

-	 * Delete related files of object in database

-	 *

-	 * @param	integer		$mode		0=Use path to find record, 1=Use src_object_xxx fields (Mode 1 is recommanded for new objects)

-	 * @return 	bool					True if OK, False if KO

-	 */

-	public function deleteEcmFiles($mode = 0)

-	{

-		global $conf;

-

-		$this->db->begin();

-

-		// Delete in database with mode 0

-		if ($mode == 0) {

-			switch ($this->element) {

-				case 'propal':

-					$element = 'propale';

-					break;

-				case 'product':

-					$element = 'produit';

-					break;

-				case 'order_supplier':

-					$element = 'fournisseur/commande';

-					break;

-				case 'invoice_supplier':

-					// Special cases that need to use get_exdir to get real dir of object

-					// In future, all object should use this to define path of documents.

-					$element = 'fournisseur/facture/'.get_exdir($this->id, 2, 0, 1, $this, 'invoice_supplier');

-					break;

-				case 'shipping':

-					$element = 'expedition/sending';

-					break;

-				case 'task':

-				case 'project_task':

-					require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';

-

-					$project_result = $this->fetch_projet();

-					if ($project_result >= 0) {

-						$element = 'projet/'.dol_sanitizeFileName($this->project->ref).'/';

-					}

-					// no break

-				default:

-					$element = $this->element;

-			}

-

-			// Delete ecm_files_extrafields with mode 0 (using name)

-			$sql = "DELETE FROM ".$this->db->prefix()."ecm_files_extrafields WHERE fk_object IN (";

-			$sql .= " SELECT rowid FROM ".$this->db->prefix()."ecm_files WHERE filename LIKE '".$this->db->escape($this->ref)."%'";

-			$sql .= " AND filepath = '".$this->db->escape($element)."/".$this->db->escape($this->ref)."' AND entity = ".((int) $conf->entity); // No need of getEntity here

-			$sql .= ")";

-

-			if (!$this->db->query($sql)) {

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

-				$this->db->rollback();

-				return false;

-			}

-

-			// Delete ecm_files with mode 0 (using name)

-			$sql = "DELETE FROM ".$this->db->prefix()."ecm_files";

-			$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%'";

-			$sql .= " AND filepath = '".$this->db->escape($element)."/".$this->db->escape($this->ref)."' AND entity = ".((int) $conf->entity); // No need of getEntity here

-

-			if (!$this->db->query($sql)) {

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

-				$this->db->rollback();

-				return false;

-			}

-		}

-

-		// Delete in database with mode 1

-		if ($mode == 1) {

-			$sql = 'DELETE FROM '.$this->db->prefix()."ecm_files_extrafields";

-			$sql .= " WHERE fk_object IN (SELECT rowid FROM ".$this->db->prefix()."ecm_files WHERE src_object_type = '".$this->db->escape($this->table_element.(empty($this->module) ? "" : "@".$this->module))."' AND src_object_id = ".((int) $this->id).")";

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

-			if (!$resql) {

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

-				$this->db->rollback();

-				return false;

-			}

-

-			$sql = 'DELETE FROM '.$this->db->prefix()."ecm_files";

-			$sql .= " WHERE src_object_type = '".$this->db->escape($this->table_element.(empty($this->module) ? "" : "@".$this->module))."' AND src_object_id = ".((int) $this->id);

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

-			if (!$resql) {

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

-				$this->db->rollback();

-				return false;

-			}

-		}

-

-		$this->db->commit();

-		return true;

-	}

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_commonobjectline.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_commonobjectline.class.php
@@ -22 +22 @@
- *  \brief      File of the superclass of classes of lines of business objects (invoice, contract, proposal, orders, etc. ...)

+ *  \brief      File of the superclass of classes of lines of business objects (invoice, contract, PROPAL, commands, etc. ...)

@@ -29,2 +28,0 @@
- *

- *  TODO For the moment we use the extends on CommonObject until PHP min is 5.4 so we can use Traits.

@@ -49,5 +46,0 @@
-	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png

-	 */

-	public $picto = 'line';

-

-	/**

@@ -59,22 +51,0 @@
-	public $date_debut_prevue;

-	public $date_debut_reel;

-	public $date_fin_prevue;

-	public $date_fin_reel;

-

-	public $weight;

-	public $weight_units;

-	public $width;

-	public $width_units;

-	public $height;

-	public $height_units;

-	public $length;

-	public $length_units;

-	public $surface;

-	public $surface_units;

-	public $volume;

-	public $volume_units;

-

-	public $multilangs;

-

-	public $product_type;		// type in line

-	public $fk_product;			// product id in line (when line is linked to a product)

@@ -83,71 +54 @@
-	 * Description of the line

-	 * @var string

-	 */

-	public $desc;

-

-	/**

-	 * Description of the line

-	 * @var string

-	 * @deprecated

-	 * @see $desc

-	 */

-	public $description;

-

-	public $product;			// To store full product object after a fetch_product() on a line

-	public $product_ref;		// ref in product table

-	public $product_label;		// label in product table

-	public $product_barcode;	// barcode in product table

-	public $product_desc;		// desc in product table

-	public $fk_product_type;	// type in product table

-

-	public $qty;

-	public $duree;

-	public $remise_percent;

-	public $info_bits;

-	public $special_code;

-	public $subprice;

-	public $tva_tx;

-

-	/**

-	 * @var int multicurrency id

-	 */

-	public $fk_multicurrency;

-

-	/**

-	 * @var string Multicurrency code

-	 */

-	public $multicurrency_code;

-

-	/**

-	 * @var float Multicurrency subprice

-	 */

-	public $multicurrency_subprice;

-

-	/**

-	 * @var float Multicurrency total without tax

-	 */

-	public $multicurrency_total_ht;

-

-	/**

-	 * @var float Multicurrency total vat

-	 */

-	public $multicurrency_total_tva;

-

-	/**

-	 * @var float Multicurrency total with tax

-	 */

-	public $multicurrency_total_ttc;

-

-

-	/**

-	 *	Constructor

-	 *

-	 *  @param		DoliDB		$db      Database handler

-	 */

-	public function __construct($db)

-	{

-		$this->db = $db;

-	}

-

-	/**

-	 *	Returns the label, short_label or code found in units dictionary from ->fk_unit.

+	 *	Returns the translation key from units dictionary.

@@ -156,2 +57,2 @@
-	 * 	@param	string $type 	Label type ('long', 'short' or 'code'). This can be a translation key.

-	 *	@return	string|int 		Return integer <0 if KO, label if OK (Example: 'long', 'short' or 'unitCODE')

+	 * 	@param	string $type 	Label type (long or short). This can be a translation key.

+	 *	@return	string|int 		<0 if ko, label if ok

@@ -163 +64 @@
-		if (empty($this->fk_unit)) {

+		if (!$this->fk_unit) {

@@ -171,2 +72,2 @@
-		$label_type = 'label';

-		if ($type == 'short') {

+		if ($type == 'short')

+		{

@@ -174,2 +74,0 @@
-		} elseif ($type == 'code') {

-			$label_type = 'code';

@@ -178,2 +77 @@
-		$sql = "SELECT ".$label_type.", code from ".$this->db->prefix()."c_units where rowid = ".((int) $this->fk_unit);

-

+		$sql = 'select '.$label_type.' from '.MAIN_DB_PREFIX.'c_units where rowid='.$this->fk_unit;

@@ -181 +79,2 @@
-		if ($resql && $this->db->num_rows($resql) > 0) {

+		if ($resql && $this->db->num_rows($resql) > 0)

+		{

@@ -183,5 +82 @@
-			if ($label_type == 'code') {

-				$label = 'unit'.$res['code'];

-			} else {

-				$label = $res[$label_type];

-			}

+			$label = $res[$label_type];

@@ -190,2 +85,4 @@
-		} else {

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

+		}

+		else

+		{

+			$this->error = $this->db->error().' sql='.$sql;

@@ -195,0 +93 @@
+	// Currently we need function at end of file CommonObject for all object lines. Should find a way to avoid duplicate code.

@@ -197,15 +95 @@
-	/**

-	 * Empty function to prevent errors on call of this function must be overload if usefull

-	 *

-	 * @param string $sortorder Sort Order

-	 * @param string $sortfield Sort field

-	 * @param int $limit offset limit

-	 * @param int $offset offset limit

-	 * @param array $filter filter array

-	 * @param string $filtermode filter mode (AND or OR)

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

-	 */

-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')

-	{

-		return 0;

-	}

+	// For the moment we use the extends on CommonObject until PHP min is 5.4 so use Traits.

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_commonorder.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_commonorder.class.php
@@ -26 +25,0 @@
-require_once DOL_DOCUMENT_ROOT.'/core/class/commonincoterm.class.php';

@@ -33 +31,0 @@
-	use CommonIncoterm;

@@ -35,65 +32,0 @@
-

-	/**

-	 *	Return clicable link of object (with eventually picto)

-	 *

-	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)

-	 *  @param		array		$arraydata				Array of data

-	 *  @return		string								HTML Code for Kanban thumb.

-	 */

-	public function getKanbanView($option = '', $arraydata = null)

-	{

-		global $langs, $conf;

-

-		$selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']);

-

-		$return = '<div class="box-flex-item box-flex-grow-zero">';

-		$return .= '<div class="info-box info-box-sm">';

-		$return .= '<div class="info-box-icon bg-infobox-action">';

-		$return .= img_picto('', 'order');

-		$return .= '</div>';

-		$return .= '<div class="info-box-content">';

-		$return .= '<span class="info-box-ref inline-block tdoverflowmax150 valignmiddle">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).'</span>';

-		if ($selected >= 0) {

-			$return .= '<input id="cb'.$this->id.'" class="flat checkforselect fright" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';

-		}

-		if (property_exists($this, 'thirdparty') && is_object($this->thirdparty)) {

-			$return .= '<br><div class="info-box-ref tdoverflowmax150">'.$this->thirdparty->getNomUrl(1).'</div>';

-		}

-		if (property_exists($this, 'total_ht')) {

-			$return .= '<div class="info-box-ref amount">'.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency).' '.$langs->trans('HT').'</div>';

-		}

-		if (method_exists($this, 'getLibStatut')) {

-			$return .= '<div class="info-box-status">'.$this->getLibStatut(3).'</div>';

-		}

-		$return .= '</div>';

-		$return .= '</div>';

-		$return .= '</div>';

-		return $return;

-	}

-

-	/** return nb of fines of order where products or services that can be buyed

-	 *

-	 * @param	boolean		$ignoreFree		Ignore free lines

-	 * @return	int							number of products or services on buy in a command

-	 */

-	public function getNbLinesProductOrServiceOnBuy($ignoreFree = false)

-	{

-		require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';

-		$product = new Product($this->db);

-		$return = 0;

-		foreach ($this->lines as $line) {

-			if (empty($line->fk_product) && !$ignoreFree) {

-				$return ++;

-			} elseif ((int) $line->fk_product > 0) {

-				if ($product->fetch($line->fk_product) > 0) {

-					if ($product->status_buy) $return ++;

-				}

-			}

-		}

-		return $return;

-	}

-

-	/**

-	 * @var string code

-	 */

-	public $code = "";

@@ -108,6 +40,0 @@
-	 * Custom label of line. Not used by default.

-	 * @deprecated

-	 */

-	public $label;

-

-	/**

@@ -119,0 +47,6 @@
+

+	/**

+	 * Product ref

+	 * @var string

+	 */

+	public $product_ref;

@@ -130,6 +62,0 @@
-	 * Product ref

-	 * @var string

-	 */

-	public $product_ref;

-

-	/**

@@ -142,12 +68,0 @@
-	 * Boolean that indicates whether the product is available for sale '1' or not '0'

-	 * @var int

-	 */

-	public $product_tosell=0;

-

-	/**

-	 * Boolean that indicates whether the product is available for purchase '1' or not '0'

-	 * @var int

-	 */

-	public $product_tobuy=0;

-

-	/**

@@ -158,12 +72,0 @@
-

-	/**

-	 * Product use lot

-	 * @var string

-	 */

-	public $product_tobatch;

-

-	/**

-	 * Product barcode

-	 * @var string

-	 */

-	public $product_barcode;

@@ -182 +85 @@
-	public $price;

+    public $price;

@@ -196,0 +100,6 @@
+	 * Description of the line

+	 * @var string

+	 */

+	public $desc;

+

+	/**

@@ -207,6 +115,0 @@
-

-	/**

-	 * VAT code

-	 * @var string

-	 */

-	public $vat_src_code;

@@ -244,7 +146,0 @@
-

-	public $fk_multicurrency;

-	public $multicurrency_code;

-	public $multicurrency_subprice;

-	public $multicurrency_total_ht;

-	public $multicurrency_total_tva;

-	public $multicurrency_total_ttc;

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_commonstickergenerator.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_commonstickergenerator.class.php
@@ -57 +56,0 @@
-require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';

@@ -63 +62 @@
-abstract class CommonStickerGenerator extends CommonDocGenerator

+abstract class CommonStickerGenerator

@@ -65,48 +64,40 @@
-	/**

-	 * @var DoliDB Database handler.

-	 */

-	public $db;

-

-	public $code; // Code of format

-

-	// phpcs:disable PEAR.NamingConventions.ValidVariableName.PublicUnderscore

-	// protected

-	// Name of stick

-	protected $_Avery_Name = '';

-	// Code of stick

-	protected $_Avery_Code = '';

-	// Marge de gauche de l'etiquette

-	protected $_Margin_Left = 0;

-	// marge en haut de la page avant la premiere etiquette

-	protected $_Margin_Top = 0;

-	// Espace horizontal entre 2 bandes d'etiquettes

-	protected $_X_Space = 0;

-	// Espace vertical entre 2 bandes d'etiquettes

-	protected $_Y_Space = 0;

-	// NX Nombre d'etiquettes sur la largeur de la page

-	protected $_X_Number = 0;

-	// NY Nombre d'etiquettes sur la hauteur de la page

-	protected $_Y_Number = 0;

-	// Largeur de chaque etiquette

-	protected $_Width = 0;

-	// Hauteur de chaque etiquette

-	protected $_Height = 0;

-	// Hauteur des caracteres

-	protected $_Char_Size = 10;

-	// Hauteur par defaut d'une ligne

-	protected $_Line_Height = 10;

-	// Type of metric.. Will help to calculate good values

-	protected $_Metric = 'mm';

-	// Type of metric for the doc..

-	protected $_Metric_Doc = 'mm';

-	protected $_COUNTX = 1;

-	protected $_COUNTY = 1;

-	protected $_First = 1;

-	public $Tformat;

-

-	/**

-	 * @var array

-	 */

-	public $_Avery_Labels;

-	// phpcs:enable

-

+    public $code; // Code of format

+

+    /**

+     * @var array format Array with informations

+     */

+    public $format;

+

+    // phpcs:disable PEAR.NamingConventions.ValidVariableName.PublicUnderscore

+    // protected

+    // Nom du format de l'etiquette

+    protected $_Avery_Name = '';

+    // Marge de gauche de l'etiquette

+    protected $_Margin_Left = 0;

+    // marge en haut de la page avant la premiere etiquette

+    protected $_Margin_Top = 0;

+    // Espace horizontal entre 2 bandes d'etiquettes

+    protected $_X_Space = 0;

+    // Espace vertical entre 2 bandes d'etiquettes

+    protected $_Y_Space = 0;

+    // NX Nombre d'etiquettes sur la largeur de la page

+    protected $_X_Number = 0;

+    // NY Nombre d'etiquettes sur la hauteur de la page

+    protected $_Y_Number = 0;

+    // Largeur de chaque etiquette

+    protected $_Width = 0;

+    // Hauteur de chaque etiquette

+    protected $_Height = 0;

+    // Hauteur des caracteres

+    protected $_Char_Size = 10;

+    // Hauteur par defaut d'une ligne

+    protected $_Line_Height = 10;

+    // Type of metric.. Will help to calculate good values

+    protected $_Metric = 'mm';

+    // Type of metric for the doc..

+    protected $_Metric_Doc = 'mm';

+    protected $_COUNTX = 1;

+    protected $_COUNTY = 1;

+    protected $_First = 1;

+    public $Tformat;

+    // phpcs:enable

@@ -123 +114 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -133,2 +124,2 @@
-	abstract public function write_file($arrayofrecords, $outputlangs, $srctemplatepath, $outputdir = '');

-	// phpcs:enable

+	public abstract function write_file($arrayofrecords, $outputlangs, $srctemplatepath, $outputdir = '');

+    // phpcs:enable

@@ -139 +130 @@
-	 * @param   TCPDF         $pdf            PDF reference

+	 * @param   PDF         $pdf            PDF reference

@@ -144,3 +135,3 @@
-	abstract public function addSticker(&$pdf, $outputlangs, $param);

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+	public abstract function addSticker(&$pdf, $outputlangs, $param);

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -151 +142 @@
-	 * @param    TCPDF        $pdf   PDF reference

+	 * @param    PDF        $pdf   PDF reference

@@ -157 +148 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -165,2 +156,2 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -170 +161 @@
-	 * @param	TCPDF   $pdf                PDF reference

+	 * @param	PDF     $pdf                PDF reference

@@ -179,3 +170,3 @@
-	protected function _Pointille(&$pdf, $x1 = 0, $y1 = 0, $x2 = 210, $y2 = 297, $epaisseur = 1, $nbPointilles = 15)

-	{

-		// phpcs:enable

+    protected function _Pointille(&$pdf, $x1 = 0, $y1 = 0, $x2 = 210, $y2 = 297, $epaisseur = 1, $nbPointilles = 15)

+    {

+        // phpcs:enable

@@ -187 +178,2 @@
-		} else {

+		}

+		else {

@@ -193,2 +185,2 @@
-					$pdf->Line($j, $y1, $j + 1, $y1); // on trace le pointill? du haut, point par point

-					$pdf->Line($j, $y2, $j + 1, $y2); // on trace le pointill? du bas, point par point

+		            $pdf->Line($j, $y1, $j + 1, $y1); // on trace le pointill? du haut, point par point

+		            $pdf->Line($j, $y2, $j + 1, $y2); // on trace le pointill? du bas, point par point

@@ -201,2 +193,2 @@
-					$pdf->Line($x1, $j, $x1, $j + 1); // on trace le pointill? du haut, point par point

-					$pdf->Line($x2, $j, $x2, $j + 1); // on trace le pointill? du bas, point par point

+		            $pdf->Line($x1, $j, $x1, $j + 1); // on trace le pointill? du haut, point par point

+		            $pdf->Line($x2, $j, $x2, $j + 1); // on trace le pointill? du bas, point par point

@@ -208,2 +200,2 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore

@@ -213 +205 @@
-	 * @param TCPDF $pdf                PDF reference

+	 * @param PDF   $pdf                PDF reference

@@ -224 +216 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -267,2 +259,2 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore

@@ -277 +269 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -287,2 +279,2 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore

@@ -292 +284 @@
-	 * @param    TCPDF     $pdf     PDF reference

+	 * @param    PDF       $pdf     PDF reference

@@ -298 +290 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -301 +293 @@
-		$this->_Avery_Code = empty($format['code']) ? '' : $format['code'];

+		$this->_Avery_Code = $format['code'];

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_conf.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_conf.class.php
@@ -28,0 +29 @@
+

@@ -32 +33 @@
-class Conf extends stdClass

+class Conf

@@ -34,32 +35,19 @@
-	/**

-	 * @var Object 	Associative array with properties found in conf file

-	 */

-	public $file;

-

-	/**

-	 * @var Object 	Associative array with some properties ->type, ->db, ...

-	 */

-	public $db;

-

-	//! To store properties found into database

-	public $global;

-	//! To store browser info (->name, ->os, ->version, ->ua, ->layout, ...)

-	public $browser;

-

-	//! To store some setup of generic modules

-	public $mycompany;

-	public $admin;

-	public $medias;

-	//! To store properties of multi-company

-	public $multicompany;

-

-	//! To store module status of special module names

-	public $expedition_bon;

-	public $delivery_note;

-

-

-	//! To store if javascript/ajax is enabked

-	public $use_javascript_ajax;

-	//! To store if javascript/ajax is enabked

-	public $disable_compute;

-	//! Used to store current currency (ISO code like 'USD', 'EUR', ...). To get the currency symbol: $langs->getCurrencySymbol($this->currency)

+    /** \public */

+    //! To store properties found in conf file

+    public $file;

+

+    /**

+     * @var Object 	Associative array with some properties ->type, ->db, ...

+     */

+    public $db;

+

+    //! To store properties found into database

+    public $global;

+    //! To store browser info

+    public $browser;

+

+    //! To store if javascript/ajax is enabked

+    public $use_javascript_ajax;

+    //! To store if javascript/ajax is enabked

+    public $disable_compute;

+	//! Used to store current currency (ISO code like 'USD', 'EUR', ...)

@@ -67 +54,0 @@
-

@@ -71,4 +58 @@
-

-	public $email_from;

-

-	//! Used to store current menu handler

+    //! Used to store current menu handler

@@ -76,22 +60,30 @@
-	// List of activated modules

-	public $modules;

-	public $modules_parts;

-

-	// An array to store cache results ->cache['nameofcache']=...

-	public $cache;

-

-	/**

-	 * @var int To tell header was output

-	 */

-	public $headerdone;

-

-	/**

-	 * @var string[]

-	 */

-	public $logbuffer = array();

-

-	/**

-	 * @var LogHandlerInterface[]

-	 */

-	public $loghandlers = array();

-

+    // List of activated modules

+    public $modules = array();

+    public $modules_parts = array(

+        'css' => array(),

+        'js' => array(),

+        'tabs' => array(),

+        'triggers' => array(),

+        'login' => array(),

+        'substitutions' => array(),

+        'menus' => array(),

+        'theme' => array(),

+        'sms' => array(),

+        'tpl' => array(),

+        'barcode' => array(),

+        'models' => array(),

+        'societe' => array(),

+        'hooks' => array(),

+        'dir' => array(),

+        'syslog' => array(),

+    );

+

+    public $logbuffer = array();

+

+    /**

+     * @var LogHandlerInterface[]

+     */

+    public $loghandlers = array();

+

+    //! To store properties of multi-company

+    public $multicompany;

@@ -107,60 +99 @@
-	public $dol_use_jmobile; // Set if we force param dol_use_jmobile into login url. 0=default, 1=to say we use app from a webview app, 2=to say we use app from a webview app and keep ajax

-

-	public $format_date_short; // Format of day with PHP/C tags (strftime functions)

-	public $format_date_short_java; // Format of day with Java tags

-	public $format_hour_short;

-	public $format_hour_short_duration;

-	public $format_date_text_short;

-	public $format_date_text;

-	public $format_date_hour_short;

-	public $format_date_hour_sec_short;

-	public $format_date_hour_text_short;

-	public $format_date_hour_text;

-

-	public $liste_limit;

-

-	public $tzuserinputkey = 'tzserver';		// Use 'tzuserrel' to always store date in GMT and show date in time zone of user.

-

-

-	// TODO Remove this part.

-	public $fournisseur;

-	public $product;

-	/**

-	 * @deprecated Use product

-	 */

-	public $produit;

-	public $service;

-	/**

-	 * @deprecated Use contract

-	 */

-	public $contrat;

-	public $contract;

-	public $actions;

-	public $agenda;

-	public $commande;

-	public $propal;

-	public $order;

-	/**

-	 * @deprecated Use invoice

-	 */

-	public $facture;

-	public $invoice;

-	public $user;

-	/**

-	 * @deprecated Use member

-	 */

-	public $adherent;

-	public $member;

-	public $bank;

-	public $notification;

-	public $expensereport;

-	public $productbatch;

-	/**

-	 * @deprecated Use project

-	 */

-	public $projet;

-	public $project;

-	public $supplier_proposal;

-	public $supplier_order;

-	public $supplier_invoice;

-	public $category;

+	public $dol_use_jmobile; // Set if we force param dol_use_jmobile into login url

@@ -176,0 +110,9 @@
+		$this->global = new stdClass();

+		$this->mycompany = new stdClass();

+		$this->admin			= new stdClass();

+		$this->user				= new stdClass();

+		$this->syslog			= new stdClass();

+		$this->browser = new stdClass();

+		$this->medias			= new stdClass();

+		$this->multicompany = new stdClass();

+

@@ -180,33 +122 @@
-		// Common objects that are not modules

-		$this->mycompany = new stdClass();

-		$this->admin = new stdClass();

-		$this->medias = new stdClass();

-		$this->global = new stdClass();

-

-		// Common objects that are not modules and set by the main and not into the this->setValues()

-		$this->browser = new stdClass();

-

-		// Common arrays

-		$this->cache = array();

-		$this->modules = array();

-		$this->modules_parts = array(

-			'css' => array(),

-			'js' => array(),

-			'tabs' => array(),

-			'triggers' => array(),

-			'login' => array(),

-			'substitutions' => array(),

-			'menus' => array(),

-			'theme' => array(),

-			'sms' => array(),

-			'tpl' => array(),

-			'barcode' => array(),

-			'models' => array(),

-			'societe' => array(),

-			'member' => array(),

-			'hooks' => array(),

-			'dir' => array(),

-			'syslog' => array()

-		);

-

-		// First level object that are modules.

+		// First level object

@@ -214 +124,2 @@
-		$this->multicompany = new stdClass();

+		$this->expedition_bon = new stdClass();

+		$this->livraison_bon = new stdClass();

@@ -216,5 +127,5 @@
-		$this->product = new stdClass();

-		$this->service = new stdClass();

-		$this->contrat = new stdClass();

-		$this->actions = new stdClass();

-		$this->agenda = new stdClass();

+		$this->product			= new stdClass();

+		$this->service			= new stdClass();

+		$this->contrat			= new stdClass();

+		$this->actions			= new stdClass();

+		$this->agenda			= new stdClass();

@@ -223,3 +134,4 @@
-		$this->facture = new stdClass();

-		$this->user	= new stdClass();

-		$this->adherent = new stdClass();

+		$this->facture			= new stdClass();

+		$this->contrat			= new stdClass();

+		$this->usergroup		= new stdClass();

+		$this->adherent			= new stdClass();

@@ -227,3 +139,4 @@
-		$this->notification = new stdClass();

-		$this->expensereport = new stdClass();

-		$this->productbatch = new stdClass();

+		$this->notification		= new stdClass();

+		$this->mailing = new stdClass();

+		$this->expensereport	= new stdClass();

+		$this->productbatch		= new stdClass();

@@ -232,18 +144,0 @@
-	/**

-	 * Load setup values into conf object (read llx_const) for a specified entity

-	 * Note that this->db->xxx, this->file->xxx and this->multicompany have been already loaded when setEntityValues is called.

-	 *

-	 * @param	DoliDB	$db			Database handler

-	 * @param	int		$entity		Entity to get

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

-	 */

-	public function setEntityValues($db, $entity)

-	{

-		if ($this->entity != $entity) {

-			// If we ask to reload setup for a new entity

-			$this->entity = $entity;

-			return $this->setValues($db);

-		}

-

-		return 0;

-	}

@@ -253 +148 @@
-	 *  Note that this->db->xxx, this->file->xxx have been already set when setValues is called.

+	 *  Note that this->db->xxx, this->file->xxx and this->multicompany have been already loaded when setValues is called.

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

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

@@ -262,83 +157,39 @@
-		// Unset all old modules values

-		if (!empty($this->modules)) {

-			foreach ($this->modules as $m) {

-				if (isset($this->$m)) {

-					unset($this->$m);

-				}

-			}

-		}

-

-		// Common objects that are not modules

-		$this->mycompany = new stdClass();

-		$this->admin = new stdClass();

-		$this->medias = new stdClass();

-		$this->global = new stdClass();

-

-		// Common objects that are not modules and set by the main and not into the this->setValues()

-		//$this->browser = new stdClass();	// This is set by main and not into this setValues(), so we keep it intact.

-

-		// First level object

-		// TODO Remove this part.

-		$this->fournisseur = new stdClass();

-		$this->product = new stdClass();

-		$this->service = new stdClass();

-		$this->contrat = new stdClass();

-		$this->actions = new stdClass();

-		$this->agenda = new stdClass();

-		$this->commande = new stdClass();

-		$this->propal = new stdClass();

-		$this->facture = new stdClass();

-		$this->user	= new stdClass();

-		$this->adherent = new stdClass();

-		$this->bank = new stdClass();

-		$this->notification = new stdClass();

-		$this->expensereport = new stdClass();

-		$this->productbatch = new stdClass();

-

-		// Common arrays

-		$this->cache = array();

-		$this->modules = array();

-		$this->modules_parts = array(

-			'css' => array(),

-			'js' => array(),

-			'tabs' => array(),

-			'triggers' => array(),

-			'login' => array(),

-			'substitutions' => array(),

-			'menus' => array(),

-			'theme' => array(),

-			'sms' => array(),

-			'tpl' => array(),

-			'barcode' => array(),

-			'models' => array(),

-			'societe' => array(),

-			'member' => array(),

-			'hooks' => array(),

-			'dir' => array(),

-			'syslog' => array(),

-		);

-

-		if (!is_null($db) && is_object($db)) {

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

-

-			// Define all global constants into $this->global->key=value

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

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

-			$sql .= " FROM ".$db->prefix()."const";

-			$sql .= " WHERE entity IN (0,".$this->entity.")";

-			$sql .= " ORDER BY entity"; // This is to have entity 0 first, then entity 1 that overwrite.

-

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

-			if ($resql) {

-				$i = 0;

-				$numr = $db->num_rows($resql);

-				while ($i < $numr) {

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

-					$key = $objp->name;

-					$value = $objp->value;

-					if ($key) {

-						// Allow constants values to be overridden by environment variables

-						if (isset($_SERVER['DOLIBARR_'.$key])) {

-							$value = $_SERVER['DOLIBARR_'.$key];

-						} elseif (isset($_ENV['DOLIBARR_'.$key])) {

-							$value = $_ENV['DOLIBARR_'.$key];

+		//Define all global constants into $this->global->key=value

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

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

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

+		$sql .= " WHERE entity IN (0,".$this->entity.")";

+		$sql .= " ORDER BY entity"; // This is to have entity 0 first, then entity 1 that overwrite.

+

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

+		if ($resql)

+		{

+			$i = 0;

+			$numr = $db->num_rows($resql);

+			while ($i < $numr)

+			{

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

+				$key = $objp->name;

+				$value = $objp->value;

+				if ($key)

+				{

+					// Allow constants values to be overridden by environment variables

+					if (isset($_SERVER['DOLIBARR_'.$key])) {

+						$value = $_SERVER['DOLIBARR_'.$key];

+					} elseif (isset($_ENV['DOLIBARR_'.$key])) {

+						$value = $_ENV['DOLIBARR_'.$key];

+					}

+

+					//if (! defined("$key")) define("$key", $value);	// In some cases, the constant might be already forced (Example: SYSLOG_HANDLERS during install)

+					$this->global->$key = $value;

+

+					if ($value && preg_match('/^MAIN_MODULE_/', $key))

+					{

+						$reg = array();

+						// If this is constant for a new tab page activated by a module. It initializes modules_parts['tabs'].

+						if (preg_match('/^MAIN_MODULE_([0-9A-Z_]+)_TABS_/i', $key))

+						{

+							$partname = 'tabs';

+							$params = explode(':', $value, 2);

+							if (!isset($this->modules_parts[$partname]) || !is_array($this->modules_parts[$partname])) { $this->modules_parts[$partname] = array(); }

+							$this->modules_parts[$partname][$params[0]][] = $value; // $value may be a string or an array

@@ -346,62 +197,17 @@
-

-						$this->global->$key = dolDecrypt($value);	// decrypt data excrypted with dolibarr_set_const($db, $name, $value)

-

-						if ($value && strpos($key, 'MAIN_MODULE_') === 0) {

-							$reg = array();

-							// If this is constant for a new tab page activated by a module. It initializes modules_parts['tabs'].

-							if (preg_match('/^MAIN_MODULE_([0-9A-Z_]+)_TABS_/i', $key)) {

-								$partname = 'tabs';

-								$params = explode(':', $value, 2);

-								if (!is_array($this->modules_parts[$partname])) {

-									$this->modules_parts[$partname] = array();

-								}

-								$this->modules_parts[$partname][$params[0]][] = $value; // $value may be a string or an array

-							} elseif (preg_match('/^MAIN_MODULE_([0-9A-Z_]+)_([A-Z]+)$/i', $key, $reg)) {

-								// If this is constant for all generic part activated by a module. It initializes

-								// modules_parts['login'], modules_parts['menus'], modules_parts['substitutions'], modules_parts['triggers'], modules_parts['tpl'],

-								// modules_parts['models'], modules_parts['theme']

-								// modules_parts['sms'],

-								// modules_parts['css'], modules_parts['js'],...

-

-								$modulename = strtolower($reg[1]);

-								$partname = strtolower($reg[2]);

-								if (!isset($this->modules_parts[$partname]) || !is_array($this->modules_parts[$partname])) {

-									$this->modules_parts[$partname] = array();

-								}

-

-								$arrValue = json_decode($value, true);

-

-								if (is_array($arrValue)) {

-									$newvalue = $arrValue;

-								} elseif (in_array($partname, array('login', 'menus', 'substitutions', 'triggers', 'tpl'))) {

-									$newvalue = '/'.$modulename.'/core/'.$partname.'/';

-								} elseif (in_array($partname, array('models', 'theme'))) {

-									$newvalue = '/'.$modulename.'/';

-								} elseif ($value == 1) {

-									$newvalue = '/'.$modulename.'/core/modules/'.$partname.'/'; // ex: partname = societe

-								} else {	// $partname can be any other value like 'sms', ...

-									$newvalue = $value;

-								}

-

-								if (!empty($newvalue)) {

-									$this->modules_parts[$partname] = array_merge($this->modules_parts[$partname], array($modulename => $newvalue)); // $value may be a string or an array

-								}

-							} elseif (preg_match('/^MAIN_MODULE_([0-9A-Z_]+)$/i', $key, $reg)) {

-								// If this is a module constant (must be at end)

-								$modulename = strtolower($reg[1]);

-								if ($modulename == 'propale') {

-									$modulename = 'propal';

-								}

-								if ($modulename == 'supplierproposal') {

-									$modulename = 'supplier_proposal';

-								}

-								$this->modules[$modulename] = $modulename; // Add this module in list of enabled modules

-

-								// deprecated in php 8.2

-								//if (version_compare(phpversion(), '8.2') < 0) {

-								if (!isset($this->$modulename) || !is_object($this->$modulename)) {

-									$this->$modulename = new stdClass();	// We need this to use the ->enabled and the ->multidir, ->dir...

-								}

-								$this->$modulename->enabled = true;	// TODO Remove this

-								//}

-							}

+						// If this is constant for all generic part activated by a module. It initializes

+						// modules_parts['login'], modules_parts['menus'], modules_parts['substitutions'], modules_parts['triggers'], modules_parts['tpl'],

+						// modules_parts['models'], modules_parts['theme']

+						// modules_parts['sms'],

+						// modules_parts['css'], ...

+						elseif (preg_match('/^MAIN_MODULE_([0-9A-Z_]+)_([A-Z]+)$/i', $key, $reg))

+						{

+							$modulename = strtolower($reg[1]);

+							$partname = strtolower($reg[2]);

+							if (!isset($this->modules_parts[$partname]) || !is_array($this->modules_parts[$partname])) { $this->modules_parts[$partname] = array(); }

+							$arrValue = json_decode($value, true);

+							if (is_array($arrValue) && !empty($arrValue)) $value = $arrValue;

+							elseif (in_array($partname, array('login', 'menus', 'substitutions', 'triggers', 'tpl'))) $value = '/'.$modulename.'/core/'.$partname.'/';

+							elseif (in_array($partname, array('models', 'theme'))) $value = '/'.$modulename.'/';

+							elseif (in_array($partname, array('sms'))) $value = '/'.$modulename.'/';

+							elseif ($value == 1) $value = '/'.$modulename.'/core/modules/'.$partname.'/'; // ex: partname = societe

+							$this->modules_parts[$partname] = array_merge($this->modules_parts[$partname], array($modulename => $value)); // $value may be a string or an array

@@ -409,122 +215,9 @@
-					}

-					$i++;

-				}

-

-				$db->free($resql);

-			}

-

-			// Include other local file xxx/zzz_consts.php to overwrite some variables

-			if (!empty($this->global->LOCAL_CONSTS_FILES)) {

-				$filesList = explode(":", $this->global->LOCAL_CONSTS_FILES);

-				foreach ($filesList as $file) {

-					$file = dol_sanitizeFileName($file);

-					dol_include_once($file."/".$file."_consts.php"); // This file can run code like setting $this->global->XXX vars.

-				}

-			}

-

-			//var_dump($this->modules);

-			//var_dump($this->modules_parts['theme']);

-

-			// If you can't set timezone of your PHP, set this constant. Better is to set it to UTC.

-			// In future, this constant will be forced to 'UTC' so PHP server timezone will not have effect anymore.

-			//$this->global->MAIN_SERVER_TZ='Europe/Paris';

-			if (!empty($this->global->MAIN_SERVER_TZ) && $this->global->MAIN_SERVER_TZ != 'auto') {

-				try {

-					date_default_timezone_set($this->global->MAIN_SERVER_TZ);

-				} catch (Exception $e) {

-					dol_syslog("Error: Bad value for parameter MAIN_SERVER_TZ=".$this->global->MAIN_SERVER_TZ, LOG_ERR);

-				}

-			}

-

-			// Object $mc

-			if (!defined('NOREQUIREMC') && isModEnabled('multicompany')) {

-				global $mc;

-				$ret = @dol_include_once('/multicompany/class/actions_multicompany.class.php');

-				if ($ret && class_exists('ActionsMulticompany')) {

-					$mc = new ActionsMulticompany($db);

-				}

-			}

-

-			// Clean some variables

-			if (empty($this->global->MAIN_MENU_STANDARD)) {

-				$this->global->MAIN_MENU_STANDARD = "eldy_menu.php";

-			}

-			if (empty($this->global->MAIN_MENUFRONT_STANDARD)) {

-				$this->global->MAIN_MENUFRONT_STANDARD = "eldy_menu.php";

-			}

-			if (empty($this->global->MAIN_MENU_SMARTPHONE)) {

-				$this->global->MAIN_MENU_SMARTPHONE = "eldy_menu.php"; // Use eldy by default because smartphone does not work on all phones

-			}

-			if (empty($this->global->MAIN_MENUFRONT_SMARTPHONE)) {

-				$this->global->MAIN_MENUFRONT_SMARTPHONE = "eldy_menu.php"; // Use eldy by default because smartphone does not work on all phones

-			}

-			if (!isset($this->global->FACTURE_TVAOPTION)) {

-				$this->global->FACTURE_TVAOPTION = 1;

-			}

-

-			// Variable globales LDAP

-			if (empty($this->global->LDAP_FIELD_FULLNAME)) {

-				$this->global->LDAP_FIELD_FULLNAME = '';

-			}

-			if (!isset($this->global->LDAP_KEY_USERS)) {

-				$this->global->LDAP_KEY_USERS = $this->global->LDAP_FIELD_FULLNAME;

-			}

-			if (!isset($this->global->LDAP_KEY_GROUPS)) {

-				$this->global->LDAP_KEY_GROUPS = $this->global->LDAP_FIELD_FULLNAME;

-			}

-			if (!isset($this->global->LDAP_KEY_CONTACTS)) {

-				$this->global->LDAP_KEY_CONTACTS = $this->global->LDAP_FIELD_FULLNAME;

-			}

-			if (!isset($this->global->LDAP_KEY_MEMBERS)) {

-				$this->global->LDAP_KEY_MEMBERS = $this->global->LDAP_FIELD_FULLNAME;

-			}

-			if (!isset($this->global->LDAP_KEY_MEMBERS_TYPES)) {

-				$this->global->LDAP_KEY_MEMBERS_TYPES = $this->global->LDAP_FIELD_FULLNAME;

-			}

-

-			// Load translation object with current language

-			if (empty($this->global->MAIN_LANG_DEFAULT)) {

-				$this->global->MAIN_LANG_DEFAULT = "en_US";

-			}

-

-			$rootfordata = DOL_DATA_ROOT;

-			$rootforuser = DOL_DATA_ROOT;

-			// If multicompany module is enabled, we redefine the root of data

-			if (isModEnabled('multicompany') && !empty($this->entity) && $this->entity > 1) {

-				$rootfordata .= '/'.$this->entity;

-			}

-			// Set standard temporary folder name or global override

-			$rootfortemp = empty($this->global->MAIN_TEMP_DIR) ? $rootfordata : $this->global->MAIN_TEMP_DIR;

-

-			// Define default dir_output and dir_temp for directories of modules

-			foreach ($this->modules as $module) {

-				//var_dump($module);

-				// For multicompany sharings

-				$this->$module->multidir_output = array($this->entity => $rootfordata."/".$module);

-				$this->$module->multidir_temp = array($this->entity => $rootfortemp."/".$module."/temp");

-				// For backward compatibility

-				$this->$module->dir_output = $rootfordata."/".$module;

-				$this->$module->dir_temp = $rootfortemp."/".$module."/temp";

-			}

-

-			// External modules storage

-			if (!empty($this->modules_parts['dir'])) {

-				foreach ($this->modules_parts['dir'] as $module => $dirs) {

-					if (!empty($this->$module->enabled)) {

-						foreach ($dirs as $type => $name) {  // $type is 'output' or 'temp'

-							$multidirname = 'multidir_'.$type;

-							$dirname = 'dir_'.$type;

-

-							if ($type != 'temp') {

-								// For multicompany sharings

-								$this->$module->$multidirname = array($this->entity => $rootfordata."/".$name);

-

-								// For backward compatibility

-								$this->$module->$dirname = $rootfordata."/".$name;

-							} else {

-								// For multicompany sharings

-								$this->$module->$multidirname = array($this->entity => $rootfortemp."/".$name."/temp");

-

-								// For backward compatibility

-								$this->$module->$dirname = $rootfortemp."/".$name."/temp";

-							}

+                        // If this is a module constant (must be at end)

+						elseif (preg_match('/^MAIN_MODULE_([0-9A-Z_]+)$/i', $key, $reg))

+						{

+							$modulename = strtolower($reg[1]);

+							if ($modulename == 'propale') $modulename = 'propal';

+							if ($modulename == 'supplierproposal') $modulename = 'supplier_proposal';

+							if (!isset($this->$modulename) || !is_object($this->$modulename)) $this->$modulename = new stdClass();

+							$this->$modulename->enabled = true;

+							$this->modules[] = $modulename; // Add this module in list of enabled modules

@@ -534,5 +227,84 @@
-			}

-

-			// For mycompany storage

-			$this->mycompany->multidir_output = array($this->entity => $rootfordata."/mycompany");

-			$this->mycompany->multidir_temp = array($this->entity => $rootfortemp."/mycompany/temp");

+				$i++;

+			}

+

+            $db->free($resql);

+        }

+

+        // Include other local consts.php files and fetch their values to the corresponding database constants.

+        if (!empty($this->global->LOCAL_CONSTS_FILES)) {

+            $filesList = explode(":", $this->global->LOCAL_CONSTS_FILES);

+            foreach ($filesList as $file) {

+                $file = dol_sanitizeFileName($file);

+                include_once DOL_DOCUMENT_ROOT."/".$file."/".$file."_consts.php"; // This file can run code like setting $this->global->XXX vars.

+            }

+        }

+

+        //var_dump($this->modules);

+        //var_dump($this->modules_parts['theme']);

+

+		// If you can't set timezone of your PHP, set this constant. Better is to set it to UTC.

+		// In future, this constant will be forced to 'UTC' so PHP server timezone will not have effect anymore.

+		//$this->global->MAIN_SERVER_TZ='Europe/Paris';

+		if (!empty($this->global->MAIN_SERVER_TZ) && $this->global->MAIN_SERVER_TZ != 'auto')

+		{

+			try {

+				date_default_timezone_set($this->global->MAIN_SERVER_TZ);

+			}

+			catch (Exception $e)

+			{

+				dol_syslog("Error: Bad value for parameter MAIN_SERVER_TZ=".$this->global->MAIN_SERVER_TZ, LOG_ERR);

+			}

+		}

+

+		// Object $mc

+		if (!defined('NOREQUIREMC') && !empty($this->multicompany->enabled)) {

+			global $mc;

+			$ret = @dol_include_once('/multicompany/class/actions_multicompany.class.php');

+			if ($ret) {

+				$mc = new ActionsMulticompany($db);

+				$this->mc = $mc;

+			}

+		}

+

+		// Clean some variables

+		if (empty($this->global->MAIN_MENU_STANDARD)) $this->global->MAIN_MENU_STANDARD = "eldy_menu.php";

+		if (empty($this->global->MAIN_MENUFRONT_STANDARD)) $this->global->MAIN_MENUFRONT_STANDARD = "eldy_menu.php";

+		if (empty($this->global->MAIN_MENU_SMARTPHONE)) $this->global->MAIN_MENU_SMARTPHONE = "eldy_menu.php"; // Use eldy by default because smartphone does not work on all phones

+		if (empty($this->global->MAIN_MENUFRONT_SMARTPHONE)) $this->global->MAIN_MENUFRONT_SMARTPHONE = "eldy_menu.php"; // Use eldy by default because smartphone does not work on all phones

+		// Clean var use vat for company

+		if (!isset($this->global->FACTURE_TVAOPTION)) $this->global->FACTURE_TVAOPTION = 1;

+		elseif (!empty($this->global->FACTURE_TVAOPTION) && !is_numeric($this->global->FACTURE_TVAOPTION))

+		{

+			// Old value of option, we clean to use new value (0 or 1)

+			if ($this->global->FACTURE_TVAOPTION != "franchise") $this->global->FACTURE_TVAOPTION = 1;

+			else $this->global->FACTURE_TVAOPTION = 0;

+		}

+

+		// Variable globales LDAP

+		if (empty($this->global->LDAP_FIELD_FULLNAME)) $this->global->LDAP_FIELD_FULLNAME = '';

+		if (!isset($this->global->LDAP_KEY_USERS)) $this->global->LDAP_KEY_USERS = $this->global->LDAP_FIELD_FULLNAME;

+		if (!isset($this->global->LDAP_KEY_GROUPS)) $this->global->LDAP_KEY_GROUPS = $this->global->LDAP_FIELD_FULLNAME;

+		if (!isset($this->global->LDAP_KEY_CONTACTS)) $this->global->LDAP_KEY_CONTACTS = $this->global->LDAP_FIELD_FULLNAME;

+		if (!isset($this->global->LDAP_KEY_MEMBERS)) $this->global->LDAP_KEY_MEMBERS = $this->global->LDAP_FIELD_FULLNAME;

+		if (!isset($this->global->LDAP_KEY_MEMBERS_TYPES)) $this->global->LDAP_KEY_MEMBERS_TYPES = $this->global->LDAP_FIELD_FULLNAME;

+

+		// Load translation object with current language

+		if (empty($this->global->MAIN_LANG_DEFAULT)) $this->global->MAIN_LANG_DEFAULT = "en_US";

+

+		$rootfordata = DOL_DATA_ROOT;

+		$rootforuser = DOL_DATA_ROOT;

+		// If multicompany module is enabled, we redefine the root of data

+		if (!empty($this->multicompany->enabled) && !empty($this->entity) && $this->entity > 1)

+		{

+			$rootfordata .= '/'.$this->entity;

+		}

+		// Set standard temporary folder name or global override

+		$rootfortemp = empty($this->global->MAIN_TEMP_DIR) ? $rootfordata : $this->global->MAIN_TEMP_DIR;

+

+		// Define default dir_output and dir_temp for directories of modules

+		foreach ($this->modules as $module)

+		{

+		    //var_dump($module);

+			// For multicompany sharings

+			$this->$module->multidir_output = array($this->entity => $rootfordata."/".$module);

+			$this->$module->multidir_temp = array($this->entity => $rootfortemp."/".$module."/temp");

@@ -540,55 +312,106 @@
-			$this->mycompany->dir_output = $rootfordata."/mycompany";

-			$this->mycompany->dir_temp = $rootfortemp."/mycompany/temp";

-

-			// For admin storage

-			$this->admin->dir_output = $rootfordata.'/admin';

-			$this->admin->dir_temp = $rootfortemp.'/admin/temp';

-

-			// For user storage

-			$this->user->multidir_output = array($this->entity => $rootfordata."/users");

-			$this->user->multidir_temp = array($this->entity => $rootfortemp."/users/temp");

-			// For backward compatibility

-			$this->user->dir_output = $rootforuser."/users";

-			$this->user->dir_temp = $rootfortemp."/users/temp";

-

-			// For proposal storage

-			$this->propal->multidir_output = array($this->entity => $rootfordata."/propale");

-			$this->propal->multidir_temp = array($this->entity => $rootfortemp."/propale/temp");

-			// For backward compatibility

-			$this->propal->dir_output = $rootfordata."/propale";

-			$this->propal->dir_temp = $rootfortemp."/propale/temp";

-

-			// For medias storage

-			$this->medias->multidir_output = array($this->entity => $rootfordata."/medias");

-			$this->medias->multidir_temp = array($this->entity => $rootfortemp."/medias/temp");

-

-			// Exception: Some dir are not the name of module. So we keep exception here for backward compatibility.

-

-			// Module fournisseur

-			if (!empty($this->fournisseur)) {

-				$this->fournisseur->commande = new stdClass();

-				$this->fournisseur->commande->multidir_output = array($this->entity => $rootfordata."/fournisseur/commande");

-				$this->fournisseur->commande->multidir_temp = array($this->entity => $rootfortemp."/fournisseur/commande/temp");

-				$this->fournisseur->commande->dir_output = $rootfordata."/fournisseur/commande"; // For backward compatibility

-				$this->fournisseur->commande->dir_temp = $rootfortemp."/fournisseur/commande/temp"; // For backward compatibility

-

-				$this->fournisseur->facture = new stdClass();

-				$this->fournisseur->facture->multidir_output = array($this->entity => $rootfordata."/fournisseur/facture");

-				$this->fournisseur->facture->multidir_temp = array($this->entity => $rootfortemp."/fournisseur/facture/temp");

-				$this->fournisseur->facture->dir_output = $rootfordata."/fournisseur/facture"; // For backward compatibility

-				$this->fournisseur->facture->dir_temp = $rootfortemp."/fournisseur/facture/temp"; // For backward compatibility

-

-				$this->supplier_proposal = new stdClass();

-				$this->supplier_proposal->multidir_output = array($this->entity => $rootfordata."/supplier_proposal");

-				$this->supplier_proposal->multidir_temp = array($this->entity => $rootfortemp."/supplier_proposal/temp");

-				$this->supplier_proposal->dir_output = $rootfordata."/supplier_proposal"; // For backward compatibility

-				$this->supplier_proposal->dir_temp = $rootfortemp."/supplier_proposal/temp"; // For backward compatibility

-

-				$this->fournisseur->payment = new stdClass();

-				$this->fournisseur->payment->multidir_output = array($this->entity => $rootfordata."/fournisseur/payment");

-				$this->fournisseur->payment->multidir_temp = array($this->entity => $rootfortemp."/fournisseur/payment/temp");

-				$this->fournisseur->payment->dir_output = $rootfordata."/fournisseur/payment"; // For backward compatibility

-				$this->fournisseur->payment->dir_temp = $rootfortemp."/fournisseur/payment/temp"; // For backward compatibility

-

-				// To prepare split of module fournisseur into module 'fournisseur' + supplier_order + supplier_invoice

-				if (!empty($this->fournisseur->enabled) && empty($this->global->MAIN_USE_NEW_SUPPLIERMOD)) {  // By default, if module supplier is on, and we don't use yet the new modules, we set artificially the module properties

+			$this->$module->dir_output = $rootfordata."/".$module;

+			$this->$module->dir_temp = $rootfortemp."/".$module."/temp";

+		}

+

+		// External modules storage

+		if (!empty($this->modules_parts['dir']))

+		{

+			foreach ($this->modules_parts['dir'] as $module => $dirs)

+			{

+				if (!empty($this->$module->enabled))

+				{

+					foreach ($dirs as $type => $name)  // $type is 'output' or 'temp'

+					{

+						$multidirname = 'multidir_'.$type;

+						$dirname = 'dir_'.$type;

+

+						if ($type != 'temp')

+						{

+							// For multicompany sharings

+							$this->$module->$multidirname = array($this->entity => $rootfordata."/".$name);

+

+							// For backward compatibility

+							$this->$module->$dirname = $rootfordata."/".$name;

+						}

+						else

+						{

+							// For multicompany sharings

+							$this->$module->$multidirname = array($this->entity => $rootfortemp."/".$name."/temp");

+

+							// For backward compatibility

+							$this->$module->$dirname = $rootfortemp."/".$name."/temp";

+						}

+					}

+				}

+			}

+		}

+

+		// For mycompany storage

+		$this->mycompany->dir_output = $rootfordata."/mycompany";

+		$this->mycompany->dir_temp = $rootfortemp."/mycompany/temp";

+

+		// For admin storage

+		$this->admin->dir_output = $rootfordata.'/admin';

+		$this->admin->dir_temp = $rootfortemp.'/admin/temp';

+

+		// For user storage

+		$this->user->multidir_output = array($this->entity => $rootfordata."/users");

+		$this->user->multidir_temp = array($this->entity => $rootfortemp."/users/temp");

+		// For backward compatibility

+		$this->user->dir_output = $rootforuser."/users";

+		$this->user->dir_temp = $rootfortemp."/users/temp";

+

+		// For usergroup storage

+		$this->usergroup->dir_output = $rootforuser."/usergroups";

+		$this->usergroup->dir_temp = $rootfortemp."/usergroups/temp";

+

+		// For proposal storage

+		$this->propal->multidir_output = array($this->entity => $rootfordata."/propale");

+		$this->propal->multidir_temp = array($this->entity => $rootfortemp."/propale/temp");

+		// For backward compatibility

+		$this->propal->dir_output = $rootfordata."/propale";

+		$this->propal->dir_temp = $rootfortemp."/propale/temp";

+

+		// For medias storage

+		$this->medias->multidir_output = array($this->entity => $rootfordata."/medias");

+		$this->medias->multidir_temp = array($this->entity => $rootfortemp."/medias/temp");

+

+		// Exception: Some dir are not the name of module. So we keep exception here for backward compatibility.

+

+		// Sous module bons d'expedition

+		$this->expedition_bon->enabled = (!empty($this->global->MAIN_SUBMODULE_EXPEDITION) ? $this->global->MAIN_SUBMODULE_EXPEDITION : 0);

+		// Sous module bons de livraison

+		$this->livraison_bon->enabled = (!empty($this->global->MAIN_SUBMODULE_LIVRAISON) ? $this->global->MAIN_SUBMODULE_LIVRAISON : 0);

+

+		// Module fournisseur

+		if (!empty($this->fournisseur))

+		{

+			$this->fournisseur->commande = new stdClass();

+			$this->fournisseur->commande->multidir_output = array($this->entity => $rootfordata."/fournisseur/commande");

+			$this->fournisseur->commande->multidir_temp = array($this->entity => $rootfortemp."/fournisseur/commande/temp");

+			$this->fournisseur->commande->dir_output = $rootfordata."/fournisseur/commande"; // For backward compatibility

+			$this->fournisseur->commande->dir_temp = $rootfortemp."/fournisseur/commande/temp"; // For backward compatibility

+

+			$this->fournisseur->facture = new stdClass();

+			$this->fournisseur->facture->multidir_output = array($this->entity => $rootfordata."/fournisseur/facture");

+			$this->fournisseur->facture->multidir_temp = array($this->entity => $rootfortemp."/fournisseur/facture/temp");

+			$this->fournisseur->facture->dir_output = $rootfordata."/fournisseur/facture"; // For backward compatibility

+			$this->fournisseur->facture->dir_temp = $rootfortemp."/fournisseur/facture/temp"; // For backward compatibility

+

+			$this->supplierproposal = new stdClass();

+			$this->supplierproposal->multidir_output = array($this->entity => $rootfordata."/supplier_proposal");

+			$this->supplierproposal->multidir_temp = array($this->entity => $rootfortemp."/supplier_proposal/temp");

+			$this->supplierproposal->dir_output = $rootfordata."/supplier_proposal"; // For backward compatibility

+			$this->supplierproposal->dir_temp = $rootfortemp."/supplier_proposal/temp"; // For backward compatibility

+

+			$this->fournisseur->payment = new stdClass();

+			$this->fournisseur->payment->multidir_output = array($this->entity => $rootfordata."/fournisseur/payment");

+			$this->fournisseur->payment->multidir_temp = array($this->entity => $rootfortemp."/fournisseur/payment/temp");

+			$this->fournisseur->payment->dir_output = $rootfordata."/fournisseur/payment"; // For backward compatibility

+			$this->fournisseur->payment->dir_temp = $rootfortemp."/fournisseur/payment/temp"; // For backward compatibility

+

+			// To prepare split of module fournisseur into fournisseur + supplier_order + supplier_invoice

+			if (!empty($this->fournisseur->enabled) && empty($this->global->MAIN_USE_NEW_SUPPLIERMOD))  // By default, if module supplier is on, we set new properties

+			{

+				if (empty($this->global->MAIN_USE_NEW_SUPPLIERMOD))	// This can be set to 1 once modules purchase order and supplier invoice exists

+				{

@@ -601 +424,4 @@
-

+				}

+

+				if (empty($this->global->MAIN_USE_NEW_SUPPLIERMOD))	// This can be set to 1 once modules purchase order and supplier invoice exists

+				{

@@ -610,101 +436,295 @@
-

-			// Module product/service

-			$this->product->multidir_output 		= array($this->entity => $rootfordata."/produit");

-			$this->product->multidir_temp			= array($this->entity => $rootfortemp."/produit/temp");

-			$this->service->multidir_output			= array($this->entity => $rootfordata."/produit");

-			$this->service->multidir_temp			= array($this->entity => $rootfortemp."/produit/temp");

-			// For backward compatibility

-			$this->product->dir_output				= $rootfordata."/produit";

-			$this->product->dir_temp				= $rootfortemp."/produit/temp";

-			$this->service->dir_output				= $rootfordata."/produit";

-			$this->service->dir_temp				= $rootfortemp."/produit/temp";

-

-			// Module productbatch

-			$this->productbatch->multidir_output = array($this->entity => $rootfordata."/productlot");

-			$this->productbatch->multidir_temp = array($this->entity => $rootfortemp."/productlot/temp");

-

-			// Module contrat

-			$this->contrat->multidir_output = array($this->entity => $rootfordata."/contract");

-			$this->contrat->multidir_temp = array($this->entity => $rootfortemp."/contract/temp");

-			// For backward compatibility

-			$this->contrat->dir_output = $rootfordata."/contract";

-			$this->contrat->dir_temp = $rootfortemp."/contract/temp";

-

-			// Module bank

-			$this->bank->multidir_output = array($this->entity => $rootfordata."/bank");

-			$this->bank->multidir_temp = array($this->entity => $rootfortemp."/bank/temp");

-			// For backward compatibility

-			$this->bank->dir_output = $rootfordata."/bank";

-			$this->bank->dir_temp = $rootfortemp."/bank/temp";

-

-			// Set some default values

-			//$this->global->MAIN_LIST_FILTER_ON_DAY=1;		// On filter that show date, we must show input field for day before or after month

-			$this->global->MAIN_MAIL_USE_MULTI_PART = 1;

-

-			// societe

-			if (empty($this->global->SOCIETE_CODECLIENT_ADDON)) {

-				$this->global->SOCIETE_CODECLIENT_ADDON = "mod_codeclient_leopard";

-			}

-			if (empty($this->global->SOCIETE_CODECOMPTA_ADDON)) {

-				$this->global->SOCIETE_CODECOMPTA_ADDON = "mod_codecompta_panicum";

-			}

-

-			if (empty($this->global->CHEQUERECEIPTS_ADDON)) {

-				$this->global->CHEQUERECEIPTS_ADDON = 'mod_chequereceipt_mint';

-			}

-			if (empty($this->global->TICKET_ADDON)) {

-				$this->global->TICKET_ADDON = 'mod_ticket_simple';

-			}

-

-			// Security

-			if (empty($this->global->USER_PASSWORD_GENERATED)) {

-				$this->global->USER_PASSWORD_GENERATED = 'standard'; // Default password generator

-			}

-			if (empty($this->global->MAIN_UMASK)) {

-				$this->global->MAIN_UMASK = '0660'; // Default mask

-			} else {

-				// We remove the execute bits on the file umask

-				$tmpumask = (octdec($this->global->MAIN_UMASK) & 0666);

-				$tmpumask = decoct($tmpumask);

-				if (!preg_match('/^0/', $tmpumask)) {

-					$tmpumask = '0'.$tmpumask;

-				}

-				if (empty($tmpumask) || $tmpumask === '0') {

-					$tmpumask = '0664';

-				}

-				$this->global->MAIN_UMASK = $tmpumask;

-			}

-

-			// conf->use_javascript_ajax

-			$this->use_javascript_ajax = 1;

-			if (isset($this->global->MAIN_DISABLE_JAVASCRIPT)) {

-				$this->use_javascript_ajax = !$this->global->MAIN_DISABLE_JAVASCRIPT;

-			}

-			// If no javascript_ajax, Ajax features are disabled.

-			if (empty($this->use_javascript_ajax)) {

-				unset($this->global->PRODUIT_USE_SEARCH_TO_SELECT);

-				unset($this->global->COMPANY_USE_SEARCH_TO_SELECT);

-				unset($this->global->CONTACT_USE_SEARCH_TO_SELECT);

-				unset($this->global->PROJECT_USE_SEARCH_TO_SELECT);

-			}

-

-			if (isModEnabled('productbatch')) {

-				// If module lot/serial enabled, we force the inc/dec mode to STOCK_CALCULATE_ON_SHIPMENT_CLOSE and STOCK_CALCULATE_ON_RECEPTION_CLOSE

-				$this->global->STOCK_CALCULATE_ON_BILL = 0;

-				$this->global->STOCK_CALCULATE_ON_VALIDATE_ORDER = 0;

-				if (empty($this->global->STOCK_CALCULATE_ON_SHIPMENT)) {

-					$this->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE = 1;

-				}

-				if (empty($this->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) {

-					$this->global->STOCK_CALCULATE_ON_SHIPMENT = 1;

-				}

-				$this->global->STOCK_CALCULATE_ON_SUPPLIER_BILL = 0;

-				$this->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER = 0;

-				if (!isModEnabled('reception')) {

-					$this->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER = 1;

-				} else {

-					if (empty($this->global->STOCK_CALCULATE_ON_RECEPTION)) {

-						$this->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE = 1;

-					}

-					if (empty($this->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)) {

-						$this->global->STOCK_CALCULATE_ON_RECEPTION = 1;

+		}

+

+		// Module product/service

+		$this->product->multidir_output 		= array($this->entity => $rootfordata."/produit");

+		$this->product->multidir_temp			= array($this->entity => $rootfortemp."/produit/temp");

+		$this->service->multidir_output			= array($this->entity => $rootfordata."/produit");

+		$this->service->multidir_temp			= array($this->entity => $rootfortemp."/produit/temp");

+		// For backward compatibility

+		$this->product->dir_output				= $rootfordata."/produit";

+		$this->product->dir_temp				= $rootfortemp."/produit/temp";

+		$this->service->dir_output				= $rootfordata."/produit";

+		$this->service->dir_temp				= $rootfortemp."/produit/temp";

+

+		// Module productbatch

+		$this->productbatch->multidir_output = array($this->entity => $rootfordata."/produitlot");

+		$this->productbatch->multidir_temp = array($this->entity => $rootfortemp."/produitlot/temp");

+

+		// Module contrat

+		$this->contrat->multidir_output = array($this->entity => $rootfordata."/contract");

+		$this->contrat->multidir_temp = array($this->entity => $rootfortemp."/contract/temp");

+		// For backward compatibility

+		$this->contrat->dir_output = $rootfordata."/contract";

+		$this->contrat->dir_temp = $rootfortemp."/contract/temp";

+

+		// Module bank

+		$this->bank->multidir_output = array($this->entity => $rootfordata."/bank");

+		$this->bank->multidir_temp = array($this->entity => $rootfortemp."/bank/temp");

+		// For backward compatibility

+		$this->bank->dir_output = $rootfordata."/bank";

+		$this->bank->dir_temp = $rootfortemp."/bank/temp";

+

+		// Set some default values

+		//$this->global->MAIN_LIST_FILTER_ON_DAY=1;		// On filter that show date, we must show input field for day before or after month

+        $this->global->MAIN_MAIL_USE_MULTI_PART = 1;

+

+		// societe

+		if (empty($this->global->SOCIETE_CODECLIENT_ADDON))		$this->global->SOCIETE_CODECLIENT_ADDON = "mod_codeclient_leopard";

+		if (empty($this->global->SOCIETE_CODECOMPTA_ADDON))		$this->global->SOCIETE_CODECOMPTA_ADDON = "mod_codecompta_panicum";

+

+		if (empty($this->global->CHEQUERECEIPTS_ADDON))			$this->global->CHEQUERECEIPTS_ADDON = 'mod_chequereceipt_mint';

+		if (empty($this->global->TICKET_ADDON))				    $this->global->TICKET_ADDON = 'mod_ticket_simple';

+

+        // Security

+		if (empty($this->global->USER_PASSWORD_GENERATED)) $this->global->USER_PASSWORD_GENERATED = 'standard'; // Default password generator

+        if (empty($this->global->MAIN_UMASK)) $this->global->MAIN_UMASK = '0664'; // Default mask

+

+		// conf->use_javascript_ajax

+		$this->use_javascript_ajax = 1;

+		if (isset($this->global->MAIN_DISABLE_JAVASCRIPT)) $this->use_javascript_ajax = !$this->global->MAIN_DISABLE_JAVASCRIPT;

+		// If no javascript_ajax, Ajax features are disabled.

+		if (empty($this->use_javascript_ajax))

+		{

+			unset($this->global->PRODUIT_USE_SEARCH_TO_SELECT);

+			unset($this->global->COMPANY_USE_SEARCH_TO_SELECT);

+			unset($this->global->CONTACT_USE_SEARCH_TO_SELECT);

+			unset($this->global->PROJECT_USE_SEARCH_TO_SELECT);

+		}

+

+		if (!empty($this->productbatch->enabled))

+		{

+			$this->global->STOCK_CALCULATE_ON_BILL = 0;

+			$this->global->STOCK_CALCULATE_ON_VALIDATE_ORDER = 0;

+			$this->global->STOCK_CALCULATE_ON_SHIPMENT = 1;

+			$this->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE = 0;

+			$this->global->STOCK_CALCULATE_ON_SUPPLIER_BILL = 0;

+			$this->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER = 0;

+			if (empty($this->reception->enabled))$this->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER = 1;

+			else {

+				$this->global->STOCK_CALCULATE_ON_RECEPTION = 1;

+				$this->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE = 0;

+			}

+		}

+

+		// conf->currency

+		if (empty($this->global->MAIN_MONNAIE)) $this->global->MAIN_MONNAIE = 'EUR';

+		$this->currency = $this->global->MAIN_MONNAIE;

+

+		if (empty($this->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY)) $this->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY = 30; // Less than 1 minutes to be sure

+

+		// conf->global->ACCOUNTING_MODE = Option des modules Comptabilites (simple ou expert). Defini le mode de calcul des etats comptables (CA,...)

+        if (empty($this->global->ACCOUNTING_MODE)) $this->global->ACCOUNTING_MODE = 'RECETTES-DEPENSES'; // By default. Can be 'RECETTES-DEPENSES' ou 'CREANCES-DETTES'

+

+        // By default, suppliers objects can be linked to all projects

+        if (!isset($this->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS)) $this->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS = 1;

+

+        // By default we enable feature to bill time spent

+        if (!isset($this->global->PROJECT_BILL_TIME_SPENT)) $this->global->PROJECT_BILL_TIME_SPENT = 1;

+

+        // MAIN_HTML_TITLE

+        if (!isset($this->global->MAIN_HTML_TITLE)) $this->global->MAIN_HTML_TITLE = 'noapp,thirdpartynameonly,contactnameonly,projectnameonly';

+

+		// conf->liste_limit = constante de taille maximale des listes

+		if (empty($this->global->MAIN_SIZE_LISTE_LIMIT)) $this->global->MAIN_SIZE_LISTE_LIMIT = 25;

+		$this->liste_limit = $this->global->MAIN_SIZE_LISTE_LIMIT;

+

+		// conf->product->limit_size = constante de taille maximale des select de produit

+		if (!isset($this->global->PRODUIT_LIMIT_SIZE)) $this->global->PRODUIT_LIMIT_SIZE = 1000;

+		$this->product->limit_size = $this->global->PRODUIT_LIMIT_SIZE;

+

+		// conf->theme et $this->css

+		if (empty($this->global->MAIN_THEME)) $this->global->MAIN_THEME = "eldy";

+        if (!empty($this->global->MAIN_FORCETHEME)) $this->global->MAIN_THEME = $this->global->MAIN_FORCETHEME;

+		$this->theme = $this->global->MAIN_THEME;

+		$this->css = "/theme/".$this->theme."/style.css.php";

+

+		// conf->email_from = email pour envoi par dolibarr des mails automatiques

+		$this->email_from = "robot@example.com";

+		if (!empty($this->global->MAIN_MAIL_EMAIL_FROM)) $this->email_from = $this->global->MAIN_MAIL_EMAIL_FROM;

+

+		// conf->notification->email_from = email pour envoi par Dolibarr des notifications

+		$this->notification->email_from = $this->email_from;

+		if (!empty($this->global->NOTIFICATION_EMAIL_FROM)) $this->notification->email_from = $this->global->NOTIFICATION_EMAIL_FROM;

+

+		// conf->mailing->email_from = email pour envoi par Dolibarr des mailings

+		$this->mailing->email_from = $this->email_from;

+		if (!empty($this->global->MAILING_EMAIL_FROM))	$this->mailing->email_from = $this->global->MAILING_EMAIL_FROM;

+		if (!isset($this->global->MAIN_EMAIL_ADD_TRACK_ID)) $this->global->MAIN_EMAIL_ADD_TRACK_ID = 1;

+

+        // Format for date (used by default when not found or not searched in lang)

+        $this->format_date_short = "%d/%m/%Y"; // Format of day with PHP/C tags (strftime functions)

+        $this->format_date_short_java = "dd/MM/yyyy"; // Format of day with Java tags

+        $this->format_hour_short = "%H:%M";

+        $this->format_hour_short_duration = "%H:%M";

+        $this->format_date_text_short = "%d %b %Y";

+        $this->format_date_text = "%d %B %Y";

+        $this->format_date_hour_short = "%d/%m/%Y %H:%M";

+        $this->format_date_hour_sec_short = "%d/%m/%Y %H:%M:%S";

+        $this->format_date_hour_text_short = "%d %b %Y %H:%M";

+        $this->format_date_hour_text = "%d %B %Y %H:%M";

+

+        // Duration of workday

+        if (!isset($this->global->MAIN_DURATION_OF_WORKDAY)) $this->global->MAIN_DURATION_OF_WORKDAY = 86400;

+

+		// Limites decimales si non definie (peuvent etre egale a 0)

+		if (!isset($this->global->MAIN_MAX_DECIMALS_UNIT))  $this->global->MAIN_MAX_DECIMALS_UNIT = 5;

+		if (!isset($this->global->MAIN_MAX_DECIMALS_TOT))   $this->global->MAIN_MAX_DECIMALS_TOT = 2;

+		if (!isset($this->global->MAIN_MAX_DECIMALS_SHOWN)) $this->global->MAIN_MAX_DECIMALS_SHOWN = 8;

+

+		// Default pdf option

+		if (!isset($this->global->MAIN_PDF_DASH_BETWEEN_LINES)) $this->global->MAIN_PDF_DASH_BETWEEN_LINES = 1; // use dash between lines

+		if (!isset($this->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) $this->global->PDF_ALLOW_HTML_FOR_FREE_TEXT = 1; // allow html content into free footer text

+

+		// Default max file size for upload

+		$this->maxfilesize = (empty($this->global->MAIN_UPLOAD_DOC) ? 0 : (int) $this->global->MAIN_UPLOAD_DOC * 1024);

+

+		// By default, we propagate contacts

+		if (!isset($this->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN)) $this->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN = '*'; // Can be also '*' or '^(BILLING|SHIPPING|CUSTOMER|.*)$' (regex not yet implemented)

+

+		// By default, we do not use the zip town table but the table of third parties

+		if (!isset($this->global->MAIN_USE_ZIPTOWN_DICTIONNARY)) $this->global->MAIN_USE_ZIPTOWN_DICTIONNARY = 0;

+

+		// By default, we open card if one found

+		if (!isset($this->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE)) $this->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE = 1;

+

+		// By default, we show state code in combo list

+		if (!isset($this->global->MAIN_SHOW_STATE_CODE)) $this->global->MAIN_SHOW_STATE_CODE = 1;

+

+		// Use a SCA ready workflow with Stripe module (STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION by default if nothing defined)

+		if (!isset($this->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION) && empty($this->global->STRIPE_USE_NEW_CHECKOUT)) $this->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION = 1;

+

+		// Define list of limited modules (value must be key found for "name" property of module, so for example 'supplierproposal' for Module "Supplier Proposal"

+		if (!isset($this->global->MAIN_MODULES_FOR_EXTERNAL)) $this->global->MAIN_MODULES_FOR_EXTERNAL = 'user,societe,propal,commande,facture,categorie,supplierproposal,fournisseur,contact,projet,contrat,ficheinter,expedition,agenda,resource,adherent,blockedlog'; // '' means 'all'. Note that contact is added here as it should be a module later.

+		if (!empty($this->modules_parts['moduleforexternal']))		// Module part to include an external module into the MAIN_MODULES_FOR_EXTERNAL list

+		{

+			foreach ($this->modules_parts['moduleforexternal'] as $key=>$value) $this->global->MAIN_MODULES_FOR_EXTERNAL .= ",".$key;

+		}

+

+		// Enable select2

+		if (empty($this->global->MAIN_USE_JQUERY_MULTISELECT) || $this->global->MAIN_USE_JQUERY_MULTISELECT == '1') $this->global->MAIN_USE_JQUERY_MULTISELECT = 'select2';

+

+		// Timeouts

+        if (empty($this->global->MAIN_USE_CONNECT_TIMEOUT)) $this->global->MAIN_USE_CONNECT_TIMEOUT = 10;

+        if (empty($this->global->MAIN_USE_RESPONSE_TIMEOUT)) $this->global->MAIN_USE_RESPONSE_TIMEOUT = 30;

+

+		// Set default variable to calculate VAT as if option tax_mode was 0 (standard)

+        if (empty($this->global->TAX_MODE_SELL_PRODUCT)) $this->global->TAX_MODE_SELL_PRODUCT = 'invoice';

+        if (empty($this->global->TAX_MODE_BUY_PRODUCT))  $this->global->TAX_MODE_BUY_PRODUCT = 'invoice';

+        if (empty($this->global->TAX_MODE_SELL_SERVICE)) $this->global->TAX_MODE_SELL_SERVICE = 'payment';

+        if (empty($this->global->TAX_MODE_BUY_SERVICE))  $this->global->TAX_MODE_BUY_SERVICE = 'payment';

+

+		// Delay before warnings

+		// Avoid strict errors. TODO: Replace xxx->warning_delay with a property ->warning_delay_xxx

+		if (isset($this->agenda)) {

+		    $this->adherent->subscription = new stdClass();

+            $this->adherent->subscription->warning_delay = (isset($this->global->MAIN_DELAY_MEMBERS) ? $this->global->MAIN_DELAY_MEMBERS : 0) * 24 * 60 * 60;

+		}

+		if (isset($this->agenda)) {

+            $this->agenda->warning_delay = (isset($this->global->MAIN_DELAY_ACTIONS_TODO) ? $this->global->MAIN_DELAY_ACTIONS_TODO : 7) * 24 * 60 * 60;

+        }

+		if (isset($this->projet))

+		{

+		    $this->projet->warning_delay = (isset($this->global->MAIN_DELAY_PROJECT_TO_CLOSE) ? $this->global->MAIN_DELAY_PROJECT_TO_CLOSE : 7) * 24 * 60 * 60;

+		    $this->projet->task = new StdClass();

+		    $this->projet->task->warning_delay = (isset($this->global->MAIN_DELAY_TASKS_TODO) ? $this->global->MAIN_DELAY_TASKS_TODO : 7) * 24 * 60 * 60;

+		}

+

+        if (isset($this->commande)) {

+            $this->commande->client = new stdClass();

+    		$this->commande->fournisseur = new stdClass();

+    		$this->commande->client->warning_delay = (isset($this->global->MAIN_DELAY_ORDERS_TO_PROCESS) ? $this->global->MAIN_DELAY_ORDERS_TO_PROCESS : 2) * 24 * 60 * 60;

+    		$this->commande->fournisseur->warning_delay = (isset($this->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS) ? $this->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS : 7) * 24 * 60 * 60;

+		}

+		if (isset($this->propal)) {

+		    $this->propal->cloture = new stdClass();

+    		$this->propal->facturation = new stdClass();

+	        $this->propal->cloture->warning_delay = (isset($this->global->MAIN_DELAY_PROPALS_TO_CLOSE) ? $this->global->MAIN_DELAY_PROPALS_TO_CLOSE : 0) * 24 * 60 * 60;

+            $this->propal->facturation->warning_delay = (isset($this->global->MAIN_DELAY_PROPALS_TO_BILL) ? $this->global->MAIN_DELAY_PROPALS_TO_BILL : 0) * 24 * 60 * 60;

+		}

+		if (isset($this->facture)) {

+		    $this->facture->client = new stdClass();

+    		$this->facture->fournisseur = new stdClass();

+            $this->facture->client->warning_delay = (isset($this->global->MAIN_DELAY_CUSTOMER_BILLS_UNPAYED) ? $this->global->MAIN_DELAY_CUSTOMER_BILLS_UNPAYED : 0) * 24 * 60 * 60;

+		    $this->facture->fournisseur->warning_delay = (isset($this->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY) ? $this->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY : 0) * 24 * 60 * 60;

+		}

+		if (isset($this->contrat)) {

+		    $this->contrat->services = new stdClass();

+    		$this->contrat->services->inactifs = new stdClass();

+	   	    $this->contrat->services->expires = new stdClass();

+		    $this->contrat->services->inactifs->warning_delay = (isset($this->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES) ? $this->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES : 0) * 24 * 60 * 60;

+            $this->contrat->services->expires->warning_delay = (isset($this->global->MAIN_DELAY_RUNNING_SERVICES) ? $this->global->MAIN_DELAY_RUNNING_SERVICES : 0) * 24 * 60 * 60;

+		}

+		if (isset($this->commande)) {

+		    $this->bank->rappro					= new stdClass();

+    		$this->bank->cheque					= new stdClass();

+            $this->bank->rappro->warning_delay = (isset($this->global->MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE) ? $this->global->MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE : 0) * 24 * 60 * 60;

+		    $this->bank->cheque->warning_delay = (isset($this->global->MAIN_DELAY_CHEQUES_TO_DEPOSIT) ? $this->global->MAIN_DELAY_CHEQUES_TO_DEPOSIT : 0) * 24 * 60 * 60;

+		}

+		if (isset($this->expensereport)) {

+		    $this->expensereport->approve = new stdClass();

+		    $this->expensereport->approve->warning_delay = (isset($this->global->MAIN_DELAY_EXPENSEREPORTS) ? $this->global->MAIN_DELAY_EXPENSEREPORTS : 0) * 24 * 60 * 60;

+		    $this->expensereport->payment = new stdClass();

+		    $this->expensereport->payment->warning_delay = (isset($this->global->MAIN_DELAY_EXPENSEREPORTS_TO_PAY) ? $this->global->MAIN_DELAY_EXPENSEREPORTS_TO_PAY : 0) * 24 * 60 * 60;

+		}

+        if (isset($this->holiday)) {

+            $this->holiday->approve = new stdClass();

+            $this->holiday->approve->warning_delay = (isset($this->global->MAIN_DELAY_HOLIDAYS) ? $this->global->MAIN_DELAY_HOLIDAYS : 0) * 24 * 60 * 60;

+        }

+

+		if (!empty($this->global->PRODUIT_MULTIPRICES) && empty($this->global->PRODUIT_MULTIPRICES_LIMIT))

+		{

+		    $this->global->PRODUIT_MULTIPRICES_LIMIT = 5;

+		}

+

+		// For modules that want to disable top or left menu

+		if (!empty($this->global->MAIN_HIDE_TOP_MENU)) $this->dol_hide_topmenu = $this->global->MAIN_HIDE_TOP_MENU;

+		if (!empty($this->global->MAIN_HIDE_LEFT_MENU)) $this->dol_hide_leftmenu = $this->global->MAIN_HIDE_LEFT_MENU;

+

+		if (empty($this->global->MAIN_SIZE_SHORTLIST_LIMIT)) $this->global->MAIN_SIZE_SHORTLIST_LIMIT = 3;

+

+		if (!isset($this->global->THEME_HIDE_BORDER_ON_INPUT)) $this->global->THEME_HIDE_BORDER_ON_INPUT = 0;

+

+		// Save inconsistent option

+		if (empty($this->global->AGENDA_USE_EVENT_TYPE) && (!isset($this->global->AGENDA_DEFAULT_FILTER_TYPE) || $this->global->AGENDA_DEFAULT_FILTER_TYPE == 'AC_NON_AUTO'))

+		{

+			$this->global->AGENDA_DEFAULT_FILTER_TYPE = '0'; // 'AC_NON_AUTO' does not exists when AGENDA_DEFAULT_FILTER_TYPE is not on.

+		}

+

+		if (!isset($this->global->MAIN_JS_GRAPH)) $this->global->MAIN_JS_GRAPH = 'chart'; // Use chart.js library

+

+		if (empty($this->global->MAIN_MODULE_DOLISTORE_API_SRV)) $this->global->MAIN_MODULE_DOLISTORE_API_SRV = 'https://www.dolistore.com';

+		if (empty($this->global->MAIN_MODULE_DOLISTORE_API_KEY)) $this->global->MAIN_MODULE_DOLISTORE_API_KEY = 'dolistorecatalogpublickey1234567';

+

+		// If we are in develop mode, we activate the option MAIN_SECURITY_CSRF_WITH_TOKEN to 1 if not already defined.

+		if (!isset($this->global->MAIN_SECURITY_CSRF_WITH_TOKEN) && $this->global->MAIN_FEATURES_LEVEL >= 2) $this->global->MAIN_SECURITY_CSRF_WITH_TOKEN = 1;

+

+		// For backward compatibility

+		if (isset($this->product))   $this->produit = $this->product;

+		if (isset($this->facture))   $this->invoice = $this->facture;

+		if (isset($this->commande))  $this->order = $this->commande;

+		if (isset($this->contrat))   $this->contract = $this->contrat;

+		if (isset($this->categorie)) $this->category = $this->categorie;

+		if (isset($this->project))   $this->project = $this->projet;

+

+        // Object $mc

+        if (!defined('NOREQUIREMC') && !empty($this->multicompany->enabled))

+        {

+        	if (is_object($mc)) $mc->setValues($this);

+        }

+

+		// We init log handlers

+		if (!empty($this->global->SYSLOG_HANDLERS)) {

+			$handlers = json_decode($this->global->SYSLOG_HANDLERS);

+		} else {

+			$handlers = array();

+		}

+		foreach ($handlers as $handler) {

+			$handler_files = array();

+			$dirsyslogs = array_merge(array('/core/modules/syslog/'), $this->modules_parts['syslog']);

+			foreach ($dirsyslogs as $reldir) {

+				$dir = dol_buildpath($reldir, 0);

+				$newdir = dol_osencode($dir);

+				if (is_dir($newdir)) {

+					$file = $newdir.$handler.'.php';

+					if (file_exists($file)) {

+						$handler_files[] = $file;

@@ -715,434 +735,14 @@
-			if (!isset($this->global->STOCK_SHOW_ALL_BATCH_BY_DEFAULT)) {

-				$this->global->STOCK_SHOW_ALL_BATCH_BY_DEFAULT = 1;

-			}

-

-			// conf->currency

-			if (empty($this->global->MAIN_MONNAIE)) {

-				$this->global->MAIN_MONNAIE = 'EUR';

-			}

-			$this->currency = $this->global->MAIN_MONNAIE;

-

-			if (empty($this->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY)) {

-				$this->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY = 30; // Less than 1 minutes to be sure

-			}

-

-			// conf->global->ACCOUNTING_MODE = Option des modules Comptabilites (simple ou expert). Defini le mode de calcul des etats comptables (CA,...)

-			if (empty($this->global->ACCOUNTING_MODE)) {

-				$this->global->ACCOUNTING_MODE = 'RECETTES-DEPENSES'; // By default. Can be 'RECETTES-DEPENSES' ou 'CREANCES-DETTES'

-			}

-

-			if (!isset($this->global->MAIN_ENABLE_AJAX_TOOLTIP)) {

-				$this->global->MAIN_ENABLE_AJAX_TOOLTIP = 0;	// Not enabled by default (still trouble of persistent tooltip)

-			}

-

-			// By default, suppliers objects can be linked to all projects

-			if (!isset($this->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS)) {

-				$this->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS = 1;

-			}

-

-			// By default we enable feature to bill time spent

-			if (!isset($this->global->PROJECT_BILL_TIME_SPENT)) {

-				$this->global->PROJECT_BILL_TIME_SPENT = 1;

-			}

-

-			// MAIN_HTML_TITLE

-			if (!isset($this->global->MAIN_HTML_TITLE)) {

-				$this->global->MAIN_HTML_TITLE = 'noapp,thirdpartynameonly,contactnameonly,projectnameonly';

-			}

-

-			// conf->liste_limit = constante de taille maximale des listes

-			if (empty($this->global->MAIN_SIZE_LISTE_LIMIT)) {

-				$this->global->MAIN_SIZE_LISTE_LIMIT = 15;

-			}

-			$this->liste_limit = $this->global->MAIN_SIZE_LISTE_LIMIT;

-

-			// conf->product->limit_size = constante de taille maximale des select de produit

-			if (!isset($this->global->PRODUIT_LIMIT_SIZE)) {

-				$this->global->PRODUIT_LIMIT_SIZE = 1000;

-			}

-			$this->product->limit_size = $this->global->PRODUIT_LIMIT_SIZE;

-

-			// Set PRODUIT_DESC_IN_FORM_ACCORDING_TO_DEVICE, may be modified later according to browser

-			$this->global->PRODUIT_DESC_IN_FORM_ACCORDING_TO_DEVICE = (isset($this->global->PRODUIT_DESC_IN_FORM) ? $this->global->PRODUIT_DESC_IN_FORM : 0);

-

-			// conf->theme et $this->css

-			if (empty($this->global->MAIN_THEME)) {

-				$this->global->MAIN_THEME = "eldy";

-			}

-			if (!empty($this->global->MAIN_FORCETHEME)) {

-				$this->global->MAIN_THEME = $this->global->MAIN_FORCETHEME;

-			}

-			$this->theme = $this->global->MAIN_THEME;

-			$this->css = "/theme/".$this->theme."/style.css.php";

-

-			// conf->email_from = email by default to send Dolibarr automatic emails

-			$this->email_from = "robot@example.com";

-			if (!empty($this->global->MAIN_MAIL_EMAIL_FROM)) {

-				$this->email_from = $this->global->MAIN_MAIL_EMAIL_FROM;

-			}

-

-			// conf->notification->email_from = email by default to send Dolibarr notifications

-			if (isModEnabled('notification')) {

-				$this->notification->email_from = $this->email_from;

-				if (!empty($this->global->NOTIFICATION_EMAIL_FROM)) {

-					$this->notification->email_from = $this->global->NOTIFICATION_EMAIL_FROM;

-				}

-			}

-

-			if (!isset($this->global->MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP)) {

-				$this->global->MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP = 1;

-			}

-

-			if (!isset($this->global->MAIN_FIX_FOR_BUGGED_MTA)) {

-				$this->global->MAIN_FIX_FOR_BUGGED_MTA = 1;

-			}

-

-			// Format for date (used by default when not found or not searched in lang)

-			$this->format_date_short = "%d/%m/%Y"; // Format of day with PHP/C tags (strftime functions)

-			$this->format_date_short_java = "dd/MM/yyyy"; // Format of day with Java tags

-			$this->format_hour_short = "%H:%M";

-			$this->format_hour_short_duration = "%H:%M";

-			$this->format_date_text_short = "%d %b %Y";

-			$this->format_date_text = "%d %B %Y";

-			$this->format_date_hour_short = "%d/%m/%Y %H:%M";

-			$this->format_date_hour_sec_short = "%d/%m/%Y %H:%M:%S";

-			$this->format_date_hour_text_short = "%d %b %Y %H:%M";

-			$this->format_date_hour_text = "%d %B %Y %H:%M";

-

-			// Duration of workday

-			if (!isset($this->global->MAIN_DURATION_OF_WORKDAY)) {

-				$this->global->MAIN_DURATION_OF_WORKDAY = 86400;

-			}

-

-			// Limites decimales si non definie (peuvent etre egale a 0)

-			if (!isset($this->global->MAIN_MAX_DECIMALS_UNIT)) {

-				$this->global->MAIN_MAX_DECIMALS_UNIT = 5;

-			}

-			if (!isset($this->global->MAIN_MAX_DECIMALS_TOT)) {

-				$this->global->MAIN_MAX_DECIMALS_TOT = 2;

-			}

-			if (!isset($this->global->MAIN_MAX_DECIMALS_SHOWN)) {

-				$this->global->MAIN_MAX_DECIMALS_SHOWN = 8;

-			}

-

-			// Default pdf option

-			if (!isset($this->global->MAIN_PDF_DASH_BETWEEN_LINES)) {

-				$this->global->MAIN_PDF_DASH_BETWEEN_LINES = 1; // use dash between lines

-			}

-			if (!isset($this->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {

-				$this->global->PDF_ALLOW_HTML_FOR_FREE_TEXT = 1; // allow html content into free footer text

-			}

-

-			// Default max file size for upload (deprecated)

-			//$this->maxfilesize = (empty($this->global->MAIN_UPLOAD_DOC) ? 0 : (int) $this->global->MAIN_UPLOAD_DOC * 1024);

-

-			// By default, we propagate contacts

-			if (!isset($this->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN)) {

-				$this->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN = '*'; // Can be also '*' or '^(BILLING|SHIPPING|CUSTOMER|.*)$' (regex not yet implemented)

-			}

-

-			// By default, we do not use the zip town table but the table of third parties

-			if (!isset($this->global->MAIN_USE_ZIPTOWN_DICTIONNARY)) {

-				$this->global->MAIN_USE_ZIPTOWN_DICTIONNARY = 0;

-			}

-

-			// By default, we open card if one found

-			if (!isset($this->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE)) {

-				$this->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE = 1;

-			}

-

-			// By default, we show state code in combo list

-			if (!isset($this->global->MAIN_SHOW_STATE_CODE)) {

-				$this->global->MAIN_SHOW_STATE_CODE = 1;

-			}

-

-			// By default, we show state code in combo list

-			if (!isset($this->global->MULTICURRENCY_USE_ORIGIN_TX)) {

-				$this->global->MULTICURRENCY_USE_ORIGIN_TX = 1;

-			}

-

-			// By default, use an enclosure " for field with CRL or LF into content, + we also remove also CRL/LF chars.

-			if (!isset($this->global->USE_STRICT_CSV_RULES)) {

-				$this->global->USE_STRICT_CSV_RULES = 2;

-			}

-

-			// Use a SCA ready workflow with Stripe module (STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION by default if nothing defined)

-			if (!isset($this->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION) && empty($this->global->STRIPE_USE_NEW_CHECKOUT)) {

-				$this->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION = 1;

-			}

-

-			// Define list of limited modules (value must be key found for "name" property of module, so for example 'supplierproposal' for Module "Supplier Proposal"

-			if (!isset($this->global->MAIN_MODULES_FOR_EXTERNAL)) {

-				$this->global->MAIN_MODULES_FOR_EXTERNAL = 'user,societe,propal,commande,facture,categorie,supplierproposal,fournisseur,contact,projet,contrat,ficheinter,expedition,reception,agenda,resource,adherent,blockedlog'; // '' means 'all'. Note that contact is added here as it should be a module later.

-			}

-			if (!empty($this->modules_parts['moduleforexternal'])) {		// Module part to include an external module into the MAIN_MODULES_FOR_EXTERNAL list

-				foreach ($this->modules_parts['moduleforexternal'] as $key => $value) {

-					$this->global->MAIN_MODULES_FOR_EXTERNAL .= ",".$key;

-				}

-			}

-

-			// Enable select2

-			if (empty($this->global->MAIN_USE_JQUERY_MULTISELECT) || $this->global->MAIN_USE_JQUERY_MULTISELECT == '1') {

-				$this->global->MAIN_USE_JQUERY_MULTISELECT = 'select2';

-			}

-

-			// Timeouts

-			if (empty($this->global->MAIN_USE_CONNECT_TIMEOUT)) {

-				$this->global->MAIN_USE_CONNECT_TIMEOUT = 10;

-			}

-			if (empty($this->global->MAIN_USE_RESPONSE_TIMEOUT)) {

-				$this->global->MAIN_USE_RESPONSE_TIMEOUT = 30;

-			}

-

-			// Set default variable to calculate VAT as if option tax_mode was 0 (standard)

-			if (empty($this->global->TAX_MODE_SELL_PRODUCT)) {

-				$this->global->TAX_MODE_SELL_PRODUCT = 'invoice';

-			}

-			if (empty($this->global->TAX_MODE_BUY_PRODUCT)) {

-				$this->global->TAX_MODE_BUY_PRODUCT = 'invoice';

-			}

-			if (empty($this->global->TAX_MODE_SELL_SERVICE)) {

-				$this->global->TAX_MODE_SELL_SERVICE = 'payment';

-			}

-			if (empty($this->global->TAX_MODE_BUY_SERVICE)) {

-				$this->global->TAX_MODE_BUY_SERVICE = 'payment';

-			}

-

-			// Delay before warnings

-			// Avoid strict errors. TODO: Replace xxx->warning_delay with a property ->warning_delay_xxx

-			if (isset($this->agenda)) {

-				$this->adherent->subscription = new stdClass();

-				$this->adherent->subscription->warning_delay = (isset($this->global->MAIN_DELAY_MEMBERS) ? (int) $this->global->MAIN_DELAY_MEMBERS : 0) * 86400;

-			}

-			if (isset($this->agenda)) {

-				$this->agenda->warning_delay = (isset($this->global->MAIN_DELAY_ACTIONS_TODO) ? (int) $this->global->MAIN_DELAY_ACTIONS_TODO : 7) * 86400;

-			}

-			if (isset($this->projet)) {

-				$this->projet->warning_delay = (getDolGlobalInt('MAIN_DELAY_PROJECT_TO_CLOSE', 7) * 86400);

-				$this->projet->task = new StdClass();

-				$this->projet->task->warning_delay = (getDolGlobalInt('MAIN_DELAY_TASKS_TODO', 7) * 86400);

-			}

-

-			if (isset($this->commande)) {

-				$this->commande->client = new stdClass();

-				$this->commande->fournisseur = new stdClass();

-				$this->commande->client->warning_delay = (isset($this->global->MAIN_DELAY_ORDERS_TO_PROCESS) ? (int) $this->global->MAIN_DELAY_ORDERS_TO_PROCESS : 2) * 86400;

-				$this->commande->fournisseur->warning_delay = (isset($this->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS) ? (int) $this->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS : 7) * 86400;

-			}

-			if (isset($this->propal)) {

-				$this->propal->cloture = new stdClass();

-				$this->propal->facturation = new stdClass();

-				$this->propal->cloture->warning_delay = (isset($this->global->MAIN_DELAY_PROPALS_TO_CLOSE) ? (int) $this->global->MAIN_DELAY_PROPALS_TO_CLOSE : 0) * 86400;

-				$this->propal->facturation->warning_delay = (isset($this->global->MAIN_DELAY_PROPALS_TO_BILL) ? (int) $this->global->MAIN_DELAY_PROPALS_TO_BILL : 0) * 86400;

-			}

-			if (isset($this->facture)) {

-				$this->facture->client = new stdClass();

-				$this->facture->fournisseur = new stdClass();

-				$this->facture->client->warning_delay = (isset($this->global->MAIN_DELAY_CUSTOMER_BILLS_UNPAYED) ? (int) $this->global->MAIN_DELAY_CUSTOMER_BILLS_UNPAYED : 0) * 86400;

-				$this->facture->fournisseur->warning_delay = (isset($this->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY) ? (int) $this->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY : 0) * 86400;

-			}

-			if (isset($this->contrat)) {

-				$this->contrat->services = new stdClass();

-				$this->contrat->services->inactifs = new stdClass();

-				$this->contrat->services->expires = new stdClass();

-				$this->contrat->services->inactifs->warning_delay = (isset($this->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES) ? (int) $this->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES : 0) * 86400;

-				$this->contrat->services->expires->warning_delay = (isset($this->global->MAIN_DELAY_RUNNING_SERVICES) ? (int) $this->global->MAIN_DELAY_RUNNING_SERVICES : 0) * 86400;

-			}

-			if (isset($this->commande)) {

-				$this->bank->rappro	= new stdClass();

-				$this->bank->cheque	= new stdClass();

-				$this->bank->rappro->warning_delay = (isset($this->global->MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE) ? (int) $this->global->MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE : 0) * 86400;

-				$this->bank->cheque->warning_delay = (isset($this->global->MAIN_DELAY_CHEQUES_TO_DEPOSIT) ? (int) $this->global->MAIN_DELAY_CHEQUES_TO_DEPOSIT : 0) * 86400;

-			}

-			if (isset($this->expensereport)) {

-				$this->expensereport->approve = new stdClass();

-				$this->expensereport->approve->warning_delay = (isset($this->global->MAIN_DELAY_EXPENSEREPORTS) ? (int) $this->global->MAIN_DELAY_EXPENSEREPORTS : 0) * 86400;

-				$this->expensereport->payment = new stdClass();

-				$this->expensereport->payment->warning_delay = (isset($this->global->MAIN_DELAY_EXPENSEREPORTS_TO_PAY) ? (int) $this->global->MAIN_DELAY_EXPENSEREPORTS_TO_PAY : 0) * 86400;

-			}

-			if (isset($this->holiday)) {

-				$this->holiday->approve = new stdClass();

-				$this->holiday->approve->warning_delay = (isset($this->global->MAIN_DELAY_HOLIDAYS) ? (int) $this->global->MAIN_DELAY_HOLIDAYS : 0) * 86400;

-			}

-

-			if (!empty($this->global->PRODUIT_MULTIPRICES) && empty($this->global->PRODUIT_MULTIPRICES_LIMIT)) {

-				$this->global->PRODUIT_MULTIPRICES_LIMIT = 5;

-			}

-

-			// For modules that want to disable top or left menu

-			if (!empty($this->global->MAIN_HIDE_TOP_MENU)) {

-				$this->dol_hide_topmenu = $this->global->MAIN_HIDE_TOP_MENU;

-			}

-			if (!empty($this->global->MAIN_HIDE_LEFT_MENU)) {

-				$this->dol_hide_leftmenu = $this->global->MAIN_HIDE_LEFT_MENU;

-			}

-

-			if (empty($this->global->MAIN_SIZE_SHORTLIST_LIMIT)) {

-				$this->global->MAIN_SIZE_SHORTLIST_LIMIT = 3;

-			}

-

-			// Save inconsistent option

-			if (empty($this->global->AGENDA_USE_EVENT_TYPE) && (!isset($this->global->AGENDA_DEFAULT_FILTER_TYPE) || $this->global->AGENDA_DEFAULT_FILTER_TYPE == 'AC_NON_AUTO')) {

-				$this->global->AGENDA_DEFAULT_FILTER_TYPE = '0'; // 'AC_NON_AUTO' does not exists when AGENDA_DEFAULT_FILTER_TYPE is not on.

-			}

-

-			if (!isset($this->global->MAIN_JS_GRAPH)) {

-				$this->global->MAIN_JS_GRAPH = 'chart'; // Use chart.js library

-			}

-

-			if (empty($this->global->MAIN_MODULE_DOLISTORE_API_SRV)) {

-				$this->global->MAIN_MODULE_DOLISTORE_API_SRV = 'https://www.dolistore.com';

-			}

-			if (empty($this->global->MAIN_MODULE_DOLISTORE_API_KEY)) {

-				$this->global->MAIN_MODULE_DOLISTORE_API_KEY = 'dolistorecatalogpublickey1234567';

-			}

-

-			// Enable by default the CSRF protection by token.

-			if (!isset($this->global->MAIN_SECURITY_CSRF_WITH_TOKEN)) {

-				// Value 1 makes CSRF check for all POST parameters only

-				// Value 2 makes also CSRF check for GET requests with action = a sensitive requests like action=del, action=remove...

-				// Value 3 makes also CSRF check for all GET requests with a param action or massaction (except some sensitive values)

-				$this->global->MAIN_SECURITY_CSRF_WITH_TOKEN = 2; // TODO Switch value to 3

-				// Note: Set MAIN_SECURITY_CSRF_TOKEN_RENEWAL_ON_EACH_CALL=1 to have a renewal of token at each page call instead of each session (not recommended)

-			}

-

-			if (!isset($this->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_DATA)) {

-				$this->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_DATA = 1;

-			}

-

-			if (!isset($this->global->MAIL_SMTP_USE_FROM_FOR_HELO)) {

-				$this->global->MAIL_SMTP_USE_FROM_FOR_HELO = 2;	// Use the domain in $dolibarr_main_url_root (mydomain.com)

-			}

-

-			if (!defined('MAIN_ANTIVIRUS_BYPASS_COMMAND_AND_PARAM')) {

-				if (defined('MAIN_ANTIVIRUS_COMMAND')) {

-					$this->global->MAIN_ANTIVIRUS_COMMAND = constant('MAIN_ANTIVIRUS_COMMAND');

-				}

-				if (defined('MAIN_ANTIVIRUS_PARAM')) {

-					$this->global->MAIN_ANTIVIRUS_PARAM = constant('MAIN_ANTIVIRUS_PARAM');

-				}

-			}

-

-			// For backward compatibility

-			if (!empty($this->global->LDAP_SYNCHRO_ACTIVE)) {

-				if ($this->global->LDAP_SYNCHRO_ACTIVE == 'dolibarr2ldap') {

-					$this->global->LDAP_SYNCHRO_ACTIVE = 1;

-				} elseif ($this->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr') {

-					$this->global->LDAP_SYNCHRO_ACTIVE = 2;

-				}

-			}

-			// For backward compatibility

-			if (!empty($this->global->LDAP_MEMBER_ACTIVE) && $this->global->LDAP_MEMBER_ACTIVE == 'ldap2dolibarr') {

-				$this->global->LDAP_MEMBER_ACTIVE = 2;

-			}

-			// For backward compatibility

-			if (!empty($this->global->LDAP_MEMBER_TYPE_ACTIVE) && $this->global->LDAP_MEMBER_TYPE_ACTIVE == 'ldap2dolibarr') {

-				$this->global->LDAP_MEMBER_TYPE_ACTIVE = 2;

-			}

-

-			if (!empty($this->global->MAIN_TZUSERINPUTKEY)) {

-				$this->tzuserinputkey = $this->global->MAIN_TZUSERINPUTKEY;	// 'tzserver' or 'tzuserrel'

-			}

-

-			if (!empty($this->global->PRODUIT_AUTOFILL_DESC)) {

-				$this->global->MAIN_NO_CONCAT_DESCRIPTION = 1;

-			} else {

-				unset($this->global->MAIN_NO_CONCAT_DESCRIPTION);

-			}

-

-			// product is new use

-			if (isset($this->product)) {

-				// For backward compatibility

-				$this->produit = $this->product;

-			}

-			// invoice is new use, facture is old use still initialised

-			if (isset($this->facture)) {

-				$this->invoice = $this->facture;

-			}

-			// order is new use, commande is old use still initialised

-			if (isset($this->commande)) {

-				$this->order = $this->commande;

-			}

-			// contract is new use, contrat is old use still initialised

-			if (isset($this->contrat)) {

-				$this->contract = $this->contrat;

-			}

-			// category is new use, categorie is old use still initialised

-			if (isset($this->categorie)) {

-				$this->category = $this->categorie;

-			}

-			// project is new use, projet is old use still initialised

-			if (isset($this->projet) && !isset($this->project)) {

-				$this->project = $this->projet;

-			}

-			// member is new use, adherent is old use still initialised

-			if (isset($this->adherent) && !isset($this->member)) {

-				$this->member = $this->adherent;

-			}

-

-			// Object $mc

-			if (!defined('NOREQUIREMC') && isModEnabled('multicompany')) {

-				if (is_object($mc)) {

-					$mc->setValues($this);

-				}

-			}

-

-			if (isModEnabled('syslog')) {

-				// We init log handlers

-				if (!empty($this->global->SYSLOG_HANDLERS)) {

-					$handlers = json_decode($this->global->SYSLOG_HANDLERS);

-				} else {

-					$handlers = array();

-				}

-				foreach ($handlers as $handler) {

-					$handler_file_found = '';

-					$dirsyslogs = array('/core/modules/syslog/');

-					if (!empty($this->modules_parts['syslog']) && is_array($this->modules_parts['syslog'])) {

-						$dirsyslogs = array_merge($dirsyslogs, $this->modules_parts['syslog']);

-					}

-					foreach ($dirsyslogs as $reldir) {

-						$dir = dol_buildpath($reldir, 0);

-						$newdir = dol_osencode($dir);

-						if (is_dir($newdir)) {

-							$file = $newdir.$handler.'.php';

-							if (file_exists($file)) {

-								$handler_file_found = $file;

-								break;

-							}

-						}

-					}

-

-					if (empty($handler_file_found)) {

-						// If log handler has been removed of is badly setup, we must be able to continue code.

-						//throw new Exception('Missing log handler file '.$handler.'.php');

-						continue;

-					}

-

-					require_once $handler_file_found;

-					$loghandlerinstance = new $handler();

-					if (!$loghandlerinstance instanceof LogHandlerInterface) {

-						throw new Exception('Log handler does not extend LogHandlerInterface');

-					}

-

-					if (empty($this->loghandlers[$handler])) {

-						$this->loghandlers[$handler] = $loghandlerinstance;

-					}

-				}

-			}

-		}

-

-		// Overwrite database values from conf into the conf.php file.

-		if (!empty($this->file->mailing_limit_sendbyweb)) {

-			$this->global->MAILING_LIMIT_SENDBYWEB = $this->file->mailing_limit_sendbyweb;

-		}

-		if (empty($this->global->MAILING_LIMIT_SENDBYWEB)) {	// Limit by web can't be 0

-			$this->global->MAILING_LIMIT_SENDBYWEB = 25;

-		}

-		if (!empty($this->file->mailing_limit_sendbycli)) {

-			$this->global->MAILING_LIMIT_SENDBYCLI = $this->file->mailing_limit_sendbycli;

-		}

-		if (!empty($this->file->mailing_limit_sendbyday)) {

-			$this->global->MAILING_LIMIT_SENDBYDAY = $this->file->mailing_limit_sendbyday;

-		}

-

-		return 0;

+			if (empty($handler_files)) {

+				throw new Exception('Missing log handler file '.$handler.'.php');

+			}

+

+			require_once $handler_files[0];

+			$loghandlerinstance = new $handler();

+			if (!$loghandlerinstance instanceof LogHandlerInterface) {

+				throw new Exception('Log handler does not extend LogHandlerInterface');

+			}

+

+			if (empty($this->loghandlers[$handler])) {

+				$this->loghandlers[$handler] = $loghandlerinstance;

+			}

+		}

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_coreobject.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_coreobject.class.php
@@ -0,0 +1,438 @@
+<?php

+/* EXPERIMENTAL

+ *

+ * Copyright (C) 2016		ATM Consulting			<support@atm-consulting.fr>

+ *

+ * This program is free software; you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation; either version 3 of the License, or

+ * (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with this program. If not, see <https://www.gnu.org/licenses/>.

+ */

+

+/**

+ *	\file       htdocs/core/class/coreobject.class.php

+ *	\ingroup    core

+ *	\brief      File of class to manage all object. Might be replace or merge into commonobject

+ */

+

+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';

+

+// TODO Remove this class (used in Expensereportik and ExpenseReportRule

+/**

+ * CoreObject

+ */

+class CoreObject extends CommonObject

+{

+    public $withChild = true;

+

+    /**

+     *  @var Array $_fields Fields to synchronize with Database

+     */

+    protected $fields = array();

+

+    /**

+     *  Constructor

+     *

+     *  @param      DoliDB		$db      Database handler

+     */

+    public function __construct(DoliDB &$db)

+    {

+        $this->db = $db;

+    }

+

+    /**

+     * Function to init fields

+     *

+     * @return bool

+     */

+    protected function init()

+    {

+        $this->id = 0;

+        $this->datec = 0;

+        $this->tms = 0;

+

+        if (!empty($this->fields))

+        {

+            foreach ($this->fields as $field=>$info)

+            {

+                if ($this->isDate($info)) $this->{$field} = time();

+                elseif ($this->isArray($info)) $this->{$field} = array();

+                elseif ($this->isInt($info)) $this->{$field} = (int) 0;

+                elseif ($this->isFloat($info)) $this->{$field} = (double) 0;

+                else $this->{$field} = '';

+            }

+

+            $this->to_delete = false;

+            $this->is_clone = false;

+

+            return true;

+        }

+        else

+        {

+            return false;

+        }

+    }

+

+    /**

+     * Test type of field

+     *

+     * @param   string  $field  name of field

+     * @param   string  $type   type of field to test

+     * @return  boolean         value of field or false

+     */

+    private function checkFieldType($field, $type)

+    {

+        if (isset($this->fields[$field]) && method_exists($this, 'is_'.$type))

+        {

+            return $this->{'is_'.$type}($this->fields[$field]);

+        }

+        else

+        {

+            return false;

+        }

+    }

+

+    /**

+     *	Get object and children from database

+     *

+     *	@param      int			$id       		Id of object to load

+     * 	@param		bool		$loadChild		used to load children from database

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

+     */

+    public function fetch($id, $loadChild = true)

+    {

+        $res = $this->fetchCommon($id);

+        if ($res > 0) {

+            if ($loadChild) $this->fetchChild();

+        }

+

+        return $res;

+    }

+

+

+    /**

+     * Function to instantiate a new child

+     *

+     * @param   string  $tabName        Table name of child

+     * @param   int     $id             If id is given, we try to return his key if exist or load if we try_to_load

+     * @param   string  $key            Attribute name of the object id

+     * @param   bool    $try_to_load    Force the fetch if an id is given

+     * @return                          int

+     */

+    public function addChild($tabName, $id = 0, $key = 'id', $try_to_load = false)

+    {

+        if (!empty($id))

+        {

+            foreach ($this->{$tabName} as $k=>&$object)

+            {

+                if ($object->{$key} === $id) return $k;

+            }

+        }

+

+        $k = count($this->{$tabName});

+

+        $className = ucfirst($tabName);

+        $this->{$tabName}[$k] = new $className($this->db);

+        if ($id > 0 && $key === 'id' && $try_to_load)

+        {

+            $this->{$tabName}[$k]->fetch($id);

+        }

+

+        return $k;

+    }

+

+

+    /**

+     * Function to set a child as to delete

+     *

+     * @param   string  $tabName        Table name of child

+     * @param   int     $id             Id of child to set as to delete

+     * @param   string  $key            Attribute name of the object id

+     * @return                          bool

+     */

+    public function removeChild($tabName, $id, $key = 'id')

+    {

+        foreach ($this->{$tabName} as &$object)

+        {

+            if ($object->{$key} == $id)

+            {

+                $object->to_delete = true;

+                return true;

+            }

+        }

+        return false;

+    }

+

+

+    /**

+     * Function to fetch children objects

+     *

+     * @return void

+     */

+    public function fetchChild()

+    {

+        if ($this->withChild && !empty($this->childtables) && !empty($this->fk_element))

+        {

+            foreach ($this->childtables as &$childTable)

+            {

+                $className = ucfirst($childTable);

+

+                $this->{$className} = array();

+

+                $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$childTable.' WHERE '.$this->fk_element.' = '.$this->id;

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

+

+                if ($res)

+                {

+                    while ($obj = $this->db->fetch_object($res))

+                    {

+                        $o = new $className($this->db);

+                        $o->fetch($obj->rowid);

+

+                        $this->{$className}[] = $o;

+                    }

+                }

+                else

+                {

+                    $this->errors[] = $this->db->lasterror();

+                }

+            }

+        }

+    }

+

+    /**

+     * Function to update children data

+     *

+     * @param   User    $user   user object

+     * @return void

+     */

+    public function saveChild(User &$user)

+    {

+        if ($this->withChild && !empty($this->childtables) && !empty($this->fk_element))

+        {

+            foreach ($this->childtables as &$childTable)

+            {

+                $className = ucfirst($childTable);

+                if (!empty($this->{$className}))

+                {

+                    foreach ($this->{$className} as $i => &$object)

+                    {

+                        $object->{$this->fk_element} = $this->id;

+

+                        $object->update($user);

+                        if ($this->unsetChildDeleted && isset($object->to_delete) && $object->to_delete == true) unset($this->{$className}[$i]);

+                    }

+                }

+            }

+        }

+    }

+

+

+    /**

+     * Function to update object or create or delete if needed

+     *

+     * @param   User    $user   User object

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

+     */

+    public function update(User &$user)

+    {

+        if (empty($this->id)) return $this->create($user); // To test, with that, no need to test on high level object, the core decide it, update just needed

+        elseif (isset($this->to_delete) && $this->to_delete == true) return $this->delete($user);

+

+        $error = 0;

+        $this->db->begin();

+

+        $res = $this->updateCommon($user);

+        if ($res)

+        {

+            $result = $this->call_trigger(strtoupper($this->element).'_UPDATE', $user);

+            if ($result < 0) $error++;

+            else $this->saveChild($user);

+        }

+        else

+        {

+            $error++;

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

+            $this->errors[] = $this->error;

+        }

+

+        if (empty($error))

+        {

+            $this->db->commit();

+            return $this->id;

+        }

+        else

+        {

+            $this->db->rollback();

+            return -1;

+        }

+    }

+

+    /**

+     * Function to create object in database

+     *

+     * @param   User    $user   user object

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

+     */

+    public function create(User &$user)

+    {

+        if ($this->id > 0) return $this->update($user);

+

+        $error = 0;

+        $this->db->begin();

+

+        $res = $this->createCommon($user);

+        if ($res)

+        {

+            $this->id = $this->db->last_insert_id($this->table_element);

+

+            $result = $this->call_trigger(strtoupper($this->element).'_CREATE', $user);

+            if ($result < 0) $error++;

+            else $this->saveChild($user);

+        }

+        else

+        {

+            $error++;

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

+            $this->errors[] = $this->error;

+        }

+

+        if (empty($error))

+        {

+            $this->db->commit();

+            return $this->id;

+        }

+        else

+        {

+            $this->db->rollback();

+            return -1;

+        }

+    }

+

+    /**

+     * Function to delete object in database

+     *

+     * @param   User    $user   user object

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

+     */

+    public function delete(User &$user)

+    {

+        if ($this->id <= 0) return 0;

+

+        $error = 0;

+        $this->db->begin();

+

+        $result = $this->call_trigger(strtoupper($this->element).'_DELETE', $user);

+        if ($result < 0) $error++;

+

+        if (!$error)

+        {

+            $this->deleteCommon($user);

+            if ($this->withChild && !empty($this->childtables))

+            {

+                foreach ($this->childtables as &$childTable)

+                {

+                    $className = ucfirst($childTable);

+                    if (!empty($this->{$className}))

+                    {

+                        foreach ($this->{$className} as &$object)

+                        {

+                            $object->delete($user);

+                        }

+                    }

+                }

+            }

+        }

+

+        if (empty($error))

+        {

+            $this->db->commit();

+            return 1;

+        }

+        else

+        {

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

+            $this->errors[] = $this->error;

+            $this->db->rollback();

+            return -1;

+        }

+    }

+

+

+    /**

+     * Function to get a formatted date

+     *

+     * @param   string  $field  Attribute to return

+     * @param   string  $format Output date format

+     * @return          string

+     */

+    public function getDate($field, $format = '')

+    {

+        if (empty($this->{$field})) return '';

+        else

+        {

+            return dol_print_date($this->{$field}, $format);

+        }

+    }

+

+    /**

+     * Function to set date in field

+     *

+     * @param   string  $field  field to set

+     * @param   string  $date   formatted date to convert

+     * @return                  mixed

+     */

+    public function setDate($field, $date)

+    {

+        if (empty($date))

+        {

+            $this->{$field} = 0;

+        }

+        else

+        {

+            require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';

+            $this->{$field} = dol_stringtotime($date);

+        }

+

+        return $this->{$field};

+    }

+

+

+    /**

+     * Function to update current object

+     *

+     * @param   array   $Tab    Array of values

+     * @return                  int

+     */

+    public function setValues(&$Tab)

+    {

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

+        {

+            if ($this->checkFieldType($key, 'date'))

+            {

+                $this->setDate($key, $value);

+            }

+            elseif ($this->checkFieldType($key, 'float'))

+            {

+                $this->{$key} = (double) price2num($value);

+            }

+            elseif ($this->checkFieldType($key, 'int')) {

+                $this->{$key} = (int) price2num($value);

+            }

+            else

+            {

+            	$this->{$key} = dol_string_nohtmltag($value);

+            }

+        }

+

+        return 1;

+    }

+}

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_cstate.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_cstate.class.php
@@ -24,4 +23,0 @@
-// Put here all includes required by your class file

-require_once DOL_DOCUMENT_ROOT.'/core/class/commondict.class.php';

-

-

@@ -31 +27 @@
-class Cstate extends CommonDict

+class Cstate // extends CommonObject

@@ -33,0 +30,18 @@
+     * @var DoliDB Database handler.

+     */

+    public $db;

+

+	/**

+	 * @var string Error code (or message)

+	 */

+	public $error = '';

+

+	/**

+	 * @var string[] Error codes (or messages)

+	 */

+	public $errors = array();

+

+	//var $element='cstate';			//!< Id that identify managed objects

+	//var $table_element='cstate';	    //!< Name of table without prefix where object is stored

+

+    /**

@@ -36 +50 @@
-	public $rowid;

+	public $id;

@@ -39,5 +52,0 @@
-

-	/**

-	 * @var string name

-	 */

-	public $name = '';

@@ -52,21 +61,31 @@
-

-	/**

-	 *  Constructor

-	 *

-	 *  @param      DoliDb		$db      Database handler

-	 */

-	public function __construct($db)

-	{

-		$this->db = $db;

-	}

-

-

-	/**

-	 *  Create object into database

-	 *

-	 *  @param      User	$user        User that create

-	 *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers

-	 *  @return     int      		   	 Return integer <0 if KO, Id of created object if OK

-	 */

-	public function create($user, $notrigger = 0)

-	{

+	/**

+	 * @var string name

+	 */

+	public $name = '';

+

+	public $active;

+

+

+

+

+    /**

+     *  Constructor

+     *

+     *  @param      DoliDb		$db      Database handler

+     */

+    public function __construct($db)

+    {

+        $this->db = $db;

+    }

+

+

+    /**

+     *  Create object into database

+     *

+     *  @param      User	$user        User that create

+     *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers

+     *  @return     int      		   	 <0 if KO, Id of created object if OK

+     */

+    public function create($user, $notrigger = 0)

+    {

+    	global $conf, $langs;

@@ -76,9 +95,3 @@
-		if (isset($this->code_departement)) {

-			$this->code_departement = trim($this->code_departement);

-		}

-		if (isset($this->nom)) {

-			$this->nom = trim($this->nom);

-		}

-		if (isset($this->active)) {

-			$this->active = trim($this->active);

-		}

+		if (isset($this->code_departement)) $this->code_departement = trim($this->code_departement);

+		if (isset($this->nom)) $this->nom = trim($this->nom);

+		if (isset($this->active)) $this->active = trim($this->active);

@@ -89,2 +102,2 @@
-		// Insert request

-		$sql = "INSERT INTO ".$this->db->prefix()."c_departements(";

+        // Insert request

+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_departements(";

@@ -95 +108 @@
-		$sql .= ") VALUES (";

+        $sql .= ") VALUES (";

@@ -99 +112 @@
-		$sql .= " ".(!isset($this->active) ? 'NULL' : "'".$this->db->escape($this->active)."'");

+		$sql .= " ".(!isset($this->active) ? 'NULL' : "'".$this->db->escape($this->active)."'")."";

@@ -104,16 +117,15 @@
-		dol_syslog(get_class($this)."::create", LOG_DEBUG);

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

-		if (!$resql) {

-			$error++;

-			$this->errors[] = "Error ".$this->db->lasterror();

-		}

-

-		if (!$error) {

-			$this->id = $this->db->last_insert_id($this->db->prefix()."c_departements");

-		}

-

-		// Commit or rollback

-		if ($error) {

-			foreach ($this->errors as $errmsg) {

-				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);

-				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);

+	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);

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

+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }

+

+        if (!$error) {

+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_departements");

+        }

+

+        // Commit or rollback

+        if ($error)

+		{

+			foreach ($this->errors as $errmsg)

+			{

+	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);

+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);

@@ -123 +135,3 @@
-		} else {

+		}

+		else

+		{

@@ -125,15 +139,16 @@
-			return $this->id;

-		}

-	}

-

-

-	/**

-	 *  Load object in memory from database

-	 *

-	 *  @param      int		$id    	Id object

-	 *  @param		string	$code	Code

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

-	 */

-	public function fetch($id, $code = '')

-	{

-		$sql = "SELECT";

+            return $this->id;

+		}

+    }

+

+

+    /**

+     *  Load object in memory from database

+     *

+     *  @param      int		$id    	Id object

+     *  @param		string	$code	Code

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

+     */

+    public function fetch($id, $code = '')

+    {

+    	global $langs;

+        $sql = "SELECT";

@@ -144,8 +159,95 @@
-		$sql .= " FROM ".$this->db->prefix()."c_departements as t";

-		if ($id) {

-			$sql .= " WHERE t.rowid = ".((int) $id);

-		} elseif ($code) {

-			$sql .= " WHERE t.code_departement = '".$this->db->escape($code)."'";

-		}

-

-		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);

+        $sql .= " FROM ".MAIN_DB_PREFIX."c_departements as t";

+        if ($id)   $sql .= " WHERE t.rowid = ".$id;

+        elseif ($code) $sql .= " WHERE t.code_departement = '".$this->db->escape($code)."'";

+

+    	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);

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

+        if ($resql)

+        {

+            if ($this->db->num_rows($resql))

+            {

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

+

+                $this->id = $obj->rowid;

+				$this->code_departement = $obj->code_departement;

+				$this->nom = $obj->nom;

+				$this->active = $obj->active;

+            }

+            $this->db->free($resql);

+

+            return 1;

+        }

+        else

+        {

+      	    $this->error = "Error ".$this->db->lasterror();

+            return -1;

+        }

+    }

+

+

+    /**

+     *  Update object into database

+     *

+     *  @param      User	$user        User that modify

+     *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers

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

+     */

+    public function update($user = null, $notrigger = 0)

+    {

+    	global $conf, $langs;

+		$error = 0;

+

+		// Clean parameters

+		if (isset($this->code_departement)) $this->code_departement = trim($this->code_departement);

+		if (isset($this->nom)) $this->nom = trim($this->nom);

+		if (isset($this->active)) $this->active = trim($this->active);

+

+

+		// Check parameters

+		// Put here code to add control on parameters values

+

+        // Update request

+        $sql = "UPDATE ".MAIN_DB_PREFIX."c_departements SET";

+		$sql .= " code_departement=".(isset($this->code_departement) ? "'".$this->db->escape($this->code_departement)."'" : "null").",";

+		$sql .= " nom=".(isset($this->nom) ? "'".$this->db->escape($this->nom)."'" : "null").",";

+		$sql .= " active=".(isset($this->active) ? $this->active : "null")."";

+        $sql .= " WHERE rowid=".$this->id;

+

+		$this->db->begin();

+

+		dol_syslog(get_class($this)."::update", LOG_DEBUG);

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

+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }

+

+	    // Commit or rollback

+	    if ($error) {

+		    foreach ($this->errors as $errmsg) {

+			    dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);

+			    $this->error .= ($this->error ? ', '.$errmsg : $errmsg);

+		    }

+		    $this->db->rollback();

+		    return -1 * $error;

+	    } else {

+		    $this->db->commit();

+		    return 1;

+	    }

+    }

+

+ 	/**

+ 	 *  Delete object in database

+	 *

+     *	@param  User	$user        User that delete

+     *  @param	int		$notrigger	 0=launch triggers after, 1=disable triggers

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

+	 */

+	public function delete($user, $notrigger = 0)

+	{

+		global $conf, $langs;

+		$error = 0;

+

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

+		$sql .= " WHERE rowid=".$this->id;

+

+		$this->db->begin();

+

+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);

@@ -153,69 +255,9 @@
-		if ($resql) {

-			if ($this->db->num_rows($resql)) {

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

-

-				$this->id = $obj->rowid;

-				$this->code_departement = $obj->code_departement; //deprecated

-				$this->code = $obj->code_departement;

-				$this->nom = $obj->nom; //deprecated

-				$this->name = $obj->nom;

-				$this->active = $obj->active;

-			}

-			$this->db->free($resql);

-

-			return 1;

-		} else {

-			$this->error = "Error ".$this->db->lasterror();

-			return -1;

-		}

-	}

-

-

-	/**

-	 *  Update object into database

-	 *

-	 *  @param      User	$user        User that modify

-	 *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers

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

-	 */

-	public function update($user = null, $notrigger = 0)

-	{

-		$error = 0;

-

-		// Clean parameters

-		if (isset($this->code_departement)) {

-			$this->code_departement = trim($this->code_departement);

-		}

-		if (isset($this->name)) {

-			$this->name = trim($this->name);

-		}

-		if (isset($this->active)) {

-			$this->active = trim($this->active);

-		}

-

-		// Check parameters

-		if (empty($this->name) && !empty($this->nom)) {

-			$this->name = $this->nom;

-		}

-

-		// Update request

-		$sql = "UPDATE ".$this->db->prefix()."c_departements SET";

-		$sql .= " code_departement=".(isset($this->code_departement) ? "'".$this->db->escape($this->code_departement)."'" : "null").",";

-		$sql .= " nom=".(isset($this->name) ? "'".$this->db->escape($this->name)."'" : "null").",";

-		$sql .= " active=".(isset($this->active) ? ((int) $this->active) : "null");

-		$sql .= " WHERE rowid=".((int) $this->id);

-

-		$this->db->begin();

-

-		dol_syslog(get_class($this)."::update", LOG_DEBUG);

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

-		if (!$resql) {

-			$error++;

-			$this->errors[] = "Error ".$this->db->lasterror();

-		}

-

-		// Commit or rollback

-		if ($error) {

-			foreach ($this->errors as $errmsg) {

-				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);

-				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);

+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }

+

+        // Commit or rollback

+		if ($error)

+		{

+			foreach ($this->errors as $errmsg)

+			{

+	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);

+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);

@@ -225 +267,3 @@
-		} else {

+		}

+		else

+		{

@@ -230,53 +273,0 @@
-

-	/**

-	 *  Delete object in database

-	 *

-	 *	@param  User	$user        User that delete

-	 *  @param	int		$notrigger	 0=launch triggers after, 1=disable triggers

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

-	 */

-	public function delete($user, $notrigger = 0)

-	{

-		$error = 0;

-

-		$sql = "DELETE FROM ".$this->db->prefix()."c_departements";

-		$sql .= " WHERE rowid=".((int) $this->id);

-

-		$this->db->begin();

-

-		dol_syslog(get_class($this)."::delete", LOG_DEBUG);

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

-		if (!$resql) {

-			$error++;

-			$this->errors[] = "Error ".$this->db->lasterror();

-		}

-

-		// Commit or rollback

-		if ($error) {

-			foreach ($this->errors as $errmsg) {

-				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);

-				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);

-			}

-			$this->db->rollback();

-			return -1 * $error;

-		} else {

-			$this->db->commit();

-			return 1;

-		}

-	}

-

-	/**

-	 *  Return a link to the object card (with optionaly the picto)

-	 *

-	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)

-	 *	@param	string	$option						On what the link point to ('nolink', ...)

-	 *  @param	int  	$notooltip					1=Disable tooltip

-	 *  @param  string  $morecss            		Add more css on link

-	 *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking

-	 *	@return	string								String with URL

-	 */

-	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)

-	{

-		global $langs;

-		return $langs->trans($this->name);

-	}

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_ctypent.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_ctypent.class.php
@@ -24,3 +23,0 @@
-// Put here all includes required by your class file

-require_once DOL_DOCUMENT_ROOT.'/core/class/commondict.class.php';

-

@@ -31 +28 @@
-class Ctypent extends CommonDict

+class Ctypent // extends CommonObject

@@ -34,4 +31,23 @@
-	 * @var int ID of country

-	 */

-	public $country_id;

-

+     * @var DoliDB Database handler.

+     */

+    public $db;

+

+	/**

+	 * @var string Error code (or message)

+	 */

+	public $error = '';

+

+	/**

+	 * @var string[] Error codes (or messages)

+	 */

+	public $errors = array();

+

+	//var $element='ctypent';			//!< Id that identify managed objects

+	//var $table_element='ctypent';	//!< Name of table without prefix where object is stored

+

+    /**

+	 * @var int ID

+	 */

+	public $id;

+

+	public $code;

@@ -38,0 +55 @@
+	public $active;

@@ -41,21 +58,24 @@
-	/**

-	 *  Constructor

-	 *

-	 *  @param      DoliDb		$db      Database handler

-	 */

-	public function __construct($db)

-	{

-		$this->db = $db;

-	}

-

-

-	/**

-	 *  Create object into database

-	 *

-	 *  @param      User	$user        User that create

-	 *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers

-	 *  @return     int      		   	 Return integer <0 if KO, Id of created object if OK

-	 */

-	public function create($user, $notrigger = 0)

-	{

-		global $conf, $langs;

+

+

+

+    /**

+     *  Constructor

+     *

+     *  @param      DoliDb		$db      Database handler

+     */

+    public function __construct($db)

+    {

+        $this->db = $db;

+    }

+

+

+    /**

+     *  Create object into database

+     *

+     *  @param      User	$user        User that create

+     *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers

+     *  @return     int      		   	 <0 if KO, Id of created object if OK

+     */

+    public function create($user, $notrigger = 0)

+    {

+    	global $conf, $langs;

@@ -66,15 +86,7 @@
-		if (isset($this->id)) {

-			$this->id = trim($this->id);

-		}

-		if (isset($this->code)) {

-			$this->code = trim($this->code);

-		}

-		if (isset($this->libelle)) {

-			$this->libelle = trim($this->libelle);

-		}

-		if (isset($this->active)) {

-			$this->active = trim($this->active);

-		}

-		if (isset($this->module)) {

-			$this->module = trim($this->module);

-		}

+		if (isset($this->id)) $this->id = trim($this->id);

+		if (isset($this->code)) $this->code = trim($this->code);

+		if (isset($this->libelle)) $this->libelle = trim($this->libelle);

+		if (isset($this->active)) $this->active = trim($this->active);

+		if (isset($this->module)) $this->module = trim($this->module);

+

+

@@ -85,2 +97,3 @@
-		// Insert request

-		$sql = "INSERT INTO ".$this->db->prefix()."c_typent(";

+        // Insert request

+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_typent(";

+

@@ -92 +105,4 @@
-		$sql .= ") VALUES (";

+

+

+        $sql .= ") VALUES (";

+

@@ -97 +113,3 @@
-		$sql .= " ".(!isset($this->module) ? 'NULL' : "'".$this->db->escape($this->module)."'");

+		$sql .= " ".(!isset($this->module) ? 'NULL' : "'".$this->db->escape($this->module)."'")."";

+

+

@@ -102,16 +120,16 @@
-		dol_syslog(get_class($this)."::create", LOG_DEBUG);

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

-		if (!$resql) {

-			$error++;

-			$this->errors[] = "Error ".$this->db->lasterror();

-		}

-

-		if (!$error) {

-			$this->id = $this->db->last_insert_id($this->db->prefix()."c_typent");

-		}

-

-		// Commit or rollback

-		if ($error) {

-			foreach ($this->errors as $errmsg) {

-				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);

-				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);

+	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);

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

+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }

+

+		if (!$error)

+        {

+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_typent");

+        }

+

+        // Commit or rollback

+        if ($error)

+		{

+			foreach ($this->errors as $errmsg)

+			{

+	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);

+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);

@@ -121 +139,3 @@
-		} else {

+		}

+		else

+		{

@@ -123,16 +143,17 @@
-			return $this->id;

-		}

-	}

-

-

-	/**

-	 *  Load object in memory from database

-	 *

-	 *  @param      int		$id    	Id object

-	 *  @param		string	$code	Code

-	 *  @param		string	$label	Label

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

-	 */

-	public function fetch($id, $code = '', $label = '')

-	{

-		$sql = "SELECT";

+            return $this->id;

+		}

+    }

+

+

+    /**

+     *  Load object in memory from database

+     *

+     *  @param      int		$id    	Id object

+     *  @param		string	$code	Code

+     *  @param		string	$label	Label

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

+     */

+    public function fetch($id, $code = '', $label = '')

+    {

+    	global $langs;

+        $sql = "SELECT";

@@ -145,15 +166,13 @@
-		$sql .= " FROM ".$this->db->prefix()."c_typent as t";

-		if ($id) {

-			$sql .= " WHERE t.id = ".((int) $id);

-		} elseif ($code) {

-			$sql .= " WHERE t.code = '".$this->db->escape($code)."'";

-		} elseif ($label) {

-			$sql .= " WHERE t.libelle = '".$this->db->escape($label)."'";

-		}

-

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

-		if ($resql) {

-			if ($this->db->num_rows($resql)) {

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

-

-				$this->id = $obj->id;

+        $sql .= " FROM ".MAIN_DB_PREFIX."c_typent as t";

+        if ($id)   $sql .= " WHERE t.id = ".$id;

+        elseif ($code) $sql .= " WHERE t.code = '".$this->db->escape($code)."'";

+        elseif ($label) $sql .= " WHERE t.libelle = '".$this->db->escape($label)."'";

+

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

+        if ($resql)

+        {

+            if ($this->db->num_rows($resql))

+            {

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

+

+                $this->id = $obj->id;

@@ -165,21 +184,23 @@
-			}

-			$this->db->free($resql);

-

-			return 1;

-		} else {

-			$this->error = "Error ".$this->db->lasterror();

-			return -1;

-		}

-	}

-

-

-	/**

-	 *  Update object into database

-	 *

-	 *  @param      User	$user        User that modify

-	 *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers

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

-	 */

-	public function update($user = null, $notrigger = 0)

-	{

-		global $conf, $langs;

+            }

+            $this->db->free($resql);

+

+            return 1;

+        }

+        else

+        {

+      	    $this->error = "Error ".$this->db->lasterror();

+            return -1;

+        }

+    }

+

+

+    /**

+     *  Update object into database

+     *

+     *  @param      User	$user        User that modify

+     *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers

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

+     */

+    public function update($user = null, $notrigger = 0)

+    {

+    	global $conf, $langs;

@@ -189,12 +210,4 @@
-		if (isset($this->code)) {

-			$this->code = trim($this->code);

-		}

-		if (isset($this->libelle)) {

-			$this->libelle = trim($this->libelle);

-		}

-		if (isset($this->active)) {

-			$this->active = trim($this->active);

-		}

-		if (isset($this->module)) {

-			$this->module = trim($this->module);

-		}

+		if (isset($this->code)) $this->code = trim($this->code);

+		if (isset($this->libelle)) $this->libelle = trim($this->libelle);

+		if (isset($this->active)) $this->active = trim($this->active);

+		if (isset($this->module)) $this->module = trim($this->module);

@@ -206,2 +219,2 @@
-		// Update request

-		$sql = "UPDATE ".$this->db->prefix()."c_typent SET";

+        // Update request

+        $sql = "UPDATE ".MAIN_DB_PREFIX."c_typent SET";

@@ -210,3 +223,3 @@
-		$sql .= " active=".(isset($this->active) ? ((int) $this->active) : "null").",";

-		$sql .= " module=".(isset($this->module) ? "'".$this->db->escape($this->module)."'" : "null");

-		$sql .= " WHERE id=".$this->id;

+		$sql .= " active=".(isset($this->active) ? $this->active : "null").",";

+		$sql .= " module=".(isset($this->module) ? "'".$this->db->escape($this->module)."'" : "null")."";

+        $sql .= " WHERE id=".$this->id;

@@ -217,11 +230,10 @@
-		$resql = $this->db->query($sql);

-		if (!$resql) {

-			$error++;

-			$this->errors[] = "Error ".$this->db->lasterror();

-		}

-

-		// Commit or rollback

-		if ($error) {

-			foreach ($this->errors as $errmsg) {

-				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);

-				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);

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

+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }

+

+        // Commit or rollback

+		if ($error)

+		{

+			foreach ($this->errors as $errmsg)

+			{

+	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);

+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);

@@ -231 +243,3 @@
-		} else {

+		}

+		else

+		{

@@ -235,4 +249,4 @@
-	}

-

-

-	/**

+    }

+

+

+ 	/**

@@ -241,3 +255,3 @@
-	 *	@param  User	$user        User that delete

-	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers

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

+     *	@param  User	$user        User that delete

+     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers

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

@@ -250,2 +264,2 @@
-		$sql = "DELETE FROM ".$this->db->prefix()."c_typent";

-		$sql .= " WHERE id = ".$this->id;

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

+		$sql .= " WHERE id=".$this->id;

@@ -257,10 +271,9 @@
-		if (!$resql) {

-			$error++;

-			$this->errors[] = "Error ".$this->db->lasterror();

-		}

-

-		// Commit or rollback

-		if ($error) {

-			foreach ($this->errors as $errmsg) {

-				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);

-				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);

+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }

+

+        // Commit or rollback

+        if ($error)

+        {

+			foreach ($this->errors as $errmsg)

+			{

+	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);

+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);

@@ -270,5 +283,7 @@
-		} else {

-			$this->db->commit();

-			return 1;

-		}

-	}

+        }

+        else

+        {

+            $this->db->commit();

+            return 1;

+        }

+    }

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_ctyperesource.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_ctyperesource.class.php
@@ -26,4 +25,0 @@
-// Put here all includes required by your class file

-require_once DOL_DOCUMENT_ROOT.'/core/class/commondict.class.php';

-

-

@@ -31,0 +28,4 @@
+ *

+ * Put here description of your class

+ *

+ * @see CommonObject

@@ -33 +33 @@
-class Ctyperesource extends CommonDict

+class Ctyperesource

@@ -48,0 +49,9 @@
+

+	public $code;

+

+	/**

+     * @var string Type resource label

+     */

+    public $label;

+

+	public $active;

@@ -67 +76 @@
-	 * @return int Return integer <0 if KO, Id of created object if OK

+	 * @return int <0 if KO, Id of created object if OK

@@ -78 +87 @@
-			$this->code = trim($this->code);

+			 $this->code = trim($this->code);

@@ -81 +90 @@
-			$this->label = trim($this->label);

+			 $this->label = trim($this->label);

@@ -84,2 +93,7 @@
-			$this->active = trim($this->active);

-		}

+			 $this->active = trim($this->active);

+		}

+

+

+

+		// Check parameters

+		// Put here code to add control on parameters values

@@ -88 +102,2 @@
-		$sql = 'INSERT INTO '.$this->db->prefix().$this->table_element.'(';

+		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element.'(';

+

@@ -91,0 +107,2 @@
+

+

@@ -92,0 +110 @@
+

@@ -95,0 +114,2 @@
+

+

@@ -108,3 +128,3 @@
-			$this->id = $this->db->last_insert_id($this->db->prefix().$this->table_element);

-

-			// Uncomment this and change CTYPERESOURCE to your own tag if you

+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);

+

+			// Uncomment this and change MYOBJECT to your own tag if you

@@ -115 +135 @@
-			//  $result=$this->call_trigger('CTYPERESOURCE_CREATE',$user);

+			//  $result=$this->call_trigger('MYOBJECT_CREATE',$user);

@@ -140 +160 @@
-	 * @return int Return integer <0 if KO, 0 if not found, >0 if OK

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

@@ -146,2 +166,3 @@
-		$sql = "SELECT";

-		$sql .= " t.rowid,";

+		$sql = 'SELECT';

+		$sql .= ' t.rowid,';

+

@@ -151,8 +172,7 @@
-		$sql .= " FROM ".$this->db->prefix().$this->table_element." as t";

-		if ($id) {

-			$sql .= " WHERE t.id = ".((int) $id);

-		} elseif ($code) {

-			$sql .= " WHERE t.code = '".$this->db->escape($code)."'";

-		} elseif ($label) {

-			$sql .= " WHERE t.label = '".$this->db->escape($label)."'";

-		}

+

+

+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';

+		if ($id)   $sql .= " WHERE t.id = ".$id;

+		elseif ($code) $sql .= " WHERE t.code = '".$this->db->escape($code)."'";

+		elseif ($label) $sql .= " WHERE t.label = '".$this->db->escape($label)."'";

+

@@ -204 +224 @@
-	 * @return int Return integer <0 if KO, >0 if OK

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

@@ -210,2 +230,3 @@
-		$sql = "SELECT";

-		$sql .= " t.rowid,";

+		$sql = 'SELECT';

+		$sql .= ' t.rowid,';

+

@@ -215 +236,3 @@
-		$sql .= " FROM ".$this->db->prefix().$this->table_element." as t";

+

+

+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';

@@ -221 +244 @@
-				$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";

+				$sqlwhere [] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';

@@ -226 +249 @@
-			$sql .= ' WHERE '.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere);

+			$sql .= ' WHERE '.implode(' '.$filtermode.' ', $sqlwhere);

@@ -232 +255 @@
-			$sql .= $this->db->plimit($limit, $offset);

+		    $sql .= ' '.$this->db->plimit($limit, $offset);

@@ -265 +288 @@
-	 * @return int Return integer <0 if KO, >0 if OK

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

@@ -276 +299 @@
-			$this->code = trim($this->code);

+			 $this->code = trim($this->code);

@@ -279 +302 @@
-			$this->label = trim($this->label);

+			 $this->label = trim($this->label);

@@ -282 +305 @@
-			$this->active = trim($this->active);

+			 $this->active = trim($this->active);

@@ -289 +312,2 @@
-		$sql = 'UPDATE '.$this->db->prefix().$this->table_element.' SET';

+		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET';

+

@@ -293 +317,3 @@
-		$sql .= ' WHERE rowid='.((int) $this->id);

+

+

+		$sql .= ' WHERE rowid='.$this->id;

@@ -304 +330 @@
-		// Uncomment this and change CTYPERESOURCE to your own tag if you

+		// Uncomment this and change MYOBJECT to your own tag if you

@@ -309 +335 @@
-		//  $result=$this->call_trigger('CTYPERESOURCE_MODIFY',$user);

+		//  $result=$this->call_trigger('MYOBJECT_MODIFY',$user);

@@ -332 +358 @@
-	 * @return int Return integer <0 if KO, >0 if OK

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

@@ -342 +368 @@
-		// Uncomment this and change CTYPERESOURCE to your own tag if you

+		// Uncomment this and change MYOBJECT to your own tag if you

@@ -347 +373 @@
-		//  $result=$this->call_trigger('CTYPERESOURCE_DELETE',$user);

+		//  $result=$this->call_trigger('MYOBJECT_DELETE',$user);

@@ -355,2 +381,2 @@
-			$sql = 'DELETE FROM '.$this->db->prefix().$this->table_element;

-			$sql .= ' WHERE rowid='.((int) $this->id);

+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element;

+			$sql .= ' WHERE rowid='.$this->id;

@@ -459,3 +485,3 @@
-	 * @var string Type resource line label

-	 */

-	public $label;

+     * @var string Type resource line label

+     */

+    public $label;

@@ -463,0 +490,4 @@
+

+	/**

+	 * @var mixed Sample line property 2

+	 */

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_cunits.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_cunits.class.php
@@ -24,3 +23,0 @@
-// Put here all includes required by your class file

-require_once DOL_DOCUMENT_ROOT.'/core/class/commondict.class.php';

-

@@ -31 +28 @@
-class CUnits extends CommonDict

+class CUnits // extends CommonObject

@@ -32,0 +30,14 @@
+	/**

+     * @var DoliDB Database handler.

+     */

+    public $db;

+

+	/**

+	 * @var string Error code (or message)

+	 */

+	public $error = '';

+

+	/**

+	 * @var string[] Error codes (or messages)

+	 */

+	public $errors = array();

@@ -38,8 +49,7 @@
-	/**

-	 * @var string label

-	 * @deprecated

-	 * @see $label

-	 */

-	public $libelle;

-

-	public $sortorder;

+    /**

+	 * @var int ID

+	 */

+	public $id;

+

+	public $code;

+	public $label;

@@ -49,22 +59,26 @@
-

-

-	/**

-	 *  Constructor

-	 *

-	 *  @param      DoliDb		$db      Database handler

-	 */

-	public function __construct($db)

-	{

-		$this->db = $db;

-	}

-

-

-	/**

-	 *  Create object into database

-	 *

-	 *  @param      User	$user        User that create

-	 *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers

-	 *  @return     int      		   	 Return integer <0 if KO, Id of created object if OK

-	 */

-	public function create($user, $notrigger = 0)

-	{

+	public $active;

+

+

+

+

+    /**

+     *  Constructor

+     *

+     *  @param      DoliDb		$db      Database handler

+     */

+    public function __construct($db)

+    {

+        $this->db = $db;

+    }

+

+

+    /**

+     *  Create object into database

+     *

+     *  @param      User	$user        User that create

+     *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers

+     *  @return     int      		   	 <0 if KO, Id of created object if OK

+     */

+    public function create($user, $notrigger = 0)

+    {

+    	global $conf, $langs;

@@ -75,21 +89,7 @@
-		if (isset($this->id)) {

-			$this->id = (int) $this->id;

-		}

-		if (isset($this->code)) {

-			$this->code = trim($this->code);

-		}

-		if (isset($this->label)) {

-			$this->libelle = trim($this->label);

-		}

-		if (isset($this->short_label)) {

-			$this->libelle = trim($this->short_label);

-		}

-		if (isset($this->unit_type)) {

-			$this->unit_type = trim($this->unit_type);

-		}

-		if (isset($this->active)) {

-			$this->active = trim($this->active);

-		}

-		if (isset($this->scale)) {

-			$this->scale = trim($this->scale);

-		}

+		if (isset($this->id)) $this->id = (int) $this->id;

+		if (isset($this->code)) $this->code = trim($this->code);

+		if (isset($this->label)) $this->libelle = trim($this->label);

+		if (isset($this->short_label)) $this->libelle = trim($this->short_label);

+		if (isset($this->unit_type)) $this->active = trim($this->unit_type);

+		if (isset($this->active)) $this->active = trim($this->active);

+		if (isset($this->scale)) $this->scale = trim($this->scale);

@@ -100,2 +100,2 @@
-		// Insert request

-		$sql = "INSERT INTO ".$this->db->prefix()."c_units(";

+        // Insert request

+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_units(";

@@ -106 +106 @@
-		$sql .= "unit_type,";

+		$sql .= "unit_type";

@@ -108 +108 @@
-		$sql .= ") VALUES (";

+        $sql .= ") VALUES (";

@@ -113 +113 @@
-		$sql .= " ".(!isset($this->unit_type) ? 'NULL' : "'".$this->db->escape($this->unit_type)."'").",";

+		$sql .= " ".(!isset($this->unit_type) ? 'NULL' : "'".$this->db->escape($this->unit_type)."'");

@@ -119,16 +119,16 @@
-		dol_syslog(get_class($this)."::create", LOG_DEBUG);

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

-		if (!$resql) {

-			$error++;

-			$this->errors[] = "Error ".$this->db->lasterror();

-		}

-

-		if (!$error) {

-			$this->id = $this->db->last_insert_id($this->db->prefix()."c_units");

-		}

-

-		// Commit or rollback

-		if ($error) {

-			foreach ($this->errors as $errmsg) {

-				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);

-				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);

+	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);

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

+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }

+

+		if (!$error)

+        {

+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_units");

+        }

+

+        // Commit or rollback

+        if ($error)

+		{

+			foreach ($this->errors as $errmsg)

+			{

+	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);

+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);

@@ -138 +138,3 @@
-		} else {

+		}

+		else

+		{

@@ -140,17 +142,19 @@
-			return $this->id;

-		}

-	}

-

-

-	/**

-	 *  Load object in memory from database

-	 *

-	 *  @param      int		$id    			Id of CUnit object to fetch (rowid)

-	 *  @param		string	$code			Code

-	 *  @param		string	$short_label	Short Label ('g', 'kg', ...)

-	 *  @param		string	$unit_type		Unit type ('size', 'surface', 'volume', 'weight', ...)

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

-	 */

-	public function fetch($id, $code = '', $short_label = '', $unit_type = '')

-	{

-		$sql = "SELECT";

+            return $this->id;

+		}

+    }

+

+

+    /**

+     *  Load object in memory from database

+     *

+     *  @param      int		$id    			Id of CUnit object to fetch (rowid)

+     *  @param		string	$code			Code

+     *  @param		string	$short_label	Short Label ('g', 'kg', ...)

+     *  @param		string	$unit_type		Unit type ('size', 'surface', 'volume', 'weight', ...)

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

+     */

+    public function fetch($id, $code = '', $short_label = '', $unit_type = '')

+    {

+    	global $langs;

+

+        $sql = "SELECT";

@@ -165,24 +169,18 @@
-		$sql .= " FROM ".$this->db->prefix()."c_units as t";

-		$sql_where = array();

-		if ($id) {

-			$sql_where[] = " t.rowid = ".((int) $id);

-		}

-		if ($unit_type) {

-			$sql_where[] = " t.unit_type = '".$this->db->escape($unit_type)."'";

-		}

-		if ($code) {

-			$sql_where[] = " t.code = '".$this->db->escape($code)."'";

-		}

-		if ($short_label) {

-			$sql_where[] = " t.short_label = '".$this->db->escape($short_label)."'";

-		}

-		if (count($sql_where) > 0) {

-			$sql .= ' WHERE '.implode(' AND ', $sql_where);

-		}

-

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

-		if ($resql) {

-			if ($this->db->num_rows($resql)) {

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

-

-				$this->id = $obj->rowid;

+        $sql .= " FROM ".MAIN_DB_PREFIX."c_units as t";

+        $sql_where = array();

+        if ($id)   $sql_where[] = " t.rowid = ".$id;

+        if ($unit_type)   $sql_where[] = " t.unit_type = '".$this->db->escape($unit_type)."'";

+        if ($code) $sql_where[] = " t.code = '".$this->db->escape($code)."'";

+        if ($short_label) $sql_where[] = " t.short_label = '".$this->db->escape($short_label)."'";

+        if (count($sql_where) > 0) {

+        	$sql .= ' WHERE '.implode(' AND ', $sql_where);

+        }

+

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

+        if ($resql)

+        {

+            if ($this->db->num_rows($resql))

+            {

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

+

+                $this->id = $obj->rowid;

@@ -196,103 +194,109 @@
-			}

-			$this->db->free($resql);

-

-			return 1;

-		} else {

-			$this->error = "Error ".$this->db->lasterror();

-			return -1;

-		}

-	}

-

-

-	/**

-	 * Load list of objects in memory from the database.

-	 *

-	 * @param  string      $sortorder    Sort Order

-	 * @param  string      $sortfield    Sort field

-	 * @param  int         $limit        limit

-	 * @param  int         $offset       Offset

-	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)

-	 * @param  string      $filtermode   Filter mode (AND or OR)

-	 * @return array|int                 int <0 if KO, array of pages if OK

-	 */

-	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')

-	{

-		dol_syslog(__METHOD__, LOG_DEBUG);

-

-		$sql = "SELECT";

-		$sql .= " t.rowid,";

-		$sql .= " t.code,";

-		$sql .= " t.sortorder,";

-		$sql .= " t.label,";

-		$sql .= " t.short_label,";

-		$sql .= " t.unit_type,";

-		$sql .= " t.scale,";

-		$sql .= " t.active";

-		$sql .= " FROM ".$this->db->prefix()."c_units as t";

-		// Manage filter

-		$sqlwhere = array();

-		if (count($filter) > 0) {

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

-				if ($key == 't.rowid' || $key == 't.active' || $key == 't.scale') {

-					$sqlwhere[] = $key." = ".((int) $value);

-				} elseif (strpos($key, 'date') !== false) {

-					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";

-				} elseif ($key == 't.unit_type' || $key == 't.code' || $key == 't.short_label') {

-					$sqlwhere[] = $key." = '".$this->db->escape($value)."'";

-				} else {

-					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";

-				}

-			}

-		}

-		if (count($sqlwhere) > 0) {

-			$sql .= ' WHERE ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';

-		}

-

-		if (!empty($sortfield)) {

-			$sql .= $this->db->order($sortfield, $sortorder);

-		}

-		if (!empty($limit)) {

-			$sql .= $this->db->plimit($limit, $offset);

-		}

-

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

-		if ($resql) {

-			$this->records = array();

-			$num = $this->db->num_rows($resql);

-			if ($num > 0) {

-				while ($obj = $this->db->fetch_object($resql)) {

-					$record = new self($this->db);

-

-					$record->id = $obj->rowid;

-					$record->code = $obj->code;

-					$record->sortorder = $obj->sortorder;

-					$record->label = $obj->label;

-					$record->short_label = $obj->short_label;

-					$record->unit_type = $obj->unit_type;

-					$record->scale = $obj->scale;

-					$record->active = $obj->active;

-

-					$this->records[$record->id] = $record;

-				}

-			}

-			$this->db->free($resql);

-

-			return $this->records;

-		} else {

-			$this->errors[] = 'Error '.$this->db->lasterror();

-			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);

-

-			return -1;

-		}

-	}

-

-

-	/**

-	 *  Update object into database

-	 *

-	 *  @param      User	$user        User that modify

-	 *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers

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

-	 */

-	public function update($user = null, $notrigger = 0)

-	{

+            }

+            $this->db->free($resql);

+

+            return 1;

+        }

+        else

+        {

+      	    $this->error = "Error ".$this->db->lasterror();

+            return -1;

+        }

+    }

+

+

+    /**

+     * Load list of objects in memory from the database.

+     *

+     * @param  string      $sortorder    Sort Order

+     * @param  string      $sortfield    Sort field

+     * @param  int         $limit        limit

+     * @param  int         $offset       Offset

+     * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)

+     * @param  string      $filtermode   Filter mode (AND or OR)

+     * @return array|int                 int <0 if KO, array of pages if OK

+     */

+    public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')

+    {

+    	global $conf;

+

+    	dol_syslog(__METHOD__, LOG_DEBUG);

+

+    	$sql = 'SELECT';

+    	$sql .= " t.rowid,";

+    	$sql .= " t.code,";

+    	$sql .= " t.label,";

+    	$sql .= " t.short_label,";

+    	$sql .= " t.unit_type,";

+    	$sql .= " t.scale,";

+    	$sql .= " t.active";

+    	$sql .= ' FROM '.MAIN_DB_PREFIX.'c_units as t';

+    	// Manage filter

+    	$sqlwhere = array();

+    	if (count($filter) > 0) {

+    		foreach ($filter as $key => $value) {

+    			if ($key == 't.rowid' || $key == 't.active' || $key == 't.scale') {

+    				$sqlwhere[] = $key.'='.(int) $value;

+    			}

+    			elseif (strpos($key, 'date') !== false) {

+    				$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';

+    			}

+    			elseif ($key == 't.unit_type' || $key == 't.code' || $key == 't.short_label') {

+    				$sqlwhere[] = $key.' = \''.$this->db->escape($value).'\'';

+    			}

+    			else {

+    				$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';

+    			}

+    		}

+    	}

+    	if (count($sqlwhere) > 0) {

+    		$sql .= ' WHERE ('.implode(' '.$filtermode.' ', $sqlwhere).')';

+    	}

+

+    	if (!empty($sortfield)) {

+    		$sql .= $this->db->order($sortfield, $sortorder);

+    	}

+    	if (!empty($limit)) {

+    		$sql .= ' '.$this->db->plimit($limit, $offset);

+    	}

+

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

+    	if ($resql) {

+    		$this->records = array();

+    		$num = $this->db->num_rows($resql);

+    		if ($num > 0) {

+	    		while ($obj = $this->db->fetch_object($resql))

+	    		{

+	    			$record = new self($this->db);

+

+	    			$record->id    = $obj->rowid;

+	    			$record->code = $obj->code;

+	    			$record->label = $obj->label;

+	    			$record->short_label = $obj->short_label;

+	    			$record->unit_type = $obj->unit_type;

+	    			$record->scale = $obj->scale;

+	    			$record->active = $obj->active;

+	    			$this->records[$record->id] = $record;

+	    		}

+    		}

+    		$this->db->free($resql);

+

+    		return $this->records;

+    	} else {

+    		$this->errors[] = 'Error '.$this->db->lasterror();

+    		dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);

+

+    		return -1;

+    	}

+    }

+

+

+    /**

+     *  Update object into database

+     *

+     *  @param      User	$user        User that modify

+     *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers

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

+     */

+    public function update($user = null, $notrigger = 0)

+    {

+    	global $conf, $langs;

@@ -302,21 +306,6 @@
-		if (isset($this->code)) {

-			$this->code = trim($this->code);

-		}

-		if (isset($this->sortorder)) {

-			$this->sortorder = trim($this->sortorder);

-		}

-		if (isset($this->label)) {

-			$this->libelle = trim($this->label);

-		}

-		if (isset($this->short_label)) {

-			$this->libelle = trim($this->short_label);

-		}

-		if (isset($this->unit_type)) {

-			$this->libelle = trim($this->unit_type);

-		}

-		if (isset($this->scale)) {

-			$this->scale = trim($this->scale);

-		}

-		if (isset($this->active)) {

-			$this->active = trim($this->active);

-		}

+		if (isset($this->code)) $this->code = trim($this->code);

+		if (isset($this->label)) $this->libelle = trim($this->label);

+		if (isset($this->short_label)) $this->libelle = trim($this->short_label);

+		if (isset($this->unit_type)) $this->libelle = trim($this->unit_type);

+		if (isset($this->scale)) $this->scale = trim($this->scale);

+		if (isset($this->active)) $this->active = trim($this->active);

@@ -327,2 +316,2 @@
-		// Update request

-		$sql = "UPDATE ".$this->db->prefix()."c_units SET";

+        // Update request

+        $sql = "UPDATE ".MAIN_DB_PREFIX."c_units SET";

@@ -330 +318,0 @@
-		$sql .= " sortorder=".(isset($this->sortorder) ? "'".$this->db->escape($this->sortorder)."'" : "null").",";

@@ -336 +324 @@
-		$sql .= " WHERE rowid=".((int) $this->id);

+        $sql .= " WHERE rowid=".$this->id;

@@ -341,11 +329,10 @@
-		$resql = $this->db->query($sql);

-		if (!$resql) {

-			$error++;

-			$this->errors[] = "Error ".$this->db->lasterror();

-		}

-

-		// Commit or rollback

-		if ($error) {

-			foreach ($this->errors as $errmsg) {

-				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);

-				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);

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

+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }

+

+        // Commit or rollback

+		if ($error)

+		{

+			foreach ($this->errors as $errmsg)

+			{

+	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);

+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);

@@ -355 +342,3 @@
-		} else {

+		}

+		else

+		{

@@ -359,4 +348,4 @@
-	}

-

-

-	/**

+    }

+

+

+ 	/**

@@ -365,3 +354,3 @@
-	 *	@param  User	$user        User that delete

-	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers

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

+     *	@param  User	$user        User that delete

+     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers

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

@@ -370,0 +360 @@
+		global $conf, $langs;

@@ -373,2 +363,2 @@
-		$sql = "DELETE FROM ".$this->db->prefix()."c_units";

-		$sql .= " WHERE rowid=".((int) $this->id);

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

+		$sql .= " WHERE rowid=".$this->id;

@@ -380,10 +370,9 @@
-		if (!$resql) {

-			$error++;

-			$this->errors[] = "Error ".$this->db->lasterror();

-		}

-

-		// Commit or rollback

-		if ($error) {

-			foreach ($this->errors as $errmsg) {

-				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);

-				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);

+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }

+

+        // Commit or rollback

+		if ($error)

+		{

+			foreach ($this->errors as $errmsg)

+			{

+	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);

+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);

@@ -393 +382,3 @@
-		} else {

+		}

+		else

+		{

@@ -404,4 +395,3 @@
-	 * @param string $unit_type weight,size,surface,volume,qty,time...

-	 * @return int|string            Return integer <0 if KO, Id of code if OK (or $code if $mode is different from '', 'short_label' or 'code')

-	 */

-	public function getUnitFromCode($code, $mode = 'code', $unit_type = '')

+	 * @return int            <0 if KO, Id of code if OK

+	 */

+	public function getUnitFromCode($code, $mode = 'code')

@@ -409,4 +399,6 @@
-		if ($mode == 'short_label') {

-			return dol_getIdFromCode($this->db, $code, 'c_units', 'short_label', 'rowid', 0, " AND unit_type = '".$this->db->escape($unit_type)."'");

-		} elseif ($mode == 'code') {

-			return dol_getIdFromCode($this->db, $code, 'c_units', 'code', 'rowid', 0, " AND unit_type = '". $this->db->escape($unit_type) ."'");

+

+		if($mode == 'short_label'){

+			return dol_getIdFromCode($this->db, $code, 'c_units', 'short_label', 'rowid');

+		}

+		elseif($mode == 'code'){

+			return dol_getIdFromCode($this->db, $code, 'c_units', 'code', 'rowid');

@@ -427 +419 @@
-		$value = (float) price2num($value);

+		$value  = doubleval(price2num($value));

@@ -434,2 +426,2 @@
-		$value = $value * $scaleUnitPow;

-		if ($fk_new_unit != 0) {

+		$value  = $value * $scaleUnitPow;

+		if($fk_new_unit !=0 ){

@@ -438 +430,2 @@
-			if (!empty($scaleUnitPow)) {

+			if(!empty($scaleUnitPow))

+			{

@@ -440 +433 @@
-				$value = $value / $scaleUnitPow;

+				$value  = $value / $scaleUnitPow;

@@ -446,5 +439,6 @@
-	/**

-	 * Get scale of unit factor

-	 *

-	 * @param 	int 		$id 	Id of unit in dictionary

-	 * @return 	float|int			Scale of unit

+

+

+	/**

+	 * get scale of unit factor

+	 * @param $id int id of unit in dictionary

+	 * @return float|int

@@ -455,15 +449,6 @@
-

-		$sql = "SELECT scale, unit_type FROM ".$this->db->prefix()."c_units WHERE rowid = ".((int) $id);

-

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

-		if ($resql) {

-			// TODO : add base col into unit dictionary table

-			$unit = $this->db->fetch_object($sql);

-			if ($unit) {

-				// TODO : if base exists in unit dictionary table, remove this convertion exception and update convertion infos in database.

-				// Example time hour currently scale 3600 will become scale 2 base 60

-				if ($unit->unit_type == 'time') {

-					return (float) $unit->scale;

-				}

-

-				return pow($base, (float) $unit->scale);

+		// TODO : add base col into unit dictionary table

+		$unit = $this->db->getRow('SELECT scale, unit_type from '.MAIN_DB_PREFIX.'c_units WHERE rowid = '.intval($id));

+		if($unit){

+			// TODO : if base exist in unit dictionary table remove this convertion exception and update convertion infos in database exemple time hour currently scale 3600 will become scale 2 base 60

+			if($unit->unit_type == 'time'){

+				return doubleval($unit->scale);

@@ -470,0 +456,2 @@
+

+			return pow($base, doubleval($unit->scale));

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_discount.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_discount.class.php
@@ -31,6 +31,6 @@
-	/**

-	 * @var DoliDB Database handler.

-	 */

-	public $db;

-

-	/**

+    /**

+     * @var DoliDB Database handler.

+     */

+    public $db;

+

+    /**

@@ -47 +47 @@
-	 * @var int 	ID discount

+	 * @var int ID discount

@@ -51,3 +51,2 @@
-	/**

-	 * @var int 	Thirdparty ID

-	 * @deprecated

+    /**

+	 * @var int Thirdparty ID

@@ -55,42 +54,14 @@
-	public $fk_soc;

-	/**

-	 * @var int 	Thirdparty ID

-	 */

-	public $socid;

-

-	public $discount_type; // 0 => customer discount, 1 => supplier discount

-

-	public $total_ht;

-	public $total_tva;

-	public $total_ttc;

-	public $amount_ht; 	// deprecated

-	public $amount_tva; // deprecated

-	public $amount_ttc; // deprecated

-

-	public $multicurrency_total_ht;

-	public $multicurrency_total_tva;

-	public $multicurrency_total_ttc;

-	public $multicurrency_amount_ht;	// deprecated

-	public $multicurrency_amount_tva;	// deprecated

-	public $multicurrency_amount_ttc;	// deprecated

-

-	/**

-	 * @var double

-	 */

-	public $multicurrency_subprice;

-

-	/**

-	 * @var int

-	 */

-	public $fk_invoice_supplier;

-

-	/**

-	 * @var int

-	 */

-	public $fk_invoice_supplier_line;

-

-	// Vat rate

-	public $tva_tx;

-	public $vat_src_code;

-

-	/**

+    public $fk_soc;

+

+    public $discount_type; // 0 => customer discount, 1 => supplier discount

+    public $amount_ht; //

+    public $amount_tva; //

+    public $amount_ttc; //

+    public $multicurrency_amount_ht;

+    public $multicurrency_amount_tva;

+    public $multicurrency_amount_ttc;

+    // Vat rate

+    public $tva_tx;

+    public $vat_src_code;

+

+    /**

@@ -101 +72 @@
-	/**

+    /**

@@ -106,22 +77,22 @@
-	/**

-	 * Date creation record (datec)

-	 *

-	 * @var integer

-	 */

-	public $datec;

-

-	/**

-	 * @var int ID invoice line when a discount is used into an invoice line (for absolute discounts)

-	 */

-	public $fk_facture_line;

-

-	/**

-	 * @var int ID invoice when a discount line is used into an invoice (for credit note)

-	 */

-	public $fk_facture;

-

-	/**

-	 * @var int ID credit note or deposit used to create the discount

-	 */

-	public $fk_facture_source;

-	public $ref_facture_source; // Ref credit note or deposit used to create the discount

+    /**

+     * Date creation record (datec)

+     *

+     * @var integer

+     */

+    public $datec;

+

+    /**

+     * @var int ID invoice line when a discount is used into an invoice line (for absolute discounts)

+     */

+    public $fk_facture_line;

+

+    /**

+     * @var int ID invoice when a discount line is used into an invoice (for credit note)

+     */

+    public $fk_facture;

+

+    /**

+     * @var int ID credit note or deposit used to create the discount

+     */

+    public $fk_facture_source;

+    public $ref_facture_source; // Ref credit note or deposit used to create the discount

@@ -130,152 +101,140 @@
-	public $fk_invoice_supplier_source;

-	public $ref_invoice_supplier_source; // Ref credit note or deposit used to create the discount

-	public $type_invoice_supplier_source;

-

-	/**

-	 *	Constructor

-	 *

-	 *  @param  	DoliDB		$db		Database handler

-	 */

-	public function __construct($db)

-	{

-		$this->db = $db;

-	}

-

-

-	/**

-	 *	Load object from database into memory

-	 *

-	 *  @param      int		$rowid       					id discount to load

-	 *  @param      int		$fk_facture_source				fk_facture_source

-	 *  @param		int		$fk_invoice_supplier_source		fk_invoice_supplier_source

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

-	 */

-	public function fetch($rowid, $fk_facture_source = 0, $fk_invoice_supplier_source = 0)

-	{

-		// Check parameters

-		if (!$rowid && !$fk_facture_source && !$fk_invoice_supplier_source) {

-			$this->error = 'ErrorBadParameters';

-			return -1;

-		}

-

-		$sql = "SELECT sr.rowid, sr.fk_soc, sr.discount_type,";

-		$sql .= " sr.fk_user,";

-		$sql .= " sr.amount_ht, sr.amount_tva, sr.amount_ttc, sr.tva_tx, sr.vat_src_code,";

-		$sql .= " sr.multicurrency_amount_ht, sr.multicurrency_amount_tva, sr.multicurrency_amount_ttc,";

-		$sql .= " sr.fk_facture_line, sr.fk_facture, sr.fk_facture_source, sr.fk_invoice_supplier_line, sr.fk_invoice_supplier, sr.fk_invoice_supplier_source, sr.description,";

-		$sql .= " sr.datec,";

-		$sql .= " f.ref as ref_facture_source, f.type as type_facture_source,";

-		$sql .= " fsup.ref as ref_invoice_supplier_source, fsup.type as type_invoice_supplier_source";

-		$sql .= " FROM ".$this->db->prefix()."societe_remise_except as sr";

-		$sql .= " LEFT JOIN ".$this->db->prefix()."facture as f ON sr.fk_facture_source = f.rowid";

-		$sql .= " LEFT JOIN ".$this->db->prefix()."facture_fourn as fsup ON sr.fk_invoice_supplier_source = fsup.rowid";

-		$sql .= " WHERE sr.entity IN (".getEntity('invoice').")";

-		if ($rowid) {

-			$sql .= " AND sr.rowid = ".((int) $rowid);

-		}

-		if ($fk_facture_source) {

-			$sql .= " AND sr.fk_facture_source = ".((int) $fk_facture_source);

-		}

-		if ($fk_invoice_supplier_source) {

-			$sql .= " AND sr.fk_invoice_supplier_source = ".((int) $fk_invoice_supplier_source);

-		}

-

-		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);

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

-		if ($resql) {

-			if ($this->db->num_rows($resql)) {

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

-

-				$this->id = $obj->rowid;

-				$this->fk_soc = $obj->fk_soc;

-				$this->discount_type = $obj->discount_type;

-

-				$this->total_ht = $obj->amount_ht;

-				$this->total_tva = $obj->amount_tva;

-				$this->total_ttc = $obj->amount_ttc;

-				// For backward compatibility

-				$this->amount_ht = $this->total_ht;

-				$this->amount_tva = $this->total_tva;

-				$this->amount_ttc = $this->total_ttc;

-

-				$this->multicurrency_total_ht = $this->multicurrency_subprice = $obj->multicurrency_amount_ht;

-				$this->multicurrency_total_tva = $obj->multicurrency_amount_tva;

-				$this->multicurrency_total_ttc = $obj->multicurrency_amount_ttc;

-				// For backward compatibility

-				$this->multicurrency_amount_ht = $this->multicurrency_total_ht;

-				$this->multicurrency_amount_tva = $this->multicurrency_total_tva;

-				$this->multicurrency_amount_ttc = $this->multicurrency_total_ttc;

-

-				$this->tva_tx = $obj->tva_tx;

-				$this->vat_src_code = $obj->vat_src_code;

-

-				$this->fk_user = $obj->fk_user;

-				$this->fk_facture_line = $obj->fk_facture_line;

-				$this->fk_facture = $obj->fk_facture;

-				$this->fk_facture_source = $obj->fk_facture_source; // Id credit note or deposit source

-				$this->ref_facture_source = $obj->ref_facture_source; // Ref credit note or deposit  source

-				$this->type_facture_source = $obj->type_facture_source; // Type credit note or deposit  source

-				$this->fk_invoice_supplier_line = $obj->fk_invoice_supplier_line;

-				$this->fk_invoice_supplier = $obj->fk_invoice_supplier;

-				$this->fk_invoice_supplier_source = $obj->fk_invoice_supplier_source; // Id credit note or deposit source

-				$this->ref_invoice_supplier_source = $obj->ref_invoice_supplier_source; // Ref credit note or deposit  source

-				$this->type_invoice_supplier_source = $obj->type_invoice_supplier_source; // Type credit note or deposit  source

-				$this->description = $obj->description;

-				$this->datec = $this->db->jdate($obj->datec);

-

-				$this->db->free($resql);

-				return 1;

-			} else {

-				$this->db->free($resql);

-				return 0;

-			}

-		} else {

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

-			return -1;

-		}

-	}

-

-

-	/**

-	 *      Create a discount into database

-	 *

-	 *      @param      User	$user       User that create

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

-	 */

-	public function create($user)

-	{

-		global $conf, $langs;

-

-		// Clean parameters

-		$this->amount_ht = price2num($this->amount_ht);

-		$this->amount_tva = price2num($this->amount_tva);

-		$this->amount_ttc = price2num($this->amount_ttc);

-

-		$this->tva_tx = price2num($this->tva_tx);

-

-		$this->multicurrency_amount_ht = price2num($this->multicurrency_amount_ht);

-		$this->multicurrency_amount_tva = price2num($this->multicurrency_amount_tva);

-		$this->multicurrency_amount_ttc = price2num($this->multicurrency_amount_ttc);

-

-		if (empty($this->multicurrency_amount_ht)) {

-			$this->multicurrency_amount_ht = 0;

-		}

-		if (empty($this->multicurrency_amount_tva)) {

-			$this->multicurrency_amount_tva = 0;

-		}

-		if (empty($this->multicurrency_amount_ttc)) {

-			$this->multicurrency_amount_ttc = 0;

-		}

-		if (empty($this->tva_tx)) {

-			$this->tva_tx = 0;

-		}

-

-		// Check parameters

-		if (empty($this->description)) {

-			$this->error = 'BadValueForPropertyDescriptionOfDiscount';

-			dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);

-			return -1;

-		}

-

-		$userid = $user->id;

-		if (!($userid > 0)) {		// For example when record is saved into an anonymous context with a not loaded object $user.

+    public $fk_invoice_supplier_source;

+    public $ref_invoice_supplier_source; // Ref credit note or deposit used to create the discount

+    public $type_invoice_supplier_source;

+

+    /**

+     *	Constructor

+     *

+     *  @param  	DoliDB		$db		Database handler

+     */

+    public function __construct($db)

+    {

+        $this->db = $db;

+    }

+

+

+    /**

+     *	Load object from database into memory

+     *

+     *  @param      int		$rowid       					id discount to load

+     *  @param      int		$fk_facture_source				fk_facture_source

+     *  @param		int		$fk_invoice_supplier_source		fk_invoice_supplier_source

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

+     */

+    public function fetch($rowid, $fk_facture_source = 0, $fk_invoice_supplier_source = 0)

+    {

+    	global $conf;

+

+        // Check parameters

+        if (!$rowid && !$fk_facture_source && !$fk_invoice_supplier_source)

+        {

+            $this->error = 'ErrorBadParameters';

+            return -1;

+        }

+

+        $sql = "SELECT sr.rowid, sr.fk_soc, sr.discount_type,";

+        $sql .= " sr.fk_user,";

+        $sql .= " sr.amount_ht, sr.amount_tva, sr.amount_ttc, sr.tva_tx, sr.vat_src_code,";

+        $sql .= " sr.multicurrency_amount_ht, sr.multicurrency_amount_tva, sr.multicurrency_amount_ttc,";

+        $sql .= " sr.fk_facture_line, sr.fk_facture, sr.fk_facture_source, sr.fk_invoice_supplier_line, sr.fk_invoice_supplier, sr.fk_invoice_supplier_source, sr.description,";

+        $sql .= " sr.datec,";

+        $sql .= " f.ref as ref_facture_source, f.type as type_facture_source,";

+        $sql .= " fsup.ref as ref_invoice_supplier_source, fsup.type as type_invoice_supplier_source";

+        $sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as sr";

+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON sr.fk_facture_source = f.rowid";

+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as fsup ON sr.fk_invoice_supplier_source = fsup.rowid";

+        $sql .= " WHERE sr.entity IN (".getEntity('invoice').")";

+        if ($rowid) $sql .= " AND sr.rowid=".$rowid;

+        if ($fk_facture_source) $sql .= " AND sr.fk_facture_source=".$fk_facture_source;

+        if ($fk_invoice_supplier_source) $sql .= " AND sr.fk_invoice_supplier_source=".$fk_invoice_supplier_source;

+

+        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);

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

+        if ($resql)

+        {

+            if ($this->db->num_rows($resql))

+            {

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

+

+                $this->id = $obj->rowid;

+                $this->fk_soc = $obj->fk_soc;

+                $this->discount_type = $obj->discount_type;

+

+                $this->amount_ht = $obj->amount_ht;

+                $this->amount_tva = $obj->amount_tva;

+                $this->amount_ttc = $obj->amount_ttc;

+

+                $this->multicurrency_amount_ht = $this->multicurrency_subprice = $obj->multicurrency_amount_ht;

+                $this->multicurrency_amount_tva = $obj->multicurrency_amount_tva;

+                $this->multicurrency_amount_ttc = $obj->multicurrency_amount_ttc;

+

+                $this->tva_tx = $obj->tva_tx;

+                $this->vat_src_code = $obj->vat_src_code;

+

+                $this->fk_user = $obj->fk_user;

+                $this->fk_facture_line = $obj->fk_facture_line;

+                $this->fk_facture = $obj->fk_facture;

+                $this->fk_facture_source = $obj->fk_facture_source; // Id credit note or deposit source

+                $this->ref_facture_source = $obj->ref_facture_source; // Ref credit note or deposit  source

+                $this->type_facture_source = $obj->type_facture_source; // Type credit note or deposit  source

+                $this->fk_invoice_supplier_line = $obj->fk_invoice_supplier_line;

+                $this->fk_invoice_supplier = $obj->fk_invoice_supplier;

+                $this->fk_invoice_supplier_source = $obj->fk_invoice_supplier_source; // Id credit note or deposit source

+                $this->ref_invoice_supplier_source = $obj->ref_invoice_supplier_source; // Ref credit note or deposit  source

+                $this->type_invoice_supplier_source = $obj->type_invoice_supplier_source; // Type credit note or deposit  source

+                $this->description = $obj->description;

+                $this->datec = $this->db->jdate($obj->datec);

+

+                $this->db->free($resql);

+                return 1;

+            }

+            else

+            {

+                $this->db->free($resql);

+                return 0;

+            }

+        }

+        else

+        {

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

+            return -1;

+        }

+    }

+

+

+    /**

+     *      Create a discount into database

+     *

+     *      @param      User	$user       User that create

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

+     */

+    public function create($user)

+    {

+        global $conf, $langs;

+

+        // Clean parameters

+        $this->amount_ht = price2num($this->amount_ht);

+        $this->amount_tva = price2num($this->amount_tva);

+        $this->amount_ttc = price2num($this->amount_ttc);

+

+        $this->tva_tx = price2num($this->tva_tx);

+

+        $this->multicurrency_amount_ht = price2num($this->multicurrency_amount_ht);

+        $this->multicurrency_amount_tva = price2num($this->multicurrency_amount_tva);

+        $this->multicurrency_amount_ttc = price2num($this->multicurrency_amount_ttc);

+

+        if (empty($this->multicurrency_amount_ht)) $this->multicurrency_amount_ht = 0;

+        if (empty($this->multicurrency_amount_tva)) $this->multicurrency_amount_tva = 0;

+        if (empty($this->multicurrency_amount_ttc)) $this->multicurrency_amount_ttc = 0;

+

+        // Check parameters

+        if (empty($this->description))

+        {

+            $this->error = 'BadValueForPropertyDescription';

+            dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);

+            return -1;

+        }

+

+        $userid = $user->id;

+		if (!($userid > 0))		// For example when record is saved into an anonymous context with a not loaded object $user.

+		{

@@ -288,219 +247,237 @@
-		// Insert request

-		$sql = "INSERT INTO ".$this->db->prefix()."societe_remise_except";

-		$sql .= " (entity, datec, fk_soc, discount_type, fk_user, description,";

-		$sql .= " amount_ht, amount_tva, amount_ttc, tva_tx, vat_src_code,";

-		$sql .= " multicurrency_amount_ht, multicurrency_amount_tva, multicurrency_amount_ttc,";

-		$sql .= " fk_facture_source, fk_invoice_supplier_source";

-		$sql .= ")";

-		$sql .= " VALUES (".$conf->entity.", '".$this->db->idate($this->datec != '' ? $this->datec : dol_now())."', ".((int) $this->fk_soc).", ".(empty($this->discount_type) ? 0 : intval($this->discount_type)).", ".((int) $userid).", '".$this->db->escape($this->description)."',";

-		$sql .= " ".price2num($this->amount_ht).", ".price2num($this->amount_tva).", ".price2num($this->amount_ttc).", ".price2num($this->tva_tx).", '".$this->db->escape($this->vat_src_code)."',";

-		$sql .= " ".price2num($this->multicurrency_amount_ht).", ".price2num($this->multicurrency_amount_tva).", ".price2num($this->multicurrency_amount_ttc).", ";

-		$sql .= " ".($this->fk_facture_source ? ((int) $this->fk_facture_source) : "null").",";

-		$sql .= " ".($this->fk_invoice_supplier_source ? ((int) $this->fk_invoice_supplier_source) : "null");

-		$sql .= ")";

-

-		dol_syslog(get_class($this)."::create", LOG_DEBUG);

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

-		if ($resql) {

-			$this->id = $this->db->last_insert_id($this->db->prefix()."societe_remise_except");

-			return $this->id;

-		} else {

-			$this->error = $this->db->lasterror().' - sql='.$sql;

-			return -1;

-		}

-	}

-

-

-	/**

-	 *  Delete object in database. If fk_facture_source is defined, we delete all familiy with same fk_facture_source. If not, only with id is removed

-	 *

-	 *  @param      User    $user       Object of user asking to delete

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

-	 */

-	public function delete($user)

-	{

-		global $conf, $langs;

-

-		// Check if we can remove the discount

-		if ($this->fk_facture_source) {

-			$sql = "SELECT COUNT(rowid) as nb";

-			$sql .= " FROM ".$this->db->prefix()."societe_remise_except";

-			$sql .= " WHERE (fk_facture_line IS NOT NULL"; // Not used as absolute simple discount

-			$sql .= " OR fk_facture IS NOT NULL)"; // Not used as credit note and not used as deposit

-			$sql .= " AND fk_facture_source = ".((int) $this->fk_facture_source);

-			//$sql.=" AND rowid != ".$this->id;

-

-			dol_syslog(get_class($this)."::delete Check if we can remove discount", LOG_DEBUG);

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

-			if ($resql) {

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

-				if ($obj->nb > 0) {

-					$this->error = 'ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';

-					return -2;

-				}

-			} else {

-				dol_print_error($this->db);

-				return -1;

-			}

-		}

-

-		// Check if we can remove the discount

-		if ($this->fk_invoice_supplier_source) {

-			$sql = "SELECT COUNT(rowid) as nb";

-			$sql .= " FROM ".$this->db->prefix()."societe_remise_except";

-			$sql .= " WHERE (fk_invoice_supplier_line IS NOT NULL"; // Not used as absolute simple discount

-			$sql .= " OR fk_invoice_supplier IS NOT NULL)"; // Not used as credit note and not used as deposit

-			$sql .= " AND fk_invoice_supplier_source = ".((int) $this->fk_invoice_supplier_source);

-			//$sql.=" AND rowid != ".$this->id;

-

-			dol_syslog(get_class($this)."::delete Check if we can remove discount", LOG_DEBUG);

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

-			if ($resql) {

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

-				if ($obj->nb > 0) {

-					$this->error = 'ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';

-					return -2;

-				}

-			} else {

-				dol_print_error($this->db);

-				return -1;

-			}

-		}

-

-		$this->db->begin();

-

-		// Delete but only if not used

-		$sql = "DELETE FROM ".$this->db->prefix()."societe_remise_except ";

-		if ($this->fk_facture_source) {

-			$sql .= " WHERE fk_facture_source = ".((int) $this->fk_facture_source); // Delete all lines of same serie

-		} elseif ($this->fk_invoice_supplier_source) {

-			$sql .= " WHERE fk_invoice_supplier_source = ".((int) $this->fk_invoice_supplier_source); // Delete all lines of same serie

-		} else {

-			$sql .= " WHERE rowid = ".((int) $this->id); // Delete only line

-		}

-		$sql .= " AND (fk_facture_line IS NULL"; // Not used as absolute simple discount

-		$sql .= " AND fk_facture IS NULL)"; // Not used as credit note and not used as deposit

-		$sql .= " AND (fk_invoice_supplier_line IS NULL"; // Not used as absolute simple discount

-		$sql .= " AND fk_invoice_supplier IS NULL)"; // Not used as credit note and not used as deposit

-

-		dol_syslog(get_class($this)."::delete Delete discount", LOG_DEBUG);

-		require_once DOL_DOCUMENT_ROOT. '/core/class/commoninvoice.class.php';

-		$result = $this->db->query($sql);

-		if ($result) {

-			// If source of discount was a credit note or deposit, we change source statut.

-			if ($this->fk_facture_source) {

-				$sql = "UPDATE ".$this->db->prefix()."facture";

-				$sql .= " set paye=0, fk_statut=1";

-				$sql .= " WHERE type IN (".$this->db->sanitize(CommonInvoice::TYPE_CREDIT_NOTE.", ".CommonInvoice::TYPE_DEPOSIT).") AND rowid = ".((int) $this->fk_facture_source);

-

-				dol_syslog(get_class($this)."::delete Update credit note or deposit invoice statut", LOG_DEBUG);

-				$result = $this->db->query($sql);

-				if ($result) {

-					$this->db->commit();

-					return 1;

-				} else {

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

-					$this->db->rollback();

-					return -1;

-				}

-			} elseif ($this->fk_invoice_supplier_source) {

-				$sql = "UPDATE ".$this->db->prefix()."facture_fourn";

-				$sql .= " set paye=0, fk_statut=1";

-				$sql .= " WHERE type IN (".$this->db->sanitize(CommonInvoice::TYPE_CREDIT_NOTE.", ".CommonInvoice::TYPE_DEPOSIT).") AND rowid = ".((int) $this->fk_invoice_supplier_source);

-

-				dol_syslog(get_class($this)."::delete Update credit note or deposit invoice statut", LOG_DEBUG);

-				$result = $this->db->query($sql);

-				if ($result) {

-					$this->db->commit();

-					return 1;

-				} else {

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

-					$this->db->rollback();

-					return -1;

-				}

-			} else {

-				$this->db->commit();

-				return 1;

-			}

-		} else {

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

-			$this->db->rollback();

-			return -1;

-		}

-	}

-

-

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 *	Link the discount to a particular invoice line or a particular invoice.

-	 *	When discount is a global discount used as an invoice line, we link using rowidline.

-	 *	When discount is from a credit note used to reduce payment of an invoice, we link using rowidinvoice

-	 *

-	 *	@param		int		$rowidline		Invoice line id (To use discount into invoice lines)

-	 *	@param		int		$rowidinvoice	Invoice id (To use discount as a credit note to reduce payment of invoice)

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

-	 */

-	public function link_to_invoice($rowidline, $rowidinvoice)

-	{

-		// phpcs:enable

-		// Check parameters

-		if (!$rowidline && !$rowidinvoice) {

-			$this->error = 'ErrorBadParameters';

-			return -1;

-		}

-		if ($rowidline && $rowidinvoice) {

-			$this->error = 'ErrorBadParameters';

-			return -2;

-		}

-

-		$sql = "UPDATE ".$this->db->prefix()."societe_remise_except";

-		if (!empty($this->discount_type)) {

-			if ($rowidline) {

-				$sql .= " SET fk_invoice_supplier_line = ".((int) $rowidline);

-			}

-			if ($rowidinvoice) {

-				$sql .= " SET fk_invoice_supplier = ".((int) $rowidinvoice);

-			}

-		} else {

-			if ($rowidline) {

-				$sql .= " SET fk_facture_line = ".((int) $rowidline);

-			}

-			if ($rowidinvoice) {

-				$sql .= " SET fk_facture = ".((int) $rowidinvoice);

-			}

-		}

-		$sql .= " WHERE rowid = ".((int) $this->id);

-

-		dol_syslog(get_class($this)."::link_to_invoice", LOG_DEBUG);

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

-		if ($resql) {

-			if (!empty($this->discount_type)) {

-				$this->fk_invoice_supplier_line = $rowidline;

-				$this->fk_invoice_supplier = $rowidinvoice;

-			} else {

-				$this->fk_facture_line = $rowidline;

-				$this->fk_facture = $rowidinvoice;

-			}

-			return 1;

-		} else {

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

-			return -3;

-		}

-	}

-

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 *	Link the discount to a particular invoice line or a particular invoice.

-	 *	Do not call this if discount is linked to a reconcialiated invoice

-	 *

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

-	 */

-	public function unlink_invoice()

-	{

-		// phpcs:enable

-		$sql = "UPDATE ".$this->db->prefix()."societe_remise_except";

-		if (!empty($this->discount_type)) {

-			$sql .= " SET fk_invoice_supplier_line = NULL, fk_invoice_supplier = NULL";

-		} else {

+        // Insert request

+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_remise_except";

+        $sql .= " (entity, datec, fk_soc, discount_type, fk_user, description,";

+        $sql .= " amount_ht, amount_tva, amount_ttc, tva_tx, vat_src_code,";

+        $sql .= " multicurrency_amount_ht, multicurrency_amount_tva, multicurrency_amount_ttc,";

+        $sql .= " fk_facture_source, fk_invoice_supplier_source";

+        $sql .= ")";

+        $sql .= " VALUES (".$conf->entity.", '".$this->db->idate($this->datec != '' ? $this->datec : dol_now())."', ".$this->fk_soc.", ".(empty($this->discount_type) ? 0 : intval($this->discount_type)).", ".$userid.", '".$this->db->escape($this->description)."',";

+        $sql .= " ".$this->amount_ht.", ".$this->amount_tva.", ".$this->amount_ttc.", ".$this->tva_tx.", '".$this->db->escape($this->vat_src_code)."',";

+        $sql .= " ".$this->multicurrency_amount_ht.", ".$this->multicurrency_amount_tva.", ".$this->multicurrency_amount_ttc.", ";

+        $sql .= " ".($this->fk_facture_source ? "'".$this->db->escape($this->fk_facture_source)."'" : "null").",";

+        $sql .= " ".($this->fk_invoice_supplier_source ? "'".$this->db->escape($this->fk_invoice_supplier_source)."'" : "null");

+        $sql .= ")";

+

+        dol_syslog(get_class($this)."::create", LOG_DEBUG);

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

+        if ($resql)

+        {

+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe_remise_except");

+            return $this->id;

+        }

+        else

+        {

+            $this->error = $this->db->lasterror().' - sql='.$sql;

+            return -1;

+        }

+    }

+

+

+    /**

+     *  Delete object in database. If fk_facture_source is defined, we delete all familiy with same fk_facture_source. If not, only with id is removed

+     *

+     *  @param      User    $user       Object of user asking to delete

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

+     */

+    public function delete($user)

+    {

+        global $conf, $langs;

+

+        // Check if we can remove the discount

+        if ($this->fk_facture_source)

+        {

+            $sql = "SELECT COUNT(rowid) as nb";

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

+            $sql .= " WHERE (fk_facture_line IS NOT NULL"; // Not used as absolute simple discount

+            $sql .= " OR fk_facture IS NOT NULL)"; // Not used as credit note and not used as deposit

+            $sql .= " AND fk_facture_source = ".$this->fk_facture_source;

+            //$sql.=" AND rowid != ".$this->id;

+

+            dol_syslog(get_class($this)."::delete Check if we can remove discount", LOG_DEBUG);

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

+            if ($resql)

+            {

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

+                if ($obj->nb > 0)

+                {

+                    $this->error = 'ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';

+                    return -2;

+                }

+            }

+            else

+            {

+                dol_print_error($this->db);

+                return -1;

+            }

+        }

+

+        // Check if we can remove the discount

+        if ($this->fk_invoice_supplier_source)

+        {

+            $sql = "SELECT COUNT(rowid) as nb";

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

+        	$sql .= " WHERE (fk_invoice_supplier_line IS NOT NULL"; // Not used as absolute simple discount

+        	$sql .= " OR fk_invoice_supplier IS NOT NULL)"; // Not used as credit note and not used as deposit

+        	$sql .= " AND fk_invoice_supplier_source = ".$this->fk_invoice_supplier_source;

+        	//$sql.=" AND rowid != ".$this->id;

+

+        	dol_syslog(get_class($this)."::delete Check if we can remove discount", LOG_DEBUG);

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

+        	if ($resql)

+        	{

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

+        		if ($obj->nb > 0)

+        		{

+        			$this->error = 'ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';

+        			return -2;

+        		}

+        	}

+        	else

+        	{

+        		dol_print_error($this->db);

+        		return -1;

+        	}

+        }

+

+        $this->db->begin();

+

+        // Delete but only if not used

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

+        if ($this->fk_facture_source) $sql .= " WHERE fk_facture_source = ".$this->fk_facture_source; // Delete all lines of same serie

+        elseif ($this->fk_invoice_supplier_source) $sql .= " WHERE fk_invoice_supplier_source = ".$this->fk_invoice_supplier_source; // Delete all lines of same serie

+        else $sql .= " WHERE rowid = ".$this->id; // Delete only line

+        $sql .= " AND (fk_facture_line IS NULL"; // Not used as absolute simple discount

+        $sql .= " AND fk_facture IS NULL)"; // Not used as credit note and not used as deposit

+        $sql .= " AND (fk_invoice_supplier_line IS NULL"; // Not used as absolute simple discount

+        $sql .= " AND fk_invoice_supplier IS NULL)"; // Not used as credit note and not used as deposit

+

+        dol_syslog(get_class($this)."::delete Delete discount", LOG_DEBUG);

+        $result = $this->db->query($sql);

+        if ($result)

+        {

+            // If source of discount was a credit note or deposit, we change source statut.

+            if ($this->fk_facture_source)

+            {

+                $sql = "UPDATE ".MAIN_DB_PREFIX."facture";

+                $sql .= " set paye=0, fk_statut=1";

+                $sql .= " WHERE (type = 2 or type = 3) AND rowid=".$this->fk_facture_source;

+

+                dol_syslog(get_class($this)."::delete Update credit note or deposit invoice statut", LOG_DEBUG);

+                $result = $this->db->query($sql);

+                if ($result)

+                {

+                    $this->db->commit();

+                    return 1;

+                }

+                else

+                {

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

+                    $this->db->rollback();

+                    return -1;

+                }

+            }

+            elseif ($this->fk_invoice_supplier_source) {

+            	$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn";

+            	$sql .= " set paye=0, fk_statut=1";

+            	$sql .= " WHERE (type = 2 or type = 3) AND rowid=".$this->fk_invoice_supplier_source;

+

+            	dol_syslog(get_class($this)."::delete Update credit note or deposit invoice statut", LOG_DEBUG);

+            	$result = $this->db->query($sql);

+            	if ($result)

+            	{

+            		$this->db->commit();

+            		return 1;

+            	}

+            	else

+            	{

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

+            		$this->db->rollback();

+            		return -1;

+            	}

+            }

+            else

+            {

+                $this->db->commit();

+                return 1;

+            }

+        }

+        else

+        {

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

+            $this->db->rollback();

+            return -1;

+        }

+    }

+

+

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     *	Link the discount to a particular invoice line or a particular invoice.

+     *	When discount is a global discount used as an invoice line, we link using rowidline.

+     *	When discount is from a credit note used to reduce payment of an invoice, we link using rowidinvoice

+     *

+     *	@param		int		$rowidline		Invoice line id (To use discount into invoice lines)

+     *	@param		int		$rowidinvoice	Invoice id (To use discount as a credit note to reduc payment of invoice)

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

+     */

+    public function link_to_invoice($rowidline, $rowidinvoice)

+    {

+        // phpcs:enable

+        // Check parameters

+        if (!$rowidline && !$rowidinvoice)

+        {

+            $this->error = 'ErrorBadParameters';

+            return -1;

+        }

+        if ($rowidline && $rowidinvoice)

+        {

+            $this->error = 'ErrorBadParameters';

+            return -2;

+        }

+

+        $sql = "UPDATE ".MAIN_DB_PREFIX."societe_remise_except";

+        if (!empty($this->discount_type)) {

+        	if ($rowidline)    $sql .= " SET fk_invoice_supplier_line = ".$rowidline;

+        	if ($rowidinvoice) $sql .= " SET fk_invoice_supplier = ".$rowidinvoice;

+        } else {

+        	if ($rowidline)    $sql .= " SET fk_facture_line = ".$rowidline;

+        	if ($rowidinvoice) $sql .= " SET fk_facture = ".$rowidinvoice;

+        }

+        $sql .= " WHERE rowid = ".$this->id;

+

+        dol_syslog(get_class($this)."::link_to_invoice", LOG_DEBUG);

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

+        if ($resql)

+        {

+        	if (!empty($this->discount_type)) {

+        		$this->fk_invoice_supplier_line = $rowidline;

+        		$this->fk_invoice_supplier = $rowidinvoice;

+        	} else {

+        		$this->fk_facture_line = $rowidline;

+        		$this->fk_facture = $rowidinvoice;

+        	}

+            return 1;

+        }

+        else

+        {

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

+            return -3;

+        }

+    }

+

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     *	Link the discount to a particular invoice line or a particular invoice.

+     *	Do not call this if discount is linked to a reconcialiated invoice

+     *

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

+     */

+    public function unlink_invoice()

+    {

+        // phpcs:enable

+        $sql = "UPDATE ".MAIN_DB_PREFIX."societe_remise_except";

+        if (!empty($this->discount_type)) {

+            $sql .= " SET fk_invoice_supplier_line = NULL, fk_invoice_supplier = NULL";

+        } else {

@@ -509,11 +486,244 @@
-		$sql .= " WHERE rowid = ".((int) $this->id);

-

-		dol_syslog(get_class($this)."::unlink_invoice", LOG_DEBUG);

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

-		if ($resql) {

-			return 1;

-		} else {

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

-			return -3;

-		}

-	}

+        $sql .= " WHERE rowid = ".$this->id;

+

+        dol_syslog(get_class($this)."::unlink_invoice", LOG_DEBUG);

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

+        if ($resql)

+        {

+            return 1;

+        }

+        else

+        {

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

+            return -3;

+        }

+    }

+

+

+    /**

+     *  Return amount (with tax) of discounts currently available for a company, user or other criteria

+     *

+     *	@param		Societe		$company		Object third party for filter

+     *	@param		User		$user			Filtre sur un user auteur des remises

+     * 	@param		string		$filter			Filtre autre

+     * 	@param		int			$maxvalue		Filter on max value for discount

+     *  @param      int			$discount_type  0 => customer discount, 1 => supplier discount

+	 *  @param      int			$multicurrency  Return multicurrency_amount instead of amount

+     * 	@return		int						<0 if KO, amount otherwise

+     */

+    public function getAvailableDiscounts($company = '', $user = '', $filter = '', $maxvalue = 0, $discount_type = 0, $multicurrency = 0)

+    {

+        global $conf;

+

+        dol_syslog(get_class($this)."::getAvailableDiscounts discount_type=".$discount_type, LOG_DEBUG);

+

+        $sql = "SELECT SUM(rc.amount_ttc) as amount, SUM(rc.multicurrency_amount_ttc) as multicurrency_amount";

+        $sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as rc";

+        $sql .= " WHERE rc.entity = ".$conf->entity;

+        $sql .= " AND rc.discount_type=".intval($discount_type);

+        if (!empty($discount_type)) {

+        	$sql .= " AND (rc.fk_invoice_supplier IS NULL AND rc.fk_invoice_supplier_line IS NULL)"; // Available from supplier

+        } else {

+        	$sql .= " AND (rc.fk_facture IS NULL AND rc.fk_facture_line IS NULL)"; // Available to customer

+        }

+        if (is_object($company)) $sql .= " AND rc.fk_soc = ".$company->id;

+        if (is_object($user))    $sql .= " AND rc.fk_user = ".$user->id;

+        if ($filter)   $sql .= ' AND ('.$filter.')';

+        if ($maxvalue) $sql .= ' AND rc.amount_ttc <= '.price2num($maxvalue);

+

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

+        if ($resql)

+        {

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

+            //while ($obj)

+            //{

+            //print 'zz'.$obj->amount;

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

+            //}

+			if ($multicurrency)

+			{

+				return $obj->amount_multicurrency;

+			}

+

+            return $obj->amount;

+        }

+        return -1;

+    }

+

+

+    /**

+     *  Return amount (with tax) of all deposits invoices used by invoice as a payment.

+     *  Should always be empty, except if option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS is on (not recommended).

+     *

+     *	@param		CommonInvoice	$invoice		Object invoice (customer of supplier)

+     *  @param 		int 		    $multicurrency 	1=Return multicurrency_amount instead of amount

+     *	@return		int				     			<0 if KO, Sum of credit notes and deposits amount otherwise

+     */

+    public function getSumDepositsUsed($invoice, $multicurrency = 0)

+    {

+        dol_syslog(get_class($this)."::getSumDepositsUsed", LOG_DEBUG);

+

+        if ($invoice->element == 'facture' || $invoice->element == 'invoice')

+        {

+            $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';

+            $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';

+            $sql .= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;

+            $sql .= ' AND f.type = 3';

+        }

+        elseif ($invoice->element == 'invoice_supplier')

+        {

+            $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';

+            $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';

+            $sql .= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;

+            $sql .= ' AND f.type = 3';

+        }

+        else

+        {

+            $this->error = get_class($this)."::getSumDepositsUsed was called with a bad object as a first parameter";

+            dol_print_error($this->error);

+            return -1;

+        }

+

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

+        if ($resql)

+        {

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

+            if ($multicurrency == 1) return $obj->multicurrency_amount;

+			else return $obj->amount;

+        }

+        else

+        {

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

+            return -1;

+        }

+    }

+

+    /**

+     *  Return amount (with tax) of all credit notes invoices + excess received used by invoice as a payment

+     *

+     *	@param      CommonInvoice	  $invoice	    	Object invoice

+     *	@param      int			      $multicurrency	1=Return multicurrency_amount instead of amount

+     *	@return     int					        		<0 if KO, Sum of credit notes and excess received amount otherwise

+     */

+    public function getSumCreditNotesUsed($invoice, $multicurrency = 0)

+    {

+        dol_syslog(get_class($this)."::getSumCreditNotesUsed", LOG_DEBUG);

+

+        if ($invoice->element == 'facture' || $invoice->element == 'invoice')

+        {

+            $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';

+            $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';

+            $sql .= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;

+            $sql .= ' AND f.type IN ('.$invoice::TYPE_STANDARD.', '.$invoice::TYPE_CREDIT_NOTE.', '.$invoice::TYPE_SITUATION.')'; // Find discount coming from credit note or excess received

+        }

+        elseif ($invoice->element == 'invoice_supplier')

+        {

+            $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';

+            $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';

+            $sql .= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;

+            $sql .= ' AND f.type IN ('.$invoice::TYPE_STANDARD.', '.$invoice::TYPE_CREDIT_NOTE.')'; // Find discount coming from credit note or excess paid

+        }

+        else

+        {

+            $this->error = get_class($this)."::getSumCreditNotesUsed was called with a bad object as a first parameter";

+            dol_print_error($this->error);

+            return -1;

+        }

+

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

+        if ($resql)

+        {

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

+            if ($multicurrency == 1) return $obj->multicurrency_amount;

+			else return $obj->amount;

+        }

+        else

+        {

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

+            return -1;

+        }

+    }

+    /**

+     *    	Return amount (with tax) of all converted amount for this credit note

+     *

+     *	@param		CommonInvoice	  $invoice	    	Object invoice

+	 *	@param		int			      $multicurrency	Return multicurrency_amount instead of amount

+     *	@return		int					        		<0 if KO, Sum of credit notes and deposits amount otherwise

+     */

+    public function getSumFromThisCreditNotesNotUsed($invoice, $multicurrency = 0)

+    {

+        dol_syslog(get_class($this)."::getSumCreditNotesUsed", LOG_DEBUG);

+

+        if ($invoice->element == 'facture' || $invoice->element == 'invoice')

+        {

+            $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';

+            $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc';

+            $sql .= ' WHERE rc.fk_facture IS NULL AND rc.fk_facture_source = '.$invoice->id;

+        }

+        elseif ($invoice->element == 'invoice_supplier')

+        {

+            $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';

+            $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc';

+            $sql .= ' WHERE rc.fk_invoice_supplier IS NULL AND rc.fk_invoice_supplier_source = '.$invoice->id;

+        }

+        else

+        {

+            $this->error = get_class($this)."::getSumCreditNotesUsed was called with a bad object as a first parameter";

+            dol_print_error($this->error);

+            return -1;

+        }

+

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

+        if ($resql)

+        {

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

+            if ($multicurrency) return $obj->multicurrency_amount;

+			else return $obj->amount;

+        }

+        else

+        {

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

+            return -1;

+        }

+    }

+

+    /**

+     *  Return clickable ref of object (with picto or not)

+     *

+     *  @param		int		$withpicto		0=No picto, 1=Include picto into link, 2=Picto only

+     *  @param		string	$option			Where to link to ('invoice' or 'discount')

+     *  @return		string					String with URL

+     */

+    public function getNomUrl($withpicto, $option = 'invoice')

+    {

+        global $langs;

+

+        $result = '';

+        $link = '';

+        $linkend = '';

+        $label = '';

+        $picto = '';

+        $ref = '';

+

+        if ($option == 'invoice') {

+            $facid = !empty($this->discount_type) ? $this->fk_invoice_supplier_source : $this->fk_facture_source;

+            $link = !empty($this->discount_type) ? '/fourn/facture/card.php' : '/compta/facture/card.php';

+            $label = $langs->trans("ShowSourceInvoice").': '.$this->ref_facture_source;

+            $link = '<a href="'.DOL_URL_ROOT.$link.'?facid='.$facid.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';

+            $linkend = '</a>';

+            $ref = !empty($this->discount_type) ? $this->ref_invoice_supplier_source : $this->ref_facture_source;

+            $picto = 'bill';

+        }

+        if ($option == 'discount') {

+            $label = $langs->trans("Discount");

+            $link = '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$this->fk_soc.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';

+            $linkend = '</a>';

+            $ref = $langs->trans("Discount");

+            $picto = 'generic';

+        }

+

+

+        if ($withpicto) $result .= ($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);

+        if ($withpicto && $withpicto != 2) $result .= ' ';

+        $result .= $link.$ref.$linkend;

+        return $result;

+    }

@@ -523,230 +733,5 @@
-	 *  Return amount (with tax) of discounts currently available for a company, user or other criteria

-	 *

-	 *	@param		Societe		$company		Object third party for filter

-	 *	@param		User		$user			Filtre sur un user auteur des remises

-	 * 	@param		string		$filter			Filter other. Warning: Do not use a user input value here.

-	 * 	@param		int			$maxvalue		Filter on max value for discount

-	 *  @param      int			$discount_type  0 => customer discount, 1 => supplier discount

-	 *  @param      int			$multicurrency  Return multicurrency_amount instead of amount

-	 * 	@return		int						Return integer <0 if KO, amount otherwise

-	 */

-	public function getAvailableDiscounts($company = null, $user = null, $filter = '', $maxvalue = 0, $discount_type = 0, $multicurrency = 0)

-	{

-		global $conf;

-

-		dol_syslog(get_class($this)."::getAvailableDiscounts discount_type=".$discount_type, LOG_DEBUG);

-

-		$sql = "SELECT SUM(rc.amount_ttc) as amount, SUM(rc.multicurrency_amount_ttc) as multicurrency_amount";

-		$sql .= " FROM ".$this->db->prefix()."societe_remise_except as rc";

-		$sql .= " WHERE rc.entity = ".$conf->entity;

-		$sql .= " AND rc.discount_type=".((int) $discount_type);

-		if (!empty($discount_type)) {

-			$sql .= " AND (rc.fk_invoice_supplier IS NULL AND rc.fk_invoice_supplier_line IS NULL)"; // Available from supplier

-		} else {

-			$sql .= " AND (rc.fk_facture IS NULL AND rc.fk_facture_line IS NULL)"; // Available to customer

-		}

-		if (is_object($company)) {

-			$sql .= " AND rc.fk_soc = ".((int) $company->id);

-		}

-		if (is_object($user)) {

-			$sql .= " AND rc.fk_user = ".((int) $user->id);

-		}

-		if ($filter) {

-			$sql .= " AND (".$filter.")";

-		}

-		if ($maxvalue) {

-			$sql .= ' AND rc.amount_ttc <= '.((float) price2num($maxvalue));

-		}

-

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

-		if ($resql) {

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

-			//while ($obj)

-			//{

-			//print 'zz'.$obj->amount;

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

-			//}

-			if ($multicurrency) {

-				return $obj->multicurrency_amount;

-			}

-

-			return $obj->amount;

-		}

-		return -1;

-	}

-

-

-	/**

-	 *  Return amount (with tax) of all deposits invoices used by invoice as a payment.

-	 *  Should always be empty, except if option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS or FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS is on (not recommended).

-	 *

-	 *	@param		CommonInvoice	$invoice		Object invoice (customer of supplier)

-	 *  @param 		int 		    $multicurrency 	1=Return multicurrency_amount instead of amount. TODO Add a mode multicurrency = -1 to return array with amount + multicurrency amount

-	 *	@return		int				     			Return integer <0 if KO, Sum of credit notes and deposits amount otherwise

-	 */

-	public function getSumDepositsUsed($invoice, $multicurrency = 0)

-	{

-		dol_syslog(get_class($this)."::getSumDepositsUsed", LOG_DEBUG);

-

-		if ($invoice->element == 'facture' || $invoice->element == 'invoice') {

-			$sql = "SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount";

-			$sql .= " FROM ".$this->db->prefix()."societe_remise_except as rc, ".$this->db->prefix()."facture as f";

-			$sql .= " WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = ".((int) $invoice->id);

-			$sql .= " AND f.type = ". (int) $invoice::TYPE_DEPOSIT;

-		} elseif ($invoice->element == 'invoice_supplier') {

-			$sql = "SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount";

-			$sql .= " FROM ".$this->db->prefix()."societe_remise_except as rc, ".$this->db->prefix()."facture_fourn as f";

-			$sql .= " WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = ".((int) $invoice->id);

-			$sql .= " AND f.type = ". (int) $invoice::TYPE_DEPOSIT;

-		} else {

-			$this->error = get_class($this)."::getSumDepositsUsed was called with a bad object as a first parameter";

-			dol_print_error($this->db, $this->error);

-			return -1;

-		}

-

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

-		if ($resql) {

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

-			if ($multicurrency == 1) {

-				return $obj->multicurrency_amount;

-			} else {

-				return $obj->amount;

-			}

-		} else {

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

-			return -1;

-		}

-	}

-

-	/**

-	 *  Return amount (with tax) of all credit notes invoices + excess received used by invoice as a payment

-	 *

-	 *	@param      CommonInvoice	  $invoice	    	Object invoice

-	 *	@param      int			      $multicurrency	1=Return multicurrency_amount instead of amount. TODO Add a mode multicurrency = -1 to return array with amount + multicurrency amount

-	 *	@return     int					        		Return integer <0 if KO, Sum of credit notes and excess received amount otherwise

-	 */

-	public function getSumCreditNotesUsed($invoice, $multicurrency = 0)

-	{

-		dol_syslog(get_class($this)."::getSumCreditNotesUsed", LOG_DEBUG);

-

-		if ($invoice->element == 'facture' || $invoice->element == 'invoice') {

-			$sql = "SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount";

-			$sql .= " FROM ".$this->db->prefix()."societe_remise_except as rc, ".$this->db->prefix()."facture as f";

-			$sql .= " WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = ".((int) $invoice->id);

-			$sql .= " AND f.type IN (".$this->db->sanitize($invoice::TYPE_STANDARD.", ".$invoice::TYPE_CREDIT_NOTE.", ".$invoice::TYPE_SITUATION).")"; // Find discount coming from credit note or excess received

-		} elseif ($invoice->element == 'invoice_supplier') {

-			$sql = "SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount";

-			$sql .= " FROM ".$this->db->prefix()."societe_remise_except as rc, ".$this->db->prefix()."facture_fourn as f";

-			$sql .= " WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = ".((int) $invoice->id);

-			$sql .= " AND f.type IN (".$this->db->sanitize($invoice::TYPE_STANDARD.", ".$invoice::TYPE_CREDIT_NOTE).")"; // Find discount coming from credit note or excess paid

-		} else {

-			$this->error = get_class($this)."::getSumCreditNotesUsed was called with a bad object as a first parameter";

-			dol_print_error($this->db, $this->error);

-			return -1;

-		}

-

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

-		if ($resql) {

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

-			if ($multicurrency == 1) {

-				return $obj->multicurrency_amount;

-			} else {

-				return $obj->amount;

-			}

-		} else {

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

-			return -1;

-		}

-	}

-	/**

-	 *    	Return amount (with tax) of all converted amount for this credit note

-	 *

-	 *	@param		CommonInvoice	  $invoice	    	Object invoice

-	 *	@param		int			      $multicurrency	Return multicurrency_amount instead of amount. TODO Add a mode multicurrency = -1 to return array with amount + multicurrency amount

-	 *	@return		int					        		Return integer <0 if KO, Sum of credit notes and deposits amount otherwise

-	 */

-	public function getSumFromThisCreditNotesNotUsed($invoice, $multicurrency = 0)

-	{

-		dol_syslog(get_class($this)."::getSumCreditNotesUsed", LOG_DEBUG);

-

-		if ($invoice->element == 'facture' || $invoice->element == 'invoice') {

-			$sql = "SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount";

-			$sql .= " FROM ".$this->db->prefix()."societe_remise_except as rc";

-			$sql .= " WHERE rc.fk_facture IS NULL AND rc.fk_facture_source = ".((int) $invoice->id);

-		} elseif ($invoice->element == 'invoice_supplier') {

-			$sql = "SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount";

-			$sql .= " FROM ".$this->db->prefix()."societe_remise_except as rc";

-			$sql .= " WHERE rc.fk_invoice_supplier IS NULL AND rc.fk_invoice_supplier_source = ".((int) $invoice->id);

-		} else {

-			$this->error = get_class($this)."::getSumCreditNotesUsed was called with a bad object as a first parameter";

-			dol_print_error($this->db, $this->error);

-			return -1;

-		}

-

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

-		if ($resql) {

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

-			if ($multicurrency) {

-				return $obj->multicurrency_amount;

-			} else {

-				return $obj->amount;

-			}

-		} else {

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

-			return -1;

-		}

-	}

-

-	/**

-	 *  Return clickable ref of object (with picto or not)

-	 *

-	 *  @param		int		$withpicto		0=No picto, 1=Include picto into link, 2=Picto only

-	 *  @param		string	$option			Where to link to ('invoice' or 'discount')

-	 *  @return		string					String with URL

-	 */

-	public function getNomUrl($withpicto, $option = 'invoice')

-	{

-		global $langs;

-

-		$result = '';

-		$link = '';

-		$linkend = '';

-		$label = '';

-		$picto = '';

-		$ref = '';

-

-		if ($option == 'invoice') {

-			$facid = !empty($this->discount_type) ? $this->fk_invoice_supplier_source : $this->fk_facture_source;

-			$link = !empty($this->discount_type) ? '/fourn/facture/card.php' : '/compta/facture/card.php';

-			$label = $langs->trans("ShowSourceInvoice").': '.$this->ref_facture_source;

-			$link = '<a href="'.DOL_URL_ROOT.$link.'?facid='.$facid.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';

-			$linkend = '</a>';

-			$ref = !empty($this->discount_type) ? $this->ref_invoice_supplier_source : $this->ref_facture_source;

-			$picto = 'bill';

-		}

-		if ($option == 'discount') {

-			$label = $langs->trans("Discount");

-			$link = '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$this->fk_soc.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';

-			$linkend = '</a>';

-			$ref = $langs->trans("Discount");

-			$picto = 'generic';

-		}

-

-

-		if ($withpicto) {

-			$result .= ($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);

-		}

-		if ($withpicto && $withpicto != 2) {

-			$result .= ' ';

-		}

-		$result .= $link.$ref.$linkend;

-		return $result;

-	}

-

-

-	/**

-	 *  Initialise an instance with random values.

-	 *  Used to build previews or test instances.

-	 *	id must be 0 if object instance is a specimen.

-	 *

-	 *  @return	void

+     *  Initialise an instance with random values.

+     *  Used to build previews or test instances.

+     *	id must be 0 if object instance is a specimen.

+     *

+     *  @return	void

@@ -755,0 +741,2 @@
+		global $user, $langs, $conf;

+

@@ -757 +743,0 @@
-		$this->socid          = 1;

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_doleditor.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_doleditor.class.php
@@ -3 +2,0 @@
- * Copyright (C) 2021 Gaëtan MAISON <gm@ilad.org>

@@ -32,31 +31,30 @@
-	public $tool; // Store the selected tool

-

-	// If using fckeditor

-	public $editor;

-

-	// If not using fckeditor

-	public $content;

-	public $htmlname;

-	public $toolbarname;

-	public $toolbarstartexpanded;

-	public $rows;

-	public $cols;

-	public $height;

-	public $width;

-	public $uselocalbrowser;

-	public $readonly;

-	public $posx;

-	public $posy;

-

-

-	/**

-	 *  Create an object to build an HTML area to edit a large string content

-	 *

-	 *  @param 	string	$htmlname		        		HTML name of WYSIWIG field

-	 *  @param 	string	$content		        		Content of WYSIWIG field

-	 *  @param	int|string	$width						Width in pixel of edit area (auto by default)

-	 *  @param 	int		$height			       		 	Height in pixel of edit area (200px by default)

-	 *  @param 	string	$toolbarname	       		 	Name of bar set to use ('Full', 'dolibarr_notes[_encoded]', 'dolibarr_details[_encoded]'=the less featured, 'dolibarr_mailings[_encoded]', 'dolibarr_readonly').

-	 *  @param  string	$toolbarlocation       			Deprecated. Not used

-	 *  @param  boolean	$toolbarstartexpanded  			Bar is visible or not at start

-	 *  @param	boolean|int		$uselocalbrowser		Enabled to add links to local object with local browser. If false, only external images can be added in content.

+    public $tool; // Store the selected tool

+

+    // If using fckeditor

+    public $editor;

+

+    // If not using fckeditor

+    public $content;

+    public $htmlname;

+    public $toolbarname;

+    public $toolbarstartexpanded;

+    public $rows;

+    public $cols;

+    public $height;

+    public $width;

+    public $readonly;

+

+

+    /**

+     *  Create an object to build an HTML area to edit a large string content

+     *

+     *  @param 	string	$htmlname		        		HTML name of WYSIWIG field

+     *  @param 	string	$content		        		Content of WYSIWIG field

+     *  @param	int		$width							Width in pixel of edit area (auto by default)

+     *  @param 	int		$height			       		 	Height in pixel of edit area (200px by default)

+     *  @param 	string	$toolbarname	       		 	Name of bar set to use ('Full', 'dolibarr_notes[_encoded]', 'dolibarr_details[_encoded]'=the less featured, 'dolibarr_mailings[_encoded]', 'dolibarr_readonly').

+     *  @param  string	$toolbarlocation       			Where bar is stored :

+     *                       		                    'In' each window has its own toolbar

+     *                              		            'Out:name' share toolbar into the div called 'name'

+     *  @param  boolean	$toolbarstartexpanded  			Bar is visible or not at start

+	 *  @param	int		$uselocalbrowser				Enabled to add links to local object with local browser. If false, only external images can be added in content.

@@ -65 +63 @@
-	 *  @param  int		$rows                   		Size of rows for textarea tool

+     *  @param  int		$rows                   		Size of rows for textarea tool

@@ -68 +65,0 @@
-	 *  @param	array	$poscursor						Array for initial cursor position array('x'=>x, 'y'=>y)

@@ -70,12 +67,8 @@
-	public function __construct($htmlname, $content, $width = '', $height = 200, $toolbarname = 'Basic', $toolbarlocation = 'In', $toolbarstartexpanded = false, $uselocalbrowser = 1, $okforextendededitor = true, $rows = 0, $cols = '', $readonly = 0, $poscursor = array())

-	{

-		global $conf;

-

-		dol_syslog(get_class($this)."::DolEditor htmlname=".$htmlname." width=".$width." height=".$height." toolbarname=".$toolbarname);

-

-		if (!$rows) {

-			$rows = round($height / 20);

-		}

-		if (!$cols) {

-			$cols = ($width ? round($width / 6) : 80);

-		}

+    public function __construct($htmlname, $content, $width = '', $height = 200, $toolbarname = 'Basic', $toolbarlocation = 'In', $toolbarstartexpanded = false, $uselocalbrowser = true, $okforextendededitor = true, $rows = 0, $cols = 0, $readonly = 0)

+    {

+    	global $conf, $langs;

+

+    	dol_syslog(get_class($this)."::DolEditor htmlname=".$htmlname." width=".$width." height=".$height." toolbarname=".$toolbarname);

+

+    	if (!$rows) $rows = round($height / 20);

+    	if (!$cols) $cols = ($width ?round($width / 6) : 80);

@@ -84,59 +77,54 @@
-		// Name of extended editor to use (FCKEDITOR_EDITORNAME can be 'ckeditor' or 'fckeditor')

-		$defaulteditor = 'ckeditor';

-		$this->tool = !getDolGlobalString('FCKEDITOR_EDITORNAME') ? $defaulteditor : $conf->global->FCKEDITOR_EDITORNAME;

-		$this->uselocalbrowser = $uselocalbrowser;

-		$this->readonly = $readonly;

-

-		// Check if extended editor is ok. If not we force textarea

-		if ((!isModEnabled('fckeditor') && $okforextendededitor != 'ace') || empty($okforextendededitor)) {

-			$this->tool = 'textarea';

-		}

-		if ($okforextendededitor === 'ace') {

-			$this->tool = 'ace';

-		}

-		//if ($conf->dol_use_jmobile) $this->tool = 'textarea';       // ckeditor and ace seems ok with mobile

-

-		// Define some properties

-		if (in_array($this->tool, array('textarea', 'ckeditor', 'ace'))) {

-			if ($this->tool == 'ckeditor' && !dol_textishtml($content)) {	// We force content to be into HTML if we are using an advanced editor if content is not HTML.

-				$this->content = dol_nl2br($content);

-			} else {

-				$this->content = $content;

-			}

-			$this->htmlname 			= $htmlname;

-			$this->toolbarname = $shorttoolbarname;

-			$this->toolbarstartexpanded = $toolbarstartexpanded;

-			$this->rows					= max(ROWS_3, $rows);

-			$this->cols					= (preg_match('/%/', $cols) ? $cols : max(40, $cols)); // If $cols is a percent, we keep it, otherwise, we take max

-			$this->height               = $height;

-			$this->width				= $width;

-			$this->posx                 = empty($poscursor['x']) ? 0 : $poscursor['x'];

-			$this->posy                 = empty($poscursor['y']) ? 0 : $poscursor['y'];

-		}

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 *	Output edit area inside the HTML stream.

-	 *	Output depends on this->tool (fckeditor, ckeditor, textarea, ...)

-	 *

-	 *  @param	int		$noprint             1=Return HTML string instead of printing it to output

-	 *  @param	string	$morejs		         Add more js. For example: ".on( \'saveSnapshot\', function(e) { alert(\'ee\'); });". Used by CKEditor only.

-	 *  @param  boolean $disallowAnyContent  Disallow to use any content. true=restrict to a predefined list of allowed elements. Used by CKEditor only.

-	 *  @param	string	$titlecontent		 Show title content before editor area. Used by ACE editor only.

-	 *  @param	string	$option				 For ACE editor, set the source language ('html', 'php', 'javascript', ...)

-	 *  @param	string	$moreparam			 Add extra tags to the textarea

-	 *  @param	string	$morecss			 Add extra css to the textarea

-	 *  @return	void|string

-	 */

-	public function Create($noprint = 0, $morejs = '', $disallowAnyContent = true, $titlecontent = '', $option = '', $moreparam = '', $morecss = '')

-	{

-		// phpcs:enable

-		global $conf, $langs;

-

-		$fullpage = false;

-		if (isset($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT)) {

-			$disallowAnyContent = !getDolGlobalString('FCKEDITOR_ALLOW_ANY_CONTENT'); // Only predefined list of html tags are allowed or all

-		}

-

-		$found = 0;

+        // Name of extended editor to use (FCKEDITOR_EDITORNAME can be 'ckeditor' or 'fckeditor')

+        $defaulteditor = 'ckeditor';

+        $this->tool = empty($conf->global->FCKEDITOR_EDITORNAME) ? $defaulteditor : $conf->global->FCKEDITOR_EDITORNAME;

+        $this->uselocalbrowser = $uselocalbrowser;

+        $this->readonly = $readonly;

+

+        // Check if extended editor is ok. If not we force textarea

+        if ((empty($conf->fckeditor->enabled) && $okforextendededitor != 'ace') || empty($okforextendededitor)) $this->tool = 'textarea';

+		if ($okforextendededitor === 'ace') $this->tool = 'ace';

+        //if ($conf->dol_use_jmobile) $this->tool = 'textarea';       // ckeditor and ace seems ok with mobile

+

+    	// Define some properties

+        if (in_array($this->tool, array('textarea', 'ckeditor', 'ace')))

+        {

+        	if ($this->tool == 'ckeditor' && ! dol_textishtml($content)) {	// We force content to be into HTML if we are using an advanced editor if content is not HTML.

+        		$this->content = dol_nl2br($content);

+        	}

+        	else {

+    	    	$this->content = $content;

+        	}

+    	    $this->htmlname 			= $htmlname;

+    	    $this->toolbarname = $shorttoolbarname;

+    	    $this->toolbarstartexpanded = $toolbarstartexpanded;

+            $this->rows					= max(ROWS_3, $rows);

+            $this->cols					= (preg_match('/%/', $cols) ? $cols : max(40, $cols)); // If $cols is a percent, we keep it, otherwise, we take max

+            $this->height = $height;

+            $this->width				= $width;

+        }

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     *	Output edit area inside the HTML stream.

+     *	Output depends on this->tool (fckeditor, ckeditor, textarea, ...)

+     *

+     *  @param	int		$noprint             1=Return HTML string instead of printing it to output

+     *  @param	string	$morejs		         Add more js. For example: ".on( \'saveSnapshot\', function(e) { alert(\'ee\'); });". Used by CKEditor only.

+     *  @param  boolean $disallowAnyContent  Disallow to use any content. true=restrict to a predefined list of allowed elements. Used by CKEditor only.

+     *  @param	string	$titlecontent		 Show title content before editor area. Used by ACE editor only.

+     *  @param	string	$option				 For ACE editor, set the source language ('html', 'php', 'javascript', ...)

+     *  @return	void|string

+     */

+    public function Create($noprint = 0, $morejs = '', $disallowAnyContent = true, $titlecontent = '', $option = '')

+    {

+        // phpcs:enable

+    	global $conf, $langs;

+

+    	$fullpage = false;

+    	if (isset($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT))

+    	{

+            $disallowAnyContent = empty($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT); // Only predefined list of html tags are allowed or all

+    	}

+

+    	$found = 0;

@@ -145,12 +133,18 @@
-		if (in_array($this->tool, array('textarea', 'ckeditor'))) {

-			$found = 1;

-			//$out.= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" '.($this->readonly?' disabled':'').' rows="'.$this->rows.'"'.(preg_match('/%/',$this->cols)?' style="margin-top: 5px; width: '.$this->cols.'"':' cols="'.$this->cols.'"').' class="flat">';

-			// TODO We do not put the 'disabled' tag because on a read form, it change style with grey.

-			//print $this->content;

-			$out .= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" rows="'.$this->rows.'"'.(preg_match('/%/', $this->cols) ? ' style="margin-top: 5px; width: '.$this->cols.'"' : ' cols="'.$this->cols.'"').' '.($moreparam ? $moreparam : '').' class="flat '.$morecss.'">';

-			$out .= htmlspecialchars($this->content);

-			$out .= '</textarea>';

-

-			if ($this->tool == 'ckeditor' && !empty($conf->use_javascript_ajax) && isModEnabled('fckeditor')) {

-				if (!defined('REQUIRE_CKEDITOR')) {

-					define('REQUIRE_CKEDITOR', '1');

+        if (in_array($this->tool, array('textarea', 'ckeditor')))

+        {

+            $found = 1;

+            //$out.= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" '.($this->readonly?' disabled':'').' rows="'.$this->rows.'"'.(preg_match('/%/',$this->cols)?' style="margin-top: 5px; width: '.$this->cols.'"':' cols="'.$this->cols.'"').' class="flat">';

+            // TODO We do not put the 'disabled' tag because on a read form, it change style with grey.

+            //print $this->content;

+            $out .= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" rows="'.$this->rows.'"'.(preg_match('/%/', $this->cols) ? ' style="margin-top: 5px; width: '.$this->cols.'"' : ' cols="'.$this->cols.'"').' class="flat">';

+            $out .= htmlspecialchars($this->content);

+            $out .= '</textarea>';

+

+            if ($this->tool == 'ckeditor' && !empty($conf->use_javascript_ajax) && !empty($conf->fckeditor->enabled))

+            {

+            	if (!defined('REQUIRE_CKEDITOR')) define('REQUIRE_CKEDITOR', '1');

+

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

+					$skin = $conf->global->FCKEDITOR_SKIN;

+				} else {

+					$skin = 'moono-lisa'; // default with ckeditor 4.6 : moono-lisa

@@ -159,30 +153,4 @@
-				$skin = getDolGlobalString('FCKEDITOR_SKIN', 'moono-lisa');		// default with ckeditor 4.6 : moono-lisa

-

-				$pluginstodisable = 'elementspath,save,flash,div,anchor';

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

-					$pluginstodisable .= ',specialchar';

-				}

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

-					$pluginstodisable .= ',scayt,wsc,find,undo';

-				}

-				if (!getDolGlobalString('FCKEDITOR_ENABLE_WSC')) {	// spellchecker has end of life december 2021

-					$pluginstodisable .= ',wsc';

-				}

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

-					$pluginstodisable .= ',exportpdf';

-				}

-				if (getDolGlobalInt('MAIN_DISALLOW_URL_INTO_DESCRIPTIONS') == 2) {

-					$this->uselocalbrowser = 0;	// Can't use browser to navigate into files. Only links with "<img src=data:..." are allowed.

-				}

-				$scaytautostartup = '';

-				if (getDolGlobalString('FCKEDITOR_ENABLE_SCAYT_AUTOSTARTUP')) {

-					$scaytautostartup = 'scayt_autoStartup: true,';

-					$scaytautostartup .= 'scayt_sLang: \''.dol_escape_js($langs->getDefaultLang()).'\',';

-				} else {

-					$pluginstodisable .= ',scayt';

-				}

-

-				$htmlencode_force = preg_match('/_encoded$/', $this->toolbarname) ? 'true' : 'false';

-

-				$out .= '<!-- Output ckeditor $disallowAnyContent='.dol_escape_htmltag($disallowAnyContent).' toolbarname='.dol_escape_htmltag($this->toolbarname).' -->'."\n";

-				$out .= '<script nonce="'.getNonce().'" type="text/javascript">

+            	$htmlencode_force = preg_match('/_encoded$/', $this->toolbarname) ? 'true' : 'false';

+

+            	$out .= '<!-- Output ckeditor $disallowAnyContent='.$disallowAnyContent.' toolbarname='.$this->toolbarname.' -->'."\n";

+            	$out .= '<script type="text/javascript">

@@ -192,2 +160,2 @@
-                            /* should be editor=CKEDITOR.replace but what if there is several editors ? */

-                            tmpeditor = CKEDITOR.replace(\''.dol_escape_js($this->htmlname).'\',

+                            /* should be editor=CKEDITOR.replace but what if serveral editors ? */

+                            CKEDITOR.replace(\''.$this->htmlname.'\',

@@ -196,10 +164,7 @@
-            						customConfig: ckeditorConfig,

-									removePlugins: \''.dol_escape_js($pluginstodisable).'\',

-									versionCheck: false,

-            						readOnly: '.($this->readonly ? 'true' : 'false').',

-                            		htmlEncodeOutput: '.dol_escape_js($htmlencode_force).',

-            						allowedContent: '.($disallowAnyContent ? 'false' : 'true').',		/* Advanced Content Filter (ACF) is own when allowedContent is false */

-            						extraAllowedContent: \'a[target];div{float,display}\',				/* Add the style float and display into div to default other allowed tags */

-									disallowedContent: '.($disallowAnyContent ? '\'\'' : '\'\'').',		/* Tags that are not allowed */

-            						fullPage: '.($fullpage ? 'true' : 'false').',						/* if true, the html, header and body tags are kept */

-                            		toolbar: \''.dol_escape_js($this->toolbarname).'\',

+            						customConfig : ckeditorConfig,

+            						readOnly : '.($this->readonly ? 'true' : 'false').',

+                            		htmlEncodeOutput :'.$htmlencode_force.',

+            						allowedContent :'.($disallowAnyContent ? 'false' : 'true').',

+            						extraAllowedContent : \'\',

+            						fullPage : '.($fullpage ? 'true' : 'false').',

+                            		toolbar: \''.$this->toolbarname.'\',

@@ -207,9 +172,9 @@
-            						width: '.($this->width ? '\''.dol_escape_js($this->width).'\'' : '\'\'').',

-            						height: '.dol_escape_js($this->height).',

-                                    skin: \''.dol_escape_js($skin).'\',

-                                    '.$scaytautostartup.'

-                                    language: \''.dol_escape_js($langs->defaultlang).'\',

-                                    textDirection: \''.dol_escape_js($langs->trans("DIRECTION")).'\',

-                                    on : {

-                                                instanceReady : function(ev) {

-													console.log("ckeditor instanceReady");

+            						width: '.($this->width ? '\''.$this->width.'\'' : '\'\'').',

+            						height: '.$this->height.',

+                                    skin: \''.$skin.'\',

+                                    language: \''.$langs->defaultlang.'\',

+                                    textDirection: \''.$langs->trans("DIRECTION").'\',

+                                    on :

+                                            {

+                                                instanceReady : function( ev )

+                                                {

@@ -217,31 +182,22 @@
-                                                    this.dataProcessor.writer.setRules( \'p\', {

-                                                        indent : false,

-                                                        breakBeforeOpen : true,

-                                                        breakAfterOpen : false,

-                                                        breakBeforeClose : false,

-                                                        breakAfterClose : true

-                                                    });

-                                                },

-												/* This is to remove the tab Link on image popup. Does not work, so commented */

-												/*

-												dialogDefinition: function (event) {

-										            var dialogName = event.data.name;

-										            var dialogDefinition = event.data.definition;

-										            if (dialogName == \'image\') {

-										                dialogDefinition.removeContents(\'Link\');

-										            }

-										        }

-												*/

-										},

-									disableNativeSpellChecker: '.(!getDolGlobalString('CKEDITOR_NATIVE_SPELLCHECKER') ? 'true' : 'false');

-

-				if ($this->uselocalbrowser) {

-					$out .= ','."\n";

-					// To use filemanager with old fckeditor (GPL)

-					// Note: ckeditorFilebrowserBrowseUrl and ckeditorFilebrowserImageBrowseUrl are defined in header by main.inc.php. They include url to browser with url of upload connector in parameter

-					$out .= '    filebrowserBrowseUrl : ckeditorFilebrowserBrowseUrl,';

-					$out .= '    filebrowserImageBrowseUrl : ckeditorFilebrowserImageBrowseUrl,';

-					//$out.= '    filebrowserUploadUrl : \''.DOL_URL_ROOT.'/includes/fckeditor/editor/filemanagerdol/connectors/php/upload.php?Type=File\',';

-					//$out.= '    filebrowserImageUploadUrl : \''.DOL_URL_ROOT.'/includes/fckeditor/editor/filemanagerdol/connectors/php/upload.php?Type=Image\',';

-					$out .= "\n";

-					// To use filemanager with ckfinder (Non free) and ckfinder directory is inside htdocs/includes

+                                                    this.dataProcessor.writer.setRules( \'p\',

+                                                        {

+                                                            indent : false,

+                                                            breakBeforeOpen : true,

+                                                            breakAfterOpen : false,

+                                                            breakBeforeClose : false,

+                                                            breakAfterClose : true

+                                                        });

+                                                }

+                                            },

+											disableNativeSpellChecker: '.(empty($conf->global->CKEDITOR_NATIVE_SPELLCHECKER) ? 'true' : 'false');

+

+            	if ($this->uselocalbrowser)

+            	{

+                    $out .= ','."\n";

+                    // To use filemanager with old fckeditor (GPL)

+                    $out .= '    filebrowserBrowseUrl : ckeditorFilebrowserBrowseUrl,';

+                    $out .= '    filebrowserImageBrowseUrl : ckeditorFilebrowserImageBrowseUrl,';

+                    //$out.= '    filebrowserUploadUrl : \''.DOL_URL_ROOT.'/includes/fckeditor/editor/filemanagerdol/connectors/php/upload.php?Type=File\',';

+                    //$out.= '    filebrowserImageUploadUrl : \''.DOL_URL_ROOT.'/includes/fckeditor/editor/filemanagerdol/connectors/php/upload.php?Type=Image\',';

+                    $out .= "\n";

+                    // To use filemanager with ckfinder (Non free) and ckfinder directory is inside htdocs/includes

@@ -249,5 +205,5 @@
-							   filebrowserImageBrowseUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/ckfinder.html?Type=Images\',

-							   filebrowserFlashBrowseUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/ckfinder.html?Type=Flash\',

-							   filebrowserUploadUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/core/connector/php/connector.php?command=QuickUpload&type=Files\',

-							   filebrowserImageUploadUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/core/connector/php/connector.php?command=QuickUpload&type=Images\',

-							   filebrowserFlashUploadUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/core/connector/php/connector.php?command=QuickUpload&type=Flash\','."\n";

+                               filebrowserImageBrowseUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/ckfinder.html?Type=Images\',

+                               filebrowserFlashBrowseUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/ckfinder.html?Type=Flash\',

+                               filebrowserUploadUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/core/connector/php/connector.php?command=QuickUpload&type=Files\',

+                               filebrowserImageUploadUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/core/connector/php/connector.php?command=QuickUpload&type=Images\',

+                               filebrowserFlashUploadUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/core/connector/php/connector.php?command=QuickUpload&type=Flash\','."\n";

@@ -255 +211 @@
-					$out .= '    filebrowserWindowWidth : \'900\',

+                    $out .= '    filebrowserWindowWidth : \'900\',

@@ -259,13 +215,12 @@
-				}

-				$out .= '	})'.$morejs;	// end CKEditor.replace

-				// Show the CKEditor javascript object once loaded is ready 'For debug)

-				//$out .= '; CKEDITOR.on(\'instanceReady\', function(ck) { ck.editor.removeMenuItem(\'maximize\'); ck.editor.removeMenuItem(\'Undo\'); ck.editor.removeMenuItem(\'undo\'); console.log(ck.editor); console.log(ck.editor.toolbar[0]); }); ';

-				$out .= '});'."\n";	// end document.ready

-				$out .= '</script>'."\n";

-			}

-		}

-

-		// Output editor ACE

-		// Warning: ace.js and ext-statusbar.js must be loaded by the parent page.

-		if (preg_match('/^ace/', $this->tool)) {

-			$found = 1;

+            	}

+            	$out .= '	})'.$morejs;

+            	$out .= '});'."\n";

+            	$out .= '</script>'."\n";

+            }

+        }

+

+        // Output editor ACE

+        // Warning: ace.js and ext-statusbar.js must be loaded by the parent page.

+        if (preg_match('/^ace/', $this->tool))

+        {

+        	$found = 1;

@@ -274,11 +229,10 @@
-			$out .= "\n".'<!-- Output Ace editor -->'."\n";

-

-			if ($titlecontent) {

-				$out .= '<div class="aceeditorstatusbar" id="statusBar'.$this->htmlname.'">'.$titlecontent;

-				$out .= ' &nbsp; - &nbsp; <span id="morelines" class="right classlink cursorpointer morelines'.$this->htmlname.'">'.dol_escape_htmltag($langs->trans("ShowMoreLines")).'</span> &nbsp; &nbsp; ';

-				$out .= '</div>';

-				$out .= '<script nonce="'.getNonce().'" type="text/javascript">'."\n";

-				$out .= 'jQuery(document).ready(function() {'."\n";

-				$out .= '	var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");

-							aceEditor.moveCursorTo('.($this->posy+1).','.$this->posx.');

-							aceEditor.gotoLine('.($this->posy+1).','.$this->posx.');

+            $out .= "\n".'<!-- Output Ace editor -->'."\n";

+

+			if ($titlecontent)

+			{

+	            $out .= '<div class="aceeditorstatusbar" id="statusBar'.$this->htmlname.'">'.$titlecontent;

+	            $out .= ' &nbsp; - &nbsp; <a id="morelines" href="#" class="right morelines'.$this->htmlname.' reposition">'.dol_escape_htmltag($langs->trans("ShowMoreLines")).'</a> &nbsp; &nbsp; ';

+	            $out .= '</div>';

+	            $out .= '<script type="text/javascript" language="javascript">'."\n";

+	            $out .= 'jQuery(document).ready(function() {'."\n";

+	            $out .= '	var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");

@@ -287,2 +241 @@
-

-							var oldNbOfLines = 0;

+	            			var oldNbOfLines = 0

@@ -307 +260 @@
-				$out .= '</script>'."\n";

+	            $out .= '</script>'."\n";

@@ -310,14 +263,12 @@
-			$out .= '<pre id="'.$this->htmlname.'aceeditorid" style="'.($this->width ? 'width: '.$this->width.'px; ' : '');

-			$out .= ($this->height ? ' height: '.$this->height.'px; ' : '');

-			//$out.=" min-height: 100px;";

-			$out .= '">';

-			$out .= htmlspecialchars($this->content);

-			$out .= '</pre>';

-			$out .= '<input type="hidden" id="'.$this->htmlname.'_x" name="'.$this->htmlname.'_x">';

-			$out .= '<input type="hidden" id="'.$this->htmlname.'_y" name="'.$this->htmlname.'_y">';

-			$out .= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" style="width:0px; height: 0px; display: none;">';

-			$out .= htmlspecialchars($this->content);

-			$out .= '</textarea>';

-

-			$out .= '<script nonce="'.getNonce().'" type="text/javascript">'."\n";

-			$out .= 'var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");

+            $out .= '<pre id="'.$this->htmlname.'aceeditorid" style="'.($this->width ? 'width: '.$this->width.'px; ' : '');

+            $out .= ($this->height ? ' height: '.$this->height.'px; ' : '');

+            //$out.=" min-height: 100px;";

+            $out .= '">';

+        	$out .= htmlspecialchars($this->content);

+        	$out .= '</pre>';

+        	$out .= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" style="width:0px; height: 0px; display: none;">';

+        	$out .= htmlspecialchars($this->content);

+        	$out .= '</textarea>';

+

+        	$out .= '<script type="text/javascript" language="javascript">'."\n";

+        	$out .= 'var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");

@@ -343 +294 @@
-			$out .= 'jQuery(document).ready(function() {

+        	$out .= 'jQuery(document).ready(function() {

@@ -345,19 +296,6 @@
-        					console.log("We click on savefile button for component '.dol_escape_js($this->htmlname).'");

-        					var aceEditor = window.ace.edit("'.dol_escape_js($this->htmlname).'aceeditorid");

-							if (aceEditor) {

-								var cursorPos = aceEditor.getCursorPosition();

-								//console.log(cursorPos);

-								if (cursorPos) {

-									jQuery("#'.dol_escape_js($this->htmlname).'_x").val(cursorPos.column);

-									jQuery("#'.dol_escape_js($this->htmlname).'_y").val(cursorPos.row);

-								}

-	        					//console.log(aceEditor.getSession().getValue());

-								// Inject content of editor into the original HTML field.

-								jQuery("#'.dol_escape_js($this->htmlname).'").val(aceEditor.getSession().getValue());

-								/*if (jQuery("#'.dol_escape_js($this->htmlname).'").html().length > 0) return true;

-								else return false;*/

-								return true;

-							} else {

-								console.log("Failed to retrieve js object ACE from its name");

-								return false;

-							}

+        					console.log("We click on savefile button for component '.$this->htmlname.'");

+        					var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid")

+        					console.log(aceEditor.getSession().getValue());

+							jQuery("#'.$this->htmlname.'").val(aceEditor.getSession().getValue());

+							/*if (jQuery("#'.$this->htmlname.'").html().length > 0) return true;

+							else return false;*/

@@ -366,13 +304,11 @@
-			$out .= '</script>'."\n";

-		}

-

-		if (empty($found)) {

-			$out .= 'Error, unknown value for tool '.$this->tool.' in DolEditor Create function.';

-		}

-

-		if ($noprint) {

-			return $out;

-		} else {

-			print $out;

-		}

-	}

+        	$out .= '</script>'."\n";

+        }

+

+        if (empty($found))

+        {

+            $out .= 'Error, unknown value for tool '.$this->tool.' in DolEditor Create function.';

+        }

+

+        if ($noprint) return $out;

+        else print $out;

+    }

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_dolexception.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_dolexception.class.php
@@ -30,6 +30,6 @@
-	/**

-	 * Constructor

-	 */

-	public function __construct()

-	{

-	}

+    /**

+     * Constructor

+     */

+    public function __construct()

+    {

+    }

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_dolgeoip.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_dolgeoip.class.php
@@ -28 +28 @@
- *      \brief      Class to manage GeoIP conversion

+ *      \brief      Classe to manage GeoIP

@@ -36,7 +36 @@
-	/**

-	 * @var GeoIp2\Database\Reader

-	 */

-	public $gi;

-

-	public $error;

-	public $errorlabel;

+    public $gi;

@@ -54,25 +48,20 @@
-		$geoipversion = '2'; // 'php', or geoip version '2'

-		if (getDolGlobalString('GEOIP_VERSION')) {

-			$geoipversion = $conf->global->GEOIP_VERSION;

-		}

-

-		if ($type == 'country') {

-			// geoip may have been already included with PEAR

-			if ($geoipversion == '2' || ($geoipversion != 'php' && !function_exists('geoip_country_code_by_name'))) {

-				if (function_exists('stream_wrapper_restore')) {

-					stream_wrapper_restore('phar');

-				}

-				require_once DOL_DOCUMENT_ROOT.'/includes/geoip2/geoip2.phar';

-			}

-		} elseif ($type == 'city') {

-			// geoip may have been already included with PEAR

-			if ($geoipversion == '2' || ($geoipversion != 'php' && !function_exists('geoip_country_code_by_name'))) {

-				if (function_exists('stream_wrapper_restore')) {

-					stream_wrapper_restore('phar');

-				}

-				require_once DOL_DOCUMENT_ROOT.'/includes/geoip2/geoip2.phar';

-			}

-		} else {

-			print 'ErrorBadParameterInConstructor';

-			return;

-		}

+		$geoipversion = '2'; // 'php', or '2'

+		if (!empty($conf->global->GEOIP_VERSION)) $geoipversion = $conf->global->GEOIP_VERSION;

+

+		if ($type == 'country')

+		{

+		    // geoip may have been already included with PEAR

+			if ($geoipversion == '2' || ($geoipversion != 'php' && !function_exists('geoip_country_code_by_name')))

+		    {

+		    	require_once DOL_DOCUMENT_ROOT.'/includes/geoip2/geoip2.phar';

+		    }

+		}

+		elseif ($type == 'city')

+		{

+		    // geoip may have been already included with PEAR

+			if ($geoipversion == '2' || ($geoipversion != 'php' && !function_exists('geoip_country_code_by_name')))

+		    {

+		    	require_once DOL_DOCUMENT_ROOT.'/includes/geoip2/geoip2.phar';

+		    }

+		}

+		else { print 'ErrorBadParameterInConstructor'; return 0; }

@@ -81 +70,2 @@
-		if (empty($type) || empty($datfile)) {

+		if (empty($type) || empty($datfile))

+		{

@@ -84,3 +74,4 @@
-			return;

-		}

-		if (!file_exists($datfile) || !is_readable($datfile)) {

+			return 0;

+		}

+		if (!file_exists($datfile) || !is_readable($datfile))

+		{

@@ -90,4 +81,5 @@
-			return;

-		}

-

-		if ($geoipversion == '2') {

+			return 0;

+		}

+

+		if ($geoipversion == '2')

+		{

@@ -95 +86,0 @@
-				// @phpstan-ignore-next-line

@@ -97 +88,3 @@
-			} catch (Exception $e) {

+			}

+			catch (Exception $e)

+			{

@@ -100,10 +93,12 @@
-				return;

-			}

-		} elseif (function_exists('geoip_open') && defined('GEOIP_STANDARD')) {

-			$this->gi = geoip_open($datfile, constant('GEOIP_STANDARD'));

-		} elseif (function_exists('geoip_country_code_by_name')) {

-			$this->gi = 'NOGI'; // We are using embedded php geoip functions

-			//print 'function_exists(geoip_country_code_by_name))='.function_exists('geoip_country_code_by_name');

-			//print geoip_database_info();

-		} else {

-			$this->gi = ''; // For avoid error

+				return 0;

+			}

+		}

+		elseif (function_exists('geoip_open'))

+		{

+			$this->gi = geoip_open($datfile, GEOIP_STANDARD);

+		}

+		else

+		{

+		    $this->gi = 'NOGI'; // We are using embedded php geoip functions

+		    //print 'function_exists(geoip_country_code_by_name))='.function_exists('geoip_country_code_by_name');

+		    //print geoip_database_info();

@@ -124,5 +119,4 @@
-		if (getDolGlobalString('GEOIP_VERSION')) {

-			$geoipversion = $conf->global->GEOIP_VERSION;

-		}

-

-		if (empty($this->gi)) {

+		if (!empty($conf->global->GEOIP_VERSION)) $geoipversion = $conf->global->GEOIP_VERSION;

+

+		if (empty($this->gi))

+		{

@@ -131,6 +125,11 @@
-		if ($this->gi == 'NOGI') {

-			// geoip_country_code_by_addr does not exists

-			return strtolower(geoip_country_code_by_name($ip));

-		} else {

-			if (preg_match('/^[0-9]+.[0-9]+\.[0-9]+\.[0-9]+/', $ip)) {

-				if ($geoipversion == '2') {

+		if ($this->gi == 'NOGI')

+		{

+		    // geoip_country_code_by_addr does not exists

+    		return strtolower(geoip_country_code_by_name($ip));

+		}

+		else

+		{

+			if (preg_match('/^[0-9]+.[0-9]+\.[0-9]+\.[0-9]+/', $ip))

+			{

+				if ($geoipversion == '2')

+				{

@@ -140 +139,2 @@
-					} catch (Exception $e) {

+					}

+					catch (Exception $e) {

@@ -144,8 +144,11 @@
-				} else {

-					if (!function_exists('geoip_country_code_by_addr')) {

-						return strtolower(geoip_country_code_by_name($ip));

-					}

-					return strtolower(geoip_country_code_by_addr($this->gi, $ip));

-				}

-			} else {

-				if ($geoipversion == '2') {

+				}

+				else

+				{

+			    	if (!function_exists('geoip_country_code_by_addr')) return strtolower(geoip_country_code_by_name($this->gi, $ip));

+			    	return strtolower(geoip_country_code_by_addr($this->gi, $ip));

+				}

+			}

+			else

+			{

+				if ($geoipversion == '2')

+				{

@@ -155 +158,2 @@
-					} catch (Exception $e) {

+					}

+					catch (Exception $e) {

@@ -159,7 +163,5 @@
-				} else {

-					if (function_exists('geoip_country_code_by_addr_v6')) {

-						return strtolower(geoip_country_code_by_addr_v6($this->gi, $ip));

-					} elseif (function_exists('geoip_country_code_by_name_v6')) {

-						return strtolower(geoip_country_code_by_name_v6($this->gi, $ip));

-					}

-					return '';

+				}

+				else

+				{

+					if (!function_exists('geoip_country_code_by_addr_v6')) return strtolower(geoip_country_code_by_name_v6($this->gi, $ip));

+					return strtolower(geoip_country_code_by_addr_v6($this->gi, $ip));

@@ -182,5 +184,4 @@
-		if (getDolGlobalString('GEOIP_VERSION')) {

-			$geoipversion = $conf->global->GEOIP_VERSION;

-		}

-

-		if (empty($this->gi)) {

+		if (!empty($conf->global->GEOIP_VERSION)) $geoipversion = $conf->global->GEOIP_VERSION;

+

+		if (empty($this->gi))

+		{

@@ -190 +191,2 @@
-		if ($geoipversion == '2') {

+		if ($geoipversion == '2')

+		{

@@ -194 +196,2 @@
-			} catch (Exception $e) {

+			}

+			catch (Exception $e) {

@@ -198,2 +201,4 @@
-		} else {

-			return strtolower(geoip_country_code_by_name($name));

+		}

+		else

+		{

+			return geoip_country_code_by_name($this->gi, $name);

@@ -203,37 +208,33 @@
-	/**

-	 * Return verion of data file

-	 *

-	 * @return  string      Version of datafile

-	 */

-	public function getVersion()

-	{

-		global $conf;

-

-		$geoipversion = '2'; // 'php', or '2'

-		if (getDolGlobalString('GEOIP_VERSION')) {

-			$geoipversion = $conf->global->GEOIP_VERSION;

-		}

-

-		if ($geoipversion == 'php') {

-			if ($this->gi == 'NOGI') {

-				return geoip_database_info();

-			} else {

-				return 'geoip_database_info() function not available';

-			}

-		}

-

-		return 'Not available (not using PHP internal geo functions - We are using embedded Geoip v'.$geoipversion.')';

-	}

-

-	/**

-	 * Close geoip object

-	 *

-	 * @return	void

-	 */

-	public function close()

-	{

-		if (function_exists('geoip_close')) {

-			// With some geoip with PEAR, geoip_close function may not exists

-			geoip_close($this->gi);

-		}

-	}

+    /**

+     * Return verion of data file

+     *

+     * @return  string      Version of datafile

+     */

+    public function getVersion()

+    {

+    	global $conf;

+

+    	$geoipversion = '2'; // 'php', or '2'

+    	if (!empty($conf->global->GEOIP_VERSION)) $geoipversion = $conf->global->GEOIP_VERSION;

+

+    	if ($geoipversion == 'php')

+    	{

+        	if ($this->gi == 'NOGI') return geoip_database_info();

+        	else return 'geoip_database_info() function not available';

+    	}

+

+    	return 'Not available (not using PHP internal geo functions - We are using embedded Geoip v'.$geoipversion.')';

+    }

+

+    /**

+     * Close geoip object

+     *

+     * @return	void

+     */

+    public function close()

+    {

+        if (function_exists('geoip_close')) {

+            // With some geoip with PEAR, geoip_close function may not exists

+            geoip_close($this->gi);

+        }

+    }

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_dolgraph.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_dolgraph.class.php
@@ -42 +42 @@
-	public $type = array(); // Array with type of each series. Example: array('bars', 'horizontalbars', 'lines', 'pies', 'piesemicircle', 'polar'...)

+	public $type = array(); // Array with type of each series. Example: array('bars', 'lines', ...)

@@ -44 +44 @@
-	private $_library; // Graphic library to use (jflot, chart, artichow)

+	private $_library = 'jflot'; // Graphic library to use (jflot, artichow)

@@ -67 +66,0 @@
-	public $YLabel;

@@ -70 +68,0 @@
-	public $hideXValues = false;

@@ -80,6 +77,0 @@
-	/**

-	 * @var boolean 					Mirrors graph values

-	 */

-	public $mirrorGraphValues = false;

-	public $tooltipsTitles = null;

-	public $tooltipsLabels = null;

@@ -96,2 +87,0 @@
-	public $borderwidth = 1;

-	public $borderskip = 'start';

@@ -112 +101,0 @@
-		// Some default values for the case it is not defined into the theme later.

@@ -117,18 +106,7 @@
-		// For small screen, we prefer a default with of 300

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

-			$this->width = 300;

-		}

-

-		// Load color of the theme

-		$color_file = DOL_DOCUMENT_ROOT . '/theme/' . $conf->theme . '/theme_vars.inc.php';

-		if (is_readable($color_file)) {

-			include $color_file;

-			if (isset($theme_bordercolor)) {

-				$this->bordercolor = $theme_bordercolor;

-			}

-			if (isset($theme_datacolor)) {

-				$this->datacolor   = $theme_datacolor;

-			}

-			if (isset($theme_bgcolor)) {

-				$this->bgcolor     = $theme_bgcolor;

-			}

+		$color_file = DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';

+		if (is_readable($color_file))

+		{

+			include_once $color_file;

+			if (isset($theme_bordercolor)) $this->bordercolor = $theme_bordercolor;

+			if (isset($theme_datacolor))   $this->datacolor   = $theme_datacolor;

+			if (isset($theme_bgcolor))     $this->bgcolor     = $theme_bgcolor;

@@ -140,6 +118,6 @@
-			$this->_library = (!getDolGlobalString('MAIN_JS_GRAPH') ? 'chart' : $conf->global->MAIN_JS_GRAPH);

-		}

-	}

-

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+			$this->_library = (empty($conf->global->MAIN_JS_GRAPH) ? 'jflot' : $conf->global->MAIN_JS_GRAPH);

+		}

+	}

+

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -154 +132 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -159 +137 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -168 +146 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -173 +151 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -182 +160 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -187 +165 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -196 +174 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -201,13 +179 @@
-	/**

-	 * Hide X Values

-	 *

-	 * @param	boolean		$bool	XValues or not

-	 * @return	boolean				true

-	 */

-	public function setHideXValues($bool)

-	{

-		$this->hideXValues = $bool;

-		return true;

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -222 +188 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -227 +193 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -231,2 +197,2 @@
-	 * @param 	string			$label		Y label

-	 * @return	void

+	 * @param 	string	$label		Y label

+	 * @return	boolean|null				True

@@ -236 +202 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -240 +206 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -245 +211 @@
-	 * @return	void

+	 * @return	boolean|null				True

@@ -249 +215 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -253 +219 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -262 +228 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -266 +232 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -276 +242 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -280,5 +246,5 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 * Set data color

-	 *

-	 * @param 	array	$datacolor		Data color array(array(R,G,B),array(R,G,B)...) or array('#......','#......'...)

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+	/**

+	 * Set data

+	 *

+	 * @param 	array	$datacolor		Data color array(array(R,G,B),array(R,G,B)...)

@@ -289 +255 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -293,57 +259 @@
-	/**

-	 * Set border color

-	 *

-	 * @param 	array	$bordercolor		Border Color array(array(R,G,B),array(R,G,B)...) or array('#FFFFFF','#......'...)

-	 * @return	void

-	 */

-	public function setBorderColor($bordercolor)

-	{

-		$this->bordercolor = $bordercolor;

-	}

-

-	/**

-	 * Set border width

-	 *

-	 * @param 	int     $borderwidth 	Border Width

-	 * @return	void

-	 */

-	public function setBorderWidth($borderwidth)

-	{

-		$this->borderwidth = $borderwidth;

-	}

-

-	/**

-	 * Set border skip

-	 *

-	 * @param 	int     $borderskip     Can be 'start' to skip start border, 'end' to skip end border, 'middle' to skip middle border,

-	 * 									'false' to not skip any border, 'true' to skip all border

-	 * @return	void

-	 */

-	public function setBorderSkip($borderskip)

-	{

-		$this->borderskip = $borderskip;

-	}

-

-	/**

-	 * Set tooltips labels of the graph

-	 *

-	 * @param 	array	$tooltipsLabels		Tooltips Labels array('...','...'...)

-	 * @return	void

-	 */

-	public function setTooltipsLabels($tooltipsLabels)

-	{

-		$this->tooltipsLabels = $tooltipsLabels;

-	}

-

-	/**

-	 * Set tooltips titles of the graph

-	 *

-	 * @param 	array	$tooltipsTitles		Tooltips Titles array('...','...'...)

-	 * @return	void

-	 */

-	public function setTooltipsTitles($tooltipsTitles)

-	{

-		$this->tooltipsTitles = $tooltipsTitles;

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -354 +264 @@
-	 * 								'pie', 'piesemicircle', 'polar', 'lines', 'linesnopoint', 'bars', 'horizontalbars'...

+	 * 								'pie', 'piesemicircle', 'polar', 'lines', 'linesnopoint', 'bars', ...

@@ -359 +269 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -363 +273 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -372 +282 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -376 +286 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -385 +295 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -389 +299 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -396,3 +306,3 @@
-	public function SetMaxValue($max)

-	{

-		// phpcs:enable

+    public function SetMaxValue($max)

+	{

+        // phpcs:enable

@@ -402 +312 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -408,3 +318,3 @@
-	public function GetMaxValue()

-	{

-		// phpcs:enable

+    public function GetMaxValue()

+	{

+        // phpcs:enable

@@ -414 +324 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -421,3 +331,3 @@
-	public function SetMinValue($min)

-	{

-		// phpcs:enable

+    public function SetMinValue($min)

+	{

+        // phpcs:enable

@@ -427 +337 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -433,3 +343,3 @@
-	public function GetMinValue()

-	{

-		// phpcs:enable

+    public function GetMinValue()

+	{

+        // phpcs:enable

@@ -439 +349 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -446,3 +356,3 @@
-	public function SetHeight($h)

-	{

-		// phpcs:enable

+    public function SetHeight($h)

+	{

+        // phpcs:enable

@@ -452 +362 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -459,3 +369,3 @@
-	public function SetShading($s)

-	{

-		// phpcs:enable

+    public function SetShading($s)

+	{

+        // phpcs:enable

@@ -465 +375 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -472,3 +382,3 @@
-	public function SetCssPrefix($s)

-	{

-		// phpcs:enable

+    public function SetCssPrefix($s)

+	{

+        // phpcs:enable

@@ -478 +388 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -484,3 +394,3 @@
-	public function ResetBgColor()

-	{

-		// phpcs:enable

+    public function ResetBgColor()

+	{

+        // phpcs:enable

@@ -490 +400 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -496,3 +406,3 @@
-	public function ResetBgColorGrid()

-	{

-		// phpcs:enable

+    public function ResetBgColorGrid()

+	{

+        // phpcs:enable

@@ -503,11 +412,0 @@
-	 * Mirror Values of the graph

-	 *

-	 * @param	boolean 	$mirrorGraphValues	Mirror Values if true and doesn't if false

-	 * @return	void

-	 */

-	public function setMirrorGraphValues($mirrorGraphValues)

-	{

-		$this->mirrorGraphValues = $mirrorGraphValues;

-	}

-

-	/**

@@ -518 +417 @@
-	public function isGraphKo()

+    public function isGraphKo()

@@ -529 +428 @@
-	public function setShowLegend($showlegend)

+    public function setShowLegend($showlegend)

@@ -537,4 +436,4 @@
-	 * @param	int		$showpointvalue		1=Show value for each point, as tooltip or inline (default), 0=Hide value, 2=Show values for each serie on same point

-	 * @return	void

-	 */

-	public function setShowPointValue($showpointvalue)

+	 * @param	int		$showpointvalue		1=Show value for each point, as tooltip or inline (default), 0=Hide value

+	 * @return	void

+	 */

+    public function setShowPointValue($showpointvalue)

@@ -551 +450 @@
-	public function setShowPercent($showpercent)

+    public function setShowPercent($showpercent)

@@ -558 +457 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -565,3 +464,3 @@
-	public function SetBgColor($bg_color = array(255, 255, 255))

-	{

-		// phpcs:enable

+    public function SetBgColor($bg_color = array(255, 255, 255))

+	{

+        // phpcs:enable

@@ -570,2 +469,4 @@
-		if (!is_array($bg_color)) {

-			if ($bg_color == 'onglet') {

+		if (!is_array($bg_color))

+		{

+			if ($bg_color == 'onglet')

+			{

@@ -574 +475,3 @@
-			} else {

+			}

+			else

+			{

@@ -577 +480,3 @@
-		} else {

+		}

+		else

+		{

@@ -582 +487 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -589,3 +494,3 @@
-	public function SetBgColorGrid($bg_colorgrid = array(255, 255, 255))

-	{

-		// phpcs:enable

+    public function SetBgColorGrid($bg_colorgrid = array(255, 255, 255))

+	{

+        // phpcs:enable

@@ -594,2 +499,4 @@
-		if (!is_array($bg_colorgrid)) {

-			if ($bg_colorgrid == 'onglet') {

+		if (!is_array($bg_colorgrid))

+		{

+			if ($bg_colorgrid == 'onglet')

+			{

@@ -598 +505,3 @@
-			} else {

+			}

+			else

+			{

@@ -601 +510,3 @@
-		} else {

+		}

+		else

+		{

@@ -606 +517 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -612,9 +523,9 @@
-	public function ResetDataColor()

-	{

-		// phpcs:enable

-		unset($this->datacolor);

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 * Get max value among all values of all series

+    public function ResetDataColor()

+    {

+        // phpcs:enable

+        unset($this->datacolor);

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+	 * Get max value

@@ -624,27 +535,26 @@
-	public function GetMaxValueInData()

-	{

-		// phpcs:enable

-		if (!is_array($this->data)) {

-			return 0;

-		}

-

-		$max = null;

-

-		$nbseries = (empty($this->data[0]) ? 0 : count($this->data[0]) - 1);

-

-		foreach ($this->data as $x) {	// Loop on each x

-			for ($i = 0; $i < $nbseries; $i++) {	// Loop on each serie

-				if (is_null($max)) {

-					$max = $x[$i + 1];		// $i+1 because the index 0 is the legend

-				} elseif ($max < $x[$i + 1]) {

-					$max = $x[$i + 1];

-				}

-			}

-		}

-

-		return $max;

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 * Return min value of all values of all series

+    public function GetMaxValueInData()

+	{

+        // phpcs:enable

+		if (!is_array($this->data)) return 0;

+

+		$k = 0;

+		$vals = array();

+

+		$nblines = count($this->data);

+		$nbvalues = count($this->data[0]) - 1;

+

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

+		{

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

+			{

+				$vals[$k] = $this->data[$j][$i + 1];

+				$k++;

+			}

+		}

+		rsort($vals);

+		return $vals[0];

+	}

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+	/**

+	 * Return min value of all data

@@ -654,25 +564,24 @@
-	public function GetMinValueInData()

-	{

-		// phpcs:enable

-		if (!is_array($this->data)) {

-			return 0;

-		}

-

-		$min = null;

-

-		$nbseries = (empty($this->data[0]) ? 0 : count($this->data[0]) - 1);

-

-		foreach ($this->data as $x) {	// Loop on each x

-			for ($i = 0; $i < $nbseries; $i++) {	// Loop on each serie

-				if (is_null($min)) {

-					$min = $x[$i + 1];		// $i+1 because the index 0 is the legend

-				} elseif ($min > $x[$i + 1]) {

-					$min = $x[$i + 1];

-				}

-			}

-		}

-

-		return $min;

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    public function GetMinValueInData()

+	{

+        // phpcs:enable

+		if (!is_array($this->data)) return 0;

+

+		$k = 0;

+		$vals = array();

+

+		$nblines = count($this->data);

+		$nbvalues = count($this->data[0]) - 1;

+

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

+		{

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

+			{

+				$vals[$k] = $this->data[$j][$i + 1];

+				$k++;

+			}

+		}

+		sort($vals);

+		return $vals[0];

+	}

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -684,3 +593,3 @@
-	public function GetCeilMaxValue()

-	{

-		// phpcs:enable

+    public function GetCeilMaxValue()

+	{

+        // phpcs:enable

@@ -688,3 +597 @@
-		if ($max != 0) {

-			$max++;

-		}

+		if ($max != 0) $max++;

@@ -693 +600,2 @@
-		for ($i = 0; $i < ($size - 1); $i++) {

+		for ($i = 0; $i < ($size - 1); $i++)

+		{

@@ -698,3 +606 @@
-		if (is_numeric($max)) {

-			$res = ceil($max / $factor) * $factor;

-		}

+		if (is_numeric($max)) $res = ceil($max / $factor) * $factor;

@@ -706 +612 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -712,3 +618,3 @@
-	public function GetFloorMinValue()

-	{

-		// phpcs:enable

+    public function GetFloorMinValue()

+	{

+        // phpcs:enable

@@ -716,6 +622,2 @@
-		if ($min == '') {

-			$min = 0;

-		}

-		if ($min != 0) {

-			$min--;

-		}

+		if ($min == '') $min = 0;

+		if ($min != 0) $min--;

@@ -724 +626,2 @@
-		for ($i = 0; $i < ($size - 1); $i++) {

+		for ($i = 0; $i < ($size - 1); $i++)

+		{

@@ -739,5 +642,6 @@
-	 * @return	mixed|boolean

-	 */

-	public function draw($file, $fileurl = '')

-	{

-		if (empty($file)) {

+	 * @return	integer|null

+	 */

+    public function draw($file, $fileurl = '')

+	{

+		if (empty($file))

+		{

@@ -745 +649 @@
-			dol_syslog(get_class($this) . "::draw " . $this->error, LOG_ERR);

+			dol_syslog(get_class($this)."::draw ".$this->error, LOG_ERR);

@@ -748 +652,2 @@
-		if (!is_array($this->data)) {

+		if (!is_array($this->data))

+		{

@@ -750 +655 @@
-			dol_syslog(get_class($this) . "::draw " . $this->error, LOG_ERR);

+			dol_syslog(get_class($this)."::draw ".$this->error, LOG_ERR);

@@ -753 +658,2 @@
-		if (count($this->data) < 1) {

+		if (count($this->data) < 1)

+		{

@@ -755,8 +661,7 @@
-			dol_syslog(get_class($this) . "::draw " . $this->error, LOG_WARNING);

-		}

-		$call = "draw_" . $this->_library;

-

-		return call_user_func_array(array($this, $call), array($file, $fileurl));

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+			dol_syslog(get_class($this)."::draw ".$this->error, LOG_WARNING);

+		}

+		$call = "draw_".$this->_library;

+		call_user_func_array(array($this, $call), array($file, $fileurl));

+	}

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -766 +671 @@
-	 *	$this->data  = array(array(0=>'labelxA',1=>yA1,...,n=>yAn), array('labelxB',yB1,...yBn));   // when there is n series to show for each x

+	 *	$this->data  = array(array(0=>'labelxA',1=>yA1,...,n=>yAn), array('labelxB',yB1,...yBn));   // or when there is n series to show for each x

@@ -781,6 +686,7 @@
-		// phpcs:enable

-		global $langs;

-

-		dol_syslog(get_class($this) . "::draw_jflot this->type=" . join(',', $this->type) . " this->MaxValue=" . $this->MaxValue);

-

-		if (empty($this->width) && empty($this->height)) {

+        // phpcs:enable

+		global $conf, $langs;

+

+		dol_syslog(get_class($this)."::draw_jflot this->type=".join(',', $this->type)." this->MaxValue=".$this->MaxValue);

+

+		if (empty($this->width) && empty($this->height))

+		{

@@ -796,3 +702 @@
-		if ($nblot < 0) {

-			dol_syslog('Bad value for property ->data. Must be set by mydolgraph->SetData before calling mydolgrapgh->draw', LOG_WARNING);

-		}

+		if ($nblot < 0) dol_syslog('Bad value for property ->data. Must be set by mydolgraph->SetData before calling mydolgrapgh->draw', LOG_WARNING);

@@ -805 +709,2 @@
-		while ($i < $nblot) {	// Loop on each serie

+		while ($i < $nblot)	// Loop on each serie

+		{

@@ -807 +712 @@
-			$serie[$i] = "var d" . $i . " = [];\n";

+			$serie[$i] = "var d".$i." = [];\n";

@@ -811 +716,2 @@
-			foreach ($this->data as $valarray) {	// Loop on each x

+			foreach ($this->data as $valarray)	// Loop on each x

+			{

@@ -817 +723,2 @@
-			if (isset($this->type[$firstlot]) && in_array($this->type[$firstlot], array('pie', 'piesemicircle', 'polar'))) {

+			if (isset($this->type[$firstlot]) && in_array($this->type[$firstlot], array('pie', 'piesemicircle', 'polar')))

+			{

@@ -819,3 +726 @@
-					if (isset($y)) {

-						$serie[$i] .= 'd' . $i . '.push({"label":"' . dol_escape_js($legends[$x]) . '", "data":' . $y . '});' . "\n";

-					}

+					if (isset($y)) $serie[$i] .= 'd'.$i.'.push({"label":"'.dol_escape_js($legends[$x]).'", "data":'.$y.'});'."\n";

@@ -823 +728,3 @@
-			} else {

+			}

+			else

+			{

@@ -825,3 +732 @@
-					if (isset($y)) {

-						$serie[$i] .= 'd' . $i . '.push([' . $x . ', ' . $y . ']);' . "\n";

-					}

+					if (isset($y)) $serie[$i] .= 'd'.$i.'.push(['.$x.', '.$y.']);'."\n";

@@ -836,8 +741,7 @@
-		$this->stringtoshow = '<!-- Build using jflot -->' . "\n";

-		if (!empty($this->title)) {

-			$this->stringtoshow .= '<div class="center dolgraphtitle' . (empty($this->cssprefix) ? '' : ' dolgraphtitle' . $this->cssprefix) . '">' . $this->title . '</div>';

-		}

-		if (!empty($this->shownographyet)) {

-			$this->stringtoshow .= '<div style="width:' . $this->width . 'px;height:' . $this->height . 'px;" class="nographyet"></div>';

-			$this->stringtoshow .= '<div class="nographyettext margintoponly">' . $langs->trans("NotEnoughDataYet") . '...</div>';

-			return;

+		$this->stringtoshow = '<!-- Build using jflot -->'."\n";

+		if (!empty($this->title)) $this->stringtoshow .= '<div class="center dolgraphtitle'.(empty($this->cssprefix) ? '' : ' dolgraphtitle'.$this->cssprefix).'">'.$this->title.'</div>';

+		if (!empty($this->shownographyet))

+		{

+		    $this->stringtoshow .= '<div style="width:'.$this->width.'px;height:'.$this->height.'px;" class="nographyet"></div>';

+		    $this->stringtoshow .= '<div class="nographyettext margintoponly">'.$langs->trans("NotEnoughDataYet").'...</div>';

+		    return;

@@ -848,7 +752,5 @@
-		if (count($this->data) > 20) {

-			$dolxaxisvertical = 'dol-xaxis-vertical';

-		}

-		$this->stringtoshow .= '<div id="placeholder_' . $tag . '" style="width:' . $this->width . 'px;height:' . $this->height . 'px;" class="dolgraph' . (empty($dolxaxisvertical) ? '' : ' ' . $dolxaxisvertical) . (empty($this->cssprefix) ? '' : ' dolgraph' . $this->cssprefix) . ' center"></div>' . "\n";

-

-		$this->stringtoshow .= '<script nonce="'.getNonce().'" id="' . $tag . '">' . "\n";

-		$this->stringtoshow .= '$(function () {' . "\n";

+		if (count($this->data) > 20) $dolxaxisvertical = 'dol-xaxis-vertical';

+		$this->stringtoshow .= '<div id="placeholder_'.$tag.'" style="width:'.$this->width.'px;height:'.$this->height.'px;" class="dolgraph'.(empty($dolxaxisvertical) ? '' : ' '.$dolxaxisvertical).(empty($this->cssprefix) ? '' : ' dolgraph'.$this->cssprefix).' center"></div>'."\n";

+

+		$this->stringtoshow .= '<script id="'.$tag.'">'."\n";

+		$this->stringtoshow .= '$(function () {'."\n";

@@ -856,6 +758,10 @@
-		if ($nblot < 0) {

-			$this->stringtoshow .= '<!-- No series of data -->' . "\n";

-		} else {

-			while ($i < $nblot) {

-				$this->stringtoshow .= '<!-- Serie ' . $i . ' -->' . "\n";

-				$this->stringtoshow .= $serie[$i] . "\n";

+		if ($nblot < 0)

+		{

+			$this->stringtoshow .= '<!-- No series of data -->'."\n";

+		}

+		else

+		{

+			while ($i < $nblot)

+			{

+				$this->stringtoshow .= '<!-- Serie '.$i.' -->'."\n";

+				$this->stringtoshow .= $serie[$i]."\n";

@@ -868 +774,2 @@
-		if (isset($this->type[$firstlot]) && in_array($this->type[$firstlot], array('pie', 'piesemicircle', 'polar'))) {

+		if (isset($this->type[$firstlot]) && in_array($this->type[$firstlot], array('pie', 'piesemicircle', 'polar')))

+		{

@@ -871,5 +778,2 @@
-				if (is_array($val)) {

-					$datacolor[] = "#" . sprintf("%02x%02x%02x", $val[0], $val[1], $val[2]); // If datacolor is array(R, G, B)

-				} else {

-					$datacolor[] = "#" . str_replace(array('#', '-'), '', $val); // If $val is '124' or '#124'

-				}

+				if (is_array($val)) $datacolor[] = "#".sprintf("%02x%02x%02x", $val[0], $val[1], $val[2]); // If datacolor is array(R, G, B)

+				else $datacolor[] = "#".str_replace(array('#', '-'), '', $val); // If $val is '124' or '#124'

@@ -884,2 +788,2 @@
-			function plotWithOptions_' . $tag . '() {

-			$.plot($("#placeholder_' . $tag . '"), d0,

+			function plotWithOptions_'.$tag.'() {

+			$.plot($("#placeholder_'.$tag.'"), d0,

@@ -891 +795 @@
-						' . ($this->combine ? '

+						'.($this->combine ? '

@@ -893,2 +797,2 @@
-						 	threshold: ' . $this->combine . '

-						},' : '') . '

+						 	threshold: '.$this->combine.'

+						},' : '').'

@@ -902,13 +806,9 @@
-			$this->stringtoshow .= '<span style="font-size:8pt;text-align:center;padding:2px;color:black;">';

-			if ($urltemp) {

-				$this->stringtoshow .= '<a style="color: #FFFFFF;" border="0" href="' . $urltemp . '">';

-			}

-			$this->stringtoshow .= '\'+';

-			$this->stringtoshow .= ($showlegend ? '' : 'label+\' \'+'); // Hide label if already shown in legend

-			$this->stringtoshow .= ($showpointvalue ? 'number+' : '');

-			$this->stringtoshow .= ($showpercent ? '\'<br>\'+percent+\'%\'+' : '');

-			$this->stringtoshow .= '\'';

-			if ($urltemp) {

-				$this->stringtoshow .= '</a>';

-			}

-			$this->stringtoshow .= '</span>\';

+								$this->stringtoshow .= '<span style="font-size:8pt;text-align:center;padding:2px;color:black;">';

+								if ($urltemp) $this->stringtoshow .= '<a style="color: #FFFFFF;" border="0" href="'.$urltemp.'">';

+								$this->stringtoshow .= '\'+';

+								$this->stringtoshow .= ($showlegend ? '' : 'label+\' \'+'); // Hide label if already shown in legend

+								$this->stringtoshow .= ($showpointvalue ? 'number+' : '');

+								$this->stringtoshow .= ($showpercent ? '\'<br/>\'+percent+\'%\'+' : '');

+								$this->stringtoshow .= '\'';

+								if ($urltemp) $this->stringtoshow .= '</a>';

+								$this->stringtoshow .= '</span>\';

@@ -929,4 +829,5 @@
-			if (count($datacolor)) {

-				$this->stringtoshow .= 'colors: ' . json_encode($datacolor) . ',';

-			}

-			$this->stringtoshow .= 'legend: {show: ' . ($showlegend ? 'true' : 'false') . ', position: \'ne\' }

+			if (count($datacolor))

+			{

+				$this->stringtoshow .= 'colors: '.(!empty($data['seriescolor']) ? json_encode($data['seriescolor']) : json_encode($datacolor)).',';

+			}

+			$this->stringtoshow .= 'legend: {show: '.($showlegend ? 'true' : 'false').', position: \'ne\' }

@@ -934,3 +835,5 @@
-		}' . "\n";

-		} else {

-			// Other cases, graph of type 'bars', 'lines'

+		}'."\n";

+		}

+		// Other cases, graph of type 'bars', 'lines'

+		else

+		{

@@ -938 +841 @@
-			// TODO: remove js css and use graph-tooltip-inner class instead by adding css in each themes

+		    // TODO: remove js css and use graph-tooltip-inner class instead by adding css in each themes

@@ -940,2 +843,2 @@
-			function showTooltip_' . $tag . '(x, y, contents) {

-				$(\'<div class="graph-tooltip-inner" id="tooltip_' . $tag . '">\' + contents + \'</div>\').css({

+			function showTooltip_'.$tag.'(x, y, contents) {

+				$(\'<div class="graph-tooltip-inner" id="tooltip_'.$tag.'">\' + contents + \'</div>\').css({

@@ -957 +860 @@
-			$("#placeholder_' . $tag . '").bind("plothover", function (event, pos, item) {

+			$("#placeholder_'.$tag.'").bind("plothover", function (event, pos, item) {

@@ -971,3 +874,2 @@
-			if ($this->showpointvalue > 0) {

-				$this->stringtoshow .= '

-							showTooltip_' . $tag . '(item.pageX, item.pageY, item.series.label + "<br>" + z + " => " + y);

+						if ($this->showpointvalue > 0) $this->stringtoshow .= '

+							showTooltip_'.$tag.'(item.pageX, item.pageY, item.series.label + "<br>" + z + " => " + y);

@@ -975,2 +877 @@
-			}

-			$this->stringtoshow .= '

+						$this->stringtoshow .= '

@@ -980 +881 @@
-					$("#tooltip_' . $tag . '").remove();

+					$("#tooltip_'.$tag.'").remove();

@@ -986,4 +887,4 @@
-			$this->stringtoshow .= 'var stack = null, steps = false;' . "\n";

-

-			$this->stringtoshow .= 'function plotWithOptions_' . $tag . '() {' . "\n";

-			$this->stringtoshow .= '$.plot($("#placeholder_' . $tag . '"), [ ' . "\n";

+			$this->stringtoshow .= 'var stack = null, steps = false;'."\n";

+

+			$this->stringtoshow .= 'function plotWithOptions_'.$tag.'() {'."\n";

+			$this->stringtoshow .= '$.plot($("#placeholder_'.$tag.'"), [ '."\n";

@@ -991,4 +892,3 @@
-			while ($i < $nblot) {

-				if ($i > $firstlot) {

-					$this->stringtoshow .= ', ' . "\n";

-				}

+			while ($i < $nblot)

+			{

+				if ($i > $firstlot) $this->stringtoshow .= ', '."\n";

@@ -997,18 +897,11 @@
-				if (!isset($this->type[$i]) || $this->type[$i] == 'bars') {

-					if ($nblot == 3) {

-						if ($i == $firstlot) {

-							$align = 'right';

-						} elseif ($i == $firstlot + 1) {

-							$align = 'center';

-						} else {

-							$align = 'left';

-						}

-						$this->stringtoshow .= 'bars: { lineWidth: 1, show: true, align: "' . $align . '", barWidth: 0.45 }, ';

-					} else {

-						$this->stringtoshow .= 'bars: { lineWidth: 1, show: true, align: "' . ($i == $firstlot ? 'center' : 'left') . '", barWidth: 0.5 }, ';

-					}

-				}

-				if (isset($this->type[$i]) && ($this->type[$i] == 'lines' || $this->type[$i] == 'linesnopoint')) {

-					$this->stringtoshow .= 'lines: { show: true, fill: false }, points: { show: ' . ($this->type[$i] == 'linesnopoint' ? 'false' : 'true') . ' }, ';

-				}

-				$this->stringtoshow .= 'color: "#' . $color . '", label: "' . (isset($this->Legend[$i]) ? dol_escape_js($this->Legend[$i]) : '') . '", data: d' . $i . ' }';

+				if (! isset($this->type[$i]) || $this->type[$i] == 'bars') {

+                    if($nblot == 3) {

+                        if($i == $firstlot) $align = 'right';

+                        elseif($i == $firstlot + 1) $align = 'center';

+                        else $align = 'left';

+                        $this->stringtoshow .= 'bars: { lineWidth: 1, show: true, align: "'.$align.'", barWidth: 0.45 }, ';

+                    }

+				    else $this->stringtoshow.='bars: { lineWidth: 1, show: true, align: "'.($i==$firstlot?'center':'left').'", barWidth: 0.5 }, ';

+                }

+				if (isset($this->type[$i]) && ($this->type[$i] == 'lines' || $this->type[$i] == 'linesnopoint')) $this->stringtoshow .= 'lines: { show: true, fill: false }, points: { show: '.($this->type[$i] == 'linesnopoint' ? 'false' : 'true').' }, ';

+				$this->stringtoshow .= 'color: "#'.$color.'", label: "'.(isset($this->Legend[$i]) ? dol_escape_js($this->Legend[$i]) : '').'", data: d'.$i.' }';

@@ -1018 +911 @@
-			$this->stringtoshow .= "\n" . ' ], { series: { shadowSize: 0, stack: stack, lines: { fill: false, steps: steps }, bars: { barWidth: 0.6,  fillColor: { colors: [{opacity: 0.9 }, {opacity: 0.85}] }} }' . "\n";

+			$this->stringtoshow .= "\n".' ], { series: { shadowSize: 0, stack: stack, lines: { fill: false, steps: steps }, bars: { barWidth: 0.6,  fillColor: { colors: [{opacity: 0.9 }, {opacity: 0.85}] }} }'."\n";

@@ -1021 +914 @@
-			$this->stringtoshow .= ', xaxis: { ticks: [' . "\n";

+			$this->stringtoshow .= ', xaxis: { ticks: ['."\n";

@@ -1023,5 +916,4 @@
-			foreach ($this->data as $key => $valarray) {

-				if ($x > 0) {

-					$this->stringtoshow .= ', ' . "\n";

-				}

-				$this->stringtoshow .= ' [' . $x . ', "' . $valarray[0] . '"]';

+			foreach ($this->data as $key => $valarray)

+			{

+				if ($x > 0) $this->stringtoshow .= ', '."\n";

+				$this->stringtoshow .= ' ['.$x.', "'.$valarray[0].'"]';

@@ -1030 +922 @@
-			$this->stringtoshow .= '] }' . "\n";

+			$this->stringtoshow .= '] }'."\n";

@@ -1033 +925 @@
-			$this->stringtoshow .= ', yaxis: { min: ' . $this->MinValue . ', max: ' . ($this->MaxValue) . ' }' . "\n";

+			$this->stringtoshow .= ', yaxis: { min: '.$this->MinValue.', max: '.($this->MaxValue).' }'."\n";

@@ -1038,8 +930,9 @@
-			$this->stringtoshow .= ', grid: { hoverable: true, backgroundColor: { colors: ["#' . $color1 . '", "#' . $color2 . '"] }, borderWidth: 1, borderColor: \'#e6e6e6\', tickColor  : \'#e6e6e6\' }' . "\n";

-			$this->stringtoshow .= '});' . "\n";

-			$this->stringtoshow .= '}' . "\n";

-		}

-

-		$this->stringtoshow .= 'plotWithOptions_' . $tag . '();' . "\n";

-		$this->stringtoshow .= '});' . "\n";

-		$this->stringtoshow .= '</script>' . "\n";

+			$this->stringtoshow .= ', grid: { hoverable: true, backgroundColor: { colors: ["#'.$color1.'", "#'.$color2.'"] }, borderWidth: 1, borderColor: \'#e6e6e6\', tickColor  : \'#e6e6e6\' }'."\n";

+			//$this->stringtoshow.=', shadowSize: 20'."\n";    TODO Uncommet this

+			$this->stringtoshow .= '});'."\n";

+			$this->stringtoshow .= '}'."\n";

+		}

+

+		$this->stringtoshow .= 'plotWithOptions_'.$tag.'();'."\n";

+		$this->stringtoshow .= '});'."\n";

+		$this->stringtoshow .= '</script>'."\n";

@@ -1053 +946 @@
-	 *	$this->data  = array(array(0=>'labelxA',1=>yA1,...,n=>yAn), array('labelxB',yB1,...yBn));   // when there is n series to show for each x

+	 *	$this->data  = array(array(0=>'labelxA',1=>yA1,...,n=>yAn), array('labelxB',yB1,...yBn));   // or when there is n series to show for each x

@@ -1069,5 +962,6 @@
-		global $langs;

-

-		dol_syslog(get_class($this) . "::draw_chart this->type=" . join(',', $this->type) . " this->MaxValue=" . $this->MaxValue);

-

-		if (empty($this->width) && empty($this->height)) {

+		global $conf, $langs;

+

+		dol_syslog(get_class($this)."::draw_chart this->type=".join(',', $this->type)." this->MaxValue=".$this->MaxValue);

+

+		if (empty($this->width) && empty($this->height))

+		{

@@ -1079 +972,0 @@
-		$bordercolor = "";

@@ -1084 +977,2 @@
-			foreach ($this->data as $valarray) {      // Loop on each x

+			foreach ($this->data as $valarray)      // Loop on each x

+			{

@@ -1089,3 +983 @@
-		if ($nblot < 0) {

-			dol_syslog('Bad value for property ->data. Must be set by mydolgraph->SetData before calling mydolgrapgh->draw', LOG_WARNING);

-		}

+		if ($nblot < 0) dol_syslog('Bad value for property ->data. Must be set by mydolgraph->SetData before calling mydolgrapgh->draw', LOG_WARNING);

@@ -1096,2 +988 @@
-		$serie = array();

-		$arrayofgroupslegend = array();

+		$serie = array(); $arrayofgroupslegend = array();

@@ -1101 +992,2 @@
-		while ($i < $nblot) {	// Loop on each serie

+		while ($i < $nblot)	// Loop on each serie

+		{

@@ -1107 +999,2 @@
-			foreach ($this->data as $valarray) {	// Loop on each x

+			foreach ($this->data as $valarray)	// Loop on each x

+			{

@@ -1112,2 +1005,2 @@
-				if (isset($tmpykey[2]) && (!empty($tmpykey[2]) || $tmpykey[2] == '0')) {		// This is a 'Group by' array

-					$tmpvalue = (array_key_exists('y_' . $tmpykey[1] . '_' . $tmpykey[2], $valarray) ? $valarray['y_' . $tmpykey[1] . '_' . $tmpykey[2]] : $valarray[$i + 1]);

+				if (!empty($tmpykey[2]) || $tmpykey[2] == '0') {		// This is a 'Group by' array

+					$tmpvalue = (array_key_exists('y_'.$tmpykey[1].'_'.$tmpykey[2], $valarray) ? $valarray['y_'.$tmpykey[1].'_'.$tmpykey[2]] : $valarray[$i + 1]);

@@ -1116 +1009 @@
-						'stacknum' => $tmpykey[1],

+						'stacknum'=> $tmpykey[1],

@@ -1118 +1011 @@
-						'legendwithgroup' => $this->Legend[$tmpykey[1]] . ' - ' . $tmpykey[2]

+						'legendwithgroup' => $this->Legend[$tmpykey[1]].' - '.$tmpykey[2]

@@ -1121 +1014 @@
-					$tmpvalue = (array_key_exists('y_' . $i, $valarray) ? $valarray['y_' . $i] : $valarray[$i + 1]);

+					$tmpvalue = (array_key_exists('y_'.$i, $valarray) ? $valarray['y_'.$i] : $valarray[$i + 1]);

@@ -1131 +1024 @@
-					$serie[$i] .= ($j > 0 ? ", " : "") . $y;

+					$serie[$i] .= ($j > 0 ? ", " : "").$y;

@@ -1133 +1026 @@
-					$serie[$i] .= ($j > 0 ? ", " : "") . 'null';

+					$serie[$i] .= ($j > 0 ? ", " : "").'null';

@@ -1146,7 +1039,6 @@
-		$this->stringtoshow = '<!-- Build using chart -->' . "\n";

-		if (!empty($this->title)) {

-			$this->stringtoshow .= '<div class="center dolgraphtitle' . (empty($this->cssprefix) ? '' : ' dolgraphtitle' . $this->cssprefix) . '">' . $this->title . '</div>';

-		}

-		if (!empty($this->shownographyet)) {

-			$this->stringtoshow .= '<div style="width:' . $this->width . (strpos($this->width, '%') > 0 ? '' : 'px') . '; height:' . $this->height . 'px;" class="nographyet"></div>';

-			$this->stringtoshow .= '<div class="nographyettext margintoponly">' . $langs->trans("NotEnoughDataYet") . '...</div>';

+		$this->stringtoshow = '<!-- Build using chart -->'."\n";

+		if (!empty($this->title)) $this->stringtoshow .= '<div class="center dolgraphtitle'.(empty($this->cssprefix) ? '' : ' dolgraphtitle'.$this->cssprefix).'">'.$this->title.'</div>';

+		if (!empty($this->shownographyet))

+		{

+			$this->stringtoshow .= '<div style="width:'.$this->width.(strpos($this->width, '%') > 0 ? '' : 'px').'; height:'.$this->height.'px;" class="nographyet"></div>';

+			$this->stringtoshow .= '<div class="nographyettext margintoponly">'.$langs->trans("NotEnoughDataYet").'...</div>';

@@ -1158,3 +1050 @@
-		if (count($this->data) > 20) {

-			$dolxaxisvertical = 'dol-xaxis-vertical';

-		}

+		if (count($this->data) > 20) $dolxaxisvertical = 'dol-xaxis-vertical';

@@ -1163,7 +1053,4 @@
-		if (isset($this->type[$firstlot])) {

-			$cssfordiv .= ' dolgraphchar' . $this->type[$firstlot];

-		}

-		$this->stringtoshow .= '<div id="placeholder_'.$tag.'" style="min-height: '.$this->height.(strpos($this->height, '%') > 0 ? '' : 'px').'; max-height: '.(strpos($this->height, '%') > 0 ? $this->height : ($this->height + 100) . 'px').'; width:'.$this->width.(strpos($this->width, '%') > 0 ? '' : 'px').';" class="'.$cssfordiv.' dolgraph'.(empty($dolxaxisvertical) ? '' : ' '.$dolxaxisvertical).(empty($this->cssprefix) ? '' : ' dolgraph'.$this->cssprefix).' center">'."\n";

-		$this->stringtoshow .= '<canvas id="canvas_'.$tag.'"></canvas></div>'."\n";

-

-		$this->stringtoshow .= '<script nonce="'.getNonce().'" id="' . $tag . '">' . "\n";

+		if (isset($this->type[$firstlot])) $cssfordiv .= ' dolgraphchar'.$this->type[$firstlot];

+		$this->stringtoshow .= '<div id="placeholder_'.$tag.'" style="min-height: '.$this->height.(strpos($this->height, '%') > 0 ? '' : 'px').'; width:'.$this->width.(strpos($this->width, '%') > 0 ? '' : 'px').';" class="'.$cssfordiv.' dolgraph'.(empty($dolxaxisvertical) ? '' : ' '.$dolxaxisvertical).(empty($this->cssprefix) ? '' : ' dolgraph'.$this->cssprefix).' center"><canvas id="canvas_'.$tag.'"></canvas></div>'."\n";

+

+		$this->stringtoshow .= '<script id="'.$tag.'">'."\n";

@@ -1171 +1058,2 @@
-		if ($nblot < 0) {

+		if ($nblot < 0)

+		{

@@ -1173,2 +1061,5 @@
-		} else {

-			while ($i < $nblot) {

+		}

+		else

+		{

+			while ($i < $nblot)

+			{

@@ -1183 +1074,2 @@
-		if (isset($this->type[$firstlot]) && (in_array($this->type[$firstlot], array('pie', 'polar', 'piesemicircle')))) {

+		if (isset($this->type[$firstlot]) && (in_array($this->type[$firstlot], array('pie', 'polar', 'piesemicircle'))))

+		{

@@ -1185,4 +1077 @@
-			//$this->stringtoshow .= 'var options = {' . "\n";

-			$this->stringtoshow .= 'var options = { maintainAspectRatio: false, aspectRatio: 2.5, ';

-

-

+			$this->stringtoshow .= 'var options = {'."\n";

@@ -1190,2 +1078,0 @@
-

-			/* For Chartjs v2.9 */

@@ -1195 +1082 @@
-				$this->stringtoshow .= 'legend: { labels: { boxWidth: 15 }, position: \'' . ($showlegend == 2 ? 'right' : 'top') . '\'';

+				$this->stringtoshow .= 'legend: { position: \''.($showlegend == 2 ? 'right' : 'top').'\'';

@@ -1197 +1084 @@
-					$this->stringtoshow .= ', maxLines: ' . $legendMaxLines;

+					$this->stringtoshow .= ', maxLines: '.$legendMaxLines.'';

@@ -1199,16 +1086,2 @@
-				$this->stringtoshow .= ' }, ' . "\n";

-			}

-

-			/* For Chartjs v3.5 */

-			$this->stringtoshow .= 'plugins: { ';

-			if (empty($showlegend)) {

-				$this->stringtoshow .= 'legend: { display: false }, ';

-			} else {

-				$this->stringtoshow .= 'legend: { labels: { boxWidth: 15 }, position: \'' . ($showlegend == 2 ? 'right' : 'top') . '\'';

-				if (!empty($legendMaxLines)) {

-					$this->stringtoshow .= ', maxLines: ' . $legendMaxLines;

-				}

-				$this->stringtoshow .= ' }, ' . "\n";

-			}

-			$this->stringtoshow .= ' }, ' . "\n";

-

+				$this->stringtoshow .= ' }, '."\n";

+			}

@@ -1217,4 +1090,4 @@
-				$this->stringtoshow .= 'circumference: Math.PI,' . "\n";

-				$this->stringtoshow .= 'rotation: -Math.PI,' . "\n";

-			}

-			$this->stringtoshow .= 'elements: { arc: {' . "\n";

+				$this->stringtoshow .= 'circumference: Math.PI,'."\n";

+				$this->stringtoshow .= 'rotation: -Math.PI,'."\n";

+			}

+			$this->stringtoshow .= 'elements: { arc: {'."\n";

@@ -1223,9 +1096,6 @@
-			$i = 0;

-			$foundnegativecolor = 0;

-			foreach ($legends as $val) {	// Loop on each serie

-				if ($i > 0) {

-					$this->stringtoshow .= ', ' . "\n";

-				}

-				if (is_array($this->datacolor[$i])) {

-					$color = 'rgb(' . $this->datacolor[$i][0] . ', ' . $this->datacolor[$i][1] . ', ' . $this->datacolor[$i][2] . ')'; // If datacolor is array(R, G, B)

-				} else {

+			$i = 0; $foundnegativecolor = 0;

+			foreach ($legends as $val)	// Loop on each serie

+			{

+				if ($i > 0) $this->stringtoshow .= ', '."\n";

+				if (is_array($this->datacolor[$i])) $color = 'rgb('.$this->datacolor[$i][0].', '.$this->datacolor[$i][1].', '.$this->datacolor[$i][2].')'; // If datacolor is array(R, G, B)

+				else {

@@ -1235,3 +1105 @@
-						$color = 'rgba(0,0,0,.0)'; // If $val is '-123'

-					} else {

-						$color = "#" . $tmp; // If $val is '123' or '#123'

+						$color = '#FFFFFF'; // If $val is '-123'

@@ -1238,0 +1107 @@
+					else $color = "#".$tmp; // If $val is '123' or '#123'

@@ -1240 +1109 @@
-				$this->stringtoshow .= "'" . $color . "'";

+				$this->stringtoshow .= "'".$color."'";

@@ -1243 +1112 @@
-			$this->stringtoshow .= '], ' . "\n";

+			$this->stringtoshow .= '], '."\n";

@@ -1248,3 +1117,8 @@
-				foreach ($legends as $val) {	// Loop on each serie

-					if ($i > 0) {

-						$this->stringtoshow .= ', ' . "\n";

+				foreach ($legends as $val)	// Loop on each serie

+				{

+					if ($i > 0) $this->stringtoshow .= ', '."\n";

+					if (is_array($this->datacolor[$i])) $color = 'null'; // If datacolor is array(R, G, B)

+					else {

+						$tmp = str_replace('#', '', $this->datacolor[$i]);

+						if (strpos($tmp, '-') !== false) $color = '#'.str_replace('-', '', $tmp); // If $val is '-123'

+						else $color = 'null'; // If $val is '123' or '#123'

@@ -1252,11 +1126 @@
-					if (is_array($this->datacolor[$i])) {

-						$color = 'null'; // If datacolor is array(R, G, B)

-					} else {

-						$tmp = str_replace('#', '', $this->datacolor[$i]);

-						if (strpos($tmp, '-') !== false) {

-							$color = '#' . str_replace('-', '', $tmp); // If $val is '-123'

-						} else {

-							$color = 'null'; // If $val is '123' or '#123'

-						}

-					}

-					$this->stringtoshow .= ($color == 'null' ? "'rgba(0,0,0,0.2)'" : "'" . $color . "'");

+					$this->stringtoshow .= ($color == 'null' ? "'rgba(0,0,0,0.2)'" : "'".$color."'");

@@ -1267 +1131 @@
-			$this->stringtoshow .= '} } };' . "\n";

+			$this->stringtoshow .= '} } };'."\n";

@@ -1270 +1134 @@
-				var ctx = document.getElementById("canvas_' . $tag . '").getContext("2d");

+				var ctx = document.getElementById("canvas_'.$tag.'").getContext("2d");

@@ -1273 +1137 @@
-    			type: \'' . (in_array($type, array('pie', 'piesemicircle')) ? 'doughnut' : 'polarArea') . '\',

+    			type: \''.(in_array($type, array('pie', 'piesemicircle')) ? 'doughnut' : 'polarArea').'\',

@@ -1280,5 +1144,4 @@
-			foreach ($legends as $val) {	// Loop on each serie

-				if ($i > 0) {

-					$this->stringtoshow .= ', ';

-				}

-				$this->stringtoshow .= "'" . dol_escape_js(dol_trunc($val, 25)) . "'";	// Lower than 25 make some important label (that we can't shorten) to be truncated

+			foreach ($legends as $val)	// Loop on each serie

+			{

+				if ($i > 0) $this->stringtoshow .= ', ';

+				$this->stringtoshow .= "'".dol_escape_js(dol_trunc($val, 32))."'";

@@ -1292,7 +1155,7 @@
-			while ($i < $nblot) {	// Loop on each serie

-				$color = 'rgb(' . $this->datacolor[$i][0] . ', ' . $this->datacolor[$i][1] . ', ' . $this->datacolor[$i][2] . ')';

-

-				if ($i > 0) {

-					$this->stringtoshow .= ', ' . "\n";

-				}

-				$this->stringtoshow .= '{' . "\n";

+			while ($i < $nblot)	// Loop on each serie

+			{

+				$color = 'rgb('.$this->datacolor[$i][0].', '.$this->datacolor[$i][1].', '.$this->datacolor[$i][2].')';

+				//$color = (!empty($data['seriescolor']) ? json_encode($data['seriescolor']) : json_encode($datacolor));

+

+				if ($i > 0) $this->stringtoshow .= ', '."\n";

+				$this->stringtoshow .= '{'."\n";

@@ -1301,2 +1164,2 @@
-				$this->stringtoshow .= '  data: [' . $serie[$i] . ']';

-				$this->stringtoshow .= '}' . "\n";

+				$this->stringtoshow .= '  data: ['.$serie[$i].']';

+				$this->stringtoshow .= '}'."\n";

@@ -1305,5 +1168,7 @@
-			$this->stringtoshow .= ']' . "\n";

-			$this->stringtoshow .= '}' . "\n";

-			$this->stringtoshow .= '});' . "\n";

-		} else {

-			// Other cases, graph of type 'bars', 'lines', 'linesnopoint'

+			$this->stringtoshow .= ']'."\n";

+			$this->stringtoshow .= '}'."\n";

+			$this->stringtoshow .= '});'."\n";

+		}

+		// Other cases, graph of type 'bars', 'lines', 'linesnopoint'

+		else

+		{

@@ -1311,14 +1176,3 @@
-			$xaxis = '';

-

-			if (!isset($this->type[$firstlot]) || $this->type[$firstlot] == 'bars') {

-				$type = 'bar';

-			}

-			if (isset($this->type[$firstlot]) && $this->type[$firstlot] == 'horizontalbars') {

-				$type = 'bar';

-				$xaxis = "indexAxis: 'y', ";

-			}

-			if (isset($this->type[$firstlot]) && ($this->type[$firstlot] == 'lines' || $this->type[$firstlot] == 'linesnopoint')) {

-				$type = 'line';

-			}

-

-			// Set options

+			if (!isset($this->type[$firstlot]) || $this->type[$firstlot] == 'bars') $type = 'bar';

+			if (isset($this->type[$firstlot]) && ($this->type[$firstlot] == 'lines' || $this->type[$firstlot] == 'linesnopoint')) $type = 'line';

+

@@ -1326,7 +1179,0 @@
-			$this->stringtoshow .= $xaxis;

-			if ($this->showpointvalue == 2) {

-				$this->stringtoshow .= 'interaction: { intersect: true, mode: \'index\'}, ';

-			}

-

-			/* For Chartjs v2.9 */

-			/*

@@ -1334,21 +1181,3 @@
-				$this->stringtoshow .= 'legend: { display: false }, '."\n";

-			} else {

-				$this->stringtoshow .= 'legend: { maxWidth: '.round($this->width / 2).', labels: { boxWidth: 15 }, position: \'' . ($showlegend == 2 ? 'right' : 'top') . '\' }, '."\n";

-			}

-			*/

-

-			/* For Chartjs v3.5 */

-			$this->stringtoshow .= 'plugins: { '."\n";

-			if (empty($showlegend)) {

-				$this->stringtoshow .= 'legend: { display: false }, '."\n";

-			} else {

-				$this->stringtoshow .= 'legend: { maxWidth: '.round(intVal($this->width) / 2).', labels: { boxWidth: 15 }, position: \'' . (($showlegend && $showlegend == 2) ? 'right' : 'top') . '\' },'."\n";

-			}

-			$this->stringtoshow .= "}, \n";

-

-			/* For Chartjs v2.9 */

-			/*

-			 $this->stringtoshow .= 'scales: { xAxis: [{ ';

-			if ($this->hideXValues) {

-				$this->stringtoshow .= ' ticks: { display: false }, display: true,';

-			}

+				$this->stringtoshow .= 'legend: { display: false }, ';

+			}

+			$this->stringtoshow .= 'scales: { xAxes: [{ ';

@@ -1361 +1189,0 @@
-			$this->stringtoshow .= ', yAxis: [{ ticks: { beginAtZero: true }';

@@ -1363,24 +1191,3 @@
-				$this->stringtoshow .= ', stacked: true';

-			}

-			$this->stringtoshow .= ' }] }';

-			*/

-

-			// Add a callback to change label to show only positive value

-			if (is_array($this->tooltipsLabels) || is_array($this->tooltipsTitles)) {

-				$this->stringtoshow .= 'tooltips: { mode: \'nearest\',

-					callbacks: {';

-				if (is_array($this->tooltipsTitles)) {

-					$this->stringtoshow .='

-							title: function(tooltipItem, data) {

-								var tooltipsTitle ='.json_encode($this->tooltipsTitles).'

-								return tooltipsTitle[tooltipItem[0].datasetIndex];

-							},';

-				}

-				if (is_array($this->tooltipsLabels)) {

-					$this->stringtoshow .= 'label: function(tooltipItem, data) {

-								var tooltipslabels ='.json_encode($this->tooltipsLabels).'

-								return tooltipslabels[tooltipItem.datasetIndex]

-							}';

-				}

-				$this->stringtoshow .='}},';

-			}

+				$this->stringtoshow .= ', yAxes: [{ stacked: true }]';

+			}

+			$this->stringtoshow .= ' }';

@@ -1387,0 +1195 @@
+

@@ -1389 +1197 @@
-				var ctx = document.getElementById("canvas_' . $tag . '").getContext("2d");

+				var ctx = document.getElementById("canvas_'.$tag.'").getContext("2d");

@@ -1392 +1200 @@
-    			type: \'' . $type . '\',

+    			type: \''.$type.'\',

@@ -1399,5 +1207,4 @@
-			foreach ($legends as $val) {	// Loop on each serie

-				if ($i > 0) {

-					$this->stringtoshow .= ', ';

-				}

-				$this->stringtoshow .= "'" . dol_escape_js(dol_trunc($val, 32)) . "'";

+			foreach ($legends as $val)	// Loop on each serie

+			{

+				if ($i > 0) $this->stringtoshow .= ', ';

+				$this->stringtoshow .= "'".dol_escape_js(dol_trunc($val, 32))."'";

@@ -1414,2 +1221 @@
-			$i = 0;

-			$iinstack = 0;

+			$i = 0; $iinstack = 0;

@@ -1417,2 +1223,2 @@
-			while ($i < $nblot) {	// Loop on each serie

-				$foundnegativecolor = 0;

+			while ($i < $nblot)	// Loop on each serie

+			{

@@ -1421 +1227 @@
-				if (!empty($arrayofgroupslegend) && is_array($arrayofgroupslegend[$i]) && count($arrayofgroupslegend[$i]) > 0) {	// If we used a group by.

+				if (is_array($arrayofgroupslegend[$i]) && count($arrayofgroupslegend[$i]) > 0) {	// If we used a group by.

@@ -1430 +1236 @@
-					$textoflegend = !empty($this->Legend[$i]) ? $this->Legend[$i] : '';

+					$textoflegend = $this->Legend[$i];

@@ -1432 +1237,0 @@
-

@@ -1442 +1247 @@
-						// Change color with offset of $iinstack

+						// Change color with offset of $$iinstack

@@ -1448 +1253 @@
-							$ratio = max(-100, -15 * $iinstack + 10); // step of -20

+							$ratio = max(-100, - 15 * $iinstack + 10); // step of -20

@@ -1457,28 +1262,6 @@
-					$color = 'rgb(' . $newcolor[0] . ', ' . $newcolor[1] . ', ' . $newcolor[2] . ', 0.9)';

-					$bordercolor = 'rgb(' . $newcolor[0] . ', ' . $newcolor[1] . ', ' . $newcolor[2] . ')';

-				} else { // We do not use a 'group by'

-					if (!empty($this->datacolor[$i])) {

-						if (is_array($this->datacolor[$i])) {

-							$color = 'rgb(' . $this->datacolor[$i][0] . ', ' . $this->datacolor[$i][1] . ', ' . $this->datacolor[$i][2] . ', 0.9)';

-						} else {

-							$color = $this->datacolor[$i];

-						}

-					}

-					// else: $color will be undefined

-					if (!empty($this->bordercolor[$i]) && is_array($this->bordercolor[$i])) {

-						$bordercolor = 'rgb(' . $this->bordercolor[$i][0] . ', ' . $this->bordercolor[$i][1] . ', ' . $this->bordercolor[$i][2] . ', 0.9)';

-					} else {

-						if ($type != 'horizontalBar') {

-							$bordercolor = $color;

-						} else {

-							$bordercolor = $this->bordercolor[$i];

-						}

-					}

-

-					// For negative colors, we invert border and background

-					$tmp = str_replace('#', '', $color);

-					if (strpos($tmp, '-') !== false) {

-						$foundnegativecolor++;

-						$bordercolor = str_replace('-', '', $color);

-						$color = '#FFFFFF'; // If $val is '-123'

-					}

+					$color = 'rgb('.$newcolor[0].', '.$newcolor[1].', '.$newcolor[2].', 0.9)';

+					$bordercolor = 'rgb('.$newcolor[0].', '.$newcolor[1].', '.$newcolor[2].')';

+				} else {																			// We do not use a 'group by'

+					$color = 'rgb('.$this->datacolor[$i][0].', '.$this->datacolor[$i][1].', '.$this->datacolor[$i][2].', 0.9)';

+					$bordercolor = $color;

+					//$color = (!empty($data['seriescolor']) ? json_encode($data['seriescolor']) : json_encode($datacolor));

@@ -1486,3 +1269,2 @@
-				if ($i > 0) {

-					$this->stringtoshow .= ', ';

-				}

+

+				if ($i > 0) $this->stringtoshow .= ', ';

@@ -1491,18 +1273,10 @@
-				$this->stringtoshow .= 'dolibarrinfo: \'y_' . $i . '\', ';

-				$this->stringtoshow .= 'label: \'' . dol_escape_js(dol_string_nohtmltag($textoflegend)) . '\', ';

-				$this->stringtoshow .= 'pointStyle: \'' . ((!empty($this->type[$i]) && $this->type[$i] == 'linesnopoint') ? 'line' : 'circle') . '\', ';

-				$this->stringtoshow .= 'fill: ' . ($type == 'bar' ? 'true' : 'false') . ', ';

-				if ($type == 'bar' || $type == 'horizontalBar') {

-					$this->stringtoshow .= 'borderWidth: \''.$this->borderwidth.'\', ';

-				}

-				$this->stringtoshow .= 'borderColor: \'' . $bordercolor . '\', ';

-				$this->stringtoshow .= 'borderSkipped: \'' . $this->borderskip . '\', ';

-				$this->stringtoshow .= 'backgroundColor: \'' . $color . '\', ';

-				if (!empty($arrayofgroupslegend) && !empty($arrayofgroupslegend[$i])) {

-					$this->stringtoshow .= 'stack: \'' . $arrayofgroupslegend[$i]['stacknum'] . '\', ';

-				}

-				$this->stringtoshow .= 'data: [';

-

-				$this->stringtoshow .= $this->mirrorGraphValues ? '[-' . $serie[$i] . ',' . $serie[$i] . ']' : $serie[$i];

-				$this->stringtoshow .= ']';

-				$this->stringtoshow .= '}' . "\n";

+				$this->stringtoshow .= 'dolibarrinfo: \'y_'.$i.'\', ';

+				$this->stringtoshow .= 'label: \''.dol_escape_js(dol_string_nohtmltag($textoflegend)).'\', ';

+				$this->stringtoshow .= 'pointStyle: \''.($this->type[$i] == 'linesnopoint' ? 'line' : 'circle').'\', ';

+				$this->stringtoshow .= 'fill: '.($type == 'bar' ? 'true' : 'false').', ';

+				if ($type == 'bar') { $this->stringtoshow .= 'borderWidth: \'1\', '; }

+				$this->stringtoshow .= 'borderColor: \''.$bordercolor.'\', ';

+				$this->stringtoshow .= 'backgroundColor: \''.$color.'\', ';

+				if ($arrayofgroupslegend[$i]) $this->stringtoshow .= 'stack: \''.$arrayofgroupslegend[$i]['stacknum'].'\', ';

+				$this->stringtoshow .= 'data: ['.$serie[$i].']';

+				$this->stringtoshow .= '}'."\n";

@@ -1513,6 +1287,6 @@
-			$this->stringtoshow .= ']' . "\n";

-			$this->stringtoshow .= '}' . "\n";

-			$this->stringtoshow .= '});' . "\n";

-		}

-

-		$this->stringtoshow .= '</script>' . "\n";

+			$this->stringtoshow .= ']'."\n";

+			$this->stringtoshow .= '}'."\n";

+			$this->stringtoshow .= '});'."\n";

+		}

+

+		$this->stringtoshow .= '</script>'."\n";

@@ -1527 +1301 @@
-	public function total()

+    public function total()

@@ -1530 +1304,2 @@
-		foreach ($this->data as $valarray) {	// Loop on each x

+		foreach ($this->data as $valarray)	// Loop on each x

+			{

@@ -1542 +1317 @@
-	public function show($shownographyet = 0)

+    public function show($shownographyet = 0)

@@ -1546,2 +1321,3 @@
-		if ($shownographyet) {

-			$s = '<div class="nographyet" style="width:' . (preg_match('/%/', $this->width) ? $this->width : $this->width . 'px') . '; height:' . (preg_match('/%/', $this->height) ? $this->height : $this->height . 'px') . ';"></div>';

+		if ($shownographyet)

+		{

+			$s = '<div class="nographyet" style="width:'.(preg_match('/%/', $this->width) ? $this->width : $this->width.'px').'; height:'.(preg_match('/%/', $this->height) ? $this->height : $this->height.'px').';"></div>';

@@ -1550 +1326 @@
-				$s .= $langs->trans("NotEnoughDataYet") . '...';

+                $s .= $langs->trans("NotEnoughDataYet").'...';

@@ -1552 +1328 @@
-				$s .= $shownographyet . '...';

+			    $s .= $shownographyet.'...';

@@ -1573,9 +1349,8 @@
-		if ($direction == 'width') {

-			if (empty($conf->dol_optimize_smallscreen)) {

-				return ($defaultsize ? $defaultsize : '500');

-			} else {

-				return (empty($_SESSION['dol_screenwidth']) ? '280' : ($_SESSION['dol_screenwidth'] - 40));

-			}

-		}

-		if ($direction == 'height') {

-			return (empty($conf->dol_optimize_smallscreen) ? ($defaultsize ? $defaultsize : '220') : '200');

+		if ($direction == 'width')

+		{

+			if (empty($conf->dol_optimize_smallscreen)) return ($defaultsize ? $defaultsize : '500');

+			else return (empty($_SESSION['dol_screen_width']) ? '280' : ($_SESSION['dol_screen_width'] - 40));

+		}

+		if ($direction == 'height')

+		{

+			return (empty($conf->dol_optimize_smallscreen) ? ($defaultsize ? $defaultsize : '200') : '160');

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_dolreceiptprinter.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_dolreceiptprinter.class.php
@@ -2 +2 @@
-/* Copyright (C) 2015-2021  Frédéric France     <frederic.france@netlogic.fr>

+/* Copyright (C) 2015-2019  Frédéric France     <frederic.france@netlogic.fr>

@@ -28,30 +28,26 @@
- * {dol_align_left}                                 Left align text

- * {dol_align_center}                               Center text

- * {dol_align_right}                                Right align text

- * {dol_use_font_a}                                 Use font A of printer

- * {dol_use_font_b}                                 Use font B of printer

- * {dol_use_font_c}                                 Use font C of printer

- * {dol_bold}                                       Text Bold

- * {dol_bold_disabled}                              Disable Text Bold

- * {dol_double_height}                              Text double height

- * {dol_double_width}                               Text double width

- * {dol_default_height_width}                       Text default height and width

- * {dol_underline}                                  Underline text

- * {dol_underline_disabled}                         Disable underline text

- * {dol_cut_paper_full}                             Cut ticket completely

- * {dol_cut_paper_partial}                          Cut ticket partially

- * {dol_open_drawer}                                Open cash drawer

- * {dol_beep}                                       Activate buzzer

- * {dol_beep_alternative}							Activate buzzer (alternative mode)

- * {dol_print_barcode}                              Print barcode

- * {dol_print_logo}                                 Print logo stored on printer. Example : <print_logo>32|32

- * {dol_print_logo_old}                             Print logo stored on printer. Must be followed by logo code. For old printers.

- * {dol_print_logo_old_cf}                          Print logo stored on printer. Must be followed by logo code. For old printers. May help for centering image.

- * {dol_print_object_lines}                         Print object lines

- * {dol_print_object_tax}                           Print object total tax

- * {dol_print_object_local_tax}                     Print object local tax

- * {dol_print_object_total}                         Print object total

- * {dol_print_order_lines}                          Print order lines for Printer

- * {dol_print_object_lines_with_notes}              Print object lines with notes

- * {dol_print_payment}                              Print payment method

- * {dol_print_curr_date}							Print the current date/time. Must be followed by format string.

+ * <dol_align_left>                                 Left align text

+ * <dol_align_center>                               Center text

+ * <dol_align_right>                                Right align text

+ * <dol_use_font_a>                                 Use font A of printer

+ * <dol_use_font_b>                                 Use font B of printer

+ * <dol_use_font_c>                                 Use font C of printer

+ * <dol_bold>                                       Text Bold

+ * <dol_bold_disabled>                              Disable Text Bold

+ * <dol_double_height>                              Text double height

+ * <dol_double_width>                               Text double width

+ * <dol_default_height_width>                       Text default height and width

+ * <dol_underline>                                  Underline text

+ * <dol_underline_disabled>                         Disable underline text

+ * <dol_cut_paper_full>                             Cut ticket completely

+ * <dol_cut_paper_partial>                          Cut ticket partially

+ * <dol_open_drawer>                                Open cash drawer

+ * <dol_beep>                                       Activate buzzer

+ * <dol_print_barcode>                              Print barcode

+ * <dol_print_logo>                                 Print logo stored on printer. Example : <print_logo>32|32

+ * <dol_print_logo_old>                             Print logo stored on printer. Must be followed by logo code. For old printers.

+ * <dol_print_object_lines>                         Print object lines

+ * <dol_print_object_tax>                           Print object total tax

+ * <dol_print_object_local_tax>                     Print object local tax

+ * <dol_print_object_total>                         Print object total

+ * <dol_print_order_lines>                          Print order lines for Printer

+ * <dol_print_payment>                              Print payment method

@@ -67,2 +62,0 @@
- * <dol_value_currentdate>                          Replaced by current date and time

- * <dol_value_currentdate_notime>                   Replaced by current date without time

@@ -75,0 +70 @@
+ * <dol_value_customer_skype>                       Replaced by customer skype

@@ -116,0 +112 @@
+

@@ -122,272 +118,226 @@
-	const CONNECTOR_DUMMY = 1;

-	const CONNECTOR_FILE_PRINT = 2;

-	const CONNECTOR_NETWORK_PRINT = 3;

-	const CONNECTOR_WINDOWS_PRINT = 4;

-	const CONNECTOR_CUPS_PRINT = 5;

-

-	/**

-	 * @var DoliDB Database handler.

-	 */

-	public $db;

-

-	/*

-	 * @var string[] array of tags

-	 */

-	public $tags;

-	public $printer;

-	public $template;

-

-	/**

-	 * Number of order printer

-	 * @var int

-	 */

-	public $orderprinter;

-

-	/**

-	 * Array with list of printers

-	 * @var array	List of printers

-	 */

-	public $listprinters;

-

-	/**

-	 * Array with list of printer templates

-	 * @var array	List of printer templates

-	 */

-	public $listprinterstemplates;

-

-	/**

-	 * @var string

-	 */

-	public $profileresprint;

-

-	/**

-	 * @var string

-	 */

-	public $resprint;

-

-	/**

-	 * @var string Error code (or message)

-	 */

-	public $error = '';

-

-	/**

-	 * @var string[] Error codes (or messages)

-	 */

-	public $errors = array();

-

-	/**

-	 * Constructor

-	 *

-	 * @param   DoliDB      $db         database

-	 */

-	public function __construct($db)

-	{

-		$this->db = $db;

-		$this->tags = array(

-			'dol_line_feed' => 'DOL_LINE_FEED',

-			'dol_line_feed_reverse' => 'DOL_LINE_FEED_REVERSE',

-			'dol_align_left' => 'DOL_ALIGN_LEFT',

-			'dol_align_center' => 'DOL_ALIGN_CENTER',

-			'dol_align_right' => 'DOL_ALIGN_RIGHT',

-			'dol_use_font_a' => 'DOL_USE_FONT_A',

-			'dol_use_font_b' => 'DOL_USE_FONT_B',

-			'dol_use_font_c' => 'DOL_USE_FONT_C',

-			'dol_bold' => 'DOL_BOLD',

-			'dol_bold_disabled' => 'DOL_BOLD_DISABLED',

-			'dol_double_height' => 'DOL_DOUBLE_HEIGHT',

-			'dol_double_width' => 'DOL_DOUBLE_WIDTH',

-			'dol_default_height_width' => 'DOL_DEFAULT_HEIGHT_WIDTH',

-			'dol_underline' => 'DOL_UNDERLINE',

-			'dol_underline_disabled' => 'DOL_UNDERLINE_DISABLED',

-			'dol_cut_paper_full' => 'DOL_CUT_PAPER_FULL',

-			'dol_cut_paper_partial' => 'DOL_CUT_PAPER_PARTIAL',

-			'dol_open_drawer' => 'DOL_OPEN_DRAWER',

-			'dol_beep' => 'DOL_BEEP',

-			'dol_beep_alternative' => 'DOL_BEEP_ALTERNATIVE',

-			'dol_print_text' => 'DOL_PRINT_TEXT',

-			'dol_print_barcode' => 'DOL_PRINT_BARCODE',

-			'dol_value_date' => 'DateInvoice',

-			'dol_value_date_time' => 'DateInvoiceWithTime',

-			'dol_value_year' => 'YearInvoice',

-			'dol_value_month_letters' => 'DOL_VALUE_MONTH_LETTERS',

-			'dol_value_month' => 'DOL_VALUE_MONTH',

-			'dol_value_day' => 'DOL_VALUE_DAY',

-			'dol_value_day_letters' => 'DOL_VALUE_DAY',

-			'dol_value_currentdate' => 'DOL_VALUE_CURRENTDATE',

-			'dol_value_currentdate_notime' => 'CurrentDateWithTime',

-			'dol_value_currentdate_letters' => 'DOL_VALUE_CURRENTDATE_LETTERS',

-			'dol_value_currentyear' => 'CurrentYear',

-			'dol_value_currentmonth_letters' => 'DOL_VALUE_CURRENT_MONTH_LETTERS',

-			'dol_value_currentmonth' => 'DOL_VALUE_CURRENT_MONTH',

-			'dol_value_currentday' => 'DOL_VALUE_CURRENT_DAY',

-			'dol_value_currentday_letters' => 'DOL_VALUE_CURRENT_DAY',

-			'dol_print_payment' => 'DOL_PRINT_PAYMENT',

-			'dol_print_curr_date' => 'DOL_PRINT_CURR_DATE',

-			'dol_print_logo' => 'DOL_PRINT_LOGO',

-			'dol_print_logo_old' => 'DOL_PRINT_LOGO_OLD',

-			'dol_print_logo_old_cf' => 'DOL_PRINT_LOGO_OLD_CF',

-			'dol_value_object_id' => 'InvoiceID',

-			'dol_value_object_ref' => 'InvoiceRef',

-			'dol_print_object_lines' => 'DOL_PRINT_OBJECT_LINES',

-			'dol_print_object_lines_with_notes' => 'DOL_PRINT_OBJECT_LINES_WITH_NOTES',

-			'dol_print_object_tax' => 'TotalVAT',

-			'dol_print_object_local_tax1' => 'TotalLT1',

-			'dol_print_object_local_tax2' => 'TotalLT2',

-			'dol_print_object_total' => 'Total',

-			'dol_print_object_number' => 'DOL_PRINT_OBJECT_NUMBER',

-			//'dol_value_object_points' => 'DOL_VALUE_OBJECT_POINTS',

-			'dol_print_order_lines' => 'DOL_PRINT_ORDER_LINES',

-			'dol_value_customer_firstname' => 'DOL_VALUE_CUSTOMER_FIRSTNAME',

-			'dol_value_customer_lastname' => 'DOL_VALUE_CUSTOMER_LASTNAME',

-			'dol_value_customer_mail' => 'DOL_VALUE_CUSTOMER_MAIL',

-			'dol_value_customer_phone' => 'DOL_VALUE_CUSTOMER_PHONE',

-			'dol_value_customer_tax_number' => 'DOL_VALUE_CUSTOMER_TAX_NUMBER',

-			//'dol_value_customer_account_balance' => 'DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE',

-			//'dol_value_customer_points' => 'DOL_VALUE_CUSTOMER_POINTS',

-			'dol_value_mysoc_name' => 'DOL_VALUE_MYSOC_NAME',

-			'dol_value_mysoc_address' => 'Address',

-			'dol_value_mysoc_zip' => 'Zip',

-			'dol_value_mysoc_town' => 'Town',

-			'dol_value_mysoc_country' => 'Country',

-			'dol_value_mysoc_idprof1' => 'ProfId1',

-			'dol_value_mysoc_idprof2' => 'ProfId2',

-			'dol_value_mysoc_idprof3' => 'ProfId3',

-			'dol_value_mysoc_idprof4' => 'ProfId4',

-			'dol_value_mysoc_idprof5' => 'ProfId5',

-			'dol_value_mysoc_idprof6' => 'ProfId6',

-			'dol_value_mysoc_tva_intra' => 'VATIntra',

-			'dol_value_mysoc_capital' => 'Capital',

-			'dol_value_mysoc_url' => 'Web',

-			'dol_value_vendor_lastname' => 'VendorLastname',

-			'dol_value_vendor_firstname' => 'VendorFirstname',

-			'dol_value_vendor_mail' => 'VendorEmail',

-			'dol_value_place' => 'DOL_VALUE_PLACE',

-		);

-	}

-

-	/**

-	 * List printers into the array ->listprinters

-	 *

-	 * @return  int                     0 if OK; >0 if KO

-	 */

-	public function listPrinters()

-	{

-		global $conf;

-

-		$error = 0;

-		$line = 0;

-		$obj = array();

-

-		$sql = "SELECT rowid, name, fk_type, fk_profile, parameter";

-		$sql .= " FROM ".$this->db->prefix()."printer_receipt";

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

-

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

-

-		if ($resql) {

-			$num = $this->db->num_rows($resql);

-			while ($line < $num) {

-				$row = $this->db->fetch_array($resql);

-				switch ($row['fk_type']) {

-					case 1:

-						$row['fk_type_name'] = 'CONNECTOR_DUMMY';

-						break;

-					case 2:

-						$row['fk_type_name'] = 'CONNECTOR_FILE_PRINT';

-						break;

-					case 3:

-						$row['fk_type_name'] = 'CONNECTOR_NETWORK_PRINT';

-						break;

-					case 4:

-						$row['fk_type_name'] = 'CONNECTOR_WINDOWS_PRINT';

-						break;

-					case 5:

-						$row['fk_type_name'] = 'CONNECTOR_CUPS_PRINT';

-						break;

-					default:

-						$row['fk_type_name'] = 'CONNECTOR_UNKNOWN';

-						break;

-				}

-				switch ($row['fk_profile']) {

-					case 0:

-						$row['fk_profile_name'] = 'PROFILE_DEFAULT';

-						break;

-					case 1:

-						$row['fk_profile_name'] = 'PROFILE_SIMPLE';

-						break;

-					case 2:

-						$row['fk_profile_name'] = 'PROFILE_EPOSTEP';

-						break;

-					case 3:

-						$row['fk_profile_name'] = 'PROFILE_P822D';

-						break;

-					default:

-						$row['fk_profile_name'] = 'PROFILE_STAR';

-						break;

-				}

-				$obj[] = $row;

-				$line++;

-			}

-		} else {

-			$error++;

-			$this->errors[] = $this->db->lasterror;

-		}

-

-		$this->listprinters = $obj;

-

-		return $error;

-	}

-

-

-	/**

-	 * List printers templates

-	 *

-	 * @return  int                     0 if OK; >0 if KO

-	 */

-	public function listPrintersTemplates()

-	{

-		global $conf;

-

-		$error = 0;

-		$line = 0;

-		$obj = array();

-

-		$sql = "SELECT rowid, name, template";

-		$sql .= " FROM ".$this->db->prefix()."printer_receipt_template";

-		$sql .= " WHERE entity = ".$conf->entity;

-

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

-

-		if ($resql) {

-			$num = $this->db->num_rows($resql);

-			while ($line < $num) {

-				$obj[] = $this->db->fetch_array($resql);

-				$line++;

-			}

-		} else {

-			$error++;

-			$this->errors[] = $this->db->lasterror;

-		}

-

-		$this->listprinterstemplates = $obj;

-

-		return $error;

-	}

-

-

-	/**

-	 *  Form to Select type printer

-	 *

-	 *  @param    string    $selected       Id printer type pre-selected

-	 *  @param    string    $htmlname       select html name

-	 *  @return  int                        0 if OK; >0 if KO

-	 */

-	public function selectTypePrinter($selected = '', $htmlname = 'printertypeid')

-	{

-		global $langs;

-

-		$options = array(

-			1 => $langs->trans('CONNECTOR_DUMMY'),

-			2 => $langs->trans('CONNECTOR_FILE_PRINT'),

-			3 => $langs->trans('CONNECTOR_NETWORK_PRINT'),

-			4 => $langs->trans('CONNECTOR_WINDOWS_PRINT'),

+    const CONNECTOR_DUMMY = 1;

+    const CONNECTOR_FILE_PRINT = 2;

+    const CONNECTOR_NETWORK_PRINT = 3;

+    const CONNECTOR_WINDOWS_PRINT = 4;

+    const CONNECTOR_CUPS_PRINT = 5;

+

+    /**

+     * @var DoliDB Database handler.

+     */

+    public $db;

+

+    /*

+     * @var string[] array of tags

+     */

+    public $tags;

+    public $printer;

+    public $template;

+

+    /**

+     * Number of order printer

+     * @var int

+     */

+    public $orderprinter;

+

+    /**

+     * @var string Error code (or message)

+     */

+    public $error = '';

+

+    /**

+     * @var string[] Error codes (or messages)

+     */

+    public $errors = array();

+

+    /**

+     * Constructor

+     *

+     * @param   DoliDB      $db         database

+     */

+    public function __construct($db)

+    {

+        $this->db = $db;

+        $this->tags = array(

+            'dol_line_feed' => 'DOL_LINE_FEED',

+        	'dol_line_feed_reverse' => 'DOL_LINE_FEED_REVERSE',

+            'dol_align_left' => 'DOL_ALIGN_LEFT',

+            'dol_align_center' => 'DOL_ALIGN_CENTER',

+            'dol_align_right' => 'DOL_ALIGN_RIGHT',

+            'dol_use_font_a' => 'DOL_USE_FONT_A',

+            'dol_use_font_b' => 'DOL_USE_FONT_B',

+        	'dol_use_font_c' => 'DOL_USE_FONT_C',

+        	'dol_bold' => 'DOL_BOLD',

+        	'dol_bold_disabled' => 'DOL_BOLD_DISABLED',

+        	'dol_double_height' => 'DOL_DOUBLE_HEIGHT',

+        	'dol_double_width' => 'DOL_DOUBLE_WIDTH',

+        	'dol_default_height_width' => 'DOL_DEFAULT_HEIGHT_WIDTH',

+        	'dol_underline' => 'DOL_UNDERLINE',

+        	'dol_underline_disabled' => 'DOL_UNDERLINE_DISABLED',

+        	'dol_cut_paper_full' => 'DOL_CUT_PAPER_FULL',

+        	'dol_cut_paper_partial' => 'DOL_CUT_PAPER_PARTIAL',

+        	'dol_open_drawer' => 'DOL_OPEN_DRAWER',

+        	'dol_beep' => 'DOL_BEEP',

+        	'dol_print_text' => 'DOL_PRINT_TEXT',

+        	'dol_print_barcode' => 'DOL_PRINT_BARCODE',

+        	'dol_value_date' => 'DateInvoice',

+        	'dol_value_date_time' => 'DateInvoiceWithTime',

+        	'dol_value_year' => 'YearInvoice',

+        	'dol_value_month_letters' => 'DOL_VALUE_MONTH_LETTERS',

+        	'dol_value_month' => 'DOL_VALUE_MONTH',

+        	'dol_value_day' => 'DOL_VALUE_DAY',

+        	'dol_value_day_letters' => 'DOL_VALUE_DAY',

+            //'dol_print_payment',

+        	'dol_print_logo' => 'DOL_PRINT_LOGO',

+        	'dol_print_logo_old' => 'DOL_PRINT_LOGO_OLD',

+        	'dol_value_object_id' => 'InvoiceID',

+        	'dol_value_object_ref' => 'InvoiceRef',

+        	'dol_print_object_lines' => 'DOL_PRINT_OBJECT_LINES',

+        	'dol_print_object_tax' => 'TotalVAT',

+        	'dol_print_object_local_tax1' => 'TotalLT1',

+        	'dol_print_object_local_tax2' => 'TotalLT2',

+        	'dol_print_object_total' => 'Total',

+        	'dol_print_object_number' => 'DOL_PRINT_OBJECT_NUMBER',

+        	'dol_value_object_points' => 'DOL_VALUE_OBJECT_POINTS',

+        	'dol_print_order_lines' => 'DOL_PRINT_ORDER_LINES',

+        	'dol_value_customer_firstname' => 'DOL_VALUE_CUSTOMER_FIRSTNAME',

+        	'dol_value_customer_lastname' => 'DOL_VALUE_CUSTOMER_LASTNAME',

+        	'dol_value_customer_mail' => 'DOL_VALUE_CUSTOMER_MAIL',

+        	'dol_value_customer_phone' => 'DOL_VALUE_CUSTOMER_PHONE',

+        	'dol_value_customer_mobile' => 'DOL_VALUE_CUSTOMER_MOBILE',

+        	'dol_value_customer_skype' => 'DOL_VALUE_CUSTOMER_SKYPE',

+        	'dol_value_customer_tax_number' => 'DOL_VALUE_CUSTOMER_TAX_NUMBER',

+        	'dol_value_customer_account_balance' => 'DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE',

+        	'dol_value_customer_points' => 'DOL_VALUE_CUSTOMER_POINTS',

+        	'dol_value_mysoc_name' => 'DOL_VALUE_MYSOC_NAME',

+        	'dol_value_mysoc_address' => 'Address',

+        	'dol_value_mysoc_zip' => 'Zip',

+        	'dol_value_mysoc_town' => 'Town',

+        	'dol_value_mysoc_country' => 'Country',

+        	'dol_value_mysoc_idprof1' => 'ProfId1',

+        	'dol_value_mysoc_idprof2' => 'ProfId2',

+        	'dol_value_mysoc_idprof3' => 'ProfId3',

+        	'dol_value_mysoc_idprof4' => 'ProfId4',

+        	'dol_value_mysoc_idprof5' => 'ProfId5',

+        	'dol_value_mysoc_idprof6' => 'ProfId6',

+        	'dol_value_mysoc_tva_intra' => 'VATIntra',

+        	'dol_value_mysoc_capital' => 'Capital',

+        	'dol_value_vendor_lastname' => 'VendorLastname',

+        	'dol_value_vendor_firstname' => 'VendorFirstname',

+        	'dol_value_vendor_mail' => 'VendorEmail',

+        );

+    }

+

+    /**

+     * list printers

+     *

+     * @return  int                     0 if OK; >0 if KO

+     */

+    public function listPrinters()

+    {

+        global $conf;

+        $error = 0;

+        $line = 0;

+        $obj = array();

+        $sql = 'SELECT rowid, name, fk_type, fk_profile, parameter';

+        $sql .= ' FROM '.MAIN_DB_PREFIX.'printer_receipt';

+        $sql .= ' WHERE entity = '.$conf->entity;

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

+        if ($resql) {

+            $num = $this->db->num_rows($resql);

+            while ($line < $num) {

+                $row = $this->db->fetch_array($resql);

+                switch ($row['fk_type']) {

+                    case 1:

+                        $row['fk_type_name'] = 'CONNECTOR_DUMMY';

+                        break;

+                    case 2:

+                        $row['fk_type_name'] = 'CONNECTOR_FILE_PRINT';

+                        break;

+                    case 3:

+                        $row['fk_type_name'] = 'CONNECTOR_NETWORK_PRINT';

+                        break;

+                    case 4:

+                        $row['fk_type_name'] = 'CONNECTOR_WINDOWS_PRINT';

+                        break;

+                    case 5:

+                        $row['fk_type_name'] = 'CONNECTOR_CUPS_PRINT';

+                        break;

+                    default:

+                        $row['fk_type_name'] = 'CONNECTOR_UNKNOWN';

+                        break;

+                }

+                switch ($row['fk_profile']) {

+                    case 0:

+                        $row['fk_profile_name'] = 'PROFILE_DEFAULT';

+                        break;

+                    case 1:

+                        $row['fk_profile_name'] = 'PROFILE_SIMPLE';

+                        break;

+                    case 2:

+                        $row['fk_profile_name'] = 'PROFILE_EPOSTEP';

+                        break;

+                    case 3:

+                        $row['fk_profile_name'] = 'PROFILE_P822D';

+                        break;

+                    default:

+                        $row['fk_profile_name'] = 'PROFILE_STAR';

+                        break;

+                }

+                $obj[] = $row;

+                $line++;

+            }

+        } else {

+            $error++;

+            $this->errors[] = $this->db->lasterror;

+        }

+        $this->listprinters = $obj;

+        return $error;

+    }

+

+

+    /**

+     * List printers templates

+     *

+     * @return  int                     0 if OK; >0 if KO

+     */

+    public function listPrintersTemplates()

+    {

+        global $conf;

+        $error = 0;

+        $line = 0;

+        $obj = array();

+        $sql = 'SELECT rowid, name, template';

+        $sql .= ' FROM '.MAIN_DB_PREFIX.'printer_receipt_template';

+        $sql .= ' WHERE entity = '.$conf->entity;

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

+        if ($resql) {

+            $num = $this->db->num_rows($resql);

+            while ($line < $num) {

+                $obj[] = $this->db->fetch_array($resql);

+                $line++;

+            }

+        } else {

+            $error++;

+            $this->errors[] = $this->db->lasterror;

+        }

+        $this->listprinterstemplates = $obj;

+        return $error;

+    }

+

+

+    /**

+     *  Form to Select type printer

+     *

+     *  @param    string    $selected       Id printer type pre-selected

+     *  @param    string    $htmlname       select html name

+     *  @return  int                        0 if OK; >0 if KO

+     */

+    public function selectTypePrinter($selected = '', $htmlname = 'printertypeid')

+    {

+        global $langs;

+

+        $options = array(

+            1 => $langs->trans('CONNECTOR_DUMMY'),

+            2 => $langs->trans('CONNECTOR_FILE_PRINT'),

+            3 => $langs->trans('CONNECTOR_NETWORK_PRINT'),

+            4 => $langs->trans('CONNECTOR_WINDOWS_PRINT'),

@@ -395,204 +345,177 @@
-		);

-

-		$this->resprint = Form::selectarray($htmlname, $options, $selected);

-

-		return 0;

-	}

-

-

-	/**

-	 *  Form to Select Profile printer

-	 *

-	 *  @param    string    $selected       Id printer profile pre-selected

-	 *  @param    string    $htmlname       select html name

-	 *  @return  int                        0 if OK; >0 if KO

-	 */

-	public function selectProfilePrinter($selected = '', $htmlname = 'printerprofileid')

-	{

-		global $langs;

-

-		$options = array(

-			0 => $langs->trans('PROFILE_DEFAULT'),

-			1 => $langs->trans('PROFILE_SIMPLE'),

-			2 => $langs->trans('PROFILE_EPOSTEP'),

-			3 => $langs->trans('PROFILE_P822D'),

-			4 => $langs->trans('PROFILE_STAR'),

-		);

-

-		$this->profileresprint = Form::selectarray($htmlname, $options, $selected);

-		return 0;

-	}

-

-

-	/**

-	 *  Function to Add a printer in db

-	 *

-	 *  @param    string    $name           Printer name

-	 *  @param    int       $type           Printer type

-	 *  @param    int       $profile        Printer profile

-	 *  @param    string    $parameter      Printer parameter

-	 *  @return  int                        0 if OK; >0 if KO

-	 */

-	public function addPrinter($name, $type, $profile, $parameter)

-	{

-		global $conf;

-		$error = 0;

-		$sql = "INSERT INTO ".$this->db->prefix()."printer_receipt";

-		$sql .= " (name, fk_type, fk_profile, parameter, entity)";

-		$sql .= " VALUES ('".$this->db->escape($name)."', ".((int) $type).", ".((int) $profile).", '".$this->db->escape($parameter)."', ".((int) $conf->entity).")";

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

-		if (!$resql) {

-			$error++;

-			$this->errors[] = $this->db->lasterror;

-		}

-		return $error;

-	}

-

-	/**

-	 *  Function to Update a printer in db

-	 *

-	 *  @param    string    $name           Printer name

-	 *  @param    int       $type           Printer type

-	 *  @param    int       $profile        Printer profile

-	 *  @param    string    $parameter      Printer parameter

-	 *  @param    int       $printerid      Printer id

-	 *  @return  int                        0 if OK; >0 if KO

-	 */

-	public function updatePrinter($name, $type, $profile, $parameter, $printerid)

-	{

-		$error = 0;

-

-		$sql = "UPDATE ".$this->db->prefix()."printer_receipt";

-		$sql .= " SET name='".$this->db->escape($name)."'";

-		$sql .= ", fk_type=".((int) $type);

-		$sql .= ", fk_profile=".((int) $profile);

-		$sql .= ", parameter='".$this->db->escape($parameter)."'";

-		$sql .= " WHERE rowid=".((int) $printerid);

-

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

-		if (!$resql) {

-			$error++;

-			$this->errors[] = $this->db->lasterror;

-		}

-		return $error;

-	}

-

-	/**

-	 *  Function to Delete a printer from db

-	 *

-	 *  @param    int       $printerid      Printer id

-	 *  @return  int                        0 if OK; >0 if KO

-	 */

-	public function deletePrinter($printerid)

-	{

-		global $conf;

-		$error = 0;

-		$sql = 'DELETE FROM '.$this->db->prefix().'printer_receipt';

-		$sql .= ' WHERE rowid='.((int) $printerid);

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

-		if (!$resql) {

-			$error++;

-			$this->errors[] = $this->db->lasterror;

-		}

-		return $error;

-	}

-

-	/**

-	 *  Function to add a printer template in db

-	 *

-	 *  @param    string    $name           Template name

-	 *  @param    int       $template       Template

-	 *  @return   int                       0 if OK; >0 if KO

-	 */

-	public function addTemplate($name, $template)

-	{

-		global $conf;

-		$error = 0;

-		$sql = "INSERT INTO ".$this->db->prefix()."printer_receipt_template";

-		$sql .= " (name, template, entity) VALUES ('".$this->db->escape($name)."'";

-		$sql .= ", '".$this->db->escape($template)."', ".$conf->entity.")";

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

-		if (!$resql) {

-			$error++;

-			$this->errors[] = $this->db->lasterror;

-		}

-		return $error;

-	}

-

-	/**

-	 *  Function to delete a printer template in db

-	 *

-	 *  @param    int       $templateid     Template ID

-	 *  @return   int                       0 if OK; >0 if KO

-	 */

-	public function deleteTemplate($templateid)

-	{

-		global $conf;

-		$error = 0;

-		$sql = 'DELETE FROM '.$this->db->prefix().'printer_receipt_template';

-		$sql .= " WHERE rowid = ".((int) $templateid);

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

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

-		if (!$resql) {

-			$error++;

-			$this->errors[] = $this->db->lasterror;

-		}

-		return $error;

-	}

-

-	/**

-	 *  Function to Update a printer template in db

-	 *

-	 *  @param    string    $name           Template name

-	 *  @param    int       $template       Template

-	 *  @param    int       $templateid     Template id

-	 *  @return   int                       0 if OK; >0 if KO

-	 */

-	public function updateTemplate($name, $template, $templateid)

-	{

-		global $conf;

-		$error = 0;

-

-		$sql = "UPDATE ".$this->db->prefix()."printer_receipt_template";

-		$sql .= " SET name='".$this->db->escape($name)."'";

-		$sql .= ", template='".$this->db->escape($template)."'";

-		$sql .= " WHERE rowid=".((int) $templateid);

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

-		if (!$resql) {

-			$error++;

-			$this->errors[] = $this->db->lasterror;

-		}

-		return $error;

-	}

-

-

-	/**

-	 *  Function to Send Test page to Printer

-	 *

-	 *  @param  int     $printerid      	Printer id

-	 *  @param	int		$addimgandbarcode	Add image and barcode into the test

-	 *  @return int                        	0 if OK; >0 if KO

-	 */

-	public function sendTestToPrinter($printerid, $addimgandbarcode = 0)

-	{

-		$error = 0;

-		$img = EscposImage::load(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo_bw.png');

-		//$this->profile = CapabilityProfile::load("TM-T88IV");

-		$ret = $this->initPrinter($printerid);

-		if ($ret > 0) {

-			setEventMessages($this->error, $this->errors, 'errors');

-		} else {

-			try {

-				if ($addimgandbarcode) {

-					$this->printer->bitImage($img);

-				}

-				$this->printer->text("Hello World!\n");

-				if ($addimgandbarcode) {

-					$testStr = "1234567890";

-					$this->printer->barcode($testStr);

-					//$this->printer->qrcode($testStr, Printer::QR_ECLEVEL_M, 5, Printer::QR_MODEL_1);

-				}

-				$this->printer->text("\n");

-				$this->printer->text("Most simple example\n");

-				$this->printer->feed();

-				$this->printer->cut();

+        );

+

+        $this->resprint = Form::selectarray($htmlname, $options, $selected);

+

+        return 0;

+    }

+

+

+    /**

+     *  Form to Select Profile printer

+     *

+     *  @param    string    $selected       Id printer profile pre-selected

+     *  @param    string    $htmlname       select html name

+     *  @return  int                        0 if OK; >0 if KO

+     */

+    public function selectProfilePrinter($selected = '', $htmlname = 'printerprofileid')

+    {

+        global $langs;

+

+        $options = array(

+            0 => $langs->trans('PROFILE_DEFAULT'),

+            1 => $langs->trans('PROFILE_SIMPLE'),

+            2 => $langs->trans('PROFILE_EPOSTEP'),

+            3 => $langs->trans('PROFILE_P822D'),

+            4 => $langs->trans('PROFILE_STAR'),

+        );

+

+        $this->profileresprint = Form::selectarray($htmlname, $options, $selected);

+        return 0;

+    }

+

+

+    /**

+     *  Function to Add a printer in db

+     *

+     *  @param    string    $name           Printer name

+     *  @param    int       $type           Printer type

+     *  @param    int       $profile        Printer profile

+     *  @param    string    $parameter      Printer parameter

+     *  @return  int                        0 if OK; >0 if KO

+     */

+    public function addPrinter($name, $type, $profile, $parameter)

+    {

+        global $conf;

+        $error = 0;

+        $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'printer_receipt';

+        $sql .= ' (name, fk_type, fk_profile, parameter, entity)';

+        $sql .= ' VALUES ("'.$this->db->escape($name).'", '.$type.', '.$profile.', "'.$this->db->escape($parameter).'", '.$conf->entity.')';

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

+        if (!$resql) {

+            $error++;

+            $this->errors[] = $this->db->lasterror;

+        }

+        return $error;

+    }

+

+    /**

+     *  Function to Update a printer in db

+     *

+     *  @param    string    $name           Printer name

+     *  @param    int       $type           Printer type

+     *  @param    int       $profile        Printer profile

+     *  @param    string    $parameter      Printer parameter

+     *  @param    int       $printerid      Printer id

+     *  @return  int                        0 if OK; >0 if KO

+     */

+    public function updatePrinter($name, $type, $profile, $parameter, $printerid)

+    {

+        global $conf;

+        $error = 0;

+        $sql = 'UPDATE '.MAIN_DB_PREFIX.'printer_receipt';

+        $sql .= ' SET name="'.$this->db->escape($name).'"';

+        $sql .= ', fk_type='.$type;

+        $sql .= ', fk_profile='.$profile;

+        $sql .= ', parameter="'.$this->db->escape($parameter).'"';

+        $sql .= ' WHERE rowid='.$printerid;

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

+        if (!$resql) {

+            $error++;

+            $this->errors[] = $this->db->lasterror;

+        }

+        return $error;

+    }

+

+    /**

+     *  Function to Delete a printer from db

+     *

+     *  @param    int       $printerid      Printer id

+     *  @return  int                        0 if OK; >0 if KO

+     */

+    public function deletePrinter($printerid)

+    {

+        global $conf;

+        $error = 0;

+        $sql = 'DELETE FROM '.MAIN_DB_PREFIX.'printer_receipt';

+        $sql .= ' WHERE rowid='.$printerid;

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

+        if (!$resql) {

+            $error++;

+            $this->errors[] = $this->db->lasterror;

+        }

+        return $error;

+    }

+

+    /**

+     *  Function to add a printer template in db

+     *

+     *  @param    string    $name           Template name

+     *  @param    int       $template       Template

+     *  @return   int                       0 if OK; >0 if KO

+     */

+    public function addTemplate($name, $template)

+    {

+        global $conf;

+        $error = 0;

+        $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'printer_receipt_template';

+        $sql .= ' (name, template, entity) VALUES ("'.$this->db->escape($name).'"';

+        $sql .= ', "'.$this->db->escape($template).'", '.$conf->entity.')';

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

+        if (!$resql) {

+            $error++;

+            $this->errors[] = $this->db->lasterror;

+        }

+        return $error;

+    }

+

+

+    /**

+     *  Function to Update a printer template in db

+     *

+     *  @param    string    $name           Template name

+     *  @param    int       $template       Template

+     *  @param    int       $templateid     Template id

+     *  @return   int                       0 if OK; >0 if KO

+     */

+    public function updateTemplate($name, $template, $templateid)

+    {

+        global $conf;

+        $error = 0;

+        $sql = 'UPDATE '.MAIN_DB_PREFIX.'printer_receipt_template';

+        $sql .= ' SET name="'.$this->db->escape($name).'"';

+        $sql .= ', template="'.$this->db->escape($template).'"';

+        $sql .= ' WHERE rowid='.$templateid;

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

+        if (!$resql) {

+            $error++;

+            $this->errors[] = $this->db->lasterror;

+        }

+        return $error;

+    }

+

+

+    /**

+     *  Function to Send Test page to Printer

+     *

+     *  @param    int       $printerid      Printer id

+     *  @return  int                        0 if OK; >0 if KO

+     */

+    public function sendTestToPrinter($printerid)

+    {

+        global $conf;

+        $error = 0;

+        $img = EscposImage::load(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo_bw.png');

+        //$this->profile = CapabilityProfile::load("TM-T88IV");

+        $ret = $this->initPrinter($printerid);

+        if ($ret > 0) {

+            setEventMessages($this->error, $this->errors, 'errors');

+        } else {

+            try {

+                $this->printer->bitImage($img);

+                $this->printer->text("Hello World!\n");

+                $testStr = "1234567890";

+                $this->printer->barcode($testStr);

+                //$this->printer->qrcode($testStr, Printer::QR_ECLEVEL_M, 5, Printer::QR_MODEL_1);

+                $this->printer->text("Most simple example\n");

+                $this->printer->feed();

+                $this->printer->cut();

@@ -601,2 +524,3 @@
-				if ($this->printer->connector instanceof DummyPrintConnector) {

-					$data = $this->printer->connector->getData();

+				if ($this->printer->connector instanceof DummyPrintConnector)

+				{

+					$data = $this->printer->connector-> getData();

@@ -605,262 +529,195 @@
-				// Close and print

-				$this->printer->close();

-			} catch (Exception $e) {

-				$this->errors[] = $e->getMessage();

-				$error++;

-			}

-		}

-		return $error;

-	}

-

-	/**

-	 *  Function to Print Receipt Ticket

-	 *

-	 *  @param   Facture|Commande   $object         Order or invoice object

-	 *  @param   int       			$templateid     Template id

-	 *  @param   int       			$printerid      Printer id

-	 *  @return  int                				0 if OK; >0 if KO

-	 */

-	public function sendToPrinter($object, $templateid, $printerid)

-	{

-		global $mysoc, $langs, $user;

-		global $hookmanager;

-

-		$langs->load('bills');

-

-		$error = 0;

-		$ret = $this->loadTemplate($templateid);

-

-		$now = dol_now('tzuser');

-		// tags a remplacer par leur valeur avant de parser (dol_value_xxx)

-		$this->template = str_replace('{dol_value_object_id}', $object->id, $this->template);

-		$this->template = str_replace('{dol_value_object_ref}', $object->ref, $this->template);

-		//$this->template = str_replace('<dol_value_object_points>', $object->points, $this->template);

-		$this->template = str_replace('{dol_value_date}', dol_print_date($object->date, 'day'), $this->template);

-		$this->template = str_replace('{dol_value_date_time}', dol_print_date($object->date, 'dayhour'), $this->template);

-		$this->template = str_replace('{dol_value_year}', dol_print_date($object->date, '%Y'), $this->template);

-		$this->template = str_replace('{dol_value_month_letters}', $langs->trans("Month".dol_print_date($object->date, '%m')), $this->template);

-		$this->template = str_replace('{dol_value_month}', dol_print_date($object->date, '%m'), $this->template);

-		$this->template = str_replace('{dol_value_day}', dol_print_date($object->date, '%d'), $this->template);

-		$this->template = str_replace('{dol_value_day_letters}', $langs->trans("Day".dol_print_date($object->date, '%m')[1]), $this->template);

-

-		$this->template = str_replace('{dol_value_currentdate}', dol_print_date($now, 'dayhour'), $this->template);

-		$this->template = str_replace('{dol_value_currentdate_notime}', dol_print_date($now, 'day'), $this->template);

-		$this->template = str_replace('{dol_value_currentdate_letters}', dol_print_date($now, 'dayhourtext'), $this->template);

-		$this->template = str_replace('{dol_value_currentyear}', dol_print_date($now, '%Y'), $this->template);

-		$this->template = str_replace('{dol_value_currentmonth_letters}', $langs->trans("Month".dol_print_date($now, '%m')), $this->template);

-		$this->template = str_replace('{dol_value_currentmonth}', dol_print_date($now, '%m'), $this->template);

-		$this->template = str_replace('{dol_value_currentday}', dol_print_date($now, '%d'), $this->template);

-		$this->template = str_replace('{dol_value_currentday_letters}', $langs->trans("Day".dol_print_date($now, '%m')[1]), $this->template);

-

-		$this->template = str_replace('{dol_value_customer_firstname}', $object->thirdparty->firstname, $this->template);

-		$this->template = str_replace('{dol_value_customer_lastname}', $object->thirdparty->lastname, $this->template);

-		$this->template = str_replace('{dol_value_customer_mail}', $object->thirdparty->email, $this->template);

-		$this->template = str_replace('{dol_value_customer_phone}', $object->thirdparty->phone, $this->template);

-		//$this->template = str_replace('<dol_value_customer_mobile>', $object->thirdparty->mobile, $this->template);

-		$this->template = str_replace('{dol_value_customer_tax_number}', $object->thirdparty->tva_intra, $this->template);

-		//$this->template = str_replace('<dol_value_customer_account_balance>', $object->customer_account_balance, $this->template);

-		//$this->template = str_replace('<dol_value_customer_points>', $object->customer_points, $this->template);

-

-		$this->template = str_replace('{dol_value_mysoc_name}', $mysoc->name, $this->template);

-		$this->template = str_replace('{dol_value_mysoc_address}', $mysoc->address, $this->template);

-		$this->template = str_replace('{dol_value_mysoc_zip}', $mysoc->zip, $this->template);

-		$this->template = str_replace('{dol_value_mysoc_town}', $mysoc->town, $this->template);

-		$this->template = str_replace('{dol_value_mysoc_country}', $mysoc->country, $this->template);

-		$this->template = str_replace('{dol_value_mysoc_idprof1}', $mysoc->idprof1, $this->template);

-		$this->template = str_replace('{dol_value_mysoc_idprof2}', $mysoc->idprof2, $this->template);

-		$this->template = str_replace('{dol_value_mysoc_idprof3}', $mysoc->idprof3, $this->template);

-		$this->template = str_replace('{dol_value_mysoc_idprof4}', $mysoc->idprof4, $this->template);

-		$this->template = str_replace('{dol_value_mysoc_idprof5}', $mysoc->idprof5, $this->template);

-		$this->template = str_replace('{dol_value_mysoc_idprof6}', $mysoc->idprof6, $this->template);

-		$this->template = str_replace('{dol_value_mysoc_tva_intra}', $mysoc->tva_intra, $this->template);

-		$this->template = str_replace('{dol_value_mysoc_capital}', $mysoc->capital, $this->template);

-		$this->template = str_replace('{dol_value_mysoc_url}', $mysoc->url, $this->template);

-

-		$this->template = str_replace('{dol_value_vendor_firstname}', $user->firstname, $this->template);

-		$this->template = str_replace('{dol_value_vendor_lastname}', $user->lastname, $this->template);

-		$this->template = str_replace('{dol_value_vendor_mail}', $user->email, $this->template);

-

-		$parameters = array('object' => $object);

-		$action = '';

-		$reshook = $hookmanager->executeHooks('sendToPrinterBefore', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks

-		if ($reshook < 0) {

-			$this->error = "Error in hook dolReceiptPrinter sendToPrinterBefore ".$reshook;

-			dol_syslog("dolReceiptPrinter::sendToPrinter: error=".$this->error, LOG_ERR);

-			return $reshook;

-		}

-

-		// parse template

-		$this->template = str_replace("{", "<", $this->template);

-		$this->template = str_replace("}", ">", $this->template);

-

-		if (LIBXML_VERSION < 20900) {

-			// Avoid load of external entities (security problem).

-			// Required only if LIBXML_VERSION < 20900

-			libxml_disable_entity_loader(true);

-		}

-

-		$vals = array();

-		$index = array();

-

-		$p = xml_parser_create();

-		xml_parse_into_struct($p, $this->template, $vals, $index);

-		xml_parser_free($p);

-

-		//print '<pre>'.print_r($index, true).'</pre>';

-		//print '<pre>'.print_r($vals, true).'</pre>';

-		// print ticket

-		$nbcharactbyline = getDolGlobalInt('RECEIPT_PRINTER_NB_CHARACT_BY_LINE', 48);

-		$ret = $this->initPrinter($printerid);

-

-		if ($ret > 0) {

-			setEventMessages($this->error, $this->errors, 'errors');

-		} else {

-			$nboflines = count($vals);

-			for ($tplline = 0; $tplline < $nboflines; $tplline++) {

-				//var_dump($vals[$tplline]['value']);

-				switch ($vals[$tplline]['tag']) {

-					case 'DOL_PRINT_TEXT':

-						$this->printer->text($vals[$tplline]['value']);

-						break;

-					case 'DOL_PRINT_OBJECT_LINES':

-						foreach ($object->lines as $line) {

-							if ($line->fk_product) {

-								$spacestoadd = $nbcharactbyline - strlen($line->ref) - strlen($line->qty) - strlen($line->subprice) - 10 - 1;

-								$spaces = str_repeat(' ', $spacestoadd > 0 ? $spacestoadd : 0);

-								$this->printer->text($line->ref . $spaces . $line->qty . str_pad(price($line->subprice), 10, ' ', STR_PAD_LEFT) . ' ' . str_pad(price($line->total_ttc), 10, ' ', STR_PAD_LEFT) . "\n");

-								$this->printer->text(strip_tags(htmlspecialchars_decode($line->product_label))."\n \n");

-							} else {

-								$spacestoadd = $nbcharactbyline - strlen($line->description) - strlen($line->qty) - strlen($line->subprice) - 10 - 1;

-								$spaces = str_repeat(' ', $spacestoadd > 0 ? $spacestoadd : 0);

-								$this->printer->text($line->description.$spaces.$line->qty.' '.str_pad(price($line->subprice), 10, ' ', STR_PAD_LEFT).' '.str_pad(price($line->total_ttc), 10, ' ', STR_PAD_LEFT)."\n");

-							}

-						}

-						break;

-					case 'DOL_PRINT_OBJECT_LINES_WITH_NOTES':

-						foreach ($object->lines as $line) {

-							if ($line->fk_product) {

-								$spacestoadd = $nbcharactbyline - strlen($line->ref) - strlen($line->qty) - 10 - 1;

-								$spaces = str_repeat(' ', $spacestoadd > 0 ? $spacestoadd : 0);

-								$this->printer->text($line->ref.$spaces.$line->qty.' '.str_pad(price($line->total_ttc), 10, ' ', STR_PAD_LEFT)."\n");

-								$this->printer->text(strip_tags(htmlspecialchars_decode($line->product_label))."\n");

-								$spacestoadd = $nbcharactbyline - strlen($line->description) - strlen($line->qty) - 10 - 1;

-								$spaces = str_repeat(' ', $spacestoadd > 0 ? $spacestoadd : 0);

-								$this->printer->text($line->description."\n");

-							} else {

-								$spacestoadd = $nbcharactbyline - strlen($line->description) - strlen($line->qty) - 10 - 1;

-								$spaces = str_repeat(' ', $spacestoadd > 0 ? $spacestoadd : 0);

-								$this->printer->text($line->description.$spaces.$line->qty.' '.str_pad(price($line->total_ttc), 10, ' ', STR_PAD_LEFT)."\n");

-							}

-						}

-						break;

-					case 'DOL_PRINT_OBJECT_TAX':

-						//var_dump($object);

-						$vatarray = array();

-						foreach ($object->lines as $line) {

-							$vatarray[$line->tva_tx] += $line->total_tva;

-						}

-						foreach ($vatarray as $vatkey => $vatvalue) {

-							$spacestoadd = $nbcharactbyline - strlen($vatkey) - 12;

-							$spaces = str_repeat(' ', $spacestoadd > 0 ? $spacestoadd : 0);

-							$this->printer->text($spaces.$vatkey.'% '.str_pad(price($vatvalue), 10, ' ', STR_PAD_LEFT)."\n");

-						}

-						break;

-					case 'DOL_PRINT_OBJECT_TAX1':

-						//var_dump($object);

-						$total_localtax1 = 0;

-						foreach ($object->lines as $line) {

-							$total_localtax1 += $line->total_localtax1;

-						}

-						$this->printer->text(str_pad(price($total_localtax1), 10, ' ', STR_PAD_LEFT)."\n");

-						break;

-					case 'DOL_PRINT_OBJECT_TAX2':

-						//var_dump($object);

-						$total_localtax2 = 0;

-						foreach ($object->lines as $line) {

-							$total_localtax2 += $line->total_localtax2;

-						}

-						$this->printer->text(str_pad(price($total_localtax2), 10, ' ', STR_PAD_LEFT)."\n");

-						break;

-					case 'DOL_PRINT_OBJECT_TOTAL':

-						$title = $langs->trans('TotalHT');

-						$spacestoadd = $nbcharactbyline - strlen($title) - 10;

-						$spaces = str_repeat(' ', $spacestoadd > 0 ? $spacestoadd : 0);

-						$this->printer->text($title.$spaces.str_pad(price($object->total_ht), 10, ' ', STR_PAD_LEFT)."\n");

-						$title = $langs->trans('TotalVAT');

-						$spacestoadd = $nbcharactbyline - strlen($title) - 10;

-						$spaces = str_repeat(' ', $spacestoadd > 0 ? $spacestoadd : 0);

-						$this->printer->text($title.$spaces.str_pad(price($object->total_tva), 10, ' ', STR_PAD_LEFT)."\n");

-						$title = $langs->trans('TotalTTC');

-						$spacestoadd = $nbcharactbyline - strlen($title) - 10;

-						$spaces = str_repeat(' ', $spacestoadd > 0 ? $spacestoadd : 0);

-						$this->printer->text($title.$spaces.str_pad(price($object->total_ttc), 10, ' ', STR_PAD_LEFT)."\n");

-						break;

-					case 'DOL_PRINT_CURR_DATE':

-						if (strlen($vals[$tplline]['value'])<2) {

-							$this->printer->text(date('d/m/Y H:i:s')."\n");

-						} else {

-							$this->printer->text(date($vals[$tplline]['value'])."\n");

-						}

-						break;

-					case 'DOL_LINE_FEED':

-						$this->printer->feed();

-						break;

-					case 'DOL_LINE_FEED_REVERSE':

-						$this->printer->feedReverse();

-						break;

-					case 'DOL_ALIGN_CENTER':

-						$this->printer->setJustification(Printer::JUSTIFY_CENTER);

-						break;

-					case 'DOL_ALIGN_RIGHT':

-						$this->printer->setJustification(Printer::JUSTIFY_RIGHT);

-						break;

-					case 'DOL_ALIGN_LEFT':

-						$this->printer->setJustification(Printer::JUSTIFY_LEFT);

-						break;

-					case 'DOL_OPEN_DRAWER':

-						$this->printer->pulse();

-						break;

-					case 'DOL_ACTIVATE_BUZZER':

-						//$this->printer->buzzer();

-						break;

-					case 'DOL_PRINT_BARCODE':

-						// $vals[$tplline]['value'] -> barcode($content, $type)

-						// var_dump($vals[$tplline]['value']);

-						try {

-							$this->printer->barcode($vals[$tplline]['value']);

-						} catch (Exception $e) {

-							$this->errors[] = 'Invalid Barcode value: '.$vals[$tplline]['value'];

-							$error++;

-						}

-						break;

-					case 'DOL_PRINT_LOGO':

-						$img = EscposImage::load(DOL_DATA_ROOT.'/mycompany/logos/'.$mysoc->logo);

-						$this->printer->graphics($img);

-						break;

-					case 'DOL_PRINT_LOGO_OLD':

-						$img = EscposImage::load(DOL_DATA_ROOT.'/mycompany/logos/'.$mysoc->logo);

-						$this->printer->bitImage($img);

-						break;

-					case 'DOL_PRINT_LOGO_OLD_CF':

-						$img = EscposImage::load(DOL_DATA_ROOT.'/mycompany/logos/'.$mysoc->logo);

-						$this->printer->bitImageColumnFormat($img);

-						break;

-					case 'DOL_PRINT_QRCODE':

-						// $vals[$tplline]['value'] -> qrCode($content, $ec, $size, $model)

-						$this->printer->qrcode($vals[$tplline]['value']);

-						break;

-					case 'DOL_CUT_PAPER_FULL':

-						$this->printer->cut(Printer::CUT_FULL);

-						break;

-					case 'DOL_CUT_PAPER_PARTIAL':

-						$this->printer->cut(Printer::CUT_PARTIAL);

-						break;

-					case 'DOL_USE_FONT_A':

-						$this->printer->setFont(Printer::FONT_A);

-						break;

-					case 'DOL_USE_FONT_B':

-						$this->printer->setFont(Printer::FONT_B);

-						break;

-					case 'DOL_USE_FONT_C':

-						$this->printer->setFont(Printer::FONT_C);

-						break;

+                $this->printer->close();

+            } catch (Exception $e) {

+                $this->errors[] = $e->getMessage();

+                $error++;

+            }

+        }

+        return $error;

+    }

+

+    /**

+     *  Function to Print Receipt Ticket

+     *

+     *  @param   Facture|Commande   $object         Order or invoice object

+     *  @param   int       			$templateid     Template id

+     *  @param   int       			$printerid      Printer id

+     *  @return  int                				0 if OK; >0 if KO

+     */

+    public function sendToPrinter($object, $templateid, $printerid)

+    {

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

+        $error = 0;

+        $ret = $this->loadTemplate($templateid);

+

+        // tags a remplacer par leur valeur avant de parser (dol_value_xxx)

+        $this->template = str_replace('<dol_value_object_id>', $object->id, $this->template);

+        $this->template = str_replace('<dol_value_object_ref>', $object->ref, $this->template);

+        $this->template = str_replace('<dol_value_object_points>', $object->points, $this->template);

+        $this->template = str_replace('<dol_value_date>', dol_print_date($object->date, 'day'), $this->template);

+        $this->template = str_replace('<dol_value_date_time>', dol_print_date($object->date, 'dayhour'), $this->template);

+        $this->template = str_replace('<dol_value_year>', dol_print_date($object->date, '%Y'), $this->template);

+        $this->template = str_replace('<dol_value_month_letters>', $langs->trans("Month".dol_print_date($object->date, '%m')), $this->template);

+        $this->template = str_replace('<dol_value_month>', dol_print_date($object->date, '%m'), $this->template);

+        $this->template = str_replace('<dol_value_day>', dol_print_date($object->date, '%d'), $this->template);

+        $this->template = str_replace('<dol_value_day_letters>', $langs->trans("Day".dol_print_date($object->date, '%m')[1]), $this->template);

+

+        $this->template = str_replace('<dol_value_customer_firstname>', $object->thirdparty->firstname, $this->template);

+        $this->template = str_replace('<dol_value_customer_lastname>', $object->thirdparty->lastname, $this->template);

+        $this->template = str_replace('<dol_value_customer_mail>', $object->thirdparty->mail, $this->template);

+        $this->template = str_replace('<dol_value_customer_phone>', $object->thirdparty->phone, $this->template);

+        $this->template = str_replace('<dol_value_customer_mobile>', $object->thirdparty->mobile, $this->template);

+        $this->template = str_replace('<dol_value_customer_tax_number>', $object->thirdparty->vatintra, $this->template);

+        $this->template = str_replace('<dol_value_customer_account_balance>', $object->customer_account_balance, $this->template);

+        $this->template = str_replace('<dol_value_customer_points>', $object->customer_points, $this->template);

+

+        $this->template = str_replace('<dol_value_mysoc_name>', $mysoc->name, $this->template);

+        $this->template = str_replace('<dol_value_mysoc_address>', $mysoc->address, $this->template);

+        $this->template = str_replace('<dol_value_mysoc_zip>', $mysoc->zip, $this->template);

+        $this->template = str_replace('<dol_value_mysoc_town>', $mysoc->town, $this->template);

+        $this->template = str_replace('<dol_value_mysoc_country>', $mysoc->country, $this->template);

+        $this->template = str_replace('<dol_value_mysoc_idprof1>', $mysoc->idprof1, $this->template);

+        $this->template = str_replace('<dol_value_mysoc_idprof2>', $mysoc->idprof2, $this->template);

+        $this->template = str_replace('<dol_value_mysoc_idprof3>', $mysoc->idprof3, $this->template);

+        $this->template = str_replace('<dol_value_mysoc_idprof4>', $mysoc->idprof4, $this->template);

+        $this->template = str_replace('<dol_value_mysoc_idprof5>', $mysoc->idprof5, $this->template);

+        $this->template = str_replace('<dol_value_mysoc_idprof6>', $mysoc->idprof6, $this->template);

+        $this->template = str_replace('<dol_value_mysoc_tva_intra>', $mysoc->tva_intra, $this->template);

+        $this->template = str_replace('<dol_value_mysoc_capital>', $mysoc->capital, $this->template);

+

+        $this->template = str_replace('<dol_value_vendor_firstname>', $user->firstname, $this->template);

+        $this->template = str_replace('<dol_value_vendor_lastname>', $user->lastname, $this->template);

+        $this->template = str_replace('<dol_value_vendor_mail>', $user->email, $this->template);

+

+        // parse template

+        $p = xml_parser_create();

+        xml_parse_into_struct($p, $this->template, $vals, $index);

+        xml_parser_free($p);

+        //print '<pre>'.print_r($index, true).'</pre>';

+        //print '<pre>'.print_r($vals, true).'</pre>';

+        // print ticket

+        $level = 0;

+        $nbcharactbyline = (!empty($conf->global->RECEIPT_PRINTER_NB_CHARACT_BY_LINE) ? $conf->global->RECEIPT_PRINTER_NB_CHARACT_BY_LINE : 48);

+        $ret = $this->initPrinter($printerid);

+        if ($ret > 0) {

+            setEventMessages($this->error, $this->errors, 'errors');

+        } else {

+            $nboflines = count($vals);

+            for ($tplline = 0; $tplline < $nboflines; $tplline++) {

+                //var_dump($vals[$tplline]['value']);

+                switch ($vals[$tplline]['tag']) {

+                    case 'DOL_PRINT_TEXT':

+                        $this->printer->text($vals[$tplline]['value']);

+                        break;

+                    case 'DOL_PRINT_OBJECT_LINES':

+                        foreach ($object->lines as $line) {

+                            //var_dump($line);

+                            $spacestoadd = $nbcharactbyline - strlen($line->ref) - strlen($line->qty) - 10 - 1;

+                            $spaces = str_repeat(' ', $spacestoadd);

+                            $this->printer->text($line->ref.$spaces.$line->qty.' '.str_pad(price($line->total_ttc), 10, ' ', STR_PAD_LEFT)."\n");

+                            $this->printer->text(strip_tags(htmlspecialchars_decode($line->product_label))."\n");

+                        }

+                        break;

+                    case 'DOL_PRINT_OBJECT_TAX':

+                        //var_dump($object);

+                        $vatarray = array();

+                        foreach ($object->lines as $line) {

+                            $vatarray[$line->tva_tx] += $line->total_tva;

+                        }

+                        foreach ($vatarray as $vatkey => $vatvalue) {

+                             $spacestoadd = $nbcharactbyline - strlen($vatkey) - 12;

+                             $spaces = str_repeat(' ', $spacestoadd);

+                             $this->printer->text($spaces.$vatkey.'% '.str_pad(price($vatvalue), 10, ' ', STR_PAD_LEFT)."\n");

+                        }

+                        break;

+                    case 'DOL_PRINT_OBJECT_TAX1':

+                    	//var_dump($object);

+                    	$total_localtax1 = 0;

+                    	foreach ($object->lines as $line) {

+                    		$total_localtax1 += $line->total_localtax1;

+                    	}

+                    	foreach ($vatarray as $vatkey => $vatvalue) {

+                    		$this->printer->text(str_pad(price($total_localtax1), 10, ' ', STR_PAD_LEFT)."\n");

+                    	}

+                    	break;

+                    case 'DOL_PRINT_OBJECT_TAX2':

+                    	//var_dump($object);

+                    	$total_localtax2 = 0;

+                    	foreach ($object->lines as $line) {

+                    		$total_localtax2 += $line->total_localtax2;

+                    	}

+                    	foreach ($vatarray as $vatkey => $vatvalue) {

+                    		$this->printer->text(str_pad(price($total_localtax2), 10, ' ', STR_PAD_LEFT)."\n");

+                    	}

+                    	break;

+                    case 'DOL_PRINT_OBJECT_TOTAL':

+                        $title = $langs->trans('TotalHT');

+                        $spacestoadd = $nbcharactbyline - strlen($title) - 10;

+                        $spaces = str_repeat(' ', $spacestoadd);

+                        $this->printer->text($title.$spaces.str_pad(price($object->total_ht), 10, ' ', STR_PAD_LEFT)."\n");

+                        $title = $langs->trans('TotalVAT');

+                        $spacestoadd = $nbcharactbyline - strlen($title) - 10;

+                        $spaces = str_repeat(' ', $spacestoadd);

+                        $this->printer->text($title.$spaces.str_pad(price($object->total_tva), 10, ' ', STR_PAD_LEFT)."\n");

+                        $title = $langs->trans('TotalTTC');

+                        $spacestoadd = $nbcharactbyline - strlen($title) - 10;

+                        $spaces = str_repeat(' ', $spacestoadd);

+                        $this->printer->text($title.$spaces.str_pad(price($object->total_ttc), 10, ' ', STR_PAD_LEFT)."\n");

+                        break;

+                    case 'DOL_LINE_FEED':

+                        $this->printer->feed();

+                        break;

+                    case 'DOL_LINE_FEED_REVERSE':

+                        $this->printer->feedReverse();

+                        break;

+                    case 'DOL_ALIGN_CENTER':

+                        $this->printer->setJustification(Printer::JUSTIFY_CENTER);

+                        break;

+                    case 'DOL_ALIGN_RIGHT':

+                        $this->printer->setJustification(Printer::JUSTIFY_RIGHT);

+                        break;

+                    case 'DOL_ALIGN_LEFT':

+                        $this->printer->setJustification(Printer::JUSTIFY_LEFT);

+                        break;

+                    case 'DOL_OPEN_DRAWER':

+                        $this->printer->pulse();

+                        break;

+                    case 'DOL_ACTIVATE_BUZZER':

+                        //$this->printer->buzzer();

+                        break;

+                    case 'DOL_PRINT_BARCODE':

+                        // $vals[$tplline]['value'] -> barcode($content, $type)

+                        // var_dump($vals[$tplline]['value']);

+                        try {

+                            $this->printer->barcode($vals[$tplline]['value']);

+                        } catch (Exception $e) {

+                            $this->errors[] = 'Invalid Barcode value: '.$vals[$tplline]['value'];

+                            $error++;

+                        }

+                        break;

+                    case 'DOL_PRINT_LOGO':

+                        $img = EscposImage::load(DOL_DATA_ROOT.'/mycompany/logos/'.$mysoc->logo);

+                        $this->printer->graphics($img);

+                        break;

+                    case 'DOL_PRINT_LOGO_OLD':

+                        $img = EscposImage::load(DOL_DATA_ROOT.'/mycompany/logos/'.$mysoc->logo);

+                        $this->printer->bitImage($img);

+                        break;

+                    case 'DOL_PRINT_QRCODE':

+                        // $vals[$tplline]['value'] -> qrCode($content, $ec, $size, $model)

+                        $this->printer->qrcode($vals[$tplline]['value']);

+                        break;

+                    case 'DOL_CUT_PAPER_FULL':

+                        $this->printer->cut(Printer::CUT_FULL);

+                        break;

+                    case 'DOL_CUT_PAPER_PARTIAL':

+                        $this->printer->cut(Printer::CUT_PARTIAL);

+                        break;

+                    case 'DOL_USE_FONT_A':

+                        $this->printer->setFont(Printer::FONT_A);

+                        break;

+                    case 'DOL_USE_FONT_B':

+                        $this->printer->setFont(Printer::FONT_B);

+                        break;

+                    case 'DOL_USE_FONT_C':

+                        $this->printer->setFont(Printer::FONT_C);

+                        break;

@@ -868,2 +725,2 @@
-						$this->printer->setEmphasis(true);

-						break;

+                        $this->printer->setEmphasis(true);

+                        break;

@@ -871,2 +728,2 @@
-						$this->printer->setEmphasis(false);

-						break;

+                        $this->printer->setEmphasis(false);

+                        break;

@@ -874,2 +731,2 @@
-						$this->printer->setTextSize(1, 2);

-						break;

+                        $this->printer->setTextSize(1, 2);

+                        break;

@@ -877,2 +734,2 @@
-						$this->printer->setTextSize(2, 1);

-						break;

+                        $this->printer->setTextSize(2, 1);

+                        break;

@@ -880,2 +737,2 @@
-						$this->printer->setTextSize(1, 1);

-						break;

+                        $this->printer->setTextSize(1, 1);

+                        break;

@@ -883,2 +740,2 @@
-						$this->printer->setUnderline(true);

-						break;

+                        $this->printer->setUnderline(true);

+                        break;

@@ -886,2 +743,2 @@
-						$this->printer->setUnderline(false);

-						break;

+                        $this->printer->setUnderline(false);

+                        break;

@@ -889,5 +746,2 @@
-						$this->printer->getPrintConnector() -> write("\x1e");

-						break;

-					case 'DOL_BEEP_ALTERNATIVE': //if DOL_BEEP not works

-						$this->printer->getPrintConnector() -> write(Printer::ESC . "B" . chr(4) . chr(1));

-						break;

+                        $this->printer->getPrintConnector() -> write("\x1e");

+                        break;

@@ -896 +750,2 @@
-							if ($line->special_code == $this->orderprinter) {

+							if ($line->special_code == $this->orderprinter)

+							{

@@ -898 +753 @@
-								$spaces = str_repeat(' ', $spacestoadd > 0 ? $spacestoadd : 0);

+								$spaces = str_repeat(' ', $spacestoadd);

@@ -902 +757 @@
-						}

+                        }

@@ -904,53 +759,11 @@
-					case 'DOL_PRINT_PAYMENT':

-						$sql = "SELECT p.pos_change as pos_change, p.datep as date, p.fk_paiement, p.num_paiement as num, pf.amount as amount, pf.multicurrency_amount,";

-						$sql .= " cp.code";

-						$sql .= " FROM ".$this->db->prefix()."paiement_facture as pf, ".$this->db->prefix()."paiement as p";

-						$sql .= " LEFT JOIN ".$this->db->prefix()."c_paiement as cp ON p.fk_paiement = cp.id";

-						$sql .= " WHERE pf.fk_paiement = p.rowid AND pf.fk_facture = ".((int) $object->id);

-						$sql .= " ORDER BY p.datep";

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

-						if ($resql) {

-							$num = $this->db->num_rows($resql);

-							$i = 0;

-							while ($i < $num) {

-								$row = $this->db->fetch_object($resql);

-								$spacestoadd = $nbcharactbyline - strlen($langs->transnoentitiesnoconv("PaymentTypeShort".$row->code)) - 12;

-								$spaces = str_repeat(' ', $spacestoadd > 0 ? $spacestoadd : 0);

-								$amount_payment = (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount;

-								if ($row->code == "LIQ") {

-									$amount_payment = $amount_payment + $row->pos_change; // Show amount with excess received if is cash payment

-								}

-								$this->printer->text($spaces.$langs->transnoentitiesnoconv("PaymentTypeShort".$row->code).' '.str_pad(price($amount_payment), 10, ' ', STR_PAD_LEFT)."\n");

-								if ($row->code == "LIQ" && $row->pos_change > 0) { // Print change only in cash payments

-									$spacestoadd = $nbcharactbyline - strlen($langs->trans("Change")) - 12;

-									$spaces = str_repeat(' ', $spacestoadd > 0 ? $spacestoadd : 0);

-									$this->printer->text($spaces.$langs->trans("Change").' '.str_pad(price($row->pos_change), 10, ' ', STR_PAD_LEFT)."\n");

-								}

-								$i++;

-							}

-						}

-						break;

-					case 'DOL_VALUE_PLACE':

-						$sql = "SELECT floor, label FROM ".$this->db->prefix()."takepos_floor_tables where rowid=".((int) str_replace(")", "", str_replace("(PROV-POS".$_SESSION["takeposterminal"]."-", "", $object->ref)));

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

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

-						if ($obj) {

-							$this->printer->text($obj->label);

-						}

-						break;

-					default:

-						$parameters = array('vals' => $vals[$tplline],'object' => $object,'nbcharactbyline' => $nbcharactbyline);

-						$action = '';

-						$reshook = $hookmanager->executeHooks('sendToPrinterAfter', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks

-

-						if (!$reshook || $reshook < 0) {

-							$this->printer->text($vals[$tplline]['tag']);

-							$this->printer->text($vals[$tplline]['value']);

-							$this->errors[] = 'UnknowTag: &lt;'.strtolower($vals[$tplline]['tag']).'&gt;';

-							$error++;

-						}

-						break;

-				}

-			}

-			// If is DummyPrintConnector send to log to debugging

-			if ($this->printer->connector instanceof DummyPrintConnector || getDolGlobalString('TAKEPOS_PRINT_METHOD') == "takeposconnector") {

+                    default:

+                        $this->printer->text($vals[$tplline]['tag']);

+                        $this->printer->text($vals[$tplline]['value']);

+                        $this->errors[] = 'UnknowTag: &lt;'.strtolower($vals[$tplline]['tag']).'&gt;';

+                        $error++;

+                        break;

+                }

+            }

+            // If is DummyPrintConnector send to log to debugging

+			if ($this->printer->connector instanceof DummyPrintConnector)

+			{

@@ -958,3 +770,0 @@
-				if (getDolGlobalString('TAKEPOS_PRINT_METHOD') == "takeposconnector") {

-					echo rtrim(strtr(base64_encode($data), '+/', '-_'), '=');

-				}

@@ -964,103 +774,94 @@
-			$this->printer->close();

-		}

-		return $error;

-	}

-

-	/**

-	 *  Function to load Template into $this->template

-	 *

-	 *  @param   int       $templateid          Template id

-	 *  @return  int                            0 if OK; >0 if KO

-	 */

-	public function loadTemplate($templateid)

-	{

-		$error = 0;

-

-		$sql = "SELECT template";

-		$sql .= " FROM ".$this->db->prefix()."printer_receipt_template";

-		$sql .= " WHERE rowid = ".((int) $templateid);

-		$sql .= " AND entity IN (".getEntity('printer_receipt_template').")";

-

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

-		if ($resql) {

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

-		} else {

-			$error++;

-			$this->errors[] = $this->db->lasterror;

-		}

-		if (empty($obj)) {

-			$error++;

-			$this->errors[] = 'TemplateDontExist';

-		} else {

-			$this->template = $obj->template;

-		}

-

-		return $error;

-	}

-

-

-	/**

-	 *  Function Init Printer into $this->printer

-	 *

-	 *  @param   int       $printerid       Printer id

-	 *  @return  void|int                   0 if OK; >0 if KO

-	 */

-	public function initPrinter($printerid)

-	{

-		if (getDolGlobalString('TAKEPOS_PRINT_METHOD') == "takeposconnector") {

-			$this->connector = new DummyPrintConnector();

-			$this->printer = new Printer($this->connector, $this->profile);

-			return;

-		}

-

-		$error = 0;

-		$sql = "SELECT rowid, name, fk_type, fk_profile, parameter";

-		$sql .= " FROM ".$this->db->prefix()."printer_receipt";

-		$sql .= " WHERE rowid = ".((int) $printerid);

-		$sql .= " AND entity IN (".getEntity('printer_receipt').")";

-

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

-		if ($resql) {

-			$obj = $this->db->fetch_array($resql);

-			if (empty($obj)) {

-				$error++;

-				$this->errors[] = 'PrinterDontExist';

-			}

-			if (!$error) {

-				$parameter = (isset($obj['parameter']) ? $obj['parameter'] : '');

-				try {

-					$type = $obj['fk_type'];

-					switch ($type) {

-						case 1:

-							$this->connector = new DummyPrintConnector();

-							break;

-						case 2:

-							$this->connector = new FilePrintConnector($parameter);

-							break;

-						case 3:

-							$parameters = explode(':', $parameter);

-							$this->connector = new NetworkPrintConnector($parameters[0], $parameters[1]);

-							break;

-						case 4:	// LPT1, smb://...

-							$this->connector = new WindowsPrintConnector(dol_sanitizePathName($parameter));

-							break;

-						case 5:

-							$this->connector = new CupsPrintConnector($parameter);

-							break;

-						default:

-							$this->connector = 'CONNECTOR_UNKNOWN';

-							break;

-					}

-					$this->printer = new Printer($this->connector, $this->profile);

-				} catch (Exception $e) {

-					$this->errors[] = $e->getMessage();

-					$error++;

-				}

-			}

-		} else {

-			$error++;

-			$this->errors[] = $this->db->lasterror;

-		}

-

-		return $error;

-	}

+            $this->printer->close();

+        }

+        return $error;

+    }

+

+    /**

+     *  Function to load Template

+     *

+     *  @param   int       $templateid          Template id

+     *  @return  int                            0 if OK; >0 if KO

+     */

+    public function loadTemplate($templateid)

+    {

+        global $conf;

+        $error = 0;

+        $sql = 'SELECT template';

+        $sql .= ' FROM '.MAIN_DB_PREFIX.'printer_receipt_template';

+        $sql .= ' WHERE rowid='.$templateid;

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

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

+        if ($resql) {

+            $obj = $this->db->fetch_array($resql);

+        } else {

+            $error++;

+            $this->errors[] = $this->db->lasterror;

+        }

+        if (empty($obj)) {

+            $error++;

+            $this->errors[] = 'TemplateDontExist';

+        } else {

+            $this->template = $obj['0'];

+        }

+

+        return $error;

+    }

+

+

+    /**

+     *  Function Init Printer

+     *

+     *  @param   int       $printerid       Printer id

+     *  @return  int                        0 if OK; >0 if KO

+     */

+    public function initPrinter($printerid)

+    {

+        global $conf;

+        $error = 0;

+        $sql = 'SELECT rowid, name, fk_type, fk_profile, parameter';

+        $sql .= ' FROM '.MAIN_DB_PREFIX.'printer_receipt';

+        $sql .= ' WHERE rowid = '.$printerid;

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

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

+        if ($resql) {

+            $obj = $this->db->fetch_array($resql);

+        } else {

+            $error++;

+            $this->errors[] = $this->db->lasterror;

+        }

+        if (empty($obj)) {

+            $error++;

+            $this->errors[] = 'PrinterDontExist';

+        }

+        if (!$error) {

+            $parameter = $obj['parameter'];

+            try {

+                switch ($obj['fk_type']) {

+                    case 1:

+                        $this->connector = new DummyPrintConnector();

+                        break;

+                    case 2:

+                        $this->connector = new FilePrintConnector($parameter);

+                        break;

+                    case 3:

+                        $parameters = explode(':', $parameter);

+                        $this->connector = new NetworkPrintConnector($parameters[0], $parameters[1]);

+                        break;

+                    case 4:

+                        $this->connector = new WindowsPrintConnector($parameter);

+                        break;

+					case 5:

+                        $this->connector = new CupsPrintConnector($parameter);

+                        break;

+                    default:

+                        $this->connector = 'CONNECTOR_UNKNOWN';

+                        break;

+                }

+                $this->printer = new Printer($this->connector, $this->profile);

+            } catch (Exception $e) {

+                $this->errors[] = $e->getMessage();

+                $error++;

+            }

+        }

+        return $error;

+    }

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_emailsenderprofile.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_emailsenderprofile.class.php
@@ -57,3 +57 @@
-	public $picto = 'emailsenderprofile';

-

-	public $fk_user_creat;

+	public $picto = 'emailsenderprofile@monmodule';

@@ -85 +83 @@
-	 *  'arrayofkeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")

+	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")

@@ -100,2 +98,3 @@
-		'private' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'User', 'visible'=>1, 'enabled'=>1, 'position'=>50, 'default'=>'0', 'notnull'=>1),

-		'signature' => array('type'=>'html', 'label'=>'Signature', 'visible'=>3, 'enabled'=>1, 'position'=>400, 'notnull'=>-1, 'index'=>1,),

+		//'fk_user_creat' => array('type'=>'integer', 'label'=>'UserAuthor', 'visible'=>-1, 'enabled'=>1, 'position'=>500, 'notnull'=>1,),

+		'private' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'User', 'visible'=>-1, 'enabled'=>1, 'position'=>50, 'default'=>'0', 'notnull'=>1),

+		'signature' => array('type'=>'text', 'label'=>'Signature', 'visible'=>3, 'enabled'=>1, 'position'=>400, 'notnull'=>-1, 'index'=>1,),

@@ -105 +104 @@
-		'active' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'default'=>1, 'position'=>1000, 'notnull'=>1, 'index'=>1, 'arrayofkeyval'=>array(0=>'Disabled', 1=>'Enabled')),

+		'active' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'default'=>1, 'position'=>1000, 'notnull'=>-1, 'index'=>1, 'arrayofkeyval'=>array(0=>'Disabled', 1=>'Enabled')),

@@ -119,3 +118,3 @@
-	 * @var string Email Sender Profile label

-	 */

-	public $label;

+     * @var string Email Sender Profile label

+     */

+    public $label;

@@ -126,2 +125,2 @@
-	 * @var integer|string date_creation

-	 */

+     * @var integer|string date_creation

+     */

@@ -129,0 +129 @@
+

@@ -131 +131,2 @@
-	public $private;

+	//public $fk_user_creat;

+	//public $fk_user_modif;

@@ -137,0 +139,26 @@
+

+	// If this object has a subtable with lines

+

+	/**

+	 * @var int    Name of subtable line

+	 */

+	//public $table_element_line = 'emailsenderprofiledet';

+	/**

+	 * @var int    Field with ID of parent key if this field has a parent

+	 */

+	//public $fk_element = 'fk_emailsenderprofile';

+	/**

+	 * @var int    Name of subtable class that manage subtable lines

+	 */

+	//public $class_element_line = 'EmailSenderProfileline';

+	/**

+	 * @var array	List of child tables. To test if we can delete object.

+	 */

+	//protected $childtables=array();

+	/**

+	 * @var EmailSenderProfileLine[]     Array of subtable lines

+	 */

+	//public $lines = array();

+

+

+

@@ -149,6 +176,2 @@
-		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID')) {

-			$this->fields['rowid']['visible'] = 0;

-		}

-		if (!isModEnabled('multicompany')) {

-			$this->fields['entity']['enabled'] = 0;

-		}

+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) $this->fields['rowid']['visible'] = 0;

+		if (empty($conf->multicompany->enabled)) $this->fields['entity']['enabled'] = 0;

@@ -162 +185 @@
-	 * @return int             Return integer <0 if KO, Id of created object if OK

+	 * @return int             <0 if KO, Id of created object if OK

@@ -225 +248 @@
-	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK

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

@@ -230,3 +253 @@
-		if ($result > 0 && !empty($this->table_element_line)) {

-			$this->fetchLines();

-		}

+		if ($result > 0 && !empty($this->table_element_line)) $this->fetchLines();

@@ -239 +260 @@
-	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK

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

@@ -255 +276 @@
-	 * @return int             Return integer <0 if KO, >0 if OK

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

@@ -267 +288 @@
-	 * @return int             Return integer <0 if KO, >0 if OK

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

@@ -289,3 +310,3 @@
-		$label = $this->label;

-

-		$url = '';

+        $label = $this->label;

+

+        $url = '';

@@ -299,3 +320 @@
-			if ($withpicto != 2) {

-				$result .= ' ';

-			}

+			if ($withpicto != 2) $result .= ' ';

@@ -308,4 +327,4 @@
-	 *  Return the label of a given status

-	 *

-	 *  @param  int		$mode          0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto

-	 *  @return string 			       Label of status

+	 *  Retourne le libelle du status d'un user (actif, inactif)

+	 *

+	 *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto

+	 *  @return	string 			       Label of status

@@ -315,10 +334,10 @@
-		return $this->LibStatut($this->active, $mode);

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 *  Return the label of a given status

-	 *

-	 *  @param	int		$status        Id status

-	 *  @param  int		$mode          0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto

-	 *  @return string 			       Label of status

+		return $this->LibStatut($this->status, $mode);

+	}

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+	/**

+	 *  Return the status

+	 *

+	 *  @param	int		$status        	Id status

+	 *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto

+	 *  @return string 			       	Label of status

@@ -330,16 +349,34 @@
-		if ($status == 1) {

-			$label = $labelshort = $langs->transnoentitiesnoconv('Enabled');

-		} else {

-			$label = $labelshort = $langs->transnoentitiesnoconv('Disabled');

-		}

-

-		$statusType = 'status'.$status;

-		if ($status == self::STATUS_ENABLED) {

-			$statusType = 'status4';

-		}

-

-		return dolGetStatus($label, $labelshort, '', $statusType, $mode);

-	}

-

-	/**

-	 *  Charge les informations d'ordre info dans l'objet commande

+		if ($mode == 0 || $mode == 1)

+		{

+			if ($status == 1) return $langs->trans('Enabled');

+			elseif ($status == 0) return $langs->trans('Disabled');

+		}

+		elseif ($mode == 2)

+		{

+			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');

+			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');

+		}

+		elseif ($mode == 3)

+		{

+			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4');

+			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5');

+		}

+		elseif ($mode == 4)

+		{

+			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');

+			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');

+		}

+		elseif ($mode == 5)

+		{

+			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');

+			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');

+		}

+		elseif ($mode == 6)

+		{

+			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');

+			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');

+		}

+	}

+

+    /**

+     *  Charge les informations d'ordre info dans l'objet commande

@@ -352,3 +389,4 @@
-		$sql = "SELECT rowid, date_creation as datec, tms as datem";

-		$sql .= " FROM ".$this->db->prefix().$this->table_element." as t";

-		$sql .= " WHERE t.rowid = ".((int) $id);

+		$sql = 'SELECT rowid, date_creation as datec, tms as datem,';

+		$sql .= ' fk_user_creat, fk_user_modif';

+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';

+		$sql .= ' WHERE t.rowid = '.$id;

@@ -356,2 +394,4 @@
-		if ($result) {

-			if ($this->db->num_rows($result)) {

+		if ($result)

+		{

+			if ($this->db->num_rows($result))

+			{

@@ -359,0 +400,20 @@
+				if ($obj->fk_user_author)

+				{

+					$cuser = new User($this->db);

+					$cuser->fetch($obj->fk_user_author);

+					$this->user_creation = $cuser;

+				}

+

+				if ($obj->fk_user_valid)

+				{

+					$vuser = new User($this->db);

+					$vuser->fetch($obj->fk_user_valid);

+					$this->user_validation = $vuser;

+				}

+

+				if ($obj->fk_user_cloture)

+				{

+					$cluser = new User($this->db);

+					$cluser->fetch($obj->fk_user_cloture);

+					$this->user_cloture = $cluser;

+				}

@@ -362,0 +423 @@
+				$this->date_validation   = $this->db->jdate($obj->datev);

@@ -366 +427,3 @@
-		} else {

+		}

+		else

+		{

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_evalmath.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_evalmath.class.php
@@ -98,0 +99 @@
+

@@ -115,2 +116 @@
-		'sin', 'sinh', 'arcsin', 'asin', 'arcsinh', 'asinh', 'cos', 'cosh', 'arccos', 'acos', 'arccosh', 'acosh', 'tan', 'tanh', 'arctan', 'atan', 'arctanh', 'atanh', 'sqrt', 'abs', 'ln', 'log', 'intval', 'ceil',

-	);

+	'sin', 'sinh', 'arcsin', 'asin', 'arcsinh', 'asinh', 'cos', 'cosh', 'arccos', 'acos', 'arccosh', 'acosh', 'tan', 'tanh', 'arctan', 'atan', 'arctanh', 'atanh', 'sqrt', 'abs', 'ln', 'log', 'intval');

@@ -147,4 +146,0 @@
-		if (empty($expr)) {

-			return false;

-		}

-

@@ -154 +150 @@
-		if (substr($expr, - 1, 1) == ';') {

+		if (substr($expr, - 1, 1) == ';')

@@ -156,3 +152,2 @@
-		}

-		// ===============

-		// is it a variable assignment?

+			                                             // ===============

+			                                             // is it a variable assignment?

@@ -164 +159 @@
-			if (($tmp = $this->pfx($this->nfx($matches[2]))) === false) {

+			if (($tmp = $this->pfx($this->nfx($matches[2]))) === false)

@@ -166 +160,0 @@
-			}

@@ -169,2 +163,2 @@
-										  // ===============

-										  // is it a function assignment?

+			                              // ===============

+			                              // is it a function assignment?

@@ -177 +171 @@
-			if (($stack = $this->nfx($matches[3])) === false) {

+			if (($stack = $this->nfx($matches[3])) === false)

@@ -179 +172,0 @@
-			}

@@ -200,3 +193,3 @@
-	 * Function vars

-	 *

-	 * @return array	Output

+	 * vars

+	 *

+	 * @return string Output

@@ -213,3 +206,3 @@
-	 * Function funcs

-	 *

-	 * @return array	Output

+	 * vars

+	 *

+	 * @return string Output

@@ -220 +213 @@
-		foreach ($this->f as $fnn => $dat) {

+		foreach ($this->f as $fnn => $dat)

@@ -222 +214,0 @@
-		}

@@ -231,2 +223,2 @@
-	 * @param 	string 			$expr		Expression

-	 * @return 	boolean|array 				Output

+	 * @param string $expr		Expression

+	 * @return string 			Output

@@ -246 +238 @@
-		// and determining when a - is a negation

+		                       // and determining when a - is a negation

@@ -250 +242 @@
-			return $this->trigger(4, "illegal character '".$matches[0]."'", $matches[0]);

+			return $this->trigger(4, "illegal character '{$matches[0]}'", $matches[0]);

@@ -255 +247 @@
-											// find out if we're currently at the beginning of a number/variable/function/parenthesis/operand

+			                                // find out if we're currently at the beginning of a number/variable/function/parenthesis/operand

@@ -264 +256 @@
-																		// ===============

+				                                                        // ===============

@@ -292 +284 @@
-						if ($arg_count > 1) {

+						if ($arg_count > 1)

@@ -294 +285,0 @@
-						}

@@ -296 +287 @@
-						if ($arg_count != count($this->f[$fnn]['args'])) {

+						if ($arg_count != count($this->f[$fnn]['args']))

@@ -298 +288,0 @@
-						}

@@ -314 +304 @@
-				if (!preg_match("/^([a-z]\w*)\($/", $stack->last(2), $matches)) {

+				if (!preg_match("/^([a-z]\w*)\($/", $stack->last(2), $matches))

@@ -316 +305,0 @@
-				}

@@ -364 +353 @@
-			if ($op == '(') {

+			if ($op == '(')

@@ -366 +354,0 @@
-			}

@@ -369 +356,0 @@
-

@@ -374,3 +361,3 @@
-	 * Evaluate postfix notation

-	 *

-	 * @param array $tokens      	Expression

+	 * evaluate postfix notation

+	 *

+	 * @param string $tokens      	Expression

@@ -381,0 +369,3 @@
+		if ($tokens == false)

+			return false;

+

@@ -385 +375 @@
-			// if the token is a binary operator, pop two values off the stack, do the operation, and push the result back on

+		                              // if the token is a binary operator, pop two values off the stack, do the operation, and push the result back on

@@ -388 +378 @@
-				if (is_null($op2 = $stack->pop())) {

+				if (is_null($op2 = $stack->pop()))

@@ -390,2 +380 @@
-				}

-				if (is_null($op1 = $stack->pop())) {

+				if (is_null($op1 = $stack->pop()))

@@ -393 +381,0 @@
-				}

@@ -405 +393 @@
-						if ($op2 == 0) {

+						if ($op2 == 0)

@@ -407 +394,0 @@
-						}

@@ -421 +408 @@
-					if (is_null($op1 = $stack->pop())) {

+					if (is_null($op1 = $stack->pop()))

@@ -423 +409,0 @@
-					}

@@ -425 +411 @@
-					if ($fnn == 'ln') {

+					if ($fnn == 'ln')

@@ -427 +412,0 @@
-					}

@@ -430 +415 @@
-															  // get args

+				                                              // get args

@@ -433 +418 @@
-						if (is_null($args[$this->f[$fnn]['args'][$i]] = $stack->pop())) {

+						if (is_null($args[$this->f[$fnn]['args'][$i]] = $stack->pop()))

@@ -435 +419,0 @@
-						}

@@ -453 +437 @@
-		if ($stack->count != 1) {

+		if ($stack->count != 1)

@@ -455 +438,0 @@
-		}

@@ -471 +454 @@
-		if (!$this->suppress_errors) {

+		if (!$this->suppress_errors)

@@ -473 +455,0 @@
-		}

@@ -482,0 +465 @@
+

@@ -490,2 +473,2 @@
-	 * @param 	string 	$val		Val

-	 * @return 	void

+	 * @param string $val		Val

+	 * @return void

@@ -516,2 +499,2 @@
-	 * @param 	int 	$n		N

-	 * @return 	mixed 			Stack

+	 * @param int $n	N

+	 * @return mixed 	Stack

@@ -524,2 +507 @@
-

-		return '';

+		return;

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_events.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_events.class.php
@@ -2,3 +2,2 @@
-/* Copyright (C) 2007-2019	Laurent Destailleur	<eldy@users.sourceforge.net>

- * Copyright (C) 2005-2009	Regis Houssin		<regis.houssin@inodbox.com>

- * Copyright (C) 2023		William Mead		<william.mead@manchenumerique.fr>

+/* Copyright (C) 2007-2019 Laurent Destailleur  <eldy@users.sourceforge.net>

+ * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>

@@ -47,4 +46,4 @@
-	/**

-	 * @var DoliDB Database handler.

-	 */

-	public $db;

+    /**

+     * @var DoliDB Database handler.

+     */

+    public $db;

@@ -62 +61 @@
-	/**

+    /**

@@ -85,5 +83,0 @@
-	 * @var string label

-	 */

-	public $label;

-

-	/**

@@ -98,6 +91,0 @@
-

-	/**

-	 * @var string	Authentication method used for USER_LOGIN with success

-	 */

-	public $authentication_method;

-

@@ -109 +97 @@
-		array('id'=>'USER_LOGOUT', 'test'=>1),

+	    array('id'=>'USER_LOGOUT', 'test'=>1),

@@ -148 +136 @@
-	 *   @return     int                Return integer <0 if KO, >0 if OK

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

@@ -156,3 +144 @@
-		if (empty($this->user_agent)) {

-			$this->user_agent = (empty($_SERVER['HTTP_USER_AGENT']) ? '' : $_SERVER['HTTP_USER_AGENT']);

-		}

+		if (empty($this->user_agent) && !empty($_SERVER['HTTP_USER_AGENT'])) $this->user_agent = $_SERVER['HTTP_USER_AGENT'];

@@ -161,4 +147 @@
-		if (empty($this->description)) {

-			$this->error = 'ErrorBadValueForParameterCreateEventDesc';

-			return -1;

-		}

+		if (empty($this->description)) { $this->error = 'ErrorBadValueForParameterCreateEventDesc'; return -1; }

@@ -167 +150 @@
-		$sql = "INSERT INTO ".$this->db->prefix()."events(";

+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."events(";

@@ -178 +161 @@
-		$sql .= " ".((int) $conf->entity).",";

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

@@ -182 +165 @@
-		$sql .= " ".($user->id > 0 ? ((int) $user->id) : 'NULL').",";

+		$sql .= " ".($user->id ? "'".$this->db->escape($user->id)."'" : 'NULL').",";

@@ -189,2 +172,3 @@
-		if ($resql) {

-			$this->id = $this->db->last_insert_id($this->db->prefix()."events");

+		if ($resql)

+		{

+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."events");

@@ -192 +176,3 @@
-		} else {

+		}

+		else

+		{

@@ -204,3 +190,3 @@
-	 * @return  int         			Return integer <0 if KO, >0 if OK

-	 */

-	public function update($user = null, $notrigger = 0)

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

+	 */

+    public function update($user = null, $notrigger = 0)

@@ -217 +203 @@
-		$sql = "UPDATE ".$this->db->prefix()."events SET";

+		$sql = "UPDATE ".MAIN_DB_PREFIX."events SET";

@@ -221 +207 @@
-		$sql .= " WHERE rowid=".((int) $this->id);

+		$sql .= " WHERE rowid=".$this->id;

@@ -225 +211,2 @@
-		if (!$resql) {

+		if (!$resql)

+		{

@@ -238,3 +225,3 @@
-	 *  @return int         		Return integer <0 if KO, >0 if OK

-	 */

-	public function fetch($id, $user = null)

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

+	 */

+    public function fetch($id, $user = null)

@@ -252,2 +239,2 @@
-		$sql .= " FROM ".$this->db->prefix()."events as t";

-		$sql .= " WHERE t.rowid = ".((int) $id);

+		$sql .= " FROM ".MAIN_DB_PREFIX."events as t";

+		$sql .= " WHERE t.rowid = ".$id;

@@ -257,2 +244,4 @@
-		if ($resql) {

-			if ($this->db->num_rows($resql)) {

+		if ($resql)

+		{

+			if ($this->db->num_rows($resql))

+			{

@@ -274 +263,3 @@
-		} else {

+		}

+		else

+		{

@@ -285,6 +276,6 @@
-	 *	@return	int					Return integer <0 if KO, >0 if OK

-	 */

-	public function delete($user)

-	{

-		$sql = "DELETE FROM ".$this->db->prefix()."events";

-		$sql .= " WHERE rowid=".((int) $this->id);

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

+	 */

+    public function delete($user)

+	{

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

+		$sql .= " WHERE rowid=".$this->id;

@@ -294 +285,2 @@
-		if (!$resql) {

+		if (!$resql)

+		{

@@ -304,7 +296,7 @@
-	 *  Initialise an instance with random values.

-	 *  Used to build previews or test instances.

-	 *	id must be 0 if object instance is a specimen.

-	 *

-	 *  @return	void

-	 */

-	public function initAsSpecimen()

+     *  Initialise an instance with random values.

+     *  Used to build previews or test instances.

+     *	id must be 0 if object instance is a specimen.

+     *

+     *  @return	void

+     */

+    public function initAsSpecimen()

@@ -321 +313 @@
-	}

+    }

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_extrafields.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_extrafields.class.php
@@ -9 +9 @@
- * Copyright (C) 2015-2023  Charlene BENKE          <charlene@patas-monkey.com>

+ * Copyright (C) 2015       Charles-Fr BENKE        <charles.fr@benke.fr>

@@ -12,2 +12 @@
- * Copyright (C) 2018-2022  Frédéric France         <frederic.france@netlogic.fr>

- * Copyright (C) 2022 		Antonin MARCHAL         <antonin@letempledujeu.fr>

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

@@ -42,3 +41,3 @@
-	 * @var DoliDB Database handler.

-	 */

-	public $db;

+     * @var DoliDB Database handler.

+     */

+    public $db;

@@ -47,2 +46,92 @@
-	 * @var array New array to store extrafields definition

-	 */

+     * @var array Array with type of element (for what object is the extrafield)

+	 * @deprecated

+     */

+    public $attribute_elementtype;

+

+    /**

+     * @var array Array with type of the extra field

+	 * @deprecated

+     */

+    public $attribute_type;

+

+    /**

+     * @var array Array with label of extra field

+	 * @deprecated

+     */

+    public $attribute_label;

+

+    /**

+     * @var array Array with size of extra field

+	 * @deprecated

+     */

+	public $attribute_size;

+

+    /**

+     * @var array Array with list of possible values for some types of extra fields

+	 * @deprecated

+     */

+	public $attribute_choice;

+

+    /**

+     * @var array Array to store compute formula for computed fields

+	 * @deprecated

+     */

+	public $attribute_computed;

+

+    /**

+     * @var array Array to store default value

+	 * @deprecated

+     */

+	public $attribute_default;

+

+    /**

+     * @var array Array to store if attribute is unique or not

+	 * @deprecated

+     */

+	public $attribute_unique;

+

+    /**

+     * @var array Array to store if attribute is required or not

+	 * @deprecated

+     */

+	public $attribute_required;

+

+    /**

+     * @var array Array to store parameters of attribute (used in select type)

+	 * @deprecated

+     */

+	public $attribute_param;

+

+    /**

+     * @var array Array to store position of attribute

+	 * @deprecated

+     */

+	public $attribute_pos;

+

+    /**

+     * @var array Array to store if attribute is editable regardless of the document status

+	 * @deprecated

+     */

+	public $attribute_alwayseditable;

+

+    /**

+     * @var array Array to store permission to check

+	 * @deprecated

+     */

+	public $attribute_perms;

+

+    /**

+     * @var array Array to store language file to translate label of values

+	 * @deprecated

+     */

+	public $attribute_langfile;

+

+    /**

+     * @var array Array to store if field is visible by default on list

+	 * @deprecated

+     */

+	public $attribute_list;

+

+	/**

+     * @var array New array to store extrafields definition

+     */

@@ -50,5 +138,0 @@
-

-	/**

-	 * @var array	Array with boolean of status of groups

-	 */

-	public $expand_display;

@@ -66,2 +150,2 @@
-	/**

-	 * @var string 	DB Error number

+    /**

+	 * @var string DB Error number

@@ -71,3 +155 @@
-	/**

-	 * @var array 	Array of type to label

-	 */

+

@@ -75,24 +157,20 @@
-		'varchar'=>'String1Line',

-		'text'=>'TextLongNLines',

-		'html'=>'HtmlText',

-		'int'=>'Int',

-		'double'=>'Float',

-		'date'=>'Date',

-		'datetime'=>'DateAndTime',

-		//'datetimegmt'=>'DateAndTimeUTC',

-		'boolean'=>'Boolean',

-		'price'=>'ExtrafieldPrice',

-		'pricecy'=>'ExtrafieldPriceWithCurrency',

-		'phone'=>'ExtrafieldPhone',

-		'mail'=>'ExtrafieldMail',

-		'url'=>'ExtrafieldUrl',

-		'ip'=>'ExtrafieldIP',

-		'icon'=>'Icon',

-		'password' => 'ExtrafieldPassword',

-		'select' => 'ExtrafieldSelect',

-		'sellist' => 'ExtrafieldSelectList',

-		'radio' => 'ExtrafieldRadio',

-		'checkbox' => 'ExtrafieldCheckBox',

-		'chkbxlst' => 'ExtrafieldCheckBoxFromList',

-		'link' => 'ExtrafieldLink',

-		'separate' => 'ExtrafieldSeparator',

+	    'varchar'=>'String',

+	    'text'=>'TextLong',

+	    'html'=>'HtmlText',

+	    'int'=>'Int',

+	    'double'=>'Float',

+	    'date'=>'Date',

+	    'datetime'=>'DateAndTime',

+	    'boolean'=>'Boolean',

+	    'price'=>'ExtrafieldPrice',

+	    'phone'=>'ExtrafieldPhone',

+	    'mail'=>'ExtrafieldMail',

+	    'url'=>'ExtrafieldUrl',

+	    'password' => 'ExtrafieldPassword',

+	    'select' => 'ExtrafieldSelect',

+	    'sellist' => 'ExtrafieldSelectList',

+	    'radio' => 'ExtrafieldRadio',

+	    'checkbox' => 'ExtrafieldCheckBox',

+	    'chkbxlst' => 'ExtrafieldCheckBoxFromList',

+	    'link' => 'ExtrafieldLink',

+	    'separate' => 'ExtrafieldSeparator',

@@ -99,0 +178 @@
+

@@ -105 +184 @@
-	 */

+	*/

@@ -111,0 +191,13 @@
+

+		// For old usage

+		$this->attribute_elementtype = array();

+		$this->attribute_type = array();

+		$this->attribute_label = array();

+		$this->attribute_size = array();

+		$this->attribute_computed = array();

+		$this->attribute_default = array();

+		$this->attribute_unique = array();

+		$this->attribute_required = array();

+		$this->attribute_perms = array();

+		$this->attribute_langfile = array();

+		$this->attribute_list = array();

@@ -119 +211 @@
-	 *  @param  string			$type               Type of attribute ('boolean','int','varchar','text','html','date','datetime','price', 'pricecy', 'phone','mail','password','url','select','checkbox','separate',...)

+	 *  @param  string			$type               Type of attribute ('boolean','int','varchar','text','html','date','datehour','price','phone','mail','password','url','select','checkbox','separate',...)

@@ -129 +221 @@
-	 *  @param	string			$list				Visibility ('0'=never visible, '1'=visible on list+forms, '2'=list only, '3'=form only or 'eval string')

+	 *  @param	string			$list				Visibilty ('0'=never visible, '1'=visible on list+forms, '2'=list only, '3'=form only or 'eval string')

@@ -136,3 +228,2 @@
-	 *  @param  int             $printable          Is extrafield displayed on PDF

-	 *  @param	array			$moreparams			More parameters. Example: array('css'=>, 'csslist'=>Css on list, 'cssview'=>...)

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

+     *  @param  int             $printable        Is extrafield displayed on PDF

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

@@ -140 +231 @@
-	public function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique = 0, $required = 0, $default_value = '', $param = '', $alwayseditable = 0, $perms = '', $list = '-1', $help = '', $computed = '', $entity = '', $langfile = '', $enabled = '1', $totalizable = 0, $printable = 0, $moreparams = array())

+	public function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique = 0, $required = 0, $default_value = '', $param = '', $alwayseditable = 0, $perms = '', $list = '-1', $help = '', $computed = '', $entity = '', $langfile = '', $enabled = '1', $totalizable = 0, $printable = 0)

@@ -142,19 +233,6 @@
-		if (empty($attrname)) {

-			return -1;

-		}

-		if (empty($label)) {

-			return -1;

-		}

-

-		$result = 0;

-

-		if ($type == 'separate') {

-			$unique = 0;

-			$required = 0;

-		}	// Force unique and not required if this is a separator field to avoid troubles.

-		if ($elementtype == 'thirdparty') {

-			$elementtype = 'societe';

-		}

-		if ($elementtype == 'contact') {

-			$elementtype = 'socpeople';

-		}

+		if (empty($attrname)) return -1;

+		if (empty($label)) return -1;

+

+		if ($type == 'separate') { $unique = 0; $required = 0; }	// Force unique and not required if this is a separator field to avoid troubles.

+		if ($elementtype == 'thirdparty') $elementtype = 'societe';

+		if ($elementtype == 'contact') $elementtype = 'socpeople';

@@ -163,2 +241,3 @@
-		if ($type != 'separate') {

-			$result = $this->create($attrname, $type, $size, $elementtype, $unique, $required, $default_value, $param, $perms, $list, $computed, $help, $moreparams);

+		if ($type != 'separate')

+		{

+			$result = $this->create($attrname, $type, $size, $elementtype, $unique, $required, $default_value, $param, $perms, $list, $computed, $help);

@@ -167 +246,2 @@
-		if ($result > 0 || $err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' || $type == 'separate') {

+		if ($result > 0 || $err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' || $type == 'separate')

+		{

@@ -169 +249 @@
-			$result2 = $this->create_label($attrname, $label, $type, $pos, $size, $elementtype, $unique, $required, $param, $alwayseditable, $perms, $list, $help, $default_value, $computed, $entity, $langfile, $enabled, $totalizable, $printable, $moreparams);

+			$result2 = $this->create_label($attrname, $label, $type, $pos, $size, $elementtype, $unique, $required, $param, $alwayseditable, $perms, $list, $help, $default_value, $computed, $entity, $langfile, $enabled, $totalizable, $printable);

@@ -171 +251,2 @@
-			if ($result2 > 0 || ($err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' && $err2 == 'DB_ERROR_RECORD_ALREADY_EXISTS')) {

+			if ($result2 > 0 || ($err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' && $err2 == 'DB_ERROR_RECORD_ALREADY_EXISTS'))

+			{

@@ -175,4 +256,5 @@
-			} else {

-				return -2;

-			}

-		} else {

+			}

+			else return -2;

+		}

+		else

+		{

@@ -188 +270 @@
-	 *  @param	string	$type				Type of attribute ('boolean', 'int', 'varchar', 'text', 'html', 'date', 'datetime', 'price', 'pricecy', 'phone', 'mail', 'password', 'url', 'select', 'checkbox', ...)

+	 *  @param	int		$type				Type of attribute ('boolean', 'int', 'varchar', 'text', 'html', 'date', 'datehour','price','phone','mail','password','url','select','checkbox', ...)

@@ -199,2 +281 @@
-	 *  @param	array	$moreparams			More parameters. Example: array('css'=>, 'csslist'=>, 'cssview'=>...)

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

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

@@ -202 +283 @@
-	private function create($attrname, $type = 'varchar', $length = '255', $elementtype = 'member', $unique = 0, $required = 0, $default_value = '', $param = array(), $perms = '', $list = '0', $computed = '', $help = '', $moreparams = array())

+	private function create($attrname, $type = 'varchar', $length = 255, $elementtype = 'member', $unique = 0, $required = 0, $default_value = '', $param = '', $perms = '', $list = '0', $computed = '', $help = '')

@@ -204,6 +285,2 @@
-		if ($elementtype == 'thirdparty') {

-			$elementtype = 'societe';

-		}

-		if ($elementtype == 'contact') {

-			$elementtype = 'socpeople';

-		}

+		if ($elementtype == 'thirdparty') $elementtype = 'societe';

+		if ($elementtype == 'contact') $elementtype = 'socpeople';

@@ -212,5 +289,4 @@
-		if ($elementtype == 'categorie') {

-			$table = 'categories_extrafields';

-		}

-

-		if (!empty($attrname) && preg_match("/^\w[a-zA-Z0-9_]*$/", $attrname) && !is_numeric($attrname)) {

+		if ($elementtype == 'categorie') $table = 'categories_extrafields';

+

+		if (!empty($attrname) && preg_match("/^\w[a-zA-Z0-9_]*$/", $attrname) && !is_numeric($attrname))

+		{

@@ -223,3 +298,0 @@
-			} elseif ($type == 'pricecy') {

-				$typedb = 'varchar';

-				$lengthdb = '64';

@@ -229 +302 @@
-			} elseif ($type == 'mail' || $type == 'ip' || $type == 'icon') {

+			} elseif ($type == 'mail') {

@@ -250,3 +323 @@
-				if ($type == 'varchar' && empty($lengthdb)) {

-					$lengthdb = '255';

-				}

+				if ($type == 'varchar' && empty($lengthdb)) $lengthdb = '255';

@@ -261,4 +332,6 @@
-			$result = $this->db->DDLAddField($this->db->prefix().$table, $attrname, $field_desc);

-			if ($result > 0) {

-				if ($unique) {

-					$sql = "ALTER TABLE ".$this->db->prefix().$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";

+			$result = $this->db->DDLAddField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);

+			if ($result > 0)

+			{

+				if ($unique)

+				{

+					$sql = "ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";

@@ -268 +341,3 @@
-			} else {

+			}

+			else

+			{

@@ -273 +348,3 @@
-		} else {

+		}

+		else

+		{

@@ -278 +355 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -284 +361 @@
-	 *  @param	string			$type			Type of attribute ('int', 'varchar', 'text', 'html', 'date', 'datehour', 'float')

+	 *  @param	int				$type			Type of attribute ('int', 'varchar', 'text', 'html', 'date', 'datehour', 'float')

@@ -301,4 +378,3 @@
-	 *  @param  int             $printable      Is extrafield displayed on PDF

-	 *  @param	array			$moreparams		More parameters. Example: array('css'=>, 'csslist'=>, 'cssview'=>...)

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

-	 *  @throws Exception

+     *  @param  int             $printable        Is extrafield displayed on PDF

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

+     *  @throws Exception

@@ -306 +382 @@
-	private function create_label($attrname, $label = '', $type = '', $pos = 0, $size = '', $elementtype = 'member', $unique = 0, $required = 0, $param = '', $alwayseditable = 0, $perms = '', $list = '-1', $help = '', $default = '', $computed = '', $entity = '', $langfile = '', $enabled = '1', $totalizable = 0, $printable = 0, $moreparams = array())

+	private function create_label($attrname, $label = '', $type = '', $pos = 0, $size = 0, $elementtype = 'member', $unique = 0, $required = 0, $param = '', $alwayseditable = 0, $perms = '', $list = '-1', $help = '', $default = '', $computed = '', $entity = '', $langfile = '', $enabled = '1', $totalizable = 0, $printable = 0)

@@ -308 +384 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -311,6 +387,2 @@
-		if ($elementtype == 'thirdparty') {

-			$elementtype = 'societe';

-		}

-		if ($elementtype == 'contact') {

-			$elementtype = 'socpeople';

-		}

+		if ($elementtype == 'thirdparty') $elementtype = 'societe';

+		if ($elementtype == 'contact') $elementtype = 'socpeople';

@@ -319,37 +391,12 @@
-		if (empty($pos)) {

-			$pos = 0;

-		}

-		if (empty($list)) {

-			$list = '0';

-		}

-		if (empty($required)) {

-			$required = 0;

-		}

-		if (empty($unique)) {

-			$unique = 0;

-		}

-		if (empty($printable)) {

-			$printable = 0;

-		}

-		if (empty($alwayseditable)) {

-			$alwayseditable = 0;

-		}

-		if (empty($totalizable)) {

-			$totalizable = 0;

-		}

-

-		$css = '';

-		if (!empty($moreparams) && !empty($moreparams['css'])) {

-			$css = $moreparams['css'];

-		}

-		$csslist = '';

-		if (!empty($moreparams) && !empty($moreparams['csslist'])) {

-			$csslist = $moreparams['csslist'];

-		}

-		$cssview = '';

-		if (!empty($moreparams) && !empty($moreparams['cssview'])) {

-			$cssview = $moreparams['cssview'];

-		}

-

-		if (!empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname) && !is_numeric($attrname)) {

-			if (is_array($param) && count($param) > 0) {

+		if (empty($pos)) $pos = 0;

+		if (empty($list)) $list = '0';

+		if (empty($required)) $required = 0;

+		if (empty($unique)) $unique = 0;

+		if (empty($printable)) $printable = 0;

+		if (empty($alwayseditable)) $alwayseditable = 0;

+		if (empty($totalizable)) $totalizable = 0;

+

+		if (!empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname) && !is_numeric($attrname))

+		{

+			if (is_array($param) && count($param) > 0)

+			{

@@ -357 +404,3 @@
-			} elseif (strlen($param) > 0) {

+			}

+			elseif (strlen($param) > 0)

+			{

@@ -359 +408,3 @@
-			} else {

+			}

+			else

+			{

@@ -363 +414 @@
-			$sql = "INSERT INTO ".$this->db->prefix()."extrafields(";

+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(";

@@ -386,4 +437 @@
-			$sql .= " totalizable,";

-			$sql .= " css,";

-			$sql .= " csslist,";

-			$sql .= " cssview";

+			$sql .= " totalizable";

@@ -391 +439 @@
-			$sql .= " VALUES('".$this->db->escape($attrname)."',";

+			$sql .= " VALUES('".$attrname."',";

@@ -394 +442 @@
-			$sql .= " ".((int) $pos).",";

+			$sql .= " ".$pos.",";

@@ -398,2 +446,2 @@
-			$sql .= " ".((int) $unique).",";

-			$sql .= " ".((int) $required).",";

+			$sql .= " ".$unique.",";

+			$sql .= " ".$required.",";

@@ -401 +449 @@
-			$sql .= " ".((int) $alwayseditable).",";

+			$sql .= " ".$alwayseditable.",";

@@ -413,4 +461 @@
-			$sql .= " ".($totalizable ? 'TRUE' : 'FALSE').",";

-			$sql .= " ".($css ? "'".$this->db->escape($css)."'" : "null").",";

-			$sql .= " ".($csslist ? "'".$this->db->escape($csslist)."'" : "null").",";

-			$sql .= " ".($cssview ? "'".$this->db->escape($cssview)."'" : "null");

+			$sql .= " ".($totalizable ? 'TRUE' : 'FALSE');

@@ -420 +465,2 @@
-			if ($this->db->query($sql)) {

+			if ($this->db->query($sql))

+			{

@@ -422 +468,3 @@
-			} else {

+			}

+			else

+			{

@@ -428 +475,0 @@
-		return -1;

@@ -436 +483 @@
-	 *  @return int              		Return integer < 0 if KO, 0 if nothing is done, 1 if OK

+	 *  @return int              		< 0 if KO, 0 if nothing is done, 1 if OK

@@ -440,6 +487,2 @@
-		if ($elementtype == 'thirdparty') {

-			$elementtype = 'societe';

-		}

-		if ($elementtype == 'contact') {

-			$elementtype = 'socpeople';

-		}

+		if ($elementtype == 'thirdparty') $elementtype = 'societe';

+		if ($elementtype == 'contact') $elementtype = 'socpeople';

@@ -448,3 +491 @@
-		if ($elementtype == 'categorie') {

-			$table = 'categories_extrafields';

-		}

+		if ($elementtype == 'categorie') $table = 'categories_extrafields';

@@ -454 +495,2 @@
-		if (!empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname)) {

+		if (!empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname))

+		{

@@ -456,2 +498,3 @@
-			if ($result < 0) {

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

+			if ($result < 0)

+			{

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

@@ -459,21 +502,25 @@
-				$error++;

-			}

-

-			if (!$error) {

-				$sql = "SELECT COUNT(rowid) as nb";

-				$sql .= " FROM ".$this->db->prefix()."extrafields";

-				$sql .= " WHERE elementtype = '".$this->db->escape($elementtype)."'";

-				$sql .= " AND name = '".$this->db->escape($attrname)."'";

-				//$sql.= " AND entity IN (0,".$conf->entity.")";      Do not test on entity here. We want to see if there is still on field remaning in other entities before deleting field in table

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

-				if ($resql) {

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

-					if ($obj->nb <= 0) {

-						$result = $this->db->DDLDropField($this->db->prefix().$table, $attrname); // This also drop the unique key

-						if ($result < 0) {

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

-							$this->errors[] = $this->db->lasterror();

-							$error++;

-						}

-					}

-				}

+			    $error++;

+			}

+

+			if (!$error)

+			{

+        		$sql = "SELECT COUNT(rowid) as nb";

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

+        		$sql .= " WHERE elementtype = '".$elementtype."'";

+        		$sql .= " AND name = '".$attrname."'";

+        		//$sql.= " AND entity IN (0,".$conf->entity.")";      Do not test on entity here. We want to see if there is still on field remaning in other entities before deleting field in table

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

+                if ($resql)

+                {

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

+                    if ($obj->nb <= 0)

+                    {

+            			$result = $this->db->DDLDropField(MAIN_DB_PREFIX.$table, $attrname); // This also drop the unique key

+            			if ($result < 0)

+            			{

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

+				            $this->errors[] = $this->db->lasterror();

+            				$error++;

+            			}

+                    }

+                }

@@ -483 +530,3 @@
-		} else {

+		}

+		else

+		{

@@ -488 +537 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -494 +543 @@
-	 *  @return int              			Return integer < 0 if KO, 0 if nothing is done, 1 if OK

+	 *  @return int              			< 0 if KO, 0 if nothing is done, 1 if OK

@@ -498 +547 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -501,10 +550,7 @@
-		if ($elementtype == 'thirdparty') {

-			$elementtype = 'societe';

-		}

-		if ($elementtype == 'contact') {

-			$elementtype = 'socpeople';

-		}

-

-		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname)) {

-			$sql = "DELETE FROM ".$this->db->prefix()."extrafields";

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

+		if ($elementtype == 'thirdparty') $elementtype = 'societe';

+		if ($elementtype == 'contact') $elementtype = 'socpeople';

+

+		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname))

+		{

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

+			$sql .= " WHERE name = '".$attrname."'";

@@ -512 +558 @@
-			$sql .= " AND elementtype = '".$this->db->escape($elementtype)."'";

+			$sql .= " AND elementtype = '".$elementtype."'";

@@ -516 +562,2 @@
-			if ($resql) {

+			if ($resql)

+			{

@@ -518 +565,3 @@
-			} else {

+			}

+			else

+			{

@@ -522 +571,3 @@
-		} else {

+		}

+		else

+		{

@@ -532 +583 @@
-	 *  @param	string	$type				Type of attribute ('boolean', 'int', 'varchar', 'text', 'html', 'date', 'datetime','price','phone','mail','password','url','select','checkbox', ...)

+	 *  @param	string	$type				Type of attribute ('boolean', 'int', 'varchar', 'text', 'html', 'date', 'datehour','price','phone','mail','password','url','select','checkbox', ...)

@@ -548,3 +599,2 @@
-	 *  @param  int     $totalizable        Is extrafield totalizable on list

-	 *  @param  int     $printable        	Is extrafield displayed on PDF

-	 *  @param	array	$moreparams			More parameters. Example: array('css'=>, 'csslist'=>, 'cssview'=>...)

+     *  @param  int     $totalizable        Is extrafield totalizable on list

+     *  @param  int     $printable        Is extrafield displayed on PDF

@@ -552 +602 @@
-	 *  @throws Exception

+     *  @throws Exception

@@ -554 +604 @@
-	public function update($attrname, $label, $type, $length, $elementtype, $unique = 0, $required = 0, $pos = 0, $param = array(), $alwayseditable = 0, $perms = '', $list = '', $help = '', $default = '', $computed = '', $entity = '', $langfile = '', $enabled = '1', $totalizable = 0, $printable = 0, $moreparams = array())

+	public function update($attrname, $label, $type, $length, $elementtype, $unique = 0, $required = 0, $pos = 0, $param = '', $alwayseditable = 0, $perms = '', $list = '', $help = '', $default = '', $computed = '', $entity = '', $langfile = '', $enabled = '1', $totalizable = 0, $printable = 0)

@@ -556,15 +606,8 @@
-		global $action, $hookmanager;

-

-		if ($elementtype == 'thirdparty') {

-			$elementtype = 'societe';

-		}

-		if ($elementtype == 'contact') {

-			$elementtype = 'socpeople';

-		}

-

-		$table = $elementtype.'_extrafields';

-		if ($elementtype == 'categorie') {

-			$table = 'categories_extrafields';

-		}

-

-		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname)) {

+		if ($elementtype == 'thirdparty') $elementtype = 'societe';

+		if ($elementtype == 'contact') $elementtype = 'socpeople';

+

+        $table = $elementtype.'_extrafields';

+		if ($elementtype == 'categorie') $table = 'categories_extrafields';

+

+		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname))

+		{

@@ -577,3 +619,0 @@
-			} elseif ($type == 'pricecy') {

-				$typedb = 'varchar';

-				$lengthdb = '64';

@@ -583 +623 @@
-			} elseif ($type == 'mail' || $type == 'ip' || $type == 'icon') {

+			} elseif ($type == 'mail') {

@@ -594 +633,0 @@
-				$lengthdb = $length;

@@ -600 +639 @@
-				$lengthdb = '128';

+				$lengthdb = '50';

@@ -607,19 +646,12 @@
-			if (is_object($hookmanager)) {

-				$hookmanager->initHooks(array('extrafieldsdao'));

-				$parameters = array('field_desc'=>&$field_desc, 'table'=>$table, 'attr_name'=>$attrname, 'label'=>$label, 'type'=>$type, 'length'=>$length, 'unique'=>$unique, 'required'=>$required, 'pos'=>$pos, 'param'=>$param, 'alwayseditable'=>$alwayseditable, 'perms'=>$perms, 'list'=>$list, 'help'=>$help, 'default'=>$default, 'computed'=>$computed, 'entity'=>$entity, 'langfile'=>$langfile, 'enabled'=>$enabled, 'totalizable'=>$totalizable, 'printable'=>$printable);

-				$reshook = $hookmanager->executeHooks('updateExtrafields', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks

-

-				if ($reshook < 0) {

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

-					return -1;

-				}

-			}

-

-			if ($type != 'separate') { // No table update when separate type

-				$result = $this->db->DDLUpdateField($this->db->prefix().$table, $attrname, $field_desc);

-			}

-			if ($result > 0 || $type == 'separate') {

-				if ($label) {

-					$result = $this->update_label($attrname, $label, $type, $length, $elementtype, $unique, $required, $pos, $param, $alwayseditable, $perms, $list, $help, $default, $computed, $entity, $langfile, $enabled, $totalizable, $printable, $moreparams);

-				}

-				if ($result > 0) {

+			if ($type != 'separate') // No table update when separate type

+			{

+				$result = $this->db->DDLUpdateField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);

+			}

+			if ($result > 0 || $type == 'separate')

+			{

+				if ($label)

+				{

+					$result = $this->update_label($attrname, $label, $type, $length, $elementtype, $unique, $required, $pos, $param, $alwayseditable, $perms, $list, $help, $default, $computed, $entity, $langfile, $enabled, $totalizable, $printable);

+				}

+				if ($result > 0)

+				{

@@ -627,4 +659,7 @@
-					if ($unique) {

-						$sql = "ALTER TABLE ".$this->db->prefix().$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";

-					} else {

-						$sql = "ALTER TABLE ".$this->db->prefix().$table." DROP INDEX IF EXISTS uk_".$table."_".$attrname;

+					if ($unique)

+					{

+						$sql = "ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";

+					}

+					else

+					{

+						$sql = "ALTER TABLE ".MAIN_DB_PREFIX.$table." DROP INDEX uk_".$table."_".$attrname;

@@ -634,4 +668,0 @@
-					/*if ($resql < 0) {

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

-						return -1;

-					}*/

@@ -639 +670,3 @@
-				} else {

+				}

+				else

+				{

@@ -643 +676,3 @@
-			} else {

+			}

+			else

+			{

@@ -647 +682,3 @@
-		} else {

+		}

+		else

+		{

@@ -652 +689 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -674,5 +711,4 @@
-	 *  @param  int     $totalizable        Is extrafield totalizable on list

-	 *  @param  int     $printable        	Is extrafield displayed on PDF

-	 *  @param	array	$moreparams			More parameters. Example: array('css'=>, 'csslist'=>, 'cssview'=>...)

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

-	 *  @throws Exception

+     *  @param  int     $totalizable        Is extrafield totalizable on list

+     *  @param  int     $printable        Is extrafield displayed on PDF

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

+     *  @throws Exception

@@ -680 +716 @@
-	private function update_label($attrname, $label, $type, $size, $elementtype, $unique = 0, $required = 0, $pos = 0, $param = array(), $alwayseditable = 0, $perms = '', $list = '0', $help = '', $default = '', $computed = '', $entity = '', $langfile = '', $enabled = '1', $totalizable = 0, $printable = 0, $moreparams = array())

+	private function update_label($attrname, $label, $type, $size, $elementtype, $unique = 0, $required = 0, $pos = 0, $param = '', $alwayseditable = 0, $perms = '', $list = '0', $help = '', $default = '', $computed = '', $entity = '', $langfile = '', $enabled = '1', $totalizable = 0, $printable = 0)

@@ -682 +718 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -687,40 +723,14 @@
-		if ($elementtype == 'thirdparty') {

-			$elementtype = 'societe';

-		}

-		if ($elementtype == 'contact') {

-			$elementtype = 'socpeople';

-		}

-

-		if (empty($pos)) {

-			$pos = 0;

-		}

-		if (empty($list)) {

-			$list = '0';

-		}

-		if (empty($totalizable)) {

-			$totalizable = 0;

-		}

-		if (empty($required)) {

-			$required = 0;

-		}

-		if (empty($unique)) {

-			$unique = 0;

-		}

-		if (empty($alwayseditable)) {

-			$alwayseditable = 0;

-		}

-

-		$css = '';

-		if (!empty($moreparams) && !empty($moreparams['css'])) {

-			$css = $moreparams['css'];

-		}

-		$csslist = '';

-		if (!empty($moreparams) && !empty($moreparams['csslist'])) {

-			$csslist = $moreparams['csslist'];

-		}

-		$cssview = '';

-		if (!empty($moreparams) && !empty($moreparams['cssview'])) {

-			$cssview = $moreparams['cssview'];

-		}

-

-		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname)) {

+		if ($elementtype == 'thirdparty') $elementtype = 'societe';

+		if ($elementtype == 'contact') $elementtype = 'socpeople';

+

+		if (empty($pos)) $pos = 0;

+		if (empty($list)) $list = '0';

+        if (empty($totalizable)) {

+            $totalizable = 0;

+        }

+		if (empty($required)) $required = 0;

+		if (empty($unique)) $unique = 0;

+		if (empty($alwayseditable)) $alwayseditable = 0;

+

+		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname))

+		{

@@ -729 +739,2 @@
-			if (is_array($param) && count($param) > 0) {

+			if (is_array($param) && count($param) > 0)

+			{

@@ -731 +742,7 @@
-			} elseif (is_array($param)) {

+			}

+			elseif (strlen($param) > 0)

+			{

+				$params = trim($param);

+			}

+			else

+			{

@@ -733,7 +750,4 @@
-			} elseif (strlen($param) > 0) {

-				$params = trim($param);

-			} else {

-				$params = '';

-			}

-

-			if ($entity === '' || $entity != '0') {

+			}

+

+			if ($entity === '' || $entity != '0')

+			{

@@ -741,2 +755,2 @@
-				$sql_del = "DELETE FROM ".$this->db->prefix()."extrafields";

-				$sql_del .= " WHERE name = '".$this->db->escape($attrname)."'";

+				$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";

+				$sql_del .= " WHERE name = '".$attrname."'";

@@ -744,2 +758,4 @@
-				$sql_del .= " AND elementtype = '".$this->db->escape($elementtype)."'";

-			} else {

+				$sql_del .= " AND elementtype = '".$elementtype."'";

+			}

+			else

+			{

@@ -747,2 +763,2 @@
-				$sql_del = "DELETE FROM ".$this->db->prefix()."extrafields";

-				$sql_del .= " WHERE name = '".$this->db->escape($attrname)."'";

+				$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";

+				$sql_del .= " WHERE name = '".$attrname."'";

@@ -750 +766 @@
-				$sql_del .= " AND elementtype = '".$this->db->escape($elementtype)."'";

+				$sql_del .= " AND elementtype = '".$elementtype."'";

@@ -754 +770 @@
-			$sql = "INSERT INTO ".$this->db->prefix()."extrafields(";

+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(";

@@ -770 +786 @@
-			$sql .= " totalizable,";

+            $sql .= " totalizable,";

@@ -777,4 +793 @@
-			$sql .= " help,";

-			$sql .= " css,";

-			$sql .= " csslist,";

-			$sql .= " cssview";

+			$sql .= " help";

@@ -782 +795 @@
-			$sql .= "'".$this->db->escape($attrname)."',";

+			$sql .= "'".$attrname."',";

@@ -797 +810 @@
-			$sql .= " ".($totalizable ? 'TRUE' : 'FALSE').",";

+            $sql .= " ".($totalizable ? 'TRUE' : 'FALSE').",";

@@ -804,4 +817 @@
-			$sql .= " ".($help ? "'".$this->db->escape($help)."'" : "null").",";

-			$sql .= " ".($css ? "'".$this->db->escape($css)."'" : "null").",";

-			$sql .= " ".($csslist ? "'".$this->db->escape($csslist)."'" : "null").",";

-			$sql .= " ".($cssview ? "'".$this->db->escape($cssview)."'" : "null");

+			$sql .= " ".($help ? "'".$this->db->escape($help)."'" : "null");

@@ -812 +822,2 @@
-			if ($resql1 && $resql2) {

+			if ($resql1 && $resql2)

+			{

@@ -815 +826,3 @@
-			} else {

+			}

+			else

+			{

@@ -820 +833,3 @@
-		} else {

+		}

+		else

+		{

@@ -826 +841 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -828 +843 @@
-	 * 	Load the array of extrafields defintion $this->attributes

+	 * 	Load array this->attributes, or old this->attribute_xxx like attribute_label, attribute_type, ...

@@ -830 +845 @@
-	 * 	@param	string		$elementtype		Type of element ('all' = all or $object->table_element like 'adherent', 'commande', 'thirdparty', 'facture', 'propal', 'product', ...).

+	 * 	@param	string		$elementtype		Type of element ('' = all, 'adherent', 'commande', 'thirdparty', 'facture', 'propal', 'product', ...).

@@ -836 +851 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -839,16 +854,5 @@
-		if (empty($elementtype)) {

-			return array();

-		}

-

-		if ($elementtype == 'thirdparty') {

-			$elementtype = 'societe';

-		}

-		if ($elementtype == 'contact') {

-			$elementtype = 'socpeople';

-		}

-		if ($elementtype == 'order_supplier') {

-			$elementtype = 'commande_fournisseur';

-		}

-

-		// Test cache $this->attributes[$elementtype]['loaded'] to see if we must do something

-		// TODO

+		if (empty($elementtype)) return array();

+

+		if ($elementtype == 'thirdparty')     $elementtype = 'societe';

+		if ($elementtype == 'contact')        $elementtype = 'socpeople';

+		if ($elementtype == 'order_supplier') $elementtype = 'commande_fournisseur';

@@ -859,3 +863,2 @@
-		$sql = "SELECT rowid, name, label, type, size, elementtype, fieldunique, fieldrequired, param, pos, alwayseditable, perms, langs, list, printable, totalizable, fielddefault, fieldcomputed, entity, enabled, help,";

-		$sql .= " css, cssview, csslist";

-		$sql .= " FROM ".$this->db->prefix()."extrafields";

+		$sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable,perms,langs,list,printable,totalizable,fielddefault,fieldcomputed,entity,enabled,help";

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

@@ -863,3 +866 @@
-		if ($elementtype && $elementtype != 'all') {

-			$sql .= " WHERE elementtype = '".$this->db->escape($elementtype)."'"; // Filed with object->table_element

-		}

+		if ($elementtype) $sql .= " WHERE elementtype = '".$elementtype."'"; // Filed with object->table_element

@@ -869,11 +870,15 @@
-		if ($resql) {

-			$count = 0;

-			if ($this->db->num_rows($resql)) {

-				while ($tab = $this->db->fetch_object($resql)) {

-					if ($tab->entity != 0 && $tab->entity != $conf->entity) {

-						// This field is not in current entity. We discard but before we save it into the array of mandatory fields if it is a mandatory field without default value

-						if ($tab->fieldrequired && is_null($tab->fielddefault)) {

-							$this->attributes[$tab->elementtype]['mandatoryfieldsofotherentities'][$tab->name] = $tab->type;

-						}

-						continue;

-					}

+		if ($resql)

+		{

+			if ($this->db->num_rows($resql))

+			{

+				while ($tab = $this->db->fetch_object($resql))

+				{

+				    if ($tab->entity != 0 && $tab->entity != $conf->entity)

+				    {

+				        // This field is not in current entity. We discard but before we save it into the array of mandatory fields if it is a mandatory field without default value

+				        if ($tab->fieldrequired && is_null($tab->fielddefault))

+				        {

+				            $this->attributes[$tab->elementtype]['mandatoryfieldsofotherentities'][$tab->name] = $tab->type;

+				        }

+				        continue;

+				    }

@@ -882 +887,2 @@
-					if ($tab->type != 'separate') {

+					if ($tab->type != 'separate')

+					{

@@ -885,0 +892,19 @@
+					// Old usage

+					$this->attribute_type[$tab->name] = $tab->type;

+					$this->attribute_label[$tab->name] = $tab->label;

+					$this->attribute_size[$tab->name] = $tab->size;

+					$this->attribute_elementtype[$tab->name] = $tab->elementtype;

+					$this->attribute_default[$tab->name] = $tab->fielddefault;

+					$this->attribute_computed[$tab->name] = $tab->fieldcomputed;

+					$this->attribute_unique[$tab->name] = $tab->fieldunique;

+					$this->attribute_required[$tab->name] = $tab->fieldrequired;

+					$this->attribute_param[$tab->name] = ($tab->param ? unserialize($tab->param) : '');

+					$this->attribute_pos[$tab->name] = $tab->pos;

+					$this->attribute_alwayseditable[$tab->name] = $tab->alwayseditable;

+					$this->attribute_perms[$tab->name] = (strlen($tab->perms) == 0 ? 1 : $tab->perms);

+					$this->attribute_langfile[$tab->name] = $tab->langs;

+					$this->attribute_list[$tab->name] = $tab->list;

+					$this->attribute_totalizable[$tab->name] = $tab->totalizable;

+					$this->attribute_entityid[$tab->name] = $tab->entity;

+

+					// New usage

@@ -894 +919 @@
-					$this->attributes[$tab->elementtype]['param'][$tab->name] = ($tab->param ? jsonOrUnserialize($tab->param) : '');

+					$this->attributes[$tab->elementtype]['param'][$tab->name] = ($tab->param ? unserialize($tab->param) : '');

@@ -897 +922 @@
-					$this->attributes[$tab->elementtype]['perms'][$tab->name] = ((is_null($tab->perms) || strlen($tab->perms) == 0) ? 1 : $tab->perms);

+					$this->attributes[$tab->elementtype]['perms'][$tab->name] = (strlen($tab->perms) == 0 ? 1 : $tab->perms);

@@ -901 +926 @@
-					$this->attributes[$tab->elementtype]['totalizable'][$tab->name] = ($tab->totalizable ? 1 : 0);

+                    $this->attributes[$tab->elementtype]['totalizable'][$tab->name] = ($tab->totalizable ? 1 : 0);

@@ -905,3 +929,0 @@
-					$this->attributes[$tab->elementtype]['css'][$tab->name] = $tab->css;

-					$this->attributes[$tab->elementtype]['cssview'][$tab->name] = $tab->cssview;

-					$this->attributes[$tab->elementtype]['csslist'][$tab->name] = $tab->csslist;

@@ -910,8 +932,6 @@
-					$count++;

-				}

-			}

-			if ($elementtype) {

-				$this->attributes[$elementtype]['loaded'] = 1; // Note: If nothing is found, we also set the key 'loaded' to 1.

-				$this->attributes[$elementtype]['count'] = $count;

-			}

-		} else {

+				}

+			}

+			if ($elementtype) $this->attributes[$elementtype]['loaded'] = 1; // If nothing found, we also save tag 'loaded'

+		}

+		else

+		{

@@ -930,9 +950,9 @@
-	 * @param  string        $key            		Key of attribute

-	 * @param  string|array  $value 			    Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value); for dates in filter mode, a range array('start'=><timestamp>, 'end'=><timestamp>) should be provided

-	 * @param  string        $moreparam      		To add more parameters on html input tag

-	 * @param  string        $keysuffix      		Prefix string to add after name and id of field (can be used to avoid duplicate names)

-	 * @param  string        $keyprefix      		Suffix string to add before name and id of field (can be used to avoid duplicate names)

-	 * @param  string        $morecss        		More css (to defined size of field. Old behaviour: may also be a numeric)

-	 * @param  int           $objectid       		Current object id

-	 * @param  string        $extrafieldsobjectkey	The key to use to store retreived data (commonly $object->table_element)

-	 * @param  int	         $mode                  1=Used for search filters

+	 * @param  string  $key            			Key of attribute

+	 * @param  string  $value          			Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value)

+	 * @param  string  $moreparam      			To add more parametes on html input tag

+	 * @param  string  $keysuffix      			Prefix string to add after name and id of field (can be used to avoid duplicate names)

+	 * @param  string  $keyprefix      			Suffix string to add before name and id of field (can be used to avoid duplicate names)

+	 * @param  string  $morecss        			More css (to defined size of field. Old behaviour: may also be a numeric)

+	 * @param  int     $objectid       			Current object id

+	 * @param  string  $extrafieldsobjectkey	If defined (for example $object->table_element), use the new method to get extrafields data

+	 * @param  string  $mode                    1=Used for search filters

@@ -945 +965,2 @@
-		if (!is_object($form)) {

+		if (!is_object($form))

+		{

@@ -952 +973,2 @@
-		if (!preg_match('/options_$/', $keyprefix)) {	// Because we work on extrafields, we add 'options_' to prefix if not already added

+		if (!preg_match('/options_$/', $keyprefix))	// Because we work on extrafields, we add 'options_' to prefix if not already added

+		{

@@ -956,36 +978,44 @@
-		if (empty($extrafieldsobjectkey)) {

-			dol_syslog(get_class($this).'::showInputField extrafieldsobjectkey required', LOG_ERR);

-			return 'BadValueForParamExtraFieldsObjectKey';

-		}

-

-		$label = $this->attributes[$extrafieldsobjectkey]['label'][$key];

-		$type = $this->attributes[$extrafieldsobjectkey]['type'][$key];

-		$size = $this->attributes[$extrafieldsobjectkey]['size'][$key];

-		$default = $this->attributes[$extrafieldsobjectkey]['default'][$key];

-		$computed = $this->attributes[$extrafieldsobjectkey]['computed'][$key];

-		$unique = $this->attributes[$extrafieldsobjectkey]['unique'][$key];

-		$required = $this->attributes[$extrafieldsobjectkey]['required'][$key];

-		$param = $this->attributes[$extrafieldsobjectkey]['param'][$key];

-		$perms = dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1, 1, '2');

-		$langfile = $this->attributes[$extrafieldsobjectkey]['langfile'][$key];

-		$list = dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1, 1, '2');

-		$totalizable = $this->attributes[$extrafieldsobjectkey]['totalizable'][$key];

-		$help = $this->attributes[$extrafieldsobjectkey]['help'][$key];

-		$hidden = (empty($list) ? 1 : 0); // If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)

-

-		//var_dump('key='.$key.' '.$value.' '.$moreparam.' '.$keysuffix.' '.$keyprefix.' '.$objectid.' '.$extrafieldsobjectkey.' '.$mode);

-		//var_dump('label='.$label.' type='.$type.' param='.var_export($param, 1));

-

-		if ($computed) {

-			if (!preg_match('/^search_/', $keyprefix)) {

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

-			} else {

-				return '';

-			}

-		}

-

-		//

-		// 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'

-		if (empty($morecss)) {

-			// Add automatic css

-			if ($type == 'date') {

+		if (!empty($extrafieldsobjectkey))

+		{

+			$label = $this->attributes[$extrafieldsobjectkey]['label'][$key];

+			$type = $this->attributes[$extrafieldsobjectkey]['type'][$key];

+			$size = $this->attributes[$extrafieldsobjectkey]['size'][$key];

+			$default = $this->attributes[$extrafieldsobjectkey]['default'][$key];

+			$computed = $this->attributes[$extrafieldsobjectkey]['computed'][$key];

+			$unique = $this->attributes[$extrafieldsobjectkey]['unique'][$key];

+			$required = $this->attributes[$extrafieldsobjectkey]['required'][$key];

+			$param = $this->attributes[$extrafieldsobjectkey]['param'][$key];

+			$perms = dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1);

+			$langfile = $this->attributes[$extrafieldsobjectkey]['langfile'][$key];

+			$list = dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);

+			$totalizable = $this->attributes[$extrafieldsobjectkey]['totalizable'][$key];

+			$help = $this->attributes[$extrafieldsobjectkey]['help'][$key];

+			$hidden = (empty($list) ? 1 : 0); // If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)

+		}

+		else	// Old usage

+		{

+			$label = $this->attribute_label[$key];

+			$type = $this->attribute_type[$key];

+			$size = $this->attribute_size[$key];

+			$elementtype = $this->attribute_elementtype[$key]; // Seems not used

+			$default = $this->attribute_default[$key];

+			$computed = $this->attribute_computed[$key];

+			$unique = $this->attribute_unique[$key];

+			$required = $this->attribute_required[$key];

+			$param = $this->attribute_param[$key];

+			$langfile = $this->attribute_langfile[$key];

+			$list = $this->attribute_list[$key];

+			$totalizable = $this->attribute_totalizable[$key];

+			$hidden = (empty($list) ? 1 : 0); // If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)

+		}

+

+		if ($computed)

+		{

+			if (!preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';

+			else return '';

+		}

+

+		if (empty($morecss))

+		{

+			if ($type == 'date')

+			{

@@ -993 +1023,3 @@
-			} elseif ($type == 'datetime' || $type == 'datetimegmt' || $type == 'link') {

+			}

+			elseif ($type == 'datetime' || $type == 'link')

+			{

@@ -995 +1027,3 @@
-			} elseif (in_array($type, array('int', 'integer', 'double', 'price'))) {

+			}

+			elseif (in_array($type, array('int', 'integer', 'double', 'price')))

+			{

@@ -997 +1031,3 @@
-			} elseif ($type == 'password') {

+			}

+			elseif ($type == 'password')

+			{

@@ -999 +1035,3 @@
-			} elseif ($type == 'url') {

+			}

+			elseif ($type == 'url')

+			{

@@ -1001 +1039,3 @@
-			} elseif ($type == 'boolean') {

+			}

+			elseif ($type == 'boolean')

+			{

@@ -1003,4 +1043,5 @@
-			} elseif ($type == 'radio') {

-				$morecss = 'width25';

-			} else {

-				if (empty($size) || round((float) $size) < 12) {

+			}

+			else

+			{

+				if (round($size) < 12)

+				{

@@ -1008 +1049,3 @@
-				} elseif (round((float) $size) <= 48) {

+				}

+				elseif (round($size) <= 48)

+				{

@@ -1010 +1053,3 @@
-				} else {

+				}

+				else

+				{

@@ -1014,7 +1059,4 @@
-			// If css forced in attribute, we use this one

-			if (!empty($this->attributes[$extrafieldsobjectkey]['css'][$key])) {

-				$morecss = $this->attributes[$extrafieldsobjectkey]['css'][$key];

-			}

-		}

-

-		if (in_array($type, array('date'))) {

+		}

+

+		if (in_array($type, array('date', 'datetime')))

+		{

@@ -1023 +1065,2 @@
-			$showtime = 0;

+

+			$showtime = in_array($type, array('datetime')) ? 1 : 0;

@@ -1026,45 +1069,7 @@
-			if (!$required && $value == '') {

-				$value = '-1';

-			}

-

-			if ($mode == 1) {

-				// search filter on a date extrafield shows two inputs to select a date range

-				$prefill = array(

-					'start' => isset($value['start']) ? $value['start'] : '',

-					'end'   => isset($value['end']) ? $value['end'] : ''

-				);

-				$out = '<div ' . ($moreparam ? $moreparam : '') . '><div class="nowrap">';

-				$out .= $form->selectDate($prefill['start'], $keyprefix.$key.$keysuffix.'_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));

-				$out .= '</div><div class="nowrap">';

-				$out .= $form->selectDate($prefill['end'], $keyprefix.$key.$keysuffix.'_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));

-				$out .= '</div></div>';

-			} else {

-				// TODO Must also support $moreparam

-				$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);

-			}

-		} elseif (in_array($type, array('datetime', 'datetimegmt'))) {

-			$tmp = explode(',', $size);

-			$newsize = $tmp[0];

-			$showtime = 1;

-

-			// Do not show current date when field not required (see selectDate() method)

-			if (!$required && $value == '') {

-				$value = '-1';

-			}

-

-			if ($mode == 1) {

-				// search filter on a date extrafield shows two inputs to select a date range

-				$prefill = array(

-					'start' => isset($value['start']) ? $value['start'] : '',

-					'end'   => isset($value['end']) ? $value['end'] : ''

-				);

-				$out = '<div ' . ($moreparam ? $moreparam : '') . '><div class="nowrap">';

-				$out .= $form->selectDate($prefill['start'], $keyprefix.$key.$keysuffix.'_start', 1, 1, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"), 'tzuserrel');

-				$out .= '</div><div class="nowrap">';

-				$out .= $form->selectDate($prefill['end'], $keyprefix.$key.$keysuffix.'_end', 1, 1, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"), 'tzuserrel');

-				$out .= '</div></div>';

-			} else {

-				// TODO Must also support $moreparam

-				$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1, '', '', '', 1, '', '', 'tzuserrel');

-			}

-		} elseif (in_array($type, array('int', 'integer'))) {

+			if (!$required && $value == '') $value = '-1';

+

+			// TODO Must also support $moreparam

+			$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);

+		}

+		elseif (in_array($type, array('int', 'integer')))

+		{

@@ -1074 +1079,3 @@
-		} elseif (preg_match('/varchar/', $type)) {

+		}

+		elseif (preg_match('/varchar/', $type))

+		{

@@ -1076 +1083,3 @@
-		} elseif (in_array($type, array('mail', 'ip', 'phone', 'url'))) {

+		}

+		elseif (in_array($type, array('mail', 'phone', 'url')))

+		{

@@ -1078,27 +1087,5 @@
-		} elseif ($type == 'icon') {

-			/* External lib inclusion are not allowed in backoffice. Also lib is included several time if there is several icon file.

-			Some code must be added into main when MAIN_ADD_ICONPICKER_JS is set to add of lib in html header

-			$out ='<link rel="stylesheet" href="'.dol_buildpath('/myfield/css/fontawesome-iconpicker.min.css', 1).'">';

-			$out.='<script src="'.dol_buildpath('/myfield/js/fontawesome-iconpicker.min.js', 1).'"></script>';

-			*/

-			$out.= '<input type="text" class="form-control icp icp-auto iconpicker-element iconpicker-input flat '.$morecss.' maxwidthonsmartphone"';

-			$out.= ' name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';

-			if (getDolGlobalInt('MAIN_ADD_ICONPICKER_JS')) {

-				$out.='<script>';

-				$options="{ title: '<b>".$langs->trans("IconFieldSelector")."</b>', placement: 'right', showFooter: false, templates: {";

-				$options.="iconpicker: '<div class=\"iconpicker\"><div style=\"background-color:#EFEFEF;\" class=\"iconpicker-items\"></div></div>',";

-				$options.="iconpickerItem: '<a role=\"button\" href=\"#\" class=\"iconpicker-item\" style=\"background-color:#DDDDDD;\"><i></i></a>',";

-				// $options.="buttons: '<button style=\"background-color:#FFFFFF;\" class=\"iconpicker-btn iconpicker-btn-cancel btn btn-default btn-sm\">".$langs->trans("Cancel")."</button>";

-				// $options.="<button style=\"background-color:#FFFFFF;\" class=\"iconpicker-btn iconpicker-btn-accept btn btn-primary btn-sm\">".$langs->trans("Save")."</button>',";

-				$options.="footer: '<div class=\"popover-footer\" style=\"background-color:#EFEFEF;\"></div>',";

-				$options.="search: '<input type=\"search\" class\"form-control iconpicker-search\" placeholder=\"".$langs->trans("TypeToFilter")."\" />',";

-				$options.="popover: '<div class=\"iconpicker-popover popover\">";

-				$options.="   <div class=\"arrow\" ></div>";

-				$options.="   <div class=\"popover-title\" style=\"text-align:center;background-color:#EFEFEF;\"></div>";

-				$options.="   <div class=\"popover-content \" ></div>";

-				$options.="</div>'}}";

-				$out.="$('#".$keyprefix.$key.$keysuffix."').iconpicker(".$options.");";

-				$out.='</script>';

-			}

-		} elseif ($type == 'text') {

-			if (!preg_match('/search_/', $keyprefix)) {		// If keyprefix is search_ or search_options_, we must just use a simple text field

+		}

+		elseif ($type == 'text')

+		{

+			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field

+			{

@@ -1108 +1095,3 @@
-			} else {

+			}

+			else

+			{

@@ -1111,2 +1100,5 @@
-		} elseif ($type == 'html') {

-			if (!preg_match('/search_/', $keyprefix)) {		// If keyprefix is search_ or search_options_, we must just use a simple text field

+		}

+		elseif ($type == 'html')

+		{

+			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field

+			{

@@ -1114 +1106 @@
-				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, isModEnabled('fckeditor') && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');

+				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');

@@ -1116 +1108,3 @@
-			} else {

+			}

+			else

+			{

@@ -1119,2 +1113,5 @@
-		} elseif ($type == 'boolean') {

-			if (empty($mode)) {

+		}

+		elseif ($type == 'boolean')

+		{

+			if (empty($mode))

+			{

@@ -1127,7 +1124,9 @@
-

-				$out = '<input type="checkbox" class="flat valignmiddle'.($morecss ? ' '.$morecss : '').' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam ? $moreparam : '').'>';

-			} else {

-				$out = $form->selectyesno($keyprefix.$key.$keysuffix, $value, 1, false, 1);

-			}

-			$out .= '<input type="hidden" name="'.$keyprefix.$key.$keysuffix.'_boolean" value="1">';	// A hidden field ending with "_boolean" that is always set to 1.

-		} elseif ($type == 'price') {

+				$out = '<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam ? $moreparam : '').'>';

+			}

+			else

+			{

+				$out .= $form->selectyesno($keyprefix.$key.$keysuffix, $value, 1, false, 1);

+			}

+		}

+		elseif ($type == 'price')

+		{

@@ -1138,11 +1137,3 @@
-		} elseif ($type == 'pricecy') {

-			$currency = $conf->currency;

-			if (!empty($value)) {

-				// $value in memory is a php string like '10.01:USD'

-				$pricetmp = explode(':', $value);

-				$currency = !empty($pricetmp[1]) ? $pricetmp[1] : $conf->currency;

-				$value = price($pricetmp[0]);

-			}

-			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> ';

-			$out .= $form->selectCurrency($currency, $keyprefix.$key.$keysuffix.'currency_id');

-		} elseif ($type == 'double') {

+		}

+		elseif ($type == 'double')

+		{

@@ -1153 +1144,3 @@
-		} elseif ($type == 'select') {

+		}

+		elseif ($type == 'select')

+		{

@@ -1155,56 +1148,2 @@
-			if ($mode) {

-				$options = array();

-				foreach ($param['options'] as $okey => $val) {

-					if ((string) $okey == '') {

-						continue;

-					}

-

-					$valarray = explode('|', $val);

-					$val = $valarray[0];

-

-					if ($langfile && $val) {

-						$options[$okey] = $langs->trans($val);

-					} else {

-						$options[$okey] = $val;

-					}

-				}

-				$selected = array();

-				if (!is_array($value)) {

-					$selected = explode(',', $value);

-				}

-

-				$out .= $form->multiselectarray($keyprefix.$key.$keysuffix, $options, $selected, 0, 0, $morecss, 0, 0, '', '', '', !empty($conf->use_javascript_ajax) && !getDolGlobalString('MAIN_EXTRAFIELDS_DISABLE_SELECT2'));

-			} else {

-				if (!empty($conf->use_javascript_ajax) && !getDolGlobalString('MAIN_EXTRAFIELDS_DISABLE_SELECT2')) {

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

-					$out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);

-				}

-

-				$out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';

-				$out .= '<option value="0">&nbsp;</option>';

-				foreach ($param['options'] as $key2 => $val2) {

-					if ((string) $key2 == '') {

-						continue;

-					}

-					$valarray = explode('|', $val2);

-					$val2 = $valarray[0];

-					$parent = '';

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

-						$parent = $valarray[1];

-					}

-					$out .= '<option value="'.$key2.'"';

-					$out .= (((string) $value == (string) $key2) ? ' selected' : '');

-					$out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');

-					$out .= '>';

-					if ($langfile && $val2) {

-						$out .= $langs->trans($val2);

-					} else {

-						$out .= $val2;

-					}

-					$out .= '</option>';

-				}

-				$out .= '</select>';

-			}

-		} elseif ($type == 'sellist') {

-			$out = '';

-			if (!empty($conf->use_javascript_ajax) && !getDolGlobalString('MAIN_EXTRAFIELDS_DISABLE_SELECT2')) {

+			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))

+			{

@@ -1215,0 +1155,201 @@
+			$out .= '<option value="0">&nbsp;</option>';

+			foreach ($param['options'] as $key => $val)

+			{

+				if ((string) $key == '') continue;

+				list($val, $parent) = explode('|', $val);

+				$out .= '<option value="'.$key.'"';

+				$out .= (((string) $value == (string) $key) ? ' selected' : '');

+				$out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');

+				$out .= '>';

+				if ($langfile && $val) $out .= $langs->trans($val);

+				else $out .= $val;

+				$out .= '</option>';

+			}

+			$out .= '</select>';

+		}

+		elseif ($type == 'sellist')

+		{

+			$out = '';

+			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))

+			{

+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

+				$out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);

+			}

+

+			$out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';

+			if (is_array($param['options']))

+			{

+				$param_list = array_keys($param['options']);

+				$InfoFieldList = explode(":", $param_list[0]);

+				$parentName = '';

+				$parentField = '';

+				// 0 : tableName

+				// 1 : label field name

+				// 2 : key fields name (if differ of rowid)

+				// 3 : key field parent (for dependent lists)

+				// 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value

+                // 5 : id category type

+                // 6 : ids categories list separated by comma for category root

+				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');

+

+

+				if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4]))

+				{

+					if (strpos($InfoFieldList[4], 'extra.') !== false)

+					{

+						$keyList = 'main.'.$InfoFieldList[2].' as rowid';

+					} else {

+						$keyList = $InfoFieldList[2].' as rowid';

+					}

+				}

+				if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3]))

+				{

+					list($parentName, $parentField) = explode('|', $InfoFieldList[3]);

+					$keyList .= ', '.$parentField;

+				}

+

+                $filter_categorie = false;

+                if (count($InfoFieldList) > 5) {

+                    if ($InfoFieldList[0] == 'categorie') {

+                        $filter_categorie = true;

+                    }

+                }

+

+                if ($filter_categorie === false) {

+                    $fields_label = explode('|', $InfoFieldList[1]);

+                    if (is_array($fields_label)) {

+                        $keyList .= ', ';

+                        $keyList .= implode(', ', $fields_label);

+                    }

+

+                    $sqlwhere = '';

+                    $sql = 'SELECT '.$keyList;

+                    $sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];

+                    if (!empty($InfoFieldList[4])) {

+                        // can use curent entity filter

+                        if (strpos($InfoFieldList[4], '$ENTITY$') !== false) {

+                            $InfoFieldList[4] = str_replace('$ENTITY$', $conf->entity, $InfoFieldList[4]);

+                        }

+                        // can use SELECT request

+                        if (strpos($InfoFieldList[4], '$SEL$') !== false) {

+                            $InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);

+                        }

+

+                        // current object id can be use into filter

+                        if (strpos($InfoFieldList[4], '$ID$') !== false && !empty($objectid)) {

+                            $InfoFieldList[4] = str_replace('$ID$', $objectid, $InfoFieldList[4]);

+                        } else {

+                            $InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);

+                        }

+                        //We have to join on extrafield table

+                        if (strpos($InfoFieldList[4], 'extra') !== false) {

+                            $sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';

+                            $sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];

+                        } else {

+                            $sqlwhere .= ' WHERE '.$InfoFieldList[4];

+                        }

+                    } else {

+                        $sqlwhere .= ' WHERE 1=1';

+                    }

+                    // Some tables may have field, some other not. For the moment we disable it.

+                    if (in_array($InfoFieldList[0], array('tablewithentity'))) {

+                        $sqlwhere .= ' AND entity = '.$conf->entity;

+                    }

+                    $sql .= $sqlwhere;

+                    //print $sql;

+

+                    $sql .= ' ORDER BY '.implode(', ', $fields_label);

+

+                    dol_syslog(get_class($this).'::showInputField type=sellist', LOG_DEBUG);

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

+                    if ($resql) {

+                        $out .= '<option value="0">&nbsp;</option>';

+                        $num = $this->db->num_rows($resql);

+                        $i = 0;

+                        while ($i < $num) {

+                            $labeltoshow = '';

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

+

+                            // Several field into label (eq table:code|libelle:rowid)

+                            $notrans = false;

+                            $fields_label = explode('|', $InfoFieldList[1]);

+                            if (is_array($fields_label) && count($fields_label) > 1) {

+                                $notrans = true;

+                                foreach ($fields_label as $field_toshow) {

+                                    $labeltoshow .= $obj->$field_toshow.' ';

+                                }

+                            } else {

+                                $labeltoshow = $obj->{$InfoFieldList[1]};

+                            }

+                            $labeltoshow = dol_trunc($labeltoshow, 45);

+

+                            if ($value == $obj->rowid) {

+                            	if (!$notrans) {

+	                                foreach ($fields_label as $field_toshow) {

+	                                    $translabel = $langs->trans($obj->$field_toshow);

+	                                    $labeltoshow = dol_trunc($translabel, 18).' ';

+	                                }

+                            	}

+                                $out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';

+                            } else {

+                                if (!$notrans) {

+                                    $translabel = $langs->trans($obj->{$InfoFieldList[1]});

+                                    $labeltoshow = dol_trunc($translabel, 18);

+                                }

+                                if (empty($labeltoshow)) $labeltoshow = '(not defined)';

+

+                                if (!empty($InfoFieldList[3]) && $parentField) {

+                                    $parent = $parentName.':'.$obj->{$parentField};

+                                }

+

+                                $out .= '<option value="'.$obj->rowid.'"';

+                                $out .= ($value == $obj->rowid ? ' selected' : '');

+                                $out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');

+                                $out .= '>'.$labeltoshow.'</option>';

+                            }

+

+                            $i++;

+                        }

+                        $this->db->free($resql);

+                    } else {

+                        print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';

+                    }

+                } else {

+					require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';

+                    $data = $form->select_all_categories(Categorie::$MAP_ID_TO_CODE[$InfoFieldList[5]], '', 'parent', 64, $InfoFieldList[6], 1, 1);

+                    $out .= '<option value="0">&nbsp;</option>';

+                    foreach ($data as $data_key => $data_value) {

+                        $out .= '<option value="'.$data_key.'"';

+                        $out .= ($value == $data_key ? ' selected' : '');

+                        $out .= '>'.$data_value.'</option>';

+                    }

+                }

+			}

+			$out .= '</select>';

+		}

+		elseif ($type == 'checkbox')

+		{

+			$value_arr = explode(',', $value);

+			$out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ?null:$param['options']), $value_arr, '', 0, '', 0, '100%');

+		}

+		elseif ($type == 'radio')

+		{

+			$out = '';

+			foreach ($param['options'] as $keyopt => $val)

+			{

+				$out .= '<input class="flat '.$morecss.'" type="radio" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '');

+				$out .= ' value="'.$keyopt.'"';

+				$out .= ' id="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'"';

+				$out .= ($value == $keyopt ? 'checked' : '');

+				$out .= '/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';

+			}

+		}

+		elseif ($type == 'chkbxlst')

+		{

+			if (is_array($value)) {

+				$value_arr = $value;

+			}

+			else {

+				$value_arr = explode(',', $value);

+			}

+

@@ -1226,3 +1366,2 @@
-				// 5 : id category type

-				// 6 : ids categories list separated by comma for category root

-				// 7 : sort by (to be close to common object)

+                // 5 : id category type

+                // 6 : ids categories list separated by comma for category root

@@ -1231 +1370,4 @@
-

+				if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3])) {

+					list ($parentName, $parentField) = explode('|', $InfoFieldList[3]);

+					$keyList .= ', '.$parentField;

+				}

@@ -1239,114 +1381,164 @@
-				if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3])) {

-					list($parentName, $parentField) = explode('|', $InfoFieldList[3]);

-					$keyList .= ', '.$parentField;

-				}

-

-				$filter_categorie = false;

-				if (count($InfoFieldList) > 5) {

-					if ($InfoFieldList[0] == 'categorie') {

-						$filter_categorie = true;

-					}

-				}

-

-				if ($filter_categorie === false) {

-					$fields_label = explode('|', $InfoFieldList[1]);

-					if (is_array($fields_label)) {

-						$keyList .= ', ';

-						$keyList .= implode(', ', $fields_label);

-					}

-

-					$sqlwhere = '';

-					$sql = "SELECT ".$keyList;

-					$sql .= ' FROM '.$this->db->prefix().$InfoFieldList[0];

-					if (!empty($InfoFieldList[4])) {

-						// can use current entity filter

-						if (strpos($InfoFieldList[4], '$ENTITY$') !== false) {

-							$InfoFieldList[4] = str_replace('$ENTITY$', $conf->entity, $InfoFieldList[4]);

-						}

-						// can use SELECT request

-						if (strpos($InfoFieldList[4], '$SEL$') !== false) {

-							$InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);

-						}

-

-						// current object id can be use into filter

-						if (strpos($InfoFieldList[4], '$ID$') !== false && !empty($objectid)) {

-							$InfoFieldList[4] = str_replace('$ID$', $objectid, $InfoFieldList[4]);

-						} else {

-							$InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);

-						}

-						//We have to join on extrafield table

-						if (strpos($InfoFieldList[4], 'extra.') !== false) {

-							$sql .= ' as main, '.$this->db->prefix().$InfoFieldList[0].'_extrafields as extra';

-							$sqlwhere .= " WHERE extra.fk_object=main.".$InfoFieldList[2]." AND ".$InfoFieldList[4];

-						} else {

-							$sqlwhere .= " WHERE ".$InfoFieldList[4];

-						}

-					} else {

-						$sqlwhere .= ' WHERE 1=1';

-					}

-					// Some tables may have field, some other not. For the moment we disable it.

-					if (in_array($InfoFieldList[0], array('tablewithentity'))) {

-						$sqlwhere .= ' AND entity = '.((int) $conf->entity);

-					}

-					$sql .= $sqlwhere;

-					//print $sql;

-

-					$sql .= ' ORDER BY '.implode(', ', $fields_label);

-

-					dol_syslog(get_class($this).'::showInputField type=sellist', LOG_DEBUG);

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

-					if ($resql) {

-						$out .= '<option value="0">&nbsp;</option>';

-						$num = $this->db->num_rows($resql);

-						$i = 0;

-						while ($i < $num) {

-							$labeltoshow = '';

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

-

-							// Several field into label (eq table:code|label:rowid)

-							$notrans = false;

-							$fields_label = explode('|', $InfoFieldList[1]);

-							if (is_array($fields_label) && count($fields_label) > 1) {

-								$notrans = true;

-								foreach ($fields_label as $field_toshow) {

-									$labeltoshow .= $obj->$field_toshow.' ';

-								}

-							} else {

-								$labeltoshow = $obj->{$InfoFieldList[1]};

-							}

-							$labeltoshow = $labeltoshow;

-

-							if ($value == $obj->rowid) {

-								if (!$notrans) {

-									foreach ($fields_label as $field_toshow) {

-										$translabel = $langs->trans($obj->$field_toshow);

-										$labeltoshow = $translabel.' ';

-									}

-								}

-								$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';

-							} else {

-								if (!$notrans) {

-									$translabel = $langs->trans($obj->{$InfoFieldList[1]});

-									$labeltoshow = $translabel;

-								}

-								if (empty($labeltoshow)) {

-									$labeltoshow = '(not defined)';

-								}

-

-								if (!empty($InfoFieldList[3]) && $parentField) {

-									$parent = $parentName.':'.$obj->{$parentField};

-								}

-

-								$out .= '<option value="'.$obj->rowid.'"';

-								$out .= ($value == $obj->rowid ? ' selected' : '');

-								$out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');

-								$out .= '>'.$labeltoshow.'</option>';

-							}

-

-							$i++;

-						}

-						$this->db->free($resql);

-					} else {

-						print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';

-					}

-				} else {

+

+                $filter_categorie = false;

+                if (count($InfoFieldList) > 5) {

+                    if ($InfoFieldList[0] == 'categorie') {

+                        $filter_categorie = true;

+                    }

+                }

+

+                if ($filter_categorie === false) {

+                    $fields_label = explode('|', $InfoFieldList[1]);

+                    if (is_array($fields_label)) {

+                        $keyList .= ', ';

+                        $keyList .= implode(', ', $fields_label);

+                    }

+

+                    $sqlwhere = '';

+                    $sql = 'SELECT '.$keyList;

+                    $sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];

+                    if (!empty($InfoFieldList[4])) {

+                        // can use SELECT request

+                        if (strpos($InfoFieldList[4], '$SEL$') !== false) {

+                            $InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);

+                        }

+

+                        // current object id can be use into filter

+                        if (strpos($InfoFieldList[4], '$ID$') !== false && !empty($objectid)) {

+                            $InfoFieldList[4] = str_replace('$ID$', $objectid, $InfoFieldList[4]);

+                        } elseif (preg_match("#^.*list.php$#", $_SERVER["PHP_SELF"])) {

+                            // Pattern for word=$ID$

+                            $word = '\b[a-zA-Z0-9-\.-_]+\b=\$ID\$';

+

+                            // Removing space arount =, ( and )

+                            $InfoFieldList[4] = preg_replace('# *(=|\(|\)) *#', '$1', $InfoFieldList[4]);

+

+                            $nbPreg = 1;

+                            // While we have parenthesis

+                            while ($nbPreg != 0) {

+                                // Init des compteurs

+                                $nbPregRepl = $nbPregSel = 0;

+                                // On retire toutes les parenthèses sans = avant

+                                $InfoFieldList[4] = preg_replace('#([^=])(\([^)^(]*('.$word.')[^)^(]*\))#', '$1 $3 ', $InfoFieldList[4], -1, $nbPregRepl);

+                                // On retire les espaces autour des = et parenthèses

+                                $InfoFieldList[4] = preg_replace('# *(=|\(|\)) *#', '$1', $InfoFieldList[4]);

+                                // On retire toutes les parenthèses avec = avant

+                                $InfoFieldList[4] = preg_replace('#\b[a-zA-Z0-9-\.-_]+\b=\([^)^(]*('.$word.')[^)^(]*\)#', '$1 ', $InfoFieldList[4], -1, $nbPregSel);

+                                // On retire les espaces autour des = et parenthèses

+                                $InfoFieldList[4] = preg_replace('# *(=|\(|\)) *#', '$1', $InfoFieldList[4]);

+

+                                // Calcul du compteur général pour la boucle

+                                $nbPreg = $nbPregRepl + $nbPregSel;

+                            }

+

+                            // Si l'on a un AND ou un OR, avant ou après

+                            preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#', $InfoFieldList[4], $matchCondition);

+                            while (!empty($matchCondition[0])) {

+                                // If the two sides differ but are not empty

+                                if (!empty($matchCondition[1]) && !empty($matchCondition[3]) && $matchCondition[1] != $matchCondition[3]) {

+                                    // Nobody sain would do that without parentheses

+                                    $InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);

+                                } else {

+                                    if (!empty($matchCondition[1])) {

+                                        $boolCond = (($matchCondition[1] == "AND") ? ' AND TRUE ' : ' OR FALSE ');

+                                        $InfoFieldList[4] = str_replace($matchCondition[0], $boolCond.$matchCondition[3], $InfoFieldList[4]);

+                                    } elseif (!empty($matchCondition[3])) {

+                                        $boolCond = (($matchCondition[3] == "AND") ? ' TRUE AND ' : ' FALSE OR');

+                                        $InfoFieldList[4] = str_replace($matchCondition[0], $boolCond, $InfoFieldList[4]);

+                                    } else {

+                                        $InfoFieldList[4] = " TRUE ";

+                                    }

+                                }

+

+                                // Si l'on a un AND ou un OR, avant ou après

+                                preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#', $InfoFieldList[4], $matchCondition);

+                            }

+                        } else {

+                            $InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);

+                        }

+

+                        // We have to join on extrafield table

+                        if (strpos($InfoFieldList[4], 'extra.') !== false) {

+                            $sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';

+                            $sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];

+                        } else {

+                            $sqlwhere .= ' WHERE '.$InfoFieldList[4];

+                        }

+                    } else {

+                        $sqlwhere .= ' WHERE 1=1';

+                    }

+                    // Some tables may have field, some other not. For the moment we disable it.

+                    if (in_array($InfoFieldList[0], array('tablewithentity'))) {

+                        $sqlwhere .= ' AND entity = '.$conf->entity;

+                    }

+                    // $sql.=preg_replace('/^ AND /','',$sqlwhere);

+                    // print $sql;

+

+                    $sql .= $sqlwhere;

+                    dol_syslog(get_class($this).'::showInputField type=chkbxlst', LOG_DEBUG);

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

+                    if ($resql) {

+                        $num = $this->db->num_rows($resql);

+                        $i = 0;

+

+                        $data = array();

+

+                        while ($i < $num) {

+                            $labeltoshow = '';

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

+

+                            $notrans = false;

+                            // Several field into label (eq table:code|libelle:rowid)

+                            $fields_label = explode('|', $InfoFieldList[1]);

+                            if (is_array($fields_label)) {

+                                $notrans = true;

+                                foreach ($fields_label as $field_toshow) {

+                                    $labeltoshow .= $obj->$field_toshow.' ';

+                                }

+                            } else {

+                                $labeltoshow = $obj->{$InfoFieldList[1]};

+                            }

+                            $labeltoshow = dol_trunc($labeltoshow, 45);

+

+                            if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {

+                                foreach ($fields_label as $field_toshow) {

+                                    $translabel = $langs->trans($obj->$field_toshow);

+                                    if ($translabel != $obj->$field_toshow) {

+                                        $labeltoshow = dol_trunc($translabel, 18).' ';

+                                    } else {

+                                        $labeltoshow = dol_trunc($obj->$field_toshow, 18).' ';

+                                    }

+                                }

+

+                                $data[$obj->rowid] = $labeltoshow;

+                            } else {

+                                if (!$notrans) {

+                                    $translabel = $langs->trans($obj->{$InfoFieldList[1]});

+                                    if ($translabel != $obj->{$InfoFieldList[1]}) {

+                                        $labeltoshow = dol_trunc($translabel, 18);

+                                    } else {

+                                        $labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);

+                                    }

+                                }

+                                if (empty($labeltoshow))

+                                    $labeltoshow = '(not defined)';

+

+                                if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {

+                                    $data[$obj->rowid] = $labeltoshow;

+                                }

+

+                                if (!empty($InfoFieldList[3]) && $parentField) {

+                                    $parent = $parentName.':'.$obj->{$parentField};

+                                }

+

+                                $data[$obj->rowid] = $labeltoshow;

+                            }

+

+                            $i++;

+                        }

+                        $this->db->free($resql);

+

+                        $out = $form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');

+                    } else {

+                        print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';

+                    }

+                } else {

@@ -1354,243 +1546,8 @@
-					$data = $form->select_all_categories(Categorie::$MAP_ID_TO_CODE[$InfoFieldList[5]], '', 'parent', 64, $InfoFieldList[6], 1, 1);

-					$out .= '<option value="0">&nbsp;</option>';

-					if (is_array($data)) {

-						foreach ($data as $data_key => $data_value) {

-							$out .= '<option value="'.$data_key.'"';

-							$out .= ($value == $data_key ? ' selected' : '');

-							$out .= '>'.$data_value.'</option>';

-						}

-					}

-				}

-			}

-			$out .= '</select>';

-		} elseif ($type == 'checkbox') {

-			$value_arr = $value;

-			if (!is_array($value)) {

-				$value_arr = explode(',', $value);

-			}

-			$out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ? null : $param['options']), $value_arr, '', 0, '', 0, '100%');

-		} elseif ($type == 'radio') {

-			$out = '';

-			foreach ($param['options'] as $keyopt => $val) {

-				$out .= '<input class="flat '.$morecss.'" type="radio" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '');

-				$out .= ' value="'.$keyopt.'"';

-				$out .= ' id="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'"';

-				$out .= ($value == $keyopt ? 'checked' : '');

-				$out .= '/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$langs->trans($val).'</label><br>';

-			}

-		} elseif ($type == 'chkbxlst') {

-			if (is_array($value)) {

-				$value_arr = $value;

-			} else {

-				$value_arr = explode(',', $value);

-			}

-

-			if (is_array($param['options'])) {

-				$param_list = array_keys($param['options']);

-				$InfoFieldList = explode(":", $param_list[0]);

-				$parentName = '';

-				$parentField = '';

-				// 0 : tableName

-				// 1 : label field name

-				// 2 : key fields name (if differ of rowid)

-				// 3 : key field parent (for dependent lists)

-				// 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value

-				// 5 : id category type

-				// 6 : ids categories list separated by comma for category root

-				// 7 : sort by (to be close to common object)

-				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');

-

-				if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3])) {

-					list($parentName, $parentField) = explode('|', $InfoFieldList[3]);

-					$keyList .= ', '.$parentField;

-				}

-				if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4])) {

-					if (strpos($InfoFieldList[4], 'extra.') !== false) {

-						$keyList = 'main.'.$InfoFieldList[2].' as rowid';

-					} else {

-						$keyList = $InfoFieldList[2].' as rowid';

-					}

-				}

-

-				$filter_categorie = false;

-				if (count($InfoFieldList) > 5) {

-					if ($InfoFieldList[0] == 'categorie') {

-						$filter_categorie = true;

-					}

-				}

-

-				if ($filter_categorie === false) {

-					$fields_label = explode('|', $InfoFieldList[1]);

-					if (is_array($fields_label)) {

-						$keyList .= ', ';

-						$keyList .= implode(', ', $fields_label);

-					}

-

-					$sqlwhere = '';

-					$sql = "SELECT ".$keyList;

-					$sql .= ' FROM '.$this->db->prefix().$InfoFieldList[0];

-					if (!empty($InfoFieldList[4])) {

-						// can use current entity filter

-						if (strpos($InfoFieldList[4], '$ENTITY$') !== false) {

-							$InfoFieldList[4] = str_replace('$ENTITY$', $conf->entity, $InfoFieldList[4]);

-						}

-						// can use SELECT request

-						if (strpos($InfoFieldList[4], '$SEL$') !== false) {

-							$InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);

-						}

-

-						// current object id can be use into filter

-						if (strpos($InfoFieldList[4], '$ID$') !== false && !empty($objectid)) {

-							$InfoFieldList[4] = str_replace('$ID$', $objectid, $InfoFieldList[4]);

-						} elseif (preg_match("#^.*list.php$#", $_SERVER["PHP_SELF"])) {

-							// Pattern for word=$ID$

-							$word = '\b[a-zA-Z0-9-\.-_]+\b=\$ID\$';

-

-							// Removing space arount =, ( and )

-							$InfoFieldList[4] = preg_replace('# *(=|\(|\)) *#', '$1', $InfoFieldList[4]);

-

-							$nbPreg = 1;

-							// While we have parenthesis

-							while ($nbPreg != 0) {

-								// Init des compteurs

-								$nbPregRepl = $nbPregSel = 0;

-								// On retire toutes les parenthèses sans = avant

-								$InfoFieldList[4] = preg_replace('#([^=])(\([^)^(]*('.$word.')[^)^(]*\))#', '$1 $3 ', $InfoFieldList[4], -1, $nbPregRepl);

-								// On retire les espaces autour des = et parenthèses

-								$InfoFieldList[4] = preg_replace('# *(=|\(|\)) *#', '$1', $InfoFieldList[4]);

-								// On retire toutes les parenthèses avec = avant

-								$InfoFieldList[4] = preg_replace('#\b[a-zA-Z0-9-\.-_]+\b=\([^)^(]*('.$word.')[^)^(]*\)#', '$1 ', $InfoFieldList[4], -1, $nbPregSel);

-								// On retire les espaces autour des = et parenthèses

-								$InfoFieldList[4] = preg_replace('# *(=|\(|\)) *#', '$1', $InfoFieldList[4]);

-

-								// Calcul du compteur général pour la boucle

-								$nbPreg = $nbPregRepl + $nbPregSel;

-							}

-

-							// Si l'on a un AND ou un OR, avant ou après

-							$matchCondition = array();

-							preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#', $InfoFieldList[4], $matchCondition);

-							while (!empty($matchCondition[0])) {

-								// If the two sides differ but are not empty

-								if (!empty($matchCondition[1]) && !empty($matchCondition[3]) && $matchCondition[1] != $matchCondition[3]) {

-									// Nobody sain would do that without parentheses

-									$InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);

-								} else {

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

-										$boolCond = (($matchCondition[1] == "AND") ? ' AND TRUE ' : ' OR FALSE ');

-										$InfoFieldList[4] = str_replace($matchCondition[0], $boolCond.$matchCondition[3], $InfoFieldList[4]);

-									} elseif (!empty($matchCondition[3])) {

-										$boolCond = (($matchCondition[3] == "AND") ? ' TRUE AND ' : ' FALSE OR');

-										$InfoFieldList[4] = str_replace($matchCondition[0], $boolCond, $InfoFieldList[4]);

-									} else {

-										$InfoFieldList[4] = " TRUE ";

-									}

-								}

-

-								// Si l'on a un AND ou un OR, avant ou après

-								preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#', $InfoFieldList[4], $matchCondition);

-							}

-						} else {

-							$InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);

-						}

-

-						// We have to join on extrafield table

-						if (strpos($InfoFieldList[4], 'extra.') !== false) {

-							$sql .= ' as main, '.$this->db->prefix().$InfoFieldList[0].'_extrafields as extra';

-							$sqlwhere .= " WHERE extra.fk_object=main.".$InfoFieldList[2]." AND ".$InfoFieldList[4];

-						} else {

-							$sqlwhere .= " WHERE ".$InfoFieldList[4];

-						}

-					} else {

-						$sqlwhere .= ' WHERE 1=1';

-					}

-					// Some tables may have field, some other not. For the moment we disable it.

-					if (in_array($InfoFieldList[0], array('tablewithentity'))) {

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

-					}

-					// $sql.=preg_replace('/^ AND /','',$sqlwhere);

-					// print $sql;

-

-					$sql .= $sqlwhere;

-					dol_syslog(get_class($this).'::showInputField type=chkbxlst', LOG_DEBUG);

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

-					if ($resql) {

-						$num = $this->db->num_rows($resql);

-						$i = 0;

-

-						$data = array();

-

-						while ($i < $num) {

-							$labeltoshow = '';

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

-

-							$notrans = false;

-							// Several field into label (eq table:code|label:rowid)

-							$fields_label = explode('|', $InfoFieldList[1]);

-							if (is_array($fields_label)) {

-								$notrans = true;

-								foreach ($fields_label as $field_toshow) {

-									$labeltoshow .= $obj->$field_toshow.' ';

-								}

-							} else {

-								$labeltoshow = $obj->{$InfoFieldList[1]};

-							}

-							$labeltoshow = dol_trunc($labeltoshow, 45);

-

-							if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {

-								$labeltoshow = '';

-								foreach ($fields_label as $field_toshow) {

-									$translabel = $langs->trans($obj->$field_toshow);

-									if ($translabel != $obj->$field_toshow) {

-										$labeltoshow .= ' '.dol_trunc($translabel, 18).' ';

-									} else {

-										$labeltoshow .= ' '.dol_trunc($obj->$field_toshow, 18).' ';

-									}

-								}

-								$data[$obj->rowid] = $labeltoshow;

-							} else {

-								if (!$notrans) {

-									$translabel = $langs->trans($obj->{$InfoFieldList[1]});

-									if ($translabel != $obj->{$InfoFieldList[1]}) {

-										$labeltoshow = dol_trunc($translabel, 18);

-									} else {

-										$labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);

-									}

-								}

-								if (empty($labeltoshow)) {

-									$labeltoshow = '(not defined)';

-								}

-

-								if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {

-									$data[$obj->rowid] = $labeltoshow;

-								}

-

-								if (!empty($InfoFieldList[3]) && $parentField) {

-									$parent = $parentName.':'.$obj->{$parentField};

-								}

-

-								$data[$obj->rowid] = $labeltoshow;

-							}

-

-							$i++;

-						}

-						$this->db->free($resql);

-

-						$out = $form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');

-					} else {

-						print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';

-					}

-				} else {

-					require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';

-					$data = $form->select_all_categories(Categorie::$MAP_ID_TO_CODE[$InfoFieldList[5]], '', 'parent', 64, $InfoFieldList[6], 1, 1);

-					$out = $form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');

-				}

-			}

-		} elseif ($type == 'link') {

-			$param_list = array_keys($param['options']); // $param_list[0] = 'ObjectName:classPath' but can also be 'ObjectName:classPath:1:(status:=:1)'

-			/* Removed.

-			The selectForForms is called with parameter $objectfield defined, so the app can retrieve the filter inside the ajax component instead of being provided as parameters. The

-			filter was used to pass SQL requests leading to serious SQL injection problem. This should not be possible. Also the call of the ajax was broken by some WAF.

-			if (strpos($param_list[0], '$ID$') !== false && !empty($objectid)) {

-				$param_list[0] = str_replace('$ID$', $objectid, $param_list[0]);

-			}*/

+                    $data = $form->select_all_categories(Categorie::$MAP_ID_TO_CODE[$InfoFieldList[5]], '', 'parent', 64, $InfoFieldList[6], 1, 1);

+                    $out = $form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');

+                }

+			}

+		}

+		elseif ($type == 'link')

+		{

+			$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'

@@ -1598,16 +1555,4 @@
-

-			$tmparray = explode(':', $param_list[0]);

-

-			$element = $extrafieldsobjectkey;		// $extrafieldsobjectkey comes from $object->table_element but we need $object->element

-			if ($element == 'socpeople') {

-				$element = 'contact';

-			} elseif ( $element == 'projet' ) {

-				$element = 'project';

-			}

-

-			//$objectdesc = $param_list[0];				// Example: 'ObjectName:classPath:1:(status:=:1)'	Replaced by next line: this was propagated also a filter by ajax call that was blocked by some WAF

-			$objectdesc = $tmparray[0];					// Example: 'ObjectName:classPath'					To not propagate any filter (selectForForms do ajax call and propagating SQL filter is blocked by some WAF). Also we should use the one into the definition in the ->fields of $elem if found.

-			$objectfield = $element.':options_'.$key;	// Example: 'actioncomm:options_fff'				To be used in priority to know object linked with all its definition (including filters)

-

-			$out = $form->selectForForms($objectdesc, $keyprefix.$key.$keysuffix, $value, $showempty, '', '', $morecss, '', 0, 0, '', $objectfield);

-		} elseif ($type == 'password') {

+			$out = $form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', $morecss);

+		}

+		elseif ($type == 'password')

+		{

@@ -1625 +1570 @@
-		/*if (!empty($help) && $keyprefix != 'search_options_') {

+		/*if (! empty($help) && $keyprefix != 'search_options_') {

@@ -1638,2 +1583 @@
-	 * @param	string	$extrafieldsobjectkey	Required (for example $object->table_element).

-	 * @param 	Translate $outputlangs 			Output language

+	 * @param	string	$extrafieldsobjectkey	If defined (for example $object->table_element), function uses the new method to get extrafields data

@@ -1642 +1586 @@
-	public function showOutputField($key, $value, $moreparam = '', $extrafieldsobjectkey = '', $outputlangs = null)

+	public function showOutputField($key, $value, $moreparam = '', $extrafieldsobjectkey = '')

@@ -1646,26 +1590,35 @@
-		if (is_null($outputlangs) || !is_object($outputlangs)) {

-			$outputlangs = $langs;

-		}

-

-		if (empty($extrafieldsobjectkey)) {

-			dol_syslog(get_class($this).'::showOutputField extrafieldsobjectkey required', LOG_ERR);

-			return 'BadValueForParamExtraFieldsObjectKey';

-		}

-

-		$label = $this->attributes[$extrafieldsobjectkey]['label'][$key];

-		$type = $this->attributes[$extrafieldsobjectkey]['type'][$key];

-		$size = $this->attributes[$extrafieldsobjectkey]['size'][$key];			// Can be '255', '24,8'...

-		$default = $this->attributes[$extrafieldsobjectkey]['default'][$key];

-		$computed = $this->attributes[$extrafieldsobjectkey]['computed'][$key];

-		$unique = $this->attributes[$extrafieldsobjectkey]['unique'][$key];

-		$required = $this->attributes[$extrafieldsobjectkey]['required'][$key];

-		$param = $this->attributes[$extrafieldsobjectkey]['param'][$key];

-		$perms = dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1, 1, '2');

-		$langfile = $this->attributes[$extrafieldsobjectkey]['langfile'][$key];

-		$list = dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1, 1, '2');

-		$help = $this->attributes[$extrafieldsobjectkey]['help'][$key];

-		$hidden = (empty($list) ? 1 : 0); // If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)

-

-		if ($hidden) {

-			return ''; // This is a protection. If field is hidden, we should just not call this method.

-		}

+		if (!empty($extrafieldsobjectkey))

+		{

+			$label = $this->attributes[$extrafieldsobjectkey]['label'][$key];

+			$type = $this->attributes[$extrafieldsobjectkey]['type'][$key];

+			$size = $this->attributes[$extrafieldsobjectkey]['size'][$key];

+			$default = $this->attributes[$extrafieldsobjectkey]['default'][$key];

+			$computed = $this->attributes[$extrafieldsobjectkey]['computed'][$key];

+			$unique = $this->attributes[$extrafieldsobjectkey]['unique'][$key];

+			$required = $this->attributes[$extrafieldsobjectkey]['required'][$key];

+			$param = $this->attributes[$extrafieldsobjectkey]['param'][$key];

+			$perms = dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1);

+			$langfile = $this->attributes[$extrafieldsobjectkey]['langfile'][$key];

+			$list = dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);

+			$help = $this->attributes[$extrafieldsobjectkey]['help'][$key];

+			$hidden = (empty($list) ? 1 : 0); // If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)

+		}

+		else	// Old usage

+		{

+			//dol_syslog("Warning: parameter 'extrafieldsobjectkey' is missing", LOG_WARNING);

+			$label = $this->attribute_label[$key];

+			$type = $this->attribute_type[$key];

+			$size = $this->attribute_size[$key];

+			$default = $this->attribute_default[$key];

+			$computed = $this->attribute_computed[$key];

+			$unique = $this->attribute_unique[$key];

+			$required = $this->attribute_required[$key];

+			$param = $this->attribute_param[$key];

+			$perms = dol_eval($this->attribute_perms[$key], 1);

+			$langfile = $this->attribute_langfile[$key];

+			$list = dol_eval($this->attribute_list[$key], 1);

+			$help = ''; // Not supported with old syntax

+			$hidden = (empty($list) ? 1 : 0); // If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)

+		}

+

+		if ($hidden) return ''; // This is a protection. If field is hidden, we should just not call this method.

@@ -1676 +1629,2 @@
-		if ($type == 'date') {

+		if ($type == 'date')

+		{

@@ -1678,4 +1632,4 @@
-			if ($value !== '') {

-				$value = dol_print_date($value, 'day');	// For date without hour, date is always GMT for storage and output

-			}

-		} elseif ($type == 'datetime') {

+			$value = dol_print_date($value, 'day');

+		}

+		elseif ($type == 'datetime')

+		{

@@ -1683,9 +1637,4 @@
-			if ($value !== '') {

-				$value = dol_print_date($value, 'dayhour', 'tzuserrel');

-			}

-		} elseif ($type == 'datetimegmt') {

-			$showsize = 19;

-			if ($value !== '') {

-				$value = dol_print_date($value, 'dayhour', 'gmt');

-			}

-		} elseif ($type == 'int') {

+			$value = dol_print_date($value, 'dayhour');

+		}

+		elseif ($type == 'int')

+		{

@@ -1693 +1642,3 @@
-		} elseif ($type == 'double') {

+		}

+		elseif ($type == 'double')

+		{

@@ -1697,4 +1648,6 @@
-				$number_decimals = array_key_exists(1, $sizeparts) ? $sizeparts[1] : 0;

-				$value = price($value, 0, $outputlangs, 0, 0, $number_decimals, '');

-			}

-		} elseif ($type == 'boolean') {

+				$number_decimals = $sizeparts[1];

+				$value = price($value, 0, $langs, 0, 0, $number_decimals, '');

+			}

+		}

+		elseif ($type == 'boolean')

+		{

@@ -1706 +1659,3 @@
-		} elseif ($type == 'mail') {

+		}

+		elseif ($type == 'mail')

+		{

@@ -1708,5 +1663,3 @@
-		} elseif ($type == 'ip') {

-			$value = dol_print_ip($value, 0);

-		} elseif ($type == 'icon') {

-			$value = '<span class="'.$value.'"></span>';

-		} elseif ($type == 'url') {

+		}

+		elseif ($type == 'url')

+		{

@@ -1714 +1667,3 @@
-		} elseif ($type == 'phone') {

+		}

+		elseif ($type == 'phone')

+		{

@@ -1716 +1671,3 @@
-		} elseif ($type == 'price') {

+		}

+		elseif ($type == 'price')

+		{

@@ -1718,17 +1675,7 @@
-			if ($value || $value == '0') {

-				$value = price($value, 0, $outputlangs, 0, $conf->global->MAIN_MAX_DECIMALS_TOT, -1).' '.$outputlangs->getCurrencySymbol($conf->currency);

-			}

-		} elseif ($type == 'pricecy') {

-			$currency = $conf->currency;

-			if (!empty($value)) {

-				// $value in memory is a php string like '0.01:EUR'

-				$pricetmp = explode(':', $value);

-				$currency = !empty($pricetmp[1]) ? $pricetmp[1] : $conf->currency;

-				$value = $pricetmp[0];

-			}

-			if ($value || $value == '0') {

-				$value = price($value, 0, $outputlangs, 0, $conf->global->MAIN_MAX_DECIMALS_TOT, -1, $currency);

-			}

-		} elseif ($type == 'select') {

-			$valstr = (!empty($param['options'][$value]) ? $param['options'][$value] : '');

-			if (($pos = strpos($valstr, "|")) !== false) {

+			if ($value || $value == '0') $value = price($value, 0, $langs, 0, 0, -1);

+		}

+		elseif ($type == 'select')

+		{

+			$valstr = $param['options'][$value];

+			if (($pos = strpos($valstr, "|")) !== false)

+			{

@@ -1737,6 +1684,5 @@
-			if ($langfile && $valstr) {

-				$value = $outputlangs->trans($valstr);

-			} else {

-				$value = $valstr;

-			}

-		} elseif ($type == 'sellist') {

+			if ($langfile && $valstr) $value = $langs->trans($valstr);

+			else $value = $valstr;

+		}

+		elseif ($type == 'sellist')

+		{

@@ -1749 +1695,2 @@
-			if (count($InfoFieldList) >= 3) {

+			if (count($InfoFieldList) >= 3)

+			{

@@ -1760,10 +1707,4 @@
-			$filter_categorie = false;

-			if (count($InfoFieldList) > 5) {

-				if ($InfoFieldList[0] == 'categorie') {

-					$filter_categorie = true;

-				}

-			}

-

-			$sql = "SELECT ".$keyList;

-			$sql .= ' FROM '.$this->db->prefix().$InfoFieldList[0];

-			if (!empty($InfoFieldList[4]) && strpos($InfoFieldList[4], 'extra.') !== false) {

+			$sql = 'SELECT '.$keyList;

+			$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];

+			if (strpos($InfoFieldList[4], 'extra') !== false)

+			{

@@ -1773 +1714 @@
-				$sql .= " WHERE ".$selectkey." = 0";

+				$sql .= " WHERE ".$selectkey."=0";

@@ -1775 +1716 @@
-				$sql .= " WHERE ".$selectkey." = ".((int) $value);

+				$sql .= " WHERE ".$selectkey."=".$this->db->escape($value);

@@ -1777 +1718 @@
-				$sql .= " WHERE ".$selectkey." = '".$this->db->escape($value)."'";

+				$sql .= " WHERE ".$selectkey."='".$this->db->escape($value)."'";

@@ -1784,21 +1725,16 @@
-			if ($resql) {

-				if ($filter_categorie === false) {

-					$value = ''; // value was used, so now we reste it to use it to build final output

-

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

-

-					// Several field into label (eq table:code|label:rowid)

-					$fields_label = explode('|', $InfoFieldList[1]);

-

-					if (is_array($fields_label) && count($fields_label) > 1) {

-						foreach ($fields_label as $field_toshow) {

-							$translabel = '';

-							if (!empty($obj->$field_toshow)) {

-								$translabel = $outputlangs->trans($obj->$field_toshow);

-

-								if ($translabel != $obj->$field_toshow) {

-									$value .= dol_trunc($translabel, 24) . ' ';

-								} else {

-									$value .= $obj->$field_toshow . ' ';

-								}

-							}

+			if ($resql)

+			{

+				$value = ''; // value was used, so now we reste it to use it to build final output

+

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

+

+				// Several field into label (eq table:code|libelle:rowid)

+				$fields_label = explode('|', $InfoFieldList[1]);

+

+				if (is_array($fields_label) && count($fields_label) > 1)

+				{

+					foreach ($fields_label as $field_toshow)

+					{

+						$translabel = '';

+						if (!empty($obj->$field_toshow)) {

+							$translabel = $langs->trans($obj->$field_toshow);

@@ -1806,9 +1742,2 @@
-					} else {

-						$translabel = '';

-						$tmppropname = $InfoFieldList[1];

-						//$obj->$tmppropname = '';

-						if (!empty(isset($obj->$tmppropname) ? $obj->$tmppropname : '')) {

-							$translabel = $outputlangs->trans($obj->$tmppropname);

-						}

-						if ($translabel != (isset($obj->$tmppropname) ? $obj->$tmppropname : '')) {

-							$value = dol_trunc($translabel, 18);

+						if ($translabel != $field_toshow) {

+							$value .= dol_trunc($translabel, 18).' ';

@@ -1816 +1745 @@
-							$value = isset($obj->$tmppropname) ? $obj->$tmppropname : '';

+							$value .= $obj->$field_toshow.' ';

@@ -1819,13 +1748,6 @@
-				} else {

-					$toprint = array();

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

-					if ($obj->rowid) {

-						require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';

-						$c = new Categorie($this->db);

-						$result = $c->fetch($obj->rowid);

-						if ($result > 0) {

-							$ways = $c->print_all_ways(); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formatted text

-							foreach ($ways as $way) {

-								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"' . ($c->color ? ' style="background: #' . $c->color . ';"' : ' style="background: #bbb"') . '>' . img_object('', 'category') . ' ' . $way . '</li>';

-							}

-						}

+				}

+				else

+				{

+					$translabel = '';

+					if (!empty($obj->{$InfoFieldList[1]})) {

+						$translabel = $langs->trans($obj->{$InfoFieldList[1]});

@@ -1833,13 +1755,15 @@
-					$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';

-				}

-			} else {

-				dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);

-			}

-		} elseif ($type == 'radio') {

-			if (!isset($param['options'][$value])) {

-				$outputlangs->load('errors');

-				$value = $outputlangs->trans('ErrorNoValueForRadioType');

-			} else {

-				$value = $outputlangs->trans($param['options'][$value]);

-			}

-		} elseif ($type == 'checkbox') {

+					if ($translabel != $obj->{$InfoFieldList[1]}) {

+						$value = dol_trunc($translabel, 18);

+					} else {

+						$value = $obj->{$InfoFieldList[1]};

+					}

+				}

+			}

+			else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);

+		}

+		elseif ($type == 'radio')

+		{

+			$value = $param['options'][$value];

+		}

+		elseif ($type == 'checkbox')

+		{

@@ -1849,5 +1773,4 @@
-			if (is_array($value_arr)) {

-				foreach ($value_arr as $keyval => $valueval) {

-					if (!empty($valueval)) {

-						$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">'.$param['options'][$valueval].'</li>';

-					}

+			if (is_array($value_arr))

+			{

+				foreach ($value_arr as $keyval=>$valueval) {

+					$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$param['options'][$valueval].'</li>';

@@ -1857 +1780,3 @@
-		} elseif ($type == 'chkbxlst') {

+		}

+		elseif ($type == 'chkbxlst')

+		{

@@ -1877,10 +1802,3 @@
-			$filter_categorie = false;

-			if (count($InfoFieldList) > 5) {

-				if ($InfoFieldList[0] == 'categorie') {

-					$filter_categorie = true;

-				}

-			}

-

-			$sql = "SELECT ".$keyList;

-			$sql .= " FROM ".$this->db->prefix().$InfoFieldList[0];

-			if (strpos($InfoFieldList[4], 'extra.') !== false) {

+			$sql = 'SELECT '.$keyList;

+			$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];

+			if (strpos($InfoFieldList[4], 'extra') !== false) {

@@ -1895,19 +1813,11 @@
-				if ($filter_categorie === false) {

-					$value = ''; // value was used, so now we reste it to use it to build final output

-					$toprint = array();

-					while ($obj = $this->db->fetch_object($resql)) {

-						// Several field into label (eq table:code|label:rowid)

-						$fields_label = explode('|', $InfoFieldList[1]);

-						if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {

-							if (is_array($fields_label) && count($fields_label) > 1) {

-								$label = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">';

-								foreach ($fields_label as $field_toshow) {

-									$translabel = '';

-									if (!empty($obj->$field_toshow)) {

-										$translabel = $outputlangs->trans($obj->$field_toshow);

-									}

-									if ($translabel != $field_toshow) {

-										$label .= ' '.dol_trunc($translabel, 18);

-									} else {

-										$label .= ' '.$obj->$field_toshow;

-									}

+				$value = ''; // value was used, so now we reste it to use it to build final output

+				$toprint = array();

+				while ($obj = $this->db->fetch_object($resql)) {

+					// Several field into label (eq table:code|libelle:rowid)

+					$fields_label = explode('|', $InfoFieldList[1]);

+					if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {

+						if (is_array($fields_label) && count($fields_label) > 1) {

+							foreach ($fields_label as $field_toshow) {

+								$translabel = '';

+								if (!empty($obj->$field_toshow)) {

+									$translabel = $langs->trans($obj->$field_toshow);

@@ -1915,2 +1825,13 @@
-								$label .= '</li>';

-								$toprint[] = $label;

+								if ($translabel != $field_toshow) {

+									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';

+								} else {

+									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->$field_toshow.'</li>';

+								}

+							}

+						} else {

+							$translabel = '';

+							if (!empty($obj->{$InfoFieldList[1]})) {

+								$translabel = $langs->trans($obj->{$InfoFieldList[1]});

+							}

+							if ($translabel != $obj->{$InfoFieldList[1]}) {

+								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';

@@ -1918,9 +1839 @@
-								$translabel = '';

-								if (!empty($obj->{$InfoFieldList[1]})) {

-									$translabel = $outputlangs->trans($obj->{$InfoFieldList[1]});

-								}

-								if ($translabel != $obj->{$InfoFieldList[1]}) {

-									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">'.dol_trunc($translabel, 18).'</li>';

-								} else {

-									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">'.$obj->{$InfoFieldList[1]}.'</li>';

-								}

+								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->{$InfoFieldList[1]}.'</li>';

@@ -1930,18 +1843,2 @@
-				} else {

-					require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';

-

-					$toprint = array();

-					while ($obj = $this->db->fetch_object($resql)) {

-						if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {

-							$c = new Categorie($this->db);

-							$c->fetch($obj->rowid);

-							$ways = $c->print_all_ways(); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formatted text

-							foreach ($ways as $way) {

-								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"'.($c->color ? ' style="background: #'.$c->color.';"' : ' style="background: #bbb"').'>'.img_object('', 'category').' '.$way.'</li>';

-							}

-						}

-					}

-				}

-				if (!empty($toprint)) {

-					$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';

-				}

+				}

+				$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';

@@ -1951 +1848,3 @@
-		} elseif ($type == 'link') {

+		}

+		elseif ($type == 'link')

+		{

@@ -1955 +1854,2 @@
-			if ($value) {		// If we have -1 here, pb is into insert, not into ouptut (fix insert instead of changing code here to compensate)

+			if ($value)		// If we have -1 here, pb is into insert, not into ouptut (fix insert instead of changing code here to compensate)

+			{

@@ -1961 +1861,2 @@
-				if (!empty($classpath)) {

+				if (!empty($classpath))

+				{

@@ -1963 +1864,2 @@
-					if ($classname && class_exists($classname)) {

+					if ($classname && class_exists($classname))

+					{

@@ -1968 +1870,3 @@
-				} else {

+				}

+				else

+				{

@@ -1973 +1877,3 @@
-		} elseif ($type == 'text') {

+		}

+		elseif ($type == 'text')

+		{

@@ -1975 +1881,3 @@
-		} elseif ($type == 'html') {

+		}

+		elseif ($type == 'html')

+		{

@@ -1977 +1885,3 @@
-		} elseif ($type == 'password') {

+		}

+		elseif ($type == 'password')

+		{

@@ -1979,5 +1889,5 @@
-		} else {

-			$showsize = round((float) $size);

-			if ($showsize > 48) {

-				$showsize = 48;

-			}

+		}

+		else

+		{

+			$showsize = round($size);

+			if ($showsize > 48) $showsize = 48;

@@ -1993 +1903 @@
-	 * Return the CSS to use for this extrafield into list

+	 * Return tag to describe alignement to use for this extrafield

@@ -2003,24 +1913,43 @@
-		$type = 'varchar';

-		if (!empty($extrafieldsobjectkey)) {

-			$type = $this->attributes[$extrafieldsobjectkey]['type'][$key];

-		}

-

-		$cssstring = '';

-

-		if (in_array($type, array('date', 'datetime', 'datetimegmt',))) {

-			$cssstring = "center";

-		} elseif (in_array($type, array('int', 'price', 'double'))) {

-			$cssstring = "right";

-		} elseif (in_array($type, array('boolean', 'radio', 'checkbox', 'ip', 'icon'))) {

-			$cssstring = "center";

-		}

-

-		if (!empty($this->attributes[$extrafieldsobjectkey]['csslist'][$key])) {

-			$cssstring .= ($cssstring ? ' ' : '').$this->attributes[$extrafieldsobjectkey]['csslist'][$key];

-		} else {

-			if (in_array($type, array('ip'))) {

-				$cssstring .= ($cssstring ? ' ' : '').'tdoverflowmax150';

-			}

-		}

-

-		return $cssstring;

+		if (!empty($extrafieldsobjectkey)) $type = $this->attributes[$extrafieldsobjectkey]['type'][$key];

+		else $type = $this->attribute_type[$key];

+

+		$align = '';

+

+        if ($type == 'date')

+		{

+			$align = "center";

+		}

+		elseif ($type == 'datetime')

+		{

+			$align = "center";

+		}

+		elseif ($type == 'int')

+		{

+			$align = "right";

+		}

+		elseif ($type == 'price')

+		{

+			$align = "right";

+		}

+		elseif ($type == 'double')

+		{

+			$align = "right";

+		}

+		elseif ($type == 'boolean')

+		{

+			$align = "center";

+		}

+		elseif ($type == 'radio')

+		{

+			$align = "center";

+		}

+		elseif ($type == 'checkbox')

+		{

+			$align = "center";

+		}

+		elseif ($type == 'price')

+		{

+			$align = "right";

+		}

+

+		return $align;

@@ -2033 +1962 @@
-	 * @param	object	$object			Object

+	 * @param	string	$object			Object

@@ -2035,2 +1963,0 @@
-	 * @param	string	$display_type	"card" for form display, "line" for document line display (extrafields on propal line, order line, etc...)

-	 * @param 	string  $mode           Show output ('view') or input ('create' or 'edit') for extrafield

@@ -2039 +1966 @@
-	public function showSeparator($key, $object, $colspan = 2, $display_type = 'card', $mode = '')

+	public function showSeparator($key, $object, $colspan = 2)

@@ -2041,39 +1968,3 @@
-		global $conf, $langs;

-

-		$tagtype='tr';

-		$tagtype_dyn='td';

-

-		if ($display_type=='line') {

-			$tagtype='div';

-			$tagtype_dyn='span';

-			$colspan=0;

-		}

-

-		$extrafield_param = $this->attributes[$object->table_element]['param'][$key];

-		$extrafield_param_list = array();

-		if (!empty($extrafield_param) && is_array($extrafield_param)) {

-			$extrafield_param_list = array_keys($extrafield_param['options']);

-		}

-

-		// Set $extrafield_collapse_display_value (do we have to collapse/expand the group after the separator)

-		$extrafield_collapse_display_value = -1;

-		$expand_display = false;

-		if (is_array($extrafield_param_list) && count($extrafield_param_list) > 0) {

-			$extrafield_collapse_display_value = intval($extrafield_param_list[0]);

-			$expand_display = ((isset($_COOKIE['DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key]) || GETPOST('ignorecollapsesetup', 'int')) ? (empty($_COOKIE['DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key]) ? false : true) : ($extrafield_collapse_display_value == 2 ? false : true));

-		}

-		$disabledcookiewrite = 0;

-		if ($mode == 'create') {

-			// On create mode, force separator group to not be collapsable

-			$extrafield_collapse_display_value = 1;

-			$expand_display = true;	// We force group to be shown expanded

-			$disabledcookiewrite = 1; // We keep status of group unchanged into the cookie

-		}

-

-		$out = '<'.$tagtype.' id="trextrafieldseparator'.$key.(!empty($object->id) ? '_'.$object->id : '').'" class="trextrafieldseparator trextrafieldseparator'.$key.(!empty($object->id) ? '_'.$object->id : '').'">';

-		$out .= '<'.$tagtype_dyn.' '.(!empty($colspan) ? 'colspan="' . $colspan . '"' : '').'>';

-		// Some js code will be injected here to manage the collapsing of extrafields

-		// Output the picto

-		$out .= '<span class="'.($extrafield_collapse_display_value ? 'cursorpointer ' : '').($extrafield_collapse_display_value == 0 ? 'fas fa-square opacitymedium' : 'far fa-'.(($expand_display ? 'minus' : 'plus').'-square')).'"></span>';

-		$out .= '&nbsp;';

-		$out .= '<strong>';

+		global $langs;

+

+		$out = '<tr id="trextrafieldseparator'.$key.'" class="trextrafieldseparator trextrafieldseparator'.$key.'"><td colspan="'.$colspan.'"><strong>';

@@ -2081,42 +1972,39 @@
-		$out .= '</strong>';

-		$out .= '</'.$tagtype_dyn.'>';

-		$out .= '</'.$tagtype.'>';

-

-		$collapse_group = $key.(!empty($object->id) ? '_'.$object->id : '');

-		//$extrafields_collapse_num = $this->attributes[$object->table_element]['pos'][$key].(!empty($object->id)?'_'.$object->id:'');

-

-		if ($extrafield_collapse_display_value == 1 || $extrafield_collapse_display_value == 2) {

-			// Set the collapse_display status to cookie in priority or if ignorecollapsesetup is 1, if cookie and ignorecollapsesetup not defined, use the setup.

-			$this->expand_display[$collapse_group] = $expand_display;

-

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

-				$out .= '<!-- Add js script to manage the collapse/uncollapse of extrafields separators '.$key.' -->'."\n";

-				$out .= '<script nonce="'.getNonce().'" type="text/javascript">'."\n";

-				$out .= 'jQuery(document).ready(function(){'."\n";

-				if (empty($disabledcookiewrite)) {

-					if ($expand_display === false) {

-						$out .= '   console.log("Inject js for the collapsing of extrafield '.$key.' - hide");'."\n";

-						$out .= '   jQuery(".trextrafields_collapse'.$collapse_group.'").hide();'."\n";

-					} else {

-						$out .= '   console.log("Inject js for collapsing of extrafield '.$key.' - keep visible and set cookie");'."\n";

-						$out .= '   document.cookie = "DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key.'=1; path='.$_SERVER["PHP_SELF"].'"'."\n";

-					}

-				}

-				$out .= '   jQuery("#trextrafieldseparator'.$key.(!empty($object->id) ? '_'.$object->id : '').'").click(function(){'."\n";

-				$out .= '       console.log("We click on collapse/uncollapse to hide/show .trextrafields_collapse'.$collapse_group.'");'."\n";

-				$out .= '       jQuery(".trextrafields_collapse'.$collapse_group.'").toggle(100, function(){'."\n";

-				$out .= '           if (jQuery(".trextrafields_collapse'.$collapse_group.'").is(":hidden")) {'."\n";

-				$out .= '               jQuery("#trextrafieldseparator'.$key.(!empty($object->id) ? '_'.$object->id : '').' '.$tagtype_dyn.' span").addClass("fa-plus-square").removeClass("fa-minus-square");'."\n";

-				$out .= '               document.cookie = "DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key.'=0; path='.$_SERVER["PHP_SELF"].'"'."\n";

-				$out .= '           } else {'."\n";

-				$out .= '               jQuery("#trextrafieldseparator'.$key.(!empty($object->id) ? '_'.$object->id : '').' '.$tagtype_dyn.' span").addClass("fa-minus-square").removeClass("fa-plus-square");'."\n";

-				$out .= '               document.cookie = "DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key.'=1; path='.$_SERVER["PHP_SELF"].'"'."\n";

-				$out .= '           }'."\n";

-				$out .= '       });'."\n";

-				$out .= '   });'."\n";

-				$out .= '});'."\n";

-				$out .= '</script>'."\n";

-			}

-		} else {

-			$this->expand_display[$collapse_group] = 1;

-		}

+		$out .= '</strong></td></tr>';

+

+        $extrafield_param = $this->attributes[$object->table_element]['param'][$key];

+        if (!empty($extrafield_param) && is_array($extrafield_param)) {

+            $extrafield_param_list = array_keys($extrafield_param['options']);

+

+            if (count($extrafield_param_list) > 0) {

+                $extrafield_collapse_display_value = intval($extrafield_param_list[0]);

+                if ($extrafield_collapse_display_value == 1 || $extrafield_collapse_display_value == 2) {

+                	// Set the collapse_display status to cookie in priority or if ignorecollapsesetup is 1, if cookie and ignorecollapsesetup not defined, use the setup.

+                	$collapse_display = ((isset($_COOKIE['DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key]) || GETPOST('ignorecollapsesetup', 'int')) ? ($_COOKIE['DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key] ? true : false) : ($extrafield_collapse_display_value == 2 ? false : true));

+                    $extrafields_collapse_num = $this->attributes[$object->table_element]['pos'][$key];

+

+                    $out .= '<!-- Add js script to manage the collpase/uncollapse of extrafields separators '.$key.' -->';

+                    $out .= '<script type="text/javascript">';

+                    $out .= 'jQuery(document).ready(function(){';

+                    if ($collapse_display === false) {

+                        $out .= '   jQuery("#trextrafieldseparator'.$key.' td").prepend("<span class=\"cursorpointer fa fa-plus-square\"></span>&nbsp;");'."\n";

+                        $out .= '   jQuery(".trextrafields_collapse'.$extrafields_collapse_num.'").hide();'."\n";

+                    } else {

+                    	$out .= '   jQuery("#trextrafieldseparator'.$key.' td").prepend("<span class=\"cursorpointer fa fa-minus-square\"></span>&nbsp;");'."\n";

+                    	$out .= '   document.cookie = "DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key.'=1; path='.$_SERVER["PHP_SELF"].'"'."\n";

+                    }

+                    $out .= '   jQuery("#trextrafieldseparator'.$key.'").click(function(){'."\n";

+                    $out .= '       jQuery(".trextrafields_collapse'.$extrafields_collapse_num.'").toggle(300, function(){'."\n";

+                    $out .= '           if (jQuery(".trextrafields_collapse'.$extrafields_collapse_num.'").is(":hidden")) {'."\n";

+                    $out .= '               jQuery("#trextrafieldseparator'.$key.' td span").addClass("fa-plus-square").removeClass("fa-minus-square");'."\n";

+                    $out .= '               document.cookie = "DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key.'=0; path='.$_SERVER["PHP_SELF"].'"'."\n";

+                    $out .= '           } else {'."\n";

+                    $out .= '               jQuery("#trextrafieldseparator'.$key.' td span").addClass("fa-minus-square").removeClass("fa-plus-square");'."\n";

+                    $out .= '               document.cookie = "DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key.'=1; path='.$_SERVER["PHP_SELF"].'"'."\n";

+                    $out .= '           }'."\n";

+                    $out .= '       });';

+                    $out .= '   });';

+                    $out .= '});';

+                    $out .= '</script>';

+                }

+            }

+        }

@@ -2130,7 +2018,6 @@
-	 * @param   array|null	$extralabels    	Deprecated (old $array of extrafields, now set this to null)

-	 * @param   object		$object         	Object

-	 * @param	string		$onlykey			Only some keys are filled:

-	 *                      	            	'string' => When we make update of only one extrafield ($action = 'update_extras'), calling page can set this to avoid to have other extrafields being reset.

-	 *                          	        	'@GETPOSTISSET' => When we make update of several extrafields ($action = 'update'), calling page can set this to avoid to have fields not into POST being reset.

-	 * @param	int			$todefaultifmissing 1=Set value to the default value in database if value is mandatory and missing

-	 * @return	int								1 if array_options set, 0 if no value, -1 if error (field required missing for example)

+	 * @param   array	$extralabels    Deprecated (old $array of extrafields, now set this to null)

+	 * @param   object	$object         Object

+	 * @param	string	$onlykey		Only some keys are filled:$this

+	 *                                  'string' => When we make update of only one extrafield ($action = 'update_extras'), calling page can set this to avoid to have other extrafields being reset.

+	 *                                  '@GETPOSTISSET' => When we make update of extrafields ($action = 'update'), calling page can set this to avoid to have fields not into POST being reset.

+	 * @return	int						1 if array_options set, 0 if no value, -1 if error (field required missing for example)

@@ -2138 +2025 @@
-	public function setOptionalsFromPost($extralabels, &$object, $onlykey = '', $todefaultifmissing = 0)

+	public function setOptionalsFromPost($extralabels, &$object, $onlykey = '')

@@ -2140 +2027 @@
-		global $conf, $_POST, $langs;

+		global $_POST, $langs;

@@ -2145,5 +2032,4 @@
-		if (isset($this->attributes[$object->table_element]['label']) && is_array($this->attributes[$object->table_element]['label'])) {

-			$extralabels = $this->attributes[$object->table_element]['label'];

-		}

-

-		if (is_array($extralabels)) {

+		if (is_array($this->attributes[$object->table_element]['label'])) $extralabels = $this->attributes[$object->table_element]['label'];

+

+		if (is_array($extralabels))

+		{

@@ -2151,9 +2037,4 @@
-			foreach ($extralabels as $key => $value) {

-				if (!empty($onlykey) && $onlykey != '@GETPOSTISSET' && $key != $onlykey) {

-					continue;

-				}

-

-				if (!empty($onlykey) && $onlykey == '@GETPOSTISSET' && !GETPOSTISSET('options_'.$key) && (! in_array($this->attributes[$object->table_element]['type'][$key], array('boolean', 'checkbox', 'chkbxlst')))) {

-					//when unticking boolean field, it's not set in POST

-					continue;

-				}

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

+			{

+				if (!empty($onlykey) && $onlykey != '@GETPOSTISSET' && $key != $onlykey) continue;

+				if (!empty($onlykey) && $onlykey == '@GETPOSTISSET' && ! GETPOSTISSET('options_'.$key)) continue;

@@ -2162,3 +2043 @@
-				if ($key_type == 'separate') {

-					continue;

-				}

+				if ($key_type == 'separate') continue;

@@ -2167,9 +2046,4 @@
-				if (isset($this->attributes[$object->table_element]['enabled'][$key])) {	// 'enabled' is often a condition on module enabled or not

-					$enabled = dol_eval($this->attributes[$object->table_element]['enabled'][$key], 1, 1, '2');

-				}

-

-				$visibility = 1;

-				if (isset($this->attributes[$object->table_element]['list'][$key])) {		// 'list' is option for visibility

-					$visibility = intval(dol_eval($this->attributes[$object->table_element]['list'][$key], 1, 1, '2'));

-				}

-

+				if (isset($this->attributes[$object->table_element]['list'][$key]))

+				{

+					$enabled = dol_eval($this->attributes[$object->table_element]['list'][$key], 1);

+				}

@@ -2177,30 +2051,14 @@
-				if (isset($this->attributes[$object->table_element]['perms'][$key])) {

-					$perms = dol_eval($this->attributes[$object->table_element]['perms'][$key], 1, 1, '2');

-				}

-				if (empty($enabled)

-					|| (

-						$onlykey === '@GETPOSTISSET'

-						&& in_array($this->attributes[$object->table_element]['type'][$key], array('boolean', 'checkbox', 'chkbxlst'))

-						&& in_array(abs($enabled), array(2, 5))

-						&& ! GETPOSTISSET('options_' . $key) // Update hidden checkboxes and multiselect only if they are provided

-					)

-				) {

-					continue;

-				}

-

-				$visibility_abs = abs($visibility);

-				// not modify if extra field is not in update form (0 : never, 2 or -2 : list only, 5 or - 5 : list and view only)

-				if (empty($visibility_abs) || $visibility_abs == 2 || $visibility_abs == 5) {

-					continue;

-				}

-				if (empty($perms)) {

-					continue;

-				}

-

-				if ($this->attributes[$object->table_element]['required'][$key]) {	// Value is required

-					// Check if functionally empty without using GETPOST (depending on the type of extrafield, a

-					// technically non-empty value may be treated as empty functionally).

-					// value can be alpha, int, array, etc...

-					$v = $_POST["options_".$key] ?? null;

-					$type = $this->attributes[$object->table_element]['type'][$key];

-					if (self::isEmptyValue($v, $type)) {

+				if (isset($this->attributes[$object->table_element]['perms'][$key]))

+				{

+					$perms = dol_eval($this->attributes[$object->table_element]['perms'][$key], 1);

+				}

+				if (empty($enabled)) continue;

+				if (empty($perms)) continue;

+

+				if ($this->attributes[$object->table_element]['required'][$key])	// Value is required

+				{

+					// Check if empty without using GETPOST, value can be alpha, int, array, etc...

+				    if ((!is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && $this->attributes[$object->table_element]['type'][$key] != 'select' && $_POST["options_".$key] != '0')

+				        || (!is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && $this->attributes[$object->table_element]['type'][$key] == 'select')

+						|| (is_array($_POST["options_".$key]) && empty($_POST["options_".$key])))

+					{

@@ -2208,3 +2065,0 @@
-

-						// Field is not defined. We mark this as an error. We may fix it later if there is a default value and $todefaultifmissing is set.

-

@@ -2212,4 +2067 @@
-						if (!empty($this->attributes[$object->table_element]['langfile'][$key])) {

-							$langs->load($this->attributes[$object->table_element]['langfile'][$key]);

-						}

-						$error_field_required[$key] = $langs->transnoentitiesnoconv($value);

+						$error_field_required[] = $langs->transnoentitiesnoconv($value);

@@ -2219 +2071,2 @@
-				if (in_array($key_type, array('date'))) {

+				if (in_array($key_type, array('date')))

+				{

@@ -2221,2 +2074,5 @@
-					$value_key = dol_mktime(12, 0, 0, GETPOST("options_".$key."month", 'int'), GETPOST("options_".$key."day", 'int'), GETPOST("options_".$key."year", 'int'));

-				} elseif (in_array($key_type, array('datetime'))) {

+					// TODO GMT date in memory must be GMT so we should add gm=true in parameters

+					$value_key = dol_mktime(0, 0, 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);

+				}

+				elseif (in_array($key_type, array('datetime')))

+				{

@@ -2224,5 +2080,5 @@
-					$value_key = dol_mktime(GETPOST("options_".$key."hour", 'int'), GETPOST("options_".$key."min", 'int'), GETPOST("options_".$key."sec", 'int'), GETPOST("options_".$key."month", 'int'), GETPOST("options_".$key."day", 'int'), GETPOST("options_".$key."year", 'int'), 'tzuserrel');

-				} elseif (in_array($key_type, array('datetimegmt'))) {

-					// Clean parameters

-					$value_key = dol_mktime(GETPOST("options_".$key."hour", 'int'), GETPOST("options_".$key."min", 'int'), GETPOST("options_".$key."sec", 'int'), GETPOST("options_".$key."month", 'int'), GETPOST("options_".$key."day", 'int'), GETPOST("options_".$key."year", 'int'), 'gmt');

-				} elseif (in_array($key_type, array('checkbox', 'chkbxlst'))) {

+					// TODO GMT date in memory must be GMT so we should add gm=true in parameters

+					$value_key = dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);

+				}

+				elseif (in_array($key_type, array('checkbox', 'chkbxlst')))

+				{

@@ -2231 +2087 @@
-						$value_key = implode(',', $value_arr);

+						$value_key = implode($value_arr, ',');

@@ -2235 +2091,3 @@
-				} elseif (in_array($key_type, array('price', 'double'))) {

+				}

+				elseif (in_array($key_type, array('price', 'double')))

+				{

@@ -2238,14 +2096,7 @@
-				} elseif (in_array($key_type, array('pricecy', 'double'))) {

-					$value_key = price2num(GETPOST("options_".$key, 'alpha')).':'.GETPOST("options_".$key."currency_id", 'alpha');

-				} elseif (in_array($key_type, array('html'))) {

-					$value_key = GETPOST("options_".$key, 'restricthtml');

-				} elseif (in_array($key_type, array('text'))) {

-					$label_security_check = 'alphanohtml';

-					// by default 'alphanohtml' (better security); hidden conf MAIN_SECURITY_ALLOW_UNSECURED_LABELS_WITH_HTML allows basic html

-					if (getDolGlobalString('MAIN_SECURITY_ALLOW_UNSECURED_REF_LABELS')) {

-						$label_security_check = 'nohtml';

-					} else {

-						$label_security_check = !getDolGlobalString('MAIN_SECURITY_ALLOW_UNSECURED_LABELS_WITH_HTML') ? 'alphanohtml' : 'restricthtml';

-					}

-					$value_key = GETPOST("options_".$key, $label_security_check);

-				} else {

+				}

+				elseif (in_array($key_type, array('html')))

+				{

+					$value_key = GETPOST("options_".$key, 'alpha');

+				}

+				else

+				{

@@ -2253,12 +2104 @@
-					if (in_array($key_type, array('link')) && $value_key == '-1') {

-						$value_key = '';

-					}

-				}

-

-				if (!empty($error_field_required[$key]) && $todefaultifmissing) {

-					// Value is required but we have a default value and we asked to set empty value to the default value

-					if (!empty($this->attributes[$object->table_element]['default']) && !is_null($this->attributes[$object->table_element]['default'][$key])) {

-						$value_key = $this->attributes[$object->table_element]['default'][$key];

-						unset($error_field_required[$key]);

-						$nofillrequired--;

-					}

+					if (in_array($key_type, array('link')) && $value_key == '-1') $value_key = '';

@@ -2272,2 +2112 @@
-				$this->error = $langs->trans('ErrorFieldsRequired').' : '.implode(', ', $error_field_required);

-				setEventMessages($this->error, null, 'errors');

+				setEventMessages($langs->trans('ErrorFieldsRequired').' : '.implode(', ', $error_field_required), null, 'errors');

@@ -2275 +2114,2 @@
-			} else {

+			}

+			else {

@@ -2278 +2118,2 @@
-		} else {

+		}

+		else {

@@ -2295 +2136,2 @@
-		if (is_string($extrafieldsobjectkey) && !empty($this->attributes[$extrafieldsobjectkey]['label']) && is_array($this->attributes[$extrafieldsobjectkey]['label'])) {

+		if (is_string($extrafieldsobjectkey) && is_array($this->attributes[$extrafieldsobjectkey]['label']))

+		{

@@ -2297 +2139,3 @@
-		} else {

+		}

+		else

+		{

@@ -2301 +2145,2 @@
-		if (is_array($extralabels)) {

+		if (is_array($extralabels))

+		{

@@ -2305 +2150,2 @@
-			foreach ($extralabels as $key => $value) {

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

+			{

@@ -2307 +2153,2 @@
-				if (is_string($extrafieldsobjectkey)) {

+				if (is_string($extrafieldsobjectkey))

+				{

@@ -2311,63 +2158,9 @@
-				if (in_array($key_type, array('date'))) {

-					$dateparamname_start = $keysuffix . 'options_' . $key . $keyprefix . '_start';

-					$dateparamname_end   = $keysuffix . 'options_' . $key . $keyprefix . '_end';

-					if (GETPOST($dateparamname_start . 'year') || GETPOST($dateparamname_end . 'year')) {

-						$value_key = array();

-						// values provided as a component year, month, day, etc.

-						if (GETPOST($dateparamname_start . 'year')) {

-							$value_key['start'] = dol_mktime(0, 0, 0, GETPOST($dateparamname_start . 'month', 'int'), GETPOST($dateparamname_start . 'day', 'int'), GETPOST($dateparamname_start . 'year', 'int'));

-						}

-						if (GETPOST($dateparamname_start . 'year')) {

-							$value_key['end'] = dol_mktime(23, 59, 59, GETPOST($dateparamname_end . 'month', 'int'), GETPOST($dateparamname_end . 'day', 'int'), GETPOST($dateparamname_end . 'year', 'int'));

-						}

-					} elseif (GETPOST($keysuffix."options_".$key.$keyprefix."year")) {

-						// Clean parameters

-						$value_key = dol_mktime(12, 0, 0, GETPOST($keysuffix."options_".$key.$keyprefix."month", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."day", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."year", 'int'));

-					} else {

-						continue; // Value was not provided, we should not set it.

-					}

-				} elseif (in_array($key_type, array('datetime', 'datetimegmt'))) {

-					$dateparamname_start = $keysuffix . 'options_' . $key . $keyprefix . '_start';

-					$dateparamname_end   = $keysuffix . 'options_' . $key . $keyprefix . '_end';

-					if (GETPOST($dateparamname_start . 'year') && GETPOST($dateparamname_end . 'year')) {

-						// values provided as a date pair (start date + end date), each date being broken down as year, month, day, etc.

-						$dateparamname_end_hour = GETPOST($dateparamname_end . 'hour', 'int') != '-1' ? GETPOST($dateparamname_end . 'hour', 'int') : '23';

-						$dateparamname_end_min = GETPOST($dateparamname_end . 'min', 'int') != '-1' ? GETPOST($dateparamname_end . 'min', 'int') : '59';

-						$dateparamname_end_sec = GETPOST($dateparamname_end . 'sec', 'int') != '-1' ? GETPOST($dateparamname_end . 'sec', 'int') : '59';

-						if ($key_type == 'datetimegmt') {

-							$value_key = array(

-								'start' => dol_mktime(GETPOST($dateparamname_start . 'hour', 'int'), GETPOST($dateparamname_start . 'min', 'int'), GETPOST($dateparamname_start . 'sec', 'int'), GETPOST($dateparamname_start . 'month', 'int'), GETPOST($dateparamname_start . 'day', 'int'), GETPOST($dateparamname_start . 'year', 'int'), 'gmt'),

-								'end' => dol_mktime($dateparamname_end_hour, $dateparamname_end_min, $dateparamname_end_sec, GETPOST($dateparamname_end . 'month', 'int'), GETPOST($dateparamname_end . 'day', 'int'), GETPOST($dateparamname_end . 'year', 'int'), 'gmt')

-							);

-						} else {

-							$value_key = array(

-								'start' => dol_mktime(GETPOST($dateparamname_start . 'hour', 'int'), GETPOST($dateparamname_start . 'min', 'int'), GETPOST($dateparamname_start . 'sec', 'int'), GETPOST($dateparamname_start . 'month', 'int'), GETPOST($dateparamname_start . 'day', 'int'), GETPOST($dateparamname_start . 'year', 'int'), 'tzuserrel'),

-								'end' => dol_mktime($dateparamname_end_hour, $dateparamname_end_min, $dateparamname_end_sec, GETPOST($dateparamname_end . 'month', 'int'), GETPOST($dateparamname_end . 'day', 'int'), GETPOST($dateparamname_end . 'year', 'int'), 'tzuserrel')

-							);

-						}

-					} elseif (GETPOST($keysuffix."options_".$key.$keyprefix."year")) {

-						// Clean parameters

-						if ($key_type == 'datetimegmt') {

-							$value_key = dol_mktime(GETPOST($keysuffix."options_".$key.$keyprefix."hour", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."min", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."sec", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."month", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."day", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."year", 'int'), 'gmt');

-						} else {

-							$value_key = dol_mktime(GETPOST($keysuffix."options_".$key.$keyprefix."hour", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."min", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."sec", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."month", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."day", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."year", 'int'), 'tzuserrel');

-						}

-					} else {

-						continue; // Value was not provided, we should not set it.

-					}

-				} elseif ($key_type == 'select') {

-					// to detect if we are in search context

-					if (GETPOSTISARRAY($keysuffix."options_".$key.$keyprefix)) {

-						$value_arr = GETPOST($keysuffix."options_".$key.$keyprefix, 'array:aZ09');

-						// Make sure we get an array even if there's only one selected

-						$value_arr = (array) $value_arr;

-						$value_key = implode(',', $value_arr);

-					} else {

-						$value_key = GETPOST($keysuffix."options_".$key.$keyprefix);

-					}

-				} elseif (in_array($key_type, array('checkbox', 'chkbxlst'))) {

-					// We test on a hidden field named "..._multiselect" that is always set to 1 if param is in form so

-					// when nothing is provided we can make a difference between noparam in the form and param was set to nothing.

-					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix.'_multiselect')) {

-						continue; // Value was not provided, we should not set it.

-					}

+				if (in_array($key_type, array('date', 'datetime')))

+				{

+					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix."year")) continue; // Value was not provided, we should not set it.

+					// Clean parameters

+					$value_key = dol_mktime(GETPOST($keysuffix."options_".$key.$keyprefix."hour", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."min", 'int'), 0, GETPOST($keysuffix."options_".$key.$keyprefix."month", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."day", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."year", 'int'));

+				}

+				elseif (in_array($key_type, array('checkbox', 'chkbxlst')))

+				{

+					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)) continue; // Value was not provided, we should not set it.

@@ -2378,4 +2171,4 @@
-				} elseif (in_array($key_type, array('price', 'double', 'int'))) {

-					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)) {

-						continue; // Value was not provided, we should not set it.

-					}

+				}

+				elseif (in_array($key_type, array('price', 'double', 'int')))

+				{

+					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)) continue; // Value was not provided, we should not set it.

@@ -2383,23 +2176,5 @@
-					if ($keysuffix != 'search_') {    // If value is for a search, we must keep complex string like '>100 <=150'

-						$value_key = price2num($value_arr);

-					} else {

-						$value_key = $value_arr;

-					}

-				} elseif (in_array($key_type, array('boolean'))) {

-					// We test on a hidden field named "..._boolean" that is always set to 1 if param is in form so

-					// when nothing is provided we can make a difference between noparam in the form and param was set to nothing.

-					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix."_boolean")) {

-						$value_key = '';

-					} else {

-						$value_arr = GETPOST($keysuffix."options_".$key.$keyprefix);

-						$value_key = $value_arr;

-					}

-				} elseif (in_array($key_type, array('html'))) {

-					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)) {

-						continue; // Value was not provided, we should not set it.

-					}

-					$value_key = dol_htmlcleanlastbr(GETPOST($keysuffix."options_".$key.$keyprefix, 'restricthtml'));

-				} else {

-					if (!GETPOST($keysuffix."options_".$key.$keyprefix)) {

-						continue; // Value was not provided, we should not set it.

-					}

+					$value_key = price2num($value_arr);

+				}

+				else

+				{

+					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)) continue; // Value was not provided, we should not set it.

@@ -2417,24 +2191,0 @@
-

-	/**

-	 * Return if a value is "empty" for a mandatory vision.

-	 *

-	 * @param 	mixed	$v		Value to test

-	 * @param 	string 	$type	Type of extrafield 'sellist', 'link', 'select', ...

-	 * @return 	boolean			True is value is an empty value, not allowed for a mandatory field.

-	 */

-	public static function isEmptyValue($v, string $type)

-	{

-		if ($v === null || $v === '') {

-			return true;

-		}

-		if (is_array($v) || $type == 'select') {

-			return empty($v);

-		}

-		if ($type == 'link') {

-			return ($v == '-1');

-		}

-		if ($type == 'sellist') {

-			return ($v == '0');

-		}

-		return (empty($v) && $v != '0');

-	}

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_extralanguages.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_extralanguages.class.php
@@ -31,3 +31,3 @@
-	 * @var DoliDB Database handler.

-	 */

-	public $db;

+     * @var DoliDB Database handler.

+     */

+    public $db;

@@ -36,2 +36,2 @@
-	 * @var array New array to store extralanguages definition

-	 */

+     * @var array New array to store extralanguages definition

+     */

@@ -50 +50 @@
-	/**

+    /**

@@ -60 +60 @@
-	 */

+	*/

@@ -70 +70 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -83 +83 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -86,3 +86 @@
-		if (empty($elementtype)) {

-			return array();

-		}

+		if (empty($elementtype)) return array();

@@ -90,9 +88,3 @@
-		if ($elementtype == 'thirdparty') {

-			$elementtype = 'societe';

-		}

-		if ($elementtype == 'contact') {

-			$elementtype = 'socpeople';

-		}

-		if ($elementtype == 'order_supplier') {

-			$elementtype = 'commande_fournisseur';

-		}

+		if ($elementtype == 'thirdparty')     $elementtype = 'societe';

+		if ($elementtype == 'contact')        $elementtype = 'socpeople';

+		if ($elementtype == 'order_supplier') $elementtype = 'commande_fournisseur';

@@ -102,2 +94,2 @@
-		if (getDolGlobalString('MAIN_USE_ALTERNATE_TRANSLATION_FOR')) {

-			$tmpelement = explode(';', getDolGlobalString('MAIN_USE_ALTERNATE_TRANSLATION_FOR'));

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

+			$tmpelement = explode(';', $conf->global->MAIN_USE_ALTERNATE_TRANSLATION_FOR);

@@ -137 +129 @@
-	 * @param  int	   $mode                    1=Used for search filters

+	 * @param  string  $mode                    1=Used for search filters

@@ -144 +136,2 @@
-		if (!is_object($form)) {

+		if (!is_object($form))

+		{

@@ -151 +144,2 @@
-		if (!preg_match('/options_$/', $keyprefix)) {	// Because we work on extrafields, we add 'options_' to prefix if not already added

+		if (!preg_match('/options_$/', $keyprefix))	// Because we work on extrafields, we add 'options_' to prefix if not already added

+		{

@@ -153,0 +148 @@
+

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_fileupload.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_fileupload.class.php
@@ -2,2 +2,2 @@
-/* Copyright (C) 2011-2022	Regis Houssin		<regis.houssin@inodbox.com>

- * Copyright (C) 2011-2023	Laurent Destailleur	<eldy@users.sourceforge.net>

+/* Copyright (C) 2011-2012	Regis Houssin		<regis.houssin@inodbox.com>

+ * Copyright (C) 2011-2012	Laurent Destailleur	<eldy@users.sourceforge.net>

@@ -20,3 +20,2 @@
- *       \file      htdocs/core/class/fileupload.class.php

- *       \brief     File to return Ajax response on common file upload.

- *       			For large files, see flowjs-server.php

+ *       \file       htdocs/core/class/fileupload.class.php

+ *       \brief      File to return Ajax response on file upload

@@ -34 +33 @@
-	public $options;

+	protected $options;

@@ -39,2 +38 @@
-	 * Constructor.

-	 * This set ->$options

+	 * Constructor

@@ -43,2 +41,2 @@
-	 * @param int		$fk_element		ID of element

-	 * @param string	$element		Code of element

+	 * @param int		$fk_element		fk_element

+	 * @param string	$element		element

@@ -48 +46,2 @@
-		global $db;

+		global $db, $conf;

+		global $object;

@@ -50 +48,0 @@
-

@@ -52,3 +49,0 @@
-

-		$element_prop = getElementProperties($element);

-		//var_dump($element_prop);

@@ -59,37 +54,89 @@
-		$pathname = str_replace('/class', '', $element_prop['classpath']);

-		$filename = dol_sanitizeFileName($element_prop['classfile']);

-		$dir_output = dol_sanitizePathName($element_prop['dir_output']);

-

-		//print 'fileupload.class.php: element='.$element.' pathname='.$pathname.' filename='.$filename.' dir_output='.$dir_output."\n";

-

-		if (empty($dir_output)) {

-			setEventMessage('The element '.$element.' is not supported for uploading file. dir_output is unknow.', 'errors');

-			throw new Exception('The element '.$element.' is not supported for uploading file. dir_output is unknow.');

-		}

-

-		// If pathname and filename are null then we can still upload files if we have specified upload_dir on $options

-		if ($pathname !== null && $filename !== null) {

-			// Get object from its id and type

-			$object = fetchObjectByElement($fk_element, $element);

-

-			$object_ref = dol_sanitizeFileName($object->ref);

-

-			// Special cases to forge $object_ref used to forge $upload_dir

-			if ($element == 'invoice_supplier') {

-				$object_ref = get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').$object_ref;

-			} elseif ($element == 'project_task') {

-				$parentForeignKey = 'fk_project';

-				$parentClass = 'Project';

-				$parentElement = 'projet';

-				$parentObject = 'project';

-

-				dol_include_once('/'.$parentElement.'/class/'.$parentObject.'.class.php');

-				$parent = new $parentClass($db);

-				$parent->fetch($object->$parentForeignKey);

-				if (!empty($parent->socid)) {

-					$parent->fetch_thirdparty();

-				}

-				$object->$parentObject = clone $parent;

-

-				$object_ref = dol_sanitizeFileName($object->project->ref).'/'.$object_ref;

-			}

+		$pathname = $filename = $element;

+		if (preg_match('/^([^_]+)_([^_]+)/i', $element, $regs))

+		{

+			$pathname = $regs[1];

+			$filename = $regs[2];

+		}

+

+		$parentForeignKey = '';

+

+		// For compatibility

+		if ($element == 'propal') {

+			$pathname = 'comm/propal';

+			$dir_output = $conf->$element->dir_output;

+		}

+		elseif ($element == 'facture') {

+			$pathname = 'compta/facture';

+			$dir_output = $conf->$element->dir_output;

+		}

+		elseif ($element == 'project') {

+			$element = $pathname = 'projet';

+			$dir_output = $conf->$element->dir_output;

+		}

+		elseif ($element == 'project_task') {

+			$pathname = 'projet'; $filename = 'task';

+			$dir_output = $conf->projet->dir_output;

+			$parentForeignKey = 'fk_project';

+			$parentClass = 'Project';

+			$parentElement = 'projet';

+			$parentObject = 'project';

+		}

+		elseif ($element == 'fichinter') {

+			$element = 'ficheinter';

+			$dir_output = $conf->$element->dir_output;

+		}

+		elseif ($element == 'order_supplier') {

+			$pathname = 'fourn'; $filename = 'fournisseur.commande';

+			$dir_output = $conf->fournisseur->commande->dir_output;

+		}

+		elseif ($element == 'invoice_supplier') {

+			$pathname = 'fourn'; $filename = 'fournisseur.facture';

+			$dir_output = $conf->fournisseur->facture->dir_output;

+		}

+		elseif ($element == 'product') {

+			$dir_output = $conf->product->multidir_output[$conf->entity];

+		}

+		elseif ($element == 'productbatch') {

+			$dir_output = $conf->productbatch->multidir_output[$conf->entity];

+		}

+		elseif ($element == 'action') {

+			$pathname = 'comm/action'; $filename = 'actioncomm';

+			$dir_output = $conf->agenda->dir_output;

+		}

+		elseif ($element == 'chargesociales') {

+			$pathname = 'compta/sociales'; $filename = 'chargesociales';

+			$dir_output = $conf->tax->dir_output;

+		} else {

+			$dir_output = $conf->$element->dir_output;

+		}

+

+		dol_include_once('/'.$pathname.'/class/'.$filename.'.class.php');

+

+		$classname = ucfirst($filename);

+

+		if ($element == 'order_supplier') {

+			$classname = 'CommandeFournisseur';

+		} elseif ($element == 'invoice_supplier') {

+			$classname = 'FactureFournisseur';

+		}

+

+		$object = new $classname($db);

+

+		$object->fetch($fk_element);

+		if (!empty($parentForeignKey)) {

+			dol_include_once('/'.$parentElement.'/class/'.$parentObject.'.class.php');

+			$parent = new $parentClass($db);

+			$parent->fetch($object->$parentForeignKey);

+			if (!empty($parent->socid)) {

+				$parent->fetch_thirdparty();

+			}

+			$object->$parentObject = clone $parent;

+		} else {

+			$object->fetch_thirdparty();

+		}

+

+		$object_ref = dol_sanitizeFileName($object->ref);

+		if ($element == 'invoice_supplier') {

+			$object_ref = get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').$object_ref;

+		} elseif ($element == 'project_task') {

+			$object_ref = $object->project->ref.'/'.$object_ref;

@@ -99,39 +146,40 @@
-			'script_url' => $_SERVER['PHP_SELF'],

-			'upload_dir' => $dir_output.'/'.$object_ref.'/',

-			'upload_url' => DOL_URL_ROOT.'/document.php?modulepart='.$element.'&attachment=1&file=/'.$object_ref.'/',

-			'param_name' => 'files',

-			// Set the following option to 'POST', if your server does not support

-			// DELETE requests. This is a parameter sent to the client:

-			'delete_type' => 'DELETE',

-			// The php.ini settings upload_max_filesize and post_max_size

-			// take precedence over the following max_file_size setting:

-			'max_file_size' => null,

-			'min_file_size' => 1,

-			'accept_file_types' => '/.+$/i',

-			// The maximum number of files for the upload directory:

-			'max_number_of_files' => null,

-			// Image resolution restrictions:

-			'max_width' => null,

-			'max_height' => null,

-			'min_width' => 1,

-			'min_height' => 1,

-			// Set the following option to false to enable resumable uploads:

-			'discard_aborted_uploads' => true,

-			'image_versions' => array(

-				// Uncomment the following version to restrict the size of

-				// uploaded images. You can also add additional versions with

-				// their own upload directories:

-				/*

-				'large' => array(

-						'upload_dir' => dirname($_SERVER['SCRIPT_FILENAME']).'/files/',

-						'upload_url' => $this->getFullUrl().'/files/',

-						'max_width' => 1920,

-						'max_height' => 1200,

-						'jpeg_quality' => 95

-				),

-				*/

-				'thumbnail' => array(

-					'upload_dir' => $dir_output.'/'.$object_ref.'/thumbs/',

-					'upload_url' => DOL_URL_ROOT.'/document.php?modulepart='.urlencode($element).'&attachment=1&file='.urlencode('/'.$object_ref.'/thumbs/'),

-					'max_width' => 80,

-					'max_height' => 80

+				'script_url' => $_SERVER['PHP_SELF'],

+				'upload_dir' => $dir_output.'/'.$object_ref.'/',

+				'upload_url' => DOL_URL_ROOT.'/document.php?modulepart='.$element.'&attachment=1&file=/'.$object_ref.'/',

+				'param_name' => 'files',

+				// Set the following option to 'POST', if your server does not support

+				// DELETE requests. This is a parameter sent to the client:

+				'delete_type' => 'DELETE',

+				// The php.ini settings upload_max_filesize and post_max_size

+				// take precedence over the following max_file_size setting:

+				'max_file_size' => null,

+				'min_file_size' => 1,

+				'accept_file_types' => '/.+$/i',

+				// The maximum number of files for the upload directory:

+				'max_number_of_files' => null,

+				// Image resolution restrictions:

+				'max_width' => null,

+				'max_height' => null,

+				'min_width' => 1,

+				'min_height' => 1,

+				// Set the following option to false to enable resumable uploads:

+				'discard_aborted_uploads' => true,

+				'image_versions' => array(

+						// Uncomment the following version to restrict the size of

+						// uploaded images. You can also add additional versions with

+						// their own upload directories:

+						/*

+		'large' => array(

+				'upload_dir' => dirname($_SERVER['SCRIPT_FILENAME']).'/files/',

+				'upload_url' => $this->getFullUrl().'/files/',

+				'max_width' => 1920,

+				'max_height' => 1200,

+				'jpeg_quality' => 95

+		),

+		*/

+						'thumbnail' => array(

+								'upload_dir' => $dir_output.'/'.$object_ref.'/thumbs/',

+								'upload_url' => DOL_URL_ROOT.'/document.php?modulepart='.$element.'&attachment=1&file=/'.$object_ref.'/thumbs/',

+								'max_width' => 80,

+								'max_height' => 80

+						)

@@ -139 +186,0 @@
-			)

@@ -142,11 +189,10 @@
-		global $action;

-

-		$hookmanager->executeHooks(

-			'overrideUploadOptions',

-			array(

-				'options' => &$options,

-				'element' => $element

-			),

-			$object,

-			$action

-		);

+        $hookmanager->executeHooks(

+            'overrideUploadOptions',

+            array(

+                'options' => &$options,

+                'element' => $element

+            ),

+            $object,

+            $action,

+            $hookmanager

+        );

@@ -156,15 +201,0 @@
-		}

-

-		// At this point we should have a valid upload_dir in options

-		//if ($pathname === null && $filename === null) { // OR or AND???

-		if ($pathname === null || $filename === null) {

-			if (!key_exists("upload_dir", $this->options)) {

-				setEventMessage('If $fk_element = null or $element = null you must specify upload_dir on $options', 'errors');

-				throw new Exception('If $fk_element = null or $element = null you must specify upload_dir on $options');

-			} elseif (!is_dir($this->options['upload_dir'])) {

-				setEventMessage('The directory '.$this->options['upload_dir'].' doesn\'t exists', 'errors');

-				throw new Exception('The directory '.$this->options['upload_dir'].' doesn\'t exists');

-			} elseif (!is_writable($this->options['upload_dir'])) {

-				setEventMessage('The directory '.$this->options['upload_dir'].' is not writable', 'errors');

-				throw new Exception('The directory '.$this->options['upload_dir'].' is not writable');

-			}

@@ -194 +225 @@
-	 * @param 	object	$file		Filename

+	 * @param 	string	$file		Filename

@@ -199 +230,2 @@
-		$file->delete_url = $this->options['script_url'].'?file='.urlencode($file->name).'&fk_element='.urlencode($this->fk_element).'&element='.urlencode($this->element);

+		$file->delete_url = $this->options['script_url']

+		.'?file='.rawurlencode($file->name).'&fk_element='.$this->fk_element.'&element='.$this->element;

@@ -214,3 +246,3 @@
-		$file_path = $this->options['upload_dir'].dol_sanitizeFileName($file_name);

-

-		if (dol_is_file($file_path) && $file_name[0] !== '.') {

+		$file_path = $this->options['upload_dir'].$file_name;

+		if (is_file($file_path) && $file_name[0] !== '.')

+		{

@@ -221 +253 @@
-			$file->url = $this->options['upload_url'].urlencode($file->name);

+			$file->url = $this->options['upload_url'].rawurlencode($file->name);

@@ -223 +255 @@
-				if (dol_is_file($options['upload_dir'].$file_name)) {

+				if (is_file($options['upload_dir'].$file_name)) {

@@ -225,4 +257 @@
-

-					// We save the path of mini file into file->... (seems not used)

-					$keyforfile = $version.'_url';

-					$file->$keyforfile = $options['upload_url'].urlencode($tmp[0].'_mini.'.$tmp[1]);

+					$file->{$version.'_url'} = $options['upload_url'].rawurlencode($tmp[0].'_mini.'.$tmp[1]);

@@ -240 +269 @@
-	 * @return	array	Array of objects

+	 * @return	void

@@ -248 +277 @@
-	 *  Create thumbs of a file uploaded.

+	 *  Create thumbs of a file uploaded. Only the "mini" thumb is generated.

@@ -256 +285 @@
-		global $maxwidthmini, $maxheightmini, $maxwidthsmall, $maxheightsmall;

+		global $maxwidthmini, $maxheightmini;

@@ -261 +290,2 @@
-		if (dol_mkdir($options['upload_dir']) >= 0) {

+		if (dol_mkdir($options['upload_dir']) >= 0)

+		{

@@ -267,10 +297,3 @@
-			$res = vignette($file_path, $maxwidthmini, $maxheightmini, '_mini'); // We don't use ->addThumbs here because there is no object

-			if (preg_match('/error/i', $res)) {

-				return false;

-			}

-

-			$res = vignette($file_path, $maxwidthsmall, $maxheightsmall, '_small'); // We don't use ->addThumbs here because there is no object

-			if (preg_match('/error/i', $res)) {

-				return false;

-			}

-

+			$res = vignette($file_path, $maxwidthmini, $maxheightmini, '_mini'); // We don't use ->addThumbs here because there is no object and we don't need all thumbs, only the "mini".

+

+			if (preg_match('/error/i', $res)) return false;

@@ -278,7 +301,9 @@
-		} else {

-			return false;

-		}

-	}

-

-	/**

-	 * Make validation on an uploaded file

+		}

+		else

+		{

+			return false;

+		}

+	}

+

+	/**

+	 * Enter description here ...

@@ -287 +312 @@
-	 * @param 	object	$file				File

+	 * @param 	string	$file				File

@@ -307 +332 @@
-			$file_size = dol_filesize($uploaded_file);

+			$file_size = filesize($uploaded_file);

@@ -312,3 +337,2 @@
-			$file_size > $this->options['max_file_size'] ||

-				$file->size > $this->options['max_file_size']

-		)

+				$file_size > $this->options['max_file_size'] ||

+				$file->size > $this->options['max_file_size'])

@@ -325,2 +349 @@
-			count($this->getFileObjects()) >= $this->options['max_number_of_files']

-		)

+				count($this->getFileObjects()) >= $this->options['max_number_of_files'])

@@ -383 +406,2 @@
-		$file_name = basename(dol_sanitizeFileName($name));

+		// Also remove control characters and spaces (\x00..\x20) around the filename:

+		$file_name = trim(basename(stripslashes($name)), ".\x00..\x20");

@@ -385,2 +409,2 @@
-		$matches = array();

-		if (strpos($file_name, '.') === false && preg_match('/^image\/(gif|jpe?g|png)/', $type, $matches)) {

+		if (strpos($file_name, '.') === false &&

+				preg_match('/^image\/(gif|jpe?g|png)/', $type, $matches)) {

@@ -389,2 +413,4 @@
-		if ($this->options['discard_aborted_uploads']) {

-			while (dol_is_file($this->options['upload_dir'].$file_name)) {

+		if ($this->options['discard_aborted_uploads'])

+		{

+			while (is_file($this->options['upload_dir'].$file_name))

+			{

@@ -398,2 +424 @@
-	 * handleFileUpload.

-	 * Validate data, move the uploaded file then create the thumbs if this is an image.

+	 * handleFileUpload

@@ -407 +432 @@
-	 * @return stdClass|null

+	 * @return stdClass

@@ -416,21 +441,29 @@
-

-		// Sanitize to avoid stream execution when calling file_size(). Not that this is a second security because

-		// most streams are already disabled by stream_wrapper_unregister() in filefunc.inc.php

-		$uploaded_file = preg_replace('/\s*(http|ftp)s?:/i', '', $uploaded_file);

-		$uploaded_file = realpath($uploaded_file);	// A hack to be sure the file point to an existing file on disk (and is not a SSRF attack)

-

-		$validate = $this->validate($uploaded_file, $file, $error, $index);

-

-		if ($validate) {

-			if (dol_mkdir($this->options['upload_dir']) >= 0) {

-				$file_path = dol_sanitizePathName($this->options['upload_dir']).dol_sanitizeFileName($file->name);

-				$append_file = !$this->options['discard_aborted_uploads'] && dol_is_file($file_path) && $file->size > dol_filesize($file_path);

-

-				clearstatcache();

-

-				if ($uploaded_file && is_uploaded_file($uploaded_file)) {

-					// multipart/formdata uploads (POST method uploads)

-					if ($append_file) {

-						file_put_contents($file_path, fopen($uploaded_file, 'r'), FILE_APPEND);

-					} else {

-						$result = dol_move_uploaded_file($uploaded_file, $file_path, 1, 0, 0, 0, 'userfile');

+		if ($this->validate($uploaded_file, $file, $error, $index) && dol_mkdir($this->options['upload_dir']) >= 0)

+		{

+			$file_path = $this->options['upload_dir'].$file->name;

+			$append_file = !$this->options['discard_aborted_uploads'] && is_file($file_path) && $file->size > filesize($file_path);

+			clearstatcache();

+			if ($uploaded_file && is_uploaded_file($uploaded_file)) {

+				// multipart/formdata uploads (POST method uploads)

+				if ($append_file)

+				{

+					file_put_contents($file_path, fopen($uploaded_file, 'r'), FILE_APPEND);

+				} else {

+					dol_move_uploaded_file($uploaded_file, $file_path, 1, 0, 0, 0, 'userfile');

+				}

+			}

+			else

+			{

+				// Non-multipart uploads (PUT method support)

+				file_put_contents($file_path, fopen('php://input', 'r'), $append_file ? FILE_APPEND : 0);

+			}

+			$file_size = filesize($file_path);

+			if ($file_size === $file->size)

+			{

+				$file->url = $this->options['upload_url'].rawurlencode($file->name);

+				foreach ($this->options['image_versions'] as $version => $options)

+				{

+					if ($this->createScaledImage($file->name, $options))

+					{

+						$tmp = explode('.', $file->name);

+						$file->{$version.'_url'} = $options['upload_url'].rawurlencode($tmp[0].'_mini.'.$tmp[1]);

@@ -438,3 +470,0 @@
-				} else {

-					// Non-multipart uploads (PUT method support)

-					file_put_contents($file_path, fopen('php://input', 'r'), $append_file ? FILE_APPEND : 0);

@@ -442,25 +472,9 @@
-				$file_size = dol_filesize($file_path);

-				if ($file_size === $file->size) {

-					$file->url = $this->options['upload_url'].urlencode($file->name);

-					foreach ($this->options['image_versions'] as $version => $options) {

-						if ($this->createScaledImage($file->name, $options)) {	// Creation of thumbs mini and small is ok

-							$tmp = explode('.', $file->name);

-

-							// We save the path of mini file into file->... (seems not used)

-							$keyforfile = $version.'_url';

-							$file->$keyforfile = $options['upload_url'].urlencode($tmp[0].'_mini.'.$tmp[1]);

-						}

-					}

-				} elseif ($this->options['discard_aborted_uploads']) {

-					unlink($file_path);

-					$file->error = 'abort';

-				}

-				$file->size = $file_size;

-				$this->setFileDeleteUrl($file);

-			} else {

-				$file->error = 'failedtocreatedestdir';

-			}

-		} else {

-			// should not happen

-		}

-

+			}

+			elseif ($this->options['discard_aborted_uploads'])

+			{

+				unlink($file_path);

+				$file->error = 'abort';

+			}

+			$file->size = $file_size;

+			$this->setFileDeleteUrl($file);

+		}

@@ -479 +493,2 @@
-		if ($file_name) {

+		if ($file_name)

+		{

@@ -481 +496,3 @@
-		} else {

+		}

+		else

+		{

@@ -491 +508 @@
-	 * @return	int			0 if OK, nb of error if errors

+	 * @return	void

@@ -495,3 +512,2 @@
-		$error = 0;

-

-		if (isset($_REQUEST['_method']) && $_REQUEST['_method'] === 'DELETE') {

+		if (isset($_REQUEST['_method']) && $_REQUEST['_method'] === 'DELETE')

+		{

@@ -500,2 +515,0 @@
-		//var_dump($_FILES);

-

@@ -505 +519,2 @@
-		if ($upload && is_array($upload['tmp_name'])) {

+		if ($upload && is_array($upload['tmp_name']))

+		{

@@ -509,12 +524,8 @@
-				$tmpres = $this->handleFileUpload(

-					$upload['tmp_name'][$index],

-					isset($_SERVER['HTTP_X_FILE_NAME']) ? $_SERVER['HTTP_X_FILE_NAME'] : $upload['name'][$index],

-					isset($_SERVER['HTTP_X_FILE_SIZE']) ? $_SERVER['HTTP_X_FILE_SIZE'] : $upload['size'][$index],

-					isset($_SERVER['HTTP_X_FILE_TYPE']) ? $_SERVER['HTTP_X_FILE_TYPE'] : $upload['type'][$index],

-					$upload['error'][$index],

-					$index

-				);

-				if (!empty($tmpres->error)) {

-					$error++;

-				}

-				$info[] = $tmpres;

+                $info[] = $this->handleFileUpload(

+                    $upload['tmp_name'][$index],

+                    isset($_SERVER['HTTP_X_FILE_NAME']) ? $_SERVER['HTTP_X_FILE_NAME'] : $upload['name'][$index],

+                    isset($_SERVER['HTTP_X_FILE_SIZE']) ? $_SERVER['HTTP_X_FILE_SIZE'] : $upload['size'][$index],

+                    isset($_SERVER['HTTP_X_FILE_TYPE']) ? $_SERVER['HTTP_X_FILE_TYPE'] : $upload['type'][$index],

+                    $upload['error'][$index],

+                    $index

+                );

@@ -525,14 +536,9 @@
-			$tmpres = $this->handleFileUpload(

-				isset($upload['tmp_name']) ? $upload['tmp_name'] : null,

-				isset($_SERVER['HTTP_X_FILE_NAME']) ? $_SERVER['HTTP_X_FILE_NAME'] : (isset($upload['name']) ? $upload['name'] : null),

-				isset($_SERVER['HTTP_X_FILE_SIZE']) ? $_SERVER['HTTP_X_FILE_SIZE'] : (isset($upload['size']) ? $upload['size'] : null),

-				isset($_SERVER['HTTP_X_FILE_TYPE']) ? $_SERVER['HTTP_X_FILE_TYPE'] : (isset($upload['type']) ? $upload['type'] : null),

-				isset($upload['error']) ? $upload['error'] : null,

-				0

-			);

-			if (!empty($tmpres->error)) {

-				$error++;

-			}

-			$info[] = $tmpres;

-		}

-

+            $info[] = $this->handleFileUpload(

+                isset($upload['tmp_name']) ? $upload['tmp_name'] : null,

+                isset($_SERVER['HTTP_X_FILE_NAME']) ? $_SERVER['HTTP_X_FILE_NAME'] : (isset($upload['name']) ? $upload['name'] : null),

+                isset($_SERVER['HTTP_X_FILE_SIZE']) ? $_SERVER['HTTP_X_FILE_SIZE'] : (isset($upload['size']) ? $upload['size'] : null),

+                isset($_SERVER['HTTP_X_FILE_TYPE']) ? $_SERVER['HTTP_X_FILE_TYPE'] : (isset($upload['type']) ? $upload['type'] : null),

+                isset($upload['error']) ? $upload['error'] : null,

+                0

+            );

+		}

@@ -541,3 +547,2 @@
-

-		/* disabled. Param redirect seems not used

-		$redirect = isset($_REQUEST['redirect']) ? stripslashes($_REQUEST['redirect']) : null;

+		$redirect = isset($_REQUEST['redirect']) ?

+		stripslashes($_REQUEST['redirect']) : null;

@@ -545 +550 @@
-			header('Location: '.sprintf($redirect, urlencode($json)));

+			header('Location: '.sprintf($redirect, rawurlencode($json)));

@@ -548,3 +553,2 @@
-		*/

-

-		if (isset($_SERVER['HTTP_ACCEPT']) && (strpos($_SERVER['HTTP_ACCEPT'], 'application/json') !== false)) {

+		if (isset($_SERVER['HTTP_ACCEPT']) &&

+				(strpos($_SERVER['HTTP_ACCEPT'], 'application/json') !== false)) {

@@ -556,2 +559,0 @@
-

-		return $error;

@@ -563 +565 @@
-	 * @return	int

+	 * @return	void

@@ -567,5 +569,8 @@
-		$file_name = GETPOST('file') ? basename(GETPOST('file')) : null;

-		$file_path = $this->options['upload_dir'].dol_sanitizeFileName($file_name);

-		$success = dol_is_file($file_path) && $file_name[0] !== '.' && unlink($file_path);

-		if ($success) {

-			foreach ($this->options['image_versions'] as $version => $options) {

+		$file_name = isset($_REQUEST['file']) ?

+		basename(stripslashes($_REQUEST['file'])) : null;

+		$file_path = $this->options['upload_dir'].$file_name;

+		$success = is_file($file_path) && $file_name[0] !== '.' && unlink($file_path);

+		if ($success)

+		{

+			foreach ($this->options['image_versions'] as $version => $options)

+			{

@@ -573 +578,2 @@
-				if (dol_is_file($file)) {

+				if (is_file($file))

+				{

@@ -578 +583,0 @@
-		// Return result in json format

@@ -581,2 +585,0 @@
-

-		return 0;

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_fiscalyear.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_fiscalyear.class.php
@@ -4 +4 @@
- * Copyright (C) 2023       Frédéric France     <frederic.france@netlogic.fr>

+ *

@@ -39,5 +38,0 @@
-	 * @var string picto

-	 */

-	public $picto = 'calendar';

-

-	/**

@@ -49 +44 @@
-	 * @var string    Name of subtable line

+	 * @var int    Name of subtable line

@@ -54 +49 @@
-	 * @var string Field with ID of parent key if this field has a parent

+	 * @var int Field with ID of parent key if this field has a parent

@@ -75,4 +70,4 @@
-	 * Date start (date_start)

-	 *

-	 * @var integer

-	 */

+     * Date start (date_start)

+     *

+     * @var integer

+     */

@@ -82,4 +77,4 @@
-	 * Date end (date_end)

-	 *

-	 * @var integer

-	 */

+     * Date end (date_end)

+     *

+     * @var integer

+     */

@@ -89,17 +84,7 @@
-	 * Date creation record (datec)

-	 *

-	 * @var integer

-	 */

-	public $datec;

-

-	/**

-	 * @var int status 0=open, 1=closed

-	 * @deprecated

-	 * @see $status

-	 */

-	public $statut;

-

-	/**

-	 * @var int status 0=open, 1=closed

-	 */

-	public $status;

+     * Date creation record (datec)

+     *

+     * @var integer

+     */

+    public $datec;

+

+	public $statut; // 0=open, 1=closed

@@ -112,4 +97,2 @@
-

-	const STATUS_OPEN = 0;

-	const STATUS_CLOSED = 1;

-

+	public $statuts = array();

+	public $statuts_short = array();

@@ -123,0 +107,2 @@
+		global $langs;

+

@@ -126,2 +111,2 @@
-		$this->labelStatusShort = array(self::STATUS_OPEN => 'Opened', self::STATUS_CLOSED => 'Closed');

-		$this->labelStatus = array(self::STATUS_OPEN => 'Opened', self::STATUS_CLOSED => 'Closed');

+		$this->statuts_short = array(0 => 'Opened', 1 => 'Closed');

+		$this->statuts = array(0 => 'Opened', 1 => 'Closed');

@@ -134 +119 @@
-	 *	@return 	int				Return integer <0 if KO, >0 if OK

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

@@ -146 +131 @@
-		$sql = "INSERT INTO ".$this->db->prefix()."accounting_fiscalyear (";

+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."accounting_fiscalyear (";

@@ -159 +144 @@
-		$sql .= ", ".((int) $conf->entity);

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

@@ -161 +146 @@
-		$sql .= ", ".((int) $user->id);

+		$sql .= ", ".$user->id;

@@ -166,2 +151,3 @@
-		if ($result) {

-			$this->id = $this->db->last_insert_id($this->db->prefix()."accounting_fiscalyear");

+		if ($result)

+		{

+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."accounting_fiscalyear");

@@ -170 +156,2 @@
-			if ($result > 0) {

+			if ($result > 0)

+			{

@@ -173 +160,3 @@
-			} else {

+			}

+			else

+			{

@@ -178 +167,3 @@
-		} else {

+		}

+		else

+		{

@@ -189 +180 @@
-	 *	@return	int					Return integer <0 if KO, >0 if OK

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

@@ -192,0 +184,2 @@
+		global $langs;

+

@@ -194 +187,2 @@
-		if (empty($this->date_start) && empty($this->date_end)) {

+		if (empty($this->date_start) && empty($this->date_end))

+		{

@@ -201 +195 @@
-		$sql = "UPDATE ".$this->db->prefix()."accounting_fiscalyear";

+		$sql = "UPDATE ".MAIN_DB_PREFIX."accounting_fiscalyear";

@@ -205,3 +199,3 @@
-		$sql .= ", statut = '".$this->db->escape($this->status ? $this->status : 0)."'";

-		$sql .= ", fk_user_modif = ".((int) $user->id);

-		$sql .= " WHERE rowid = ".((int) $this->id);

+		$sql .= ", statut = '".$this->db->escape($this->statut ? $this->statut : 0)."'";

+		$sql .= ", fk_user_modif = ".$user->id;

+		$sql .= " WHERE rowid = ".$this->id;

@@ -211 +205,2 @@
-		if ($result) {

+		if ($result)

+		{

@@ -214 +209,3 @@
-		} else {

+		}

+		else

+		{

@@ -223,5 +220,5 @@
-	 * Load an object from database

-	 *

-	 * @param	int		$id		Id of record to load

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

-	 */

+	* Load an object from database

+	*

+	* @param	int		$id		Id of record to load

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

+	*/

@@ -230,3 +227,3 @@
-		$sql = "SELECT rowid, label, date_start, date_end, statut as status";

-		$sql .= " FROM ".$this->db->prefix()."accounting_fiscalyear";

-		$sql .= " WHERE rowid = ".((int) $id);

+		$sql = "SELECT rowid, label, date_start, date_end, statut";

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

+		$sql .= " WHERE rowid = ".$id;

@@ -236 +233,2 @@
-		if ($result) {

+		if ($result)

+		{

@@ -244,2 +242 @@
-			$this->statut = $obj->status;

-			$this->status = $obj->status;

+			$this->statut	    = $obj->statut;

@@ -248 +245,3 @@
-		} else {

+		}

+		else

+		{

@@ -254 +253 @@
-	/**

+    /**

@@ -258 +257 @@
-	 *	@return	int				Return integer <0 if KO, >0 if OK

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

@@ -264 +263 @@
-		$sql = "DELETE FROM ".$this->db->prefix()."accounting_fiscalyear WHERE rowid = ".((int) $id);

+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."accounting_fiscalyear WHERE rowid = ".$id;

@@ -268 +267,2 @@
-		if ($result) {

+		if ($result)

+		{

@@ -271 +271,3 @@
-		} else {

+		}

+		else

+		{

@@ -279,112 +280,0 @@
-	 * getTooltipContentArray

-	 *

-	 * @param array $params ex option, infologin

-	 * @since v18

-	 * @return array

-	 */

-	public function getTooltipContentArray($params)

-	{

-		global $langs;

-

-		$langs->load('compta');

-

-		$datas = [];

-		$datas['picto'] = img_picto('', $this->picto).' <b><u>'.$langs->trans("FiscalPeriod").'</u></b>';

-		if (isset($this->status)) {

-			$datas['picto'] .= ' '.$this->getLibStatut(5);

-		}

-		$datas['ref'] = '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;

-		if (isset($this->date_start)) {

-			$datas['date_start'] = '<br><b>'.$langs->trans('DateStart').':</b> '.dol_print_date($this->date_start, 'day');

-		}

-		if (isset($this->date_start)) {

-			$datas['date_end'] = '<br><b>'.$langs->trans('DateEnd').':</b> '.dol_print_date($this->date_end, 'day');

-		}

-

-		return $datas;

-	}

-

-	/**

-	 *	Return clicable link of object (with eventually picto)

-	 *

-	 *	@param      int			$withpicto                Add picto into link

-	 *  @param	    int   	    $notooltip		          1=Disable tooltip

-	 *  @param      int         $save_lastsearch_value    -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking

-	 *	@return     string          			          String with URL

-	 */

-	public function getNomUrl($withpicto = 0, $notooltip = 0, $save_lastsearch_value = -1)

-	{

-		global $conf, $langs, $user;

-

-		if (empty($this->ref)) {

-			$this->ref = $this->id;

-		}

-

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

-			$notooltip = 1; // Force disable tooltips

-		}

-		$option = '';

-		if (!$user->hasRight('accounting', 'fiscalyear', 'write')) {

-			$option = 'nolink';

-		}

-		$result = '';

-		$params = [

-			'id' => $this->id,

-			'objecttype' => $this->element,

-			'option', $option,

-			'nofetch' => 1,

-		];

-		$classfortooltip = 'classfortooltip';

-		$dataparams = '';

-		if (getDolGlobalInt('MAIN_ENABLE_AJAX_TOOLTIP')) {

-			$classfortooltip = 'classforajaxtooltip';

-			$dataparams = ' data-params="'.dol_escape_htmltag(json_encode($params)).'"';

-			$label = 'ToComplete';

-		} else {

-			$label = implode($this->getTooltipContentArray($params));

-		}

-		$url = DOL_URL_ROOT.'/accountancy/admin/fiscalyear_card.php?id='.$this->id;

-

-		if ($option !== 'nolink') {

-			// Add param to save lastsearch_values or not

-			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);

-			if ($save_lastsearch_value == -1 && isset($_SERVER["PHP_SELF"]) && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {

-				$add_save_lastsearch_values = 1;

-			}

-			if ($add_save_lastsearch_values) {

-				$url .= '&save_lastsearch_values=1';

-			}

-		}

-

-		$linkclose = '';

-		if (empty($notooltip) && $user->hasRight('accounting', 'fiscalyear', 'write')) {

-			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {

-				$label = $langs->trans("FiscalYear");

-				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';

-			}

-			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';

-			$linkclose .= $dataparams.' class="'.$classfortooltip.'"';

-		}

-

-		$linkstart = '<a href="'.$url.'"';

-		$linkstart .= $linkclose.'>';

-		$linkend = '</a>';

-

-		if ($option === 'nolink') {

-			$linkstart = '';

-			$linkend = '';

-		}

-

-		$result .= $linkstart;

-		if ($withpicto) {

-			$result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : $dataparams.' class="'.(($withpicto != 2) ? 'paddingright ' : '').$classfortooltip.'"'), 0, 0, $notooltip ? 0 : 1);

-		}

-		if ($withpicto != 2) {

-			$result .= $this->ref;

-		}

-		$result .= $linkend;

-

-		return $result;

-	}

-

-	/**

@@ -398 +288 @@
-		return $this->LibStatut($this->status, $mode);

+		return $this->LibStatut($this->statut, $mode);

@@ -412,16 +302,30 @@
-		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {

-			global $langs;

-			//$langs->load("mymodule@mymodule");

-			$this->labelStatus[self::STATUS_OPEN] = $langs->transnoentitiesnoconv('Draft');

-			$this->labelStatus[self::STATUS_CLOSED] = $langs->transnoentitiesnoconv('Enabled');

-			$this->labelStatusShort[self::STATUS_OPEN] = $langs->transnoentitiesnoconv('Enabled');

-			$this->labelStatusShort[self::STATUS_CLOSED] = $langs->transnoentitiesnoconv('Disabled');

-		}

-

-		$statusType = 'status4';

-		//if ($status == self::STATUS_VALIDATED) $statusType = 'status1';

-		if ($status == self::STATUS_CLOSED) {

-			$statusType = 'status6';

-		}

-

-		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);

+		global $langs;

+

+		if ($mode == 0)

+		{

+			return $langs->trans($this->statuts[$status]);

+		}

+		elseif ($mode == 1)

+		{

+			return $langs->trans($this->statuts_short[$status]);

+		}

+		elseif ($mode == 2)

+		{

+			if ($status == 0) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts_short[$status]);

+			elseif ($status == 1) return img_picto($langs->trans($this->statuts_short[$status]), 'statut8').' '.$langs->trans($this->statuts_short[$status]);

+		}

+		elseif ($mode == 3)

+		{

+			if ($status == 0 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4');

+			elseif ($status == 1 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut8');

+		}

+		elseif ($mode == 4)

+		{

+			if ($status == 0 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts[$status]);

+			elseif ($status == 1 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut8').' '.$langs->trans($this->statuts[$status]);

+		}

+		elseif ($mode == 5)

+		{

+			if ($status == 0 && !empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut4');

+			elseif ($status == 1 && !empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut6');

+		}

@@ -438,4 +342,4 @@
-		$sql = "SELECT fy.rowid, fy.datec, fy.fk_user_author, fy.fk_user_modif,";

-		$sql .= " fy.tms as datem";

-		$sql .= " FROM ".$this->db->prefix()."accounting_fiscalyear as fy";

-		$sql .= " WHERE fy.rowid = ".((int) $id);

+		$sql = 'SELECT fy.rowid, fy.datec, fy.fk_user_author, fy.fk_user_modif,';

+		$sql .= ' fy.tms';

+		$sql .= ' FROM '.MAIN_DB_PREFIX.'accounting_fiscalyear as fy';

+		$sql .= ' WHERE fy.rowid = '.$id;

@@ -446,2 +350,4 @@
-		if ($result) {

-			if ($this->db->num_rows($result)) {

+		if ($result)

+		{

+			if ($this->db->num_rows($result))

+			{

@@ -449 +354,0 @@
-

@@ -451,3 +356,12 @@
-

-				$this->user_creation_id = $obj->fk_user_author;

-				$this->user_modification_id = $obj->fk_user_modif;

+				if ($obj->fk_user_author)

+				{

+					$cuser = new User($this->db);

+					$cuser->fetch($obj->fk_user_author);

+					$this->user_creation = $cuser;

+				}

+				if ($obj->fk_user_modif)

+				{

+					$muser = new User($this->db);

+					$muser->fetch($obj->fk_user_modif);

+					$this->user_modification = $muser;

+				}

@@ -455 +369 @@
-				$this->date_modification = $this->db->jdate($obj->datem);

+				$this->date_modification = $this->db->jdate($obj->tms);

@@ -458 +372,3 @@
-		} else {

+		}

+		else

+		{

@@ -466,3 +382,3 @@
-	 *	@param	int|string		$datestart	Date start to scan

-	 *	@param	int|string		$dateend	Date end to scan

-	 *	@return	string			Number of entries

+	 *	@param	int		$datestart	Date start to scan

+	 *	@param	int		$dateend	Date end to scan

+	 *	@return	string				Number of entries

@@ -474 +390 @@
-		if (empty($datestart)) {

+		if (empty($datestart))

@@ -476,2 +392 @@
-		}

-		if (empty($dateend)) {

+		if (empty($dateend))

@@ -479 +393,0 @@
-		}

@@ -482 +396 @@
-		$sql .= " FROM ".$this->db->prefix()."accounting_bookkeeping";

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

@@ -487 +401,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -490,3 +405,2 @@
-		} else {

-			dol_print_error($this->db);

-		}

+		}

+		else dol_print_error($this->db);

@@ -500,2 +414,2 @@
-	 *  @param	int|string		$datestart	Date start to scan

-	 *  @param	int|string		$dateend	Date end to scan

+	 *  @param	int		$datestart	Date start to scan

+	 *  @param	int		$dateend	Date end to scan

@@ -508 +422 @@
-		if (empty($datestart)) {

+		if (empty($datestart))

@@ -510,2 +424 @@
-		}

-		if (empty($dateend)) {

+		if (empty($dateend))

@@ -513 +425,0 @@
-		}

@@ -516 +428 @@
-		$sql .= " FROM ".$this->db->prefix()."accounting_bookkeeping ";

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

@@ -521 +433,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -524,3 +437,2 @@
-		} else {

-			dol_print_error($this->db);

-		}

+		}

+		else dol_print_error($this->db);

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_genericobject.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_genericobject.class.php
@@ -32,9 +32,9 @@
-	/**

-	 * Constructor

-	 *

-	 * @param       DoliDB      $db     Database handler

-	 */

-	public function __construct($db)

-	{

-		$this->db = $db;

-	}

+    /**

+     * Constructor

+     *

+     * @param       DoliDB      $db     Database handler

+     */

+    public function __construct($db)

+    {

+        $this->db = $db;

+    }

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_google.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_google.class.php
@@ -29,4 +29,4 @@
-	/**

-	 * @var DoliDB Database handler.

-	 */

-	public $db;

+    /**

+     * @var DoliDB Database handler.

+     */

+    public $db;

@@ -34,4 +34,4 @@
-	/**

-	 * @var string Error code (or message)

-	 */

-	public $error = '';

+    /**

+     * @var string Error code (or message)

+     */

+    public $error = '';

@@ -39 +39 @@
-	public $key;

+    public $key;

@@ -41,11 +41,11 @@
-	/**

-	 * Constructor

-	 *

-	 * @param 	DoliDB		$db			Database handler

-	 * @param	string		$key		Google key

-	 */

-	public function __construct($db, $key)

-	{

-		$this->db = $db;

-		$this->key = $key;

-	}

+    /**

+     * Constructor

+     *

+     * @param 	DoliDB		$db			Database handler

+     * @param	string		$key		Google key

+     */

+    public function __construct($db, $key)

+    {

+        $this->db = $db;

+        $this->key = $key;

+    }

@@ -54,11 +54,11 @@
-	/**

-	 *  Return geo coordinates of an address

-	 *

-	 *  @param	string	$address	Address

-	 * 								Example: 68 Grande rue Charles de Gaulle,+94130,+Nogent sur Marne,+France

-	 *								Example: 188, rue de Fontenay,+94300,+Vincennes,+France

-	 *	@return	string				Coordinates

-	 */

-	public function getGeoCoordinatesOfAddress($address)

-	{

-		global $conf;

+    /**

+     *  Return geo coordinates of an address

+     *

+     *  @param	string	$address	Address

+     * 								Example: 68 Grande rue Charles de Gaulle,+94130,+Nogent sur Marne,+France

+     *								Example: 188, rue de Fontenay,+94300,+Vincennes,+France

+     *	@return	string				Coordinates

+     */

+    public function getGeoCoordinatesOfAddress($address)

+    {

+        global $conf;

@@ -66 +66 @@
-		$i = 0;

+        $i = 0;

@@ -68,2 +68,2 @@
-		// Desired address

-		$urladdress = "https://maps.google.com/maps/geo?q=".urlencode($address)."&output=xml&key=".urlencode($this->key);

+        // Desired address

+        $urladdress = "https://maps.google.com/maps/geo?q=".urlencode($address)."&output=xml&key=".$this->key;

@@ -71,4 +71,2 @@
-		// Retrieve the URL contents

-		require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';

-		$pagearray = getURLContent($urladdress, 'GET');

-		$page = $pagearray['content'];

+        // Retrieve the URL contents

+        $page = file_get_contents($urladdress);

@@ -76,8 +74,8 @@
-		$code = strstr($page, '<coordinates>');

-		$code = strstr($code, '>');

-		$val = strpos($code, "<");

-		$code = substr($code, 1, $val - 1);

-		//print $code;

-		//print "<br>";

-		$latitude = substr($code, 0, strpos($code, ","));

-		$longitude = substr($code, strpos($code, ",") + 1, dol_strlen(strpos($code, ",")) - 3);

+        $code = strstr($page, '<coordinates>');

+        $code = strstr($code, '>');

+        $val = strpos($code, "<");

+        $code = substr($code, 1, $val - 1);

+        //print $code;

+        //print "<br>";

+        $latitude = substr($code, 0, strpos($code, ","));

+        $longitude = substr($code, strpos($code, ",") + 1, dol_strlen(strpos($code, ",")) - 3);

@@ -85,2 +83,2 @@
-		// Output the coordinates

-		//echo "Longitude: $longitude ',' Latitude: $latitude";

+        // Output the coordinates

+        //echo "Longitude: $longitude ',' Latitude: $latitude";

@@ -88,3 +86,2 @@
-		$i++;

-		return "Longitude: $longitude, Latitude: $latitude";

-	}

+        $i++;

+    }

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_hookmanager.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_hookmanager.class.php
@@ -33,3 +33,3 @@
-	 * @var DoliDB Database handler.

-	 */

-	public $db;

+     * @var DoliDB Database handler.

+     */

+    public $db;

@@ -47,2 +47,2 @@
-	// Context hookmanager was created for ('thirdpartycard', 'thirdpartydao', ...)

-	public $contextarray = array();

+    // Context hookmanager was created for ('thirdpartycard', 'thirdpartydao', ...)

+    public $contextarray = array();

@@ -51 +51 @@
-	public $hooks = array();

+    public $hooks = array();

@@ -54 +54 @@
-	public $resArray = array();

+    public $resArray = array();

@@ -56 +56 @@
-	public $resPrint = '';

+    public $resPrint = '';

@@ -58 +58 @@
-	public $resNbOfHooks = 0;

+    public $resNbOfHooks = 0;

@@ -80 +80 @@
-	 *	@return	int								0 or 1

+	 *	@return	int							    Always 1

@@ -87,8 +87,4 @@
-		if (!is_array($conf->modules_parts['hooks']) || empty($conf->modules_parts['hooks'])) {

-			return 0;

-		}

-

-		// For backward compatibility

-		if (!is_array($arraycontext)) {

-			$arraycontext = array($arraycontext);

-		}

+        if (!is_array($conf->modules_parts['hooks']) || empty($conf->modules_parts['hooks'])) return;

+

+        // For backward compatibility

+		if (!is_array($arraycontext)) $arraycontext = array($arraycontext);

@@ -99,4 +95,3 @@
-		foreach ($conf->modules_parts['hooks'] as $module => $hooks) {	// Loop on each module that brings hooks

-			if (empty($conf->$module->enabled)) {

-				continue;

-			}

+		foreach ($conf->modules_parts['hooks'] as $module => $hooks)	// Loop on each module that brings hooks

+		{

+			if (empty($conf->$module->enabled)) continue;

@@ -105,8 +100,7 @@
-			foreach ($arraycontext as $context) {

-				if (is_array($hooks)) {

-					$arrayhooks = $hooks; // New system

-				} else {

-					$arrayhooks = explode(':', $hooks); // Old system (for backward compatibility)

-				}

-

-				if (in_array($context, $arrayhooks) || in_array('all', $arrayhooks)) {    // We instantiate action class only if initialized hook is handled by module

+			foreach ($arraycontext as $context)

+			{

+				if (is_array($hooks)) $arrayhooks = $hooks; // New system

+				else $arrayhooks = explode(':', $hooks); // Old system (for backward compatibility)

+

+				if (in_array($context, $arrayhooks) || in_array('all', $arrayhooks))    // We instantiate action class only if initialized hook is handled by module

+				{

@@ -114 +108,2 @@
-					if (empty($this->hooks[$context][$module]) || !is_object($this->hooks[$context][$module])) {	// If set to an object value, class was already loaded so we do nothing.

+					if (!is_object($this->hooks[$context][$module]))	// If set, class was already loaded

+					{

@@ -120 +115,2 @@
-						if ($resaction) {

+						if ($resaction)

+						{

@@ -123,2 +119 @@
-							$priority = empty($actionInstance->priority) ? 50 : $actionInstance->priority;

-							$this->hooks[$context][$priority.':'.$module] = $actionInstance;

+							$this->hooks[$context][$module] = $actionInstance;

@@ -130,2 +125,2 @@
-		// Log the init of hook but only for hooks thare are declared to be managed

-		if (count($arraytolog) > 0) {

+		if (count($arraytolog) > 0)

+		{

@@ -135,6 +129,0 @@
-		foreach ($arraycontext as $context) {

-			if (!empty($this->hooks[$context])) {

-				ksort($this->hooks[$context], SORT_NATURAL);

-			}

-		}

-

@@ -144,13 +133,13 @@
-	/**

-	 *  Execute hooks (if they were initialized) for the given method

-	 *

-	 *  @param		string	$method			Name of method hooked ('doActions', 'printSearchForm', 'showInputField', ...)

-	 *  @param		array	$parameters		Array of parameters

-	 *  @param		Object	$object			Object to use hooks on

-	 *  @param		string	$action			Action code on calling page ('create', 'edit', 'view', 'add', 'update', 'delete'...)

-	 *  @return		int						For 'addreplace' hooks (doActions, formConfirm, formObjectOptions, pdf_xxx,...): 	Return 0 if we want to keep standard actions, >0 if we want to stop/replace standard actions, <0 if KO. Things to print are returned into ->resprints and set into ->resPrint. Things to return are returned into ->results by hook and set into ->resArray for caller.

-	 *                                      For 'output' hooks (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...):	Return 0 if we want to keep standard actions, >0 uf we want to stop/replace standard actions (at least one > 0 and replacement will be done), <0 if KO. Things to print are returned into ->resprints and set into ->resPrint. Things to return are returned into ->results by hook and set into ->resArray for caller.

-	 *                                      All types can also return some values into an array ->results that will be finaly merged into this->resArray for caller.

-	 *                                      $this->error or this->errors are also defined by class called by this function if error.

-	 */

-	public function executeHooks($method, $parameters = array(), &$object = null, &$action = '')

+    /**

+     *  Execute hooks (if they were initialized) for the given method

+     *

+     *  @param		string	$method			Name of method hooked ('doActions', 'printSearchForm', 'showInputField', ...)

+     *  @param		array	$parameters		Array of parameters

+     *  @param		Object	$object			Object to use hooks on

+     *  @param		string	$action			Action code on calling page ('create', 'edit', 'view', 'add', 'update', 'delete'...)

+     *  @return		mixed					For 'addreplace' hooks (doActions,formObjectOptions,pdf_xxx,...):  					Return 0 if we want to keep standard actions, >0 if we want to stop/replace standard actions, <0 if KO. Things to print are returned into ->resprints and set into ->resPrint. Things to return are returned into ->results by hook and set into ->resArray for caller.

+     *                                      For 'output' hooks (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...):	Return 0, <0 if KO. Things to print are returned into ->resprints and set into ->resPrint. Things to return are returned into ->results by hook and set into ->resArray for caller.

+     *                                      All types can also return some values into an array ->results that will be finaly merged into this->resArray for caller.

+     *                                      $this->error or this->errors are also defined by class called by this function if error.

+     */

+	public function executeHooks($method, $parameters = array(), &$object = '', &$action = '')

@@ -158,168 +147,155 @@
-		if (!is_array($this->hooks) || empty($this->hooks)) {

-			return 0; // No hook available, do nothing.

-		}

-		if (!is_array($parameters)) {

-			dol_syslog('executeHooks was called with a non array $parameters. Surely a bug.', LOG_WARNING);

-			$parameters = array();

-		}

-

-		$parameters['context'] = join(':', $this->contextarray);

-		//dol_syslog(get_class($this).'::executeHooks method='.$method." action=".$action." context=".$parameters['context']);

-

-		// Define type of hook ('output' or 'addreplace').

-		$hooktype = 'addreplace';

-		// TODO Remove hooks with type 'output' (exemple createFrom). All hooks must be converted into 'addreplace' hooks.

-		if (in_array($method, array(

-			'createFrom',

-			'dashboardAccountancy',

-			'dashboardActivities',

-			'dashboardCommercials',

-			'dashboardContracts',

-			'dashboardDonation',

-			'dashboardEmailings',

-			'dashboardExpenseReport',

-			'dashboardHRM',

-			'dashboardInterventions',

-			'dashboardMRP',

-			'dashboardMembers',

-			'dashboardOpensurvey',

-			'dashboardOrders',

-			'dashboardOrdersSuppliers',

-			'dashboardProductServices',

-			'dashboardProjects',

-			'dashboardPropals',

-			'dashboardSpecialBills',

-			'dashboardSupplierProposal',

-			'dashboardThirdparties',

-			'dashboardTickets',

-			'dashboardUsersGroups',

-			'dashboardWarehouse',

-			'dashboardWarehouseReceptions',

-			'dashboardWarehouseSendings',

-			'insertExtraHeader',

-			'insertExtraFooter',

-			'printLeftBlock',

-			'formAddObjectLine',

-			'formBuilddocOptions',

-			'showSocinfoOnPrint'

-		))) {

-			$hooktype = 'output';

-		}

-

-		// Init return properties

-		$localResPrint = '';

-		$this->resArray = array();

-		$this->resNbOfHooks = 0;

-

-		// Here, the value for $method and $hooktype are given.

-		// Loop on each hook to qualify modules that have declared context

-		$modulealreadyexecuted = array();

-		$resaction = 0;

-		$error = 0;

-		foreach ($this->hooks as $context => $modules) {    // $this->hooks is an array with context as key and value is an array of modules that handle this context

-			if (!empty($modules)) {

-				// Loop on each active hooks of module for this context

-				foreach ($modules as $module => $actionclassinstance) {

-					$module = preg_replace('/^\d+:/', '', $module);

-					//print "Before hook ".get_class($actionclassinstance)." method=".$method." module=".$module." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction."<br>\n";

-

-					// test to avoid running twice a hook, when a module implements several active contexts

-					if (in_array($module, $modulealreadyexecuted)) {

-						continue;

-					}

-

-					// jump to next module/class if method does not exist

-					if (!method_exists($actionclassinstance, $method)) {

-						continue;

-					}

-

-					$this->resNbOfHooks++;

-

-					$modulealreadyexecuted[$module] = $module;

-

-					// Clean class (an error may have been set from a previous call of another method for same module/hook)

-					$actionclassinstance->error = 0;

-					$actionclassinstance->errors = array();

-

-					if (getDolGlobalInt('MAIN_HOOK_DEBUG')) {

-						// This his too much verbose, enabled if const enabled only

-						dol_syslog(get_class($this)."::executeHooks Qualified hook found (hooktype=".$hooktype."). We call method ".get_class($actionclassinstance).'->'.$method.", context=".$context.", module=".$module.", action=".$action.((is_object($object) && property_exists($object, 'id')) ? ', object id='.$object->id : '').((is_object($object) && property_exists($object, 'element')) ? ', object element='.$object->element : ''), LOG_DEBUG);

-					}

-

-					// Add current context to avoid method execution in bad context, you can add this test in your method : eg if($currentcontext != 'formfile') return;

-					// Note: The hook can use the $currentcontext in its code to avoid to be ran twice or be ran for one given context only

-					$parameters['currentcontext'] = $context;

-					// Hooks that must return int (hooks with type 'addreplace')

-					if ($hooktype == 'addreplace') {

-						$resactiontmp = $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)

-						$resaction += $resactiontmp;

-

-						if ($resactiontmp < 0 || !empty($actionclassinstance->error) || (!empty($actionclassinstance->errors) && count($actionclassinstance->errors) > 0)) {

-							$error++;

-							$this->error = $actionclassinstance->error;

-							$this->errors = array_merge($this->errors, (array) $actionclassinstance->errors);

-							dol_syslog("Error on hook module=".$module.", method ".$method.", class ".get_class($actionclassinstance).", hooktype=".$hooktype.(empty($this->error) ? '' : " ".$this->error).(empty($this->errors) ? '' : " ".join(",", $this->errors)), LOG_ERR);

-						}

-

-						if (isset($actionclassinstance->results) && is_array($actionclassinstance->results)) {

-							if ($resactiontmp > 0) {

-								$this->resArray = $actionclassinstance->results;

-							} else {

-								$this->resArray = array_merge($this->resArray, $actionclassinstance->results);

-							}

-						}

-						if (!empty($actionclassinstance->resprints)) {

-							if ($resactiontmp > 0) {

-								$localResPrint = $actionclassinstance->resprints;

-							} else {

-								$localResPrint .= $actionclassinstance->resprints;

-							}

-						}

-					} else {

-						// Generic hooks that return a string or array (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...)

-

-						// TODO. this test should be done into the method of hook by returning nothing

-						if (is_array($parameters) && !empty($parameters['special_code']) && $parameters['special_code'] > 3 && $parameters['special_code'] != $actionclassinstance->module_number) {

-							continue;

-						}

-

-						if (getDolGlobalInt('MAIN_HOOK_DEBUG')) {

-							dol_syslog("Call method ".$method." of class ".get_class($actionclassinstance).", module=".$module.", hooktype=".$hooktype, LOG_DEBUG);

-						}

-

-						$resactiontmp = $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)

-						$resaction += $resactiontmp;

-

-						if (!empty($actionclassinstance->results) && is_array($actionclassinstance->results)) {

-							$this->resArray = array_merge($this->resArray, $actionclassinstance->results);

-						}

-						if (!empty($actionclassinstance->resprints)) {

-							$localResPrint .= $actionclassinstance->resprints;

-						}

-						if (is_numeric($resactiontmp) && $resactiontmp < 0) {

-							$error++;

-							$this->error = $actionclassinstance->error;

-							$this->errors = array_merge($this->errors, (array) $actionclassinstance->errors);

-							dol_syslog("Error on hook module=".$module.", method ".$method.", class ".get_class($actionclassinstance).", hooktype=".$hooktype.(empty($this->error) ? '' : " ".$this->error).(empty($this->errors) ? '' : " ".join(",", $this->errors)), LOG_ERR);

-						}

-

-						// TODO dead code to remove (do not disable this, but fix your hook instead): result must not be a string but an int. you must use $actionclassinstance->resprints to return a string

-						if (!is_array($resactiontmp) && !is_numeric($resactiontmp)) {

-							dol_syslog('Error: Bug into hook '.$method.' of module class '.get_class($actionclassinstance).'. Method must not return a string but an int (0=OK, 1=Replace, -1=KO) and set string into ->resprints', LOG_ERR);

-							if (empty($actionclassinstance->resprints)) {

-								$localResPrint .= $resactiontmp;

-							}

-						}

-					}

-

-					//print "After hook context=".$context." ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction."<br>\n";

-

-					unset($actionclassinstance->results);

-					unset($actionclassinstance->resprints);

-				}

-			}

-		}

-

-		$this->resPrint = $localResPrint;

-

-		return ($error ? -1 : $resaction);

+        if (!is_array($this->hooks) || empty($this->hooks)) return '';

+

+        $parameters['context'] = join(':', $this->contextarray);

+        //dol_syslog(get_class($this).'::executeHooks method='.$method." action=".$action." context=".$parameters['context']);

+

+        // Define type of hook ('output' or 'addreplace'). Type 'returnvalue' is deprecated because a 'addreplace' hook can also return resPrint and resArray).

+        $hooktype = 'output';

+        if (in_array(

+			$method,

+			array(

+				'addCalendarChoice',

+				'addMoreActionsButtons',

+				'addMoreMassActions',

+				'addSearchEntry',

+				'addStatisticLine',

+				'createDictionaryFieldlist',

+				'editDictionaryFieldlist',

+				'getFormMail',

+				'deleteFile',

+				'doActions',

+				'doMassActions',

+				'formatEvent',

+				'formCreateThirdpartyOptions',

+				'formObjectOptions',

+				'formattachOptions',

+				'formBuilddocLineOptions',

+				'formatNotificationMessage',

+				'getAccessForbiddenMessage',

+				'getDirList',

+				'getFormMail',

+				'getFormatedCustomerRef',

+			    'getFormatedSupplierRef',

+				'getIdProfUrl',

+				'getInputIdProf',

+				'moveUploadedFile',

+				'moreHtmlStatus',

+				'pdf_build_address',

+				'pdf_writelinedesc',

+			    'pdf_getlinenum',

+			    'pdf_getlineref',

+			    'pdf_getlineref_supplier',

+			    'pdf_getlinevatrate',

+			    'pdf_getlineupexcltax',

+			    'pdf_getlineupwithtax',

+			    'pdf_getlineqty',

+			    'pdf_getlineqty_asked',

+			    'pdf_getlineqty_shipped',

+			    'pdf_getlineqty_keeptoship',

+			    'pdf_getlineunit',

+			    'pdf_getlineremisepercent',

+			    'pdf_getlineprogress',

+			    'pdf_getlinetotalexcltax',

+			    'pdf_getlinetotalwithtax',

+				'paymentsupplierinvoices',

+				'printAddress',

+				'printEmail',

+				'printSearchForm',

+				'printTabsHead',

+				'printObjectLine',

+				'printObjectSubLine',

+				'restrictedArea',

+				'sendMail',

+				'sendMailAfter',

+				'showLinkToObjectBlock',

+				'setContentSecurityPolicy',

+				'setHtmlTitle',

+                'completeTabsHead'

+				)

+			)) $hooktype = 'addreplace';

+

+        if ($method == 'insertExtraFields') {

+            $hooktype = 'returnvalue'; // @deprecated. TODO Remove all code with "executeHooks('insertExtraFields'" as soon as there is a trigger available.

+            dol_syslog("Warning: The hook 'insertExtraFields' is deprecated and must not be used. Use instead trigger on CRUD event (ask it to dev team if not implemented)", LOG_WARNING);

+        }

+

+        // Init return properties

+        $this->resPrint = ''; $this->resArray = array(); $this->resNbOfHooks = 0;

+

+        // Loop on each hook to qualify modules that have declared context

+        $modulealreadyexecuted = array();

+        $resaction = 0; $error = 0; $result = '';

+        foreach ($this->hooks as $context => $modules)    // $this->hooks is an array with context as key and value is an array of modules that handle this context

+        {

+            if (!empty($modules))

+            {

+                foreach ($modules as $module => $actionclassinstance)

+                {

+                	//print "Before hook ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction." result=".$result."<br>\n";

+

+                    // test to avoid running twice a hook, when a module implements several active contexts

+                    if (in_array($module, $modulealreadyexecuted)) continue;

+

+                	// jump to next module/class if method does not exist

+                    if (!method_exists($actionclassinstance, $method)) continue;

+

+                    $this->resNbOfHooks++;

+

+                    $modulealreadyexecuted[$module] = $module; // Use the $currentcontext in method to avoid running twice

+

+                    // Clean class (an error may have been set from a previous call of another method for same module/hook)

+                    $actionclassinstance->error = 0;

+                    $actionclassinstance->errors = array();

+

+                    dol_syslog(get_class($this)."::executeHooks Qualified hook found (hooktype=".$hooktype."). We call method ".$method." of class ".get_class($actionclassinstance).", module=".$module.", action=".$action." context=".$context, LOG_DEBUG);

+

+                    // Add current context to avoid method execution in bad context, you can add this test in your method : eg if($currentcontext != 'formfile') return;

+                    $parameters['currentcontext'] = $context;

+                    // Hooks that must return int (hooks with type 'addreplace')

+                    if ($hooktype == 'addreplace')

+                    {

+                    	$resaction += $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)

+                    	if ($resaction < 0 || !empty($actionclassinstance->error) || (!empty($actionclassinstance->errors) && count($actionclassinstance->errors) > 0))

+                    	{

+                    		$error++;

+                    		$this->error = $actionclassinstance->error; $this->errors = array_merge($this->errors, (array) $actionclassinstance->errors);

+                    		dol_syslog("Error on hook module=".$module.", method ".$method.", class ".get_class($actionclassinstance).", hooktype=".$hooktype.(empty($this->error) ? '' : " ".$this->error).(empty($this->errors) ? '' : " ".join(",", $this->errors)), LOG_ERR);

+                    	}

+

+                    	if (isset($actionclassinstance->results) && is_array($actionclassinstance->results))  $this->resArray = array_merge($this->resArray, $actionclassinstance->results);

+                    	if (!empty($actionclassinstance->resprints)) $this->resPrint .= $actionclassinstance->resprints;

+                    }

+                    // Generic hooks that return a string or array (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...)

+                    else

+					{

+                    	// TODO. this test should be done into the method of hook by returning nothing

+                    	if (is_array($parameters) && !empty($parameters['special_code']) && $parameters['special_code'] > 3 && $parameters['special_code'] != $actionclassinstance->module_number) continue;

+

+                    	//dol_syslog("Call method ".$method." of class ".get_class($actionclassinstance).", module=".$module.", hooktype=".$hooktype, LOG_DEBUG);

+                    	$resaction = $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)

+

+                    	if (!empty($actionclassinstance->results) && is_array($actionclassinstance->results)) $this->resArray = array_merge($this->resArray, $actionclassinstance->results);

+                    	if (!empty($actionclassinstance->resprints)) $this->resPrint .= $actionclassinstance->resprints;

+                    	if (is_numeric($resaction) && $resaction < 0)

+                    	{

+                    	    $error++;

+                    	    $this->error = $actionclassinstance->error; $this->errors = array_merge($this->errors, (array) $actionclassinstance->errors);

+                    	    dol_syslog("Error on hook module=".$module.", method ".$method.", class ".get_class($actionclassinstance).", hooktype=".$hooktype.(empty($this->error) ? '' : " ".$this->error).(empty($this->errors) ? '' : " ".join(",", $this->errors)), LOG_ERR);

+                    	}

+                    	// TODO dead code to remove (do not enable this, but fix hook instead): result must not be a string but an int. you must use $actionclassinstance->resprints to return a string

+                    	if (!is_array($resaction) && !is_numeric($resaction))

+                    	{

+                    		dol_syslog('Error: Bug into hook '.$method.' of module class '.get_class($actionclassinstance).'. Method must not return a string but an int (0=OK, 1=Replace, -1=KO) and set string into ->resprints', LOG_ERR);

+                    		if (empty($actionclassinstance->resprints)) { $this->resPrint .= $resaction; $resaction = 0; }

+                    	}

+                    }

+

+                    //print "After hook  ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction." result=".$result."<br>\n";

+

+                    unset($actionclassinstance->results);

+                    unset($actionclassinstance->resprints);

+                }

+            }

+        }

+

+        return ($error ?-1 : $resaction);

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_html.form.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_html.form.class.php
@@ -13 +13 @@
- * Copyright (C) 2010-2021  Philippe Grand          <philippe.grand@atoo-net.com>

+ * Copyright (C) 2010-2019  Philippe Grand          <philippe.grand@atoo-net.com>

@@ -18,3 +18,3 @@
- * Copyright (C) 2014-2023  Alexandre Spangaro      <aspangaro@open-dsi.fr>

- * Copyright (C) 2018-2022  Ferran Marcet           <fmarcet@2byte.es>

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

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

+ * Copyright (C) 2018       Ferran Marcet           <fmarcet@2byte.es>

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

@@ -24,2 +23,0 @@
- * Copyright (C) 2023		Joachim Kueter			<git-jk@bloxera.com>

- * Copyright (C) 2023		Nick Fragoulis

@@ -42,3 +40,3 @@
- * \file       htdocs/core/class/html.form.class.php

- * \ingroup    core

- * \brief      File of class with all html predefined components

+ *	\file       htdocs/core/class/html.form.class.php

+ *  \ingroup    core

+ *	\brief      File of class with all html predefined components

@@ -49,2 +47,2 @@
- * Class to manage generation of HTML components

- * Only common components must be here.

+ *	Class to manage generation of HTML components

+ *	Only common components must be here.

@@ -52 +50 @@
- * TODO Merge all function load_cache_* and loadCache* (except load_cache_vatrates) into one generic function loadCacheTable

+ *  TODO Merge all function load_cache_* and loadCache* (except load_cache_vatrates) into one generic function loadCacheTable

@@ -71,2 +68,0 @@
-	// Some properties used to return data by some methods

-	public $result;

@@ -78 +73,0 @@
-	public $cache_transport_mode = array();

@@ -83 +77,0 @@
-	public $cache_invoice_subtype = array();

@@ -89 +83 @@
-	 * @param DoliDB $db Database handler

+	 * @param		DoliDB		$db      Database handler

@@ -99,12 +93,12 @@
-	 * @param 	string 	$text 			Text of label or key to translate

-	 * @param 	string 	$htmlname 		Name of select field ('edit' prefix will be added)

-	 * @param 	string 	$preselected 	Value to show/edit (not used in this function)

-	 * @param 	object 	$object 		Object (on the page we show)

-	 * @param 	boolean $perm 			Permission to allow button to edit parameter. Set it to 0 to have a not edited field.

-	 * @param 	string 	$typeofdata 	Type of data ('string' by default, 'email', 'amount:99', 'numeric:99', 'text' or 'textarea:rows:cols', 'datepicker' ('day' do not work, don't know why), 'dayhour' or 'datehourpicker' 'checkbox:ckeditor:dolibarr_zzz:width:height:savemethod:1:rows:cols', 'select;xxx[:class]'...)

-	 * @param 	string 	$moreparam 		More param to add on a href URL.

-	 * @param 	int 	$fieldrequired 	1 if we want to show field as mandatory using the "fieldrequired" CSS.

-	 * @param 	int 	$notabletag 	1=Do not output table tags but output a ':', 2=Do not output table tags and no ':', 3=Do not output table tags but output a ' '

-	 * @param 	string 	$paramid 		Key of parameter for id ('id', 'socid')

-	 * @param 	string 	$help 			Tooltip help

-	 * @return  string                  HTML edit field

+	 * @param   string	$text			Text of label or key to translate

+	 * @param   string	$htmlname		Name of select field ('edit' prefix will be added)

+	 * @param   string	$preselected    Value to show/edit (not used in this function)

+	 * @param	object	$object			Object

+	 * @param	boolean	$perm			Permission to allow button to edit parameter. Set it to 0 to have a not edited field.

+	 * @param	string	$typeofdata		Type of data ('string' by default, 'email', 'amount:99', 'numeric:99', 'text' or 'textarea:rows:cols', 'datepicker' ('day' do not work, don't know why), 'ckeditor:dolibarr_zzz:width:height:savemethod:1:rows:cols', 'select;xxx[:class]'...)

+	 * @param	string	$moreparam		More param to add on a href URL.

+	 * @param   int     $fieldrequired  1 if we want to show field as mandatory using the "fieldrequired" CSS.

+	 * @param   int     $notabletag     1=Do not output table tags but output a ':', 2=Do not output table tags and no ':', 3=Do not output table tags but output a ' '

+	 * @param	string	$paramid		Key of parameter for id ('id', 'socid')

+	 * @param	string	$help			Tooltip help

+	 * @return	string					HTML edit field

@@ -119,2 +113,4 @@
-		if (getDolGlobalString('MAIN_USE_JQUERY_JEDITABLE') && !preg_match('/^select;/', $typeofdata)) {

-			if (!empty($perm)) {

+		if (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && !preg_match('/^select;/', $typeofdata))

+		{

+			if (!empty($perm))

+			{

@@ -122,4 +118,2 @@
-				$ret .= '<div class="editkey_' . $tmp[0] . (!empty($tmp[1]) ? ' ' . $tmp[1] : '') . '" id="' . $htmlname . '">';

-				if ($fieldrequired) {

-					$ret .= '<span class="fieldrequired">';

-				}

+				$ret .= '<div class="editkey_'.$tmp[0].(!empty($tmp[1]) ? ' '.$tmp[1] : '').'" id="'.$htmlname.'">';

+				if ($fieldrequired) $ret .= '<span class="fieldrequired">';

@@ -131,8 +125,6 @@
-				if ($fieldrequired) {

-					$ret .= '</span>';

-				}

-				$ret .= '</div>' . "\n";

-			} else {

-				if ($fieldrequired) {

-					$ret .= '<span class="fieldrequired">';

-				}

+				if ($fieldrequired) $ret .= '</span>';

+				$ret .= '</div>'."\n";

+			}

+			else

+			{

+				if ($fieldrequired) $ret .= '<span class="fieldrequired">';

@@ -144,11 +136,7 @@
-				if ($fieldrequired) {

-					$ret .= '</span>';

-				}

-			}

-		} else {

-			if (empty($notabletag) && $perm) {

-				$ret .= '<table class="nobordernopadding centpercent"><tr><td class="nowrap">';

-			}

-			if ($fieldrequired) {

-				$ret .= '<span class="fieldrequired">';

-			}

+				if ($fieldrequired) $ret .= '</span>';

+			}

+		}

+		else

+		{

+			if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) $ret .= '<table class="nobordernopadding centpercent"><tr><td class="nowrap">';

+			if ($fieldrequired) $ret .= '<span class="fieldrequired">';

@@ -160,31 +148,9 @@
-			if ($fieldrequired) {

-				$ret .= '</span>';

-			}

-			if (!empty($notabletag)) {

-				$ret .= ' ';

-			}

-			if (empty($notabletag) && $perm) {

-				$ret .= '</td>';

-			}

-			if (empty($notabletag) && $perm) {

-				$ret .= '<td class="right">';

-			}

-			if ($htmlname && GETPOST('action', 'aZ09') != 'edit' . $htmlname && $perm) {

-				$ret .= '<a class="editfielda reposition" href="' . $_SERVER["PHP_SELF"] . '?action=edit' . $htmlname . '&token=' . newToken() . '&' . $paramid . '=' . $object->id . $moreparam . '">' . img_edit($langs->trans('Edit'), ($notabletag ? 0 : 1)) . '</a>';

-			}

-			if (!empty($notabletag) && $notabletag == 1) {

-				if ($text) {

-					$ret .= ' : ';

-				} else {

-					$ret .= ' ';

-				}

-			}

-			if (!empty($notabletag) && $notabletag == 3) {

-				$ret .= ' ';

-			}

-			if (empty($notabletag) && $perm) {

-				$ret .= '</td>';

-			}

-			if (empty($notabletag) && $perm) {

-				$ret .= '</tr></table>';

-			}

+			if ($fieldrequired) $ret .= '</span>';

+			if (!empty($notabletag)) $ret .= ' ';

+			if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) $ret .= '</td>';

+			if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) $ret .= '<td class="right">';

+			if ($htmlname && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) $ret .= '<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edit'.$htmlname.'&amp;'.$paramid.'='.$object->id.$moreparam.'">'.img_edit($langs->trans('Edit'), ($notabletag ? 0 : 1)).'</a>';

+			if (!empty($notabletag) && $notabletag == 1) $ret .= ' : ';

+			if (!empty($notabletag) && $notabletag == 3) $ret .= ' ';

+			if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) $ret .= '</td>';

+			if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) $ret .= '</tr></table>';

@@ -199,23 +165,18 @@
-	 * @param string 	$text 			Text of label (not used in this function)

-	 * @param string 	$htmlname 		Name of select field

-	 * @param string 	$value 			Value to show/edit

-	 * @param object 	$object 		Object (that we want to show)

-	 * @param boolean 	$perm 			Permission to allow button to edit parameter

-	 * @param string 	$typeofdata 	Type of data ('string' by default, 'checkbox', 'email', 'phone', 'amount:99', 'numeric:99',

-	 *                                  'text' or 'textarea:rows:cols%', 'safehtmlstring', 'restricthtml',

-	 *                                  'datepicker' ('day' do not work, don't know why), 'dayhour' or 'datehourpicker', 'ckeditor:dolibarr_zzz:width:height:savemethod:toolbarstartexpanded:rows:cols', 'select;xkey:xval,ykey:yval,...')

-	 * @param string 	$editvalue 		When in edit mode, use this value as $value instead of value (for example, you can provide here a formated price instead of numeric value, or a select combo). Use '' to use same than $value

-	 * @param object 	$extObject 		External object ???

-	 * @param mixed 	$custommsg 		String or Array of custom messages : eg array('success' => 'MyMessage', 'error' => 'MyMessage')

-	 * @param string 	$moreparam 		More param to add on the form on action href URL parameter

-	 * @param int 		$notabletag 	Do no output table tags

-	 * @param string 	$formatfunc 	Call a specific method of $object->$formatfunc to output field in view mode (For example: 'dol_print_email')

-	 * @param string 	$paramid 		Key of parameter for id ('id', 'socid')

-	 * @param string 	$gm 			'auto' or 'tzuser' or 'tzuserrel' or 'tzserver' (when $typeofdata is a date)

-	 * @param array 	$moreoptions 	Array with more options. For example array('addnowlink'=>1), array('valuealreadyhtmlescaped'=>1)

-	 * @param string 	$editaction 	[=''] use GETPOST default action or set action to edit mode

-	 * @return string                   HTML edit field

-	 */

-	public function editfieldval($text, $htmlname, $value, $object, $perm, $typeofdata = 'string', $editvalue = '', $extObject = null, $custommsg = null, $moreparam = '', $notabletag = 1, $formatfunc = '', $paramid = 'id', $gm = 'auto', $moreoptions = array(), $editaction = '')

-	{

-		global $conf, $langs;

+	 * @param	string	$text			Text of label (not used in this function)

+	 * @param	string	$htmlname		Name of select field

+	 * @param	string	$value			Value to show/edit

+	 * @param	object	$object			Object

+	 * @param	boolean	$perm			Permission to allow button to edit parameter

+	 * @param	string	$typeofdata		Type of data ('string' by default, 'email', 'amount:99', 'numeric:99', 'text' or 'textarea:rows:cols%', 'datepicker' ('day' do not work, don't know why), 'dayhour' or 'datepickerhour', 'ckeditor:dolibarr_zzz:width:height:savemethod:toolbarstartexpanded:rows:cols', 'select;xkey:xval,ykey:yval,...')

+	 * @param	string	$editvalue		When in edit mode, use this value as $value instead of value (for example, you can provide here a formated price instead of value). Use '' to use same than $value

+	 * @param	object	$extObject		External object

+	 * @param	mixed	$custommsg		String or Array of custom messages : eg array('success' => 'MyMessage', 'error' => 'MyMessage')

+	 * @param	string	$moreparam		More param to add on the form action href URL

+	 * @param   int     $notabletag     Do no output table tags

+	 * @param	string	$formatfunc		Call a specific function to output field

+	 * @param	string	$paramid		Key of parameter for id ('id', 'socid')

+	 * @return  string					HTML edit field

+	 */

+	public function editfieldval($text, $htmlname, $value, $object, $perm, $typeofdata = 'string', $editvalue = '', $extObject = null, $custommsg = null, $moreparam = '', $notabletag = 0, $formatfunc = '', $paramid = 'id')

+	{

+		global $conf, $langs, $db;

@@ -226,17 +187 @@
-		if (empty($typeofdata)) {

-			return 'ErrorBadParameter typeofdata is empty';

-		}

-		// Clean paramater $typeofdata

-		if ($typeofdata == 'datetime') {

-			$typeofdata = 'dayhour';

-		}

-		$reg = array();

-		if (preg_match('/^(\w+)\((\d+)\)$/', $typeofdata, $reg)) {

-			if ($reg[1] == 'varchar') {

-				$typeofdata = 'string';

-			} elseif ($reg[1] == 'int') {

-				$typeofdata = 'numeric';

-			} else {

-				return 'ErrorBadParameter ' . $typeofdata;

-			}

-		}

+		if (empty($typeofdata)) return 'ErrorBadParameter';

@@ -245 +190,2 @@
-		if (getDolGlobalString('MAIN_USE_JQUERY_JEDITABLE') && !preg_match('/^select;|day|datepicker|dayhour|datehourpicker/', $typeofdata)) { // TODO add jquery timepicker and support select

+		if (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && !preg_match('/^select;|datehourpicker/', $typeofdata)) // TODO add jquery timepicker and support select

+		{

@@ -247,6 +193,5 @@
-		} else {

-			if ($editaction == '') {

-				$editaction = GETPOST('action', 'aZ09');

-			}

-			$editmode = ($editaction == 'edit' . $htmlname);

-			if ($editmode) {	// edit mode

+		}

+		else

+		{

+			if (GETPOST('action', 'aZ09') == 'edit'.$htmlname)

+			{

@@ -254,11 +199,8 @@
-				$ret .= '<form method="post" action="' . $_SERVER["PHP_SELF"] . ($moreparam ? '?' . $moreparam : '') . '">';

-				$ret .= '<input type="hidden" name="action" value="set' . $htmlname . '">';

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

-				$ret .= '<input type="hidden" name="' . $paramid . '" value="' . $object->id . '">';

-				if (empty($notabletag)) {

-					$ret .= '<table class="nobordernopadding centpercent">';

-				}

-				if (empty($notabletag)) {

-					$ret .= '<tr><td>';

-				}

-				if (preg_match('/^(string|safehtmlstring|email|phone|url)/', $typeofdata)) {

+				$ret .= '<form method="post" action="'.$_SERVER["PHP_SELF"].($moreparam ? '?'.$moreparam : '').'">';

+				$ret .= '<input type="hidden" name="action" value="set'.$htmlname.'">';

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

+				$ret .= '<input type="hidden" name="'.$paramid.'" value="'.$object->id.'">';

+				if (empty($notabletag)) $ret .= '<table class="nobordernopadding centpercent" cellpadding="0" cellspacing="0">';

+				if (empty($notabletag)) $ret .= '<tr><td>';

+				if (preg_match('/^(string|safehtmlstring|email)/', $typeofdata))

+				{

@@ -266,6 +208,4 @@
-					$ret .= '<input type="text" id="' . $htmlname . '" name="' . $htmlname . '" value="' . ($editvalue ? $editvalue : $value) . '"' . (empty($tmp[1]) ? '' : ' size="' . $tmp[1] . '"') . ' autofocus>';

-				} elseif (preg_match('/^(integer)/', $typeofdata)) {

-					$tmp = explode(':', $typeofdata);

-					$valuetoshow = price2num($editvalue ? $editvalue : $value, 0);

-					$ret .= '<input type="text" id="' . $htmlname . '" name="' . $htmlname . '" value="' . $valuetoshow . '"' . (empty($tmp[1]) ? '' : ' size="' . $tmp[1] . '"') . ' autofocus>';

-				} elseif (preg_match('/^(numeric|amount)/', $typeofdata)) {

+					$ret .= '<input type="text" id="'.$htmlname.'" name="'.$htmlname.'" value="'.($editvalue ? $editvalue : $value).'"'.($tmp[1] ? ' size="'.$tmp[1].'"' : '').'>';

+				}

+				elseif (preg_match('/^(numeric|amount)/', $typeofdata))

+				{

@@ -274,2 +214,4 @@
-					$ret .= '<input type="text" id="' . $htmlname . '" name="' . $htmlname . '" value="' . ($valuetoshow != '' ? price($valuetoshow) : '') . '"' . (empty($tmp[1]) ? '' : ' size="' . $tmp[1] . '"') . ' autofocus>';

-				} elseif (preg_match('/^(checkbox)/', $typeofdata)) {

+					$ret .= '<input type="text" id="'.$htmlname.'" name="'.$htmlname.'" value="'.($valuetoshow != '' ?price($valuetoshow) : '').'"'.($tmp[1] ? ' size="'.$tmp[1].'"' : '').'>';

+				}

+				elseif (preg_match('/^text/', $typeofdata) || preg_match('/^note/', $typeofdata))	// if wysiwyg is enabled $typeofdata = 'ckeditor'

+				{

@@ -277,4 +219 @@
-					$ret .= '<input type="checkbox" id="' . $htmlname . '" name="' . $htmlname . '" value="' . ($value ? $value : 'on') . '"' . ($value ? ' checked' : '') . (empty($tmp[1]) ? '' : $tmp[1]) . '/>';

-				} elseif (preg_match('/^text/', $typeofdata) || preg_match('/^note/', $typeofdata)) {    // if wysiwyg is enabled $typeofdata = 'ckeditor'

-					$tmp = explode(':', $typeofdata);

-					$cols = (empty($tmp[2]) ? '' : $tmp[2]);

+					$cols = $tmp[2];

@@ -282,2 +221,3 @@
-					if (preg_match('/%/', $cols)) {

-						$morealt = ' style="width: ' . $cols . '"';

+					if (preg_match('/%/', $cols))

+					{

+						$morealt = ' style="width: '.$cols.'"';

@@ -285,0 +226 @@
+

@@ -287 +228 @@
-					$ret .= '<textarea id="' . $htmlname . '" name="' . $htmlname . '" wrap="soft" rows="' . (empty($tmp[1]) ? '20' : $tmp[1]) . '"' . ($cols ? ' cols="' . $cols . '"' : 'class="quatrevingtpercent"') . $morealt . '" autofocus>';

+					$ret .= '<textarea id="'.$htmlname.'" name="'.$htmlname.'" wrap="soft" rows="'.($tmp[1] ? $tmp[1] : '20').'"'.($cols ? ' cols="'.$cols.'"' : 'class="quatrevingtpercent"').$morealt.'">';

@@ -291 +232 @@
-					$ret .= dol_htmlwithnojs(dol_string_neverthesehtmltags($valuetoshow, array('textarea')));

+					$ret .= dol_string_neverthesehtmltags($valuetoshow, array('textarea'));

@@ -293,11 +234,11 @@
-				} elseif ($typeofdata == 'day' || $typeofdata == 'datepicker') {

-					$addnowlink = empty($moreoptions['addnowlink']) ? 0 : $moreoptions['addnowlink'];

-					$adddateof = empty($moreoptions['adddateof']) ? '' : $moreoptions['adddateof'];

-					$labeladddateof = empty($moreoptions['labeladddateof']) ? '' : $moreoptions['labeladddateof'];

-					$ret .= $this->selectDate($value, $htmlname, 0, 0, 1, 'form' . $htmlname, 1, $addnowlink, 0, '', '', $adddateof, '', 1, $labeladddateof, '', $gm);

-				} elseif ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker') {

-					$addnowlink = empty($moreoptions['addnowlink']) ? 0 : $moreoptions['addnowlink'];

-					$adddateof = empty($moreoptions['adddateof']) ? '' : $moreoptions['adddateof'];

-					$labeladddateof = empty($moreoptions['labeladddateof']) ? '' : $moreoptions['labeladddateof'];

-					$ret .= $this->selectDate($value, $htmlname, 1, 1, 1, 'form' . $htmlname, 1, $addnowlink, 0, '', '', $adddateof, '', 1, $labeladddateof, '', $gm);

-				} elseif (preg_match('/^select;/', $typeofdata)) {

+				}

+				elseif ($typeofdata == 'day' || $typeofdata == 'datepicker')

+				{

+					$ret .= $this->selectDate($value, $htmlname, 0, 0, 1, 'form'.$htmlname, 1, 0);

+				}

+				elseif ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker')

+				{

+					$ret .= $this->selectDate($value, $htmlname, 1, 1, 1, 'form'.$htmlname, 1, 0);

+				}

+				elseif (preg_match('/^select;/', $typeofdata))

+				{

@@ -306 +247,2 @@
-					foreach ($arraydata as $val) {

+					foreach ($arraydata as $val)

+					{

@@ -312,3 +254,3 @@
-				} elseif (preg_match('/^link/', $typeofdata)) {

-					// TODO Not yet implemented. See code for extrafields

-				} elseif (preg_match('/^ckeditor/', $typeofdata)) {

+				}

+				elseif (preg_match('/^ckeditor/', $typeofdata))

+				{

@@ -316,2 +258,2 @@
-					require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';

-					$doleditor = new DolEditor($htmlname, ($editvalue ? $editvalue : $value), (empty($tmp[2]) ? '' : $tmp[2]), (empty($tmp[3]) ? '100' : $tmp[3]), (empty($tmp[1]) ? 'dolibarr_notes' : $tmp[1]), 'In', (empty($tmp[5]) ? 0 : $tmp[5]), (isset($tmp[8]) ? ($tmp[8] ? true : false) : true), true, (empty($tmp[6]) ? '20' : $tmp[6]), (empty($tmp[7]) ? '100' : $tmp[7]));

+					require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';

+					$doleditor = new DolEditor($htmlname, ($editvalue ? $editvalue : $value), ($tmp[2] ? $tmp[2] : ''), ($tmp[3] ? $tmp[3] : '100'), ($tmp[1] ? $tmp[1] : 'dolibarr_notes'), 'In', ($tmp[5] ? $tmp[5] : 0), (isset($tmp[8]) ? ($tmp[8] ?true:false) : true), true, ($tmp[6] ? $tmp[6] : '20'), ($tmp[7] ? $tmp[7] : '100'));

@@ -319,11 +261,4 @@
-				} elseif ($typeofdata == 'asis') {

-					$ret .= ($editvalue ? $editvalue : $value);

-				}

-				if (empty($notabletag)) {

-					$ret .= '</td>';

-				}

-

-				// Button save-cancel

-				if (empty($notabletag)) {

-					$ret .= '<td>';

-				}

+				}

+				if (empty($notabletag)) $ret .= '</td>';

+

+				if (empty($notabletag)) $ret .= '<td class="left">';

@@ -331,34 +266,18 @@
-				$ret .= '<input type="submit" class="smallpaddingimp button' . (empty($notabletag) ? '' : ' ') . '" name="modify" value="' . $langs->trans("Modify") . '">';

-				if (preg_match('/ckeditor|textarea/', $typeofdata) && empty($notabletag)) {

-					$ret .= '<br>' . "\n";

-				}

-				$ret .= '<input type="submit" class="smallpaddingimp button button-cancel' . (empty($notabletag) ? '' : ' ') . '" name="cancel" value="' . $langs->trans("Cancel") . '">';

-				if (empty($notabletag)) {

-					$ret .= '</td>';

-				}

-

-				if (empty($notabletag)) {

-					$ret .= '</tr></table>' . "\n";

-				}

-				$ret .= '</form>' . "\n";

-			} else {		// view mode

-				if (preg_match('/^email/', $typeofdata)) {

-					$ret .= dol_print_email($value, 0, 0, 0, 0, 1);

-				} elseif (preg_match('/^phone/', $typeofdata)) {

-					$ret .= dol_print_phone($value, '_blank', 32, 1);

-				} elseif (preg_match('/^url/', $typeofdata)) {

-					$ret .= dol_print_url($value, '_blank', 32, 1);

-				} elseif (preg_match('/^(amount|numeric)/', $typeofdata)) {

-					$ret .= ($value != '' ? price($value, '', $langs, 0, -1, -1, $conf->currency) : '');

-				} elseif (preg_match('/^checkbox/', $typeofdata)) {

-					$tmp = explode(':', $typeofdata);

-					$ret .= '<input type="checkbox" disabled id="' . $htmlname . '" name="' . $htmlname . '" value="' . $value . '"' . ($value ? ' checked' : '') . ($tmp[1] ? $tmp[1] : '') . '/>';

-				} elseif (preg_match('/^text/', $typeofdata) || preg_match('/^note/', $typeofdata)) {

-					$ret .= dol_htmlwithnojs(dol_string_onlythesehtmltags(dol_htmlentitiesbr($value), 1, 1, 1));

-				} elseif (preg_match('/^(safehtmlstring|restricthtml)/', $typeofdata)) {	// 'restricthtml' is not an allowed type for editfieldval. Value is 'safehtmlstring'

-					$ret .= dol_htmlwithnojs(dol_string_onlythesehtmltags($value));

-				} elseif ($typeofdata == 'day' || $typeofdata == 'datepicker') {

-					$ret .= '<span class="valuedate">' . dol_print_date($value, 'day', $gm) . '</span>';

-				} elseif ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker') {

-					$ret .= '<span class="valuedate">' . dol_print_date($value, 'dayhour', $gm) . '</span>';

-				} elseif (preg_match('/^select;/', $typeofdata)) {

+				$ret .= '<input type="submit" class="button'.(empty($notabletag) ? '' : ' ').'" name="modify" value="'.$langs->trans("Modify").'">';

+				if (preg_match('/ckeditor|textarea/', $typeofdata) && empty($notabletag)) $ret .= '<br>'."\n";

+				$ret .= '<input type="submit" class="button'.(empty($notabletag) ? '' : ' ').'" name="cancel" value="'.$langs->trans("Cancel").'">';

+				if (empty($notabletag)) $ret .= '</td>';

+

+				if (empty($notabletag)) $ret .= '</tr></table>'."\n";

+				$ret .= '</form>'."\n";

+			}

+			else

+			{

+				if (preg_match('/^(email)/', $typeofdata))              $ret .= dol_print_email($value, 0, 0, 0, 0, 1);

+				elseif (preg_match('/^(amount|numeric)/', $typeofdata)) $ret .= ($value != '' ? price($value, '', $langs, 0, -1, -1, $conf->currency) : '');

+				elseif (preg_match('/^text/', $typeofdata) || preg_match('/^note/', $typeofdata))  $ret .= dol_htmlentitiesbr($value);

+				elseif (preg_match('/^safehtmlstring/', $typeofdata)) $ret .= dol_string_onlythesehtmltags($value);

+				elseif ($typeofdata == 'day' || $typeofdata == 'datepicker') $ret .= dol_print_date($value, 'day');

+				elseif ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker') $ret .= dol_print_date($value, 'dayhour');

+				elseif (preg_match('/^select;/', $typeofdata))

+				{

@@ -367 +286,2 @@
-					foreach ($arraydata as $val) {

+					foreach ($arraydata as $val)

+					{

@@ -372,8 +292,3 @@
-					if ($htmlname == 'fk_product_type') {

-						if ($value == 0) {

-							$ret = img_picto($langs->trans("Product"), 'product', 'class="paddingleftonly paddingrightonly colorgrey"') . $ret;

-						} else {

-							$ret = img_picto($langs->trans("Service"), 'service', 'class="paddingleftonly paddingrightonly colorgrey"') . $ret;

-						}

-					}

-				} elseif (preg_match('/^ckeditor/', $typeofdata)) {

+				}

+				elseif (preg_match('/^ckeditor/', $typeofdata))

+				{

@@ -381 +296,2 @@
-					if (getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {

+					if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB))

+					{

@@ -384 +300 @@
-						$tmpcontent = $firstline . ((strlen($firstline) != strlen($tmpcontent)) ? '...' : '');

+						$tmpcontent = $firstline.((strlen($firstline) != strlen($tmpcontent)) ? '...' : '');

@@ -389,10 +305,7 @@
-				} else {

-					if (empty($moreoptions['valuealreadyhtmlescaped'])) {

-						$ret .= dol_escape_htmltag($value);

-					} else {

-						$ret .= $value;        // $value must be already html escaped.

-					}

-				}

-

-				// Custom format if parameter $formatfunc has been provided

-				if ($formatfunc && method_exists($object, $formatfunc)) {

+				}

+				else {

+					$ret .= dol_escape_htmltag($value);

+				}

+

+				if ($formatfunc && method_exists($object, $formatfunc))

+				{

@@ -409,7 +322,7 @@
-	 * @param 	string 	$fieldname 	Name of the field

-	 * @param 	object 	$object 	Object

-	 * @param 	boolean $perm 		Permission to allow button to edit parameter. Set it to 0 to have a not edited field.

-	 * @param 	string 	$typeofdata Type of data ('string' by default, 'email', 'amount:99', 'numeric:99', 'text' or 'textarea:rows:cols', 'datepicker' ('day' do not work, don't know why), 'ckeditor:dolibarr_zzz:width:height:savemethod:1:rows:cols', 'select;xxx[:class]'...)

-	 * @param 	string 	$check 		Same coe than $check parameter of GETPOST()

-	 * @param 	string 	$morecss 	More CSS

-	 * @return  string              HTML code for the edit of alternative language

+	 * @param   string	$fieldname		Name of the field

+	 * @param	object	$object			Object

+	 * @param	boolean	$perm			Permission to allow button to edit parameter. Set it to 0 to have a not edited field.

+	 * @param	string	$typeofdata		Type of data ('string' by default, 'email', 'amount:99', 'numeric:99', 'text' or 'textarea:rows:cols', 'datepicker' ('day' do not work, don't know why), 'ckeditor:dolibarr_zzz:width:height:savemethod:1:rows:cols', 'select;xxx[:class]'...)

+	 * @param	string	$check			Same coe than $check parameter of GETPOST()

+	 * @param	string	$morecss		More CSS

+	 * @return	string   		      	HTML code for the edit of alternative language

@@ -425,3 +338 @@
-		if (getDolGlobalString('PDF_USE_ALSO_LANGUAGE_CODE')) {

-			$arrayoflangcode[] = $conf->global->PDF_USE_ALSO_LANGUAGE_CODE;

-		}

+		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE)) $arrayoflangcode[] = $conf->global->PDF_USE_ALSO_LANGUAGE_CODE;

@@ -431 +342 @@
-				include_once DOL_DOCUMENT_ROOT . '/core/class/extralanguages.class.php';

+				include_once DOL_DOCUMENT_ROOT.'/core/class/extralanguages.class.php';

@@ -440,2 +351,2 @@
-			$result .= '<!-- Widget for translation -->' . "\n";

-			$result .= '<div class="inline-block paddingleft image-' . $object->element . '-' . $fieldname . '">';

+			$result .= '<!-- Widget for translation -->'."\n";

+			$result .= '<div class="inline-block paddingleft image-'.$object->element.'-'.$fieldname.'">';

@@ -446 +357 @@
-			$result .= '<div class="inline-block hidden field-' . $object->element . '-' . $fieldname . '">';

+			$result .= '<div class="inline-block hidden field-'.$object->element.'-'.$fieldname.'">';

@@ -449,2 +360,3 @@
-			foreach ($arrayoflangcode as $langcode) {

-				$valuetoshow = GETPOSTISSET('field-' . $object->element . "-" . $fieldname . "-" . $langcode) ? GETPOST('field-' . $object->element . '-' . $fieldname . "-" . $langcode, $check) : '';

+			foreach ($arrayoflangcode as $langcode)

+			{

+				$valuetoshow = GETPOSTISSET('field-'.$object->element."-".$fieldname."-".$langcode) ? GETPOST('field-'.$object->element.'-'.$fieldname."-".$langcode, $check) : '';

@@ -462 +374 @@
-					$resultforextrlang .= '<textarea name="field-' . $object->element . "-" . $fieldname . "-" . $langcode . '" id="' . $fieldname . "-" . $langcode . '" class="' . $morecss . '" rows="' . ROWS_2 . '" wrap="soft">';

+					$resultforextrlang .= '<textarea name="field-'.$object->element."-".$fieldname."-".$langcode.'" id="'.$fieldname."-".$langcode.'" class="'.$morecss.'" rows="'.ROWS_2.'" wrap="soft">';

@@ -466 +378 @@
-					$resultforextrlang .= '<input type="text" class="inputfieldforlang ' . ($morecss ? ' ' . $morecss : '') . '" name="field-' . $object->element . '-' . $fieldname . '-' . $langcode . '" value="' . $valuetoshow . '">';

+					$resultforextrlang .= '<input type="text" class="inputfieldforlang '.($morecss ? ' '.$morecss : '').'" name="field-'.$object->element.'-'.$fieldname.'-'.$langcode.'" value="'.$valuetoshow.'">';

@@ -472 +384 @@
-			$result .= '<script nonce="' . getNonce() . '">$(".image-' . $object->element . '-' . $fieldname . '").click(function() { console.log("Toggle lang widget"); jQuery(".field-' . $object->element . '-' . $fieldname . '").toggle(); });</script>';

+			$result .= '<script>$(".image-'.$object->element.'-'.$fieldname.'").click(function() { console.log("Toggle lang widget"); jQuery(".field-'.$object->element.'-'.$fieldname.'").toggle(); });</script>';

@@ -481,9 +393,9 @@
-	 * @param 	object 	$object 	Object

-	 * @param 	string 	$value 		Value to show/edit

-	 * @param 	string 	$htmlname 	DIV ID (field name)

-	 * @param 	int 	$condition 	Condition to edit

-	 * @param 	string 	$inputType 	Type of input ('string', 'numeric', 'datepicker' ('day' do not work, don't know why), 'textarea:rows:cols', 'ckeditor:dolibarr_zzz:width:height:?:1:rows:cols', 'select:loadmethod:savemethod:buttononly')

-	 * @param 	string 	$editvalue 	When in edit mode, use this value as $value instead of value

-	 * @param 	object 	$extObject 	External object

-	 * @param 	mixed 	$custommsg 	String or Array of custom messages : eg array('success' => 'MyMessage', 'error' => 'MyMessage')

-	 * @return  string              HTML edit in place

+	 * @param	object	$object			Object

+	 * @param	string	$value			Value to show/edit

+	 * @param	string	$htmlname		DIV ID (field name)

+	 * @param	int		$condition		Condition to edit

+	 * @param	string	$inputType		Type of input ('string', 'numeric', 'datepicker' ('day' do not work, don't know why), 'textarea:rows:cols', 'ckeditor:dolibarr_zzz:width:height:?:1:rows:cols', 'select:loadmethod:savemethod:buttononly')

+	 * @param	string	$editvalue		When in edit mode, use this value as $value instead of value

+	 * @param	object	$extObject		External object

+	 * @param	mixed	$custommsg		String or Array of custom messages : eg array('success' => 'MyMessage', 'error' => 'MyMessage')

+	 * @return	string   		      	HTML edit in place

@@ -498,9 +410,6 @@
-		if (preg_match('/^text/', $inputType)) {

-			$value = dol_nl2br($value);

-		} elseif (preg_match('/^numeric/', $inputType)) {

-			$value = price($value);

-		} elseif ($inputType == 'day' || $inputType == 'datepicker') {

-			$value = dol_print_date($value, 'day');

-		}

-

-		if ($condition) {

+		if (preg_match('/^text/', $inputType)) $value = dol_nl2br($value);

+		elseif (preg_match('/^numeric/', $inputType)) $value = price($value);

+		elseif ($inputType == 'day' || $inputType == 'datepicker') $value = dol_print_date($value, 'day');

+

+		if ($condition)

+		{

@@ -509,5 +418,5 @@
-			$fk_element = false;

-			$loadmethod = false;

-			$savemethod = false;

-			$ext_element = false;

-			$button_only = false;

+			$fk_element		= false;

+			$loadmethod		= false;

+			$savemethod		= false;

+			$ext_element	= false;

+			$button_only	= false;

@@ -515,4 +424,3 @@
-			$rows = '';

-			$cols = '';

-

-			if (is_object($object)) {

+

+			if (is_object($object))

+			{

@@ -524 +432,2 @@
-			if (is_object($extObject)) {

+			if (is_object($extObject))

+			{

@@ -528 +437,2 @@
-			if (preg_match('/^(string|email|numeric)/', $inputType)) {

+			if (preg_match('/^(string|email|numeric)/', $inputType))

+			{

@@ -531,8 +441,6 @@
-				if (!empty($tmp[1])) {

-					$inputOption = $tmp[1];

-				}

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

-					$savemethod = $tmp[2];

-				}

-				$out .= '<input id="width_' . $htmlname . '" value="' . $inputOption . '" type="hidden"/>' . "\n";

-			} elseif ((preg_match('/^day$/', $inputType)) || (preg_match('/^datepicker/', $inputType)) || (preg_match('/^datehourpicker/', $inputType))) {

+				if (!empty($tmp[1])) $inputOption = $tmp[1];

+				if (!empty($tmp[2])) $savemethod = $tmp[2];

+				$out .= '<input id="width_'.$htmlname.'" value="'.$inputOption.'" type="hidden"/>'."\n";

+			}

+			elseif ((preg_match('/^day$/', $inputType)) || (preg_match('/^datepicker/', $inputType)) || (preg_match('/^datehourpicker/', $inputType)))

+			{

@@ -541,9 +449,7 @@
-				if (!empty($tmp[1])) {

-					$inputOption = $tmp[1];

-				}

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

-					$savemethod = $tmp[2];

-				}

-

-				$out .= '<input id="timestamp" type="hidden"/>' . "\n"; // Use for timestamp format

-			} elseif (preg_match('/^(select|autocomplete)/', $inputType)) {

+				if (!empty($tmp[1])) $inputOption = $tmp[1];

+				if (!empty($tmp[2])) $savemethod = $tmp[2];

+

+				$out .= '<input id="timestamp" type="hidden"/>'."\n"; // Use for timestamp format

+			}

+			elseif (preg_match('/^(select|autocomplete)/', $inputType))

+			{

@@ -551,9 +457,6 @@
-				$inputType = $tmp[0];

-				$loadmethod = $tmp[1];

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

-					$savemethod = $tmp[2];

-				}

-				if (!empty($tmp[3])) {

-					$button_only = true;

-				}

-			} elseif (preg_match('/^textarea/', $inputType)) {

+				$inputType = $tmp[0]; $loadmethod = $tmp[1];

+				if (!empty($tmp[2])) $savemethod = $tmp[2];

+				if (!empty($tmp[3])) $button_only = true;

+			}

+			elseif (preg_match('/^textarea/', $inputType))

+			{

@@ -564 +467,3 @@
-			} elseif (preg_match('/^ckeditor/', $inputType)) {

+			}

+			elseif (preg_match('/^ckeditor/', $inputType))

+			{

@@ -566,15 +471,11 @@
-				$inputType = $tmp[0];

-				$toolbar = $tmp[1];

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

-					$width = $tmp[2];

-				}

-				if (!empty($tmp[3])) {

-					$heigth = $tmp[3];

-				}

-				if (!empty($tmp[4])) {

-					$savemethod = $tmp[4];

-				}

-

-				if (isModEnabled('fckeditor')) {

-					$out .= '<input id="ckeditor_toolbar" value="' . $toolbar . '" type="hidden"/>' . "\n";

-				} else {

+				$inputType = $tmp[0]; $toolbar = $tmp[1];

+				if (!empty($tmp[2])) $width = $tmp[2];

+				if (!empty($tmp[3])) $heigth = $tmp[3];

+				if (!empty($tmp[4])) $savemethod = $tmp[4];

+

+				if (!empty($conf->fckeditor->enabled))

+				{

+					$out .= '<input id="ckeditor_toolbar" value="'.$toolbar.'" type="hidden"/>'."\n";

+				}

+				else

+				{

@@ -585,21 +486,17 @@
-			$out .= '<input id="element_' . $htmlname . '" value="' . $element . '" type="hidden"/>' . "\n";

-			$out .= '<input id="table_element_' . $htmlname . '" value="' . $table_element . '" type="hidden"/>' . "\n";

-			$out .= '<input id="fk_element_' . $htmlname . '" value="' . $fk_element . '" type="hidden"/>' . "\n";

-			$out .= '<input id="loadmethod_' . $htmlname . '" value="' . $loadmethod . '" type="hidden"/>' . "\n";

-			if (!empty($savemethod)) {

-				$out .= '<input id="savemethod_' . $htmlname . '" value="' . $savemethod . '" type="hidden"/>' . "\n";

-			}

-			if (!empty($ext_element)) {

-				$out .= '<input id="ext_element_' . $htmlname . '" value="' . $ext_element . '" type="hidden"/>' . "\n";

-			}

-			if (!empty($custommsg)) {

-				if (is_array($custommsg)) {

-					if (!empty($custommsg['success'])) {

-						$out .= '<input id="successmsg_' . $htmlname . '" value="' . $custommsg['success'] . '" type="hidden"/>' . "\n";

-					}

-					if (!empty($custommsg['error'])) {

-						$out .= '<input id="errormsg_' . $htmlname . '" value="' . $custommsg['error'] . '" type="hidden"/>' . "\n";

-					}

-				} else {

-					$out .= '<input id="successmsg_' . $htmlname . '" value="' . $custommsg . '" type="hidden"/>' . "\n";

-				}

+			$out .= '<input id="element_'.$htmlname.'" value="'.$element.'" type="hidden"/>'."\n";

+			$out .= '<input id="table_element_'.$htmlname.'" value="'.$table_element.'" type="hidden"/>'."\n";

+			$out .= '<input id="fk_element_'.$htmlname.'" value="'.$fk_element.'" type="hidden"/>'."\n";

+			$out .= '<input id="loadmethod_'.$htmlname.'" value="'.$loadmethod.'" type="hidden"/>'."\n";

+			if (!empty($savemethod))	$out .= '<input id="savemethod_'.$htmlname.'" value="'.$savemethod.'" type="hidden"/>'."\n";

+			if (!empty($ext_element))	$out .= '<input id="ext_element_'.$htmlname.'" value="'.$ext_element.'" type="hidden"/>'."\n";

+			if (!empty($custommsg))

+			{

+				if (is_array($custommsg))

+				{

+					if (!empty($custommsg['success']))

+						$out .= '<input id="successmsg_'.$htmlname.'" value="'.$custommsg['success'].'" type="hidden"/>'."\n";

+						if (!empty($custommsg['error']))

+							$out .= '<input id="errormsg_'.$htmlname.'" value="'.$custommsg['error'].'" type="hidden"/>'."\n";

+				}

+				else

+					$out .= '<input id="successmsg_'.$htmlname.'" value="'.$custommsg.'" type="hidden"/>'."\n";

@@ -608,6 +505,8 @@
-				$out .= '<input id="textarea_' . $htmlname . '_rows" value="' . $rows . '" type="hidden"/>' . "\n";

-				$out .= '<input id="textarea_' . $htmlname . '_cols" value="' . $cols . '" type="hidden"/>' . "\n";

-			}

-			$out .= '<span id="viewval_' . $htmlname . '" class="viewval_' . $inputType . ($button_only ? ' inactive' : ' active') . '">' . $value . '</span>' . "\n";

-			$out .= '<span id="editval_' . $htmlname . '" class="editval_' . $inputType . ($button_only ? ' inactive' : ' active') . ' hideobject">' . (!empty($editvalue) ? $editvalue : $value) . '</span>' . "\n";

-		} else {

+				$out .= '<input id="textarea_'.$htmlname.'_rows" value="'.$rows.'" type="hidden"/>'."\n";

+				$out .= '<input id="textarea_'.$htmlname.'_cols" value="'.$cols.'" type="hidden"/>'."\n";

+			}

+			$out .= '<span id="viewval_'.$htmlname.'" class="viewval_'.$inputType.($button_only ? ' inactive' : ' active').'">'.$value.'</span>'."\n";

+			$out .= '<span id="editval_'.$htmlname.'" class="editval_'.$inputType.($button_only ? ' inactive' : ' active').' hideobject">'.(!empty($editvalue) ? $editvalue : $value).'</span>'."\n";

+		}

+		else

+		{

@@ -621 +520 @@
-	 *  Show a text and picto with tooltip on text or picto.

+	 *	Show a text and picto with tooltip on text or picto.

@@ -624,13 +523,14 @@
-	 * 	@param 	string 	$text 				Text to show

-	 * 	@param 	string 	$htmltext 			HTML content of tooltip. Must be HTML/UTF8 encoded.

-	 * 	@param 	int 	$tooltipon 			1=tooltip on text, 2=tooltip on image, 3=tooltip sur les 2

-	 * 	@param 	int 	$direction 			-1=image is before, 0=no image, 1=image is after

-	 * 	@param 	string 	$img 				Html code for image (use img_xxx() function to get it)

-	 * 	@param 	string 	$extracss 			Add a CSS style to td tags

-	 * 	@param 	int 	$notabs 			0=Include table and tr tags, 1=Do not include table and tr tags, 2=use div, 3=use span

-	 * 	@param 	string 	$incbefore 			Include code before the text

-	 * 	@param 	int 	$noencodehtmltext 	Do not encode into html entity the htmltext

-	 * 	@param 	string 	$tooltiptrigger 	''=Tooltip on hover, 'abc'=Tooltip on click (abc is a unique key)

-	 * 	@param 	int 	$forcenowrap 		Force no wrap between text and picto (works with notabs=2 only)

-	 * 	@return string                      Code html du tooltip (texte+picto)

-	 * 	@see    textwithpicto() 			Use textwithpicto() instead of textwithtooltip if you can.

+	 *	@param	string		$text				Text to show

+	 *	@param	string		$htmltext			HTML content of tooltip. Must be HTML/UTF8 encoded.

+	 *	@param	int			$tooltipon			1=tooltip on text, 2=tooltip on image, 3=tooltip sur les 2

+	 *	@param	int			$direction			-1=image is before, 0=no image, 1=image is after

+	 *	@param	string		$img				Html code for image (use img_xxx() function to get it)

+	 *	@param	string		$extracss			Add a CSS style to td tags

+	 *	@param	int			$notabs				0=Include table and tr tags, 1=Do not include table and tr tags, 2=use div, 3=use span

+	 *	@param	string		$incbefore			Include code before the text

+	 *	@param	int			$noencodehtmltext	Do not encode into html entity the htmltext

+	 *  @param  string      $tooltiptrigger		''=Tooltip on hover, 'abc'=Tooltip on click (abc is a unique key)

+	 *  @param	int			$forcenowrap		Force no wrap between text and picto (works with notabs=2 only)

+	 *	@return	string							Code html du tooltip (texte+picto)

+	 *	@see	textwithpicto() Use thisfunction if you can.

+	 *  TODO Move this as static as soon as everybody use textwithpicto or @Form::textwithtooltip

@@ -640,7 +540,2 @@
-		if ($incbefore) {

-			$text = $incbefore . $text;

-		}

-		if (!$htmltext) {

-			return $text;

-		}

-		$direction = (int) $direction;    // For backward compatibility when $direction was set to '' instead of 0

+		if ($incbefore) $text = $incbefore.$text;

+		if (!$htmltext) return $text;

@@ -649,6 +544,2 @@
-		if ($notabs == 2) {

-			$tag = 'div';

-		}

-		if ($notabs == 3) {

-			$tag = 'span';

-		}

+		if ($notabs == 2) $tag = 'div';

+		if ($notabs == 3) $tag = 'span';

@@ -659,8 +550,2 @@
-		if ($direction < 0) {

-			$extracss = ($extracss ? $extracss . ' ' : '') . ($notabs != 3 ? 'inline-block' : '');

-			$extrastyle = 'padding: 0px; padding-left: 3px;';

-		}

-		if ($direction > 0) {

-			$extracss = ($extracss ? $extracss . ' ' : '') . ($notabs != 3 ? 'inline-block' : '');

-			$extrastyle = 'padding: 0px; padding-right: 3px;';

-		}

+		if ($direction < 0) { $extracss = ($extracss ? $extracss.' ' : '').($notabs != 3 ? 'inline-block' : ''); $extrastyle = 'padding: 0px; padding-left: 3px !important;'; }

+		if ($direction > 0) { $extracss = ($extracss ? $extracss.' ' : '').($notabs != 3 ? 'inline-block' : ''); $extrastyle = 'padding: 0px; padding-right: 3px !important;'; }

@@ -670,4 +555,4 @@
-		$s = '';

-		$textfordialog = '';

-

-		if ($tooltiptrigger == '') {

+		$s = ''; $textfordialog = '';

+

+		if ($tooltiptrigger == '')

+		{

@@ -675 +560,3 @@
-		} else {

+		}

+		else

+		{

@@ -677,27 +564,18 @@
-			$textfordialog .= '<div style="display: none;" id="idfortooltiponclick_' . $tooltiptrigger . '" class="classfortooltiponclicktext">' . $htmltext . '</div>';

-		}

-		if ($tooltipon == 2 || $tooltipon == 3) {

-			$paramfortooltipimg = ' class="' . $classfortooltip . ($notabs != 3 ? ' inline-block' : '') . ($extracss ? ' ' . $extracss : '') . '" style="padding: 0px;' . ($extrastyle ? ' ' . $extrastyle : '') . '"';

-			if ($tooltiptrigger == '') {

-				$paramfortooltipimg .= ' title="' . ($noencodehtmltext ? $htmltext : dol_escape_htmltag($htmltext, 1)) . '"'; // Attribut to put on img tag to store tooltip

-			} else {

-				$paramfortooltipimg .= ' dolid="' . $tooltiptrigger . '"';

-			}

-		} else {

-			$paramfortooltipimg = ($extracss ? ' class="' . $extracss . '"' : '') . ($extrastyle ? ' style="' . $extrastyle . '"' : ''); // Attribut to put on td text tag

-		}

-		if ($tooltipon == 1 || $tooltipon == 3) {

-			$paramfortooltiptd = ' class="' . ($tooltipon == 3 ? 'cursorpointer ' : '') . $classfortooltip . ' inline-block' . ($extracss ? ' ' . $extracss : '') . '" style="padding: 0px;' . ($extrastyle ? ' ' . $extrastyle : '') . '" ';

-			if ($tooltiptrigger == '') {

-				$paramfortooltiptd .= ' title="' . ($noencodehtmltext ? $htmltext : dol_escape_htmltag($htmltext, 1)) . '"'; // Attribut to put on td tag to store tooltip

-			} else {

-				$paramfortooltiptd .= ' dolid="' . $tooltiptrigger . '"';

-			}

-		} else {

-			$paramfortooltiptd = ($extracss ? ' class="' . $extracss . '"' : '') . ($extrastyle ? ' style="' . $extrastyle . '"' : ''); // Attribut to put on td text tag

-		}

-		if (empty($notabs)) {

-			$s .= '<table class="nobordernopadding"><tr style="height: auto;">';

-		} elseif ($notabs == 2) {

-			$s .= '<div class="inline-block' . ($forcenowrap ? ' nowrap' : '') . '">';

-		}

+			$textfordialog .= '<div style="display: none;" id="idfortooltiponclick_'.$tooltiptrigger.'" class="classfortooltiponclicktext">'.$htmltext.'</div>';

+		}

+		if ($tooltipon == 2 || $tooltipon == 3)

+		{

+			$paramfortooltipimg = ' class="'.$classfortooltip.($notabs != 3 ? ' inline-block' : '').($extracss ? ' '.$extracss : '').'" style="padding: 0px;'.($extrastyle ? ' '.$extrastyle : '').'"';

+			if ($tooltiptrigger == '') $paramfortooltipimg .= ' title="'.($noencodehtmltext ? $htmltext : dol_escape_htmltag($htmltext, 1)).'"'; // Attribut to put on img tag to store tooltip

+			else $paramfortooltipimg .= ' dolid="'.$tooltiptrigger.'"';

+		}

+		else $paramfortooltipimg = ($extracss ? ' class="'.$extracss.'"' : '').($extrastyle ? ' style="'.$extrastyle.'"' : ''); // Attribut to put on td text tag

+		if ($tooltipon == 1 || $tooltipon == 3)

+		{

+			$paramfortooltiptd = ' class="'.($tooltipon == 3 ? 'cursorpointer ' : '').$classfortooltip.' inline-block'.($extracss ? ' '.$extracss : '').'" style="padding: 0px;'.($extrastyle ? ' '.$extrastyle : '').'" ';

+			if ($tooltiptrigger == '') $paramfortooltiptd .= ' title="'.($noencodehtmltext ? $htmltext : dol_escape_htmltag($htmltext, 1)).'"'; // Attribut to put on td tag to store tooltip

+			else $paramfortooltiptd .= ' dolid="'.$tooltiptrigger.'"';

+		}

+		else $paramfortooltiptd = ($extracss ? ' class="'.$extracss.'"' : '').($extrastyle ? ' style="'.$extrastyle.'"' : ''); // Attribut to put on td text tag

+		if (empty($notabs)) $s .= '<table class="nobordernopadding"><tr style="height: auto;">';

+		elseif ($notabs == 2) $s .= '<div class="inline-block'.($forcenowrap ? ' nowrap' : '').'">';

@@ -706 +584 @@
-			$s .= '<' . $tag . $paramfortooltipimg;

+			$s .= '<'.$tag.$paramfortooltipimg;

@@ -708,3 +586,3 @@
-				$s .= ' class="valigntop" width="14"';

-			}

-			$s .= '>' . $textfordialog . $img . '</' . $tag . '>';

+				$s .= ' class=valigntop" width="14"';

+			}

+			$s .= '>'.$textfordialog.$img.'</'.$tag.'>';

@@ -714,3 +592 @@
-		if ((string) $text != '') {

-			$s .= '<' . $tag . $paramfortooltiptd . '>' . $text . '</' . $tag . '>';

-		}

+		if ((string) $text != '') $s .= '<'.$tag.$paramfortooltiptd.'>'.$text.'</'.$tag.'>';

@@ -719,11 +595,6 @@
-			$s .= '<' . $tag . $paramfortooltipimg;

-			if ($tag == 'td') {

-				$s .= ' class="valignmiddle" width="14"';

-			}

-			$s .= '>' . $textfordialog . $img . '</' . $tag . '>';

-		}

-		if (empty($notabs)) {

-			$s .= '</tr></table>';

-		} elseif ($notabs == 2) {

-			$s .= '</div>';

-		}

+			$s .= '<'.$tag.$paramfortooltipimg;

+			if ($tag == 'td') $s .= ' class="valignmiddle" width="14"';

+			$s .= '>'.$textfordialog.$img.'</'.$tag.'>';

+		}

+		if (empty($notabs)) $s .= '</tr></table>';

+		elseif ($notabs == 2) $s .= '</div>';

@@ -735,12 +606,12 @@
-	 * Show a text with a picto and a tooltip on picto

-	 *

-	 * @param 	string 		$text 				Text to show

-	 * @param 	string 		$htmltext 			Content of tooltip

-	 * @param 	int 		$direction 			1=Icon is after text, -1=Icon is before text, 0=no icon

-	 * @param 	string 		$type 				Type of picto ('info', 'infoclickable', 'help', 'helpclickable', 'warning', 'superadmin', 'mypicto@mymodule', ...) or image filepath or 'none'

-	 * @param 	string 		$extracss 			Add a CSS style to td, div or span tag

-	 * @param 	int 		$noencodehtmltext 	Do not encode into html entity the htmltext

-	 * @param 	int 		$notabs 			0=Include table and tr tags, 1=Do not include table and tr tags, 2=use div, 3=use span

-	 * @param 	string 		$tooltiptrigger 	''=Tooltip on hover and hidden on smartphone, 'abconsmartphone'=Tooltip on hover and on click on smartphone, 'abc'=Tooltip on click (abc is a unique key, clickable link is on image or on link if param $type='none' or on both if $type='xxxclickable')

-	 * @param 	int 		$forcenowrap 		Force no wrap between text and picto (works with notabs=2 only)

-	 * @return	string                        	HTML code of text, picto, tooltip

+	 *	Show a text with a picto and a tooltip on picto

+	 *

+	 *	@param	string	$text				Text to show

+	 *	@param  string	$htmltext	     	Content of tooltip

+	 *	@param	int		$direction			1=Icon is after text, -1=Icon is before text, 0=no icon

+	 * 	@param	string	$type				Type of picto ('info', 'infoclickable', 'help', 'helpclickable', 'warning', 'superadmin', 'mypicto@mymodule', ...) or image filepath or 'none'

+	 *  @param  string	$extracss           Add a CSS style to td, div or span tag

+	 *  @param  int		$noencodehtmltext   Do not encode into html entity the htmltext

+	 *  @param	int		$notabs				0=Include table and tr tags, 1=Do not include table and tr tags, 2=use div, 3=use span

+	 *  @param  string  $tooltiptrigger     ''=Tooltip on hover, 'abc'=Tooltip on click (abc is a unique key, clickable link is on image or on link if param $type='none' or on both if $type='xxxclickable')

+	 *  @param	int		$forcenowrap		Force no wrap between text and picto (works with notabs=2 only)

+	 * 	@return	string						HTML code of text, picto, tooltip

@@ -751,0 +623,3 @@
+		$alt = '';

+		if ($tooltiptrigger) $alt = $langs->transnoentitiesnoconv("ClickToShowHelp");

+

@@ -753,15 +627,2 @@
-		if ($type == '0') {

-			$type = 'info';

-		} elseif ($type == '1') {

-			$type = 'help';

-		}

-		// Clean parameters

-		$tooltiptrigger = preg_replace('/[^a-z0-9]/i', '', $tooltiptrigger);

-

-		if (preg_match('/onsmartphone$/', $tooltiptrigger) && empty($conf->dol_no_mouse_hover)) {

-			$tooltiptrigger = preg_replace('/^.*onsmartphone$/', '', $tooltiptrigger);

-		}

-		$alt = '';

-		if ($tooltiptrigger) {

-			$alt = $langs->transnoentitiesnoconv("ClickToShowHelp");

-		}

+		if ($type == '0') $type = 'info';

+		elseif ($type == '1') $type = 'help';

@@ -770,4 +631,5 @@
-		if (empty($conf->use_javascript_ajax)) {

-			if ($type == 'info' || $type == 'infoclickable' || $type == 'help' || $type == 'helpclickable') {

-				return $text;

-			} else {

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

+		{

+			if ($type == 'info' || $type == 'infoclickable' || $type == 'help' || $type == 'helpclickable')	return $text;

+			else

+			{

@@ -780,4 +642,3 @@
-		if (!empty($conf->dol_no_mouse_hover) && empty($tooltiptrigger)) {

-			if ($type == 'info' || $type == 'infoclickable' || $type == 'help' || $type == 'helpclickable') {

-				return $text;

-			}

+		if (!empty($conf->dol_no_mouse_hover) && empty($tooltiptrigger))

+		{

+			if ($type == 'info' || $type == 'infoclickable' || $type == 'help' || $type == 'helpclickable') return $text;

@@ -786 +647 @@
-		//if (!empty($conf->dol_no_mouse_hover) && !empty($tooltiptrigger))

+		//if (! empty($conf->dol_no_mouse_hover) && ! empty($tooltiptrigger))

@@ -788 +649 @@
-		//if ($type == 'info' || $type == 'help') return '<a href="'..'">'.$text.'</a>';

+		//if ($type == 'info' || $type == 'help') return '<a href="'..'">'.$text.''</a>';

@@ -792,15 +653,7 @@
-		if ($type == 'info') {

-			$img = img_help(0, $alt);

-		} elseif ($type == 'help') {

-			$img = img_help(($tooltiptrigger != '' ? 2 : 1), $alt);

-		} elseif ($type == 'helpclickable') {

-			$img = img_help(($tooltiptrigger != '' ? 2 : 1), $alt);

-		} elseif ($type == 'superadmin') {

-			$img = img_picto($alt, 'redstar');

-		} elseif ($type == 'admin') {

-			$img = img_picto($alt, 'star');

-		} elseif ($type == 'warning') {

-			$img = img_warning($alt);

-		} elseif ($type != 'none') {

-			$img = img_picto($alt, $type); // $type can be an image path

-		}

+		if ($type == 'info') $img = img_help(0, $alt);

+		elseif ($type == 'help') $img = img_help(($tooltiptrigger != '' ? 2 : 1), $alt);

+		elseif ($type == 'helpclickable') $img = img_help(($tooltiptrigger != '' ? 2 : 1), $alt);

+		elseif ($type == 'superadmin') $img = img_picto($alt, 'redstar');

+		elseif ($type == 'admin') $img = img_picto($alt, 'star');

+		elseif ($type == 'warning') $img = img_warning($alt);

+		elseif ($type != 'none') $img = img_picto($alt, $type); // $type can be an image path

@@ -814,8 +667,6 @@
-	 * @param string 	$selected 		Value auto selected when at least one record is selected. Not a preselected value. Use '0' by default.

-	 * @param array 	$arrayofaction 	array('code'=>'label', ...). The code is the key stored into the GETPOST('massaction') when submitting action.

-	 * @param int 		$alwaysvisible 	1=select button always visible

-	 * @param string 	$name 			Name for massaction

-	 * @param string 	$cssclass 		CSS class used to check for select

-	 * @return string|void              Select list

-	 */

-	public function selectMassAction($selected, $arrayofaction, $alwaysvisible = 0, $name = 'massaction', $cssclass = 'checkforselect')

+	 * @param	string	$selected		Value auto selected when at least one record is selected. Not a preselected value. Use '0' by default.

+	 * @param	array		$arrayofaction	array('code'=>'label', ...). The code is the key stored into the GETPOST('massaction') when submitting action.

+	 * @param   int     $alwaysvisible  1=select button always visible

+	 * @return	string|void					Select list

+	 */

+	public function selectMassAction($selected, $arrayofaction, $alwaysvisible = 0)

@@ -823,0 +675 @@
+

@@ -827 +679 @@
-		$ret .= '<select class="flat' . (empty($conf->use_javascript_ajax) ? '' : ' hideobject') . ' ' . $name . ' ' . $name . 'select valignmiddle alignstart" id="' . $name . '" name="' . $name . '"' . ($disabled ? ' disabled="disabled"' : '') . '>';

+		$ret .= '<select class="flat'.(empty($conf->use_javascript_ajax) ? '' : ' hideobject').' massaction massactionselect valignmiddle" name="massaction"'.($disabled ? ' disabled="disabled"' : '').'>';

@@ -833,10 +685,7 @@
-

-		if (is_array($arrayofaction) && count($arrayofaction) == 0 && empty($hookmanager->resPrint)) {

-			return;

-		}

-		if (empty($reshook)) {

-			$ret .= '<option value="0"' . ($disabled ? ' disabled="disabled"' : '') . '>-- ' . $langs->trans("SelectAction") . ' --</option>';

-			if (is_array($arrayofaction)) {

-				foreach ($arrayofaction as $code => $label) {

-					$ret .= '<option value="' . $code . '"' . ($disabled ? ' disabled="disabled"' : '') . ' data-html="' . dol_escape_htmltag($label) . '">' . $label . '</option>';

-				}

+		if (count($arrayofaction) == 0 && empty($hookmanager->resPrint)) return;

+		if (empty($reshook))

+		{

+			$ret .= '<option value="0"'.($disabled ? ' disabled="disabled"' : '').'>-- '.$langs->trans("SelectAction").' --</option>';

+			foreach ($arrayofaction as $code => $label)

+			{

+				$ret .= '<option value="'.$code.'"'.($disabled ? ' disabled="disabled"' : '').' data-html="'.dol_escape_htmltag($label).'">'.$label.'</option>';

@@ -849,3 +698 @@
-		if (empty($conf->dol_optimize_smallscreen)) {

-			$ret .= ajax_combobox('.' . $name . 'select');

-		}

+		if (empty($conf->dol_optimize_smallscreen)) $ret .= ajax_combobox('.massactionselect');

@@ -855 +702 @@
-		$ret .= '<input type="submit" disabled name="confirmmassaction"' . (empty($conf->use_javascript_ajax) ? '' : ' style="display: none"') . ' class="reposition button smallpaddingimp' . (empty($conf->use_javascript_ajax) ? '' : ' hideobject') . ' ' . $name . ' ' . $name . 'confirmed" value="' . dol_escape_htmltag($langs->trans("Confirm")) . '">';

+		$ret .= '<input type="submit" disabled name="confirmmassaction" class="button'.(empty($conf->use_javascript_ajax) ? '' : ' hideobject').' massaction massactionconfirmed" value="'.dol_escape_htmltag($langs->trans("Confirm")).'">';

@@ -858 +705,2 @@
-		if (!empty($conf->use_javascript_ajax)) {

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

+		{

@@ -860,2 +708,2 @@
-    		<script nonce="' . getNonce() . '">

-                        function initCheckForSelect(mode, name, cssclass)	/* mode is 0 during init of page or click all, 1 when we click on 1 checkboxi, "name" refers to the class of the massaction button, "cssclass" to the class of the checkfor select boxes */

+    		<script>

+        		function initCheckForSelect(mode)	/* mode is 0 during init of page or click all, 1 when we click on 1 checkbox */

@@ -864 +712 @@
-                                jQuery("."+cssclass).each(function( index ) {

+    	    		jQuery(".checkforselect").each(function( index ) {

@@ -869,3 +717,3 @@
-					console.log("initCheckForSelect mode="+mode+" name="+name+" cssclass="+cssclass+" atleastoneselected="+atleastoneselected);

-

-    	  			if (atleastoneselected || ' . $alwaysvisible . ')

+					console.log("initCheckForSelect mode="+mode+" atleastoneselected="+atleastoneselected);

+

+    	  			if (atleastoneselected || '.$alwaysvisible.')

@@ -873,3 +721,3 @@
-                                    jQuery("."+name).show();

-        			    ' . ($selected ? 'if (atleastoneselected) { jQuery("."+name+"select").val("' . $selected . '").trigger(\'change\'); jQuery("."+name+"confirmed").prop(\'disabled\', false); }' : '') . '

-        			    ' . ($selected ? 'if (! atleastoneselected) { jQuery("."+name+"select").val("0").trigger(\'change\'); jQuery("."+name+"confirmed").prop(\'disabled\', true); } ' : '') . '

+    	  				jQuery(".massaction").show();

+        			    '.($selected ? 'if (atleastoneselected) { jQuery(".massactionselect").val("'.$selected.'").trigger(\'change\'); jQuery(".massactionconfirmed").prop(\'disabled\', false); }' : '').'

+        			    '.($selected ? 'if (! atleastoneselected) { jQuery(".massactionselect").val("0").trigger(\'change\'); jQuery(".massactionconfirmed").prop(\'disabled\', true); } ' : '').'

@@ -879,2 +727,2 @@
-                                    jQuery("."+name).hide();

-                                    jQuery("."+name+"other").hide();

+    	  				jQuery(".massaction").hide();

+						jQuery(".massactionother").hide();

@@ -885,5 +733,5 @@
-                    initCheckForSelect(0, "' . $name . '", "' . $cssclass . '");

-                    jQuery(".' . $cssclass . '").click(function() {

-                        initCheckForSelect(1, "' . $name . '", "' . $cssclass . '");

-                    });

-                        jQuery(".' . $name . 'select").change(function() {

+        		initCheckForSelect(0);

+        		jQuery(".checkforselect").click(function() {

+        			initCheckForSelect(1);

+    	  		});

+    	  		jQuery(".massactionselect").change(function() {

@@ -897 +745 @@
-                    console.log("we select a mass action name=' . $name . ' massaction="+massaction+" - "+urlform);

+                    console.log("we select a mass action "+massaction+" - "+urlform);

@@ -901,3 +749,2 @@
-                                        jQuery(".' . $name . 'confirmed").prop(\'disabled\', false);

-										jQuery(".' . $name . 'other").hide();	/* To disable if another div was open */

-                                        jQuery(".' . $name . '"+massaction).show();

+    	  				jQuery(".massactionconfirmed").prop(\'disabled\', false);

+						jQuery(".massactionother").show();

@@ -907,2 +754,2 @@
-                                        jQuery(".' . $name . 'confirmed").prop(\'disabled\', true);

-										jQuery(".' . $name . 'other").hide();	/* To disable any div open */

+    	  				jQuery(".massactionconfirmed").prop(\'disabled\', true);

+						jQuery(".massactionother").hide();

@@ -920 +766,0 @@
-

@@ -924,14 +770,13 @@
-	 * @param string 		$selected 				Id or Code or Label of preselected country

-	 * @param string 		$htmlname 				Name of html select object

-	 * @param string 		$htmloption 			More html options on select object

-	 * @param integer 		$maxlength 				Max length for labels (0=no limit)

-	 * @param string 		$morecss 				More css class

-	 * @param string 		$usecodeaskey 			''=Use id as key (default), 'code3'=Use code on 3 alpha as key, 'code2"=Use code on 2 alpha as key

-	 * @param int|string 	$showempty 				Show empty choice

-	 * @param int 			$disablefavorites 		1=Disable favorites,

-	 * @param int 			$addspecialentries 		1=Add dedicated entries for group of countries (like 'European Economic Community', ...)

-	 * @param array 		$exclude_country_code 	Array of country code (iso2) to exclude

-	 * @param int 			$hideflags 				Hide flags

-	 * @return string       	                	HTML string with select

-	 */

-	public function select_country($selected = '', $htmlname = 'country_id', $htmloption = '', $maxlength = 0, $morecss = 'minwidth300', $usecodeaskey = '', $showempty = 1, $disablefavorites = 0, $addspecialentries = 0, $exclude_country_code = array(), $hideflags = 0)

+	 *  @param	string	$selected       		Id or Code or Label of preselected country

+	 *  @param  string	$htmlname       		Name of html select object

+	 *  @param  string	$htmloption     		More html options on select object

+	 *  @param	integer	$maxlength				Max length for labels (0=no limit)

+	 *  @param	string	$morecss				More css class

+	 *  @param	string	$usecodeaskey			''=Use id as key (default), 'code3'=Use code on 3 alpha as key, 'code2"=Use code on 2 alpha as key

+	 *  @param	int		$showempty				Show empty choice

+	 *  @param	int		$disablefavorites		1=Disable favorites,

+	 *  @param	int		$addspecialentries		1=Add dedicated entries for group of countries (like 'European Economic Community', ...)

+	 *  @param	array	$exclude_country_code	Array of country code (iso2) to exclude

+	 *  @return string           				HTML string with select

+	 */

+	public function select_country($selected = '', $htmlname = 'country_id', $htmloption = '', $maxlength = 0, $morecss = 'minwidth300', $usecodeaskey = '', $showempty = 1, $disablefavorites = 0, $addspecialentries = 0, $exclude_country_code = array())

@@ -950,2 +795,2 @@
-		$sql = "SELECT rowid, code as code_iso, code_iso as code_iso3, label, favorite, eec";

-		$sql .= " FROM " . $this->db->prefix() . "c_country";

+		$sql = "SELECT rowid, code as code_iso, code_iso as code_iso3, label, favorite";

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

@@ -955 +800 @@
-		dol_syslog(get_class($this) . "::select_country", LOG_DEBUG);

+		dol_syslog(get_class($this)."::select_country", LOG_DEBUG);

@@ -957,2 +802,3 @@
-		if ($resql) {

-			$out .= '<select id="select' . $htmlname . '" class="flat maxwidth200onsmartphone selectcountry' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '" ' . $htmloption . '>';

+		if ($resql)

+		{

+			$out .= '<select id="select'.$htmlname.'" class="flat maxwidth200onsmartphone selectcountry'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" '.$htmloption.'>';

@@ -961,2 +807,6 @@
-			if ($num) {

-				while ($i < $num) {

+			if ($num)

+			{

+				$foundselected = false;

+

+				while ($i < $num)

+				{

@@ -967,4 +817,3 @@
-					$countryArray[$i]['code_iso3'] = $obj->code_iso3;

-					$countryArray[$i]['label'] = ($obj->code_iso && $langs->transnoentitiesnoconv("Country" . $obj->code_iso) != "Country" . $obj->code_iso ? $langs->transnoentitiesnoconv("Country" . $obj->code_iso) : ($obj->label != '-' ? $obj->label : ''));

-					$countryArray[$i]['favorite'] = $obj->favorite;

-					$countryArray[$i]['eec'] = $obj->eec;

+					$countryArray[$i]['code_iso3'] 	= $obj->code_iso3;

+					$countryArray[$i]['label'] = ($obj->code_iso && $langs->transnoentitiesnoconv("Country".$obj->code_iso) != "Country".$obj->code_iso ? $langs->transnoentitiesnoconv("Country".$obj->code_iso) : ($obj->label != '-' ? $obj->label : ''));

+					$countryArray[$i]['favorite']   = $obj->favorite;

@@ -976,17 +825,10 @@
-				if (empty($disablefavorites)) {

-					$array1_sort_order = SORT_DESC;

-					$array2_sort_order = SORT_ASC;

-					array_multisort($favorite, $array1_sort_order, $label, $array2_sort_order, $countryArray);

-				} else {

-					$countryArray = dol_sort_array($countryArray, 'label');

-				}

-

-				if ($showempty) {

-					if (is_numeric($showempty)) {

-						$out .= '<option value="">&nbsp;</option>' . "\n";

-					} else {

-						$out .= '<option value="-1">' . $langs->trans($showempty) . '</option>' . "\n";

-					}

-				}

-

-				if ($addspecialentries) {    // Add dedicated entries for groups of countries

+				if (empty($disablefavorites)) array_multisort($favorite, SORT_DESC, $label, SORT_ASC, $countryArray);

+				else $countryArray = dol_sort_array($countryArray, 'label');

+

+				if ($showempty)

+				{

+					$out .= '<option value="">&nbsp;</option>'."\n";

+				}

+

+				if ($addspecialentries)	// Add dedicated entries for groups of countries

+				{

@@ -994,10 +836,9 @@
-					$out .= '<option value="special_allnotme"' . ($selected == 'special_allnotme' ? ' selected' : '') . '>' . $langs->trans("CountriesExceptMe", $langs->transnoentitiesnoconv("Country" . $mysoc->country_code)) . '</option>';

-					$out .= '<option value="special_eec"' . ($selected == 'special_eec' ? ' selected' : '') . '>' . $langs->trans("CountriesInEEC") . '</option>';

-					if ($mysoc->isInEEC()) {

-						$out .= '<option value="special_eecnotme"' . ($selected == 'special_eecnotme' ? ' selected' : '') . '>' . $langs->trans("CountriesInEECExceptMe", $langs->transnoentitiesnoconv("Country" . $mysoc->country_code)) . '</option>';

-					}

-					$out .= '<option value="special_noteec"' . ($selected == 'special_noteec' ? ' selected' : '') . '>' . $langs->trans("CountriesNotInEEC") . '</option>';

-					$out .= '<option value="" disabled class="selectoptiondisabledwhite">------------</option>';

-				}

-

-				foreach ($countryArray as $row) {

+					$out .= '<option value="special_allnotme"'.($selected == 'special_allnotme' ? ' selected' : '').'>'.$langs->trans("CountriesExceptMe", $langs->transnoentitiesnoconv("Country".$mysoc->country_code)).'</option>';

+					$out .= '<option value="special_eec"'.($selected == 'special_eec' ? ' selected' : '').'>'.$langs->trans("CountriesInEEC").'</option>';

+					if ($mysoc->isInEEC()) $out .= '<option value="special_eecnotme"'.($selected == 'special_eecnotme' ? ' selected' : '').'>'.$langs->trans("CountriesInEECExceptMe", $langs->transnoentitiesnoconv("Country".$mysoc->country_code)).'</option>';

+					$out .= '<option value="special_noteec"'.($selected == 'special_noteec' ? ' selected' : '').'>'.$langs->trans("CountriesNotInEEC").'</option>';

+					$out .= '<option value="" disabled class="selectoptiondisabledwhite">--------------</option>';

+				}

+

+				foreach ($countryArray as $row)

+				{

@@ -1005,11 +846,6 @@
-					if (empty($row['rowid'])) {

-						continue;

-					}

-					if (is_array($exclude_country_code) && count($exclude_country_code) && in_array($row['code_iso'], $exclude_country_code)) {

-						continue; // exclude some countries

-					}

-

-					if (empty($disablefavorites) && $row['favorite'] && $row['code_iso']) {

-						$atleastonefavorite++;

-					}

-					if (empty($row['favorite']) && $atleastonefavorite) {

+					if (empty($row['rowid'])) continue;

+					if (is_array($exclude_country_code) && count($exclude_country_code) && in_array($row['code_iso'], $exclude_country_code)) continue; // exclude some countries

+

+					if (empty($disablefavorites) && $row['favorite'] && $row['code_iso']) $atleastonefavorite++;

+					if (empty($row['favorite']) && $atleastonefavorite)

+					{

@@ -1017,24 +853,15 @@
-						$out .= '<option value="" disabled class="selectoptiondisabledwhite">------------</option>';

-					}

-

-					$labeltoshow = '';

-					if ($row['label']) {

-						$labeltoshow .= dol_trunc($row['label'], $maxlength, 'middle');

-					} else {

-						$labeltoshow .= '&nbsp;';

-					}

-					if ($row['code_iso']) {

-						$labeltoshow .= ' <span class="opacitymedium">(' . $row['code_iso'] . ')</span>';

-						if (empty($hideflags)) {

-							$tmpflag = picto_from_langcode($row['code_iso'], 'class="saturatemedium paddingrightonly"', 1);

-							$labeltoshow = $tmpflag . ' ' . $labeltoshow;

-						}

-					}

-

-					if ($selected && $selected != '-1' && ($selected == $row['rowid'] || $selected == $row['code_iso'] || $selected == $row['code_iso3'] || $selected == $row['label'])) {

-						$out .= '<option value="' . ($usecodeaskey ? ($usecodeaskey == 'code2' ? $row['code_iso'] : $row['code_iso3']) : $row['rowid']) . '" selected data-html="' . dol_escape_htmltag($labeltoshow) . '" data-eec="' . ((int) $row['eec']) . '">';

-					} else {

-						$out .= '<option value="' . ($usecodeaskey ? ($usecodeaskey == 'code2' ? $row['code_iso'] : $row['code_iso3']) : $row['rowid']) . '" data-html="' . dol_escape_htmltag($labeltoshow) . '" data-eec="' . ((int) $row['eec']) . '">';

-					}

-					$out .= $labeltoshow;

-					$out .= '</option>' . "\n";

+						$out .= '<option value="" disabled class="selectoptiondisabledwhite">--------------</option>';

+					}

+					if ($selected && $selected != '-1' && ($selected == $row['rowid'] || $selected == $row['code_iso'] || $selected == $row['code_iso3'] || $selected == $row['label']))

+					{

+						$foundselected = true;

+						$out .= '<option value="'.($usecodeaskey ? ($usecodeaskey == 'code2' ? $row['code_iso'] : $row['code_iso3']) : $row['rowid']).'" selected>';

+					}

+					else

+					{

+						$out .= '<option value="'.($usecodeaskey ? ($usecodeaskey == 'code2' ? $row['code_iso'] : $row['code_iso3']) : $row['rowid']).'">';

+					}

+					if ($row['label']) $out .= dol_trunc($row['label'], $maxlength, 'middle');

+					else $out .= '&nbsp;';

+					if ($row['code_iso']) $out .= ' ('.$row['code_iso'].')';

+					$out .= '</option>';

@@ -1044 +871,3 @@
-		} else {

+		}

+		else

+		{

@@ -1049,2 +878,2 @@
-		include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

-		$out .= ajax_combobox('select' . $htmlname, array(), 0, 0, 'resolve');

+		include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

+		$out .= ajax_combobox('select'.$htmlname);

@@ -1056 +884,0 @@
-

@@ -1060,11 +888,10 @@
-	 * @param 	string 	$selected 				Id or Code of preselected incoterm

-	 * @param 	string 	$location_incoterms 	Value of input location

-	 * @param 	string 	$page 					Defined the form action

-	 * @param 	string 	$htmlname 				Name of html select object

-	 * @param 	string 	$htmloption 			Options html on select object

-	 * @param 	int 	$forcecombo 			Force to load all values and output a standard combobox (with no beautification)

-	 * @param 	array 	$events 				Event options to run on change. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))

-	 * @param 	int 	$disableautocomplete 	Disable autocomplete

-	 * @return 	string                       	HTML string with select and input

-	 */

-	public function select_incoterms($selected = '', $location_incoterms = '', $page = '', $htmlname = 'incoterm_id', $htmloption = '', $forcecombo = 1, $events = array(), $disableautocomplete = 0)

+	 *  @param	string	$selected       		Id or Code of preselected incoterm

+	 *  @param	string	$location_incoterms     Value of input location

+	 *  @param	string	$page       			Defined the form action

+	 *  @param  string	$htmlname       		Name of html select object

+	 *  @param  string	$htmloption     		Options html on select object

+	 * 	@param	int		$forcecombo				Force to load all values and output a standard combobox (with no beautification)

+	 *  @param	array	$events					Event options to run on change. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))

+	 *  @return string           				HTML string with select and input

+	 */

+	public function select_incoterms($selected = '', $location_incoterms = '', $page = '', $htmlname = 'incoterm_id', $htmloption = '', $forcecombo = 1, $events = array())

@@ -1078 +904,0 @@
-		$moreattrib = '';

@@ -1082 +908 @@
-		$sql .= " FROM " . $this->db->prefix() . "c_incoterms";

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

@@ -1086 +912 @@
-		dol_syslog(get_class($this) . "::select_incoterm", LOG_DEBUG);

+		dol_syslog(get_class($this)."::select_incoterm", LOG_DEBUG);

@@ -1088,3 +914,5 @@
-		if ($resql) {

-			if ($conf->use_javascript_ajax && !$forcecombo) {

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

+		if ($resql)

+		{

+			if ($conf->use_javascript_ajax && !$forcecombo)

+			{

+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

@@ -1094,2 +922,3 @@
-			if (!empty($page)) {

-				$out .= '<form method="post" action="' . $page . '">';

+			if (!empty($page))

+			{

+				$out .= '<form method="post" action="'.$page.'">';

@@ -1097,4 +926,4 @@
-				$out .= '<input type="hidden" name="token" value="' . newToken() . '">';

-			}

-

-			$out .= '<select id="' . $htmlname . '" class="flat selectincoterm width75" name="' . $htmlname . '" ' . $htmloption . '>';

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

+			}

+

+			$out .= '<select id="'.$htmlname.'" class="flat selectincoterm minwidth100imp noenlargeonsmartphone" name="'.$htmlname.'" '.$htmloption.'>';

@@ -1104,2 +933,6 @@
-			if ($num) {

-				while ($i < $num) {

+			if ($num)

+			{

+				$foundselected = false;

+

+				while ($i < $num)

+				{

@@ -1112,10 +945,12 @@
-				foreach ($incotermArray as $row) {

-					if ($selected && ($selected == $row['rowid'] || $selected == $row['code'])) {

-						$out .= '<option value="' . $row['rowid'] . '" selected>';

-					} else {

-						$out .= '<option value="' . $row['rowid'] . '">';

-					}

-

-					if ($row['code']) {

-						$out .= $row['code'];

-					}

+				foreach ($incotermArray as $row)

+				{

+					if ($selected && ($selected == $row['rowid'] || $selected == $row['code']))

+					{

+						$out .= '<option value="'.$row['rowid'].'" selected>';

+					}

+					else

+					{

+						$out .= '<option value="'.$row['rowid'].'">';

+					}

+

+					if ($row['code']) $out .= $row['code'];

@@ -1128,10 +963,9 @@
-			if ($conf->use_javascript_ajax && empty($disableautocomplete)) {

-				$out .= ajax_multiautocompleter('location_incoterms', array(), DOL_URL_ROOT . '/core/ajax/locationincoterms.php') . "\n";

-				$moreattrib .= ' autocomplete="off"';

-			}

-			$out .= '<input id="location_incoterms" class="maxwidthonsmartphone type="text" name="location_incoterms" value="' . $location_incoterms . '">' . "\n";

-

-			if (!empty($page)) {

-				$out .= '<input type="submit" class="button valignmiddle smallpaddingimp nomargintop nomarginbottom" value="' . $langs->trans("Modify") . '"></form>';

-			}

-		} else {

+			$out .= '<input id="location_incoterms" class="maxwidth100onsmartphone" name="location_incoterms" value="'.$location_incoterms.'">';

+

+			if (!empty($page))

+			{

+				$out .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'"></form>';

+			}

+		}

+		else

+		{

@@ -1145,11 +979,10 @@
-

-	/**

-	 * Return list of types of lines (product or service)

-	 * Example: 0=product, 1=service, 9=other (for external module)

-	 *

-	 * @param 	string 		$selected 	Preselected type

-	 * @param 	string 		$htmlname 	Name of field in html form

-	 * @param 	int 		$showempty 	Add an empty field

-	 * @param 	int 		$hidetext 	Do not show label 'Type' before combo box (used only if there is at least 2 choices to select)

-	 * @param 	integer 	$forceall 	1=Force to show products and services in combo list, whatever are activated modules, 0=No force, 2=Force to show only Products, 3=Force to show only services, -1=Force none (and set hidden field to 'service')

-	 * @return  void

+	/**

+	 *	Return list of types of lines (product or service)

+	 * 	Example: 0=product, 1=service, 9=other (for external module)

+	 *

+	 *	@param  string	$selected       Preselected type

+	 *	@param  string	$htmlname       Name of field in html form

+	 * 	@param	int		$showempty		Add an empty field

+	 * 	@param	int		$hidetext		Do not show label 'Type' before combo box (used only if there is at least 2 choices to select)

+	 * 	@param	integer	$forceall		1=Force to show products and services in combo list, whatever are activated modules, 0=No force, 2=Force to show only Products, 3=Force to show only services, -1=Force none (and set hidden field to 'service')

+	 *  @return	void

@@ -1157,0 +991,51 @@
+	{

+		// phpcs:enable

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

+

+		// If product & services are enabled or both disabled.

+		if ($forceall == 1 || (empty($forceall) && !empty($conf->product->enabled) && !empty($conf->service->enabled))

+			|| (empty($forceall) && empty($conf->product->enabled) && empty($conf->service->enabled)))

+		{

+			if (empty($hidetext)) print $langs->trans("Type").': ';

+			print '<select class="flat" id="select_'.$htmlname.'" name="'.$htmlname.'">';

+			if ($showempty)

+			{

+				print '<option value="-1"';

+				if ($selected == -1) print ' selected';

+				print '>&nbsp;</option>';

+			}

+

+			print '<option value="0"';

+			if (0 == $selected) print ' selected';

+			print '>'.$langs->trans("Product");

+

+			print '<option value="1"';

+			if (1 == $selected) print ' selected';

+			print '>'.$langs->trans("Service");

+

+			print '</select>';

+			//if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);

+		}

+		if ((empty($forceall) && empty($conf->product->enabled) && !empty($conf->service->enabled)) || $forceall == 3)

+		{

+			print $langs->trans("Service");

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

+		}

+		if ((empty($forceall) && !empty($conf->product->enabled) && empty($conf->service->enabled)) || $forceall == 2)

+		{

+			print $langs->trans("Product");

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

+		}

+		if ($forceall < 0)	// This should happened only for contracts when both predefined product and service are disabled.

+		{

+			print '<input type="hidden" name="'.$htmlname.'" value="1">'; // By default we set on service for contract. If CONTRACT_SUPPORT_PRODUCTS is set, forceall should be 1 not -1

+		}

+	}

+

+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+	/**

+	 *	Load into cache cache_types_fees, array of types of fees

+	 *

+	 *	@return     int             Nb of lines loaded, <0 if KO

+	 */

+	public function load_cache_types_fees()

@@ -1162,56 +1045,0 @@
-		// If product & services are enabled or both disabled.

-		if ($forceall == 1 || (empty($forceall) && isModEnabled("product") && isModEnabled("service"))

-			|| (empty($forceall) && !isModEnabled('product') && !isModEnabled('service'))) {

-			if (empty($hidetext)) {

-				print $langs->trans("Type") . ': ';

-			}

-			print '<select class="flat" id="select_' . $htmlname . '" name="' . $htmlname . '">';

-			if ($showempty) {

-				print '<option value="-1"';

-				if ($selected == -1) {

-					print ' selected';

-				}

-				print '>&nbsp;</option>';

-			}

-

-			print '<option value="0"';

-			if (0 == $selected || ($selected == -1 && getDolGlobalString('MAIN_FREE_PRODUCT_CHECKED_BY_DEFAULT') == 'product')) {

-				print ' selected';

-			}

-			print '>' . $langs->trans("Product");

-

-			print '<option value="1"';

-			if (1 == $selected || ($selected == -1 && getDolGlobalString('MAIN_FREE_PRODUCT_CHECKED_BY_DEFAULT') == 'service')) {

-				print ' selected';

-			}

-			print '>' . $langs->trans("Service");

-

-			print '</select>';

-			print ajax_combobox('select_' . $htmlname);

-			//if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);

-		}

-		if ((empty($forceall) && !isModEnabled('product') && isModEnabled("service")) || $forceall == 3) {

-			print $langs->trans("Service");

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

-		}

-		if ((empty($forceall) && isModEnabled("product") && !isModEnabled('service')) || $forceall == 2) {

-			print $langs->trans("Product");

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

-		}

-		if ($forceall < 0) {    // This should happened only for contracts when both predefined product and service are disabled.

-			print '<input type="hidden" name="' . $htmlname . '" value="1">'; // By default we set on service for contract. If CONTRACT_SUPPORT_PRODUCTS is set, forceall should be 1 not -1

-		}

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-

-	/**

-	 *    Load into cache cache_types_fees, array of types of fees

-	 *

-	 * @return     int             Nb of lines loaded, <0 if KO

-	 */

-	public function load_cache_types_fees()

-	{

-		// phpcs:enable

-		global $langs;

-

@@ -1219,3 +1047 @@
-		if ($num > 0) {

-			return 0; // Cache already loaded

-		}

+		if ($num > 0) return 0; // Cache already loaded

@@ -1228 +1054 @@
-		$sql .= " FROM " . $this->db->prefix() . "c_type_fees as c";

+		$sql .= " FROM ".MAIN_DB_PREFIX."c_type_fees as c";

@@ -1232 +1058,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -1236 +1063,2 @@
-			while ($i < $num) {

+			while ($i < $num)

+			{

@@ -1248 +1076,3 @@
-		} else {

+		}

+		else

+		{

@@ -1255,8 +1085,7 @@
-

-	/**

-	 *    Return list of types of notes

-	 *

-	 * @param string $selected Preselected type

-	 * @param string $htmlname Name of field in form

-	 * @param int $showempty Add an empty field

-	 * @return    void

+	/**

+	 *	Return list of types of notes

+	 *

+	 *	@param	string		$selected		Preselected type

+	 *	@param  string		$htmlname		Name of field in form

+	 * 	@param	int			$showempty		Add an empty field

+	 * 	@return	void

@@ -1269 +1098 @@
-		dol_syslog(__METHOD__ . " selected=" . $selected . ", htmlname=" . $htmlname, LOG_DEBUG);

+		dol_syslog(__METHOD__." selected=".$selected.", htmlname=".$htmlname, LOG_DEBUG);

@@ -1273,2 +1102,3 @@
-		print '<select id="select_' . $htmlname . '" class="flat" name="' . $htmlname . '">';

-		if ($showempty) {

+		print '<select id="select_'.$htmlname.'" class="flat" name="'.$htmlname.'">';

+		if ($showempty)

+		{

@@ -1276,3 +1106 @@
-			if ($selected == -1) {

-				print ' selected';

-			}

+			if ($selected == -1) print ' selected';

@@ -1282,5 +1110,4 @@
-		foreach ($this->cache_types_fees as $key => $value) {

-			print '<option value="' . $key . '"';

-			if ($key == $selected) {

-				print ' selected';

-			}

+		foreach ($this->cache_types_fees as $key => $value)

+		{

+			print '<option value="'.$key.'"';

+			if ($key == $selected) print ' selected';

@@ -1293,3 +1120 @@
-		if ($user->admin) {

-			print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

-		}

+		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

@@ -1300 +1125,19 @@
-

+	/**

+	 *  Return HTML code to select a company.

+	 *

+	 *  @param		int			$selected				Preselected products

+	 *  @param		string		$htmlname				Name of HTML select field (must be unique in page)

+	 *  @param		int			$filter					Filter on thirdparty

+	 *  @param		int			$limit					Limit on number of returned lines

+	 *  @param		array		$ajaxoptions			Options for ajax_autocompleter

+	 * 	@param		int			$forcecombo				Force to load all values and output a standard combobox (with no beautification)

+	 *  @return		string								Return select box for thirdparty.

+	 *  @deprecated	3.8 Use select_company instead. For exemple $form->select_thirdparty(GETPOST('socid'),'socid','',0) => $form->select_company(GETPOST('socid'),'socid','',1,0,0,array(),0)

+	 */

+	public function select_thirdparty($selected = '', $htmlname = 'socid', $filter = '', $limit = 20, $ajaxoptions = array(), $forcecombo = 0)

+	{

+		// phpcs:enable

+		return $this->select_thirdparty_list($selected, $htmlname, $filter, 1, 0, $forcecombo, array(), '', 0, $limit);

+	}

+

+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -1304,19 +1147,17 @@
-	 * @param string 	$selected 			Preselected type

-	 * @param string 	$htmlname 			Name of field in form

-	 * @param string 	$filter 			Optional filters criteras. WARNING: To avoid SQL injection, only few chars [.a-z0-9 =<>()] are allowed here (example: 's.rowid <> x', 's.client IN (1,3)'). Do not use a filter coming from input of users.

-	 * @param string 	$showempty 			Add an empty field (Can be '1' or text key to use on empty line like 'SelectThirdParty')

-	 * @param int 		$showtype 			Show third party type in combolist (customer, prospect or supplier)

-	 * @param int 		$forcecombo 		Force to load all values and output a standard combobox (with no beautification)

-	 * @param array 	$events 			Ajax event options to run on change. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))

-	 * @param int 		$limit 				Maximum number of elements

-	 * @param string 	$morecss 			Add more css styles to the SELECT component

-	 * @param string 	$moreparam 			Add more parameters onto the select tag. For example 'style="width: 95%"' to avoid select2 component to go over parent container

-	 * @param string 	$selected_input_value 	Value of preselected input text (for use with ajax)

-	 * @param int 		$hidelabel 			Hide label (0=no, 1=yes, 2=show search icon (before) and placeholder, 3 search icon after)

-	 * @param array 	$ajaxoptions 		Options for ajax_autocompleter

-	 * @param bool 		$multiple 			add [] in the name of element and add 'multiple' attribut (not working with ajax_autocompleter)

-	 * @param array 	$excludeids 		Exclude IDs from the select combo

-	 * @param int 		$showcode 			Show code

-	 * @return string  		                HTML string with select box for thirdparty.

-	 */

-	public function select_company($selected = '', $htmlname = 'socid', $filter = '', $showempty = '', $showtype = 0, $forcecombo = 0, $events = array(), $limit = 0, $morecss = 'minwidth100', $moreparam = '', $selected_input_value = '', $hidelabel = 1, $ajaxoptions = array(), $multiple = false, $excludeids = array(), $showcode = 0)

+	 *	@param	string	$selected       		Preselected type

+	 *	@param  string	$htmlname       		Name of field in form

+	 *  @param  string	$filter         		Optional filters criteras. WARNING: To avoid SQL injection, only few chars [.a-z0-9 =<>] are allowed here (example: 's.rowid <> x', 's.client IN (1,3)')

+	 *	@param	string	$showempty				Add an empty field (Can be '1' or text key to use on empty line like 'SelectThirdParty')

+	 * 	@param	int		$showtype				Show third party type in combolist (customer, prospect or supplier)

+	 * 	@param	int		$forcecombo				Force to load all values and output a standard combobox (with no beautification)

+	 *  @param	array	$events					Ajax event options to run on change. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))

+	 *	@param	int		$limit					Maximum number of elements

+	 *  @param	string	$morecss				Add more css styles to the SELECT component

+	 *	@param  string	$moreparam      		Add more parameters onto the select tag. For example 'style="width: 95%"' to avoid select2 component to go over parent container

+	 *	@param	string	$selected_input_value	Value of preselected input text (for use with ajax)

+	 *  @param	int		$hidelabel				Hide label (0=no, 1=yes, 2=show search icon (before) and placeholder, 3 search icon after)

+	 *  @param	array	$ajaxoptions			Options for ajax_autocompleter

+	 * 	@param  bool	$multiple				add [] in the name of element and add 'multiple' attribut (not working with ajax_autocompleter)

+	 * 	@return	string							HTML string with select box for thirdparty.

+	 */

+	public function select_company($selected = '', $htmlname = 'socid', $filter = '', $showempty = '', $showtype = 0, $forcecombo = 0, $events = array(), $limit = 0, $morecss = 'minwidth100', $moreparam = '', $selected_input_value = '', $hidelabel = 1, $ajaxoptions = array(), $multiple = false)

@@ -1329,7 +1170,2 @@
-		if (!empty($conf->use_javascript_ajax) && getDolGlobalString('COMPANY_USE_SEARCH_TO_SELECT') && !$forcecombo) {

-			if (is_null($ajaxoptions)) {

-				$ajaxoptions = array();

-			}

-

-			require_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

-

+		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT) && !$forcecombo)

+		{

@@ -1338,2 +1174,3 @@
-			if ($selected && empty($selected_input_value)) {

-				require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';

+			if ($selected && empty($selected_input_value))

+			{

+				require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';

@@ -1345 +1181,0 @@
-

@@ -1347,7 +1183,6 @@
-			$urloption = 'htmlname=' . urlencode(str_replace('.', '_', $htmlname)) . '&outjson=1&filter=' . urlencode($filter) . (empty($excludeids) ? '' : '&excludeids=' . join(',', $excludeids)) . ($showtype ? '&showtype=' . urlencode($showtype) : '') . ($showcode ? '&showcode=' . urlencode($showcode) : '');

-

-			$out .= '<!-- force css to be higher than dialog popup --><style type="text/css">.ui-autocomplete { z-index: 1010; }</style>';

-			if (empty($hidelabel)) {

-				print $langs->trans("RefOrLabel") . ' : ';

-			} elseif ($hidelabel > 1) {

-				$placeholder = $langs->trans("RefOrLabel");

+			$urloption = 'htmlname='.urlencode($htmlname).'&outjson=1&filter='.urlencode($filter).($showtype ? '&showtype='.urlencode($showtype) : '');

+			$out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/societe/ajax/company.php', $urloption, $conf->global->COMPANY_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);

+			$out .= '<style type="text/css">.ui-autocomplete { z-index: 250; }</style>';

+			if (empty($hidelabel)) print $langs->trans("RefOrLabel").' : ';

+			elseif ($hidelabel > 1) {

+				$placeholder = ' placeholder="'.$langs->trans("RefOrLabel").'"';

@@ -1358 +1193 @@
-			$out .= '<input type="text" class="' . $morecss . '" name="search_' . $htmlname . '" id="search_' . $htmlname . '" value="' . $selected_input_value . '"' . ($placeholder ? ' placeholder="' . dol_escape_htmltag($placeholder) . '"' : '') . ' ' . (getDolGlobalString('THIRDPARTY_SEARCH_AUTOFOCUS') ? 'autofocus' : '') . ' />';

+			$out .= '<input type="text" class="'.$morecss.'" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' '.(!empty($conf->global->THIRDPARTY_SEARCH_AUTOFOCUS) ? 'autofocus' : '').' />';

@@ -1362,5 +1197,3 @@
-

-			$out .= ajax_event($htmlname, $events);

-

-			$out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT . '/societe/ajax/company.php', $urloption, $conf->global->COMPANY_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);

-		} else {

+		}

+		else

+		{

@@ -1368 +1201 @@
-			$out .= $this->select_thirdparty_list($selected, $htmlname, $filter, $showempty, $showtype, $forcecombo, $events, '', 0, $limit, $morecss, $moreparam, $multiple, $excludeids, $showcode);

+			$out .= $this->select_thirdparty_list($selected, $htmlname, $filter, $showempty, $showtype, $forcecombo, $events, '', 0, $limit, $morecss, $moreparam, $multiple);

@@ -1375 +1207,0 @@
-

@@ -1380,20 +1212,16 @@
-	 * @param string 	$selected 		Preselected type

-	 * @param string 	$htmlname 		Name of field in form

-	 * @param string 	$filter 		Optional filters criteras. WARNING: To avoid SQL injection, only few chars [.a-z0-9 =<>] are allowed here, example: 's.rowid <> x'

-	 * 									If you need parenthesis, use the Universal Filter Syntax, example: '(s.client:in:1,3)'

-	 * 									Do not use a filter coming from input of users.

-	 * @param string 	$showempty 		Add an empty field (Can be '1' or text to use on empty line like 'SelectThirdParty')

-	 * @param int 		$showtype 		Show third party type in combolist (customer, prospect or supplier)

-	 * @param int 		$forcecombo 	Force to use standard HTML select component without beautification

-	 * @param array 	$events 		Event options. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))

-	 * @param string 	$filterkey 		Filter on key value

-	 * @param int 		$outputmode 	0=HTML select string, 1=Array

-	 * @param int 		$limit 			Limit number of answers

-	 * @param string 	$morecss 		Add more css styles to the SELECT component

-	 * @param string 	$moreparam 		Add more parameters onto the select tag. For example 'style="width: 95%"' to avoid select2 component to go over parent container

-	 * @param bool 		$multiple 		add [] in the name of element and add 'multiple' attribut

-	 * @param array 	$excludeids 	Exclude IDs from the select combo

-	 * @param int 		$showcode 		Show code in list

-	 * @return array|string            	HTML string with

-	 */

-	public function select_thirdparty_list($selected = '', $htmlname = 'socid', $filter = '', $showempty = '', $showtype = 0, $forcecombo = 0, $events = array(), $filterkey = '', $outputmode = 0, $limit = 0, $morecss = 'minwidth100', $moreparam = '', $multiple = false, $excludeids = array(), $showcode = 0)

+	 *	@param	string	$selected       Preselected type

+	 *	@param  string	$htmlname       Name of field in form

+	 *  @param  string	$filter         Optional filters criteras (example: 's.rowid <> x', 's.client in (1,3)')

+	 *	@param	string	$showempty		Add an empty field (Can be '1' or text to use on empty line like 'SelectThirdParty')

+	 * 	@param	int		$showtype		Show third party type in combolist (customer, prospect or supplier)

+	 * 	@param	int		$forcecombo		Force to use standard HTML select component without beautification

+	 *  @param	array	$events			Event options. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))

+	 *  @param	string	$filterkey		Filter on key value

+	 *  @param	int		$outputmode		0=HTML select string, 1=Array

+	 *  @param	int		$limit			Limit number of answers

+	 *  @param	string	$morecss		Add more css styles to the SELECT component

+	 *	@param  string	$moreparam      Add more parameters onto the select tag. For example 'style="width: 95%"' to avoid select2 component to go over parent container

+	 *	@param  bool	$multiple       add [] in the name of element and add 'multiple' attribut

+	 * 	@return	string					HTML string with

+	 */

+	public function select_thirdparty_list($selected = '', $htmlname = 'socid', $filter = '', $showempty = '', $showtype = 0, $forcecombo = 0, $events = array(), $filterkey = '', $outputmode = 0, $limit = 0, $morecss = 'minwidth100', $moreparam = '', $multiple = false)

@@ -1403 +1230,0 @@
-		global $hookmanager;

@@ -1409,5 +1236,2 @@
-		if ($selected === '') {

-			$selected = array();

-		} elseif (!is_array($selected)) {

-			$selected = array($selected);

-		}

+		if ($selected === '') $selected = array();

+		elseif (!is_array($selected)) $selected = array($selected);

@@ -1419,27 +1243,7 @@
-				return 'SQLInjectionTryDetected';

-			}

-		}

-

-		if ($filter != '') {	// If a filter was provided

-			if (preg_match('/[\(\)]/', $filter)) {

-				// If there is one parenthesis inside the criteria, we assume it is an Universal Filter Syntax.

-				$errormsg = '';

-				$filter = forgeSQLFromUniversalSearchCriteria($filter, $errormsg, 1);

-

-				// Redo clean $filter that may contains sql conditions so sql code

-				if (function_exists('testSqlAndScriptInject')) {

-					if (testSqlAndScriptInject($filter, 3) > 0) {

-						$filter = '';

-						return 'SQLInjectionTryDetected';

-					}

-				}

-			} else {

-				// If not, we do nothing. We already know that there is no parenthesis

-				// TODO Disallow this case in a future.

-				dol_syslog("Warning, select_thirdparty_list was called with a filter criteria not using the Universal Search Syntax.", LOG_WARNING);

-			}

-		}

-

-		// We search companies

-		$sql = "SELECT s.rowid, s.nom as name, s.name_alias, s.tva_intra, s.client, s.fournisseur, s.code_client, s.code_fournisseur";

-		if (getDolGlobalString('COMPANY_SHOW_ADDRESS_SELECTLIST')) {

+			}

+		}

+

+		// On recherche les societes

+		$sql = "SELECT s.rowid, s.nom as name, s.name_alias, s.client, s.fournisseur, s.code_client, s.code_fournisseur";

+

+		if ($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST) {

@@ -1449,29 +1253,11 @@
-		$sql .= " FROM " . $this->db->prefix() . "societe as s";

-		if (getDolGlobalString('COMPANY_SHOW_ADDRESS_SELECTLIST')) {

-			$sql .= " LEFT JOIN " . $this->db->prefix() . "c_country as dictp ON dictp.rowid = s.fk_pays";

-		}

-		if (!$user->hasRight('societe', 'client', 'voir') && !$user->socid) {

-			$sql .= ", " . $this->db->prefix() . "societe_commerciaux as sc";

-		}

-		$sql .= " WHERE s.entity IN (" . getEntity('societe') . ")";

-		if (!empty($user->socid)) {

-			$sql .= " AND s.rowid = " . ((int) $user->socid);

-		}

-		if ($filter) {

-			// $filter is safe because, if it contains '(' or ')', it has been sanitized by testSqlAndScriptInject() and forgeSQLFromUniversalSearchCriteria()

-			// if not, by testSqlAndScriptInject() only.

-			$sql .= " AND (" . $filter . ")";

-		}

-		if (!$user->hasRight('societe', 'client', 'voir') && !$user->socid) {

-			$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " . ((int) $user->id);

-		}

-		if (getDolGlobalString('COMPANY_HIDE_INACTIVE_IN_COMBOBOX')) {

-			$sql .= " AND s.status <> 0";

-		}

-		if (!empty($excludeids)) {

-			$sql .= " AND s.rowid NOT IN (" . $this->db->sanitize(join(',', $excludeids)) . ")";

-		}

-		// Add where from hooks

-		$parameters = array();

-		$reshook = $hookmanager->executeHooks('selectThirdpartyListWhere', $parameters); // Note that $action and $object may have been modified by hook

-		$sql .= $hookmanager->resPrint;

+

+		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";

+		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

+		if ($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST) {

+			$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."c_country as dictp ON dictp.rowid=s.fk_pays";

+		}

+		$sql .= " WHERE s.entity IN (".getEntity('societe').")";

+		if (!empty($user->socid)) $sql .= " AND s.rowid = ".$user->socid;

+		if ($filter) $sql .= " AND (".$filter.")";

+		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;

+		if (!empty($conf->global->COMPANY_HIDE_INACTIVE_IN_COMBOBOX)) $sql .= " AND s.status <> 0";

@@ -1479 +1265,2 @@
-		if ($filterkey && $filterkey != '') {

+		if ($filterkey && $filterkey != '')

+		{

@@ -1481 +1268 @@
-			$prefix = !getDolGlobalString('COMPANY_DONOTSEARCH_ANYWHERE') ? '%' : ''; // Can use index if COMPANY_DONOTSEARCH_ANYWHERE is on

+			$prefix = empty($conf->global->COMPANY_DONOTSEARCH_ANYWHERE) ? '%' : ''; // Can use index if COMPANY_DONOTSEARCH_ANYWHERE is on

@@ -1485,3 +1272 @@
-			if (count($scrit) > 1) {

-				$sql .= "(";

-			}

+			if (count($scrit) > 1) $sql .= "(";

@@ -1489,4 +1274,2 @@
-				if ($i > 0) {

-					$sql .= " AND ";

-				}

-				$sql .= "(s.nom LIKE '" . $this->db->escape($prefix . $crit) . "%')";

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

+				$sql .= "(s.nom LIKE '".$this->db->escape($prefix.$crit)."%')";

@@ -1495,8 +1278,6 @@
-			if (count($scrit) > 1) {

-				$sql .= ")";

-			}

-			if (isModEnabled('barcode')) {

-				$sql .= " OR s.barcode LIKE '" . $this->db->escape($prefix . $filterkey) . "%'";

-			}

-			$sql .= " OR s.code_client LIKE '" . $this->db->escape($prefix . $filterkey) . "%' OR s.code_fournisseur LIKE '" . $this->db->escape($prefix . $filterkey) . "%'";

-			$sql .= " OR s.name_alias LIKE '" . $this->db->escape($prefix . $filterkey) . "%' OR s.tva_intra LIKE '" . $this->db->escape($prefix . $filterkey) . "%'";

+			if (count($scrit) > 1) $sql .= ")";

+			if (!empty($conf->barcode->enabled))

+			{

+				$sql .= " OR s.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";

+			}

+			$sql .= " OR s.code_client LIKE '".$this->db->escape($prefix.$filterkey)."%' OR s.code_fournisseur LIKE '".$this->db->escape($prefix.$filterkey)."%'";

@@ -1511,4 +1292,6 @@
-		if ($resql) {

-			if (!$forcecombo) {

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

-				$out .= ajax_combobox($htmlname, $events, getDolGlobalString("COMPANY_USE_SEARCH_TO_SELECT"));

+		if ($resql)

+		{

+			if (!$forcecombo)

+			{

+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

+				$out .= ajax_combobox($htmlname, $events, $conf->global->COMPANY_USE_SEARCH_TO_SELECT);

@@ -1518 +1301 @@
-			$out .= '<select id="' . $htmlname . '" class="flat' . ($morecss ? ' ' . $morecss : '') . '"' . ($moreparam ? ' ' . $moreparam : '') . ' name="' . $htmlname . ($multiple ? '[]' : '') . '" ' . ($multiple ? 'multiple' : '') . '>' . "\n";

+			$out .= '<select id="'.$htmlname.'" class="flat'.($morecss ? ' '.$morecss : '').'"'.($moreparam ? ' '.$moreparam : '').' name="'.$htmlname.($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').'>'."\n";

@@ -1521 +1304,2 @@
-			if (getDolGlobalString('COMPANY_USE_SEARCH_TO_SELECT')) {

+			if (!empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT))

+			{

@@ -1523,12 +1307,5 @@
-				//if (!empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';

-				if ($showempty && !is_numeric($showempty)) {

-					$textifempty = $langs->trans($showempty);

-				} else {

-					$textifempty .= $langs->trans("All");

-				}

-			}

-			if ($showempty) {

-				$out .= '<option value="-1" data-html="' . dol_escape_htmltag('<span class="opacitymedium">' . ($textifempty ? $textifempty : '&nbsp;') . '</span>') . '">' . $textifempty . '</option>' . "\n";

-			}

-

-			$companytemp = new Societe($this->db);

+				//if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';

+				if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);

+				else $textifempty .= $langs->trans("All");

+			}

+			if ($showempty) $out .= '<option value="-1">'.$textifempty.'</option>'."\n";

@@ -1538,2 +1315,4 @@
-			if ($num) {

-				while ($i < $num) {

+			if ($num)

+			{

+				while ($i < $num)

+				{

@@ -1542 +1321 @@
-					if ($showcode || getDolGlobalString('SOCIETE_ADD_REF_IN_LIST')) {

+					if ($conf->global->SOCIETE_ADD_REF_IN_LIST) {

@@ -1544 +1323 @@
-							$label = $obj->code_client . ' - ';

+							$label = $obj->code_client.' - ';

@@ -1547 +1326 @@
-							$label .= $obj->code_fournisseur . ' - ';

+							$label .= $obj->code_fournisseur.' - ';

@@ -1549,2 +1328,4 @@
-						$label .= ' ' . $obj->name;

-					} else {

+						$label .= ' '.$obj->name;

+					}

+					else

+					{

@@ -1555,16 +1336,16 @@
-						$label .= ' (' . $obj->name_alias . ')';

-					}

-

-					if (getDolGlobalString('SOCIETE_SHOW_VAT_IN_LIST') && !empty($obj->tva_intra)) {

-						$label .= ' - '.$obj->tva_intra;

-					}

-

-					$labelhtml = $label;

-

-					if ($showtype) {

-						$companytemp->id = $obj->rowid;

-						$companytemp->client = $obj->client;

-						$companytemp->fournisseur = $obj->fournisseur;

-						$tmptype = $companytemp->getTypeUrl(1, '', 0, 'span');

-						if ($tmptype) {

-							$labelhtml .= ' ' . $tmptype;

+						$label .= ' ('.$obj->name_alias.')';

+					}

+

+					if ($showtype)

+					{

+						if ($obj->client || $obj->fournisseur) $label .= ' (';

+						if ($obj->client == 1 || $obj->client == 3) $label .= $langs->trans("Customer");

+						if ($obj->client == 2 || $obj->client == 3) $label .= ($obj->client == 3 ? ', ' : '').$langs->trans("Prospect");

+						if ($obj->fournisseur) $label .= ($obj->client ? ', ' : '').$langs->trans("Supplier");

+						if ($obj->client || $obj->fournisseur) $label .= ')';

+					}

+

+					if ($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST) {

+						$label .= '-'.$obj->address.'-'.$obj->zip.' '.$obj->town;

+						if (!empty($obj->country_code)) {

+							$label .= ' '.$langs->trans('Country'.$obj->country_code);

@@ -1572,3 +1353,7 @@
-

-						if ($obj->client || $obj->fournisseur) {

-							$label .= ' (';

+					}

+

+					if (empty($outputmode))

+					{

+						if (in_array($obj->rowid, $selected))

+						{

+							$out .= '<option value="'.$obj->rowid.'" selected>'.$label.'</option>';

@@ -1576,2 +1361,3 @@
-						if ($obj->client == 1 || $obj->client == 3) {

-							$label .= $langs->trans("Customer");

+						else

+						{

+							$out .= '<option value="'.$obj->rowid.'">'.$label.'</option>';

@@ -1579,28 +1365,4 @@
-						if ($obj->client == 2 || $obj->client == 3) {

-							$label .= ($obj->client == 3 ? ', ' : '') . $langs->trans("Prospect");

-						}

-						if ($obj->fournisseur) {

-							$label .= ($obj->client ? ', ' : '') . $langs->trans("Supplier");

-						}

-						if ($obj->client || $obj->fournisseur) {

-							$label .= ')';

-						}

-					}

-

-					if (getDolGlobalString('COMPANY_SHOW_ADDRESS_SELECTLIST')) {

-						$s = ($obj->address ? ' - ' . $obj->address : '') . ($obj->zip ? ' - ' . $obj->zip : '') . ($obj->town ? ' ' . $obj->town : '');

-						if (!empty($obj->country_code)) {

-							$s .= ', ' . $langs->trans('Country' . $obj->country_code);

-						}

-						$label .= $s;

-						$labelhtml .= $s;

-					}

-

-					if (empty($outputmode)) {

-						if (in_array($obj->rowid, $selected)) {

-							$out .= '<option value="' . $obj->rowid . '" selected data-html="' . dol_escape_htmltag($labelhtml, 0, 0, '', 0, 1) . '">' . dol_escape_htmltag($label, 0, 0, '', 0, 1) . '</option>';

-						} else {

-							$out .= '<option value="' . $obj->rowid . '" data-html="' . dol_escape_htmltag($labelhtml, 0, 0, '', 0, 1) . '">' . dol_escape_htmltag($label, 0, 0, '', 0, 1) . '</option>';

-						}

-					} else {

-						array_push($outarray, array('key' => $obj->rowid, 'value' => $label, 'label' => $label, 'labelhtml' => $labelhtml));

+					}

+					else

+					{

+						array_push($outarray, array('key'=>$obj->rowid, 'value'=>$label, 'label'=>$label));

@@ -1610,7 +1372,7 @@
-					if (($i % 10) == 0) {

-						$out .= "\n";

-					}

-				}

-			}

-			$out .= '</select>' . "\n";

-		} else {

+					if (($i % 10) == 0) $out .= "\n";

+				}

+			}

+			$out .= '</select>'."\n";

+		}

+		else

+		{

@@ -1620,5 +1382,3 @@
-		$this->result = array('nbofthirdparties' => $num);

-

-		if ($outputmode) {

-			return $outarray;

-		}

+		$this->result = array('nbofthirdparties'=>$num);

+

+		if ($outputmode) return $outarray;

@@ -1630 +1389,0 @@
-

@@ -1634,6 +1393,6 @@
-	 * @param string $selected Id remise fixe pre-selectionnee

-	 * @param string $htmlname Nom champ formulaire

-	 * @param string $filter Criteres optionnels de filtre

-	 * @param int $socid Id of thirdparty

-	 * @param int $maxvalue Max value for lines that can be selected

-	 * @return    int                        Return number of qualifed lines in list

+	 *  @param	string	$selected       Id remise fixe pre-selectionnee

+	 *  @param  string	$htmlname       Nom champ formulaire

+	 *  @param  string	$filter         Criteres optionnels de filtre

+	 *  @param	int		$socid			Id of thirdparty

+	 *  @param	int		$maxvalue		Max value for lines that can be selected

+	 *  @return	int						Return number of qualifed lines in list

@@ -1649,6 +1408,4 @@
-		$sql .= " FROM " . $this->db->prefix() . "societe_remise_except as re";

-		$sql .= " WHERE re.fk_soc = " . (int) $socid;

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

-		if ($filter) {

-			$sql .= " AND " . $filter;

-		}

+		$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as re";

+		$sql .= " WHERE re.fk_soc = ".(int) $socid;

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

+		if ($filter) $sql .= " AND ".$filter;

@@ -1657 +1414 @@
-		dol_syslog(get_class($this) . "::select_remises", LOG_DEBUG);

+		dol_syslog(get_class($this)."::select_remises", LOG_DEBUG);

@@ -1659,2 +1416,3 @@
-		if ($resql) {

-			print '<select id="select_' . $htmlname . '" class="flat maxwidthonsmartphone" name="' . $htmlname . '">';

+		if ($resql)

+		{

+			print '<select id="select_'.$htmlname.'" class="flat maxwidthonsmartphone" name="'.$htmlname.'">';

@@ -1666 +1424,2 @@
-			if ($num) {

+			if ($num)

+			{

@@ -1668 +1427,2 @@
-				while ($i < $num) {

+				while ($i < $num)

+				{

@@ -1671,12 +1431,4 @@
-					if (preg_match('/\(CREDIT_NOTE\)/', $desc)) {

-						$desc = preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $desc);

-					}

-					if (preg_match('/\(DEPOSIT\)/', $desc)) {

-						$desc = preg_replace('/\(DEPOSIT\)/', $langs->trans("Deposit"), $desc);

-					}

-					if (preg_match('/\(EXCESS RECEIVED\)/', $desc)) {

-						$desc = preg_replace('/\(EXCESS RECEIVED\)/', $langs->trans("ExcessReceived"), $desc);

-					}

-					if (preg_match('/\(EXCESS PAID\)/', $desc)) {

-						$desc = preg_replace('/\(EXCESS PAID\)/', $langs->trans("ExcessPaid"), $desc);

-					}

+					if (preg_match('/\(CREDIT_NOTE\)/', $desc)) $desc = preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $desc);

+					if (preg_match('/\(DEPOSIT\)/', $desc)) $desc = preg_replace('/\(DEPOSIT\)/', $langs->trans("Deposit"), $desc);

+					if (preg_match('/\(EXCESS RECEIVED\)/', $desc)) $desc = preg_replace('/\(EXCESS RECEIVED\)/', $langs->trans("ExcessReceived"), $desc);

+					if (preg_match('/\(EXCESS PAID\)/', $desc)) $desc = preg_replace('/\(EXCESS PAID\)/', $langs->trans("ExcessPaid"), $desc);

@@ -1685,3 +1437 @@
-					if ($selected > 0 && $selected == $obj->rowid) {

-						$selectstring = ' selected';

-					}

+					if ($selected > 0 && $selected == $obj->rowid) $selectstring = ' selected';

@@ -1690 +1440,2 @@
-					if ($maxvalue > 0 && $obj->amount_ttc > $maxvalue) {

+					if ($maxvalue > 0 && $obj->amount_ttc > $maxvalue)

+					{

@@ -1695 +1446,2 @@
-					if (getDolGlobalString('MAIN_SHOW_FACNUMBER_IN_DISCOUNT_LIST') && !empty($obj->fk_facture_source)) {

+					if (!empty($conf->global->MAIN_SHOW_FACNUMBER_IN_DISCOUNT_LIST) && !empty($obj->fk_facture_source))

+					{

@@ -1697,6 +1449,4 @@
-						if ($tmpfac->fetch($obj->fk_facture_source) > 0) {

-							$desc = $desc . ' - ' . $tmpfac->ref;

-						}

-					}

-

-					print '<option value="' . $obj->rowid . '"' . $selectstring . $disabled . '>' . $desc . ' (' . price($obj->amount_ht) . ' ' . $langs->trans("HT") . ' - ' . price($obj->amount_ttc) . ' ' . $langs->trans("TTC") . ')</option>';

+						if ($tmpfac->fetch($obj->fk_facture_source) > 0) $desc = $desc.' - '.$tmpfac->ref;

+					}

+

+					print '<option value="'.$obj->rowid.'"'.$selectstring.$disabled.'>'.$desc.' ('.price($obj->amount_ht).' '.$langs->trans("HT").' - '.price($obj->amount_ttc).' '.$langs->trans("TTC").')</option>';

@@ -1707,2 +1456,0 @@
-			print ajax_combobox('select_' . $htmlname);

-

@@ -1710 +1458,3 @@
-		} else {

+		}

+		else

+		{

@@ -1717 +1466,0 @@
-

@@ -1721,18 +1470,18 @@
-	 * @param int 		$socid 			Id ot third party or 0 for all

-	 * @param string 	$selected 		Id contact pre-selectionne

-	 * @param string 	$htmlname 		Name of HTML field ('none' for a not editable field)

-	 * @param int 		$showempty 		0=no empty value, 1=add an empty value, 2=add line 'Internal' (used by user edit), 3=add an empty value only if more than one record into list

-	 * @param string 	$exclude 		List of contacts id to exclude

-	 * @param string 	$limitto 		Disable answers that are not id in this array list

-	 * @param integer 	$showfunction 	Add function into label

-	 * @param string 	$morecss 		Add more class to class style

-	 * @param integer 	$showsoc 		Add company into label

-	 * @param int 		$forcecombo 	Force to use combo box

-	 * @param array 	$events 		Event options. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))

-	 * @param bool 		$options_only 	Return options only (for ajax treatment)

-	 * @param string 	$moreparam 		Add more parameters onto the select tag. For example 'style="width: 95%"' to avoid select2 component to go over parent container

-	 * @param string 	$htmlid 		Html id to use instead of htmlname

-	 * @return    int                   Return integer <0 if KO, Nb of contact in list if OK

-	 * @deprecated You can use selectcontacts directly (warning order of param was changed)

-	 */

-	public function select_contacts($socid, $selected = '', $htmlname = 'contactid', $showempty = 0, $exclude = '', $limitto = '', $showfunction = 0, $morecss = '', $showsoc = 0, $forcecombo = 0, $events = array(), $options_only = false, $moreparam = '', $htmlid = '')

+	 *  @param	int		$socid      	Id ot third party or 0 for all

+	 *  @param  string	$selected   	Id contact pre-selectionne

+	 *  @param  string	$htmlname  	    Name of HTML field ('none' for a not editable field)

+	 *  @param  int		$showempty      0=no empty value, 1=add an empty value, 2=add line 'Internal' (used by user edit), 3=add an empty value only if more than one record into list

+	 *  @param  string	$exclude        List of contacts id to exclude

+	 *  @param	string	$limitto		Disable answers that are not id in this array list

+	 *  @param	integer	$showfunction   Add function into label

+	 *  @param	string	$moreclass		Add more class to class style

+	 *  @param	integer	$showsoc	    Add company into label

+	 *  @param	int		$forcecombo		Force to use combo box

+	 *  @param	array	$events			Event options. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))

+	 *  @param	bool	$options_only	Return options only (for ajax treatment)

+	 *  @param	string	$moreparam		Add more parameters onto the select tag. For example 'style="width: 95%"' to avoid select2 component to go over parent container

+	 *  @param	string	$htmlid			Html id to use instead of htmlname

+	 *  @return	int						<0 if KO, Nb of contact in list if OK

+	 *  @deprected						You can use selectcontacts directly (warning order of param was changed)

+	 */

+	public function select_contacts($socid, $selected = '', $htmlname = 'contactid', $showempty = 0, $exclude = '', $limitto = '', $showfunction = 0, $moreclass = '', $showsoc = 0, $forcecombo = 0, $events = array(), $options_only = false, $moreparam = '', $htmlid = '')

@@ -1741 +1490 @@
-		print $this->selectcontacts($socid, $selected, $htmlname, $showempty, $exclude, $limitto, $showfunction, $morecss, $options_only, $showsoc, $forcecombo, $events, $moreparam, $htmlid);

+		print $this->selectcontacts($socid, $selected, $htmlname, $showempty, $exclude, $limitto, $showfunction, $moreclass, $options_only, $showsoc, $forcecombo, $events, $moreparam, $htmlid);

@@ -1746,2 +1495,2 @@
-	 * Return HTML code of the SELECT of list of all contacts (for a third party or all).

-	 * This also set the number of contacts found into $this->num

+	 *	Return HTML code of the SELECT of list of all contacts (for a third party or all).

+	 *  This also set the number of contacts found into $this->num

@@ -1751,19 +1500,18 @@
-	 * @param int 			$socid 				Id ot third party or 0 for all or -1 for empty list

-	 * @param array|int 	$selected 			Array of ID of pre-selected contact id

-	 * @param string 		$htmlname 			Name of HTML field ('none' for a not editable field)

-	 * @param int|string 	$showempty 			0=no empty value, 1=add an empty value, 2=add line 'Internal' (used by user edit), 3=add an empty value only if more than one record into list

-	 * @param string 		$exclude 			List of contacts id to exclude

-	 * @param string 		$limitto 			Disable answers that are not id in this array list

-	 * @param integer 		$showfunction 		Add function into label

-	 * @param string 		$morecss 			Add more class to class style

-	 * @param bool 			$options_only 		Return options only (for ajax treatment)

-	 * @param integer 		$showsoc 			Add company into label

-	 * @param int 			$forcecombo 		Force to use combo box (so no ajax beautify effect)

-	 * @param array 		$events 			Event options. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))

-	 * @param string 		$moreparam 			Add more parameters onto the select tag. For example 'style="width: 95%"' to avoid select2 component to go over parent container

-	 * @param string 		$htmlid 			Html id to use instead of htmlname

-	 * @param bool 			$multiple 			add [] in the name of element and add 'multiple' attribut

-	 * @param integer 		$disableifempty 	Set tag 'disabled' on select if there is no choice

-	 * @return     int|string                   Return integer <0 if KO, HTML with select string if OK.

-	 */

-	public function selectcontacts($socid, $selected = array(), $htmlname = 'contactid', $showempty = 0, $exclude = '', $limitto = '', $showfunction = 0, $morecss = '', $options_only = false, $showsoc = 0, $forcecombo = 0, $events = array(), $moreparam = '', $htmlid = '', $multiple = false, $disableifempty = 0)

+	 *	@param	int			$socid      	Id ot third party or 0 for all or -1 for empty list

+	 *	@param  array|int	$selected   	Array of ID of pre-selected contact id

+	 *	@param  string		$htmlname  	    Name of HTML field ('none' for a not editable field)

+	 *	@param  int			$showempty     	0=no empty value, 1=add an empty value, 2=add line 'Internal' (used by user edit), 3=add an empty value only if more than one record into list

+	 *	@param  string		$exclude        List of contacts id to exclude

+	 *	@param	string		$limitto		Disable answers that are not id in this array list

+	 *	@param	integer		$showfunction   Add function into label

+	 *	@param	string		$moreclass		Add more class to class style

+	 *	@param	bool		$options_only	Return options only (for ajax treatment)

+	 *	@param	integer		$showsoc	    Add company into label

+	 * 	@param	int			$forcecombo		Force to use combo box (so no ajax beautify effect)

+	 *  @param	array		$events			Event options. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))

+	 *  @param	string		$moreparam		Add more parameters onto the select tag. For example 'style="width: 95%"' to avoid select2 component to go over parent container

+	 *  @param	string		$htmlid			Html id to use instead of htmlname

+	 *  @param	bool		$multiple		add [] in the name of element and add 'multiple' attribut

+	 *	@return	 int						<0 if KO, Nb of contact in list if OK

+	 */

+	public function selectcontacts($socid, $selected = '', $htmlname = 'contactid', $showempty = 0, $exclude = '', $limitto = '', $showfunction = 0, $moreclass = '', $options_only = false, $showsoc = 0, $forcecombo = 0, $events = array(), $moreparam = '', $htmlid = '', $multiple = false)

@@ -1775,10 +1523,4 @@
-		if (empty($htmlid)) {

-			$htmlid = $htmlname;

-		}

-		$num = 0;

-

-		if ($selected === '') {

-			$selected = array();

-		} elseif (!is_array($selected)) {

-			$selected = array($selected);

-		}

+		if (empty($htmlid)) $htmlid = $htmlname;

+

+		if ($selected === '') $selected = array();

+		elseif (!is_array($selected)) $selected = array($selected);

@@ -1787,2 +1529,3 @@
-		if (!is_object($hookmanager)) {

-			include_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';

+		if (!is_object($hookmanager))

+		{

+			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';

@@ -1793,19 +1536,7 @@
-		$sql = "SELECT sp.rowid, sp.lastname, sp.statut, sp.firstname, sp.poste, sp.email, sp.phone, sp.phone_perso, sp.phone_mobile, sp.town AS contact_town";

-		if ($showsoc > 0 || getDolGlobalString('CONTACT_SHOW_EMAIL_PHONE_TOWN_SELECTLIST')) {

-			$sql .= ", s.nom as company, s.town AS company_town";

-		}

-		$sql .= " FROM " . $this->db->prefix() . "socpeople as sp";

-		if ($showsoc > 0 || getDolGlobalString('CONTACT_SHOW_EMAIL_PHONE_TOWN_SELECTLIST')) {

-			$sql .= " LEFT OUTER JOIN  " . $this->db->prefix() . "societe as s ON s.rowid=sp.fk_soc";

-		}

-		$sql .= " WHERE sp.entity IN (" . getEntity('contact') . ")";

-		if ($socid > 0 || $socid == -1) {

-			$sql .= " AND sp.fk_soc = " . ((int) $socid);

-		}

-		if (getDolGlobalString('CONTACT_HIDE_INACTIVE_IN_COMBOBOX')) {

-			$sql .= " AND sp.statut <> 0";

-		}

-		// Add where from hooks

-		$parameters = array();

-		$reshook = $hookmanager->executeHooks('selectContactListWhere', $parameters); // Note that $action and $object may have been modified by hook

-		$sql .= $hookmanager->resPrint;

+		$sql = "SELECT sp.rowid, sp.lastname, sp.statut, sp.firstname, sp.poste";

+		if ($showsoc > 0) $sql .= " , s.nom as company";

+		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as sp";

+		if ($showsoc > 0) $sql .= " LEFT OUTER JOIN  ".MAIN_DB_PREFIX."societe as s ON s.rowid=sp.fk_soc";

+		$sql .= " WHERE sp.entity IN (".getEntity('socpeople').")";

+		if ($socid > 0 || $socid == -1) $sql .= " AND sp.fk_soc=".$socid;

+		if (!empty($conf->global->CONTACT_HIDE_INACTIVE_IN_COMBOBOX)) $sql .= " AND sp.statut <> 0";

@@ -1814 +1545 @@
-		dol_syslog(get_class($this) . "::selectcontacts", LOG_DEBUG);

+		dol_syslog(get_class($this)."::select_contacts", LOG_DEBUG);

@@ -1816 +1547,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -1819,16 +1551,11 @@
-			if ($htmlname != 'none' && !$options_only) {

-				$out .= '<select class="flat' . ($morecss ? ' ' . $morecss : '') . '" id="' . $htmlid . '" name="' . $htmlname . (($num || empty($disableifempty)) ? '' : ' disabled') . ($multiple ? '[]' : '') . '" ' . ($multiple ? 'multiple' : '') . ' ' . (!empty($moreparam) ? $moreparam : '') . '>';

-			}

-

-			if ($showempty && !is_numeric($showempty)) {

-				$textforempty = $showempty;

-				$out .= '<option class="optiongrey" value="-1"' . (in_array(-1, $selected) ? ' selected' : '') . '>' . $textforempty . '</option>';

-			} else {

-				if (($showempty == 1 || ($showempty == 3 && $num > 1)) && !$multiple) {

-					$out .= '<option value="0"' . (in_array(0, $selected) ? ' selected' : '') . '>&nbsp;</option>';

-				}

-				if ($showempty == 2) {

-					$out .= '<option value="0"' . (in_array(0, $selected) ? ' selected' : '') . '>-- ' . $langs->trans("Internal") . ' --</option>';

-				}

-			}

-

+			if ($conf->use_javascript_ajax && !$forcecombo && !$options_only)

+			{

+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

+				$out .= ajax_combobox($htmlid, $events, $conf->global->CONTACT_USE_SEARCH_TO_SELECT);

+			}

+

+			if ($htmlname != 'none' && !$options_only) $out .= '<select class="flat'.($moreclass ? ' '.$moreclass : '').'" id="'.$htmlid.'" name="'.$htmlname.($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.(!empty($moreparam) ? $moreparam : '').'>';

+			if (($showempty == 1 || ($showempty == 3 && $num > 1)) && !$multiple) $out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>&nbsp;</option>';

+			if ($showempty == 2) $out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>-- '.$langs->trans("Internal").' --</option>';

+

+			$num = $this->db->num_rows($resql);

@@ -1836,2 +1563,3 @@
-			if ($num) {

-				include_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';

+			if ($num)

+			{

+				include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';

@@ -1840 +1568,2 @@
-				while ($i < $num) {

+				while ($i < $num)

+				{

@@ -1842,34 +1570,0 @@
-

-					// Set email (or phones) and town extended infos

-					$extendedInfos = '';

-					if (getDolGlobalString('CONTACT_SHOW_EMAIL_PHONE_TOWN_SELECTLIST')) {

-						$extendedInfos = array();

-						$email = trim($obj->email);

-						if (!empty($email)) {

-							$extendedInfos[] = $email;

-						} else {

-							$phone = trim($obj->phone);

-							$phone_perso = trim($obj->phone_perso);

-							$phone_mobile = trim($obj->phone_mobile);

-							if (!empty($phone)) {

-								$extendedInfos[] = $phone;

-							}

-							if (!empty($phone_perso)) {

-								$extendedInfos[] = $phone_perso;

-							}

-							if (!empty($phone_mobile)) {

-								$extendedInfos[] = $phone_mobile;

-							}

-						}

-						$contact_town = trim($obj->contact_town);

-						$company_town = trim($obj->company_town);

-						if (!empty($contact_town)) {

-							$extendedInfos[] = $contact_town;

-						} elseif (!empty($company_town)) {

-							$extendedInfos[] = $company_town;

-						}

-						$extendedInfos = implode(' - ', $extendedInfos);

-						if (!empty($extendedInfos)) {

-							$extendedInfos = ' - ' . $extendedInfos;

-						}

-					}

@@ -1881 +1576,2 @@
-						if ($htmlname != 'none') {

+						if ($htmlname != 'none')

+						{

@@ -1883,11 +1579,6 @@
-							if (is_array($exclude) && count($exclude) && in_array($obj->rowid, $exclude)) {

-								$disabled = 1;

-							}

-							if (is_array($limitto) && count($limitto) && !in_array($obj->rowid, $limitto)) {

-								$disabled = 1;

-							}

-							if (!empty($selected) && in_array($obj->rowid, $selected)) {

-								$out .= '<option value="' . $obj->rowid . '"';

-								if ($disabled) {

-									$out .= ' disabled';

-								}

+							if (is_array($exclude) && count($exclude) && in_array($obj->rowid, $exclude)) $disabled = 1;

+							if (is_array($limitto) && count($limitto) && !in_array($obj->rowid, $limitto)) $disabled = 1;

+							if (!empty($selected) && in_array($obj->rowid, $selected))

+							{

+								$out .= '<option value="'.$obj->rowid.'"';

+								if ($disabled) $out .= ' disabled';

@@ -1895,21 +1586,3 @@
-								$out .= $contactstatic->getFullName($langs) . $extendedInfos;

-								if ($showfunction && $obj->poste) {

-									$out .= ' (' . $obj->poste . ')';

-								}

-								if (($showsoc > 0) && $obj->company) {

-									$out .= ' - (' . $obj->company . ')';

-								}

-								$out .= '</option>';

-							} else {

-								$out .= '<option value="' . $obj->rowid . '"';

-								if ($disabled) {

-									$out .= ' disabled';

-								}

-								$out .= '>';

-								$out .= $contactstatic->getFullName($langs) . $extendedInfos;

-								if ($showfunction && $obj->poste) {

-									$out .= ' (' . $obj->poste . ')';

-								}

-								if (($showsoc > 0) && $obj->company) {

-									$out .= ' - (' . $obj->company . ')';

-								}

+								$out .= $contactstatic->getFullName($langs);

+								if ($showfunction && $obj->poste) $out .= ' ('.$obj->poste.')';

+								if (($showsoc > 0) && $obj->company) $out .= ' - ('.$obj->company.')';

@@ -1918,9 +1591,9 @@
-						} else {

-							if (in_array($obj->rowid, $selected)) {

-								$out .= $contactstatic->getFullName($langs) . $extendedInfos;

-								if ($showfunction && $obj->poste) {

-									$out .= ' (' . $obj->poste . ')';

-								}

-								if (($showsoc > 0) && $obj->company) {

-									$out .= ' - (' . $obj->company . ')';

-								}

+							else

+							{

+								$out .= '<option value="'.$obj->rowid.'"';

+								if ($disabled) $out .= ' disabled';

+								$out .= '>';

+								$out .= $contactstatic->getFullName($langs);

+								if ($showfunction && $obj->poste) $out .= ' ('.$obj->poste.')';

+								if (($showsoc > 0) && $obj->company) $out .= ' - ('.$obj->company.')';

+								$out .= '</option>';

@@ -1928,0 +1602,9 @@
+						else

+						{

+							if (in_array($obj->rowid, $selected))

+							{

+								$out .= $contactstatic->getFullName($langs);

+								if ($showfunction && $obj->poste) $out .= ' ('.$obj->poste.')';

+								if (($showsoc > 0) && $obj->company) $out .= ' - ('.$obj->company.')';

+							}

+						}

@@ -1932,4 +1614,5 @@
-			} else {

-				$labeltoshow = ($socid != -1) ? ($langs->trans($socid ? "NoContactDefinedForThirdParty" : "NoContactDefined")) : $langs->trans('SelectAThirdPartyFirst');

-				$out .= '<option class="disabled" value="-1"' . (($showempty == 2 || $multiple) ? '' : ' selected') . ' disabled="disabled">';

-				$out .= $labeltoshow;

+			}

+			else

+			{

+				$out .= '<option value="-1"'.(($showempty == 2 || $multiple) ? '' : ' selected').' disabled>';

+				$out .= ($socid != -1) ? ($langs->trans($socid ? "NoContactDefinedForThirdParty" : "NoContactDefined")) : $langs->trans('SelectAThirdPartyFirst');

@@ -1940,6 +1623,6 @@
-				'socid' => $socid,

-				'htmlname' => $htmlname,

-				'resql' => $resql,

-				'out' => &$out,

-				'showfunction' => $showfunction,

-				'showsoc' => $showsoc,

+				'socid'=>$socid,

+				'htmlname'=>$htmlname,

+				'resql'=>$resql,

+				'out'=>&$out,

+				'showfunction'=>$showfunction,

+				'showsoc'=>$showsoc,

@@ -1950 +1633,2 @@
-			if ($htmlname != 'none' && !$options_only) {

+			if ($htmlname != 'none' && !$options_only)

+			{

@@ -1952,5 +1635,0 @@
-			}

-

-			if ($conf->use_javascript_ajax && !$forcecombo && !$options_only) {

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

-				$out .= ajax_combobox($htmlid, $events, getDolGlobalString("CONTACT_USE_SEARCH_TO_SELECT"));

@@ -1961 +1640,3 @@
-		} else {

+		}

+		else

+		{

@@ -1968,17 +1649,16 @@
-

-	/**

-	 *    Return the HTML select list of users

-	 *

-	 * @param string $selected Id user preselected

-	 * @param string $htmlname Field name in form

-	 * @param int $show_empty 0=liste sans valeur nulle, 1=ajoute valeur inconnue

-	 * @param array $exclude Array list of users id to exclude

-	 * @param int $disabled If select list must be disabled

-	 * @param array|string $include Array list of users id to include. User '' for all users or 'hierarchy' to have only supervised users or 'hierarchyme' to have supervised + me

-	 * @param array|int $enableonly Array list of users id to be enabled. All other must be disabled

-	 * @param string $force_entity '0' or Ids of environment to force

-	 * @return    void

-	 * @deprecated        Use select_dolusers instead

-	 * @see select_dolusers()

-	 */

-	public function select_users($selected = '', $htmlname = 'userid', $show_empty = 0, $exclude = null, $disabled = 0, $include = '', $enableonly = array(), $force_entity = '0')

+	/**

+	 *	Return the HTML select list of users

+	 *

+	 *  @param	string			$selected       Id user preselected

+	 *  @param  string			$htmlname       Field name in form

+	 *  @param  int				$show_empty     0=liste sans valeur nulle, 1=ajoute valeur inconnue

+	 *  @param  array			$exclude        Array list of users id to exclude

+	 * 	@param	int				$disabled		If select list must be disabled

+	 *  @param  array|string	$include        Array list of users id to include. User '' for all users or 'hierarchy' to have only supervised users or 'hierarchyme' to have supervised + me

+	 * 	@param	int				$enableonly		Array list of users id to be enabled. All other must be disabled

+	 *  @param	string			$force_entity	'0' or Ids of environment to force

+	 * 	@return	void

+	 *  @deprecated		Use select_dolusers instead

+	 *  @see select_dolusers()

+	 */

+	public function select_users($selected = '', $htmlname = 'userid', $show_empty = 0, $exclude = null, $disabled = 0, $include = '', $enableonly = '', $force_entity = '0')

@@ -1991,26 +1671,24 @@
-

-	/**

-	 *    Return select list of users

-	 *

-	 * @param string 		$selected 		User id or user object of user preselected. If 0 or < -2, we use id of current user. If -1, keep unselected (if empty is allowed)

-	 * @param string 		$htmlname 		Field name in form

-	 * @param int|string 	$show_empty 	0=list with no empty value, 1=add also an empty value into list

-	 * @param array|null	$exclude 		Array list of users id to exclude

-	 * @param int 			$disabled 		If select list must be disabled

-	 * @param array|string 	$include 		Array list of users id to include. User '' for all users or 'hierarchy' to have only supervised users or 'hierarchyme' to have supervised + me

-	 * @param array|string	$enableonly 	Array list of users id to be enabled. If defined, it means that others will be disabled

-	 * @param string 		$force_entity 	'0' or list of Ids of environment to force separated by a coma

-	 * @param int 			$maxlength 		Maximum length of string into list (0=no limit)

-	 * @param int 			$showstatus 	0=show user status only if status is disabled, 1=always show user status into label, -1=never show user status

-	 * @param string 		$morefilter 	Add more filters into sql request (Example: 'employee = 1'). This value must not come from user input.

-	 * @param integer 		$show_every 	0=default list, 1=add also a value "Everybody" at beginning of list

-	 * @param string 		$enableonlytext If option $enableonlytext is set, we use this text to explain into label why record is disabled. Not used if enableonly is empty.

-	 * @param string 		$morecss 		More css

-	 * @param int 			$notdisabled 	Show only active users (this will also happened whatever is this option if USER_HIDE_INACTIVE_IN_COMBOBOX is on).

-	 * @param int 			$outputmode 	0=HTML select string, 1=Array

-	 * @param bool 			$multiple 		add [] in the name of element and add 'multiple' attribut

-	 * @param int 			$forcecombo 	Force the component to be a simple combo box without ajax

-	 * @return array|string                    HTML select string

-	 * @see select_dolgroups()

-	 */

-	public function select_dolusers($selected = '', $htmlname = 'userid', $show_empty = 0, $exclude = null, $disabled = 0, $include = '', $enableonly = '', $force_entity = '', $maxlength = 0, $showstatus = 0, $morefilter = '', $show_every = 0, $enableonlytext = '', $morecss = '', $notdisabled = 0, $outputmode = 0, $multiple = false, $forcecombo = 0)

+	/**

+	 *	Return select list of users

+	 *

+	 *  @param	string			$selected       User id or user object of user preselected. If 0 or < -2, we use id of current user. If -1, keep unselected (if empty is allowed)

+	 *  @param  string			$htmlname       Field name in form

+	 *  @param  int				$show_empty     0=list with no empty value, 1=add also an empty value into list

+	 *  @param  array			$exclude        Array list of users id to exclude

+	 * 	@param	int				$disabled		If select list must be disabled

+	 *  @param  array|string	$include        Array list of users id to include. User '' for all users or 'hierarchy' to have only supervised users or 'hierarchyme' to have supervised + me

+	 * 	@param	array			$enableonly		Array list of users id to be enabled. If defined, it means that others will be disabled

+	 *  @param	string			$force_entity	'0' or Ids of environment to force

+	 *  @param	int				$maxlength		Maximum length of string into list (0=no limit)

+	 *  @param	int				$showstatus		0=show user status only if status is disabled, 1=always show user status into label, -1=never show user status

+	 *  @param	string			$morefilter		Add more filters into sql request (Example: 'employee = 1')

+	 *  @param	integer			$show_every		0=default list, 1=add also a value "Everybody" at beginning of list

+	 *  @param	string			$enableonlytext	If option $enableonlytext is set, we use this text to explain into label why record is disabled. Not used if enableonly is empty.

+	 *  @param	string			$morecss		More css

+	 *  @param  int     		$noactive       Show only active users (this will also happened whatever is this option if USER_HIDE_INACTIVE_IN_COMBOBOX is on).

+	 *  @param  int				$outputmode     0=HTML select string, 1=Array

+	 *  @param  bool			$multiple       add [] in the name of element and add 'multiple' attribut

+	 * 	@return	string							HTML select string

+	 *  @see select_dolgroups()

+	 */

+	public function select_dolusers($selected = '', $htmlname = 'userid', $show_empty = 0, $exclude = null, $disabled = 0, $include = '', $enableonly = '', $force_entity = '0', $maxlength = 0, $showstatus = 0, $morefilter = '', $show_every = 0, $enableonlytext = '', $morecss = '', $noactive = 0, $outputmode = 0, $multiple = false)

@@ -2020 +1697,0 @@
-		global $action;

@@ -2023,9 +1700,4 @@
-		if ((is_numeric($selected) && ($selected < -2 || empty($selected))) && !getDolGlobalString('SOCIETE_DISABLE_DEFAULT_SALESREPRESENTATIVE')) {

-			$selected = $user->id;

-		}

-

-		if ($selected === '') {

-			$selected = array();

-		} elseif (!is_array($selected)) {

-			$selected = array($selected);

-		}

+		if ((is_numeric($selected) && ($selected < -2 || empty($selected))) && empty($conf->global->SOCIETE_DISABLE_DEFAULT_SALESREPRESENTATIVE)) $selected = $user->id;

+

+		if ($selected === '') $selected = array();

+		elseif (!is_array($selected)) $selected = array($selected);

@@ -2036,8 +1708,6 @@
-		// Exclude some users

-		if (is_array($exclude)) {

-			$excludeUsers = implode(",", $exclude);

-		}

-		// Include some uses

-		if (is_array($include)) {

-			$includeUsers = implode(",", $include);

-		} elseif ($include == 'hierarchy') {

+		// Permettre l'exclusion d'utilisateurs

+		if (is_array($exclude))	$excludeUsers = implode(",", $exclude);

+		// Permettre l'inclusion d'utilisateurs

+		if (is_array($include))	$includeUsers = implode(",", $include);

+		elseif ($include == 'hierarchy')

+		{

@@ -2046 +1716,3 @@
-		} elseif ($include == 'hierarchyme') {

+		}

+		elseif ($include == 'hierarchyme')

+		{

@@ -2053 +1724,0 @@
-		$outarray2 = array();

@@ -2056,2 +1727,3 @@
-		$sql = "SELECT DISTINCT u.rowid, u.lastname as lastname, u.firstname, u.statut as status, u.login, u.admin, u.entity, u.photo";

-		if (isModEnabled('multicompany') && $conf->entity == 1 && $user->admin && !$user->entity) {

+		$sql = "SELECT DISTINCT u.rowid, u.lastname as lastname, u.firstname, u.statut, u.login, u.admin, u.entity";

+		if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity)

+		{

@@ -2060,30 +1732,25 @@
-		$sql .= " FROM " . $this->db->prefix() . "user as u";

-		if (isModEnabled('multicompany') && $conf->entity == 1 && $user->admin && !$user->entity) {

-			$sql .= " LEFT JOIN " . $this->db->prefix() . "entity as e ON e.rowid = u.entity";

-			if (!empty($force_entity)) {

-				$sql .= " WHERE u.entity IN (0, " . $this->db->sanitize($force_entity) . ")";

-			} else {

-				$sql .= " WHERE u.entity IS NOT NULL";

-			}

-		} else {

-			if (isModEnabled('multicompany') && getDolGlobalInt('MULTICOMPANY_TRANSVERSE_MODE')) {

-				$sql .= " WHERE u.rowid IN (SELECT ug.fk_user FROM ".$this->db->prefix()."usergroup_user as ug WHERE ug.entity IN (".getEntity('usergroup')."))";

-			} else {

-				$sql .= " WHERE u.entity IN (" . getEntity('user') . ")";

-			}

-		}

-		if (!empty($user->socid)) {

-			$sql .= " AND u.fk_soc = " . ((int) $user->socid);

-		}

-		if (is_array($exclude) && $excludeUsers) {

-			$sql .= " AND u.rowid NOT IN (" . $this->db->sanitize($excludeUsers) . ")";

-		}

-		if ($includeUsers) {

-			$sql .= " AND u.rowid IN (" . $this->db->sanitize($includeUsers) . ")";

-		}

-		if (getDolGlobalString('USER_HIDE_INACTIVE_IN_COMBOBOX') || $notdisabled) {

-			$sql .= " AND u.statut <> 0";

-		}

-		if (!empty($morefilter)) {

-			$sql .= " " . $morefilter;

-		}

+		$sql .= " FROM ".MAIN_DB_PREFIX."user as u";

+		if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity)

+		{

+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entity as e ON e.rowid=u.entity";

+			if ($force_entity) $sql .= " WHERE u.entity IN (0,".$force_entity.")";

+			else $sql .= " WHERE u.entity IS NOT NULL";

+		}

+		else

+		{

+			if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))

+			{

+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug";

+				$sql .= " ON ug.fk_user = u.rowid";

+				$sql .= " WHERE ug.entity = ".$conf->entity;

+			}

+			else

+			{

+				$sql .= " WHERE u.entity IN (0,".$conf->entity.")";

+			}

+		}

+		if (!empty($user->socid)) $sql .= " AND u.fk_soc = ".$user->socid;

+		if (is_array($exclude) && $excludeUsers) $sql .= " AND u.rowid NOT IN (".$excludeUsers.")";

+		if ($includeUsers) $sql .= " AND u.rowid IN (".$includeUsers.")";

+		if (!empty($conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX) || $noactive) $sql .= " AND u.statut <> 0";

+		if (!empty($morefilter)) $sql .= " ".$morefilter;

@@ -2093,12 +1760,12 @@
-		if (!empty($reshook)) {

-			$sql .= $hookmanager->resPrint;

-		}

-

-		if (!getDolGlobalString('MAIN_FIRSTNAME_NAME_POSITION')) {    // MAIN_FIRSTNAME_NAME_POSITION is 0 means firstname+lastname

-			$sql .= " ORDER BY u.statut DESC, u.firstname ASC, u.lastname ASC";

-		} else {

-			$sql .= " ORDER BY u.statut DESC, u.lastname ASC, u.firstname ASC";

-		}

-

-		dol_syslog(get_class($this) . "::select_dolusers", LOG_DEBUG);

-

+		if (!empty($reshook)) $sql .= $hookmanager->resPrint;

+

+		if (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION))	// MAIN_FIRSTNAME_NAME_POSITION is 0 means firstname+lastname

+		{

+			$sql .= " ORDER BY u.firstname ASC";

+		}

+		else

+		{

+			$sql .= " ORDER BY u.lastname ASC";

+		}

+

+		dol_syslog(get_class($this)."::select_dolusers", LOG_DEBUG);

@@ -2106 +1773,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -2109 +1777,6 @@
-			if ($num) {

+			if ($num)

+			{

+				// Enhance with select2

+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

+				$out .= ajax_combobox($htmlname);

+

@@ -2111,14 +1784,3 @@
-				$out .= '<select class="flat' . ($morecss ? ' ' . $morecss : ' minwidth200') . '" id="' . $htmlname . '" name="' . $htmlname . ($multiple ? '[]' : '') . '" ' . ($multiple ? 'multiple' : '') . ' ' . ($disabled ? ' disabled' : '') . '>';

-				if ($show_empty && !$multiple) {

-					$textforempty = ' ';

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

-						$textforempty = '&nbsp;'; // If we use ajaxcombo, we need &nbsp; here to avoid to have an empty element that is too small.

-					}

-					if (!is_numeric($show_empty)) {

-						$textforempty = $show_empty;

-					}

-					$out .= '<option class="optiongrey" value="' . ($show_empty < 0 ? $show_empty : -1) . '"' . ((empty($selected) || in_array(-1, $selected)) ? ' selected' : '') . '>' . $textforempty . '</option>' . "\n";

-				}

-				if ($show_every) {

-					$out .= '<option value="-2"' . ((in_array(-2, $selected)) ? ' selected' : '') . '>-- ' . $langs->trans("Everybody") . ' --</option>' . "\n";

-				}

+				$out .= '<select class="flat'.($morecss ? ' minwidth100imp '.$morecss : ' minwidth200').'" id="'.$htmlname.'" name="'.$htmlname.($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.($disabled ? ' disabled' : '').'>';

+				if ($show_empty && !$multiple) $out .= '<option value="-1"'.((empty($selected) || in_array(-1, $selected)) ? ' selected' : '').'>&nbsp;</option>'."\n";

+				if ($show_every) $out .= '<option value="-2"'.((in_array(-2, $selected)) ? ' selected' : '').'>-- '.$langs->trans("Everybody").' --</option>'."\n";

@@ -2128 +1790,2 @@
-				while ($i < $num) {

+				while ($i < $num)

+				{

@@ -2134,4 +1796,0 @@
-					$userstatic->photo = $obj->photo;

-					$userstatic->statut = $obj->status;

-					$userstatic->entity = $obj->entity;

-					$userstatic->admin = $obj->admin;

@@ -2140,6 +1799,14 @@
-					if (is_array($enableonly) && count($enableonly) && !in_array($obj->rowid, $enableonly)) {

-						$disableline = ($enableonlytext ? $enableonlytext : '1');

-					}

-

-					$labeltoshow = '';

-					$labeltoshowhtml = '';

+					if (is_array($enableonly) && count($enableonly) && !in_array($obj->rowid, $enableonly)) $disableline = ($enableonlytext ? $enableonlytext : '1');

+

+					if ((is_object($selected) && $selected->id == $obj->rowid) || (!is_object($selected) && in_array($obj->rowid, $selected)))

+					{

+						$out .= '<option value="'.$obj->rowid.'"';

+						if ($disableline) $out .= ' disabled';

+						$out .= ' selected>';

+					}

+					else

+					{

+						$out .= '<option value="'.$obj->rowid.'"';

+						if ($disableline) $out .= ' disabled';

+						$out .= '>';

+					}

@@ -2149 +1816,2 @@
-					if (!getDolGlobalString('MAIN_FIRSTNAME_NAME_POSITION')) {

+					if (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION))

+					{

@@ -2152,20 +1820,15 @@
-					$labeltoshow .= $userstatic->getFullName($langs, $fullNameMode, -1, $maxlength);

-					$labeltoshowhtml .= $userstatic->getFullName($langs, $fullNameMode, -1, $maxlength);

-					if (empty($obj->firstname) && empty($obj->lastname)) {

-						$labeltoshow .= $obj->login;

-						$labeltoshowhtml .= $obj->login;

-					}

-

-					// Complete name with a more info string like: ' (info1 - info2 - ...)'

-					$moreinfo = '';

-					$moreinfohtml = '';

-					if (getDolGlobalString('MAIN_SHOW_LOGIN')) {

-						$moreinfo .= ($moreinfo ? ' - ' : ' (');

-						$moreinfohtml .= ($moreinfohtml ? ' - ' : ' <span class="opacitymedium">(');

-						$moreinfo .= $obj->login;

-						$moreinfohtml .= $obj->login;

-					}

-					if ($showstatus >= 0) {

-						if ($obj->status == 1 && $showstatus == 1) {

-							$moreinfo .= ($moreinfo ? ' - ' : ' (') . $langs->trans('Enabled');

-							$moreinfohtml .= ($moreinfohtml ? ' - ' : ' <span class="opacitymedium">(') . $langs->trans('Enabled');

+					$out .= $userstatic->getFullName($langs, $fullNameMode, -1, $maxlength);

+

+					// Complete name with more info

+					$moreinfo = 0;

+					if (!empty($conf->global->MAIN_SHOW_LOGIN))

+					{

+						$out .= ($moreinfo ? ' - ' : ' (').$obj->login;

+						$moreinfo++;

+					}

+					if ($showstatus >= 0)

+					{

+						if ($obj->statut == 1 && $showstatus == 1)

+						{

+							$out .= ($moreinfo ? ' - ' : ' (').$langs->trans('Enabled');

+							$moreinfo++;

@@ -2173,3 +1836,4 @@
-						if ($obj->status == 0 && $showstatus == 1) {

-							$moreinfo .= ($moreinfo ? ' - ' : ' (') . $langs->trans('Disabled');

-							$moreinfohtml .= ($moreinfohtml ? ' - ' : ' <span class="opacitymedium">(') . $langs->trans('Disabled');

+						if ($obj->statut == 0)

+						{

+							$out .= ($moreinfo ? ' - ' : ' (').$langs->trans('Disabled');

+							$moreinfo++;

@@ -2178,9 +1842,6 @@
-					if (isModEnabled('multicompany') && !getDolGlobalInt('MULTICOMPANY_TRANSVERSE_MODE') && $conf->entity == 1 && !empty($user->admin) && empty($user->entity)) {

-						if (empty($obj->entity)) {

-							$moreinfo .= ($moreinfo ? ' - ' : ' (') . $langs->trans("AllEntities");

-							$moreinfohtml .= ($moreinfohtml ? ' - ' : ' <span class="opacitymedium">(') . $langs->trans("AllEntities");

-						} else {

-							if ($obj->entity != $conf->entity) {

-								$moreinfo .= ($moreinfo ? ' - ' : ' (') . ($obj->label ? $obj->label : $langs->trans("EntityNameNotDefined"));

-								$moreinfohtml .= ($moreinfohtml ? ' - ' : ' <span class="opacitymedium">(') . ($obj->label ? $obj->label : $langs->trans("EntityNameNotDefined"));

-							}

+					if (!empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && !$user->entity)

+					{

+						if (!$obj->entity)

+						{

+							$out .= ($moreinfo ? ' - ' : ' (').$langs->trans("AllEntities");

+							$moreinfo++;

@@ -2188,30 +1849,11 @@
-					}

-					$moreinfo .= (!empty($moreinfo) ? ')' : '');

-					$moreinfohtml .= (!empty($moreinfohtml) ? ')</span>' : '');

-					if (!empty($disableline) && $disableline != '1') {

-						// Add text from $enableonlytext parameter

-						$moreinfo .= ' - ' . $disableline;

-						$moreinfohtml .= ' - ' . $disableline;

-					}

-					$labeltoshow .= $moreinfo;

-					$labeltoshowhtml .= $moreinfohtml;

-

-					$out .= '<option value="' . $obj->rowid . '"';

-					if (!empty($disableline)) {

-						$out .= ' disabled';

-					}

-					if ((is_object($selected) && $selected->id == $obj->rowid) || (!is_object($selected) && in_array($obj->rowid, $selected))) {

-						$out .= ' selected';

-					}

-					$out .= ' data-html="';

-					$outhtml = $userstatic->getNomUrl(-3, '', 0, 1, 24, 1, 'login', '', 1) . ' ';

-					if ($showstatus >= 0 && $obj->status == 0) {

-						$outhtml .= '<strike class="opacitymediumxxx">';

-					}

-					$outhtml .= $labeltoshowhtml;

-					if ($showstatus >= 0 && $obj->status == 0) {

-						$outhtml .= '</strike>';

-					}

-					$out .= dol_escape_htmltag($outhtml);

-					$out .= '">';

-					$out .= $labeltoshow;

+						else

+						{

+							$out .= ($moreinfo ? ' - ' : ' (').($obj->label ? $obj->label : $langs->trans("EntityNameNotDefined"));

+							$moreinfo++;

+						}

+					}

+					$out .= ($moreinfo ? ')' : '');

+					if ($disableline && $disableline != '1')

+					{

+						$out .= ' - '.$disableline; // This is text from $enableonlytext parameter

+					}

@@ -2219,9 +1861 @@
-

-					$outarray[$userstatic->id] = $userstatic->getFullName($langs, $fullNameMode, -1, $maxlength) . $moreinfo;

-					$outarray2[$userstatic->id] = array(

-						'id'=>$userstatic->id,

-						'label'=>$labeltoshow,

-						'labelhtml'=>$labeltoshowhtml,

-						'color'=>'',

-						'picto'=>''

-					);

+					$outarray[$userstatic->id] = $userstatic->getFullName($langs, $fullNameMode, -1, $maxlength);

@@ -2231,3 +1865,5 @@
-			} else {

-				$out .= '<select class="flat" id="' . $htmlname . '" name="' . $htmlname . '" disabled>';

-				$out .= '<option value="">' . $langs->trans("None") . '</option>';

+			}

+			else

+			{

+				$out .= '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'" disabled>';

+				$out .= '<option value="">'.$langs->trans("None").'</option>';

@@ -2236,7 +1872,3 @@
-

-			if ($num && !$forcecombo) {

-				// Enhance with select2

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

-				$out .= ajax_combobox($htmlname);

-			}

-		} else {

+		}

+		else

+		{

@@ -2246,6 +1878 @@
-		if ($outputmode == 2) {

-			return $outarray2;

-		} elseif ($outputmode) {

-			return $outarray;

-		}

-

+		if ($outputmode) return $outarray;

@@ -2258,22 +1885,22 @@
-	 * Return select list of users. Selected users are stored into session.

-	 * List of users are provided into $_SESSION['assignedtouser'].

-	 *

-	 * @param string 	$action 			Value for $action

-	 * @param string 	$htmlname			Field name in form

-	 * @param int 		$show_empty 		0=list without the empty value, 1=add empty value

-	 * @param array 	$exclude 			Array list of users id to exclude

-	 * @param int 		$disabled 			If select list must be disabled

-	 * @param array 	$include 			Array list of users id to include or 'hierarchy' to have only supervised users

-	 * @param array|int	$enableonly 		Array list of users id to be enabled. All other must be disabled

-	 * @param string	$force_entity 		'0' or Ids of environment to force

-	 * @param int 		$maxlength 			Maximum length of string into list (0=no limit)

-	 * @param int 		$showstatus 		0=show user status only if status is disabled, 1=always show user status into label, -1=never show user status

-	 * @param string 	$morefilter 		Add more filters into sql request

-	 * @param int 		$showproperties 	Show properties of each attendees

-	 * @param array 	$listofuserid 		Array with properties of each user

-	 * @param array 	$listofcontactid 	Array with properties of each contact

-	 * @param array 	$listofotherid 		Array with properties of each other contact

-	 * @return    string                    HTML select string

-	 * @see select_dolgroups()

-	 */

-	public function select_dolusers_forevent($action = '', $htmlname = 'userid', $show_empty = 0, $exclude = null, $disabled = 0, $include = array(), $enableonly = array(), $force_entity = '0', $maxlength = 0, $showstatus = 0, $morefilter = '', $showproperties = 0, $listofuserid = array(), $listofcontactid = array(), $listofotherid = array())

+	 *	Return select list of users. Selected users are stored into session.

+	 *  List of users are provided into $_SESSION['assignedtouser'].

+	 *

+	 *  @param  string	$action         Value for $action

+	 *  @param  string	$htmlname       Field name in form

+	 *  @param  int		$show_empty     0=list without the empty value, 1=add empty value

+	 *  @param  array	$exclude        Array list of users id to exclude

+	 * 	@param	int		$disabled		If select list must be disabled

+	 *  @param  array	$include        Array list of users id to include or 'hierarchy' to have only supervised users

+	 * 	@param	array	$enableonly		Array list of users id to be enabled. All other must be disabled

+	 *  @param	int		$force_entity	'0' or Ids of environment to force

+	 *  @param	int		$maxlength		Maximum length of string into list (0=no limit)

+	 *  @param	int		$showstatus		0=show user status only if status is disabled, 1=always show user status into label, -1=never show user status

+	 *  @param	string	$morefilter		Add more filters into sql request

+	 *  @param	int		$showproperties		Show properties of each attendees

+	 *  @param	array	$listofuserid		Array with properties of each user

+	 *  @param	array	$listofcontactid	Array with properties of each contact

+	 *  @param	array	$listofotherid		Array with properties of each other contact

+	 * 	@return	string					HTML select string

+	 *  @see select_dolgroups()

+	 */

+	public function select_dolusers_forevent($action = '', $htmlname = 'userid', $show_empty = 0, $exclude = null, $disabled = 0, $include = '', $enableonly = '', $force_entity = '0', $maxlength = 0, $showstatus = 0, $morefilter = '', $showproperties = 0, $listofuserid = array(), $listofcontactid = array(), $listofotherid = array())

@@ -2282 +1909 @@
-		global $langs;

+		global $conf, $user, $langs;

@@ -2286,0 +1914,14 @@
+		// Method with no ajax

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

+		if ($action == 'view')

+		{

+			$out .= '';

+		}

+		else

+		{

+			$out .= '<input type="hidden" class="removedassignedhidden" name="removedassigned" value="">';

+			$out .= '<script type="text/javascript" language="javascript">jQuery(document).ready(function () {    jQuery(".removedassigned").click(function() {        jQuery(".removedassignedhidden").val(jQuery(this).val());    });})</script>';

+			$out .= $this->select_dolusers('', $htmlname, $show_empty, $exclude, $disabled, $include, $enableonly, $force_entity, $maxlength, $showstatus, $morefilter);

+			$out .= ' <input type="submit" class="button valignmiddle" name="'.$action.'assignedtouser" value="'.dol_escape_htmltag($langs->trans("Add")).'">';

+			$out .= '<br>';

+		}

@@ -2288 +1929,2 @@
-		if (!empty($_SESSION['assignedtouser'])) {

+		if (!empty($_SESSION['assignedtouser']))

+		{

@@ -2293,10 +1935,6 @@
-		//if ($nbassignetouser && $action != 'view') $out .= '<br>';

-		if ($nbassignetouser) {

-			$out .= '<ul class="attendees">';

-		}

-		$i = 0;

-		$ownerid = 0;

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

-			if ($value['id'] == $ownerid) {

-				continue;

-			}

+		if ($nbassignetouser && $action != 'view') $out .= '<br>';

+		if ($nbassignetouser) $out .= '<ul class="attendees">';

+		$i = 0; $ownerid = 0;

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

+		{

+			if ($value['id'] == $ownerid) continue;

@@ -2307,6 +1945,4 @@
-			if ($i == 0) {

-				$ownerid = $value['id'];

-				$out .= ' (' . $langs->trans("Owner") . ')';

-			}

-			if ($nbassignetouser > 1 && $action != 'view') {

-				$out .= ' <input type="image" style="border: 0px;" src="' . img_picto($langs->trans("Remove"), 'delete', '', 0, 1) . '" value="' . $userstatic->id . '" class="removedassigned reposition" id="removedassigned_' . $userstatic->id . '" name="removedassigned_' . $userstatic->id . '">';

+			if ($i == 0) { $ownerid = $value['id']; $out .= ' ('.$langs->trans("Owner").')'; }

+			if ($nbassignetouser > 1 && $action != 'view')

+			{

+				$out .= ' <input type="image" style="border: 0px;" src="'.img_picto($langs->trans("Remove"), 'delete', '', 0, 1).'" value="'.$userstatic->id.'" class="removedassigned" id="removedassigned_'.$userstatic->id.'" name="removedassigned_'.$userstatic->id.'">';

@@ -2315,2 +1951,4 @@
-			if ($showproperties) {

-				if ($ownerid == $value['id'] && is_array($listofuserid) && count($listofuserid) && in_array($ownerid, array_keys($listofuserid))) {

+			if ($showproperties)

+			{

+				if ($ownerid == $value['id'] && is_array($listofuserid) && count($listofuserid) && in_array($ownerid, array_keys($listofuserid)))

+				{

@@ -2318 +1956 @@
-					$out .= '<span class="hideonsmartphone">&nbsp;-&nbsp;<span class="opacitymedium">' . $langs->trans("Availability") . ':</span>  </span><input id="transparency" class="paddingrightonly" ' . ($action == 'view' ? 'disabled' : '') . ' type="checkbox" name="transparency"' . ($listofuserid[$ownerid]['transparency'] ? ' checked' : '') . '><label for="transparency">' . $langs->trans("Busy") . '</label>';

+					$out .= '&nbsp;-&nbsp;<span class="opacitymedium">'.$langs->trans("Availability").':</span>  <input id="transparency" class="marginleftonly marginrightonly" '.($action == 'view' ? 'disabled' : '').' type="checkbox" name="transparency"'.($listofuserid[$ownerid]['transparency'] ? ' checked' : '').'>'.$langs->trans("Busy");

@@ -2328,19 +1966,3 @@
-		if ($nbassignetouser) {

-			$out .= '</ul>';

-		}

-

-		// Method with no ajax

-		if ($action != 'view') {

-			$out .= '<input type="hidden" class="removedassignedhidden" name="removedassigned" value="">';

-			$out .= '<script nonce="' . getNonce() . '" type="text/javascript">jQuery(document).ready(function () {';

-			$out .= 'jQuery(".removedassigned").click(function() { jQuery(".removedassignedhidden").val(jQuery(this).val()); });';

-			$out .= 'jQuery(".assignedtouser").change(function() { console.log(jQuery(".assignedtouser option:selected").val());';

-			$out .= ' if (jQuery(".assignedtouser option:selected").val() > 0) { jQuery("#' . $action . 'assignedtouser").attr("disabled", false); }';

-			$out .= ' else { jQuery("#' . $action . 'assignedtouser").attr("disabled", true); }';

-			$out .= '});';

-			$out .= '})</script>';

-			$out .= $this->select_dolusers('', $htmlname, $show_empty, $exclude, $disabled, $include, $enableonly, $force_entity, $maxlength, $showstatus, $morefilter);

-			$out .= ' <input type="submit" disabled class="button valignmiddle smallpaddingimp reposition" id="' . $action . 'assignedtouser" name="' . $action . 'assignedtouser" value="' . dol_escape_htmltag($langs->trans("Add")) . '">';

-			$out .= '<br>';

-		}

-

+		if ($nbassignetouser) $out .= '</ul>';

+

+		//$out.='</form>';

@@ -2349,0 +1972 @@
+

@@ -2352,91 +1974,0 @@
-	 * Return select list of resources. Selected resources are stored into session.

-	 * List of resources are provided into $_SESSION['assignedtoresource'].

-	 *

-	 * @param string 	$action 			Value for $action

-	 * @param string 	$htmlname			Field name in form

-	 * @param int 		$show_empty 		0=list without the empty value, 1=add empty value

-	 * @param array 	$exclude 			Array list of users id to exclude

-	 * @param int 		$disabled 			If select list must be disabled

-	 * @param array 	$include 			Array list of users id to include or 'hierarchy' to have only supervised users

-	 * @param array 	$enableonly 		Array list of users id to be enabled. All other must be disabled

-	 * @param string	$force_entity 		'0' or Ids of environment to force

-	 * @param int 		$maxlength 			Maximum length of string into list (0=no limit)

-	 * @param int 		$showstatus 		0=show user status only if status is disabled, 1=always show user status into label, -1=never show user status

-	 * @param string 	$morefilter 		Add more filters into sql request

-	 * @param int 		$showproperties 	Show properties of each attendees

-	 * @param array 	$listofresourceid 	Array with properties of each resource

-	 * @return    string                    HTML select string

-	 */

-	public function select_dolresources_forevent($action = '', $htmlname = 'userid', $show_empty = 0, $exclude = null, $disabled = 0, $include = array(), $enableonly = array(), $force_entity = '0', $maxlength = 0, $showstatus = 0, $morefilter = '', $showproperties = 0, $listofresourceid = array())

-	{

-		// phpcs:enable

-		global $langs;

-

-		require_once DOL_DOCUMENT_ROOT.'/resource/class/html.formresource.class.php';

-		require_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';

-		$formresources = new FormResource($this->db);

-		$resourcestatic = new Dolresource($this->db);

-

-		$out = '';

-		$assignedtoresource = array();

-		if (!empty($_SESSION['assignedtoresource'])) {

-			$assignedtoresource = json_decode($_SESSION['assignedtoresource'], true);

-		}

-		$nbassignetoresource = count($assignedtoresource);

-

-		//if ($nbassignetoresource && $action != 'view') $out .= '<br>';

-		if ($nbassignetoresource) {

-			$out .= '<ul class="attendees">';

-		}

-		$i = 0;

-

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

-			$out .= '<li>';

-			$resourcestatic->fetch($value['id']);

-			$out .= $resourcestatic->getNomUrl(-1);

-			if ($nbassignetoresource > 1 && $action != 'view') {

-				$out .= ' <input type="image" style="border: 0px;" src="' . img_picto($langs->trans("Remove"), 'delete', '', 0, 1) . '" value="' . $resourcestatic->id . '" class="removedassigned reposition" id="removedassignedresource_' . $resourcestatic->id . '" name="removedassignedresource_' . $resourcestatic->id . '">';

-			}

-			// Show my availability

-			if ($showproperties) {

-				if (is_array($listofresourceid) && count($listofresourceid)) {

-					$out .= '<div class="myavailability inline-block">';

-					$out .= '<span class="hideonsmartphone">&nbsp;-&nbsp;<span class="opacitymedium">' . $langs->trans("Availability") . ':</span>  </span><input id="transparencyresource" class="paddingrightonly" ' . ($action == 'view' ? 'disabled' : '') . ' type="checkbox" name="transparency"' . ($listofresourceid[$value['id']]['transparency'] ? ' checked' : '') . '><label for="transparency">' . $langs->trans("Busy") . '</label>';

-					$out .= '</div>';

-				}

-			}

-			//$out.=' '.($value['mandatory']?$langs->trans("Mandatory"):$langs->trans("Optional"));

-			//$out.=' '.($value['transparency']?$langs->trans("Busy"):$langs->trans("NotBusy"));

-

-			$out .= '</li>';

-			$i++;

-		}

-		if ($nbassignetoresource) {

-			$out .= '</ul>';

-		}

-

-		// Method with no ajax

-		if ($action != 'view') {

-			$out .= '<input type="hidden" class="removedassignedhidden" name="removedassignedresource" value="">';

-			$out .= '<script nonce="' . getNonce() . '" type="text/javascript">jQuery(document).ready(function () {';

-			$out .= 'jQuery(".removedassignedresource").click(function() { jQuery(".removedassignedresourcehidden").val(jQuery(this).val()); });';

-			$out .= 'jQuery(".assignedtoresource").change(function() { console.log(jQuery(".assignedtoresource option:selected").val());';

-			$out .= ' if (jQuery(".assignedtoresource option:selected").val() > 0) { jQuery("#' . $action . 'assignedtoresource").attr("disabled", false); }';

-			$out .= ' else { jQuery("#' . $action . 'assignedtoresource").attr("disabled", true); }';

-			$out .= '});';

-			$out .= '})</script>';

-

-			$events = array();

-			$out .= img_picto('', 'resource', 'class="pictofixedwidth"');

-			$out .= $formresources->select_resource_list('', $htmlname, '', 1, 1, 0, $events, '', 2, null);

-			//$out .= $this->select_dolusers('', $htmlname, $show_empty, $exclude, $disabled, $include, $enableonly, $force_entity, $maxlength, $showstatus, $morefilter);

-			$out .= ' <input type="submit" disabled class="button valignmiddle smallpaddingimp reposition" id="' . $action . 'assignedtoresource" name="' . $action . 'assignedtoresource" value="' . dol_escape_htmltag($langs->trans("Add")) . '">';

-			$out .= '<br>';

-		}

-

-		return $out;

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-

-	/**

@@ -2446,2 +1978,2 @@
-	 *  @param		string		$htmlname				Name of HTML select field (must be unique in page).

-	 *  @param		int|string	$filtertype				Filter on product type (''=nofilter, 0=product, 1=service)

+	 *  @param		string		$htmlname				Name of HTML select field (must be unique in page)

+	 *  @param		int			$filtertype				Filter on product type (''=nofilter, 0=product, 1=service)

@@ -2450 +1982 @@
-	 *  @param		int			$status					Sell status: -1=No filter on sell status, 0=Products not on sell, 1=Products on sell

+	 *  @param		int			$status					Sell status -1=Return all products, 0=Products not on sell, 1=Products on sell

@@ -2465,5 +1997,3 @@
-	 *  @param		string		$nooutput				No print, return the output into a string

-	 *  @param		int			$status_purchase		Purchase status: -1=No filter on purchase status, 0=Products not on purchase, 1=Products on purchase

-	 *  @return		void|string

-	 */

-	public function select_produits($selected = 0, $htmlname = 'productid', $filtertype = '', $limit = 0, $price_level = 0, $status = 1, $finished = 2, $selected_input_value = '', $hidelabel = 0, $ajaxoptions = array(), $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $hidepriceinlabel = 0, $warehouseStatus = '', $selected_combinations = null, $nooutput = 0, $status_purchase = -1)

+	 *  @return		void

+	 */

+	public function select_produits($selected = '', $htmlname = 'productid', $filtertype = '', $limit = 20, $price_level = 0, $status = 1, $finished = 2, $selected_input_value = '', $hidelabel = 0, $ajaxoptions = array(), $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $hidepriceinlabel = 0, $warehouseStatus = '', $selected_combinations = array())

@@ -2474,2 +2003,0 @@
-		$out = '';

-

@@ -2478,6 +2006,4 @@
-		if (is_null($ajaxoptions)) {

-			$ajaxoptions = array();

-		}

-

-		if (strval($filtertype) === '' && (isModEnabled("product") || isModEnabled("service"))) {

-			if (isModEnabled("product") && !isModEnabled('service')) {

+		if (is_null($ajaxoptions)) $ajaxoptions = array();

+

+		if (strval($filtertype) === '' && (!empty($conf->product->enabled) || !empty($conf->service->enabled))) {

+			if (!empty($conf->product->enabled) && empty($conf->service->enabled)) {

@@ -2485 +2011,2 @@
-			} elseif (!isModEnabled('product') && isModEnabled("service")) {

+			}

+			elseif (empty($conf->product->enabled) && !empty($conf->service->enabled)) {

@@ -2490 +2017,2 @@
-		if (!empty($conf->use_javascript_ajax) && getDolGlobalString('PRODUIT_USE_SEARCH_TO_SELECT')) {

+		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT))

+		{

@@ -2493,2 +2021,3 @@
-			if ($selected && empty($selected_input_value)) {

-				require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';

+			if ($selected && empty($selected_input_value))

+			{

+				require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';

@@ -2501,2 +2030,3 @@
-			if ($filtertype == '') {

-				if (!isModEnabled('product')) { // when product module is disabled, show services only

+			if ($filtertype == '')

+			{

+				if (empty($conf->product->enabled)) { // when product module is disabled, show services only

@@ -2504 +2034,2 @@
-				} elseif (!isModEnabled('service')) { // when service module is disabled, show products only

+				}

+				elseif (empty($conf->service->enabled)) { // when service module is disabled, show products only

@@ -2509,11 +2040,12 @@
-			$urloption = ($socid > 0 ? 'socid=' . $socid . '&' : '') . 'htmlname=' . $htmlname . '&outjson=1&price_level=' . $price_level . '&type=' . $filtertype . '&mode=1&status=' . $status . '&status_purchase=' . $status_purchase . '&finished=' . $finished . '&hidepriceinlabel=' . $hidepriceinlabel . '&warehousestatus=' . $warehouseStatus;

-			$out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT . '/product/ajax/products.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 1, $ajaxoptions);

-

-			if (isModEnabled('variants') && is_array($selected_combinations)) {

-				// Code to automatically insert with javascript the select of attributes under the select of product

-				// when a parent of variant has been selected.

-				$out .= '

-				<!-- script to auto show attributes select tags if a variant was selected -->

-				<script nonce="' . getNonce() . '">

-					// auto show attributes fields

-					selected = ' . json_encode($selected_combinations) . ';

+			$urloption = 'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&finished='.$finished.'&hidepriceinlabel='.$hidepriceinlabel.'&warehousestatus='.$warehouseStatus;

+			//Price by customer

+			if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES) && !empty($socid)) {

+				$urloption .= '&socid='.$socid;

+			}

+			print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajax/products.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);

+

+			if (!empty($conf->variants->enabled)) {

+				?>

+				<script>

+

+					selected = <?php echo json_encode($selected_combinations) ?>;

@@ -2524,3 +2056,3 @@
-						jQuery("input[name=\'prod_entry_mode\']").change(function () {

-							if (jQuery(this).val() == \'free\') {

-								jQuery(\'div#attributes_box\').empty();

+						jQuery("input[name='prod_entry_mode']").change(function () {

+							if (jQuery(this).val() == 'free') {

+								jQuery('div#attributes_box').empty();

@@ -2530 +2062 @@
-						jQuery("input#' . $htmlname . '").change(function () {

+						jQuery("input#<?php echo $htmlname ?>").change(function () {

@@ -2533 +2065 @@
-								jQuery(\'div#attributes_box\').empty();

+								jQuery('div#attributes_box').empty();

@@ -2537,3 +2069 @@
-							console.log("A change has started. We get variants fields to inject html select");

-

-							jQuery.getJSON("' . DOL_URL_ROOT . '/variants/ajax/getCombinations.php", {

+							jQuery.getJSON("<?php echo dol_buildpath('/variants/ajax/getCombinations.php', 2) ?>", {

@@ -2542 +2072 @@
-								jQuery(\'div#attributes_box\').empty();

+								jQuery('div#attributes_box').empty();

@@ -2548,2 +2078,2 @@
-									var span = jQuery(document.createElement(\'div\')).css({

-										\'display\': \'table-row\'

+									var span = jQuery(document.createElement('div')).css({

+										'display': 'table-row'

@@ -2553,3 +2083,4 @@
-										jQuery(document.createElement(\'div\')).text(val.label).css({

-											\'font-weight\': \'bold\',

-											\'display\': \'table-cell\'

+										jQuery(document.createElement('div')).text(val.label).css({

+											'font-weight': 'bold',

+											'display': 'table-cell',

+											'text-align': 'right'

@@ -2559,3 +2090,3 @@
-									var html = jQuery(document.createElement(\'select\')).attr(\'name\', \'combinations[\' + val.id + \']\').css({

-										\'margin-left\': \'15px\',

-										\'white-space\': \'pre\'

+									var html = jQuery(document.createElement('select')).attr('name', 'combinations[' + val.id + ']').css({

+										'margin-left': '15px',

+										'white-space': 'pre'

@@ -2563 +2094 @@
-										jQuery(document.createElement(\'option\')).val(\'\')

+										jQuery(document.createElement('option')).val('')

@@ -2567 +2098 @@
-										var tag = jQuery(document.createElement(\'option\')).val(val.id).html(val.value);

+										var tag = jQuery(document.createElement('option')).val(val.id).html(val.value);

@@ -2570 +2101 @@
-											tag.attr(\'selected\', \'selected\');

+											tag.attr('selected', 'selected');

@@ -2577 +2108 @@
-									jQuery(\'div#attributes_box\').append(span);

+									jQuery('div#attributes_box').append(span);

@@ -2582 +2113,3 @@
-						' . ($selected ? 'jQuery("input#' . $htmlname . '").change();' : '') . '

+						<?php if ($selected): ?>

+						jQuery("input#<?php echo $htmlname ?>").change();

+						<?php endif ?>

@@ -2585,7 +2118,5 @@
-                ';

-			}

-

-			if (empty($hidelabel)) {

-				$out .= $langs->trans("RefOrLabel") . ' : ';

-			} elseif ($hidelabel > 1) {

-				$placeholder = ' placeholder="' . $langs->trans("RefOrLabel") . '"';

+                <?php

+			}

+			if (empty($hidelabel)) print $langs->trans("RefOrLabel").' : ';

+			elseif ($hidelabel > 1) {

+				$placeholder = ' placeholder="'.$langs->trans("RefOrLabel").'"';

@@ -2593,4 +2124,4 @@
-					$out .= img_picto($langs->trans("Search"), 'search');

-				}

-			}

-			$out .= '<input type="text" class="minwidth100' . ($morecss ? ' ' . $morecss : '') . '" name="search_' . $htmlname . '" id="search_' . $htmlname . '" value="' . $selected_input_value . '"' . $placeholder . ' ' . (getDolGlobalString('PRODUCT_SEARCH_AUTOFOCUS') ? 'autofocus' : '') . ' />';

+					print img_picto($langs->trans("Search"), 'search');

+				}

+			}

+			print '<input type="text" class="minwidth100" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' '.(!empty($conf->global->PRODUCT_SEARCH_AUTOFOCUS) ? 'autofocus' : '').' />';

@@ -2598,125 +2129,37 @@
-				$out .= img_picto($langs->trans("Search"), 'search');

-			}

-		} else {

-			$out .= $this->select_produits_list($selected, $htmlname, $filtertype, $limit, $price_level, '', $status, $finished, 0, $socid, $showempty, $forcecombo, $morecss, $hidepriceinlabel, $warehouseStatus, $status_purchase);

-		}

-

-		if (empty($nooutput)) {

-			print $out;

-		} else {

-			return $out;

-		}

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-

-	/**

-	 *  Return list of BOM for customer in Ajax if Ajax activated or go to select_produits_list

-	 *

-	 * @param string $selected Preselected BOM id

-	 * @param string $htmlname Name of HTML select field (must be unique in page).

-	 * @param int $limit Limit on number of returned lines

-	 * @param int $status Sell status -1=Return all bom, 0=Draft BOM, 1=Validated BOM

-	 * @param int $type type of the BOM (-1=Return all BOM, 0=Return disassemble BOM, 1=Return manufacturing BOM)

-	 * @param string $showempty '' to not show empty line. Translation key to show an empty line. '1' show empty line with no text.

-	 * @param string $morecss Add more css on select

-	 * @param string $nooutput No print, return the output into a string

-	 * @param int $forcecombo Force to use combo box

-	 * @param array $TProducts Add filter on a defined product

-	 * @return        void|string

-	 */

-	public function select_bom($selected = '', $htmlname = 'bom_id', $limit = 0, $status = 1, $type = 0, $showempty = '1', $morecss = '', $nooutput = '', $forcecombo = 0, $TProducts = [])

-	{

-		// phpcs:enable

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

-

-		require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';

-

-		$error = 0;

-		$out = '';

-

-		if (!$forcecombo) {

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

-			$events = array();

-			$out .= ajax_combobox($htmlname, $events, getDolGlobalInt("PRODUIT_USE_SEARCH_TO_SELECT"));

-		}

-

-		$out .= '<select class="flat' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '" id="' . $htmlname . '">';

-

-		$sql = 'SELECT b.rowid, b.ref, b.label, b.fk_product';

-		$sql .= ' FROM ' . MAIN_DB_PREFIX . 'bom_bom as b';

-		$sql .= ' WHERE b.entity IN (' . getEntity('bom') . ')';

-		if (!empty($status)) {

-			$sql .= ' AND status = ' . (int) $status;

-		}

-		if (!empty($type)) {

-			$sql .= ' AND bomtype = ' . (int) $type;

-		}

-		if (!empty($TProducts)) {

-			$sql .= ' AND fk_product IN (' . $this->db->sanitize(implode(',', $TProducts)) . ')';

-		}

-		if (!empty($limit)) {

-			$sql .= ' LIMIT ' . (int) $limit;

-		}

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

-		if ($resql) {

-			if ($showempty) {

-				$out .= '<option value="-1"';

-				if (empty($selected)) {

-					$out .= ' selected';

-				}

-				$out .= '>&nbsp;</option>';

-			}

-			while ($obj = $db->fetch_object($resql)) {

-				$product = new Product($db);

-				$res = $product->fetch($obj->fk_product);

-				$out .= '<option value="' . $obj->rowid . '"';

-				if ($obj->rowid == $selected) {

-					$out .= 'selected';

-				}

-				$out .= '>' . $obj->ref . ' - ' . $product->label . ' - ' . $obj->label . '</option>';

-			}

-		} else {

-			$error++;

-			dol_print_error($db);

-		}

-		$out .= '</select>';

-		if (empty($nooutput)) {

-			print $out;

-		} else {

-			return $out;

-		}

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-

-	/**

-	 *    Return list of products for a customer.

-	 *  Called by select_produits.

-	 *

-	 * @param int $selected Preselected product

-	 * @param string $htmlname Name of select html

-	 * @param string $filtertype Filter on product type (''=nofilter, 0=product, 1=service)

-	 * @param int $limit Limit on number of returned lines

-	 * @param int $price_level Level of price to show

-	 * @param string $filterkey Filter on product

-	 * @param int $status -1=Return all products, 0=Products not on sell, 1=Products on sell

-	 * @param int $finished Filter on finished field: 2=No filter

-	 * @param int $outputmode 0=HTML select string, 1=Array

-	 * @param int $socid Thirdparty Id (to get also price dedicated to this customer)

-	 * @param string $showempty '' to not show empty line. Translation key to show an empty line. '1' show empty line with no text.

-	 * @param int $forcecombo Force to use combo box

-	 * @param string $morecss Add more css on select

-	 * @param int $hidepriceinlabel 1=Hide prices in label

-	 * @param string $warehouseStatus Warehouse status filter to group/count stock. Following comma separated filter options can be used.

-	 *                                'warehouseopen' = count products from open warehouses,

-	 *                                'warehouseclosed' = count products from closed warehouses,

-	 *                                'warehouseinternal' = count products from warehouses for internal correct/transfer only

-	 * @param int $status_purchase Purchase status -1=Return all products, 0=Products not on purchase, 1=Products on purchase

-	 * @return     array|string                Array of keys for json

-	 */

-	public function select_produits_list($selected = '', $htmlname = 'productid', $filtertype = '', $limit = 20, $price_level = 0, $filterkey = '', $status = 1, $finished = 2, $outputmode = 0, $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $hidepriceinlabel = 0, $warehouseStatus = '', $status_purchase = -1)

-	{

-		// phpcs:enable

-		global $langs, $conf;

-		global $hookmanager;

+				print img_picto($langs->trans("Search"), 'search');

+			}

+		}

+		else

+		{

+			print $this->select_produits_list($selected, $htmlname, $filtertype, $limit, $price_level, '', $status, $finished, 0, $socid, $showempty, $forcecombo, $morecss, $hidepriceinlabel, $warehouseStatus);

+		}

+	}

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+	/**

+	 *	Return list of products for a customer

+	 *

+	 *	@param      int		$selected           Preselected product

+	 *	@param      string	$htmlname           Name of select html

+	 *  @param		string	$filtertype         Filter on product type (''=nofilter, 0=product, 1=service)

+	 *	@param      int		$limit              Limit on number of returned lines

+	 *	@param      int		$price_level        Level of price to show

+	 * 	@param      string	$filterkey          Filter on product

+	 *	@param		int		$status             -1=Return all products, 0=Products not on sell, 1=Products on sell

+	 *  @param      int		$finished           Filter on finished field: 2=No filter

+	 *  @param      int		$outputmode         0=HTML select string, 1=Array

+	 *  @param      int		$socid     		    Thirdparty Id (to get also price dedicated to this customer)

+	 *  @param		string	$showempty		    '' to not show empty line. Translation key to show an empty line. '1' show empty line with no text.

+	 * 	@param		int		$forcecombo		    Force to use combo box

+	 *  @param      string  $morecss            Add more css on select

+	 *  @param      int     $hidepriceinlabel   1=Hide prices in label

+	 *  @param      string  $warehouseStatus    Warehouse status filter to group/count stock. Following comma separated filter options can be used.

+	 *										    'warehouseopen' = count products from open warehouses,

+	 *										    'warehouseclosed' = count products from closed warehouses,

+	 *										    'warehouseinternal' = count products from warehouses for internal correct/transfer only

+	 *  @return     array    				    Array of keys for json

+	 */

+    public function select_produits_list($selected = '', $htmlname = 'productid', $filtertype = '', $limit = 20, $price_level = 0, $filterkey = '', $status = 1, $finished = 2, $outputmode = 0, $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $hidepriceinlabel = 0, $warehouseStatus = '')

+	{

+        // phpcs:enable

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

@@ -2727,4 +2170,4 @@
-		// Units

-		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {

-			$langs->load('other');

-		}

+        // Units

+        if ($conf->global->PRODUCT_USE_UNITS) {

+            $langs->load('other');

+        }

@@ -2733,3 +2176,5 @@
-		if (!empty($warehouseStatus)) {

-			require_once DOL_DOCUMENT_ROOT . '/product/stock/class/entrepot.class.php';

-			if (preg_match('/warehouseclosed/', $warehouseStatus)) {

+		if (!empty($warehouseStatus))

+		{

+			require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';

+			if (preg_match('/warehouseclosed/', $warehouseStatus))

+			{

@@ -2738 +2183,2 @@
-			if (preg_match('/warehouseopen/', $warehouseStatus)) {

+			if (preg_match('/warehouseopen/', $warehouseStatus))

+			{

@@ -2741 +2187,2 @@
-			if (preg_match('/warehouseinternal/', $warehouseStatus)) {

+			if (preg_match('/warehouseinternal/', $warehouseStatus))

+			{

@@ -2746,5 +2193,8 @@
-		$selectFields = " p.rowid, p.ref, p.label, p.description, p.barcode, p.fk_country, p.fk_product_type, p.price, p.price_ttc, p.price_base_type, p.tva_tx, p.default_vat_code, p.duration, p.fk_price_expression";

-		if (count($warehouseStatusArray)) {

-			$selectFieldsGrouped = ", sum(" . $this->db->ifsql("e.statut IS NULL", "0", "ps.reel") . ") as stock"; // e.statut is null if there is no record in stock

-		} else {

-			$selectFieldsGrouped = ", " . $this->db->ifsql("p.stock IS NULL", 0, "p.stock") . " AS stock";

+		$selectFields = " p.rowid, p.ref, p.label, p.description, p.barcode, p.fk_country, p.fk_product_type, p.price, p.price_ttc, p.price_base_type, p.tva_tx, p.duration, p.fk_price_expression";

+		if (count($warehouseStatusArray))

+		{

+		    $selectFieldsGrouped = ", sum(".$db->ifsql("e.statut IS NULL", "0", "ps.reel").") as stock"; // e.statut is null if there is no record in stock

+		}

+		else

+		{

+		    $selectFieldsGrouped = ", ".$db->ifsql("p.stock IS NULL", 0, "p.stock")." AS stock";

@@ -2754,11 +2204,4 @@
-

-		// Add select from hooks

-		$parameters = array();

-		$reshook = $hookmanager->executeHooks('selectProductsListSelect', $parameters); // Note that $action and $object may have been modified by hook

-		if (empty($reshook)) {

-			$sql .= $selectFields.$selectFieldsGrouped.$hookmanager->resPrint;

-		} else {

-			$sql .= $hookmanager->resPrint;

-		}

-

-		if (getDolGlobalString('PRODUCT_SORT_BY_CATEGORY')) {

+		$sql .= $selectFields.$selectFieldsGrouped;

+

+		if (!empty($conf->global->PRODUCT_SORT_BY_CATEGORY))

+		{

@@ -2766,3 +2209,3 @@
-			$sql .= ", (SELECT " . $this->db->prefix() . "categorie_product.fk_categorie

-						FROM " . $this->db->prefix() . "categorie_product

-						WHERE " . $this->db->prefix() . "categorie_product.fk_product=p.rowid

+			$sql .= ", (SELECT ".MAIN_DB_PREFIX."categorie_product.fk_categorie

+						FROM ".MAIN_DB_PREFIX."categorie_product

+						WHERE ".MAIN_DB_PREFIX."categorie_product.fk_product=p.rowid

@@ -2774 +2217,2 @@
-		if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES') && !empty($socid)) {

+		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES) && !empty($socid))

+		{

@@ -2776,8 +2220,8 @@
-			$sql .= ' pcp.price_base_type as custprice_base_type, pcp.tva_tx as custtva_tx, pcp.default_vat_code as custdefault_vat_code, pcp.ref_customer as custref';

-			$selectFields .= ", idprodcustprice, custprice, custprice_ttc, custprice_base_type, custtva_tx, custdefault_vat_code, custref";

-		}

-		// Units

-		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {

-			$sql .= ", u.label as unit_long, u.short_label as unit_short, p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units";

-			$selectFields .= ', unit_long, unit_short, p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units';

-		}

+			$sql .= ' pcp.price_base_type as custprice_base_type, pcp.tva_tx as custtva_tx';

+			$selectFields .= ", idprodcustprice, custprice, custprice_ttc, custprice_base_type, custtva_tx";

+		}

+        // Units

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

+            $sql .= ", u.label as unit_long, u.short_label as unit_short, p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units";

+            $selectFields .= ', unit_long, unit_short, p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units';

+        }

@@ -2786 +2230,2 @@
-		if (getDolGlobalInt('MAIN_MULTILANGS')) {

+		if (!empty($conf->global->MAIN_MULTILANGS))

+		{

@@ -2788 +2232,0 @@
-			$sql .= ", pl.description as description_translated";

@@ -2790 +2233,0 @@
-			$selectFields .= ", description_translated";

@@ -2793,5 +2236,4 @@
-		if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {

-			$sql .= ", (SELECT pp.rowid FROM " . $this->db->prefix() . "product_price as pp WHERE pp.fk_product = p.rowid";

-			if ($price_level >= 1 && getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {

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

-			}

+		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))

+		{

+			$sql .= ", (SELECT pp.rowid FROM ".MAIN_DB_PREFIX."product_price as pp WHERE pp.fk_product = p.rowid";

+			if ($price_level >= 1 && !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) $sql .= " AND price_level=".$price_level;

@@ -2800,4 +2242,2 @@
-			$sql .= ", (SELECT pp.price_by_qty FROM " . $this->db->prefix() . "product_price as pp WHERE pp.fk_product = p.rowid"; // price_by_qty is 1 if some prices by qty exists in subtable

-			if ($price_level >= 1 && getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {

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

-			}

+			$sql .= ", (SELECT pp.price_by_qty FROM ".MAIN_DB_PREFIX."product_price as pp WHERE pp.fk_product = p.rowid"; // price_by_qty is 1 if some prices by qty exists in subtable

+			if ($price_level >= 1 && !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) $sql .= " AND price_level=".$price_level;

@@ -2808,11 +2248,6 @@
-

-		$sql .= " FROM ".$this->db->prefix()."product as p";

-		// Add from (left join) from hooks

-		$parameters = array();

-		$reshook = $hookmanager->executeHooks('selectProductsListFrom', $parameters); // Note that $action and $object may have been modified by hook

-		$sql .= $hookmanager->resPrint;

-

-		if (count($warehouseStatusArray)) {

-			$sql .= " LEFT JOIN " . $this->db->prefix() . "product_stock as ps on ps.fk_product = p.rowid";

-			$sql .= " LEFT JOIN " . $this->db->prefix() . "entrepot as e on ps.fk_entrepot = e.rowid AND e.entity IN (" . getEntity('stock') . ")";

-			$sql .= ' AND e.statut IN (' . $this->db->sanitize($this->db->escape(implode(',', $warehouseStatusArray))) . ')'; // Return line if product is inside the selected stock. If not, an empty line will be returned so we will count 0.

+		$sql .= " FROM ".MAIN_DB_PREFIX."product as p";

+		if (count($warehouseStatusArray))

+		{

+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps on ps.fk_product = p.rowid";

+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entrepot as e on ps.fk_entrepot = e.rowid AND e.entity IN (".getEntity('stock').")";

+			$sql .= ' AND e.statut IN ('.$this->db->escape(implode(',', $warehouseStatusArray)).')'; // Return line if product is inside the selected stock. If not, an empty line will be returned so we will count 0.

@@ -2822,2 +2257,3 @@
-		if (getDolGlobalString('MAIN_SEARCH_PRODUCT_BY_FOURN_REF')) {

-			$sql .= " LEFT JOIN " . $this->db->prefix() . "product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";

+		if (!empty($conf->global->MAIN_SEARCH_PRODUCT_BY_FOURN_REF))

+		{

+            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";

@@ -2827,7 +2263,7 @@
-		if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES') && !empty($socid)) {

-			$sql .= " LEFT JOIN  " . $this->db->prefix() . "product_customer_price as pcp ON pcp.fk_soc=" . ((int) $socid) . " AND pcp.fk_product=p.rowid";

-		}

-		// Units

-		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {

-			$sql .= " LEFT JOIN " . $this->db->prefix() . "c_units u ON u.rowid = p.fk_unit";

-		}

+		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES) && !empty($socid)) {

+			$sql .= " LEFT JOIN  ".MAIN_DB_PREFIX."product_customer_price as pcp ON pcp.fk_soc=".$socid." AND pcp.fk_product=p.rowid";

+		}

+        // Units

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

+            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_units u ON u.rowid = p.fk_unit";

+        }

@@ -2835,23 +2271,12 @@
-		if (getDolGlobalInt('MAIN_MULTILANGS')) {

-			$sql .= " LEFT JOIN " . $this->db->prefix() . "product_lang as pl ON pl.fk_product = p.rowid ";

-			if (getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE') && !empty($socid)) {

-				require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';

-				$soc = new Societe($this->db);

-				$result = $soc->fetch($socid);

-				if ($result > 0 && !empty($soc->default_lang)) {

-					$sql .= " AND pl.lang = '" . $this->db->escape($soc->default_lang) . "'";

-				} else {

-					$sql .= " AND pl.lang = '" . $this->db->escape($langs->getDefaultLang()) . "'";

-				}

-			} else {

-				$sql .= " AND pl.lang = '" . $this->db->escape($langs->getDefaultLang()) . "'";

-			}

-		}

-

-		if (getDolGlobalString('PRODUIT_ATTRIBUTES_HIDECHILD')) {

-			$sql .= " LEFT JOIN " . $this->db->prefix() . "product_attribute_combination pac ON pac.fk_product_child = p.rowid";

-		}

-

-		$sql .= ' WHERE p.entity IN (' . getEntity('product') . ')';

-

-		if (getDolGlobalString('PRODUIT_ATTRIBUTES_HIDECHILD')) {

+		if (!empty($conf->global->MAIN_MULTILANGS))

+		{

+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_lang as pl ON pl.fk_product = p.rowid AND pl.lang='".$langs->getDefaultLang()."'";

+		}

+

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

+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination pac ON pac.fk_product_child = p.rowid";

+		}

+

+		$sql .= ' WHERE p.entity IN ('.getEntity('product').')';

+

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

@@ -2861,10 +2286,12 @@
-		if ($finished == 0) {

-			$sql .= " AND p.finished = " . ((int) $finished);

-		} elseif ($finished == 1) {

-			$sql .= " AND p.finished = ".((int) $finished);

-		}

-		if ($status >= 0) {

-			$sql .= " AND p.tosell = ".((int) $status);

-		}

-		if ($status_purchase >= 0) {

-			$sql .= " AND p.tobuy = " . ((int) $status_purchase);

+		if ($finished == 0)

+		{

+			$sql .= " AND p.finished = ".$finished;

+		}

+		elseif ($finished == 1)

+		{

+			$sql .= " AND p.finished = ".$finished;

+			if ($status >= 0)  $sql .= " AND p.tosell = ".$status;

+		}

+		elseif ($status >= 0)

+		{

+			$sql .= " AND p.tosell = ".$status;

@@ -2873,3 +2300,2 @@
-		if (strval($filtertype) != '') {

-			$sql .= " AND p.fk_product_type = " . ((int) $filtertype);

-		} elseif (!isModEnabled('product')) { // when product module is disabled, show services only

+		if (strval($filtertype) != '') $sql .= " AND p.fk_product_type = ".$filtertype;

+		elseif (empty($conf->product->enabled)) { // when product module is disabled, show services only

@@ -2877 +2303,2 @@
-		} elseif (!isModEnabled('service')) { // when service module is disabled, show products only

+		}

+		elseif (empty($conf->service->enabled)) { // when service module is disabled, show products only

@@ -2880,4 +2306,0 @@
-		// Add where from hooks

-		$parameters = array();

-		$reshook = $hookmanager->executeHooks('selectProductsListWhere', $parameters); // Note that $action and $object may have been modified by hook

-		$sql .= $hookmanager->resPrint;

@@ -2885 +2308,2 @@
-		if ($filterkey != '') {

+		if ($filterkey != '')

+		{

@@ -2887 +2311 @@
-			$prefix = !getDolGlobalString('PRODUCT_DONOTSEARCH_ANYWHERE') ? '%' : ''; // Can use index if PRODUCT_DONOTSEARCH_ANYWHERE is on

+			$prefix = empty($conf->global->PRODUCT_DONOTSEARCH_ANYWHERE) ? '%' : ''; // Can use index if PRODUCT_DONOTSEARCH_ANYWHERE is on

@@ -2891,23 +2315,12 @@
-			if (count($scrit) > 1) {

-				$sql .= "(";

-			}

-			foreach ($scrit as $crit) {

-				if ($i > 0) {

-					$sql .= " AND ";

-				}

-				$sql .= "(p.ref LIKE '" . $this->db->escape($prefix . $crit) . "%' OR p.label LIKE '" . $this->db->escape($prefix . $crit) . "%'";

-				if (getDolGlobalInt('MAIN_MULTILANGS')) {

-					$sql .= " OR pl.label LIKE '" . $this->db->escape($prefix . $crit) . "%'";

-				}

-				if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES') && !empty($socid)) {

-					$sql .= " OR pcp.ref_customer LIKE '" . $this->db->escape($prefix . $crit) . "%'";

-				}

-				if (getDolGlobalString('PRODUCT_AJAX_SEARCH_ON_DESCRIPTION')) {

-					$sql .= " OR p.description LIKE '" . $this->db->escape($prefix . $crit) . "%'";

-					if (getDolGlobalInt('MAIN_MULTILANGS')) {

-						$sql .= " OR pl.description LIKE '" . $this->db->escape($prefix . $crit) . "%'";

-					}

-				}

-				if (getDolGlobalString('MAIN_SEARCH_PRODUCT_BY_FOURN_REF')) {

-					$sql .= " OR pfp.ref_fourn LIKE '" . $this->db->escape($prefix . $crit) . "%'";

-				}

+			if (count($scrit) > 1) $sql .= "(";

+			foreach ($scrit as $crit)

+			{

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

+				$sql .= "(p.ref LIKE '".$db->escape($prefix.$crit)."%' OR p.label LIKE '".$db->escape($prefix.$crit)."%'";

+				if (!empty($conf->global->MAIN_MULTILANGS)) $sql .= " OR pl.label LIKE '".$db->escape($prefix.$crit)."%'";

+				if (!empty($conf->global->PRODUCT_AJAX_SEARCH_ON_DESCRIPTION))

+				{

+					$sql .= " OR p.description LIKE '".$db->escape($prefix.$crit)."%'";

+					if (!empty($conf->global->MAIN_MULTILANGS)) $sql .= " OR pl.description LIKE '".$db->escape($prefix.$crit)."%'";

+				}

+				if (!empty($conf->global->MAIN_SEARCH_PRODUCT_BY_FOURN_REF)) $sql .= " OR pfp.ref_fourn LIKE '".$db->escape($prefix.$crit)."%'";

@@ -2917,6 +2330,2 @@
-			if (count($scrit) > 1) {

-				$sql .= ")";

-			}

-			if (isModEnabled('barcode')) {

-				$sql .= " OR p.barcode LIKE '" . $this->db->escape($prefix . $filterkey) . "%'";

-			}

+			if (count($scrit) > 1) $sql .= ")";

+		  	if (!empty($conf->barcode->enabled)) $sql .= " OR p.barcode LIKE '".$db->escape($prefix.$filterkey)."%'";

@@ -2925,2 +2334,3 @@
-		if (count($warehouseStatusArray)) {

-			$sql .= " GROUP BY " . $selectFields;

+		if (count($warehouseStatusArray))

+		{

+			$sql .= ' GROUP BY'.$selectFields;

@@ -2930 +2340,2 @@
-		if (getDolGlobalString('PRODUCT_SORT_BY_CATEGORY')) {

+		if (!empty($conf->global->PRODUCT_SORT_BY_CATEGORY))

+		{

@@ -2933,6 +2344,8 @@
-			(getDolGlobalInt('PRODUCT_SORT_BY_CATEGORY') == 1) ? $sql .= "ASC" : $sql .= "DESC";

-		} else {

-			$sql .= $this->db->order("p.ref");

-		}

-

-		$sql .= $this->db->plimit($limit, 0);

+			($conf->global->PRODUCT_SORT_BY_CATEGORY == 1) ? $sql .= "ASC" : $sql .= "DESC";

+		}

+		else

+		{

+			$sql .= $db->order("p.ref");

+		}

+

+		$sql .= $db->plimit($limit, 0);

@@ -2941 +2354 @@
-		dol_syslog(get_class($this) . "::select_produits_list search products", LOG_DEBUG);

+		dol_syslog(get_class($this)."::select_produits_list search product", LOG_DEBUG);

@@ -2943,4 +2356,5 @@
-		if ($result) {

-			require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';

-			require_once DOL_DOCUMENT_ROOT . '/product/dynamic_price/class/price_parser.class.php';

-			require_once DOL_DOCUMENT_ROOT . '/core/lib/product.lib.php';

+		if ($result)

+		{

+			require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';

+			require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';

+			require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';

@@ -2952,6 +2366,7 @@
-			if (!$forcecombo) {

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

-				$out .= ajax_combobox($htmlname, $events, getDolGlobalInt("PRODUIT_USE_SEARCH_TO_SELECT"));

-			}

-

-			$out .= '<select class="flat' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '" id="' . $htmlname . '">';

+			if (!$forcecombo)

+			{

+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

+				$out .= ajax_combobox($htmlname, $events, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT);

+			}

+

+			$out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';

@@ -2961,15 +2376,11 @@
-			//if (!empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';

-			if (getDolGlobalString('PRODUIT_USE_SEARCH_TO_SELECT')) {

-				if ($showempty && !is_numeric($showempty)) {

-					$textifempty = $langs->trans($showempty);

-				} else {

-					$textifempty .= $langs->trans("All");

-				}

-			} else {

-				if ($showempty && !is_numeric($showempty)) {

-					$textifempty = $langs->trans($showempty);

-				}

-			}

-			if ($showempty) {

-				$out .= '<option value="-1" selected>' . ($textifempty ? $textifempty : '&nbsp;') . '</option>';

-			}

+			//if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';

+			if (!empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT))

+			{

+				if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);

+				else $textifempty .= $langs->trans("All");

+			}

+			else

+			{

+			    if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);

+			}

+			if ($showempty) $out .= '<option value="0" selected>'.$textifempty.'</option>';

@@ -2978 +2389,2 @@
-			while ($num && $i < $num) {

+			while ($num && $i < $num)

+			{

@@ -2983 +2395,2 @@
-				if ((getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) && !empty($objp->price_by_qty) && $objp->price_by_qty == 1) { // Price by quantity will return many prices for the same product

+				if ((!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) && !empty($objp->price_by_qty) && $objp->price_by_qty == 1)

+				{ // Price by quantity will return many prices for the same product

@@ -2985,2 +2398,2 @@
-					$sql .= " FROM " . $this->db->prefix() . "product_price_by_qty";

-					$sql .= " WHERE fk_product_price = " . ((int) $objp->price_rowid);

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

+					$sql .= " WHERE fk_product_price=".$objp->price_rowid;

@@ -2989 +2402 @@
-					dol_syslog(get_class($this) . "::select_produits_list search prices by qty", LOG_DEBUG);

+					dol_syslog(get_class($this)."::select_produits_list search price by qty", LOG_DEBUG);

@@ -2991 +2404,2 @@
-					if ($result2) {

+					if ($result2)

+					{

@@ -3007,3 +2421 @@
-

-							//$objp->tva_tx is not overwritten by $objp2 value

-							//$objp->default_vat_code is not overwritten by $objp2 value

+							$objp->remise = $objp2->remise;

@@ -3022,2 +2434,4 @@
-				} else {

-					if (isModEnabled('dynamicprices') && !empty($objp->fk_price_expression)) {

+				}

+				else

+				{

+					if (!empty($conf->dynamicprices->enabled) && !empty($objp->fk_price_expression)) {

@@ -3026,2 +2439,0 @@
-

-						require_once DOL_DOCUMENT_ROOT . '/product/dynamic_price/class/price_parser.class.php';

@@ -3054,4 +2466 @@
-			if (empty($outputmode)) {

-				return $out;

-			}

-

+			if (empty($outputmode)) return $out;

@@ -3059,9 +2468,9 @@
-		} else {

-			dol_print_error($this->db);

-		}

-

-		return '';

-	}

-

-	/**

-	 * Function to forge the string with OPTIONs of SELECT.

+		}

+		else

+		{

+			dol_print_error($db);

+		}

+	}

+

+	/**

+	 * constructProductListOption.

@@ -3069,11 +2478,10 @@
-	 * This function is called by select_produits_list().

-	 *

-	 * @param object 	$objp 			Resultset of fetch

-	 * @param string 	$opt 			Option (var used for returned value in string option format)

-	 * @param array 	$optJson 		Option (var used for returned value in json format)

-	 * @param int 		$price_level 	Price level

-	 * @param string 	$selected 		Preselected value

-	 * @param int 		$hidepriceinlabel Hide price in label

-	 * @param string 	$filterkey 		Filter key to highlight

-	 * @param int 		$novirtualstock Do not load virtual stock, even if slow option STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO is on.

-	 * @return    void

+	 *

+	 * @param 	resource	$objp			    Resultset of fetch

+	 * @param 	string		$opt			    Option (var used for returned value in string option format)

+	 * @param 	string		$optJson		    Option (var used for returned value in json format)

+	 * @param 	int			$price_level	    Price level

+	 * @param 	string		$selected		    Preselected value

+	 * @param   int         $hidepriceinlabel   Hide price in label

+	 * @param   string      $filterkey          Filter key to highlight

+	 * @param	int			$novirtualstock 	Do not load virtual stock, even if slow option STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO is on.

+	 * @return	void

@@ -3083,2 +2491 @@
-		global $langs, $conf, $user;

-		global $hookmanager;

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

@@ -3090 +2496,0 @@
-		$outlabel_translated = '';

@@ -3092 +2497,0 @@
-		$outdesc_translated = '';

@@ -3100 +2504,0 @@
-		$outdefault_vat_code = '';

@@ -3104 +2508 @@
-		$maxlengtharticle = (!getDolGlobalString('PRODUCT_MAX_LENGTH_COMBO') ? 48 : $conf->global->PRODUCT_MAX_LENGTH_COMBO);

+		$maxlengtharticle = (empty($conf->global->PRODUCT_MAX_LENGTH_COMBO) ? 48 : $conf->global->PRODUCT_MAX_LENGTH_COMBO);

@@ -3107,6 +2511,2 @@
-		if (!empty($objp->label_translated)) {

-			$label = $objp->label_translated;

-		}

-		if (!empty($filterkey) && $filterkey != '') {

-			$label = preg_replace('/(' . preg_quote($filterkey, '/') . ')/i', '<strong>$1</strong>', $label, 1);

-		}

+		if (!empty($objp->label_translated)) $label = $objp->label_translated;

+		if (!empty($filterkey) && $filterkey != '') $label = preg_replace('/('.preg_quote($filterkey, '/').')/i', '<strong>$1</strong>', $label, 1);

@@ -3116 +2515,0 @@
-		$outrefcust = empty($objp->custref) ? '' : $objp->custref;

@@ -3119,4 +2517,0 @@
-		if (getDolGlobalInt('MAIN_MULTILANGS')) {

-			$outlabel_translated = $objp->label_translated;

-			$outdesc_translated = $objp->description_translated;

-		}

@@ -3128,46 +2523,44 @@
-		$outdurationvalue = $outtype == Product::TYPE_SERVICE ? substr($objp->duration, 0, dol_strlen($objp->duration) - 1) : '';

-		$outdurationunit = $outtype == Product::TYPE_SERVICE ? substr($objp->duration, -1) : '';

-

-		if ($outorigin && getDolGlobalString('PRODUCT_SHOW_ORIGIN_IN_COMBO')) {

-			require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';

-		}

-

-		// Units

-		$outvalUnits = '';

-		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {

-			if (!empty($objp->unit_short)) {

-				$outvalUnits .= ' - ' . $objp->unit_short;

-			}

-		}

-		if (getDolGlobalString('PRODUCT_SHOW_DIMENSIONS_IN_COMBO')) {

-			if (!empty($objp->weight) && $objp->weight_units !== null) {

-				$unitToShow = showDimensionInBestUnit($objp->weight, $objp->weight_units, 'weight', $langs);

-				$outvalUnits .= ' - ' . $unitToShow;

-			}

-			if ((!empty($objp->length) || !empty($objp->width) || !empty($objp->height)) && $objp->length_units !== null) {

-				$unitToShow = $objp->length . ' x ' . $objp->width . ' x ' . $objp->height . ' ' . measuringUnitString(0, 'size', $objp->length_units);

-				$outvalUnits .= ' - ' . $unitToShow;

-			}

-			if (!empty($objp->surface) && $objp->surface_units !== null) {

-				$unitToShow = showDimensionInBestUnit($objp->surface, $objp->surface_units, 'surface', $langs);

-				$outvalUnits .= ' - ' . $unitToShow;

-			}

-			if (!empty($objp->volume) && $objp->volume_units !== null) {

-				$unitToShow = showDimensionInBestUnit($objp->volume, $objp->volume_units, 'volume', $langs);

-				$outvalUnits .= ' - ' . $unitToShow;

-			}

-		}

-		if ($outdurationvalue && $outdurationunit) {

-			$da = array(

-				'h' => $langs->trans('Hour'),

-				'd' => $langs->trans('Day'),

-				'w' => $langs->trans('Week'),

-				'm' => $langs->trans('Month'),

-				'y' => $langs->trans('Year')

-			);

-			if (isset($da[$outdurationunit])) {

-				$outvalUnits .= ' - ' . $outdurationvalue . ' ' . $langs->transnoentities($da[$outdurationunit] . ($outdurationvalue > 1 ? 's' : ''));

-			}

-		}

-

-		$opt = '<option value="' . $objp->rowid . '"';

+		$outdurationvalue = $outtype == Product::TYPE_SERVICE ?substr($objp->duration, 0, dol_strlen($objp->duration) - 1) : '';

+		$outdurationunit = $outtype == Product::TYPE_SERVICE ?substr($objp->duration, -1) : '';

+

+		if ($outorigin && !empty($conf->global->PRODUCT_SHOW_ORIGIN_IN_COMBO))  require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';

+

+        // Units

+        $outvalUnits = '';

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

+            if (!empty($objp->unit_short)) {

+                $outvalUnits .= ' - '.$objp->unit_short;

+            }

+        }

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

+            if (!empty($objp->weight) && $objp->weight_units !== null) {

+                $unitToShow = showDimensionInBestUnit($objp->weight, $objp->weight_units, 'weight', $langs);

+                $outvalUnits .= ' - '.$unitToShow;

+            }

+            if ((!empty($objp->length) || !empty($objp->width) || !empty($objp->height)) && $objp->length_units !== null) {

+            	$unitToShow = $objp->length.' x '.$objp->width.' x '.$objp->height.' '.measuringUnitString(0, 'size', $objp->length_units);

+                $outvalUnits .= ' - '.$unitToShow;

+            }

+            if (!empty($objp->surface) && $objp->surface_units !== null) {

+                $unitToShow = showDimensionInBestUnit($objp->surface, $objp->surface_units, 'surface', $langs);

+                $outvalUnits .= ' - '.$unitToShow;

+            }

+            if (!empty($objp->volume) && $objp->volume_units !== null) {

+                $unitToShow = showDimensionInBestUnit($objp->volume, $objp->volume_units, 'volume', $langs);

+                $outvalUnits .= ' - '.$unitToShow;

+            }

+        }

+        if ($outdurationvalue && $outdurationunit) {

+            $da = array(

+                'h' => $langs->trans('Hour'),

+                'd' => $langs->trans('Day'),

+                'w' => $langs->trans('Week'),

+                'm' => $langs->trans('Month'),

+                'y' => $langs->trans('Year')

+            );

+            if (isset($da[$outdurationunit])) {

+                $outvalUnits .= ' - '.$outdurationvalue.' '.$langs->transnoentities($da[$outdurationunit].($outdurationvalue > 1 ? 's' : ''));

+            }

+        }

+

+		$opt = '<option value="'.$objp->rowid.'"';

@@ -3175,15 +2568,10 @@
-		if (!empty($objp->price_by_qty_rowid) && $objp->price_by_qty_rowid > 0) {

-			$opt .= ' pbq="' . $objp->price_by_qty_rowid . '" data-pbq="' . $objp->price_by_qty_rowid . '" data-pbqup="' . $objp->price_by_qty_unitprice . '" data-pbqbase="' . $objp->price_by_qty_price_base_type . '" data-pbqqty="' . $objp->price_by_qty_quantity . '" data-pbqpercent="' . $objp->price_by_qty_remise_percent . '"';

-		}

-		if (isModEnabled('stock') && isset($objp->stock) && ($objp->fk_product_type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES'))) {

-			if ($user->hasRight('stock', 'lire')) {

-				if ($objp->stock > 0) {

-					$opt .= ' class="product_line_stock_ok"';

-				} elseif ($objp->stock <= 0) {

-					$opt .= ' class="product_line_stock_too_low"';

-				}

-			}

-		}

-		if (getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {

-			$opt .= ' data-labeltrans="' . $outlabel_translated . '"';

-			$opt .= ' data-desctrans="' . dol_escape_htmltag($outdesc_translated) . '"';

+		if (!empty($objp->price_by_qty_rowid) && $objp->price_by_qty_rowid > 0)

+		{

+			$opt .= ' pbq="'.$objp->price_by_qty_rowid.'" data-pbq="'.$objp->price_by_qty_rowid.'" data-pbqup="'.$objp->price_by_qty_unitprice.'" data-pbqbase="'.$objp->price_by_qty_price_base_type.'" data-pbqqty="'.$objp->price_by_qty_quantity.'" data-pbqpercent="'.$objp->price_by_qty_remise_percent.'"';

+		}

+		if (!empty($conf->stock->enabled) && isset($objp->stock) && ($objp->fk_product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)))

+		{

+		    if (!empty($user->rights->stock->lire)) {

+    			if ($objp->stock > 0) $opt .= ' class="product_line_stock_ok"';

+	       		elseif ($objp->stock <= 0) $opt .= ' class="product_line_stock_too_low"';

+		    }

@@ -3193,10 +2581,3 @@
-		if (!empty($objp->custref)) {

-			$opt .= ' (' . $objp->custref . ')';

-		}

-		if ($outbarcode) {

-			$opt .= ' (' . $outbarcode . ')';

-		}

-		$opt .= ' - ' . dol_trunc($label, $maxlengtharticle);

-		if ($outorigin && getDolGlobalString('PRODUCT_SHOW_ORIGIN_IN_COMBO')) {

-			$opt .= ' (' . getCountry($outorigin, 1) . ')';

-		}

+		if ($outbarcode) $opt .= ' ('.$outbarcode.')';

+		$opt .= ' - '.dol_trunc($label, $maxlengtharticle);

+		if ($outorigin && !empty($conf->global->PRODUCT_SHOW_ORIGIN_IN_COMBO)) $opt .= ' ('.getCountry($outorigin, 1).')';

@@ -3205,6 +2586 @@
-		if (!empty($objp->custref)) {

-			$objRef .= ' (' . $objp->custref . ')';

-		}

-		if (!empty($filterkey) && $filterkey != '') {

-			$objRef = preg_replace('/(' . preg_quote($filterkey, '/') . ')/i', '<strong>$1</strong>', $objRef, 1);

-		}

+		if (!empty($filterkey) && $filterkey != '') $objRef = preg_replace('/('.preg_quote($filterkey, '/').')/i', '<strong>$1</strong>', $objRef, 1);

@@ -3212,11 +2588,7 @@
-		if ($outbarcode) {

-			$outval .= ' (' . $outbarcode . ')';

-		}

-		$outval .= ' - ' . dol_trunc($label, $maxlengtharticle);

-		if ($outorigin && getDolGlobalString('PRODUCT_SHOW_ORIGIN_IN_COMBO')) {

-			$outval .= ' (' . getCountry($outorigin, 1) . ')';

-		}

-

-		// Units

-		$opt .= $outvalUnits;

-		$outval .= $outvalUnits;

+		if ($outbarcode) $outval .= ' ('.$outbarcode.')';

+		$outval .= ' - '.dol_trunc($label, $maxlengtharticle);

+		if ($outorigin && !empty($conf->global->PRODUCT_SHOW_ORIGIN_IN_COMBO)) $outval .= ' ('.getCountry($outorigin, 1).')';

+

+        // Units

+        $opt .= $outvalUnits;

+        $outval .= $outvalUnits;

@@ -3227,7 +2599,8 @@
-		// If we need a particular price level (from 1 to n)

-		if (empty($hidepriceinlabel) && $price_level >= 1 && (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES'))) {

-			$sql = "SELECT price, price_ttc, price_base_type, tva_tx, default_vat_code";

-			$sql .= " FROM " . $this->db->prefix() . "product_price";

-			$sql .= " WHERE fk_product = " . ((int) $objp->rowid);

-			$sql .= " AND entity IN (" . getEntity('productprice') . ")";

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

+		// If we need a particular price level (from 1 to 6)

+		if (empty($hidepriceinlabel) && $price_level >= 1 && (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)))

+		{

+			$sql = "SELECT price, price_ttc, price_base_type, tva_tx";

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

+			$sql .= " WHERE fk_product='".$objp->rowid."'";

+			$sql .= " AND entity IN (".getEntity('productprice').")";

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

@@ -3237 +2610 @@
-			dol_syslog(get_class($this) . '::constructProductListOption search price for product ' . $objp->rowid . ' AND level ' . $price_level, LOG_DEBUG);

+			dol_syslog(get_class($this).'::constructProductListOption search price for product '.$objp->rowid.' AND level '.$price_level.'', LOG_DEBUG);

@@ -3239 +2612,2 @@
-			if ($result2) {

+			if ($result2)

+			{

@@ -3241 +2615,2 @@
-				if ($objp2) {

+				if ($objp2)

+				{

@@ -3243,6 +2618,9 @@
-					if ($objp2->price_base_type == 'HT') {

-						$opt .= ' - ' . price($objp2->price, 1, $langs, 0, 0, -1, $conf->currency) . ' ' . $langs->trans("HT");

-						$outval .= ' - ' . price($objp2->price, 0, $langs, 0, 0, -1, $conf->currency) . ' ' . $langs->transnoentities("HT");

-					} else {

-						$opt .= ' - ' . price($objp2->price_ttc, 1, $langs, 0, 0, -1, $conf->currency) . ' ' . $langs->trans("TTC");

-						$outval .= ' - ' . price($objp2->price_ttc, 0, $langs, 0, 0, -1, $conf->currency) . ' ' . $langs->transnoentities("TTC");

+					if ($objp2->price_base_type == 'HT')

+					{

+						$opt .= ' - '.price($objp2->price, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("HT");

+						$outval .= ' - '.price($objp2->price, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("HT");

+					}

+					else

+					{

+						$opt .= ' - '.price($objp2->price_ttc, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("TTC");

+						$outval .= ' - '.price($objp2->price_ttc, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("TTC");

@@ -3253,9 +2631,5 @@
-					if (getDolGlobalString('PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL')) {  // using this option is a bug. kept for backward compatibility

-						$outtva_tx = $objp2->tva_tx;                        // We use the vat rate on line of multiprice

-						$outdefault_vat_code = $objp2->default_vat_code;    // We use the vat code on line of multiprice

-					} else {

-						$outtva_tx = $objp->tva_tx;                            // We use the vat rate of product, not the one on line of multiprice

-						$outdefault_vat_code = $objp->default_vat_code;        // We use the vat code or product, not the one on line of multiprice

-					}

-				}

-			} else {

+					$outtva_tx = $objp2->tva_tx;

+				}

+			}

+			else

+			{

@@ -3267 +2641,2 @@
-		if (empty($hidepriceinlabel) && !empty($objp->quantity) && $objp->quantity >= 1 && (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES'))) {

+		if (empty($hidepriceinlabel) && !empty($objp->quantity) && $objp->quantity >= 1 && (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)))

+		{

@@ -3271,3 +2646,4 @@
-			if ($objp->quantity == 1) {

-				$opt .= ' - ' . price($objp->unitprice, 1, $langs, 0, 0, -1, $conf->currency) . "/";

-				$outval .= ' - ' . price($objp->unitprice, 0, $langs, 0, 0, -1, $conf->currency) . "/";

+			if ($objp->quantity == 1)

+			{

+				$opt .= ' - '.price($objp->unitprice, 1, $langs, 0, 0, -1, $conf->currency)."/";

+				$outval .= ' - '.price($objp->unitprice, 0, $langs, 0, 0, -1, $conf->currency)."/";

@@ -3276,3 +2652,5 @@
-			} else {

-				$opt .= ' - ' . price($objp->price, 1, $langs, 0, 0, -1, $conf->currency) . "/" . $objp->quantity;

-				$outval .= ' - ' . price($objp->price, 0, $langs, 0, 0, -1, $conf->currency) . "/" . $objp->quantity;

+			}

+			else

+			{

+				$opt .= ' - '.price($objp->price, 1, $langs, 0, 0, -1, $conf->currency)."/".$objp->quantity;

+				$outval .= ' - '.price($objp->price, 0, $langs, 0, 0, -1, $conf->currency)."/".$objp->quantity;

@@ -3286,10 +2664,11 @@
-			$outtva_tx = $objp->tva_tx;                            // This value is the value on product when constructProductListOption is called by select_produits_list even if other field $objp-> are from table price_by_qty

-			$outdefault_vat_code = $objp->default_vat_code;        // This value is the value on product when constructProductListOption is called by select_produits_list even if other field $objp-> are from table price_by_qty

-		}

-		if (empty($hidepriceinlabel) && !empty($objp->quantity) && $objp->quantity >= 1) {

-			$opt .= " (" . price($objp->unitprice, 1, $langs, 0, 0, -1, $conf->currency) . "/" . $langs->trans("Unit") . ")"; // Do not use strtolower because it breaks utf8 encoding

-			$outval .= " (" . price($objp->unitprice, 0, $langs, 0, 0, -1, $conf->currency) . "/" . $langs->transnoentities("Unit") . ")"; // Do not use strtolower because it breaks utf8 encoding

-		}

-		if (empty($hidepriceinlabel) && !empty($objp->remise_percent) && $objp->remise_percent >= 1) {

-			$opt .= " - " . $langs->trans("Discount") . " : " . vatrate($objp->remise_percent) . ' %';

-			$outval .= " - " . $langs->transnoentities("Discount") . " : " . vatrate($objp->remise_percent) . ' %';

+			$outtva_tx = $objp->tva_tx;

+		}

+		if (empty($hidepriceinlabel) && !empty($objp->quantity) && $objp->quantity >= 1)

+		{

+			$opt .= " (".price($objp->unitprice, 1, $langs, 0, 0, -1, $conf->currency)."/".$langs->trans("Unit").")"; // Do not use strtolower because it breaks utf8 encoding

+			$outval .= " (".price($objp->unitprice, 0, $langs, 0, 0, -1, $conf->currency)."/".$langs->transnoentities("Unit").")"; // Do not use strtolower because it breaks utf8 encoding

+		}

+		if (empty($hidepriceinlabel) && !empty($objp->remise_percent) && $objp->remise_percent >= 1)

+		{

+			$opt .= " - ".$langs->trans("Discount")." : ".vatrate($objp->remise_percent).' %';

+			$outval .= " - ".$langs->transnoentities("Discount")." : ".vatrate($objp->remise_percent).' %';

@@ -3299,2 +2678,4 @@
-		if (empty($hidepriceinlabel) && getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {

-			if (!empty($objp->idprodcustprice)) {

+		if (empty($hidepriceinlabel) && !empty($conf->global->PRODUIT_CUSTOMER_PRICES))

+		{

+			if (!empty($objp->idprodcustprice))

+			{

@@ -3303,6 +2684,9 @@
-				if ($objp->custprice_base_type == 'HT') {

-					$opt .= ' - ' . price($objp->custprice, 1, $langs, 0, 0, -1, $conf->currency) . ' ' . $langs->trans("HT");

-					$outval .= ' - ' . price($objp->custprice, 0, $langs, 0, 0, -1, $conf->currency) . ' ' . $langs->transnoentities("HT");

-				} else {

-					$opt .= ' - ' . price($objp->custprice_ttc, 1, $langs, 0, 0, -1, $conf->currency) . ' ' . $langs->trans("TTC");

-					$outval .= ' - ' . price($objp->custprice_ttc, 0, $langs, 0, 0, -1, $conf->currency) . ' ' . $langs->transnoentities("TTC");

+				if ($objp->custprice_base_type == 'HT')

+				{

+					$opt .= ' - '.price($objp->custprice, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("HT");

+					$outval .= ' - '.price($objp->custprice, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("HT");

+				}

+				else

+				{

+					$opt .= ' - '.price($objp->custprice_ttc, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("TTC");

+					$outval .= ' - '.price($objp->custprice_ttc, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("TTC");

@@ -3315 +2698,0 @@
-				$outdefault_vat_code = $objp->custdefault_vat_code;

@@ -3320,7 +2703,11 @@
-		if (empty($hidepriceinlabel) && !$found) {

-			if ($objp->price_base_type == 'HT') {

-				$opt .= ' - ' . price($objp->price, 1, $langs, 0, 0, -1, $conf->currency) . ' ' . $langs->trans("HT");

-				$outval .= ' - ' . price($objp->price, 0, $langs, 0, 0, -1, $conf->currency) . ' ' . $langs->transnoentities("HT");

-			} else {

-				$opt .= ' - ' . price($objp->price_ttc, 1, $langs, 0, 0, -1, $conf->currency) . ' ' . $langs->trans("TTC");

-				$outval .= ' - ' . price($objp->price_ttc, 0, $langs, 0, 0, -1, $conf->currency) . ' ' . $langs->transnoentities("TTC");

+		if (empty($hidepriceinlabel) && !$found)

+		{

+			if ($objp->price_base_type == 'HT')

+			{

+				$opt .= ' - '.price($objp->price, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("HT");

+				$outval .= ' - '.price($objp->price, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("HT");

+			}

+			else

+			{

+				$opt .= ' - '.price($objp->price_ttc, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("TTC");

+				$outval .= ' - '.price($objp->price_ttc, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("TTC");

@@ -3332,44 +2719,37 @@
-			$outdefault_vat_code = $objp->default_vat_code;

-		}

-

-		if (isModEnabled('stock') && isset($objp->stock) && ($objp->fk_product_type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES'))) {

-			if ($user->hasRight('stock', 'lire')) {

-				$opt .= ' - ' . $langs->trans("Stock") . ': ' . price(price2num($objp->stock, 'MS'));

-

-				if ($objp->stock > 0) {

-					$outval .= ' - <span class="product_line_stock_ok">';

-				} elseif ($objp->stock <= 0) {

-					$outval .= ' - <span class="product_line_stock_too_low">';

-				}

-				$outval .= $langs->transnoentities("Stock") . ': ' . price(price2num($objp->stock, 'MS'));

-				$outval .= '</span>';

-				if (empty($novirtualstock) && getDolGlobalString('STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO')) {  // Warning, this option may slow down combo list generation

-					$langs->load("stocks");

-

-					$tmpproduct = new Product($this->db);

-					$tmpproduct->fetch($objp->rowid, '', '', '', 1, 1, 1); // Load product without lang and prices arrays (we just need to make ->virtual_stock() after)

-					$tmpproduct->load_virtual_stock();

-					$virtualstock = $tmpproduct->stock_theorique;

-

-					$opt .= ' - ' . $langs->trans("VirtualStock") . ':' . $virtualstock;

-

-					$outval .= ' - ' . $langs->transnoentities("VirtualStock") . ':';

-					if ($virtualstock > 0) {

-						$outval .= '<span class="product_line_stock_ok">';

-					} elseif ($virtualstock <= 0) {

-						$outval .= '<span class="product_line_stock_too_low">';

-					}

-					$outval .= $virtualstock;

-					$outval .= '</span>';

-

-					unset($tmpproduct);

-				}

-			}

-		}

-

-		$parameters = array('objp'=>$objp);

-		$reshook = $hookmanager->executeHooks('constructProductListOption', $parameters); // Note that $action and $object may have been modified by hook

-		if (empty($reshook)) {

-			$opt .= $hookmanager->resPrint;

-		} else {

-			$opt = $hookmanager->resPrint;

+		}

+

+		if (!empty($conf->stock->enabled) && isset($objp->stock) && ($objp->fk_product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)))

+		{

+	        if (!empty($user->rights->stock->lire)) {

+                $opt .= ' - '.$langs->trans("Stock").':'.$objp->stock;

+

+    			if ($objp->stock > 0) {

+    				$outval .= ' - <span class="product_line_stock_ok">';

+    			}elseif ($objp->stock <= 0) {

+    				$outval .= ' - <span class="product_line_stock_too_low">';

+    			}

+    			$outval .= $langs->transnoentities("Stock").':'.$objp->stock;

+    			$outval .= '</span>';

+    			if (empty($novirtualstock) && !empty($conf->global->STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO))  // Warning, this option may slow down combo list generation

+    			{

+    			    $langs->load("stocks");

+

+    			    $tmpproduct = new Product($this->db);

+    			    $tmpproduct->fetch($objp->rowid, '', '', '', 1, 1, 1); // Load product without lang and prices arrays (we just need to make ->virtual_stock() after)

+    			    $tmpproduct->load_virtual_stock();

+    			    $virtualstock = $tmpproduct->stock_theorique;

+

+    			    $opt .= ' - '.$langs->trans("VirtualStock").':'.$virtualstock;

+

+    			    $outval .= ' - '.$langs->transnoentities("VirtualStock").':';

+    			    if ($virtualstock > 0) {

+    			        $outval .= ' - <span class="product_line_stock_ok">';

+    			    }elseif ($virtualstock <= 0) {

+    			        $outval .= ' - <span class="product_line_stock_too_low">';

+    			    }

+    			    $outval .= $virtualstock;

+    			    $outval .= '</span>';

+

+    			    unset($tmpproduct);

+    			}

+	        }

@@ -3379,45 +2759,21 @@
-		$optJson = array(

-			'key' => $outkey,

-			'value' => $outref,

-			'label' => $outval,

-			'label2' => $outlabel,

-			'desc' => $outdesc,

-			'type' => $outtype,

-			'price_ht' => price2num($outprice_ht),

-			'price_ttc' => price2num($outprice_ttc),

-			'price_ht_locale' => price(price2num($outprice_ht)),

-			'price_ttc_locale' => price(price2num($outprice_ttc)),

-			'pricebasetype' => $outpricebasetype,

-			'tva_tx' => $outtva_tx,

-			'default_vat_code' => $outdefault_vat_code,

-			'qty' => $outqty,

-			'discount' => $outdiscount,

-			'duration_value' => $outdurationvalue,

-			'duration_unit' => $outdurationunit,

-			'pbq' => $outpbq,

-			'labeltrans' => $outlabel_translated,

-			'desctrans' => $outdesc_translated,

-			'ref_customer' => $outrefcust

-		);

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-

-	/**

-	 *    Return list of products for customer (in Ajax if Ajax activated or go to select_produits_fournisseurs_list)

-	 *

-	 * @param int 		$socid 			Id third party

-	 * @param string 	$selected 		Preselected product

-	 * @param string 	$htmlname 		Name of HTML Select

-	 * @param string 	$filtertype 	Filter on product type (''=nofilter, 0=product, 1=service)

-	 * @param string 	$filtre 		For a SQL filter

-	 * @param array 	$ajaxoptions 	Options for ajax_autocompleter

-	 * @param int 		$hidelabel 		Hide label (0=no, 1=yes)

-	 * @param int 		$alsoproductwithnosupplierprice 1=Add also product without supplier prices

-	 * @param string 	$morecss 		More CSS

-	 * @param string 	$placeholder 	Placeholder

-	 * @return    void

-	 */

-	public function select_produits_fournisseurs($socid, $selected = '', $htmlname = 'productid', $filtertype = '', $filtre = '', $ajaxoptions = array(), $hidelabel = 0, $alsoproductwithnosupplierprice = 0, $morecss = '', $placeholder = '')

-	{

-		// phpcs:enable

+		$optJson = array('key'=>$outkey, 'value'=>$outref, 'label'=>$outval, 'label2'=>$outlabel, 'desc'=>$outdesc, 'type'=>$outtype, 'price_ht'=>price2num($outprice_ht), 'price_ttc'=>price2num($outprice_ttc), 'pricebasetype'=>$outpricebasetype, 'tva_tx'=>$outtva_tx, 'qty'=>$outqty, 'discount'=>$outdiscount, 'duration_value'=>$outdurationvalue, 'duration_unit'=>$outdurationunit, 'pbq'=>$outpbq);

+	}

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+	/**

+	 *	Return list of products for customer (in Ajax if Ajax activated or go to select_produits_fournisseurs_list)

+	 *

+	 *	@param	int		$socid			Id third party

+	 *	@param  string	$selected       Preselected product

+	 *	@param  string	$htmlname       Name of HTML Select

+	 *  @param	string	$filtertype     Filter on product type (''=nofilter, 0=product, 1=service)

+	 *	@param  string	$filtre			For a SQL filter

+	 *	@param	array	$ajaxoptions	Options for ajax_autocompleter

+	 *  @param	int		$hidelabel		Hide label (0=no, 1=yes)

+	 *  @param  int     $alsoproductwithnosupplierprice    1=Add also product without supplier prices

+	 *  @param	string	$morecss		More CSS

+	 *	@return	void

+	 */

+    public function select_produits_fournisseurs($socid, $selected = '', $htmlname = 'productid', $filtertype = '', $filtre = '', $ajaxoptions = array(), $hidelabel = 0, $alsoproductwithnosupplierprice = 0, $morecss = '')

+	{

+        // phpcs:enable

@@ -3427,4 +2782,0 @@
-		if (!isset($status)) {

-			$status = 1;

-		}

-

@@ -3432,3 +2784,5 @@
-		if (!empty($conf->use_javascript_ajax) && getDolGlobalString('PRODUIT_USE_SEARCH_TO_SELECT')) {

-			if ($selected > 0) {

-				require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';

+		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT))

+		{

+			if ($selected > 0)

+			{

+				require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';

@@ -3442,34 +2796,31 @@
-			$urloption = ($socid > 0 ? 'socid=' . $socid . '&' : '') . 'htmlname=' . $htmlname . '&outjson=1&price_level=' . $price_level . '&type=' . $filtertype . '&mode=2&status=' . $status . '&finished=' . $finished . '&alsoproductwithnosupplierprice=' . $alsoproductwithnosupplierprice;

-			print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT . '/product/ajax/products.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);

-

-			print($hidelabel ? '' : $langs->trans("RefOrLabel") . ' : ') . '<input type="text" class="minwidth300" name="search_' . $htmlname . '" id="search_' . $htmlname . '" value="' . $selected_input_value . '"' . ($placeholder ? ' placeholder="' . $placeholder . '"' : '') . '>';

-		} else {

-			print $this->select_produits_fournisseurs_list($socid, $selected, $htmlname, $filtertype, $filtre, '', $status, 0, 0, $alsoproductwithnosupplierprice, $morecss, 0, $placeholder);

-		}

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-

-	/**

-	 *    Return list of suppliers products

-	 *

-	 * @param int $socid Id of supplier thirdparty (0 = no filter)

-	 * @param string $selected Product price pre-selected (must be 'id' in product_fournisseur_price or 'idprod_IDPROD')

-	 * @param string $htmlname Name of HTML select

-	 * @param string $filtertype Filter on product type (''=nofilter, 0=product, 1=service)

-	 * @param string $filtre Generic filter. Data must not come from user input.

-	 * @param string $filterkey Filter of produdts

-	 * @param int $statut -1=Return all products, 0=Products not on buy, 1=Products on buy

-	 * @param int $outputmode 0=HTML select string, 1=Array

-	 * @param int $limit Limit of line number

-	 * @param int $alsoproductwithnosupplierprice 1=Add also product without supplier prices

-	 * @param string $morecss Add more CSS

-	 * @param int $showstockinlist Show stock information (slower).

-	 * @param string $placeholder Placeholder

-	 * @return array|string                Array of keys for json or HTML component

-	 */

-	public function select_produits_fournisseurs_list($socid, $selected = '', $htmlname = 'productid', $filtertype = '', $filtre = '', $filterkey = '', $statut = -1, $outputmode = 0, $limit = 100, $alsoproductwithnosupplierprice = 0, $morecss = '', $showstockinlist = 0, $placeholder = '')

-	{

-		// phpcs:enable

-		global $langs, $conf, $user;

-		global $hookmanager;

+			$urloption = ($socid > 0 ? 'socid='.$socid.'&' : '').'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=2&status='.$status.'&finished='.$finished.'&alsoproductwithnosupplierprice='.$alsoproductwithnosupplierprice;

+			print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajax/products.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);

+			print ($hidelabel ? '' : $langs->trans("RefOrLabel").' : ').'<input type="text" size="20" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'">';

+		}

+		else

+		{

+			print $this->select_produits_fournisseurs_list($socid, $selected, $htmlname, $filtertype, $filtre, '', -1, 0, 0, $alsoproductwithnosupplierprice, $morecss);

+		}

+	}

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+	/**

+	 *	Return list of suppliers products

+	 *

+	 *	@param	int		$socid   		Id societe fournisseur (0 pour aucun filtre)

+	 *	@param  int		$selected       Product price pre-selected (must be 'id' in product_fournisseur_price or 'idprod_IDPROD')

+	 *	@param  string	$htmlname       Nom de la zone select

+	 *  @param	string	$filtertype     Filter on product type (''=nofilter, 0=product, 1=service)

+	 *	@param  string	$filtre         Pour filtre sql

+	 *	@param  string	$filterkey      Filtre des produits

+	 *  @param  int		$statut         -1=Return all products, 0=Products not on sell, 1=Products on sell (not used here, a filter on tobuy is already hard coded in request)

+	 *  @param  int		$outputmode     0=HTML select string, 1=Array

+	 *  @param  int     $limit          Limit of line number

+	 *  @param  int     $alsoproductwithnosupplierprice    1=Add also product without supplier prices

+	 *  @param	string	$morecss		Add more CSS

+	 *  @return array           		Array of keys for json

+	 */

+    public function select_produits_fournisseurs_list($socid, $selected = '', $htmlname = 'productid', $filtertype = '', $filtre = '', $filterkey = '', $statut = -1, $outputmode = 0, $limit = 100, $alsoproductwithnosupplierprice = 0, $morecss = '')

+	{

+        // phpcs:enable

+		global $langs, $conf, $db;

@@ -3480 +2831 @@
-		$maxlengtharticle = (!getDolGlobalString('PRODUCT_MAX_LENGTH_COMBO') ? 48 : $conf->global->PRODUCT_MAX_LENGTH_COMBO);

+		$maxlengtharticle = (empty($conf->global->PRODUCT_MAX_LENGTH_COMBO) ? 48 : $conf->global->PRODUCT_MAX_LENGTH_COMBO);

@@ -3483,6 +2834,6 @@
-		// Units

-		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {

-			$langs->load('other');

-		}

-

-		$sql = "SELECT p.rowid, p.ref, p.label, p.price, p.duration, p.fk_product_type, p.stock, p.tva_tx as tva_tx_sale, p.default_vat_code as default_vat_code_sale,";

+        // Units

+        if ($conf->global->PRODUCT_USE_UNITS) {

+            $langs->load('other');

+        }

+

+		$sql = "SELECT p.rowid, p.ref, p.label, p.price, p.duration, p.fk_product_type,";

@@ -3490 +2841 @@
-		$sql .= " pfp.fk_supplier_price_expression, pfp.fk_product, pfp.tva_tx, pfp.default_vat_code, pfp.fk_soc, s.nom as name,";

+		$sql .= " pfp.fk_supplier_price_expression, pfp.fk_product, pfp.tva_tx, pfp.fk_soc, s.nom as name,";

@@ -3492,37 +2843,17 @@
-		// if we use supplier description of the products

-		if (getDolGlobalString('PRODUIT_FOURN_TEXTS')) {

-			$sql .= ", pfp.desc_fourn as description";

-		} else {

-			$sql .= ", p.description";

-		}

-		// Units

-		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {

-			$sql .= ", u.label as unit_long, u.short_label as unit_short, p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units";

-		}

-		if (isModEnabled('barcode')) {

-			$sql .= ", pfp.barcode";

-		}

-		$sql .= " FROM " . $this->db->prefix() . "product as p";

-		$sql .= " LEFT JOIN " . $this->db->prefix() . "product_fournisseur_price as pfp ON ( p.rowid = pfp.fk_product AND pfp.entity IN (" . getEntity('product') . ") )";

-		if ($socid > 0) {

-			$sql .= " AND pfp.fk_soc = " . ((int) $socid);

-		}

-		$sql .= " LEFT JOIN " . $this->db->prefix() . "societe as s ON pfp.fk_soc = s.rowid";

-		// Units

-		if (getDolGlobalInt('PRODUCT_USE_UNITS')) {

-			$sql .= " LEFT JOIN " . $this->db->prefix() . "c_units u ON u.rowid = p.fk_unit";

-		}

-		$sql .= " WHERE p.entity IN (" . getEntity('product') . ")";

-		if ($statut != -1) {

-			$sql .= " AND p.tobuy = " . ((int) $statut);

-		}

-		if (strval($filtertype) != '') {

-			$sql .= " AND p.fk_product_type = " . ((int) $filtertype);

-		}

-		if (!empty($filtre)) {

-			$sql .= " " . $filtre;

-		}

-		// Add where from hooks

-		$parameters = array();

-		$reshook = $hookmanager->executeHooks('selectSuppliersProductsListWhere', $parameters); // Note that $action and $object may have been modified by hook

-		$sql .= $hookmanager->resPrint;

+        // Units

+        if ($conf->global->PRODUCT_USE_UNITS) {

+            $sql .= ", u.label as unit_long, u.short_label as unit_short, p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units";

+        }

+        if (!empty($conf->barcode->enabled)) $sql .= ", pfp.barcode";

+		$sql .= " FROM ".MAIN_DB_PREFIX."product as p";

+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON ( p.rowid = pfp.fk_product AND pfp.entity IN (".getEntity('product').") )";

+		if ($socid) $sql .= " AND pfp.fk_soc = ".$socid;

+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON pfp.fk_soc = s.rowid";

+        // Units

+        if ($conf->global->PRODUCT_USE_UNITS) {

+            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_units u ON u.rowid = p.fk_unit";

+        }

+		$sql .= " WHERE p.entity IN (".getEntity('product').")";

+		$sql .= " AND p.tobuy = 1";

+		if (strval($filtertype) != '') $sql .= " AND p.fk_product_type=".$this->db->escape($filtertype);

+		if (!empty($filtre)) $sql .= " ".$filtre;

@@ -3530 +2861,2 @@
-		if ($filterkey != '') {

+		if ($filterkey != '')

+		{

@@ -3532 +2864 @@
-			$prefix = !getDolGlobalString('PRODUCT_DONOTSEARCH_ANYWHERE') ? '%' : ''; // Can use index if PRODUCT_DONOTSEARCH_ANYWHERE is on

+			$prefix = empty($conf->global->PRODUCT_DONOTSEARCH_ANYWHERE) ? '%' : ''; // Can use index if PRODUCT_DONOTSEARCH_ANYWHERE is on

@@ -3536,12 +2868,5 @@
-			if (count($scrit) > 1) {

-				$sql .= "(";

-			}

-			foreach ($scrit as $crit) {

-				if ($i > 0) {

-					$sql .= " AND ";

-				}

-				$sql .= "(pfp.ref_fourn LIKE '" . $this->db->escape($prefix . $crit) . "%' OR p.ref LIKE '" . $this->db->escape($prefix . $crit) . "%' OR p.label LIKE '" . $this->db->escape($prefix . $crit) . "%'";

-				if (getDolGlobalString('PRODUIT_FOURN_TEXTS')) {

-					$sql .= " OR pfp.desc_fourn LIKE '" . $this->db->escape($prefix . $crit) . "%'";

-				}

-				$sql .= ")";

+			if (count($scrit) > 1) $sql .= "(";

+			foreach ($scrit as $crit)

+			{

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

+				$sql .= "(pfp.ref_fourn LIKE '".$this->db->escape($prefix.$crit)."%' OR p.ref LIKE '".$this->db->escape($prefix.$crit)."%' OR p.label LIKE '".$this->db->escape($prefix.$crit)."%')";

@@ -3550,7 +2875,5 @@
-			if (count($scrit) > 1) {

-				$sql .= ")";

-			}

-			if (isModEnabled('barcode')) {

-				$sql .= " OR p.barcode LIKE '" . $this->db->escape($prefix . $filterkey) . "%'";

-				$sql .= " OR pfp.barcode LIKE '" . $this->db->escape($prefix . $filterkey) . "%'";

-			}

+			if (count($scrit) > 1) $sql .= ")";

+			if (!empty($conf->barcode->enabled)) {

+                $sql .= " OR p.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";

+                $sql .= " OR pfp.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";

+            }

@@ -3560 +2883 @@
-		$sql .= $this->db->plimit($limit, 0);

+		$sql .= $db->plimit($limit, 0);

@@ -3564 +2887 @@
-		dol_syslog(get_class($this) . "::select_produits_fournisseurs_list", LOG_DEBUG);

+		dol_syslog(get_class($this)."::select_produits_fournisseurs_list", LOG_DEBUG);

@@ -3566,3 +2889,4 @@
-		if ($result) {

-			require_once DOL_DOCUMENT_ROOT . '/product/dynamic_price/class/price_parser.class.php';

-			require_once DOL_DOCUMENT_ROOT . '/core/lib/product.lib.php';

+		if ($result)

+		{

+			require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';

+			require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';

@@ -3573,6 +2897,3 @@
-			$out .= '<select class="flat ' . ($morecss ? ' ' . $morecss : '') . '" id="' . $htmlname . '" name="' . $htmlname . '">';

-			if (!$selected) {

-				$out .= '<option value="-1" selected>' . ($placeholder ? $placeholder : '&nbsp;') . '</option>';

-			} else {

-				$out .= '<option value="-1">' . ($placeholder ? $placeholder : '&nbsp;') . '</option>';

-			}

+			$out .= '<select class="flat maxwidthonsmartphone'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'">';

+			if (!$selected) $out .= '<option value="0" selected>&nbsp;</option>';

+			else $out .= '<option value="0">&nbsp;</option>';

@@ -3581 +2902,2 @@
-			while ($i < $num) {

+			while ($i < $num)

+			{

@@ -3584,6 +2905,0 @@
-				if (is_null($objp->idprodfournprice)) {

-					// There is no supplier price found, we will use the vat rate for sale

-					$objp->tva_tx = $objp->tva_tx_sale;

-					$objp->default_vat_code = $objp->default_vat_code_sale;

-				}

-

@@ -3591,3 +2907 @@
-				if (!$outkey && $alsoproductwithnosupplierprice) {

-					$outkey = 'idprod_' . $objp->rowid; // id of product

-				}

+				if (!$outkey && $alsoproductwithnosupplierprice) $outkey = 'idprod_'.$objp->rowid; // id of product

@@ -3595,0 +2910 @@
+				$outval = '';

@@ -3600,38 +2915,38 @@
-				$outdurationvalue = $outtype == Product::TYPE_SERVICE ? substr($objp->duration, 0, dol_strlen($objp->duration) - 1) : '';

-				$outdurationunit = $outtype == Product::TYPE_SERVICE ? substr($objp->duration, -1) : '';

-

-				// Units

-				$outvalUnits = '';

-				if (getDolGlobalInt('PRODUCT_USE_UNITS')) {

-					if (!empty($objp->unit_short)) {

-						$outvalUnits .= ' - ' . $objp->unit_short;

-					}

-					if (!empty($objp->weight) && $objp->weight_units !== null) {

-						$unitToShow = showDimensionInBestUnit($objp->weight, $objp->weight_units, 'weight', $langs);

-						$outvalUnits .= ' - ' . $unitToShow;

-					}

-					if ((!empty($objp->length) || !empty($objp->width) || !empty($objp->height)) && $objp->length_units !== null) {

-						$unitToShow = $objp->length . ' x ' . $objp->width . ' x ' . $objp->height . ' ' . measuringUnitString(0, 'size', $objp->length_units);

-						$outvalUnits .= ' - ' . $unitToShow;

-					}

-					if (!empty($objp->surface) && $objp->surface_units !== null) {

-						$unitToShow = showDimensionInBestUnit($objp->surface, $objp->surface_units, 'surface', $langs);

-						$outvalUnits .= ' - ' . $unitToShow;

-					}

-					if (!empty($objp->volume) && $objp->volume_units !== null) {

-						$unitToShow = showDimensionInBestUnit($objp->volume, $objp->volume_units, 'volume', $langs);

-						$outvalUnits .= ' - ' . $unitToShow;

-					}

-					if ($outdurationvalue && $outdurationunit) {

-						$da = array(

-							'h' => $langs->trans('Hour'),

-							'd' => $langs->trans('Day'),

-							'w' => $langs->trans('Week'),

-							'm' => $langs->trans('Month'),

-							'y' => $langs->trans('Year')

-						);

-						if (isset($da[$outdurationunit])) {

-							$outvalUnits .= ' - ' . $outdurationvalue . ' ' . $langs->transnoentities($da[$outdurationunit] . ($outdurationvalue > 1 ? 's' : ''));

-						}

-					}

-				}

+				$outdurationvalue = $outtype == Product::TYPE_SERVICE ?substr($objp->duration, 0, dol_strlen($objp->duration) - 1) : '';

+				$outdurationunit = $outtype == Product::TYPE_SERVICE ?substr($objp->duration, -1) : '';

+

+                // Units

+                $outvalUnits = '';

+                if ($conf->global->PRODUCT_USE_UNITS) {

+                    if (!empty($objp->unit_short)) {

+                        $outvalUnits .= ' - '.$objp->unit_short;

+                    }

+                    if (!empty($objp->weight) && $objp->weight_units !== null) {

+                        $unitToShow = showDimensionInBestUnit($objp->weight, $objp->weight_units, 'weight', $langs);

+                        $outvalUnits .= ' - '.$unitToShow;

+                    }

+                    if ((!empty($objp->length) || !empty($objp->width) || !empty($objp->height)) && $objp->length_units !== null) {

+                    	$unitToShow = $objp->length.' x '.$objp->width.' x '.$objp->height.' '.measuringUnitString(0, 'size', $objp->length_units);

+                        $outvalUnits .= ' - '.$unitToShow;

+                    }

+                    if (!empty($objp->surface) && $objp->surface_units !== null) {

+                        $unitToShow = showDimensionInBestUnit($objp->surface, $objp->surface_units, 'surface', $langs);

+                        $outvalUnits .= ' - '.$unitToShow;

+                    }

+                    if (!empty($objp->volume) && $objp->volume_units !== null) {

+                        $unitToShow = showDimensionInBestUnit($objp->volume, $objp->volume_units, 'volume', $langs);

+                        $outvalUnits .= ' - '.$unitToShow;

+                    }

+                    if ($outdurationvalue && $outdurationunit) {

+                        $da = array(

+                            'h' => $langs->trans('Hour'),

+                            'd' => $langs->trans('Day'),

+                            'w' => $langs->trans('Week'),

+                            'm' => $langs->trans('Month'),

+                            'y' => $langs->trans('Year')

+                        );

+                        if (isset($da[$outdurationunit])) {

+                            $outvalUnits .= ' - '.$outdurationvalue.' '.$langs->transnoentities($da[$outdurationunit].($outdurationvalue > 1 ? 's' : ''));

+                        }

+                    }

+                }

@@ -3640,3 +2955 @@
-				if ($filterkey && $filterkey != '') {

-					$objRef = preg_replace('/(' . preg_quote($filterkey, '/') . ')/i', '<strong>$1</strong>', $objRef, 1);

-				}

+				if ($filterkey && $filterkey != '') $objRef = preg_replace('/('.preg_quote($filterkey, '/').')/i', '<strong>$1</strong>', $objRef, 1);

@@ -3644,3 +2957 @@
-				if ($filterkey && $filterkey != '') {

-					$objRefFourn = preg_replace('/(' . preg_quote($filterkey, '/') . ')/i', '<strong>$1</strong>', $objRefFourn, 1);

-				}

+				if ($filterkey && $filterkey != '') $objRefFourn = preg_replace('/('.preg_quote($filterkey, '/').')/i', '<strong>$1</strong>', $objRefFourn, 1);

@@ -3648,23 +2959,3 @@
-				if ($filterkey && $filterkey != '') {

-					$label = preg_replace('/(' . preg_quote($filterkey, '/') . ')/i', '<strong>$1</strong>', $label, 1);

-				}

-

-				switch ($objp->fk_product_type) {

-					case Product::TYPE_PRODUCT:

-						$picto = 'product';

-						break;

-					case Product::TYPE_SERVICE:

-						$picto = 'service';

-						break;

-					default:

-						$picto = '';

-						break;

-				}

-

-				if (empty($picto)) {

-					$optlabel = '';

-				} else {

-					$optlabel = img_object('', $picto, 'class="paddingright classfortooltip"', 0, 0, 1);

-				}

-

-				$optlabel .= $objp->ref;

+				if ($filterkey && $filterkey != '') $label = preg_replace('/('.preg_quote($filterkey, '/').')/i', '<strong>$1</strong>', $label, 1);

+

+				$optlabel = $objp->ref;

@@ -3672,6 +2963,6 @@
-					$optlabel .= ' <span class="opacitymedium">(' . $objp->ref_fourn . ')</span>';

-				}

-				if (isModEnabled('barcode') && !empty($objp->barcode)) {

-					$optlabel .= ' (' . $outbarcode . ')';

-				}

-				$optlabel .= ' - ' . dol_trunc($label, $maxlengtharticle);

+					$optlabel .= ' <span class=\'opacitymedium\'>('.$objp->ref_fourn.')</span>';

+				}

+				if (!empty($conf->barcode->enabled) && !empty($objp->barcode)) {

+					$optlabel .= ' ('.$outbarcode.')';

+				}

+				$optlabel .= ' - '.dol_trunc($label, $maxlengtharticle);

@@ -3681,8 +2972,8 @@
-					$outvallabel .= ' (' . $objRefFourn . ')';

-				}

-				if (isModEnabled('barcode') && !empty($objp->barcode)) {

-					$outvallabel .= ' (' . $outbarcode . ')';

-				}

-				$outvallabel .= ' - ' . dol_trunc($label, $maxlengtharticle);

-

-				// Units

+					$outvallabel .= ' ('.$objRefFourn.')';

+				}

+				if (!empty($conf->barcode->enabled) && !empty($objp->barcode)) {

+					$outvallabel .= ' ('.$outbarcode.')';

+				}

+				$outvallabel .= ' - '.dol_trunc($label, $maxlengtharticle);

+

+                // Units

@@ -3692 +2983,2 @@
-				if (!empty($objp->idprodfournprice)) {

+				if (!empty($objp->idprodfournprice))

+				{

@@ -3695 +2987 @@
-					if (isModEnabled('dynamicprices') && !empty($objp->fk_supplier_price_expression)) {

+					if (!empty($conf->dynamicprices->enabled) && !empty($objp->fk_supplier_price_expression)) {

@@ -3702,2 +2993,0 @@
-

-						require_once DOL_DOCUMENT_ROOT . '/product/dynamic_price/class/price_parser.class.php';

@@ -3708 +2998,2 @@
-							if ($objp->quantity >= 1) {

+							if ($objp->quantity >= 1)

+							{

@@ -3713,3 +3004,4 @@
-					if ($objp->quantity == 1) {

-						$optlabel .= ' - ' . price($objp->fprice * (getDolGlobalString('DISPLAY_DISCOUNTED_SUPPLIER_PRICE') ? (1 - $objp->remise_percent / 100) : 1), 1, $langs, 0, 0, -1, $conf->currency) . "/";

-						$outvallabel .= ' - ' . price($objp->fprice * (getDolGlobalString('DISPLAY_DISCOUNTED_SUPPLIER_PRICE') ? (1 - $objp->remise_percent / 100) : 1), 0, $langs, 0, 0, -1, $conf->currency) . "/";

+					if ($objp->quantity == 1)

+					{

+						$optlabel .= ' - '.price($objp->fprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE) ? (1 - $objp->remise_percent / 100) : 1), 1, $langs, 0, 0, -1, $conf->currency)."/";

+						$outvallabel .= ' - '.price($objp->fprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE) ? (1 - $objp->remise_percent / 100) : 1), 0, $langs, 0, 0, -1, $conf->currency)."/";

@@ -3718,24 +3010,31 @@
-					} else {

-						$optlabel .= ' - ' . price($objp->fprice * (getDolGlobalString('DISPLAY_DISCOUNTED_SUPPLIER_PRICE') ? (1 - $objp->remise_percent / 100) : 1), 1, $langs, 0, 0, -1, $conf->currency) . "/" . $objp->quantity;

-						$outvallabel .= ' - ' . price($objp->fprice * (getDolGlobalString('DISPLAY_DISCOUNTED_SUPPLIER_PRICE') ? (1 - $objp->remise_percent / 100) : 1), 0, $langs, 0, 0, -1, $conf->currency) . "/" . $objp->quantity;

-						$optlabel .= ' ' . $langs->trans("Units"); // Do not use strtolower because it breaks utf8 encoding

-						$outvallabel .= ' ' . $langs->transnoentities("Units");

-					}

-

-					if ($objp->quantity > 1) {

-						$optlabel .= " (" . price($objp->unitprice * (getDolGlobalString('DISPLAY_DISCOUNTED_SUPPLIER_PRICE') ? (1 - $objp->remise_percent / 100) : 1), 1, $langs, 0, 0, -1, $conf->currency) . "/" . $langs->trans("Unit") . ")"; // Do not use strtolower because it breaks utf8 encoding

-						$outvallabel .= " (" . price($objp->unitprice * (getDolGlobalString('DISPLAY_DISCOUNTED_SUPPLIER_PRICE') ? (1 - $objp->remise_percent / 100) : 1), 0, $langs, 0, 0, -1, $conf->currency) . "/" . $langs->transnoentities("Unit") . ")"; // Do not use strtolower because it breaks utf8 encoding

-					}

-					if ($objp->remise_percent >= 1) {

-						$optlabel .= " - " . $langs->trans("Discount") . " : " . vatrate($objp->remise_percent) . ' %';

-						$outvallabel .= " - " . $langs->transnoentities("Discount") . " : " . vatrate($objp->remise_percent) . ' %';

-					}

-					if ($objp->duration) {

-						$optlabel .= " - " . $objp->duration;

-						$outvallabel .= " - " . $objp->duration;

-					}

-					if (!$socid) {

-						$optlabel .= " - " . dol_trunc($objp->name, 8);

-						$outvallabel .= " - " . dol_trunc($objp->name, 8);

-					}

-					if ($objp->supplier_reputation) {

+					}

+					else

+					{

+						$optlabel .= ' - '.price($objp->fprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE) ? (1 - $objp->remise_percent / 100) : 1), 1, $langs, 0, 0, -1, $conf->currency)."/".$objp->quantity;

+						$outvallabel .= ' - '.price($objp->fprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE) ? (1 - $objp->remise_percent / 100) : 1), 0, $langs, 0, 0, -1, $conf->currency)."/".$objp->quantity;

+						$optlabel .= ' '.$langs->trans("Units"); // Do not use strtolower because it breaks utf8 encoding

+						$outvallabel .= ' '.$langs->transnoentities("Units");

+					}

+

+					if ($objp->quantity > 1)

+					{

+						$optlabel .= " (".price($objp->unitprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE) ? (1 - $objp->remise_percent / 100) : 1), 1, $langs, 0, 0, -1, $conf->currency)."/".$langs->trans("Unit").")"; // Do not use strtolower because it breaks utf8 encoding

+						$outvallabel .= " (".price($objp->unitprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE) ? (1 - $objp->remise_percent / 100) : 1), 0, $langs, 0, 0, -1, $conf->currency)."/".$langs->transnoentities("Unit").")"; // Do not use strtolower because it breaks utf8 encoding

+					}

+					if ($objp->remise_percent >= 1)

+					{

+						$optlabel .= " - ".$langs->trans("Discount")." : ".vatrate($objp->remise_percent).' %';

+						$outvallabel .= " - ".$langs->transnoentities("Discount")." : ".vatrate($objp->remise_percent).' %';

+					}

+					if ($objp->duration)

+					{

+						$optlabel .= " - ".$objp->duration;

+						$outvallabel .= " - ".$objp->duration;

+					}

+					if (!$socid)

+					{

+						$optlabel .= " - ".dol_trunc($objp->name, 8);

+						$outvallabel .= " - ".dol_trunc($objp->name, 8);

+					}

+					if ($objp->supplier_reputation)

+					{

@@ -3743,101 +3042,34 @@
-						$reputations = array('' => $langs->trans('Standard'), 'FAVORITE' => $langs->trans('Favorite'), 'NOTTHGOOD' => $langs->trans('NotTheGoodQualitySupplier'), 'DONOTORDER' => $langs->trans('DoNotOrderThisProductToThisSupplier'));

-

-						$optlabel .= " - " . $reputations[$objp->supplier_reputation];

-						$outvallabel .= " - " . $reputations[$objp->supplier_reputation];

-					}

-				} else {

-					if (empty($alsoproductwithnosupplierprice)) {     // No supplier price defined for couple product/supplier

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

-						$outvallabel .= ' - ' . $langs->transnoentities("NoPriceDefinedForThisSupplier");

-					} else { // No supplier price defined for product, even on other suppliers

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

-						$outvallabel .= ' - ' . $langs->transnoentities("NoPriceDefinedForThisSupplier");

-					}

-				}

-

-				if (isModEnabled('stock') && $showstockinlist && isset($objp->stock) && ($objp->fk_product_type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES'))) {

-					$novirtualstock = ($showstockinlist == 2);

-

-					if ($user->hasRight('stock', 'lire')) {

-						$outvallabel .= ' - ' . $langs->trans("Stock") . ': ' . price(price2num($objp->stock, 'MS'));

-

-						if ($objp->stock > 0) {

-							$optlabel .= ' - <span class="product_line_stock_ok">';

-						} elseif ($objp->stock <= 0) {

-							$optlabel .= ' - <span class="product_line_stock_too_low">';

-						}

-						$optlabel .= $langs->transnoentities("Stock") . ':' . price(price2num($objp->stock, 'MS'));

-						$optlabel .= '</span>';

-						if (empty($novirtualstock) && getDolGlobalString('STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO')) {  // Warning, this option may slow down combo list generation

-							$langs->load("stocks");

-

-							$tmpproduct = new Product($this->db);

-							$tmpproduct->fetch($objp->rowid, '', '', '', 1, 1, 1); // Load product without lang and prices arrays (we just need to make ->virtual_stock() after)

-							$tmpproduct->load_virtual_stock();

-							$virtualstock = $tmpproduct->stock_theorique;

-

-							$outvallabel .= ' - ' . $langs->trans("VirtualStock") . ':' . $virtualstock;

-

-							$optlabel .= ' - ' . $langs->transnoentities("VirtualStock") . ':';

-							if ($virtualstock > 0) {

-								$optlabel .= '<span class="product_line_stock_ok">';

-							} elseif ($virtualstock <= 0) {

-								$optlabel .= '<span class="product_line_stock_too_low">';

-							}

-							$optlabel .= $virtualstock;

-							$optlabel .= '</span>';

-

-							unset($tmpproduct);

-						}

-					}

-				}

-

-				$optstart = '<option value="' . $outkey . '"';

-				if ($selected && $selected == $objp->idprodfournprice) {

-					$optstart .= ' selected';

-				}

-				if (empty($objp->idprodfournprice) && empty($alsoproductwithnosupplierprice)) {

-					$optstart .= ' disabled';

-				}

-

-				if (!empty($objp->idprodfournprice) && $objp->idprodfournprice > 0) {

-					$optstart .= ' data-product-id="' . dol_escape_htmltag($objp->rowid) . '"';

-					$optstart .= ' data-price-id="' . dol_escape_htmltag($objp->idprodfournprice) . '"';

-					$optstart .= ' data-qty="' . dol_escape_htmltag($objp->quantity) . '"';

-					$optstart .= ' data-up="' . dol_escape_htmltag(price2num($objp->unitprice)) . '"';

-					$optstart .= ' data-up-locale="' . dol_escape_htmltag(price($objp->unitprice)) . '"';

-					$optstart .= ' data-discount="' . dol_escape_htmltag($outdiscount) . '"';

-					$optstart .= ' data-tvatx="' . dol_escape_htmltag(price2num($objp->tva_tx)) . '"';

-					$optstart .= ' data-tvatx-formated="' . dol_escape_htmltag(price($objp->tva_tx, 0, $langs, 1, -1, 2)) . '"';

-					$optstart .= ' data-default-vat-code="' . dol_escape_htmltag($objp->default_vat_code) . '"';

-					$optstart .= ' data-supplier-ref="' . dol_escape_htmltag($objp->ref_fourn) . '"';

-				}

-				$optstart .= ' data-description="' . dol_escape_htmltag($objp->description, 0, 1) . '"';

-

-				$outarrayentry = array(

-					'key' => $outkey,

-					'value' => $outref,

-					'label' => $outvallabel,

-					'qty' => $outqty,

-					'price_qty_ht' => price2num($objp->fprice, 'MU'),    // Keep higher resolution for price for the min qty

-					'price_unit_ht' => price2num($objp->unitprice, 'MU'),    // This is used to fill the Unit Price

-					'price_ht' => price2num($objp->unitprice, 'MU'),        // This is used to fill the Unit Price (for compatibility)

-					'tva_tx_formated' => price($objp->tva_tx, 0, $langs, 1, -1, 2),

-					'tva_tx' => price2num($objp->tva_tx),

-					'default_vat_code' => $objp->default_vat_code,

-					'discount' => $outdiscount,

-					'type' => $outtype,

-					'duration_value' => $outdurationvalue,

-					'duration_unit' => $outdurationunit,

-					'disabled' => (empty($objp->idprodfournprice) ? true : false),

-					'description' => $objp->description

-				);

-

-				$parameters = array(

-					'objp' => &$objp,

-					'optstart' => &$optstart,

-					'optlabel' => &$optlabel,

-					'outvallabel' => &$outvallabel,

-					'outarrayentry' => &$outarrayentry

-				);

-				$reshook = $hookmanager->executeHooks('selectProduitsFournisseurListOption', $parameters, $this);

+						$reputations = array(''=>$langs->trans('Standard'), 'FAVORITE'=>$langs->trans('Favorite'), 'NOTTHGOOD'=>$langs->trans('NotTheGoodQualitySupplier'), 'DONOTORDER'=>$langs->trans('DoNotOrderThisProductToThisSupplier'));

+

+						$optlabel .= " - ".$reputations[$objp->supplier_reputation];

+						$outvallabel .= " - ".$reputations[$objp->supplier_reputation];

+					}

+				}

+				else

+				{

+					if (empty($alsoproductwithnosupplierprice))     // No supplier price defined for couple product/supplier

+					{

+						$optlabel .= " - <span class='opacitymedium'>".$langs->trans("NoPriceDefinedForThisSupplier").'</span>';

+						$outvallabel .= ' - '.$langs->transnoentities("NoPriceDefinedForThisSupplier");

+					}

+					else                                            // No supplier price defined for product, even on other suppliers

+					{

+						$optlabel .= " - <span class='opacitymedium'>".$langs->trans("NoPriceDefinedForThisSupplier").'</span>';

+						$outvallabel .= ' - '.$langs->transnoentities("NoPriceDefinedForThisSupplier");

+					}

+				}

+

+				$opt = '<option value="'.$outkey.'"';

+				if ($selected && $selected == $objp->idprodfournprice) $opt .= ' selected';

+				if (empty($objp->idprodfournprice) && empty($alsoproductwithnosupplierprice)) $opt .= ' disabled';

+				if (!empty($objp->idprodfournprice) && $objp->idprodfournprice > 0)

+				{

+					$opt .= ' pbq="'.$objp->idprodfournprice.'" data-pbq="'.$objp->idprodfournprice.'" data-pbqqty="'.$objp->quantity.'" data-pbqup="'.$objp->unitprice.'" data-pbqpercent="'.$objp->remise_percent.'"';

+				}

+				$opt .= ' data-html="'.dol_escape_htmltag($optlabel).'"';

+				$opt .= '>';

+

+				$opt .= $optlabel;

+				$outval .= $outvallabel;

+

+				$opt .= "</option>\n";

@@ -3847 +3079 @@
-				// "key" value of json key array is used by jQuery automatically as selected value. Example: 'type' = product or service, 'price_ht' = unit price without tax

+				// "key" value of json key array is used by jQuery automatically as selected value

@@ -3849,23 +3081,2 @@
-				$out .= $optstart . ' data-html="' . dol_escape_htmltag($optlabel) . '">' . $optlabel . "</option>\n";

-				array_push(

-					$outarray,

-					array('key' => $outkey,

-						'value' => $outref,

-						'label' => $outvallabel,

-						'qty' => $outqty,

-						'price_qty_ht' => price2num($objp->fprice, 'MU'),        // Keep higher resolution for price for the min qty

-						'price_qty_ht_locale' => price($objp->fprice),

-						'price_unit_ht' => price2num($objp->unitprice, 'MU'),    // This is used to fill the Unit Price

-						'price_unit_ht_locale' => price($objp->unitprice),

-						'price_ht' => price2num($objp->unitprice, 'MU'),        // This is used to fill the Unit Price (for compatibility)

-						'tva_tx_formated' => price($objp->tva_tx),

-						'tva_tx' => price2num($objp->tva_tx),

-						'default_vat_code' => $objp->default_vat_code,

-						'discount' => $outdiscount,

-						'type' => $outtype,

-						'duration_value' => $outdurationvalue,

-						'duration_unit' => $outdurationunit,

-						'disabled' => (empty($objp->idprodfournprice) ? true : false),

-						'description' => $objp->description

-					)

-				);

+				$out .= $opt;

+				array_push($outarray, array('key'=>$outkey, 'value'=>$outref, 'label'=>$outval, 'qty'=>$outqty, 'up'=>$objp->unitprice, 'discount'=>$outdiscount, 'type'=>$outtype, 'duration_value'=>$outdurationvalue, 'duration_unit'=>$outdurationunit, 'disabled'=>(empty($objp->idprodfournprice) ?true:false)));

@@ -3887 +3098 @@
-			include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

+			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

@@ -3889 +3100,6 @@
-		} else {

+

+			if (empty($outputmode)) return $out;

+			return $outarray;

+		}

+		else

+		{

@@ -3892,20 +3108,14 @@
-

-		if (empty($outputmode)) {

-			return $out;

-		}

-		return $outarray;

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-

-	/**

-	 *    Return list of suppliers prices for a product

-	 *

-	 * @param int $productid Id of product

-	 * @param string $htmlname Name of HTML field

-	 * @param int $selected_supplier Pre-selected supplier if more than 1 result

-	 * @return        string

-	 */

-	public function select_product_fourn_price($productid, $htmlname = 'productfournpriceid', $selected_supplier = 0)

-	{

-		// phpcs:enable

+	}

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+	/**

+	 *	Return list of suppliers prices for a product

+	 *

+	 *  @param	    int		$productid       	Id of product

+	 *  @param      string	$htmlname        	Name of HTML field

+	 *  @param      int		$selected_supplier  Pre-selected supplier if more than 1 result

+	 *  @return	    string

+	 */

+    public function select_product_fourn_price($productid, $htmlname = 'productfournpriceid', $selected_supplier = '')

+	{

+        // phpcs:enable

@@ -3919,4 +3129,4 @@
-		$sql .= " FROM " . $this->db->prefix() . "product as p";

-		$sql .= " LEFT JOIN " . $this->db->prefix() . "product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";

-		$sql .= " LEFT JOIN " . $this->db->prefix() . "societe as s ON pfp.fk_soc = s.rowid";

-		$sql .= " WHERE pfp.entity IN (" . getEntity('productsupplierprice') . ")";

+		$sql .= " FROM ".MAIN_DB_PREFIX."product as p";

+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";

+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON pfp.fk_soc = s.rowid";

+		$sql .= " WHERE pfp.entity IN (".getEntity('productsupplierprice').")";

@@ -3925,8 +3135,4 @@
-		$sql .= " AND p.rowid = " . ((int) $productid);

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

-			$sql .= " ORDER BY s.nom, pfp.ref_fourn DESC";

-		} else {

-			$sql .= " ORDER BY pfp.unitprice ASC";

-		}

-

-		dol_syslog(get_class($this) . "::select_product_fourn_price", LOG_DEBUG);

+		$sql .= " AND p.rowid = ".$productid;

+		$sql .= " ORDER BY s.nom, pfp.ref_fourn DESC";

+

+		dol_syslog(get_class($this)."::select_product_fourn_price", LOG_DEBUG);

@@ -3935 +3141,2 @@
-		if ($result) {

+		if ($result)

+		{

@@ -3938,6 +3145,9 @@
-			$form = '<select class="flat" id="select_' . $htmlname . '" name="' . $htmlname . '">';

-

-			if (!$num) {

-				$form .= '<option value="0">-- ' . $langs->trans("NoSupplierPriceDefinedForThisProduct") . ' --</option>';

-			} else {

-				require_once DOL_DOCUMENT_ROOT . '/product/dynamic_price/class/price_parser.class.php';

+			$form = '<select class="flat" id="select_'.$htmlname.'" name="'.$htmlname.'">';

+

+			if (!$num)

+			{

+				$form .= '<option value="0">-- '.$langs->trans("NoSupplierPriceDefinedForThisProduct").' --</option>';

+			}

+			else

+			{

+				require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';

@@ -3947 +3157,2 @@
-				while ($i < $num) {

+				while ($i < $num)

+				{

@@ -3950 +3161 @@
-					$opt = '<option value="' . $objp->idprodfournprice . '"';

+					$opt = '<option value="'.$objp->idprodfournprice.'"';

@@ -3952 +3163 @@
-					if ($num == 1 || ($selected_supplier > 0 && $objp->fk_soc == $selected_supplier) || ($i == 0 && getDolGlobalString('PRODUCT_BEST_SUPPLIER_PRICE_PRESELECTED'))) {

+					if ($num == 1 || ($selected_supplier > 0 && $objp->fk_soc == $selected_supplier)) {

@@ -3955,3 +3166,3 @@
-					$opt .= '>' . $objp->name . ' - ' . $objp->ref_fourn . ' - ';

-

-					if (isModEnabled('dynamicprices') && !empty($objp->fk_supplier_price_expression)) {

+					$opt .= '>'.$objp->name.' - '.$objp->ref_fourn.' - ';

+

+					if (!empty($conf->dynamicprices->enabled) && !empty($objp->fk_supplier_price_expression)) {

@@ -3964,2 +3174,0 @@
-

-						require_once DOL_DOCUMENT_ROOT . '/product/dynamic_price/class/price_parser.class.php';

@@ -3970 +3179,2 @@
-							if ($objp->quantity >= 1) {

+							if ($objp->quantity >= 1)

+							{

@@ -3975,7 +3185,9 @@
-					if ($objp->quantity == 1) {

-						$opt .= price($objp->fprice * (getDolGlobalString('DISPLAY_DISCOUNTED_SUPPLIER_PRICE') ? (1 - $objp->remise_percent / 100) : 1), 1, $langs, 0, 0, -1, $conf->currency) . "/";

-					}

-

-					$opt .= $objp->quantity . ' ';

-

-					if ($objp->quantity == 1) {

+					if ($objp->quantity == 1)

+					{

+						$opt .= price($objp->fprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE) ? (1 - $objp->remise_percent / 100) : 1), 1, $langs, 0, 0, -1, $conf->currency)."/";

+					}

+

+					$opt .= $objp->quantity.' ';

+

+					if ($objp->quantity == 1)

+					{

@@ -3983 +3195,3 @@
-					} else {

+					}

+					else

+					{

@@ -3986 +3200,2 @@
-					if ($objp->quantity > 1) {

+					if ($objp->quantity > 1)

+					{

@@ -3988,5 +3203,3 @@
-						$opt .= price($objp->unitprice * (getDolGlobalString('DISPLAY_DISCOUNTED_SUPPLIER_PRICE') ? (1 - $objp->remise_percent / 100) : 1), 1, $langs, 0, 0, -1, $conf->currency) . "/" . $langs->trans("Unit");

-					}

-					if ($objp->duration) {

-						$opt .= " - " . $objp->duration;

-					}

+						$opt .= price($objp->unitprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE) ? (1 - $objp->remise_percent / 100) : 1), 1, $langs, 0, 0, -1, $conf->currency)."/".$langs->trans("Unit");

+					}

+					if ($objp->duration) $opt .= " - ".$objp->duration;

@@ -4003 +3216,3 @@
-		} else {

+		}

+		else

+		{

@@ -4005,6 +3220,58 @@
-			return '';

-		}

-	}

-

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+		}

+	}

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+	/**

+	 *    Return list of delivery address

+	 *

+	 *    @param    string	$selected          	Id contact pre-selectionn

+	 *    @param    int		$socid				Id of company

+	 *    @param    string	$htmlname          	Name of HTML field

+	 *    @param    int		$showempty         	Add an empty field

+	 *    @return	integer|null

+	 */

+    public function select_address($selected, $socid, $htmlname = 'address_id', $showempty = 0)

+	{

+        // phpcs:enable

+		// looking for users

+		$sql = "SELECT a.rowid, a.label";

+		$sql .= " FROM ".MAIN_DB_PREFIX."societe_address as a";

+		$sql .= " WHERE a.fk_soc = ".$socid;

+		$sql .= " ORDER BY a.label ASC";

+

+		dol_syslog(get_class($this)."::select_address", LOG_DEBUG);

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

+		if ($resql)

+		{

+			print '<select class="flat" id="select_'.$htmlname.'" name="'.$htmlname.'">';

+			if ($showempty) print '<option value="0">&nbsp;</option>';

+			$num = $this->db->num_rows($resql);

+			$i = 0;

+			if ($num)

+			{

+				while ($i < $num)

+				{

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

+

+					if ($selected && $selected == $obj->rowid)

+					{

+						print '<option value="'.$obj->rowid.'" selected>'.$obj->label.'</option>';

+					}

+					else

+					{

+						print '<option value="'.$obj->rowid.'">'.$obj->label.'</option>';

+					}

+					$i++;

+				}

+			}

+			print '</select>';

+			return $num;

+		}

+		else

+		{

+			dol_print_error($this->db);

+		}

+	}

+

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -4014,5 +3281,5 @@
-	 * @return     int             Nb of lines loaded, <0 if KO

-	 */

-	public function load_cache_conditions_paiements()

-	{

-		// phpcs:enable

+	 *      @return     int             Nb of lines loaded, <0 if KO

+	 */

+    public function load_cache_conditions_paiements()

+	{

+        // phpcs:enable

@@ -4022,3 +3289 @@
-		if ($num > 0) {

-			return 0; // Cache already loaded

-		}

+		if ($num > 0) return 0; // Cache already loaded

@@ -4028,3 +3293,3 @@
-		$sql = "SELECT rowid, code, libelle as label, deposit_percent";

-		$sql .= " FROM " . $this->db->prefix() . 'c_payment_term';

-		$sql .= " WHERE entity IN (" . getEntity('c_payment_term') . ")";

+		$sql = "SELECT rowid, code, libelle as label";

+		$sql .= " FROM ".MAIN_DB_PREFIX.'c_payment_term';

+		$sql .= " WHERE entity IN (".getEntity('c_payment_term').")";

@@ -4035 +3300,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -4038 +3304,2 @@
-			while ($i < $num) {

+			while ($i < $num)

+			{

@@ -4042 +3309 @@
-				$label = ($langs->trans("PaymentConditionShort" . $obj->code) != "PaymentConditionShort" . $obj->code ? $langs->trans("PaymentConditionShort" . $obj->code) : ($obj->label != '-' ? $obj->label : ''));

+				$label = ($langs->trans("PaymentConditionShort".$obj->code) != ("PaymentConditionShort".$obj->code) ? $langs->trans("PaymentConditionShort".$obj->code) : ($obj->label != '-' ? $obj->label : ''));

@@ -4045 +3311,0 @@
-				$this->cache_conditions_paiements[$obj->rowid]['deposit_percent'] = $obj->deposit_percent;

@@ -4052 +3318,3 @@
-		} else {

+		}

+		else

+		{

@@ -4058,10 +3326,9 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-

-	/**

-	 *      Load int a cache property th elist of possible delivery delays.

-	 *

-	 * @return     int             Nb of lines loaded, <0 if KO

-	 */

-	public function load_cache_availability()

-	{

-		// phpcs:enable

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+	/**

+	 *      Charge dans cache la liste des délais de livraison possibles

+	 *

+	 *      @return     int             Nb of lines loaded, <0 if KO

+	 */

+    public function load_cache_availability()

+	{

+        // phpcs:enable

@@ -4070,4 +3337,2 @@
-		$num = count($this->cache_availability);    // TODO Use $conf->cache['availability'] instead of $this->cache_availability

-		if ($num > 0) {

-			return 0; // Cache already loaded

-		}

+		$num = count($this->cache_availability);

+		if ($num > 0) return 0; // Cache already loaded

@@ -4079,2 +3344,2 @@
-		$sql = "SELECT rowid, code, label, position";

-		$sql .= " FROM " . $this->db->prefix() . 'c_availability';

+		$sql = "SELECT rowid, code, label";

+		$sql .= " FROM ".MAIN_DB_PREFIX.'c_availability';

@@ -4084 +3349,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -4087 +3353,2 @@
-			while ($i < $num) {

+			while ($i < $num)

+			{

@@ -4091 +3358 @@
-				$label = ($langs->trans("AvailabilityType" . $obj->code) != "AvailabilityType" . $obj->code ? $langs->trans("AvailabilityType" . $obj->code) : ($obj->label != '-' ? $obj->label : ''));

+				$label = ($langs->trans("AvailabilityType".$obj->code) != ("AvailabilityType".$obj->code) ? $langs->trans("AvailabilityType".$obj->code) : ($obj->label != '-' ? $obj->label : ''));

@@ -4094 +3360,0 @@
-				$this->cache_availability[$obj->rowid]['position'] = $obj->position;

@@ -4098 +3364 @@
-			$this->cache_availability = dol_sort_array($this->cache_availability, 'position', 'asc', 0, 0, 1);

+			$this->cache_availability = dol_sort_array($this->cache_availability, 'label', 'asc', 0, 0, 1);

@@ -4101 +3367,3 @@
-		} else {

+		}

+		else

+		{

@@ -4110,8 +3378,7 @@
-	 * @param string $selected Id du type de delais pre-selectionne

-	 * @param string $htmlname Nom de la zone select

-	 * @param string $filtertype To add a filter

-	 * @param int $addempty Add empty entry

-	 * @param string $morecss More CSS

-	 * @return    void

-	 */

-	public function selectAvailabilityDelay($selected = '', $htmlname = 'availid', $filtertype = '', $addempty = 0, $morecss = '')

+	 *      @param	int		$selected        Id du type de delais pre-selectionne

+	 *      @param  string	$htmlname        Nom de la zone select

+	 *      @param  string	$filtertype      To add a filter

+	 *		@param	int		$addempty		Add empty entry

+	 *		@return	void

+	 */

+    public function selectAvailabilityDelay($selected = '', $htmlname = 'availid', $filtertype = '', $addempty = 0)

@@ -4123,13 +3390,15 @@
-		dol_syslog(__METHOD__ . " selected=" . $selected . ", htmlname=" . $htmlname, LOG_DEBUG);

-

-		print '<select id="' . $htmlname . '" class="flat' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '">';

-		if ($addempty) {

-			print '<option value="0">&nbsp;</option>';

-		}

-		foreach ($this->cache_availability as $id => $arrayavailability) {

-			if ($selected == $id) {

-				print '<option value="' . $id . '" selected>';

-			} else {

-				print '<option value="' . $id . '">';

-			}

-			print dol_escape_htmltag($arrayavailability['label']);

+		dol_syslog(__METHOD__." selected=".$selected.", htmlname=".$htmlname, LOG_DEBUG);

+

+		print '<select id="'.$htmlname.'" class="flat" name="'.$htmlname.'">';

+		if ($addempty) print '<option value="0">&nbsp;</option>';

+		foreach ($this->cache_availability as $id => $arrayavailability)

+		{

+			if ($selected == $id)

+			{

+				print '<option value="'.$id.'" selected>';

+			}

+			else

+			{

+				print '<option value="'.$id.'">';

+			}

+			print $arrayavailability['label'];

@@ -4139,4 +3408 @@
-		if ($user->admin) {

-			print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

-		}

-		print ajax_combobox($htmlname);

+		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

@@ -4148,3 +3414,3 @@
-	 * @return     int             Nb of lines loaded, <0 if KO

-	 */

-	public function loadCacheInputReason()

+	 *      @return     int             Nb of lines loaded, <0 if KO

+	 */

+    public function loadCacheInputReason()

@@ -4154,4 +3420,2 @@
-		$num = count($this->cache_demand_reason);    // TODO Use $conf->cache['input_reason'] instead of $this->cache_demand_reason

-		if ($num > 0) {

-			return 0; // Cache already loaded

-		}

+		$num = count($this->cache_demand_reason);

+		if ($num > 0) return 0; // Cache already loaded

@@ -4160 +3424 @@
-		$sql .= " FROM " . $this->db->prefix() . 'c_input_reason';

+		$sql .= " FROM ".MAIN_DB_PREFIX.'c_input_reason';

@@ -4164 +3428,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -4168 +3433,2 @@
-			while ($i < $num) {

+			while ($i < $num)

+			{

@@ -4173,8 +3439,4 @@
-				if ($langs->trans("DemandReasonType" . $obj->code) != "DemandReasonType" . $obj->code) {

-					$label = $langs->trans("DemandReasonType" . $obj->code); // So translation key DemandReasonTypeSRC_XXX will work

-				}

-				if ($langs->trans($obj->code) != $obj->code) {

-					$label = $langs->trans($obj->code); // So translation key SRC_XXX will work

-				}

-

-				$tmparray[$obj->rowid]['id'] = $obj->rowid;

+				if ($langs->trans("DemandReasonType".$obj->code) != ("DemandReasonType".$obj->code)) $label = $langs->trans("DemandReasonType".$obj->code); // So translation key DemandReasonTypeSRC_XXX will work

+				if ($langs->trans($obj->code) != $obj->code) $label = $langs->trans($obj->code); // So translation key SRC_XXX will work

+

+				$tmparray[$obj->rowid]['id']   = $obj->rowid;

@@ -4190 +3452,3 @@
-		} else {

+		}

+		else

+		{

@@ -4197 +3461 @@
-	 *    Return list of input reason (events that triggered an object creation, like after sending an emailing, making an advert, ...)

+	 *	Return list of input reason (events that triggered an object creation, like after sending an emailing, making an advert, ...)

@@ -4200,9 +3464,7 @@
-	 * @param string $selected Id or code of type origin to select by default

-	 * @param string $htmlname Nom de la zone select

-	 * @param string $exclude To exclude a code value (Example: SRC_PROP)

-	 * @param int $addempty Add an empty entry

-	 * @param string $morecss Add more css to the HTML select component

-	 * @param int $notooltip Do not show the tooltip for admin

-	 * @return    void

-	 */

-	public function selectInputReason($selected = '', $htmlname = 'demandreasonid', $exclude = '', $addempty = 0, $morecss = '', $notooltip = 0)

+	 *  @param	int		$selected        Id or code of type origin to select by default

+	 *  @param  string	$htmlname        Nom de la zone select

+	 *  @param  string	$exclude         To exclude a code value (Example: SRC_PROP)

+	 *	@param	int		$addempty		 Add an empty entry

+	 *	@return	void

+	 */

+    public function selectInputReason($selected = '', $htmlname = 'demandreasonid', $exclude = '', $addempty = 0)

@@ -4214,13 +3476,13 @@
-		print '<select class="flat' . ($morecss ? ' ' . $morecss : '') . '" id="select_' . $htmlname . '" name="' . $htmlname . '">';

-		if ($addempty) {

-			print '<option value="0"' . (empty($selected) ? ' selected' : '') . '>&nbsp;</option>';

-		}

-		foreach ($this->cache_demand_reason as $id => $arraydemandreason) {

-			if ($arraydemandreason['code'] == $exclude) {

-				continue;

-			}

-

-			if ($selected && ($selected == $arraydemandreason['id'] || $selected == $arraydemandreason['code'])) {

-				print '<option value="' . $arraydemandreason['id'] . '" selected>';

-			} else {

-				print '<option value="' . $arraydemandreason['id'] . '">';

+		print '<select class="flat" id="select_'.$htmlname.'" name="'.$htmlname.'">';

+		if ($addempty) print '<option value="0"'.(empty($selected) ? ' selected' : '').'>&nbsp;</option>';

+		foreach ($this->cache_demand_reason as $id => $arraydemandreason)

+		{

+			if ($arraydemandreason['code'] == $exclude) continue;

+

+			if ($selected && ($selected == $arraydemandreason['id'] || $selected == $arraydemandreason['code']))

+			{

+				print '<option value="'.$arraydemandreason['id'].'" selected>';

+			}

+			else

+			{

+				print '<option value="'.$arraydemandreason['id'].'">';

@@ -4233,8 +3495,4 @@
-		if ($user->admin && empty($notooltip)) {

-			print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

-		}

-		print ajax_combobox('select_' . $htmlname);

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-

+		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+	}

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -4244,5 +3502,5 @@
-	 * @return     int                 Nb of lines loaded, <0 if KO

-	 */

-	public function load_cache_types_paiements()

-	{

-		// phpcs:enable

+	 *      @return     int                 Nb of lines loaded, <0 if KO

+	 */

+    public function load_cache_types_paiements()

+	{

+        // phpcs:enable

@@ -4251,4 +3509,2 @@
-		$num = count($this->cache_types_paiements);        // TODO Use $conf->cache['payment_mode'] instead of $this->cache_types_paiements

-		if ($num > 0) {

-			return $num; // Cache already loaded

-		}

+		$num = count($this->cache_types_paiements);

+		if ($num > 0) return $num; // Cache already loaded

@@ -4261,2 +3517,3 @@
-		$sql .= " FROM " . $this->db->prefix() . "c_paiement";

-		$sql .= " WHERE entity IN (" . getEntity('c_paiement') . ")";

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

+		$sql .= " WHERE entity IN (".getEntity('c_paiement').")";

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

@@ -4265 +3522,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -4268 +3526,2 @@
-			while ($i < $num) {

+			while ($i < $num)

+			{

@@ -4272 +3531 @@
-				$label = ($langs->transnoentitiesnoconv("PaymentTypeShort" . $obj->code) != "PaymentTypeShort" . $obj->code ? $langs->transnoentitiesnoconv("PaymentTypeShort" . $obj->code) : ($obj->label != '-' ? $obj->label : ''));

+				$label = ($langs->transnoentitiesnoconv("PaymentTypeShort".$obj->code) != ("PaymentTypeShort".$obj->code) ? $langs->transnoentitiesnoconv("PaymentTypeShort".$obj->code) : ($obj->label != '-' ? $obj->label : ''));

@@ -4284 +3543,3 @@
-		} else {

+		}

+		else

+		{

@@ -4291,44 +3552,17 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-

-	/**

-	 *    print list of payment modes.

-	 *    Constant MAIN_DEFAULT_PAYMENT_TERM_ID can be used to set default value but scope is all application, probably not what you want.

-	 *    See instead to force the default value by the caller.

-	 *

-	 * @param int $selected Id of payment term to preselect by default

-	 * @param string $htmlname Nom de la zone select

-	 * @param int $filtertype If > 0, include payment terms with deposit percentage (for objects other than invoices and invoice templates)

-	 * @param int $addempty Add an empty entry

-	 * @param int $noinfoadmin 0=Add admin info, 1=Disable admin info

-	 * @param string $morecss Add more CSS on select tag

-	 * @param int	 $deposit_percent < 0 : deposit_percent input makes no sense (for example, in list filters)

-	 *                                0 : use default deposit percentage from entry

-	 *                                > 0 : force deposit percentage (for example, from company object)

-	 * @return    void

-	 * @deprecated

-	 */

-	public function select_conditions_paiements($selected = 0, $htmlname = 'condid', $filtertype = -1, $addempty = 0, $noinfoadmin = 0, $morecss = '', $deposit_percent = -1)

-	{

-		// phpcs:enable

-		print $this->getSelectConditionsPaiements($selected, $htmlname, $filtertype, $addempty, $noinfoadmin, $morecss, $deposit_percent);

-	}

-

-

-	/**

-	 *    Return list of payment modes.

-	 *    Constant MAIN_DEFAULT_PAYMENT_TERM_ID can be used to set default value but scope is all application, probably not what you want.

-	 *    See instead to force the default value by the caller.

-	 *

-	 * @param int $selected Id of payment term to preselect by default

-	 * @param string $htmlname Nom de la zone select

-	 * @param int $filtertype If > 0, include payment terms with deposit percentage (for objects other than invoices and invoice templates)

-	 * @param int $addempty Add an empty entry

-	 * @param int $noinfoadmin 0=Add admin info, 1=Disable admin info

-	 * @param string $morecss Add more CSS on select tag

-	 * @param int	 $deposit_percent < 0 : deposit_percent input makes no sense (for example, in list filters)

-	 *                                0 : use default deposit percentage from entry

-	 *                                > 0 : force deposit percentage (for example, from company object)

-	 * @return    string                        String for the HTML select component

-	 */

-	public function getSelectConditionsPaiements($selected = 0, $htmlname = 'condid', $filtertype = -1, $addempty = 0, $noinfoadmin = 0, $morecss = '', $deposit_percent = -1)

-	{

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+	/**

+	 *      Return list of payment modes.

+	 *      Constant MAIN_DEFAULT_PAYMENT_TERM_ID can used to set default value but scope is all application, probably not what you want.

+	 *      See instead to force the default value by the caller.

+	 *

+	 *      @param	int		$selected		Id of payment term to preselect by default

+	 *      @param	string	$htmlname		Nom de la zone select

+	 *      @param	int		$filtertype		Not used

+	 *		@param	int		$addempty		Add an empty entry

+	 * 		@param	int		$noinfoadmin		0=Add admin info, 1=Disable admin info

+	 * 		@param	string	$morecss			Add more CSS on select tag

+	 *		@return	void

+	 */

+    public function select_conditions_paiements($selected = 0, $htmlname = 'condid', $filtertype = -1, $addempty = 0, $noinfoadmin = 0, $morecss = '')

+	{

+        // phpcs:enable

@@ -4337,2 +3571 @@
-		$out = '';

-		dol_syslog(__METHOD__ . " selected=" . $selected . ", htmlname=" . $htmlname, LOG_DEBUG);

+		dol_syslog(__METHOD__." selected=".$selected.", htmlname=".$htmlname, LOG_DEBUG);

@@ -4343,87 +3576,41 @@
-		if (empty($selected) && getDolGlobalString('MAIN_DEFAULT_PAYMENT_TERM_ID')) {

-			dol_syslog(__METHOD__ . "Using deprecated option MAIN_DEFAULT_PAYMENT_TERM_ID", LOG_NOTICE);

-			$selected = $conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID;

-		}

-

-		$out .= '<select id="' . $htmlname . '" class="flat selectpaymentterms' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '">';

-		if ($addempty) {

-			$out .= '<option value="0">&nbsp;</option>';

-		}

-

-		$selectedDepositPercent = null;

-

-		foreach ($this->cache_conditions_paiements as $id => $arrayconditions) {

-			if ($filtertype <= 0 && !empty($arrayconditions['deposit_percent'])) {

-				continue;

-			}

-

-			if ($selected == $id) {

-				$selectedDepositPercent = $deposit_percent > 0 ? $deposit_percent : $arrayconditions['deposit_percent'];

-				$out .= '<option value="' . $id . '" data-deposit_percent="' . $arrayconditions['deposit_percent'] . '" selected>';

-			} else {

-				$out .= '<option value="' . $id . '" data-deposit_percent="' . $arrayconditions['deposit_percent'] . '">';

-			}

-			$label = $arrayconditions['label'];

-

-			if (!empty($arrayconditions['deposit_percent'])) {

-				$label = str_replace('__DEPOSIT_PERCENT__', $deposit_percent > 0 ? $deposit_percent : $arrayconditions['deposit_percent'], $label);

-			}

-

-			$out .= $label;

-			$out .= '</option>';

-		}

-		$out .= '</select>';

-		if ($user->admin && empty($noinfoadmin)) {

-			$out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

-		}

-		$out .= ajax_combobox($htmlname);

-

-		if ($deposit_percent >= 0) {

-			$out .= ' <span id="' . $htmlname . '_deposit_percent_container"' . (empty($selectedDepositPercent) ? ' style="display: none"' : '') . '>';

-			$out .= $langs->trans('DepositPercent') . ' : ';

-			$out .= '<input id="' . $htmlname . '_deposit_percent" name="' . $htmlname . '_deposit_percent" class="maxwidth50" value="' . $deposit_percent . '" />';

-			$out .= '</span>';

-			$out .= '

-				<script nonce="' . getNonce() . '">

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

-						$("#' . $htmlname . '").change(function () {

-							let $selected = $(this).find("option:selected");

-							let depositPercent = $selected.attr("data-deposit_percent");

-

-							if (depositPercent.length > 0) {

-								$("#' . $htmlname . '_deposit_percent_container").show().find("#' . $htmlname . '_deposit_percent").val(depositPercent);

-							} else {

-								$("#' . $htmlname . '_deposit_percent_container").hide();

-							}

-

-							return true;

-						});

-					});

-				</script>';

-		}

-

-		return $out;

-	}

-

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-

-	/**

-	 * Return list of payment methods

-	 * Constant MAIN_DEFAULT_PAYMENT_TYPE_ID can used to set default value but scope is all application, probably not what you want.

-	 *

-	 * @param 	string 	$selected 		Id or code or preselected payment mode

-	 * @param 	string 	$htmlname 		Name of select field

-	 * @param 	string 	$filtertype 	To filter on field type in llx_c_paiement ('CRDT' or 'DBIT' or array('code'=>xx,'label'=>zz))

-	 * @param 	int 	$format 		0=id+label, 1=code+code, 2=code+label, 3=id+code

-	 * @param 	int 	$empty 			1=can be empty, 0 otherwise

-	 * @param 	int 	$noadmininfo 	0=Add admin info, 1=Disable admin info

-	 * @param 	int 	$maxlength 		Max length of label

-	 * @param 	int 	$active 		Active or not, -1 = all

-	 * @param 	string 	$morecss 		Add more CSS on select tag

-	 * @param 	int 	$nooutput 		1=Return string, do not send to output

-	 * @return  string|void             String for the HTML select component

-	 */

-	public function select_types_paiements($selected = '', $htmlname = 'paiementtype', $filtertype = '', $format = 0, $empty = 1, $noadmininfo = 0, $maxlength = 0, $active = 1, $morecss = '', $nooutput = 0)

-	{

-		// phpcs:enable

+		if (empty($selected) && !empty($conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID)) $selected = $conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID;

+

+		print '<select id="'.$htmlname.'" class="flat selectpaymentterms'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';

+		if ($addempty) print '<option value="0">&nbsp;</option>';

+		foreach ($this->cache_conditions_paiements as $id => $arrayconditions)

+		{

+			if ($selected == $id)

+			{

+				print '<option value="'.$id.'" selected>';

+			}

+			else

+			{

+				print '<option value="'.$id.'">';

+			}

+			print $arrayconditions['label'];

+			print '</option>';

+		}

+		print '</select>';

+		if ($user->admin && empty($noinfoadmin)) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+	}

+

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+	/**

+	 *      Return list of payment methods

+	 *      Constant MAIN_DEFAULT_PAYMENT_TYPE_ID can used to set default value but scope is all application, probably not what you want.

+	 *

+	 *      @param	string	$selected       Id or code or preselected payment mode

+	 *      @param  string	$htmlname       Name of select field

+	 *      @param  string	$filtertype     To filter on field type in llx_c_paiement ('CRDT' or 'DBIT' or array('code'=>xx,'label'=>zz))

+	 *      @param  int		$format         0=id+label, 1=code+code, 2=code+label, 3=id+code

+	 *      @param  int		$empty			1=can be empty, 0 otherwise

+	 * 		@param	int		$noadmininfo	0=Add admin info, 1=Disable admin info

+	 *      @param  int		$maxlength      Max length of label

+	 *      @param  int     $active         Active or not, -1 = all

+	 *      @param  string  $morecss        Add more CSS on select tag

+	 * 		@return	void

+	 */

+    public function select_types_paiements($selected = '', $htmlname = 'paiementtype', $filtertype = '', $format = 0, $empty = 1, $noadmininfo = 0, $maxlength = 0, $active = 1, $morecss = '')

+	{

+        // phpcs:enable

@@ -4432,3 +3619 @@
-		$out = '';

-

-		dol_syslog(__METHOD__ . " " . $selected . ", " . $htmlname . ", " . $filtertype . ", " . $format, LOG_DEBUG);

+		dol_syslog(__METHOD__." ".$selected.", ".$htmlname.", ".$filtertype.", ".$format, LOG_DEBUG);

@@ -4437,7 +3622,3 @@
-		if ($filtertype == 'CRDT') {

-			$filterarray = array(0, 2, 3);

-		} elseif ($filtertype == 'DBIT') {

-			$filterarray = array(1, 2, 3);

-		} elseif ($filtertype != '' && $filtertype != '-1') {

-			$filterarray = explode(',', $filtertype);

-		}

+		if ($filtertype == 'CRDT')  	$filterarray = array(0, 2, 3);

+		elseif ($filtertype == 'DBIT') 	$filterarray = array(1, 2, 3);

+		elseif ($filtertype != '' && $filtertype != '-1') $filterarray = explode(',', $filtertype);

@@ -4448,10 +3629,6 @@
-		if (empty($selected) && getDolGlobalString('MAIN_DEFAULT_PAYMENT_TYPE_ID')) {

-			dol_syslog(__METHOD__ . "Using deprecated option MAIN_DEFAULT_PAYMENT_TYPE_ID", LOG_NOTICE);

-			$selected = $conf->global->MAIN_DEFAULT_PAYMENT_TYPE_ID;

-		}

-

-		$out .= '<select id="select' . $htmlname . '" class="flat selectpaymenttypes' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '">';

-		if ($empty) {

-			$out .= '<option value="">&nbsp;</option>';

-		}

-		foreach ($this->cache_types_paiements as $id => $arraytypes) {

+		if (empty($selected) && !empty($conf->global->MAIN_DEFAULT_PAYMENT_TYPE_ID)) $selected = $conf->global->MAIN_DEFAULT_PAYMENT_TYPE_ID;

+

+		print '<select id="select'.$htmlname.'" class="flat selectpaymenttypes'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';

+		if ($empty) print '<option value="">&nbsp;</option>';

+		foreach ($this->cache_types_paiements as $id => $arraytypes)

+		{

@@ -4459,3 +3636 @@
-			if ($active >= 0 && $arraytypes['active'] != $active) {

-				continue;

-			}

+			if ($active >= 0 && $arraytypes['active'] != $active) continue;

@@ -4464,3 +3639 @@
-			if (count($filterarray) && !in_array($arraytypes['type'], $filterarray)) {

-				continue;

-			}

+			if (count($filterarray) && !in_array($arraytypes['type'], $filterarray)) continue;

@@ -4469,13 +3642,6 @@
-			if ($empty && empty($arraytypes['code'])) {

-				continue;

-			}

-

-			if ($format == 0) {

-				$out .= '<option value="' . $id . '"';

-			} elseif ($format == 1) {

-				$out .= '<option value="' . $arraytypes['code'] . '"';

-			} elseif ($format == 2) {

-				$out .= '<option value="' . $arraytypes['code'] . '"';

-			} elseif ($format == 3) {

-				$out .= '<option value="' . $id . '"';

-			}

+			if ($empty && empty($arraytypes['code'])) continue;

+

+			if ($format == 0) print '<option value="'.$id.'"';

+			elseif ($format == 1) print '<option value="'.$arraytypes['code'].'"';

+			elseif ($format == 2) print '<option value="'.$arraytypes['code'].'"';

+			elseif ($format == 3) print '<option value="'.$id.'"';

@@ -4484,3 +3650 @@
-				if ($selected == $arraytypes['code']) {

-					$out .= ' selected';

-				}

+				if ($selected == $arraytypes['code']) print ' selected';

@@ -4488,165 +3652 @@
-				if ($selected == $id) {

-					$out .= ' selected';

-				}

-			}

-			$out .= '>';

-			$value = '';

-			if ($format == 0) {

-				$value = ($maxlength ? dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);

-			} elseif ($format == 1) {

-				$value = $arraytypes['code'];

-			} elseif ($format == 2) {

-				$value = ($maxlength ? dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);

-			} elseif ($format == 3) {

-				$value = $arraytypes['code'];

-			}

-			$out .= $value ? $value : '&nbsp;';

-			$out .= '</option>';

-		}

-		$out .= '</select>';

-		if ($user->admin && !$noadmininfo) {

-			$out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

-		}

-		$out .= ajax_combobox('select' . $htmlname);

-

-		if (empty($nooutput)) {

-			print $out;

-		} else {

-			return $out;

-		}

-	}

-

-

-	/**

-	 *  Selection HT or TTC

-	 *

-	 * @param string $selected Id pre-selectionne

-	 * @param string $htmlname Nom de la zone select

-	 * @param int	 $addjscombo Add js combo

-	 * @return    string                    Code of HTML select to chose tax or not

-	 */

-	public function selectPriceBaseType($selected = '', $htmlname = 'price_base_type', $addjscombo = 0)

-	{

-		global $langs;

-

-		$return = '<select class="flat maxwidth100" id="select_' . $htmlname . '" name="' . $htmlname . '">';

-		$options = array(

-			'HT' => $langs->trans("HT"),

-			'TTC' => $langs->trans("TTC")

-		);

-		foreach ($options as $id => $value) {

-			if ($selected == $id) {

-				$return .= '<option value="' . $id . '" selected>' . $value;

-			} else {

-				$return .= '<option value="' . $id . '">' . $value;

-			}

-			$return .= '</option>';

-		}

-		$return .= '</select>';

-		if ($addjscombo) {

-			$return .= ajax_combobox('select_' . $htmlname);

-		}

-

-		return $return;

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-

-	/**

-	 *      Load in cache list of transport mode

-	 *

-	 * @return     int                 Nb of lines loaded, <0 if KO

-	 */

-	public function load_cache_transport_mode()

-	{

-		// phpcs:enable

-		global $langs;

-

-		$num = count($this->cache_transport_mode);        // TODO Use $conf->cache['payment_mode'] instead of $this->cache_transport_mode

-		if ($num > 0) {

-			return $num; // Cache already loaded

-		}

-

-		dol_syslog(__METHOD__, LOG_DEBUG);

-

-		$this->cache_transport_mode = array();

-

-		$sql = "SELECT rowid, code, label, active";

-		$sql .= " FROM " . $this->db->prefix() . "c_transport_mode";

-		$sql .= " WHERE entity IN (" . getEntity('c_transport_mode') . ")";

-

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

-		if ($resql) {

-			$num = $this->db->num_rows($resql);

-			$i = 0;

-			while ($i < $num) {

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

-

-				// If traduction exist, we use it else we take the default label

-				$label = ($langs->transnoentitiesnoconv("PaymentTypeShort" . $obj->code) != "PaymentTypeShort" . $obj->code ? $langs->transnoentitiesnoconv("PaymentTypeShort" . $obj->code) : ($obj->label != '-' ? $obj->label : ''));

-				$this->cache_transport_mode[$obj->rowid]['rowid'] = $obj->rowid;

-				$this->cache_transport_mode[$obj->rowid]['code'] = $obj->code;

-				$this->cache_transport_mode[$obj->rowid]['label'] = $label;

-				$this->cache_transport_mode[$obj->rowid]['active'] = $obj->active;

-				$i++;

-			}

-

-			$this->cache_transport_mode = dol_sort_array($this->cache_transport_mode, 'label', 'asc', 0, 0, 1);

-

-			return $num;

-		} else {

-			dol_print_error($this->db);

-			return -1;

-		}

-	}

-

-	/**

-	 *      Return list of transport mode for intracomm report

-	 *

-	 * @param string $selected Id of the transport mode pre-selected

-	 * @param string $htmlname Name of the select field

-	 * @param int $format 0=id+label, 1=code+code, 2=code+label, 3=id+code

-	 * @param int $empty 1=can be empty, 0 else

-	 * @param int $noadmininfo 0=Add admin info, 1=Disable admin info

-	 * @param int $maxlength Max length of label

-	 * @param int $active Active or not, -1 = all

-	 * @param string $morecss Add more CSS on select tag

-	 * @return    void

-	 */

-	public function selectTransportMode($selected = '', $htmlname = 'transportmode', $format = 0, $empty = 1, $noadmininfo = 0, $maxlength = 0, $active = 1, $morecss = '')

-	{

-		global $langs, $user;

-

-		dol_syslog(__METHOD__ . " " . $selected . ", " . $htmlname . ", " . $format, LOG_DEBUG);

-

-		$this->load_cache_transport_mode();

-

-		print '<select id="select' . $htmlname . '" class="flat selectmodetransport' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '">';

-		if ($empty) {

-			print '<option value="">&nbsp;</option>';

-		}

-		foreach ($this->cache_transport_mode as $id => $arraytypes) {

-			// If not good status

-			if ($active >= 0 && $arraytypes['active'] != $active) {

-				continue;

-			}

-

-			// We discard empty line if showempty is on because an empty line has already been output.

-			if ($empty && empty($arraytypes['code'])) {

-				continue;

-			}

-

-			if ($format == 0) {

-				print '<option value="' . $id . '"';

-			} elseif ($format == 1) {

-				print '<option value="' . $arraytypes['code'] . '"';

-			} elseif ($format == 2) {

-				print '<option value="' . $arraytypes['code'] . '"';

-			} elseif ($format == 3) {

-				print '<option value="' . $id . '"';

-			}

-			// If text is selected, we compare with code, else with id

-			if (preg_match('/[a-z]/i', $selected) && $selected == $arraytypes['code']) {

-				print ' selected';

-			} elseif ($selected == $id) {

-				print ' selected';

+				if ($selected == $id) print ' selected';

@@ -4655,10 +3655,4 @@
-			$value = '';

-			if ($format == 0) {

-				$value = ($maxlength ? dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);

-			} elseif ($format == 1) {

-				$value = $arraytypes['code'];

-			} elseif ($format == 2) {

-				$value = ($maxlength ? dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);

-			} elseif ($format == 3) {

-				$value = $arraytypes['code'];

-			}

+			if ($format == 0) $value = ($maxlength ?dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);

+			elseif ($format == 1) $value = $arraytypes['code'];

+			elseif ($format == 2) $value = ($maxlength ?dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);

+			elseif ($format == 3) $value = $arraytypes['code'];

@@ -4669,20 +3663,52 @@
-		if ($user->admin && !$noadmininfo) {

-			print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

-		}

-	}

-

-	/**

-	 * Return a HTML select list of shipping mode

-	 *

-	 * @param string 	$selected 		Id shipping mode pre-selected

-	 * @param string 	$htmlname 		Name of select zone

-	 * @param string 	$filtre 		To filter list. This parameter must not come from input of users

-	 * @param int 		$useempty 		1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.

-	 * @param string 	$moreattrib 	To add more attribute on select

-	 * @param int 		$noinfoadmin 	0=Add admin info, 1=Disable admin info

-	 * @param string 	$morecss 		More CSS

-	 * @return void

-	 */

-	public function selectShippingMethod($selected = '', $htmlname = 'shipping_method_id', $filtre = '', $useempty = 0, $moreattrib = '', $noinfoadmin = 0, $morecss = '')

-	{

-		global $langs, $user;

+		if ($user->admin && !$noadmininfo) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+	}

+

+

+	/**

+	 *  Selection HT or TTC

+	 *

+	 *  @param	string	$selected       Id pre-selectionne

+	 *  @param  string	$htmlname       Nom de la zone select

+	 * 	@return	string					Code of HTML select to chose tax or not

+	 */

+    public function selectPriceBaseType($selected = '', $htmlname = 'price_base_type')

+	{

+		global $langs;

+

+		$return = '';

+

+		$return .= '<select class="flat maxwidth75" id="select_'.$htmlname.'" name="'.$htmlname.'">';

+		$options = array(

+			'HT'=>$langs->trans("HT"),

+			'TTC'=>$langs->trans("TTC")

+		);

+		foreach ($options as $id => $value)

+		{

+			if ($selected == $id)

+			{

+				$return .= '<option value="'.$id.'" selected>'.$value;

+			}

+			else

+			{

+				$return .= '<option value="'.$id.'">'.$value;

+			}

+			$return .= '</option>';

+		}

+		$return .= '</select>';

+

+		return $return;

+	}

+

+	/**

+	 *  Return a HTML select list of shipping mode

+	 *

+	 *  @param	string	$selected          Id shipping mode pre-selected

+	 *  @param  string	$htmlname          Name of select zone

+	 *  @param  string	$filtre            To filter list

+	 *  @param  int		$useempty          1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.

+	 *  @param  string	$moreattrib        To add more attribute on select

+	 * 	@return	void

+	 */

+    public function selectShippingMethod($selected = '', $htmlname = 'shipping_method_id', $filtre = '', $useempty = 0, $moreattrib = '')

+	{

+		global $langs, $conf, $user;

@@ -4694 +3720 @@
-		$sql .= " FROM " . $this->db->prefix() . "c_shipment_mode";

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

@@ -4696,3 +3722 @@
-		if ($filtre) {

-			$sql .= " AND " . $filtre;

-		}

+		if ($filtre) $sql .= " AND ".$filtre;

@@ -4701 +3725 @@
-		dol_syslog(get_class($this) . "::selectShippingMode", LOG_DEBUG);

+		dol_syslog(get_class($this)."::selectShippingMode", LOG_DEBUG);

@@ -4707 +3731 @@
-				print '<select id="select' . $htmlname . '" class="flat selectshippingmethod' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '"' . ($moreattrib ? ' ' . $moreattrib : '') . '>';

+				print '<select id="select'.$htmlname.'" class="flat selectshippingmethod" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';

@@ -4714 +3738 @@
-						print '<option value="' . $obj->rowid . '" selected>';

+						print '<option value="'.$obj->rowid.'" selected>';

@@ -4716,3 +3740,3 @@
-						print '<option value="' . $obj->rowid . '">';

-					}

-					print ($langs->trans("SendingMethod" . strtoupper($obj->code)) != "SendingMethod" . strtoupper($obj->code)) ? $langs->trans("SendingMethod" . strtoupper($obj->code)) : $obj->label;

+						print '<option value="'.$obj->rowid.'">';

+					}

+					print ($langs->trans("SendingMethod".strtoupper($obj->code)) != "SendingMethod".strtoupper($obj->code)) ? $langs->trans("SendingMethod".strtoupper($obj->code)) : $obj->label;

@@ -4723,5 +3747 @@
-				if ($user->admin && empty($noinfoadmin)) {

-					print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

-				}

-

-				print ajax_combobox('select' . $htmlname);

+				if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

@@ -4739,9 +3759,9 @@
-	 * @param string $page Page

-	 * @param string $selected Id of shipping mode

-	 * @param string $htmlname Name of select html field

-	 * @param int $addempty 1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.

-	 * @return    void

-	 */

-	public function formSelectShippingMethod($page, $selected = '', $htmlname = 'shipping_method_id', $addempty = 0)

-	{

-		global $langs;

+	 *    @param	string	$page        Page

+	 *    @param    int		$selected    Id of shipping mode

+	 *    @param    string	$htmlname    Name of select html field

+	 *    @param    int		$addempty    1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.

+	 *    @return	void

+	 */

+    public function formSelectShippingMethod($page, $selected = '', $htmlname = 'shipping_method_id', $addempty = 0)

+	{

+		global $langs, $db;

@@ -4752 +3772 @@
-			print '<form method="POST" action="' . $page . '">';

+			print '<form method="POST" action="'.$page.'">';

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

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

@@ -4756 +3776 @@
-			print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("Modify") . '">';

+			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';

@@ -4760,2 +3780,2 @@
-				$code = $langs->getLabelFromKey($this->db, $selected, 'c_shipment_mode', 'rowid', 'code');

-				print $langs->trans("SendingMethod" . strtoupper($code));

+				$code = $langs->getLabelFromKey($db, $selected, 'c_shipment_mode', 'rowid', 'code');

+				print $langs->trans("SendingMethod".strtoupper($code));

@@ -4771,2 +3791,2 @@
-	 * @param string $selected Preselected ID

-	 * @param int $socid Company ID

+	 * @param     string  $selected   		Preselected ID

+	 * @param     int     $socid      		Company ID

@@ -4776 +3796 @@
-	public function selectSituationInvoices($selected = '', $socid = 0)

+    public function selectSituationInvoices($selected = '', $socid = 0)

@@ -4782,4 +3802,4 @@
-		$opt = '<option value="" selected></option>';

-		$sql = "SELECT rowid, ref, situation_cycle_ref, situation_counter, situation_final, fk_soc";

-		$sql .= ' FROM ' . $this->db->prefix() . 'facture';

-		$sql .= ' WHERE entity IN (' . getEntity('invoice') . ')';

+		$opt = '<option value ="" selected></option>';

+		$sql = 'SELECT rowid, ref, situation_cycle_ref, situation_counter, situation_final, fk_soc';

+		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture';

+		$sql .= ' WHERE entity IN ('.getEntity('invoice').')';

@@ -4787 +3806,0 @@
-		$sql .= ' AND fk_soc = ' . (int) $socid;

@@ -4791 +3809,0 @@
-

@@ -4796,12 +3814,15 @@
-				//Same cycle ?

-				if ($obj->situation_cycle_ref != $ref) {

-					// Just seen this cycle

-					$ref = $obj->situation_cycle_ref;

-					//not final ?

-					if ($obj->situation_final != 1) {

-						//Not prov?

-						if (substr($obj->ref, 1, 4) != 'PROV') {

-							if ($selected == $obj->rowid) {

-								$opt .= '<option value="' . $obj->rowid . '" selected>' . $obj->ref . '</option>';

-							} else {

-								$opt .= '<option value="' . $obj->rowid . '">' . $obj->ref . '</option>';

+				//Same company ?

+			    if ($socid == $obj->fk_soc) {

+					//Same cycle ?

+			        if ($obj->situation_cycle_ref != $ref) {

+						// Just seen this cycle

+			            $ref = $obj->situation_cycle_ref;

+						//not final ?

+			            if ($obj->situation_final != 1) {

+							//Not prov?

+			                if (substr($obj->ref, 1, 4) != 'PROV') {

+			                    if ($selected == $obj->rowid) {

+			                        $opt .= '<option value="'.$obj->rowid.'" selected>'.$obj->ref.'</option>';

+								} else {

+								    $opt .= '<option value="'.$obj->rowid.'">'.$obj->ref.'</option>';

+								}

@@ -4813,5 +3834,8 @@
-		} else {

-			dol_syslog("Error sql=" . $sql . ", error=" . $this->error, LOG_ERR);

-		}

-		if ($opt == '<option value ="" selected></option>') {

-			$opt = '<option value ="0" selected>' . $langs->trans('NoSituations') . '</option>';

+		}

+		else

+		{

+				dol_syslog("Error sql=".$sql.", error=".$this->error, LOG_ERR);

+		}

+		if ($opt == '<option value ="" selected></option>')

+		{

+			$opt = '<option value ="0" selected>'.$langs->trans('NoSituations').'</option>';

@@ -4825,7 +3849,6 @@
-	 * @param string $selected Preselected Unit ID

-	 * @param string $htmlname Select name

-	 * @param int $showempty Add a nempty line

-	 * @param string $unit_type Restrict to one given unit type

-	 * @return    string                  HTML select

-	 */

-	public function selectUnits($selected = '', $htmlname = 'units', $showempty = 0, $unit_type = '')

+	 *      @param	string	$selected       Preselected Unit ID

+	 *      @param  string	$htmlname       Select name

+	 *      @param	int		$showempty		Add a nempty line

+	 * 		@return	string                  HTML select

+	 */

+    public function selectUnits($selected = '', $htmlname = 'units', $showempty = 0)

@@ -4837,3 +3860,3 @@
-		$return = '<select class="flat" id="' . $htmlname . '" name="' . $htmlname . '">';

-

-		$sql = "SELECT rowid, label, code FROM " . $this->db->prefix() . "c_units";

+		$return = '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';

+

+		$sql = 'SELECT rowid, label, code from '.MAIN_DB_PREFIX.'c_units';

@@ -4841,4 +3863,0 @@
-		if (!empty($unit_type)) {

-			$sql .= " AND unit_type = '" . $this->db->escape($unit_type) . "'";

-		}

-		$sql .= " ORDER BY sortorder";

@@ -4847,15 +3866,19 @@
-		if ($resql && $this->db->num_rows($resql) > 0) {

-			if ($showempty) {

-				$return .= '<option value="none"></option>';

-			}

-

-			while ($res = $this->db->fetch_object($resql)) {

-				$unitLabel = $res->label;

-				if (!empty($langs->tab_translate['unit' . $res->code])) {    // check if Translation is available before

-					$unitLabel = $langs->trans('unit' . $res->code) != $res->label ? $langs->trans('unit' . $res->code) : $res->label;

-				}

-

-				if ($selected == $res->rowid) {

-					$return .= '<option value="' . $res->rowid . '" selected>' . $unitLabel . '</option>';

-				} else {

-					$return .= '<option value="' . $res->rowid . '">' . $unitLabel . '</option>';

+		if ($resql && $this->db->num_rows($resql) > 0)

+		{

+			if ($showempty) $return .= '<option value="none"></option>';

+

+			while ($res = $this->db->fetch_object($resql))

+			{

+			    $unitLabel = $res->label;

+			    if (!empty($langs->tab_translate['unit'.$res->code]))	// check if Translation is available before

+			    {

+			        $unitLabel = $langs->trans('unit'.$res->code) != $res->label ? $langs->trans('unit'.$res->code) : $res->label;

+			    }

+

+				if ($selected == $res->rowid)

+				{

+				    $return .= '<option value="'.$res->rowid.'" selected>'.$unitLabel.'</option>';

+				}

+				else

+				{

+				    $return .= '<option value="'.$res->rowid.'">'.$unitLabel.'</option>';

@@ -4869,2 +3892 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -4874,14 +3896,13 @@
-	 * @param string 	$selected 		Id account pre-selected

-	 * @param string 	$htmlname 		Name of select zone

-	 * @param int 		$status 		Status of searched accounts (0=open, 1=closed, 2=both)

-	 * @param string 	$filtre 		To filter list. This parameter must not come from input of users

-	 * @param int 		$useempty 		1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.

-	 * @param string 	$moreattrib 	To add more attribute on select

-	 * @param int 		$showcurrency 	Show currency in label

-	 * @param string 	$morecss 		More CSS

-	 * @param int 		$nooutput 		1=Return string, do not send to output

-	 * @return int                   	Return integer <0 if error, Num of bank account found if OK (0, 1, 2, ...)

-	 */

-	public function select_comptes($selected = '', $htmlname = 'accountid', $status = 0, $filtre = '', $useempty = 0, $moreattrib = '', $showcurrency = 0, $morecss = '', $nooutput = 0)

-	{

-		// phpcs:enable

+	 *  @param	string	$selected           Id account pre-selected

+	 *  @param  string	$htmlname           Name of select zone

+	 *  @param  int		$status             Status of searched accounts (0=open, 1=closed, 2=both)

+	 *  @param  string	$filtre             To filter list

+	 *  @param  int		$useempty           1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.

+	 *  @param  string	$moreattrib         To add more attribute on select

+	 *  @param	int		$showcurrency		Show currency in label

+	 *  @param	string	$morecss			More CSS

+	 * 	@return	int							<0 if error, Num of bank account found if OK (0, 1, 2, ...)

+	 */

+    public function select_comptes($selected = '', $htmlname = 'accountid', $status = 0, $filtre = '', $useempty = 0, $moreattrib = '', $showcurrency = 0, $morecss = '')

+	{

+        // phpcs:enable

@@ -4889,2 +3909,0 @@
-

-		$out = '';

@@ -4896,8 +3915,4 @@
-		$sql .= " FROM " . $this->db->prefix() . "bank_account";

-		$sql .= " WHERE entity IN (" . getEntity('bank_account') . ")";

-		if ($status != 2) {

-			$sql .= " AND clos = " . (int) $status;

-		}

-		if ($filtre) {

-			$sql .= " AND " . $filtre;

-		}

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

+		$sql .= " WHERE entity IN (".getEntity('bank_account').")";

+		if ($status != 2) $sql .= " AND clos = ".(int) $status;

+		if ($filtre) $sql .= " AND ".$filtre;

@@ -4906 +3921 @@
-		dol_syslog(get_class($this) . "::select_comptes", LOG_DEBUG);

+		dol_syslog(get_class($this)."::select_comptes", LOG_DEBUG);

@@ -4908 +3923,2 @@
-		if ($result) {

+		if ($result)

+		{

@@ -4911,7 +3927,10 @@
-			if ($num) {

-				$out .= '<select id="select' . $htmlname . '" class="flat selectbankaccount' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '"' . ($moreattrib ? ' ' . $moreattrib : '') . '>';

-				if ($useempty == 1 || ($useempty == 2 && $num > 1)) {

-					$out .= '<option value="-1">&nbsp;</option>';

-				}

-

-				while ($i < $num) {

+			if ($num)

+			{

+				print '<select id="select'.$htmlname.'" class="flat selectbankaccount'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';

+				if ($useempty == 1 || ($useempty == 2 && $num > 1))

+				{

+					print '<option value="-1">&nbsp;</option>';

+				}

+

+				while ($i < $num)

+				{

@@ -4919,13 +3938,12 @@
-					if ($selected == $obj->rowid || ($useempty == 2 && $num == 1 && empty($selected))) {

-						$out .= '<option value="' . $obj->rowid . '" data-currency-code="' . $obj->currency_code . '" selected>';

-					} else {

-						$out .= '<option value="' . $obj->rowid . '" data-currency-code="' . $obj->currency_code . '">';

-					}

-					$out .= trim($obj->label);

-					if ($showcurrency) {

-						$out .= ' (' . $obj->currency_code . ')';

-					}

-					if ($status == 2 && $obj->status == 1) {

-						$out .= ' (' . $langs->trans("Closed") . ')';

-					}

-					$out .= '</option>';

+					if ($selected == $obj->rowid)

+					{

+						print '<option value="'.$obj->rowid.'" selected>';

+					}

+					else

+					{

+						print '<option value="'.$obj->rowid.'">';

+					}

+					print trim($obj->label);

+					if ($showcurrency) print ' ('.$obj->currency_code.')';

+					if ($status == 2 && $obj->status == 1) print ' ('.$langs->trans("Closed").')';

+					print '</option>';

@@ -4934,10 +3952,9 @@
-				$out .= "</select>";

-				$out .= ajax_combobox('select' . $htmlname);

-			} else {

-				if ($status == 0) {

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

-				} else {

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

-				}

-			}

-		} else {

+				print "</select>";

+			}

+			else

+			{

+				if ($status == 0) print '<span class="opacitymedium">'.$langs->trans("NoActiveBankAccountDefined").'</span>';

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

+			}

+		}

+		else {

@@ -4947,7 +3963,0 @@
-		// Output or return

-		if (empty($nooutput)) {

-			print $out;

-		} else {

-			return $out;

-		}

-

@@ -4960,7 +3970,7 @@
-	 * @param string $selected Id establishment pre-selected

-	 * @param string $htmlname Name of select zone

-	 * @param int $status Status of searched establishment (0=open, 1=closed, 2=both)

-	 * @param string $filtre To filter list. This parameter must not come from input of users

-	 * @param int $useempty 1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.

-	 * @param string $moreattrib To add more attribute on select

-	 * @return    int                            Return integer <0 if error, Num of establishment found if OK (0, 1, 2, ...)

+	 *  @param	string	$selected           Id establishment pre-selected

+	 *  @param  string	$htmlname           Name of select zone

+	 *  @param  int		$status             Status of searched establishment (0=open, 1=closed, 2=both)

+	 *  @param  string	$filtre             To filter list

+	 *  @param  int		$useempty           1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.

+	 *  @param  string	$moreattrib         To add more attribute on select

+	 * 	@return	int							<0 if error, Num of establishment found if OK (0, 1, 2, ...)

@@ -4969,0 +3980 @@
+        // phpcs:enable

@@ -4976 +3987 @@
-		$sql .= " FROM " . $this->db->prefix() . "establishment";

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

@@ -4978,6 +3989,2 @@
-		if ($status != 2) {

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

-		}

-		if ($filtre) {

-			$sql .= " AND " . $filtre;

-		}

+		if ($status != 2) $sql .= " AND status = ".(int) $status;

+		if ($filtre) $sql .= " AND ".$filtre;

@@ -4986 +3993 @@
-		dol_syslog(get_class($this) . "::select_establishment", LOG_DEBUG);

+		dol_syslog(get_class($this)."::select_establishment", LOG_DEBUG);

@@ -4988 +3995,2 @@
-		if ($result) {

+		if ($result)

+		{

@@ -4991,3 +3999,5 @@
-			if ($num) {

-				print '<select id="select' . $htmlname . '" class="flat selectestablishment" name="' . $htmlname . '"' . ($moreattrib ? ' ' . $moreattrib : '') . '>';

-				if ($useempty == 1 || ($useempty == 2 && $num > 1)) {

+			if ($num)

+			{

+				print '<select id="select'.$htmlname.'" class="flat selectestablishment" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';

+				if ($useempty == 1 || ($useempty == 2 && $num > 1))

+				{

@@ -4997 +4007,2 @@
-				while ($i < $num) {

+				while ($i < $num)

+				{

@@ -4999,4 +4010,7 @@
-					if ($selected == $obj->rowid) {

-						print '<option value="' . $obj->rowid . '" selected>';

-					} else {

-						print '<option value="' . $obj->rowid . '">';

+					if ($selected == $obj->rowid)

+					{

+						print '<option value="'.$obj->rowid.'" selected>';

+					}

+					else

+					{

+						print '<option value="'.$obj->rowid.'">';

@@ -5005,3 +4019 @@
-					if ($status == 2 && $obj->status == 1) {

-						print ' (' . $langs->trans("Closed") . ')';

-					}

+					if ($status == 2 && $obj->status == 1) print ' ('.$langs->trans("Closed").')';

@@ -5012,10 +4024,8 @@
-			} else {

-				if ($status == 0) {

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

-				} else {

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

-				}

-			}

-

-			return $num;

-		} else {

+			}

+			else

+			{

+				if ($status == 0) print '<span class="opacitymedium">'.$langs->trans("NoActiveEstablishmentDefined").'</span>';

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

+			}

+		}

+		else {

@@ -5023 +4032,0 @@
-			return -1;

@@ -5030,7 +4039,7 @@
-	 * @param string $page Page

-	 * @param string $selected Id of bank account

-	 * @param string $htmlname Name of select html field

-	 * @param int $addempty 1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.

-	 * @return    void

-	 */

-	public function formSelectAccount($page, $selected = '', $htmlname = 'fk_account', $addempty = 0)

+	 *    @param	string	$page        Page

+	 *    @param    int		$selected    Id of bank account

+	 *    @param    string	$htmlname    Name of select html field

+	 *    @param    int		$addempty    1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.

+	 *    @return	void

+	 */

+    public function formSelectAccount($page, $selected = '', $htmlname = 'fk_account', $addempty = 0)

@@ -5040 +4049 @@
-			print '<form method="POST" action="' . $page . '">';

+			print '<form method="POST" action="'.$page.'">';

@@ -5042,2 +4051 @@
-			print '<input type="hidden" name="token" value="' . newToken() . '">';

-			print img_picto('', 'bank_account', 'class="pictofixedwidth"');

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

@@ -5045,3 +4053 @@
-			if ($nbaccountfound > 0) {

-				print '<input type="submit" class="button smallpaddingimp valignmiddle" value="' . $langs->trans("Modify") . '">';

-			}

+			if ($nbaccountfound > 0) print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';

@@ -5053 +4059 @@
-				require_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';

+				require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';

@@ -5056,3 +4062 @@
-				if ($result) {

-					print $bankstatic->getNomUrl(1);

-				}

+				if ($result) print $bankstatic->getNomUrl(1);

@@ -5065,23 +4069,22 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-

-	/**

-	 * Return list of categories having choosed type

-	 *

-	 * @param 	string|int 			$type 			Type of category ('customer', 'supplier', 'contact', 'product', 'member'). Old mode (0, 1, 2, ...) is deprecated.

-	 * @param 	string 				$selected 		Id of category preselected or 'auto' (autoselect category if there is only one element). Not used if $outputmode = 1.

-	 * @param 	string 				$htmlname 		HTML field name

-	 * @param 	int 				$maxlength 		Maximum length for labels

-	 * @param 	int|string|array	$markafterid 	Keep only or removed all categories including the leaf $markafterid in category tree (exclude) or Keep only of category is inside the leaf starting with this id.

-	 *                             	    	     	$markafterid can be an :

-	 *                                 	    	 	- int (id of category)

-	 *                                 		 		- string (categories ids seprated by comma)

-	 * 	                                  	 		- array (list of categories ids)

-	 * @param 	int 				$outputmode 	0=HTML select string, 1=Array with full label only, 2=Array extended, 3=Array with full picto + label

-	 * @param 	int 				$include 		[=0] Removed or 1=Keep only

-	 * @param 	string 				$morecss 		More CSS

-	 * @return  string|array						String list or Array of categories

-	 * @see select_categories()

-	 */

-	public function select_all_categories($type, $selected = '', $htmlname = "parent", $maxlength = 64, $markafterid = 0, $outputmode = 0, $include = 0, $morecss = '')

-	{

-		// phpcs:enable

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+	/**

+	 *    Return list of categories having choosed type

+	 *

+	 *    @param	string|int	            $type				Type of category ('customer', 'supplier', 'contact', 'product', 'member'). Old mode (0, 1, 2, ...) is deprecated.

+	 *    @param    string		            $selected    		Id of category preselected or 'auto' (autoselect category if there is only one element)

+	 *    @param    string		            $htmlname			HTML field name

+	 *    @param    int			            $maxlength      	Maximum length for labels

+     *    @param    int|string|array    	$markafterid        Keep only or removed all categories including the leaf $markafterid in category tree (exclude) or Keep only of category is inside the leaf starting with this id.

+     *                                                          $markafterid can be an :

+     *                                                          - int (id of category)

+     *                                                          - string (categories ids seprated by comma)

+     *                                                          - array (list of categories ids)

+	 *    @param	int			            $outputmode			0=HTML select string, 1=Array

+     *    @param	int			            $include			[=0] Removed or 1=Keep only

+     *    @param	string					$morecss			More CSS

+	 *    @return	string

+	 *    @see select_categories()

+	 */

+    public function select_all_categories($type, $selected = '', $htmlname = "parent", $maxlength = 64, $markafterid = 0, $outputmode = 0, $include = 0, $morecss = '')

+	{

+        // phpcs:enable

@@ -5091 +4094 @@
-		include_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';

+		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';

@@ -5094,5 +4097,7 @@
-		if (is_numeric($type)) {

-			dol_syslog(__METHOD__ . ': using numeric value for parameter type is deprecated. Use string code instead.', LOG_WARNING);

-		}

-

-		if ($type === Categorie::TYPE_BANK_LINE) {

+		if (is_numeric($type))

+		{

+			dol_syslog(__METHOD__.': using numeric value for parameter type is deprecated. Use string code instead.', LOG_WARNING);

+		}

+

+		if ($type === Categorie::TYPE_BANK_LINE)

+		{

@@ -5102,2 +4107,2 @@
-			$sql .= " FROM " . $this->db->prefix() . "bank_categ as c";

-			$sql .= " WHERE entity = " . $conf->entity;

+			$sql .= " FROM ".MAIN_DB_PREFIX."bank_categ as c";

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

@@ -5106 +4111,2 @@
-			if ($result) {

+			if ($result)

+			{

@@ -5109 +4115,2 @@
-				while ($i < $num) {

+				while ($i < $num)

+				{

@@ -5111,3 +4118 @@
-					if ($objp) {

-						$cate_arbo[$objp->rowid] = array('id' => $objp->rowid, 'fulllabel' => $objp->label, 'color' => '', 'picto' => 'category');

-					}

+					if ($objp) $cate_arbo[$objp->rowid] = array('id'=>$objp->rowid, 'fulllabel'=>$objp->label);

@@ -5117,4 +4122,5 @@
-			} else {

-				dol_print_error($this->db);

-			}

-		} else {

+			}

+			else dol_print_error($this->db);

+		}

+		else

+		{

@@ -5122,3 +4128,4 @@
-			$cate_arbo = $cat->get_full_arbo($type, $markafterid, $include);

-		}

-

+            $cate_arbo = $cat->get_full_arbo($type, $markafterid, $include);

+		}

+

+		$output = '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';

@@ -5126,7 +4133,5 @@
-		$outarrayrichhtml = array();

-

-		$output = '<select class="flat' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '" id="' . $htmlname . '">';

-		if (is_array($cate_arbo)) {

-			if (!count($cate_arbo)) {

-				$output .= '<option value="-1" disabled>' . $langs->trans("NoCategoriesDefined") . '</option>';

-			} else {

+		if (is_array($cate_arbo))

+		{

+			if (!count($cate_arbo)) $output .= '<option value="-1" disabled>'.$langs->trans("NoCategoriesDefined").'</option>';

+			else

+			{

@@ -5134,2 +4139,4 @@
-				foreach ($cate_arbo as $key => $value) {

-					if ($cate_arbo[$key]['id'] == $selected || ($selected === 'auto' && count($cate_arbo) == 1)) {

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

+				{

+					if ($cate_arbo[$key]['id'] == $selected || ($selected == 'auto' && count($cate_arbo) == 1))

+					{

@@ -5137 +4144,3 @@
-					} else {

+					}

+					else

+					{

@@ -5140,3 +4149 @@
-

-					$labeltoshow = img_picto('', 'category', 'class="pictofixedwidth" style="color: #' . $cate_arbo[$key]['color'] . '"');

-					$labeltoshow .= dol_trunc($cate_arbo[$key]['fulllabel'], $maxlength, 'middle');

+					$output .= '<option '.$add.'value="'.$cate_arbo[$key]['id'].'">'.dol_trunc($cate_arbo[$key]['fulllabel'], $maxlength, 'middle').'</option>';

@@ -5145,8 +4151,0 @@
-

-					$outarrayrichhtml[$cate_arbo[$key]['id']] = $labeltoshow;

-

-					$output .= '<option ' . $add . 'value="' . $cate_arbo[$key]['id'] . '"';

-					$output .= ' data-html="' . dol_escape_htmltag($labeltoshow) . '"';

-					$output .= '>';

-					$output .= dol_trunc($cate_arbo[$key]['fulllabel'], $maxlength, 'middle');

-					$output .= '</option>';

@@ -5159,7 +4158 @@
-		if ($outputmode == 2) {

-			return $cate_arbo;

-		} elseif ($outputmode == 1) {

-			return $outarray;

-		} elseif ($outputmode == 3) {

-			return $outarrayrichhtml;

-		}

+		if ($outputmode) return $outarray;

@@ -5169,2 +4162 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -5174,17 +4166,17 @@
-	 * @param string $page Url of page to call if confirmation is OK

-	 * @param string $title Title

-	 * @param string $question Question

-	 * @param string $action Action

-	 * @param array $formquestion An array with forms complementary inputs

-	 * @param string $selectedchoice "" or "no" or "yes"

-	 * @param int|string $useajax 0=No, 1=Yes use Ajax to show the popup, 2=Yes and also submit page with &confirm=no if choice is No, 'xxx'=Yes and preoutput confirm box with div id=dialog-confirm-xxx

-	 * @param int $height Force height of box

-	 * @param int $width Force width of box

-	 * @return    void

-	 * @deprecated

-	 * @see formconfirm()

-	 */

-	public function form_confirm($page, $title, $question, $action, $formquestion = array(), $selectedchoice = "", $useajax = 0, $height = 170, $width = 500)

-	{

-		// phpcs:enable

-		dol_syslog(__METHOD__ . ': using form_confirm is deprecated. Use formconfim instead.', LOG_WARNING);

+	 *     @param	string		$page        	   	Url of page to call if confirmation is OK

+	 *     @param	string		$title       	   	Title

+	 *     @param	string		$question    	   	Question

+	 *     @param 	string		$action      	   	Action

+	 *	   @param	array		$formquestion	   	An array with forms complementary inputs

+	 * 	   @param	string		$selectedchoice		"" or "no" or "yes"

+	 * 	   @param	int			$useajax		   	0=No, 1=Yes, 2=Yes but submit page with &confirm=no if choice is No, 'xxx'=preoutput confirm box with div id=dialog-confirm-xxx

+	 *     @param	int			$height          	Force height of box

+	 *     @param	int			$width				Force width of box

+	 *     @return 	void

+	 *     @deprecated

+	 *     @see formconfirm()

+	 */

+    public function form_confirm($page, $title, $question, $action, $formquestion = '', $selectedchoice = "", $useajax = 0, $height = 170, $width = 500)

+	{

+        // phpcs:enable

+        dol_syslog(__METHOD__.': using form_confirm is deprecated. Use formconfim instead.', LOG_WARNING);

@@ -5199 +4191 @@
-	 *       print '<script nonce="'.getNonce().'" type="text/javascript">'."\n";

+	 *       print '<script type="text/javascript">'."\n";

@@ -5205,17 +4197,14 @@
-	 * @param string 		$page 				Url of page to call if confirmation is OK. Can contains parameters (param 'action' and 'confirm' will be reformated)

-	 * @param string 		$title 				Title

-	 * @param string 		$question 			Question

-	 * @param string 		$action 			Action

-	 * @param array|string 	$formquestion 		An array with complementary inputs to add into forms: array(array('label'=> ,'type'=> , 'size'=>, 'morecss'=>, 'moreattr'=>'autofocus' or 'style=...'))

-	 *                                   		'type' can be 'text', 'password', 'checkbox', 'radio', 'date', 'datetime', 'select', 'multiselect', 'morecss',

-	 *                                   		'other', 'onecolumn' or 'hidden'...

-	 * @param int|string 	$selectedchoice 	'' or 'no', or 'yes' or '1', 1, '0' or 0

-	 * @param int|string 	$useajax 			0=No, 1=Yes use Ajax to show the popup, 2=Yes and also submit page with &confirm=no if choice is No, 'xxx'=Yes and preoutput confirm box with div id=dialog-confirm-xxx

-	 * @param int|string 	$height 			Force height of box (0 = auto)

-	 * @param int 			$width 				Force width of box ('999' or '90%'). Ignored and forced to 90% on smartphones.

-	 * @param int 			$disableformtag 	1=Disable form tag. Can be used if we are already inside a <form> section.

-	 * @param string 		$labelbuttonyes 	Label for Yes

-	 * @param string 		$labelbuttonno 		Label for No

-	 * @return string                        	HTML ajax code if a confirm ajax popup is required, Pure HTML code if it's an html form

-	 */

-	public function formconfirm($page, $title, $question, $action, $formquestion = '', $selectedchoice = '', $useajax = 0, $height = 0, $width = 500, $disableformtag = 0, $labelbuttonyes = 'Yes', $labelbuttonno = 'No')

+	 *     @param  	string			$page        	   	Url of page to call if confirmation is OK. Can contains parameters (param 'action' and 'confirm' will be reformated)

+	 *     @param	string			$title       	   	Title

+	 *     @param	string			$question    	   	Question

+	 *     @param 	string			$action      	   	Action

+	 *	   @param  	array|string	$formquestion	   	An array with complementary inputs to add into forms: array(array('label'=> ,'type'=> , ))

+	 *													type can be 'hidden', 'text', 'password', 'checkbox', 'radio', 'date', 'morecss', ...

+	 * 	   @param  	string			$selectedchoice  	'' or 'no', or 'yes' or '1' or '0'

+	 * 	   @param  	int|string		$useajax		   	0=No, 1=Yes, 2=Yes but submit page with &confirm=no if choice is No, 'xxx'=Yes and preoutput confirm box with div id=dialog-confirm-xxx

+	 *     @param  	int				$height          	Force height of box (0 = auto)

+	 *     @param	int				$width				Force width of box ('999' or '90%'). Ignored and forced to 90% on smartphones.

+	 *     @param	int				$disableformtag		1=Disable form tag. Can be used if we are already inside a <form> section.

+	 *     @return 	string      		    			HTML ajax code if a confirm ajax popup is required, Pure HTML code if it's an html form

+	 */

+    public function formconfirm($page, $title, $question, $action, $formquestion = '', $selectedchoice = '', $useajax = 0, $height = 0, $width = 500, $disableformtag = 0)

@@ -5225 +4214 @@
-		$more = '<!-- formconfirm - before call, page=' . dol_escape_htmltag($page) . ' -->';

+		$more = '<!-- formconfirm -->';

@@ -5232,3 +4221 @@
-		if ($conf->browser->layout == 'phone') {

-			$width = '95%';

-		}

+		if ($conf->browser->layout == 'phone') $width = '95%';

@@ -5238 +4225 @@
-			$height = 220;

+			$height = 210;

@@ -5244 +4231,2 @@
-		if (is_array($formquestion) && !empty($formquestion)) {

+		if (is_array($formquestion) && !empty($formquestion))

+		{

@@ -5246,7 +4234,7 @@
-			foreach ($formquestion as $key => $input) {

-				if (is_array($input) && !empty($input)) {

-					if ($input['type'] == 'hidden') {

-						$moreattr = (!empty($input['moreattr']) ? ' ' . $input['moreattr'] : '');

-						$morecss = (!empty($input['morecss']) ? ' ' . $input['morecss'] : '');

-

-						$more .= '<input type="hidden" id="' . dol_escape_htmltag($input['name']) . '" name="' . dol_escape_htmltag($input['name']) . '" value="' . dol_escape_htmltag($input['value']) . '" class="' . $morecss . '"' . $moreattr . '>' . "\n";

+			foreach ($formquestion as $key => $input)

+			{

+				if (is_array($input) && !empty($input))

+				{

+					if ($input['type'] == 'hidden')

+					{

+						$more .= '<input type="hidden" id="'.$input['name'].'" name="'.$input['name'].'" value="'.dol_escape_htmltag($input['value']).'">'."\n";

@@ -5259,47 +4247,26 @@
-			$more .= '<div class="tagtable paddingtopbottomonly centpercent noborderspacing">' . "\n";

-			foreach ($formquestion as $key => $input) {

-				if (is_array($input) && !empty($input)) {

-					$size = (!empty($input['size']) ? ' size="' . $input['size'] . '"' : '');    // deprecated. Use morecss instead.

-					$moreattr = (!empty($input['moreattr']) ? ' ' . $input['moreattr'] : '');

-					$morecss = (!empty($input['morecss']) ? ' ' . $input['morecss'] : '');

-

-					if ($input['type'] == 'text') {

-						$more .= '<div class="tagtr"><div class="tagtd' . (empty($input['tdclass']) ? '' : (' ' . $input['tdclass'])) . '">' . $input['label'] . '</div><div class="tagtd"><input type="text" class="flat' . $morecss . '" id="' . dol_escape_htmltag($input['name']) . '" name="' . dol_escape_htmltag($input['name']) . '"' . $size . ' value="' . (empty($input['value']) ? '' : $input['value']) . '"' . $moreattr . ' /></div></div>' . "\n";

-					} elseif ($input['type'] == 'password') {

-						$more .= '<div class="tagtr"><div class="tagtd' . (empty($input['tdclass']) ? '' : (' ' . $input['tdclass'])) . '">' . $input['label'] . '</div><div class="tagtd"><input type="password" class="flat' . $morecss . '" id="' . dol_escape_htmltag($input['name']) . '" name="' . dol_escape_htmltag($input['name']) . '"' . $size . ' value="' . (empty($input['value']) ? '' : $input['value']) . '"' . $moreattr . ' /></div></div>' . "\n";

-					} elseif ($input['type'] == 'textarea') {

-						/*$more .= '<div class="tagtr"><div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">'.$input['label'].'</div><div class="tagtd">';

-						$more .= '<textarea name="'.$input['name'].'" class="'.$morecss.'"'.$moreattr.'>';

-						$more .= $input['value'];

-						$more .= '</textarea>';

-						$more .= '</div></div>'."\n";*/

-						$moreonecolumn .= '<div class="margintoponly">';

-						$moreonecolumn .= $input['label'] . '<br>';

-						$moreonecolumn .= '<textarea name="' . dol_escape_htmltag($input['name']) . '" id="' . dol_escape_htmltag($input['name']) . '" class="' . $morecss . '"' . $moreattr . '>';

-						$moreonecolumn .= $input['value'];

-						$moreonecolumn .= '</textarea>';

-						$moreonecolumn .= '</div>';

-					} elseif (in_array($input['type'], ['select', 'multiselect'])) {

-						if (empty($morecss)) {

-							$morecss = 'minwidth100';

-						}

-

-						$show_empty = isset($input['select_show_empty']) ? $input['select_show_empty'] : 1;

-						$key_in_label = isset($input['select_key_in_label']) ? $input['select_key_in_label'] : 0;

-						$value_as_key = isset($input['select_value_as_key']) ? $input['select_value_as_key'] : 0;

-						$translate = isset($input['select_translate']) ? $input['select_translate'] : 0;

-						$maxlen = isset($input['select_maxlen']) ? $input['select_maxlen'] : 0;

-						$disabled = isset($input['select_disabled']) ? $input['select_disabled'] : 0;

-						$sort = isset($input['select_sort']) ? $input['select_sort'] : '';

-

-						$more .= '<div class="tagtr"><div class="tagtd' . (empty($input['tdclass']) ? '' : (' ' . $input['tdclass'])) . '">';

-						if (!empty($input['label'])) {

-							$more .= $input['label'] . '</div><div class="tagtd left">';

-						}

-						if ($input['type'] == 'select') {

-							$more .= $this->selectarray($input['name'], $input['values'], isset($input['default']) ? $input['default'] : '-1', $show_empty, $key_in_label, $value_as_key, $moreattr, $translate, $maxlen, $disabled, $sort, $morecss);

-						} else {

-							$more .= $this->multiselectarray($input['name'], $input['values'], is_array($input['default']) ? $input['default'] : [$input['default']], $key_in_label, $value_as_key, $morecss, $translate, $maxlen, $moreattr);

-						}

-						$more .= '</div></div>' . "\n";

-					} elseif ($input['type'] == 'checkbox') {

+			$more .= '<div class="tagtable paddingtopbottomonly centpercent noborderspacing">'."\n";

+			foreach ($formquestion as $key => $input)

+			{

+				if (is_array($input) && !empty($input))

+				{

+					$size = (!empty($input['size']) ? ' size="'.$input['size'].'"' : '');

+					$moreattr = (!empty($input['moreattr']) ? ' '.$input['moreattr'] : '');

+					$morecss = (!empty($input['morecss']) ? ' '.$input['morecss'] : '');

+

+					if ($input['type'] == 'text')

+					{

+						$more .= '<div class="tagtr"><div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">'.$input['label'].'</div><div class="tagtd"><input type="text" class="flat'.$morecss.'" id="'.$input['name'].'" name="'.$input['name'].'"'.$size.' value="'.$input['value'].'"'.$moreattr.' /></div></div>'."\n";

+					}

+					elseif ($input['type'] == 'password')

+					{

+						$more .= '<div class="tagtr"><div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">'.$input['label'].'</div><div class="tagtd"><input type="password" class="flat'.$morecss.'" id="'.$input['name'].'" name="'.$input['name'].'"'.$size.' value="'.$input['value'].'"'.$moreattr.' /></div></div>'."\n";

+					}

+					elseif ($input['type'] == 'select')

+					{

+						$more .= '<div class="tagtr"><div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">';

+						if (!empty($input['label'])) $more .= $input['label'].'</div><div class="tagtd left">';

+						$more .= $this->selectarray($input['name'], $input['values'], $input['default'], 1, 0, 0, $moreattr, 0, 0, 0, '', $morecss);

+						$more .= '</div></div>'."\n";

+					}

+					elseif ($input['type'] == 'checkbox')

+					{

@@ -5307,11 +4274,5 @@
-						$more .= '<div class="tagtd' . (empty($input['tdclass']) ? '' : (' ' . $input['tdclass'])) . '"><label for="' . dol_escape_htmltag($input['name']) . '">' . $input['label'] . '</label></div><div class="tagtd">';

-						$more .= '<input type="checkbox" class="flat' . ($morecss ? ' ' . $morecss : '') . '" id="' . dol_escape_htmltag($input['name']) . '" name="' . dol_escape_htmltag($input['name']) . '"' . $moreattr;

-						if (!is_bool($input['value']) && $input['value'] != 'false' && $input['value'] != '0' && $input['value'] != '') {

-							$more .= ' checked';

-						}

-						if (is_bool($input['value']) && $input['value']) {

-							$more .= ' checked';

-						}

-						if (isset($input['disabled'])) {

-							$more .= ' disabled';

-						}

+						$more .= '<div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">'.$input['label'].' </div><div class="tagtd">';

+						$more .= '<input type="checkbox" class="flat'.$morecss.'" id="'.$input['name'].'" name="'.$input['name'].'"'.$moreattr;

+						if (!is_bool($input['value']) && $input['value'] != 'false' && $input['value'] != '0') $more .= ' checked';

+						if (is_bool($input['value']) && $input['value']) $more .= ' checked';

+						if (isset($input['disabled'])) $more .= ' disabled';

@@ -5319,2 +4280,4 @@
-						$more .= '</div>' . "\n";

-					} elseif ($input['type'] == 'radio') {

+						$more .= '</div>'."\n";

+					}

+					elseif ($input['type'] == 'radio')

+					{

@@ -5322 +4285,2 @@
-						foreach ($input['values'] as $selkey => $selval) {

+						foreach ($input['values'] as $selkey => $selval)

+						{

@@ -5324,14 +4288,4 @@
-							if (isset($input['label'])) {

-								if ($i == 0) {

-									$more .= '<div class="tagtd' . (empty($input['tdclass']) ? ' tdtop' : (' tdtop ' . $input['tdclass'])) . '">' . $input['label'] . '</div>';

-								} else {

-									$more .= '<div clas="tagtd' . (empty($input['tdclass']) ? '' : (' "' . $input['tdclass'])) . '">&nbsp;</div>';

-								}

-							}

-							$more .= '<div class="tagtd' . ($i == 0 ? ' tdtop' : '') . '"><input type="radio" class="flat' . $morecss . '" id="' . dol_escape_htmltag($input['name'] . $selkey) . '" name="' . dol_escape_htmltag($input['name']) . '" value="' . $selkey . '"' . $moreattr;

-							if (!empty($input['disabled'])) {

-								$more .= ' disabled';

-							}

-							if (isset($input['default']) && $input['default'] === $selkey) {

-								$more .= ' checked="checked"';

-							}

+							if ($i == 0) $more .= '<div class="tagtd'.(empty($input['tdclass']) ? ' tdtop' : (' tdtop '.$input['tdclass'])).'">'.$input['label'].'</div>';

+							else $more .= '<div clas="tagtd'.(empty($input['tdclass']) ? '' : (' "'.$input['tdclass'])).'">&nbsp;</div>';

+							$more .= '<div class="tagtd"><input type="radio" class="flat'.$morecss.'" id="'.$input['name'].'" name="'.$input['name'].'" value="'.$selkey.'"'.$moreattr;

+							if ($input['disabled']) $more .= ' disabled';

@@ -5339,2 +4293,2 @@
-							$more .= '<label for="' . dol_escape_htmltag($input['name'] . $selkey) . '" class="valignmiddle">' . $selval . '</label>';

-							$more .= '</div></div>' . "\n";

+							$more .= $selval;

+							$more .= '</div></div>'."\n";

@@ -5343,2 +4297,4 @@
-					} elseif ($input['type'] == 'date' || $input['type'] == 'datetime') {

-						$more .= '<div class="tagtr"><div class="tagtd' . (empty($input['tdclass']) ? '' : (' ' . $input['tdclass'])) . '">' . $input['label'] . '</div>';

+					}

+					elseif ($input['type'] == 'date')

+					{

+						$more .= '<div class="tagtr"><div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">'.$input['label'].'</div>';

@@ -5346,7 +4302 @@
-						$addnowlink = (empty($input['datenow']) ? 0 : 1);

-						$h = $m = 0;

-						if ($input['type'] == 'datetime') {

-							$h = isset($input['hours']) ? $input['hours'] : 1;

-							$m = isset($input['minutes']) ? $input['minutes'] : 1;

-						}

-						$more .= $this->selectDate($input['value'], $input['name'], $h, $m, 0, '', 1, $addnowlink);

+						$more .= $this->selectDate($input['value'], $input['name'], 0, 0, 0, '', 1, 0);

@@ -5359 +4309,3 @@
-					} elseif ($input['type'] == 'other') { // can be 1 column or 2 depending if label is set or not

+					}

+					elseif ($input['type'] == 'other')

+					{

@@ -5361,3 +4313 @@
-						if (!empty($input['label'])) {

-							$more .= $input['label'] . '</div><div class="tagtd">';

-						}

+						if (!empty($input['label'])) $more .= $input['label'].'</div><div class="tagtd">';

@@ -5365,2 +4315,5 @@
-						$more .= '</div></div>' . "\n";

-					} elseif ($input['type'] == 'onecolumn') {

+						$more .= '</div></div>'."\n";

+					}

+

+					elseif ($input['type'] == 'onecolumn')

+					{

@@ -5369,11 +4322,5 @@
-						$moreonecolumn .= '</div>' . "\n";

-					} elseif ($input['type'] == 'hidden') {

-						// Do nothing more, already added by a previous loop

-					} elseif ($input['type'] == 'separator') {

-						$more .= '<br>';

-					} else {

-						$more .= 'Error type ' . $input['type'] . ' for the confirm box is not a supported type';

-					}

-				}

-			}

-			$more .= '</div>' . "\n";

+						$moreonecolumn .= '</div>'."\n";

+					}

+				}

+			}

+			$more .= '</div>'."\n";

@@ -5383 +4330 @@
-		// JQUERY method dialog is broken with smartphone, we use standard HTML.

+		// JQUI method dialog is broken with jmobile, we use standard HTML.

@@ -5386,8 +4333,5 @@
-		if (!empty($conf->dol_use_jmobile)) {

-			$useajax = 0;

-		}

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

-			$useajax = 0;

-		}

-

-		if ($useajax) {

+		if (!empty($conf->dol_use_jmobile)) $useajax = 0;

+		if (empty($conf->use_javascript_ajax)) $useajax = 0;

+

+		if ($useajax)

+		{

@@ -5397 +4341,2 @@
-			if (!is_numeric($useajax)) {

+			if (!is_numeric($useajax))

+			{

@@ -5401,5 +4346,4 @@
-				$dialogconfirm .= '-' . $button;

-			}

-			$pageyes = $page . (preg_match('/\?/', $page) ? '&' : '?') . 'action=' . urlencode($action) . '&confirm=yes';

-			$pageno = ($useajax == 2 ? $page . (preg_match('/\?/', $page) ? '&' : '?') . 'action=' . urlencode($action) . '&confirm=no' : '');

-

+				$dialogconfirm .= '-'.$button;

+			}

+			$pageyes = $page.(preg_match('/\?/', $page) ? '&' : '?').'action='.$action.'&confirm=yes';

+			$pageno = ($useajax == 2 ? $page.(preg_match('/\?/', $page) ? '&' : '?').'confirm=no' : '');

@@ -5407,2 +4351,4 @@
-			if (is_array($formquestion)) {

-				foreach ($formquestion as $key => $input) {

+			if (is_array($formquestion))

+			{

+				foreach ($formquestion as $key => $input)

+				{

@@ -5410,15 +4356,4 @@
-					// Add name of fields to propagate with the GET when submitting the form with button OK.

-					if (is_array($input) && isset($input['name'])) {

-						if (strpos($input['name'], ',') > 0) {

-							$inputok = array_merge($inputok, explode(',', $input['name']));

-						} else {

-							array_push($inputok, $input['name']);

-						}

-					}

-					// Add name of fields to propagate with the GET when submitting the form with button KO.

-					if (isset($input['inputko']) && $input['inputko'] == 1) {

-						array_push($inputko, $input['name']);

-					}

-				}

-			}

-

+					if (is_array($input) && isset($input['name'])) array_push($inputok, $input['name']);

+					if (isset($input['inputko']) && $input['inputko'] == 1) array_push($inputko, $input['name']);

+				}

+			}

@@ -5426 +4361 @@
-			$formconfirm .= '<div id="' . $dialogconfirm . '" title="' . dol_escape_htmltag($title) . '" style="display: none;">';

+			$formconfirm .= '<div id="'.$dialogconfirm.'" title="'.dol_escape_htmltag($title).'" style="display: none;">';

@@ -5428 +4363 @@
-				$formconfirm .= '<div class="confirmtext">' . $formquestion['text'] . '</div>' . "\n";

+				$formconfirm .= '<div class="confirmtext">'.$formquestion['text'].'</div>'."\n";

@@ -5431,8 +4366,7 @@
-				$formconfirm .= '<div class="confirmquestions">' . $more . '</div>' . "\n";

-			}

-			$formconfirm .= ($question ? '<div class="confirmmessage">' . img_help('', '') . ' ' . $question . '</div>' : '');

-			$formconfirm .= '</div>' . "\n";

-

-			$formconfirm .= "\n<!-- begin code of popup for formconfirm page=" . $page . " -->\n";

-			$formconfirm .= '<script nonce="' . getNonce() . '" type="text/javascript">' . "\n";

-			$formconfirm .= "/* Code for the jQuery('#dialogforpopup').dialog() */\n";

+				$formconfirm .= '<div class="confirmquestions">'.$more.'</div>'."\n";

+			}

+			$formconfirm .= ($question ? '<div class="confirmmessage">'.img_help('', '').' '.$question.'</div>' : '');

+			$formconfirm .= '</div>'."\n";

+

+			$formconfirm .= "\n<!-- begin ajax formconfirm page=".$page." -->\n";

+			$formconfirm .= '<script type="text/javascript">'."\n";

@@ -5441 +4375 @@
-            	$( "#' . $dialogconfirm . '" ).dialog(

+            	$( "#'.$dialogconfirm.'" ).dialog(

@@ -5443,2 +4377,3 @@
-                    autoOpen: ' . ($autoOpen ? "true" : "false") . ',';

-			if ($newselectedchoice == 'no') {

+                    autoOpen: '.($autoOpen ? "true" : "false").',';

+			if ($newselectedchoice == 'no')

+			{

@@ -5450,9 +4384,0 @@
-

-			$jsforcursor = '';

-			if ($useajax == 1) {

-				$jsforcursor = '// The call to urljump can be slow, so we set the wait cursor' . "\n";

-				$jsforcursor .= 'jQuery("html,body,#id-container").addClass("cursorwait");' . "\n";

-			}

-

-			$postconfirmas = 'GET';

-

@@ -5461,2 +4387,2 @@
-                    height: "' . $height . '",

-                    width: "' . $width . '",

+                    height: "'.$height.'",

+                    width: "'.$width.'",

@@ -5466,7 +4392,5 @@
-                        "' . dol_escape_js($langs->transnoentities($labelbuttonyes)) . '": function() {

-							var options = "token=' . urlencode(newToken()) . '";

-                        	var inputok = ' . json_encode($inputok) . ';	/* List of fields into form */

-							var page = "' . dol_escape_js(!empty($page) ? $page : '') . '";

-                         	var pageyes = "' . dol_escape_js(!empty($pageyes) ? $pageyes : '') . '";

-

-                         	if (inputok.length > 0) {

+                        "'.dol_escape_js($langs->transnoentities("Yes")).'": function() {

+                        	var options = "&token='.urlencode(newToken()).'";

+                        	var inputok = '.json_encode($inputok).';	/* List of fields into form */

+                         	var pageyes = "'.dol_escape_js(!empty($pageyes) ? $pageyes : '').'";

+                         	if (inputok.length>0) {

@@ -5475,7 +4399,3 @@
-									var inputvalue;

-                         			if ($("input[name=\'" + inputname + "\']").attr("type") == "radio") {

-										inputvalue = $("input[name=\'" + inputname + "\']:checked").val();

-									} else {

-                         		    	if ($("#" + inputname).attr("type") == "checkbox") { more = ":checked"; }

-                         				inputvalue = $("#" + inputname + more).val();

-									}

+                         			if ($("#" + inputname).attr("type") == "checkbox") { more = ":checked"; }

+                         		    if ($("#" + inputname).attr("type") == "radio") { more = ":checked"; }

+                         			var inputvalue = $("#" + inputname + more).val();

@@ -5483 +4402,0 @@
-									console.log("formconfirm check inputname="+inputname+" inputvalue="+inputvalue);

@@ -5487,16 +4406,4 @@
-                         	var urljump = pageyes + (pageyes.indexOf("?") < 0 ? "?" : "&") + options;

-            				if (pageyes.length > 0) {';

-			if ($postconfirmas == 'GET') {

-				$formconfirm .= 'location.href = urljump;';

-			} else {

-				$formconfirm .= $jsforcursor;

-				$formconfirm .= 'var post = $.post(

-									pageyes,

-									options,

-									function(data) { $("body").html(data); jQuery("html,body,#id-container").removeClass("cursorwait"); }

-								);';

-			}

-			$formconfirm .= '

-								console.log("after post ok");

-							}

-	                        $(this).dialog("close");

+                         	var urljump = pageyes + (pageyes.indexOf("?") < 0 ? "?" : "") + options;

+                         	//alert(urljump);

+            				if (pageyes.length > 0) { location.href = urljump; }

+                            $(this).dialog("close");

@@ -5504,6 +4411,5 @@
-                        "' . dol_escape_js($langs->transnoentities($labelbuttonno)) . '": function() {

-                        	var options = "token=' . urlencode(newToken()) . '";

-                         	var inputko = ' . json_encode($inputko) . ';	/* List of fields into form */

-							var page = "' . dol_escape_js(!empty($page) ? $page : '') . '";

-                         	var pageno="' . dol_escape_js(!empty($pageno) ? $pageno : '') . '";

-                         	if (inputko.length > 0) {

+                        "'.dol_escape_js($langs->transnoentities("No")).'": function() {

+                        	var options = "&token='.urlencode(newToken()).'";

+                         	var inputko = '.json_encode($inputko).';	/* List of fields into form */

+                         	var pageno="'.dol_escape_js(!empty($pageno) ? $pageno : '').'";

+                         	if (inputko.length>0) {

@@ -5518 +4424 @@
-                         	var urljump=pageno + (pageno.indexOf("?") < 0 ? "?" : "&") + options;

+                         	var urljump=pageno + (pageno.indexOf("?") < 0 ? "?" : "") + options;

@@ -5520,14 +4426 @@
-            				if (pageno.length > 0) {';

-			if ($postconfirmas == 'GET') {

-				$formconfirm .= 'location.href = urljump;';

-			} else {

-				$formconfirm .= $jsforcursor;

-				$formconfirm .= 'var post = $.post(

-									pageno,

-									options,

-									function(data) { $("body").html(data); jQuery("html,body,#id-container").removeClass("cursorwait"); }

-								);';

-			}

-			$formconfirm .= '

-								console.log("after post ko");

-							}

+            				if (pageno.length > 0) { location.href = urljump; }

@@ -5540 +4433 @@
-            	var button = "' . $button . '";

+            	var button = "'.$button.'";

@@ -5543 +4436 @@
-                		$("#' . $dialogconfirm . '").dialog("open");

+                		$("#'.$dialogconfirm.'").dialog("open");

@@ -5550,11 +4443,11 @@
-		} else {

-			$formconfirm .= "\n<!-- begin formconfirm page=" . dol_escape_htmltag($page) . " -->\n";

-

-			if (empty($disableformtag)) {

-				$formconfirm .= '<form method="POST" action="' . $page . '" class="notoptoleftroright">' . "\n";

-			}

-

-			$formconfirm .= '<input type="hidden" name="action" value="' . $action . '">' . "\n";

-			$formconfirm .= '<input type="hidden" name="token" value="' . newToken() . '">' . "\n";

-

-			$formconfirm .= '<table class="valid centpercent">' . "\n";

+		}

+		else

+		{

+			$formconfirm .= "\n<!-- begin formconfirm page=".$page." -->\n";

+

+			if (empty($disableformtag)) $formconfirm .= '<form method="POST" action="'.$page.'" class="notoptoleftroright">'."\n";

+

+			$formconfirm .= '<input type="hidden" name="action" value="'.$action.'">'."\n";

+			$formconfirm .= '<input type="hidden" name="token" value="'.newToken().'">'."\n";

+

+			$formconfirm .= '<table class="valid centpercent">'."\n";

@@ -5563,3 +4456 @@
-			$formconfirm .= '<tr class="validtitre"><td class="validtitre" colspan="2">';

-			$formconfirm .= img_picto('', 'pictoconfirm') . ' ' . $title;

-			$formconfirm .= '</td></tr>' . "\n";

+			$formconfirm .= '<tr class="validtitre"><td class="validtitre" colspan="3">'.img_picto('', 'recent').' '.$title.'</td></tr>'."\n";

@@ -5569 +4460 @@
-				$formconfirm .= '<tr class="valid"><td class="valid" colspan="2">' . $formquestion['text'] . '</td></tr>' . "\n";

+				$formconfirm .= '<tr class="valid"><td class="valid" colspan="3">'.$formquestion['text'].'</td></tr>'."\n";

@@ -5573,2 +4464,3 @@
-			if ($more) {

-				$formconfirm .= '<tr class="valid"><td class="valid" colspan="2">' . "\n";

+			if ($more)

+			{

+				$formconfirm .= '<tr class="valid"><td class="valid" colspan="3">'."\n";

@@ -5576 +4468 @@
-				$formconfirm .= '</td></tr>' . "\n";

+				$formconfirm .= '</td></tr>'."\n";

@@ -5581,4 +4473,3 @@
-			$formconfirm .= '<td class="valid">' . $question . '</td>';

-			$formconfirm .= '<td class="valid center">';

-			$formconfirm .= $this->selectyesno("confirm", $newselectedchoice, 0, false, 0, 0, 'marginleftonly marginrightonly', $labelbuttonyes, $labelbuttonno);

-			$formconfirm .= '<input class="button valignmiddle confirmvalidatebutton small" type="submit" value="' . $langs->trans("Validate") . '">';

+			$formconfirm .= '<td class="valid">'.$question.'</td>';

+			$formconfirm .= '<td class="valid">';

+			$formconfirm .= $this->selectyesno("confirm", $newselectedchoice);

@@ -5586,7 +4477,6 @@
-			$formconfirm .= '</tr>' . "\n";

-

-			$formconfirm .= '</table>' . "\n";

-

-			if (empty($disableformtag)) {

-				$formconfirm .= "</form>\n";

-			}

+			$formconfirm .= '<td class="valid center"><input class="button valignmiddle" type="submit" value="'.$langs->trans("Validate").'"></td>';

+			$formconfirm .= '</tr>'."\n";

+

+			$formconfirm .= '</table>'."\n";

+

+			if (empty($disableformtag)) $formconfirm .= "</form>\n";

@@ -5595,17 +4484,0 @@
-			if (!empty($conf->use_javascript_ajax)) {

-				$formconfirm .= '<!-- code to disable button to avoid double clic -->';

-				$formconfirm .= '<script nonce="' . getNonce() . '" type="text/javascript">' . "\n";

-				$formconfirm .= '

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

-					$(".confirmvalidatebutton").on("click", function() {

-						console.log("We click on button confirmvalidatebutton");

-						$(this).attr("disabled", "disabled");

-						setTimeout(\'$(".confirmvalidatebutton").removeAttr("disabled")\', 3000);

-						//console.log($(this).closest("form"));

-						$(this).closest("form").submit();

-					});

-				});

-				';

-				$formconfirm .= '</script>' . "\n";

-			}

-

@@ -5619,20 +4492,17 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-

-	/**

-	 * Show a form to select a project

-	 *

-	 * @param 	int 		$page 				Page

-	 * @param 	int 		$socid 				Id third party (-1=all, 0=only projects not linked to a third party, id=projects not linked or linked to third party id)

-	 * @param 	string 		$selected 			Id pre-selected project

-	 * @param 	string 		$htmlname 			Name of select field

-	 * @param 	int 		$discard_closed 	Discard closed projects (0=Keep,1=hide completely except $selected,2=Disable)

-	 * @param 	int 		$maxlength 			Max length

-	 * @param 	int 		$forcefocus 		Force focus on field (works with javascript only)

-	 * @param 	int 		$nooutput 			No print is done. String is returned.

-	 * @param 	string 		$textifnoproject 	Text to show if no project

-	 * @param 	string 		$morecss 			More CSS

-	 * @return	string                      	Return html content

-	 */

-	public function form_project($page, $socid, $selected = '', $htmlname = 'projectid', $discard_closed = 0, $maxlength = 20, $forcefocus = 0, $nooutput = 0, $textifnoproject = '', $morecss = '')

-	{

-		// phpcs:enable

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+	/**

+	 *    Show a form to select a project

+	 *

+	 *    @param	int		$page        		Page

+	 *    @param	int		$socid       		Id third party (-1=all, 0=only projects not linked to a third party, id=projects not linked or linked to third party id)

+	 *    @param    int		$selected    		Id pre-selected project

+	 *    @param    string	$htmlname    		Name of select field

+	 *    @param	int		$discard_closed		Discard closed projects (0=Keep,1=hide completely except $selected,2=Disable)

+	 *    @param	int		$maxlength			Max length

+	 *    @param	int		$forcefocus			Force focus on field (works with javascript only)

+	 *    @param    int     $nooutput           No print is done. String is returned.

+	 *    @return	string                      Return html content

+	 */

+    public function form_project($page, $socid, $selected = '', $htmlname = 'projectid', $discard_closed = 0, $maxlength = 20, $forcefocus = 0, $nooutput = 0)

+	{

+        // phpcs:enable

@@ -5641,2 +4511,2 @@
-		require_once DOL_DOCUMENT_ROOT . '/core/lib/project.lib.php';

-		require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';

+		require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';

+		require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';

@@ -5649,2 +4519,4 @@
-		if ($htmlname != "none") {

-			$out .= '<form method="post" action="' . $page . '">';

+		if ($htmlname != "none")

+		{

+			$out .= "\n";

+			$out .= '<form method="post" action="'.$page.'">';

@@ -5652,3 +4524,3 @@
-			$out .= '<input type="hidden" name="token" value="' . newToken() . '">';

-			$out .= $formproject->select_projects($socid, $selected, $htmlname, $maxlength, 0, 1, $discard_closed, $forcefocus, 0, 0, '', 1, 0, $morecss);

-			$out .= '<input type="submit" class="button smallpaddingimp" value="' . $langs->trans("Modify") . '">';

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

+			$out .= $formproject->select_projects($socid, $selected, $htmlname, $maxlength, 0, 1, $discard_closed, $forcefocus, 0, 0, '', 1);

+			$out .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';

@@ -5656,3 +4528,5 @@
-		} else {

-			$out .= '<span class="project_head_block">';

-			if ($selected) {

+		}

+		else

+		{

+			if ($selected)

+			{

@@ -5660,0 +4535 @@
+				//print '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$selected.'">'.$projet->title.'</a>';

@@ -5662,7 +4537,9 @@
-			} else {

-				$out .= '<span class="opacitymedium">' . $textifnoproject . '</span>';

-			}

-			$out .= '</span>';

-		}

-

-		if (empty($nooutput)) {

+			}

+			else

+			{

+				$out .= "&nbsp;";

+			}

+		}

+

+		if (empty($nooutput))

+		{

@@ -5675,20 +4552,13 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-

-	/**

-	 * Show a form to select payment conditions

-	 *

-	 * @param int 		$page 				Page

-	 * @param string 	$selected 			Id condition pre-selectionne

-	 * @param string 	$htmlname 			Name of select html field

-	 * @param int 		$addempty 			Add empty entry

-	 * @param string 	$type 				Type ('direct-debit' or 'bank-transfer')

-	 * @param int 		$filtertype 		If > 0, include payment terms with deposit percentage (for objects other than invoices and invoice templates)

-	 * @param int	 	$deposit_percent 	< 0 : deposit_percent input makes no sense (for example, in list filters)

-	 *                                		0 : use default deposit percentage from entry

-	 *                                		> 0 : force deposit percentage (for example, from company object)

-	 * @param int 		$nooutput 			No print is done. String is returned.

-	 * @return string                   	HTML output or ''

-	 */

-	public function form_conditions_reglement($page, $selected = '', $htmlname = 'cond_reglement_id', $addempty = 0, $type = '', $filtertype = -1, $deposit_percent = -1, $nooutput = 0)

-	{

-		// phpcs:enable

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+	/**

+	 *	Show a form to select payment conditions

+	 *

+	 *  @param	int		$page        	Page

+	 *  @param  string	$selected    	Id condition pre-selectionne

+	 *  @param  string	$htmlname    	Name of select html field

+	 *	@param	int		$addempty		Add empty entry

+	 *  @return	void

+	 */

+    public function form_conditions_reglement($page, $selected = '', $htmlname = 'cond_reglement_id', $addempty = 0)

+	{

+        // phpcs:enable

@@ -5696,15 +4566,13 @@
-

-		$out = '';

-

-		if ($htmlname != "none") {

-			$out .= '<form method="POST" action="' . $page . '">';

-			$out .= '<input type="hidden" name="action" value="setconditions">';

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

-			if ($type) {

-				$out .= '<input type="hidden" name="type" value="' . dol_escape_htmltag($type) . '">';

-			}

-			$out .= $this->getSelectConditionsPaiements($selected, $htmlname, $filtertype, $addempty, 0, '', $deposit_percent);

-			$out .= '<input type="submit" class="button valignmiddle smallpaddingimp" value="' . $langs->trans("Modify") . '">';

-			$out .= '</form>';

-		} else {

-			if ($selected) {

+		if ($htmlname != "none")

+		{

+			print '<form method="post" action="'.$page.'">';

+			print '<input type="hidden" name="action" value="setconditions">';

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

+			$this->select_conditions_paiements($selected, $htmlname, -1, $addempty);

+			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';

+			print '</form>';

+		}

+		else

+		{

+			if ($selected)

+			{

@@ -5712,12 +4580 @@
-				if (isset($this->cache_conditions_paiements[$selected])) {

-					$label = $this->cache_conditions_paiements[$selected]['label'];

-

-					if (!empty($this->cache_conditions_paiements[$selected]['deposit_percent'])) {

-						$label = str_replace('__DEPOSIT_PERCENT__', $deposit_percent > 0 ? $deposit_percent : $this->cache_conditions_paiements[$selected]['deposit_percent'], $label);

-					}

-

-					$out .= $label;

-				} else {

-					$langs->load('errors');

-					$out .= $langs->trans('ErrorNotInDictionaryPaymentConditions');

-				}

+				print $this->cache_conditions_paiements[$selected]['label'];

@@ -5725,13 +4582,6 @@
-				$out .= '&nbsp;';

-			}

-		}

-

-		if (empty($nooutput)) {

-			print $out;

-			return '';

-		}

-		return $out;

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-

+				print "&nbsp;";

+			}

+		}

+	}

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -5741,9 +4591,9 @@
-	 * @param 	int 		$page 		Page

-	 * @param 	string 		$selected 	Id condition pre-selectionne

-	 * @param 	string 		$htmlname 	Name of select html field

-	 * @param 	int 		$addempty 	Add an empty entry

-	 * @return  void

-	 */

-	public function form_availability($page, $selected = '', $htmlname = 'availability', $addempty = 0)

-	{

-		// phpcs:enable

+	 *  @param  int		$page        	Page

+	 *  @param  string	$selected    	Id condition pre-selectionne

+	 *  @param  string	$htmlname    	Name of select html field

+	 *	@param	int		$addempty		Ajoute entree vide

+	 *  @return	void

+	 */

+    public function form_availability($page, $selected = '', $htmlname = 'availability', $addempty = 0)

+	{

+        // phpcs:enable

@@ -5751,2 +4601,3 @@
-		if ($htmlname != "none") {

-			print '<form method="post" action="' . $page . '">';

+		if ($htmlname != "none")

+		{

+			print '<form method="post" action="'.$page.'">';

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

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

@@ -5756,2 +4607 @@
-			print '<input type="submit" name="modify" class="button smallpaddingimp" value="' . $langs->trans("Modify") . '">';

-			print '<input type="submit" name="cancel" class="button smallpaddingimp" value="' . $langs->trans("Cancel") . '">';

+			print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';

@@ -5759,2 +4609,5 @@
-		} else {

-			if ($selected) {

+		}

+		else

+		{

+			if ($selected)

+			{

@@ -5773,8 +4626,8 @@
-	 * @param string $page Page

-	 * @param string $selected Id condition pre-selectionne

-	 * @param string $htmlname Name of select html field

-	 * @param int $addempty Add empty entry

-	 * @return    void

-	 */

-	public function formInputReason($page, $selected = '', $htmlname = 'demandreason', $addempty = 0)

-	{

+	 *  @param  string	$page        	Page

+	 *  @param  string	$selected    	Id condition pre-selectionne

+	 *  @param  string	$htmlname    	Name of select html field

+	 *  @param	int		$addempty		Add empty entry

+	 *  @return	void

+     */

+    public function formInputReason($page, $selected = '', $htmlname = 'demandreason', $addempty = 0)

+    {

@@ -5782,2 +4635,3 @@
-		if ($htmlname != "none") {

-			print '<form method="post" action="' . $page . '">';

+		if ($htmlname != "none")

+		{

+			print '<form method="post" action="'.$page.'">';

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

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

@@ -5787 +4641 @@
-			print '<input type="submit" class="button smallpaddingimp" value="' . $langs->trans("Modify") . '">';

+			print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';

@@ -5789,2 +4643,5 @@
-		} else {

-			if ($selected) {

+		}

+		else

+		{

+			if ($selected)

+			{

@@ -5792,2 +4649,4 @@
-				foreach ($this->cache_demand_reason as $key => $val) {

-					if ($val['id'] == $selected) {

+				foreach ($this->cache_demand_reason as $key => $val)

+				{

+					if ($val['id'] == $selected)

+					{

@@ -5804,2 +4663 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -5809,13 +4667,12 @@
-	 * @param string $page Page

-	 * @param string $selected Date preselected

-	 * @param string $htmlname Html name of date input fields or 'none'

-	 * @param int $displayhour Display hour selector

-	 * @param int $displaymin Display minutes selector

-	 * @param int $nooutput 1=No print output, return string

-	 * @param string $type 'direct-debit' or 'bank-transfer'

-	 * @return    string

-	 * @see        selectDate()

-	 */

-	public function form_date($page, $selected, $htmlname, $displayhour = 0, $displaymin = 0, $nooutput = 0, $type = '')

-	{

-		// phpcs:enable

+	 *    @param	string		$page        	Page

+	 *    @param	string		$selected    	Date preselected

+	 *    @param    string		$htmlname    	Html name of date input fields or 'none'

+	 *    @param    int			$displayhour 	Display hour selector

+	 *    @param    int			$displaymin		Display minutes selector

+	 *    @param	int			$nooutput		1=No print output, return string

+	 *    @return	string

+	 *    @see		selectDate()

+	 */

+    public function form_date($page, $selected, $htmlname, $displayhour = 0, $displaymin = 0, $nooutput = 0)

+	{

+        // phpcs:enable

@@ -5826,8 +4683,6 @@
-		if ($htmlname != "none") {

-			$ret .= '<form method="POST" action="' . $page . '" name="form' . $htmlname . '">';

-			$ret .= '<input type="hidden" name="action" value="set' . $htmlname . '">';

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

-			if ($type) {

-				$ret .= '<input type="hidden" name="type" value="' . dol_escape_htmltag($type) . '">';

-			}

-			$ret .= '<table class="nobordernopadding">';

+		if ($htmlname != "none")

+		{

+			$ret .= '<form method="post" action="'.$page.'" name="form'.$htmlname.'">';

+			$ret .= '<input type="hidden" name="action" value="set'.$htmlname.'">';

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

+			$ret .= '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';

@@ -5835 +4690 @@
-			$ret .= $this->selectDate($selected, $htmlname, $displayhour, $displaymin, 1, 'form' . $htmlname, 1, 0);

+			$ret .= $this->selectDate($selected, $htmlname, $displayhour, $displaymin, 1, 'form'.$htmlname, 1, 0);

@@ -5837 +4692 @@
-			$ret .= '<td class="left"><input type="submit" class="button smallpaddingimp" value="' . $langs->trans("Modify") . '"></td>';

+			$ret .= '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';

@@ -5839,11 +4694,8 @@
-		} else {

-			if ($displayhour) {

-				$ret .= dol_print_date($selected, 'dayhour');

-			} else {

-				$ret .= dol_print_date($selected, 'day');

-			}

-		}

-

-		if (empty($nooutput)) {

-			print $ret;

-		}

+		}

+		else

+		{

+			if ($displayhour) $ret .= dol_print_date($selected, 'dayhour');

+			else $ret .= dol_print_date($selected, 'day');

+		}

+

+		if (empty($nooutput)) print $ret;

@@ -5854,2 +4706 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -5859,10 +4710,10 @@
-	 * @param string $page Page

-	 * @param string $selected Id of user preselected

-	 * @param string $htmlname Name of input html field. If 'none', we just output the user link.

-	 * @param array $exclude List of users id to exclude

-	 * @param array $include List of users id to include

-	 * @return    void

-	 */

-	public function form_users($page, $selected = '', $htmlname = 'userid', $exclude = array(), $include = array())

-	{

-		// phpcs:enable

+	 *  @param	string	$page        	Page

+	 *  @param  string	$selected    	Id of user preselected

+	 *  @param  string	$htmlname    	Name of input html field. If 'none', we just output the user link.

+	 *  @param  array	$exclude		List of users id to exclude

+	 *  @param  array	$include        List of users id to include

+	 *  @return	void

+	 */

+    public function form_users($page, $selected = '', $htmlname = 'userid', $exclude = '', $include = '')

+	{

+        // phpcs:enable

@@ -5871,4 +4722,5 @@
-		if ($htmlname != "none") {

-			print '<form method="POST" action="' . $page . '" name="form' . $htmlname . '">';

-			print '<input type="hidden" name="action" value="set' . $htmlname . '">';

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

+		if ($htmlname != "none")

+		{

+			print '<form method="POST" action="'.$page.'" name="form'.$htmlname.'">';

+			print '<input type="hidden" name="action" value="set'.$htmlname.'">';

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

@@ -5876 +4728 @@
-			print '<input type="submit" class="button smallpaddingimp valignmiddle" value="' . $langs->trans("Modify") . '">';

+			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';

@@ -5878,3 +4730,6 @@
-		} else {

-			if ($selected) {

-				require_once DOL_DOCUMENT_ROOT . '/user/class/user.class.php';

+		}

+		else

+		{

+			if ($selected)

+			{

+				require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';

@@ -5891,2 +4746 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -5896,13 +4750,11 @@
-	 * @param string $page Page

-	 * @param string $selected Id mode pre-selectionne

-	 * @param string $htmlname Name of select html field

-	 * @param string $filtertype To filter on field type in llx_c_paiement ('CRDT' or 'DBIT' or array('code'=>xx,'label'=>zz))

-	 * @param int $active Active or not, -1 = all

-	 * @param int $addempty 1=Add empty entry

-	 * @param string $type Type ('direct-debit' or 'bank-transfer')

-	 * @param int $nooutput 1=Return string, no output

-	 * @return    string                    HTML output or ''

-	 */

-	public function form_modes_reglement($page, $selected = '', $htmlname = 'mode_reglement_id', $filtertype = '', $active = 1, $addempty = 0, $type = '', $nooutput = 0)

-	{

-		// phpcs:enable

+	 *    @param	string	$page        	Page

+	 *    @param    int		$selected    	Id mode pre-selectionne

+	 *    @param    string	$htmlname    	Name of select html field

+	 *    @param  	string	$filtertype		To filter on field type in llx_c_paiement (array('code'=>xx,'label'=>zz))

+	 *    @param    int     $active         Active or not, -1 = all

+	 *    @param   int     $addempty       1=Add empty entry

+	 *    @return	void

+	 */

+    public function form_modes_reglement($page, $selected = '', $htmlname = 'mode_reglement_id', $filtertype = '', $active = 1, $addempty = 0)

+	{

+        // phpcs:enable

@@ -5910,14 +4762,13 @@
-

-		$out = '';

-		if ($htmlname != "none") {

-			$out .= '<form method="POST" action="' . $page . '">';

-			$out .= '<input type="hidden" name="action" value="setmode">';

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

-			if ($type) {

-				$out .= '<input type="hidden" name="type" value="' . dol_escape_htmltag($type) . '">';

-			}

-			$out .= $this->select_types_paiements($selected, $htmlname, $filtertype, 0, $addempty, 0, 0, $active, '', 1);

-			$out .= '<input type="submit" class="button smallpaddingimp valignmiddle" value="' . $langs->trans("Modify") . '">';

-			$out .= '</form>';

-		} else {

-			if ($selected) {

+		if ($htmlname != "none")

+		{

+			print '<form method="POST" action="'.$page.'">';

+			print '<input type="hidden" name="action" value="setmode">';

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

+			$this->select_types_paiements($selected, $htmlname, $filtertype, 0, $addempty, 0, 0, $active);

+			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';

+			print '</form>';

+		}

+		else

+		{

+			if ($selected)

+			{

@@ -5925,38 +4776 @@
-				$out .= $this->cache_types_paiements[$selected]['label'];

-			} else {

-				$out .= "&nbsp;";

-			}

-		}

-

-		if ($nooutput) {

-			return $out;

-		} else {

-			print $out;

-		}

-		return '';

-	}

-

-	/**

-	 *    Show form with transport mode

-	 *

-	 * @param string $page Page

-	 * @param string $selected Id mode pre-select

-	 * @param string $htmlname Name of select html field

-	 * @param int $active Active or not, -1 = all

-	 * @param int $addempty 1=Add empty entry

-	 * @return    void

-	 */

-	public function formSelectTransportMode($page, $selected = '', $htmlname = 'transport_mode_id', $active = 1, $addempty = 0)

-	{

-		global $langs;

-		if ($htmlname != "none") {

-			print '<form method="POST" action="' . $page . '">';

-			print '<input type="hidden" name="action" value="settransportmode">';

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

-			$this->selectTransportMode($selected, $htmlname, 0, $addempty, 0, 0, $active);

-			print '<input type="submit" class="button smallpaddingimp valignmiddle" value="' . $langs->trans("Modify") . '">';

-			print '</form>';

-		} else {

-			if ($selected) {

-				$this->load_cache_transport_mode();

-				print $this->cache_transport_mode[$selected]['label'];

+				print $this->cache_types_paiements[$selected]['label'];

@@ -5969,2 +4783 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -5974,8 +4787,8 @@
-	 * @param string $page Page

-	 * @param string $selected code pre-selectionne

-	 * @param string $htmlname Name of select html field

-	 * @return    void

-	 */

-	public function form_multicurrency_code($page, $selected = '', $htmlname = 'multicurrency_code')

-	{

-		// phpcs:enable

+	 *    @param	string	$page        	Page

+	 *    @param    string	$selected    	code pre-selectionne

+	 *    @param    string	$htmlname    	Name of select html field

+	 *    @return	void

+	 */

+    public function form_multicurrency_code($page, $selected = '', $htmlname = 'multicurrency_code')

+	{

+        // phpcs:enable

@@ -5983,2 +4796,3 @@
-		if ($htmlname != "none") {

-			print '<form method="POST" action="' . $page . '">';

+		if ($htmlname != "none")

+		{

+			print '<form method="POST" action="'.$page.'">';

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

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

@@ -5988 +4802 @@
-			print '<input type="submit" class="button smallpaddingimp valignmiddle" value="' . $langs->trans("Modify") . '">';

+			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';

@@ -5990 +4804,3 @@
-		} else {

+		}

+		else

+		{

@@ -5996,2 +4812 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -6001,9 +4816,9 @@
-	 * @param string $page Page

-	 * @param double $rate Current rate

-	 * @param string $htmlname Name of select html field

-	 * @param string $currency Currency code to explain the rate

-	 * @return    void

-	 */

-	public function form_multicurrency_rate($page, $rate = 0.0, $htmlname = 'multicurrency_tx', $currency = '')

-	{

-		// phpcs:enable

+	 *    @param	string	$page        	Page

+	 *    @param    double	$rate	    	Current rate

+	 *    @param    string	$htmlname    	Name of select html field

+	 *    @param    string  $currency       Currency code to explain the rate

+	 *    @return	void

+	 */

+    public function form_multicurrency_rate($page, $rate = '', $htmlname = 'multicurrency_tx', $currency = '')

+	{

+        // phpcs:enable

@@ -6012,2 +4827,3 @@
-		if ($htmlname != "none") {

-			print '<form method="POST" action="' . $page . '">';

+		if ($htmlname != "none")

+		{

+			print '<form method="POST" action="'.$page.'">';

@@ -6015,2 +4831,2 @@
-			print '<input type="hidden" name="token" value="' . newToken() . '">';

-			print '<input type="text" class="maxwidth100" name="' . $htmlname . '" value="' . (!empty($rate) ? price(price2num($rate, 'CU')) : 1) . '" /> ';

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

+			print '<input type="text" class="maxwidth100" name="'.$htmlname.'" value="'.(!empty($rate) ? price(price2num($rate, 'CR')) : 1).'" /> ';

@@ -6018,2 +4834,2 @@
-			print '<option value="1">Change ' . $langs->trans("PriceUHT") . ' of lines</option>';

-			print '<option value="2">Change ' . $langs->trans("PriceUHTCurrency") . ' of lines</option>';

+			print '<option value="1">'.$currency.' > '.$conf->currency.'</option>';

+			print '<option value="2">'.$conf->currency.' > '.$currency.'</option>';

@@ -6021 +4837 @@
-			print '<input type="submit" class="button smallpaddingimp valignmiddle" value="' . $langs->trans("Modify") . '">';

+			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';

@@ -6023,7 +4839,10 @@
-		} else {

-			if (!empty($rate)) {

-				print price($rate, 1, $langs, 0, 0);

-				if ($currency && $rate != 1) {

-					print ' &nbsp; (' . price($rate, 1, $langs, 0, 0) . ' ' . $currency . ' = 1 ' . $conf->currency . ')';

-				}

-			} else {

+		}

+		else

+		{

+			if (!empty($rate))

+			{

+				print price($rate, 1, $langs, 1, 0);

+				if ($currency && $rate != 1) print ' &nbsp; ('.price($rate, 1, $langs, 1, 0).' '.$currency.' = 1 '.$conf->currency.')';

+			}

+			else

+			{

@@ -6036,20 +4855,19 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-

-	/**

-	 *    Show a select box with available absolute discounts

-	 *

-	 * @param string $page Page URL where form is shown

-	 * @param int $selected Value pre-selected

-	 * @param string $htmlname Name of SELECT component. If 'none', not changeable. Example 'remise_id'.

-	 * @param int $socid Third party id

-	 * @param float $amount Total amount available

-	 * @param string $filter SQL filter on discounts

-	 * @param int $maxvalue Max value for lines that can be selected

-	 * @param string $more More string to add

-	 * @param int $hidelist 1=Hide list

-	 * @param int $discount_type 0 => customer discount, 1 => supplier discount

-	 * @return    void

-	 */

-	public function form_remise_dispo($page, $selected, $htmlname, $socid, $amount, $filter = '', $maxvalue = 0, $more = '', $hidelist = 0, $discount_type = 0)

-	{

-		// phpcs:enable

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+	/**

+	 *	Show a select box with available absolute discounts

+	 *

+	 *  @param  string	$page        	Page URL where form is shown

+	 *  @param  int		$selected    	Value pre-selected

+	 *	@param  string	$htmlname    	Name of SELECT component. If 'none', not changeable. Example 'remise_id'.

+	 *	@param	int		$socid			Third party id

+	 * 	@param	float	$amount			Total amount available

+	 * 	@param	string	$filter			SQL filter on discounts

+	 * 	@param	int		$maxvalue		Max value for lines that can be selected

+	 *  @param  string	$more           More string to add

+	 *  @param  int     $hidelist       1=Hide list

+	 *  @param	int		$discount_type	0 => customer discount, 1 => supplier discount

+	 *  @return	void

+	 */

+    public function form_remise_dispo($page, $selected, $htmlname, $socid, $amount, $filter = '', $maxvalue = 0, $more = '', $hidelist = 0, $discount_type = 0)

+	{

+        // phpcs:enable

@@ -6057,2 +4875,3 @@
-		if ($htmlname != "none") {

-			print '<form method="post" action="' . $page . '">';

+		if ($htmlname != "none")

+		{

+			print '<form method="post" action="'.$page.'">';

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

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

@@ -6063,12 +4882,9 @@
-				if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {

-					if (!$filter || $filter == "fk_invoice_supplier_source IS NULL") {

-						$translationKey = 'HasAbsoluteDiscountFromSupplier'; // If we want deposit to be substracted to payments only and not to total of final invoice

-					} else {

-						$translationKey = 'HasCreditNoteFromSupplier';

-					}

-				} else {

-					if (!$filter || $filter == "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')") {

-						$translationKey = 'HasAbsoluteDiscountFromSupplier';

-					} else {

-						$translationKey = 'HasCreditNoteFromSupplier';

-					}

+				if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))

+				{

+					if (!$filter || $filter == "fk_invoice_supplier_source IS NULL") $translationKey = 'HasAbsoluteDiscountFromSupplier'; // If we want deposit to be substracted to payments only and not to total of final invoice

+					else $translationKey = 'HasCreditNoteFromSupplier';

+				}

+				else

+				{

+					if (!$filter || $filter == "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')") $translationKey = 'HasAbsoluteDiscountFromSupplier';

+					else $translationKey = 'HasCreditNoteFromSupplier';

@@ -6077,12 +4893,9 @@
-				if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {

-					if (!$filter || $filter == "fk_facture_source IS NULL") {

-						$translationKey = 'CompanyHasAbsoluteDiscount'; // If we want deposit to be substracted to payments only and not to total of final invoice

-					} else {

-						$translationKey = 'CompanyHasCreditNote';

-					}

-				} else {

-					if (!$filter || $filter == "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')") {

-						$translationKey = 'CompanyHasAbsoluteDiscount';

-					} else {

-						$translationKey = 'CompanyHasCreditNote';

-					}

+				if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))

+				{

+					if (!$filter || $filter == "fk_facture_source IS NULL") $translationKey = 'CompanyHasAbsoluteDiscount'; // If we want deposit to be substracted to payments only and not to total of final invoice

+					else $translationKey = 'CompanyHasCreditNote';

+				}

+				else

+				{

+					if (!$filter || $filter == "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')") $translationKey = 'CompanyHasAbsoluteDiscount';

+					else $translationKey = 'CompanyHasCreditNote';

@@ -6092,3 +4905 @@
-			if (empty($hidelist)) {

-				print ' ';

-			}

+			if (empty($hidelist)) print ': ';

@@ -6096 +4907,2 @@
-			if (empty($hidelist)) {

+			if (empty($hidelist))

+			{

@@ -6098 +4910 @@
-				$newfilter = 'discount_type=' . intval($discount_type);

+				$newfilter = 'discount_type='.intval($discount_type);

@@ -6104,4 +4916 @@
-				if ($filter) {

-					$newfilter .= ' AND (' . $filter . ')';

-				}

-				// output the combo of discounts

+				if ($filter) $newfilter .= ' AND ('.$filter.')';

@@ -6109,8 +4918,7 @@
-				if ($nbqualifiedlines > 0) {

-					print ' &nbsp; <input type="submit" class="button smallpaddingimp" value="' . dol_escape_htmltag($langs->trans("UseLine")) . '"';

-					if (!empty($discount_type) && $filter && $filter != "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')") {

-						print ' title="' . $langs->trans("UseCreditNoteInInvoicePayment") . '"';

-					}

-					if (empty($discount_type) && $filter && $filter != "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')") {

-						print ' title="' . $langs->trans("UseCreditNoteInInvoicePayment") . '"';

-					}

+				if ($nbqualifiedlines > 0)

+				{

+					print ' &nbsp; <input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("UseLine")).'"';

+					if (!empty($discount_type) && $filter && $filter != "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')")

+						print ' title="'.$langs->trans("UseCreditNoteInInvoicePayment").'"';

+					if (empty($discount_type) && $filter && $filter != "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')")

+						print ' title="'.$langs->trans("UseCreditNoteInInvoicePayment").'"';

@@ -6122 +4930,2 @@
-			if ($more) {

+			if ($more)

+			{

@@ -6128,2 +4937,5 @@
-		} else {

-			if ($selected) {

+		}

+		else

+		{

+			if ($selected)

+			{

@@ -6131 +4943,3 @@
-			} else {

+			}

+			else

+			{

@@ -6138,14 +4952,13 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-

-	/**

-	 *  Show forms to select a contact

-	 *

-	 * @param string $page Page

-	 * @param Societe $societe Filter on third party

-	 * @param string $selected Id contact pre-selectionne

-	 * @param string $htmlname Name of HTML select. If 'none', we just show contact link.

-	 * @return    void

-	 */

-	public function form_contacts($page, $societe, $selected = '', $htmlname = 'contactid')

-	{

-		// phpcs:enable

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     *  Show forms to select a contact

+     *

+     *  @param	string		$page        	Page

+     *  @param	Societe		$societe		Filter on third party

+     *  @param    int			$selected    	Id contact pre-selectionne

+     *  @param    string		$htmlname    	Name of HTML select. If 'none', we just show contact link.

+     *  @return	void

+     */

+    public function form_contacts($page, $societe, $selected = '', $htmlname = 'contactid')

+    {

+        // phpcs:enable

@@ -6154,2 +4967,3 @@
-		if ($htmlname != "none") {

-			print '<form method="post" action="' . $page . '">';

+		if ($htmlname != "none")

+		{

+			print '<form method="post" action="'.$page.'">';

@@ -6157,2 +4971,2 @@
-			print '<input type="hidden" name="token" value="' . newToken() . '">';

-			print '<table class="nobordernopadding">';

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

+			print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';

@@ -6160,5 +4974,5 @@
-			print $this->selectcontacts($societe->id, $selected, $htmlname);

-			$num = $this->num;

-			if ($num == 0) {

-				$addcontact = (getDolGlobalString('SOCIETE_ADDRESSES_MANAGEMENT') ? $langs->trans("AddContact") : $langs->trans("AddContactAddress"));

-				print '<a href="' . DOL_URL_ROOT . '/contact/card.php?socid=' . $societe->id . '&amp;action=create&amp;backtoreferer=1">' . $addcontact . '</a>';

+			$num = $this->select_contacts($societe->id, $selected, $htmlname);

+			if ($num == 0)

+			{

+				$addcontact = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("AddContact") : $langs->trans("AddContactAddress"));

+				print '<a href="'.DOL_URL_ROOT.'/contact/card.php?socid='.$societe->id.'&amp;action=create&amp;backtoreferer=1">'.$addcontact.'</a>';

@@ -6167 +4981 @@
-			print '<td class="left"><input type="submit" class="button smallpaddingimp" value="' . $langs->trans("Modify") . '"></td>';

+			print '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';

@@ -6169,3 +4983,6 @@
-		} else {

-			if ($selected) {

-				require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';

+		}

+		else

+		{

+			if ($selected)

+			{

+				require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';

@@ -6181,2 +4998 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -6186,16 +5002,14 @@
-	 * @param string 	$page 					Page

-	 * @param string 	$selected 				Id preselected

-	 * @param string 	$htmlname 				Name of HTML select

-	 * @param string	$filter 				Optional filters criteras. WARNING: To avoid SQL injection, only few chars [.a-z0-9 =<>()] are allowed here (example: 's.rowid <> x', 's.client IN (1,3)'). Do not use a filter coming from input of users.

-	 * @param int 		$showempty 				Add an empty field

-	 * @param int 		$showtype 				Show third party type in combolist (customer, prospect or supplier)

-	 * @param int 		$forcecombo 			Force to use combo box

-	 * @param array 	$events 				Event options. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))

-	 * @param int 		$nooutput 				No print output. Return it only.

-	 * @param array 	$excludeids 			Exclude IDs from the select combo

-	 * @param string 	$textifnothirdparty 	Text to show if no thirdparty

-	 * @return    string                        HTML output or ''

-	 */

-	public function form_thirdparty($page, $selected = '', $htmlname = 'socid', $filter = '', $showempty = 0, $showtype = 0, $forcecombo = 0, $events = array(), $nooutput = 0, $excludeids = array(), $textifnothirdparty = '')

-	{

-		// phpcs:enable

+	 *  @param	string	$page       	Page

+	 *  @param  string	$selected   	Id preselected

+	 *  @param  string	$htmlname		Name of HTML select

+	 *  @param  string	$filter         optional filters criteras

+	 *	@param	int		$showempty		Add an empty field

+	 * 	@param	int		$showtype		Show third party type in combolist (customer, prospect or supplier)

+	 * 	@param	int		$forcecombo		Force to use combo box

+	 *  @param	array	$events			Event options. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))

+	 *  @param  int     $nooutput       No print output. Return it only.

+	 *  @return	void|string

+	 */

+    public function form_thirdparty($page, $selected = '', $htmlname = 'socid', $filter = '', $showempty = 0, $showtype = 0, $forcecombo = 0, $events = array(), $nooutput = 0)

+	{

+        // phpcs:enable

@@ -6205,2 +5019,3 @@
-		if ($htmlname != "none") {

-			$out .= '<form method="post" action="' . $page . '">';

+		if ($htmlname != "none")

+		{

+			$out .= '<form method="post" action="'.$page.'">';

@@ -6208,3 +5023,3 @@
-			$out .= '<input type="hidden" name="token" value="' . newToken() . '">';

-			$out .= $this->select_company($selected, $htmlname, $filter, $showempty, $showtype, $forcecombo, $events, 0, 'minwidth100', '', '', 1, array(), false, $excludeids);

-			$out .= '<input type="submit" class="button smallpaddingimp valignmiddle" value="' . $langs->trans("Modify") . '">';

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

+			$out .= $this->select_company($selected, $htmlname, $filter, $showempty, $showtype, $forcecombo, $events);

+			$out .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';

@@ -6212,3 +5027,6 @@
-		} else {

-			if ($selected) {

-				require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';

+		}

+		else

+		{

+			if ($selected)

+			{

+				require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';

@@ -6217,17 +5035,13 @@
-				$out .= $soc->getNomUrl(0, '');

-			} else {

-				$out .= '<span class="opacitymedium">' . $textifnothirdparty . '</span>';

-			}

-		}

-

-		if ($nooutput) {

-			return $out;

-		} else {

-			print $out;

-		}

-

-		return '';

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-

+				$out .= $soc->getNomUrl($langs);

+			}

+			else

+			{

+				$out .= "&nbsp;";

+			}

+		}

+

+		if ($nooutput) return $out;

+		else print $out;

+	}

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -6237,8 +5051,8 @@
-	 * @param string $selected preselected currency code

-	 * @param string $htmlname name of HTML select list

-	 * @deprecated

-	 * @return    void

-	 */

-	public function select_currency($selected = '', $htmlname = 'currency_id')

-	{

-		// phpcs:enable

+	 *    @param	string	$selected    preselected currency code

+	 *    @param    string	$htmlname    name of HTML select list

+     *    @deprecated

+	 *    @return	void

+	 */

+    public function select_currency($selected = '', $htmlname = 'currency_id')

+	{

+        // phpcs:enable

@@ -6251,7 +5065,6 @@
-	 * @param string $selected preselected currency code

-	 * @param string $htmlname name of HTML select list

-	 * @param int	 $mode 0 = Add currency symbol into label, 1 = Add 3 letter iso code

-	 * @param string $useempty '1'=Allow empty value

-	 * @return    string

-	 */

-	public function selectCurrency($selected = '', $htmlname = 'currency_id', $mode = 0, $useempty = '')

+	 *  @param	string	$selected    preselected currency code

+	 *  @param  string	$htmlname    name of HTML select list

+	 *  @param  string  $mode        0 = Add currency symbol into label, 1 = Add 3 letter iso code

+	 * 	@return	string

+	 */

+    public function selectCurrency($selected = '', $htmlname = 'currency_id', $mode = 0)

@@ -6265,22 +5078,22 @@
-		if ($selected == 'euro' || $selected == 'euros') {

-			$selected = 'EUR'; // Pour compatibilite

-		}

-

-		$out .= '<select class="flat maxwidth200onsmartphone minwidth300" name="' . $htmlname . '" id="' . $htmlname . '">';

-		if ($useempty) {

-			$out .= '<option value="-1" selected></option>';

-		}

-		foreach ($langs->cache_currencies as $code_iso => $currency) {

-			$labeltoshow = $currency['label'];

-			if ($mode == 1) {

-				$labeltoshow .= ' <span class="opacitymedium">(' . $code_iso . ')</span>';

-			} else {

-				$labeltoshow .= ' <span class="opacitymedium">(' . $langs->getCurrencySymbol($code_iso) . ')</span>';

-			}

-

-			if ($selected && $selected == $code_iso) {

-				$out .= '<option value="' . $code_iso . '" selected data-html="' . dol_escape_htmltag($labeltoshow) . '">';

-			} else {

-				$out .= '<option value="' . $code_iso . '" data-html="' . dol_escape_htmltag($labeltoshow) . '">';

-			}

-			$out .= $labeltoshow;

+		if ($selected == 'euro' || $selected == 'euros') $selected = 'EUR'; // Pour compatibilite

+

+		$out .= '<select class="flat maxwidth200onsmartphone minwidth300" name="'.$htmlname.'" id="'.$htmlname.'">';

+		foreach ($langs->cache_currencies as $code_iso => $currency)

+		{

+			if ($selected && $selected == $code_iso)

+			{

+				$out .= '<option value="'.$code_iso.'" selected>';

+			}

+			else

+			{

+				$out .= '<option value="'.$code_iso.'">';

+			}

+			$out .= $currency['label'];

+			if ($mode == 1)

+			{

+			    $out .= ' ('.$code_iso.')';

+			}

+			else

+			{

+                $out .= ' ('.$langs->getCurrencySymbol($code_iso).')';

+			}

@@ -6290,3 +5103 @@
-		if ($user->admin) {

-			$out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

-		}

+		if ($user->admin) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

@@ -6295 +5106 @@
-		include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

+		include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

@@ -6302,14 +5113,10 @@
-	 *    Return array of currencies in user language

-	 *

-	 * @param string $selected Preselected currency code

-	 * @param string $htmlname Name of HTML select list

-	 * @param integer $useempty 1=Add empty line

-	 * @param string $filter Optional filters criteras (example: 'code <> x', ' in (1,3)')

-	 * @param bool $excludeConfCurrency false = If company current currency not in table, we add it into list. Should always be available.

-	 *                                  true = we are in currency_rate update , we don't want to see conf->currency in select

-	 * @param string $morecss More css

-	 * @return    string

-	 */

-	public function selectMultiCurrency($selected = '', $htmlname = 'multicurrency_code', $useempty = 0, $filter = '', $excludeConfCurrency = false, $morecss = '')

-	{

-		global $conf, $langs;

+	 *	Return array of currencies in user language

+	 *

+	 *  @param	string	$selected    preselected currency code

+	 *  @param  string	$htmlname    name of HTML select list

+	 *  @param  integer	$useempty    1=Add empty line

+	 * 	@return	string

+	 */

+    public function selectMultiCurrency($selected = '', $htmlname = 'multicurrency_code', $useempty = 0)

+	{

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

@@ -6321,10 +5128,6 @@
-		$sql = "SELECT code FROM " . $this->db->prefix() . "multicurrency";

-		$sql .= " WHERE entity IN ('" . getEntity('mutlicurrency') . "')";

-		if ($filter) {

-			$sql .= " AND " . $filter;

-		}

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

-		if ($resql) {

-			while ($obj = $this->db->fetch_object($resql)) {

-				$TCurrency[$obj->code] = $obj->code;

-			}

+		$sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'multicurrency';

+		$sql .= " WHERE entity IN ('".getEntity('mutlicurrency')."')";

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

+		if ($resql)

+		{

+			while ($obj = $db->fetch_object($resql)) $TCurrency[$obj->code] = $obj->code;

@@ -6334,4 +5137,2 @@
-		$out .= '<select class="flat' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '" id="' . $htmlname . '">';

-		if ($useempty) {

-			$out .= '<option value="">&nbsp;</option>';

-		}

+		$out .= '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';

+		if ($useempty) $out .= '<option value="">&nbsp;</option>';

@@ -6339 +5140,2 @@
-		if (!in_array($conf->currency, $TCurrency) && !$excludeConfCurrency) {

+		if (!in_array($conf->currency, $TCurrency))

+		{

@@ -6342,8 +5144,8 @@
-		if (count($TCurrency) > 0) {

-			foreach ($langs->cache_currencies as $code_iso => $currency) {

-				if (isset($TCurrency[$code_iso])) {

-					if (!empty($selected) && $selected == $code_iso) {

-						$out .= '<option value="' . $code_iso . '" selected="selected">';

-					} else {

-						$out .= '<option value="' . $code_iso . '">';

-					}

+		if (count($TCurrency) > 0)

+		{

+			foreach ($langs->cache_currencies as $code_iso => $currency)

+			{

+				if (isset($TCurrency[$code_iso]))

+				{

+					if (!empty($selected) && $selected == $code_iso) $out .= '<option value="'.$code_iso.'" selected="selected">';

+					else $out .= '<option value="'.$code_iso.'">';

@@ -6352 +5154 @@
-					$out .= ' (' . $langs->getCurrencySymbol($code_iso) . ')';

+					$out .= ' ('.$langs->getCurrencySymbol($code_iso).')';

@@ -6359 +5160,0 @@
-

@@ -6361 +5162 @@
-		include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

+		include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

@@ -6367,2 +5168 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -6372,7 +5172,7 @@
-	 * @param 	string 	$country_code 		Country code with quotes ("'CA'", or "'CA,IN,...'")

-	 * @return  int                         Nb of loaded lines, 0 if already loaded, <0 if KO

-	 */

-	public function load_cache_vatrates($country_code)

-	{

-		// phpcs:enable

-		global $langs, $user;

+	 *  @param	string	$country_code		Country code with quotes ("'CA'", or "'CA,IN,...'")

+	 *  @return	int							Nb of loaded lines, 0 if already loaded, <0 if KO

+	 */

+    public function load_cache_vatrates($country_code)

+	{

+        // phpcs:enable

+		global $langs;

@@ -6381,3 +5181 @@
-		if ($num > 0) {

-			return $num; // Cache already loaded

-		}

+		if ($num > 0) return $num; // Cache already loaded

@@ -6388 +5186 @@
-		$sql .= " FROM " . $this->db->prefix() . "c_tva as t, " . $this->db->prefix() . "c_country as c";

+		$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";

@@ -6391,2 +5189 @@
-		$sql .= " AND t.entity IN (".getEntity('c_tva').")";

-		$sql .= " AND c.code IN (" . $this->db->sanitize($country_code, 1) . ")";

+		$sql .= " AND c.code IN (".$country_code.")";

@@ -6396 +5193,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -6398,2 +5196,4 @@
-			if ($num) {

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

+			if ($num)

+			{

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

+				{

@@ -6401 +5201 @@
-					$this->cache_vatrates[$i]['rowid'] = $obj->rowid;

+					$this->cache_vatrates[$i]['rowid']	= $obj->rowid;

@@ -6403 +5203 @@
-					$this->cache_vatrates[$i]['txtva'] = $obj->taux;

+					$this->cache_vatrates[$i]['txtva']	= $obj->taux;

@@ -6405,7 +5205,7 @@
-					$this->cache_vatrates[$i]['localtax1'] = $obj->localtax1;

-					$this->cache_vatrates[$i]['localtax1_type'] = $obj->localtax1_type;

-					$this->cache_vatrates[$i]['localtax2'] = $obj->localtax2;

-					$this->cache_vatrates[$i]['localtax2_type'] = $obj->localtax1_type;

-

-					$this->cache_vatrates[$i]['label'] = $obj->taux . '%' . ($obj->code ? ' (' . $obj->code . ')' : ''); // Label must contains only 0-9 , . % or *

-					$this->cache_vatrates[$i]['labelallrates'] = $obj->taux . '/' . ($obj->localtax1 ? $obj->localtax1 : '0') . '/' . ($obj->localtax2 ? $obj->localtax2 : '0') . ($obj->code ? ' (' . $obj->code . ')' : ''); // Must never be used as key, only label

+					$this->cache_vatrates[$i]['localtax1']	    = $obj->localtax1;

+					$this->cache_vatrates[$i]['localtax1_type']	= $obj->localtax1_type;

+					$this->cache_vatrates[$i]['localtax2']	    = $obj->localtax2;

+					$this->cache_vatrates[$i]['localtax2_type']	= $obj->localtax1_type;

+

+					$this->cache_vatrates[$i]['label'] = $obj->taux.'%'.($obj->code ? ' ('.$obj->code.')' : ''); // Label must contains only 0-9 , . % or *

+					$this->cache_vatrates[$i]['labelallrates'] = $obj->taux.'/'.($obj->localtax1 ? $obj->localtax1 : '0').'/'.($obj->localtax2 ? $obj->localtax2 : '0').($obj->code ? ' ('.$obj->code.')' : ''); // Must never be used as key, only label

@@ -6413,13 +5213,5 @@
-					if ($obj->taux) {

-						$positiverates .= ($positiverates ? '/' : '') . $obj->taux;

-					}

-					if ($obj->localtax1) {

-						$positiverates .= ($positiverates ? '/' : '') . $obj->localtax1;

-					}

-					if ($obj->localtax2) {

-						$positiverates .= ($positiverates ? '/' : '') . $obj->localtax2;

-					}

-					if (empty($positiverates)) {

-						$positiverates = '0';

-					}

-					$this->cache_vatrates[$i]['labelpositiverates'] = $positiverates . ($obj->code ? ' (' . $obj->code . ')' : ''); // Must never be used as key, only label

+					if ($obj->taux) $positiverates .= ($positiverates ? '/' : '').$obj->taux;

+					if ($obj->localtax1) $positiverates .= ($positiverates ? '/' : '').$obj->localtax1;

+					if ($obj->localtax2) $positiverates .= ($positiverates ? '/' : '').$obj->localtax2;

+					if (empty($positiverates)) $positiverates = '0';

+					$this->cache_vatrates[$i]['labelpositiverates'] = $positiverates.($obj->code ? ' ('.$obj->code.')' : ''); // Must never be used as key, only label

@@ -6429,11 +5221,4 @@
-			} else {

-				$this->error = '<span class="error">';

-				$this->error .= $langs->trans("ErrorNoVATRateDefinedForSellerCountry", $country_code);

-				$reg = array();

-				if (!empty($user) && $user->admin && preg_match('/\'(..)\'/', $country_code, $reg)) {

-					$langs->load("errors");

-					$new_country_code = $reg[1];

-					$country_id = dol_getIdFromCode($this->db, $new_country_code, 'c_pays', 'code', 'rowid');

-					$this->error .= '<br>'.$langs->trans("ErrorFixThisHere", DOL_URL_ROOT.'/admin/dict.php?id=10'.($country_id > 0 ? '&countryidforinsert='.$country_id : ''));

-				}

-				$this->error .= '</span>';

+			}

+			else

+			{

+				$this->error = '<font class="error">'.$langs->trans("ErrorNoVATRateDefinedForSellerCountry", $country_code).'</font>';

@@ -6442,2 +5227,4 @@
-		} else {

-			$this->error = '<span class="error">' . $this->db->error() . '</span>';

+		}

+		else

+		{

+			$this->error = '<font class="error">'.$this->db->error().'</font>';

@@ -6448,2 +5235 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -6454,20 +5240,20 @@
-	 * @param string $htmlname Name of HTML select field

-	 * @param float|string $selectedrate Force preselected vat rate. Can be '8.5' or '8.5 (NOO)' for example. Use '' for no forcing.

-	 * @param Societe $societe_vendeuse Thirdparty seller

-	 * @param Societe $societe_acheteuse Thirdparty buyer

-	 * @param int $idprod Id product. O if unknown of NA.

-	 * @param int $info_bits Miscellaneous information on line (1 for NPR)

-	 * @param int|string $type ''=Unknown, 0=Product, 1=Service (Used if idprod not defined)

-	 *                         Si vendeur non assujeti a TVA, TVA par defaut=0. Fin de regle.

-	 *                         Si le (pays vendeur = pays acheteur) alors la TVA par defaut=TVA du produit vendu. Fin de regle.

-	 *                         Si (vendeur et acheteur dans Communaute europeenne) et bien vendu = moyen de transports neuf (auto, bateau, avion), 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.

-	 *                         Si vendeur et acheteur dans Communauté européenne et acheteur=particulier alors TVA par défaut=TVA du produit vendu. Fin de règle.

-	 *                         Si vendeur et acheteur dans Communauté européenne et acheteur=entreprise alors TVA par défaut=0. Fin de règle.

-	 *                         Sinon la TVA proposee par defaut=0. Fin de regle.

-	 * @param bool $options_only Return HTML options lines only (for ajax treatment)

-	 * @param int $mode 0=Use vat rate as key in combo list, 1=Add VAT code after vat rate into key, -1=Use id of vat line as key

-	 * @return    string

-	 */

-	public function load_tva($htmlname = 'tauxtva', $selectedrate = '', $societe_vendeuse = null, $societe_acheteuse = null, $idprod = 0, $info_bits = 0, $type = '', $options_only = false, $mode = 0)

-	{

-		// phpcs:enable

+	 *  @param	string	      $htmlname           Name of HTML select field

+	 *  @param  float|string  $selectedrate       Force preselected vat rate. Can be '8.5' or '8.5 (NOO)' for example. Use '' for no forcing.

+	 *  @param  Societe	      $societe_vendeuse   Thirdparty seller

+	 *  @param  Societe	      $societe_acheteuse  Thirdparty buyer

+	 *  @param  int		      $idprod             Id product. O if unknown of NA.

+	 *  @param  int		      $info_bits          Miscellaneous information on line (1 for NPR)

+	 *  @param  int|string    $type               ''=Unknown, 0=Product, 1=Service (Used if idprod not defined)

+	 *                  		                  Si vendeur non assujeti a TVA, TVA par defaut=0. Fin de regle.

+	 *                  					      Si le (pays vendeur = pays acheteur) alors la TVA par defaut=TVA du produit vendu. Fin de regle.

+	 *                  					      Si (vendeur et acheteur dans Communaute europeenne) et bien vendu = moyen de transports neuf (auto, bateau, avion), 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.

+	 *                                            Si vendeur et acheteur dans Communauté européenne et acheteur= particulier alors TVA par défaut=TVA du produit vendu. Fin de règle.

+	 *                                            Si vendeur et acheteur dans Communauté européenne et acheteur= entreprise alors TVA par défaut=0. Fin de règle.

+	 *                  					      Sinon la TVA proposee par defaut=0. Fin de regle.

+	 *  @param	bool	     $options_only		  Return HTML options lines only (for ajax treatment)

+	 *  @param  int          $mode                0=Use vat rate as key in combo list, 1=Add VAT code after vat rate into key, -1=Use id of vat line as key

+	 *  @return	string

+	 */

+    public function load_tva($htmlname = 'tauxtva', $selectedrate = '', $societe_vendeuse = '', $societe_acheteuse = '', $idprod = 0, $info_bits = 0, $type = '', $options_only = false, $mode = 0)

+	{

+        // phpcs:enable

@@ -6485,2 +5271,2 @@
-		$reg = array();

-		if (preg_match('/\((.*)\)/', $defaulttx, $reg)) {

+		if (preg_match('/\((.*)\)/', $defaulttx, $reg))

+		{

@@ -6493,5 +5279,9 @@
-		if (is_object($societe_vendeuse) && !$societe_vendeuse->country_code) {

-			if ($societe_vendeuse->id == $mysoc->id) {

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

-			} else {

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

+		if (is_object($societe_vendeuse) && !$societe_vendeuse->country_code)

+		{

+			if ($societe_vendeuse->id == $mysoc->id)

+			{

+				$return .= '<font class="error">'.$langs->trans("ErrorYourCountryIsNotDefined").'</font>';

+			}

+			else

+			{

+				$return .= '<font class="error">'.$langs->trans("ErrorSupplierCountryIsNotDefined").'</font>';

@@ -6508,33 +5298,27 @@
-		if (is_object($societe_vendeuse)) {

-			$code_country = "'" . $societe_vendeuse->country_code . "'";

-		} else {

-			$code_country = "'" . $mysoc->country_code . "'"; // Pour compatibilite ascendente

-		}

-		if (getDolGlobalString('SERVICE_ARE_ECOMMERCE_200238EC')) {    // If option to have vat for end customer for services is on

-			require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';

-			// If SERVICE_ARE_ECOMMERCE_200238EC=1 combo list vat rate of purchaser and seller countries

-			// If SERVICE_ARE_ECOMMERCE_200238EC=2 combo list only the vat rate of the purchaser country

-			$selectVatComboMode = getDolGlobalString('SERVICE_ARE_ECOMMERCE_200238EC');

-			if (isInEEC($societe_vendeuse) && isInEEC($societe_acheteuse) && !$societe_acheteuse->isACompany()) {

-				// We also add the buyer country code

-				if (is_numeric($type)) {

-					if ($type == 1) { // We know product is a service

-						switch ($selectVatComboMode) {

-							case '1':

-								$code_country .= ",'" . $societe_acheteuse->country_code . "'";

-								break;

-							case '2':

-								$code_country = "'" . $societe_acheteuse->country_code . "'";

-								break;

-						}

-					}

-				} elseif (!$idprod) {  // We don't know type of product

-					switch ($selectVatComboMode) {

-						case '1':

-							$code_country .= ",'" . $societe_acheteuse->country_code . "'";

-							break;

-						case '2':

-							$code_country = "'" . $societe_acheteuse->country_code . "'";

-							break;

-					}

-				} else {

+		if (is_object($societe_vendeuse))

+		{

+			$code_country = "'".$societe_vendeuse->country_code."'";

+		}

+		else

+		{

+			$code_country = "'".$mysoc->country_code."'"; // Pour compatibilite ascendente

+		}

+		if (!empty($conf->global->SERVICE_ARE_ECOMMERCE_200238EC))    // If option to have vat for end customer for services is on

+		{

+			require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';

+			if (!isInEEC($societe_vendeuse) && (!is_object($societe_acheteuse) || (isInEEC($societe_acheteuse) && !$societe_acheteuse->isACompany())))

+			{

+				// We also add the buyer

+				if (is_numeric($type))

+				{

+					if ($type == 1) // We know product is a service

+					{

+						$code_country .= ",'".$societe_acheteuse->country_code."'";

+					}

+				}

+				elseif (!$idprod)  // We don't know type of product

+				{

+					$code_country .= ",'".$societe_acheteuse->country_code."'";

+				}

+				else

+				{

@@ -6543,2 +5327,3 @@
-					if ($prodstatic->type == Product::TYPE_SERVICE) {   // We know product is a service

-						$code_country .= ",'" . $societe_acheteuse->country_code . "'";

+					if ($prodstatic->type == Product::TYPE_SERVICE)   // We know product is a service

+					{

+						$code_country .= ",'".$societe_acheteuse->country_code."'";

@@ -6551,3 +5336,4 @@
-		$num = $this->load_cache_vatrates($code_country); // If no vat at all defined for this country, return -1 with message into this->error

-

-		if ($num > 0) {

+		$num = $this->load_cache_vatrates($code_country); // If no vat defined, return -1 with message into this->error

+

+		if ($num > 0)

+		{

@@ -6555 +5341,2 @@
-			if ($defaulttx < 0 || dol_strlen($defaulttx) == 0) {

+			if ($defaulttx < 0 || dol_strlen($defaulttx) == 0)

+			{

@@ -6557 +5343,0 @@
-

@@ -6560,27 +5346,13 @@
-

-				if (preg_match('/\((.*)\)/', $defaulttx, $reg)) {

-					$defaultcode = $reg[1];

-					$defaulttx = preg_replace('/\s*\(.*\)/', '', $defaulttx);

-				}

-				if (empty($defaulttx)) {

-					$defaultnpr = 0;

-				}

-			}

-

-			// If we fails to find a default vat rate, we take the last one in list

-			// Because they are sorted in ascending order, the last one will be the higher one (we suppose the higher one is the current rate)

-			if ($defaulttx < 0 || dol_strlen($defaulttx) == 0) {

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

-					// We take the last one found in list

-					$defaulttx = $this->cache_vatrates[$num - 1]['txtva'];

-				} else {

-					// We will use the rate defined into MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS

-					$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);

-					}

-				}

+		        if (preg_match('/\((.*)\)/', $defaulttx, $reg)) {

+			        $defaultcode = $reg[1];

+			        $defaulttx = preg_replace('/\s*\(.*\)/', '', $defaulttx);

+		        }

+				if (empty($defaulttx)) $defaultnpr = 0;

+			}

+

+			// Si taux par defaut n'a pu etre determine, on prend dernier de la liste.

+			// Comme ils sont tries par ordre croissant, dernier = plus eleve = taux courant

+			if ($defaulttx < 0 || dol_strlen($defaulttx) == 0)

+			{

+				if (empty($conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS)) $defaulttx = $this->cache_vatrates[$num - 1]['txtva'];

+				else $defaulttx = ($conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS == 'none' ? '' : $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS);

@@ -6590,3 +5362,3 @@
-			$disabled = false;

-			$title = '';

-			if (is_object($societe_vendeuse) && $societe_vendeuse->id == $mysoc->id && $societe_vendeuse->tva_assuj == "0") {

+			$disabled = false; $title = '';

+			if (is_object($societe_vendeuse) && $societe_vendeuse->id == $mysoc->id && $societe_vendeuse->tva_assuj == "0")

+			{

@@ -6595,2 +5367,3 @@
-				if (!getDolGlobalString('EXPENSEREPORT_OVERRIDE_VAT')) {

-					$title = ' title="' . dol_escape_htmltag($langs->trans('VATIsNotUsed')) . '"';

+				if (empty($conf->global->EXPENSEREPORT_OVERRIDE_VAT))

+				{

+					$title = ' title="'.$langs->trans('VATIsNotUsed').'"';

@@ -6601,3 +5374 @@
-			if (!$options_only) {

-				$return .= '<select class="flat minwidth50imp maxwidth100" id="' . $htmlname . '" name="' . $htmlname . '"' . ($disabled ? ' disabled' : '') . $title . '>';

-			}

+			if (!$options_only) $return .= '<select class="flat minwidth75imp" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled ? ' disabled' : '').$title.'>';

@@ -6606 +5377,2 @@
-			foreach ($this->cache_vatrates as $rate) {

+			foreach ($this->cache_vatrates as $rate)

+			{

@@ -6608,3 +5380 @@
-				if ($disabled && $rate['txtva'] != 0) {

-					continue;

-				}

+				if ($disabled && $rate['txtva'] != 0) continue;

@@ -6615,11 +5385,10 @@
-				if ($mode > 0 && $rate['code']) {

-					$key .= ' (' . $rate['code'] . ')';

-				}

-				if ($mode < 0) {

-					$key = $rate['rowid'];

-				}

-

-				$return .= '<option value="' . $key . '"';

-				if (!$selectedfound) {

-					if ($defaultcode) { // If defaultcode is defined, we used it in priority to select combo option instead of using rate+npr flag

-						if ($defaultcode == $rate['code']) {

+				if ($mode > 0 && $rate['code']) $key .= ' ('.$rate['code'].')';

+				if ($mode < 0) $key = $rate['rowid'];

+

+				$return .= '<option value="'.$key.'"';

+				if (!$selectedfound)

+				{

+					if ($defaultcode) // If defaultcode is defined, we used it in priority to select combo option instead of using rate+npr flag

+					{

+						if ($defaultcode == $rate['code'])

+						{

@@ -6629,3 +5398,5 @@
-					} elseif ($rate['txtva'] == $defaulttx && $rate['nprtva'] == $defaultnpr) {

-						$return .= ' selected';

-						$selectedfound = true;

+					}

+					elseif ($rate['txtva'] == $defaulttx && $rate['nprtva'] == $defaultnpr)

+			   		{

+			   			$return .= ' selected';

+			   			$selectedfound = true;

@@ -6635,4 +5406,3 @@
-

-				// Show label of VAT

-				if ($mysoc->country_code == 'IN' || getDolGlobalString('MAIN_VAT_LABEL_IS_POSITIVE_RATES')) {

-					// Label with all localtax and code. For example:  x.y / a.b / c.d (CODE)'

+				//if (! empty($conf->global->MAIN_VAT_SHOW_POSITIVE_RATES))

+				if ($mysoc->country_code == 'IN' || !empty($conf->global->MAIN_VAT_LABEL_IS_POSITIVE_RATES))

+				{

@@ -6640,2 +5410,3 @@
-				} else {

-					// Simple label

+				}

+				else

+				{

@@ -6644 +5414,0 @@
-

@@ -6651,5 +5421,4 @@
-			if (!$options_only) {

-				$return .= '</select>';

-				//$return .= ajax_combobox($htmlname);		// This break for the moment the dynamic autoselection of a value when selecting a product in object lines

-			}

-		} else {

+			if (!$options_only) $return .= '</select>';

+		}

+		else

+		{

@@ -6664,4 +5433,3 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-

-	/**

-	 *  Show a HTML widget to input a date or combo list for day, month, years and optionaly hours and minutes.

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     *  Show a HTML widget to input a date or combo list for day, month, years and optionaly hours and minutes.

@@ -6669,36 +5437,34 @@
-	 *                - set_time date (must be a local PHP server timestamp or string date with format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM')

-	 *                - local date in user area, if set_time is '' (so if set_time is '', output may differs when done from two different location)

-	 *                - Empty (fields empty), if set_time is -1 (in this case, parameter empty must also have value 1)

-	 *

-	 * @param integer|string $set_time Pre-selected date (must be a local PHP server timestamp), -1 to keep date not preselected, '' to use current date with 00:00 hour (Parameter 'empty' must be 0 or 2).

-	 * @param string $prefix Prefix for fields name

-	 * @param int $h 1 or 2=Show also hours (2=hours on a new line), -1 has same effect but hour and minutes are prefilled with 23:59 if date is empty, 3 show hour always empty

-	 * @param int $m 1=Show also minutes, -1 has same effect but hour and minutes are prefilled with 23:59 if date is empty, 3 show minutes always empty

-	 * @param int $empty 0=Fields required, 1=Empty inputs are allowed, 2=Empty inputs are allowed for hours only

-	 * @param string $form_name Not used

-	 * @param int $d 1=Show days, month, years

-	 * @param int $addnowlink Add a link "Now"

-	 * @param int $nooutput Do not output html string but return it

-	 * @param int $disabled Disable input fields

-	 * @param int $fullday When a checkbox with this html name is on, hour and day are set with 00:00 or 23:59

-	 * @param string $addplusone Add a link "+1 hour". Value must be name of another select_date field.

-	 * @param int|string $adddateof Add a link "Date of invoice" using the following date.

-	 * @return    string                        '' or HTML component string if nooutput is 1

-	 * @deprecated

-	 * @see    selectDate(), form_date(), select_month(), select_year(), select_dayofweek()

-	 */

-	public function select_date($set_time = '', $prefix = 're', $h = 0, $m = 0, $empty = 0, $form_name = "", $d = 1, $addnowlink = 0, $nooutput = 0, $disabled = 0, $fullday = 0, $addplusone = '', $adddateof = '')

-	{

-		// phpcs:enable

-		dol_syslog(__METHOD__ . ': using select_date is deprecated. Use selectDate instead.', LOG_WARNING);

-		$retstring = $this->selectDate($set_time, $prefix, $h, $m, $empty, $form_name, $d, $addnowlink, $disabled, $fullday, $addplusone, $adddateof);

-		if (!empty($nooutput)) {

-			return $retstring;

-		}

-		print $retstring;

-

-		return '';

-	}

-

-	/**

-	 *  Show 2 HTML widget to input a date or combo list for day, month, years and optionaly hours and minutes.

+	 *            	- set_time date (must be a local PHP server timestamp or string date with format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM')

+	 *            	- local date in user area, if set_time is '' (so if set_time is '', output may differs when done from two different location)

+	 *            	- Empty (fields empty), if set_time is -1 (in this case, parameter empty must also have value 1)

+	 *

+	 *	@param	integer	    $set_time 		Pre-selected date (must be a local PHP server timestamp), -1 to keep date not preselected, '' to use current date with 00:00 hour (Parameter 'empty' must be 0 or 2).

+	 *	@param	string		$prefix			Prefix for fields name

+	 *	@param	int			$h				1 or 2=Show also hours (2=hours on a new line), -1 has same effect but hour and minutes are prefilled with 23:59 if date is empty, 3 show hour always empty

+	 *	@param	int			$m				1=Show also minutes, -1 has same effect but hour and minutes are prefilled with 23:59 if date is empty, 3 show minutes always empty

+	 *	@param	int			$empty			0=Fields required, 1=Empty inputs are allowed, 2=Empty inputs are allowed for hours only

+	 *	@param	string		$form_name 		Not used

+	 *	@param	int			$d				1=Show days, month, years

+	 * 	@param	int			$addnowlink		Add a link "Now"

+	 * 	@param	int			$nooutput		Do not output html string but return it

+	 * 	@param 	int			$disabled		Disable input fields

+	 *  @param  int			$fullday        When a checkbox with this html name is on, hour and day are set with 00:00 or 23:59

+	 *  @param	string		$addplusone		Add a link "+1 hour". Value must be name of another select_date field.

+	 *  @param  datetime    $adddateof      Add a link "Date of invoice" using the following date.

+	 *  @return	string|void					Nothing or string if nooutput is 1

+     *  @deprecated

+	 *  @see    selectDate(), form_date(), select_month(), select_year(), select_dayofweek()

+	 */

+    public function select_date($set_time = '', $prefix = 're', $h = 0, $m = 0, $empty = 0, $form_name = "", $d = 1, $addnowlink = 0, $nooutput = 0, $disabled = 0, $fullday = '', $addplusone = '', $adddateof = '')

+    {

+        // phpcs:enable

+        $retstring = $this->selectDate($set_time, $prefix, $h, $m, $empty, $form_name, $d, $addnowlink, $disabled, $fullday, $addplusone, $adddateof);

+        if (!empty($nooutput)) {

+            return $retstring;

+        }

+        print $retstring;

+        return;

+    }

+

+    /**

+     *  Show a HTML widget to input a date or combo list for day, month, years and optionaly hours and minutes.

@@ -6710,48 +5476,19 @@
-	 * @param integer|string $set_time Pre-selected date (must be a local PHP server timestamp), -1 to keep date not preselected, '' to use current date with 00:00 hour (Parameter 'empty' must be 0 or 2).

-	 * @param integer|string $set_time_end Pre-selected date (must be a local PHP server timestamp), -1 to keep date not preselected, '' to use current date with 00:00 hour (Parameter 'empty' must be 0 or 2).

-	 * @param string $prefix Prefix for fields name

-	 * @param int	 $empty 0=Fields required, 1=Empty inputs are allowed, 2=Empty inputs are allowed for hours only

-	 * @param int	 $forcenewline Force new line between the 2 dates.

-	 * @return string                        Html for selectDate

-	 * @see    form_date(), select_month(), select_year(), select_dayofweek()

-	 */

-	public function selectDateToDate($set_time = '', $set_time_end = '', $prefix = 're', $empty = 0, $forcenewline = 0)

-	{

-		global $langs;

-

-		$ret = $this->selectDate($set_time, $prefix . '_start', 0, 0, $empty, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("from"), 'tzuserrel');

-		if ($forcenewline) {

-			$ret .= '<br>';

-		}

-		$ret .= $this->selectDate($set_time_end, $prefix . '_end', 0, 0, $empty, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"), 'tzuserrel');

-		return $ret;

-	}

-

-	/**

-	 *  Show a HTML widget to input a date or combo list for day, month, years and optionaly hours and minutes.

-	 *  Fields are preselected with :

-	 *              - set_time date (must be a local PHP server timestamp or string date with format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM')

-	 *              - local date in user area, if set_time is '' (so if set_time is '', output may differs when done from two different location)

-	 *              - Empty (fields empty), if set_time is -1 (in this case, parameter empty must also have value 1)

-	 *

-	 * @param integer|string 		$set_time 		Pre-selected date (must be a local PHP server timestamp), -1 to keep date not preselected, '' to use current date with 00:00 hour (Parameter 'empty' must be 0 or 2).

-	 * @param string 				$prefix 		Prefix for fields name

-	 * @param int 					$h 				1 or 2=Show also hours (2=hours on a new line), -1 has same effect but hour and minutes are prefilled with 23:59 if date is empty, 3 show hour always empty

-	 * @param int 					$m 				1=Show also minutes, -1 has same effect but hour and minutes are prefilled with 23:59 if date is empty, 3 show minutes always empty

-	 * @param int 					$empty 			0=Fields required, 1=Empty inputs are allowed, 2=Empty inputs are allowed for hours only

-	 * @param string 				$form_name 		Not used

-	 * @param int 					$d 				1=Show days, month, years

-	 * @param int 					$addnowlink 	Add a link "Now", 1 with server time, 2 with local computer time

-	 * @param int 					$disabled 		Disable input fields

-	 * @param int|string			$fullday 		When a checkbox with id #fullday is checked, hours are set with 00:00 (if value if 'fulldaystart') or 23:59 (if value is 'fulldayend')

-	 * @param string 				$addplusone 	Add a link "+1 hour". Value must be name of another selectDate field.

-	 * @param int|string|array      $adddateof 		Add a link "Date of ..." using the following date. Must be array(array('adddateof'=>..., 'labeladddateof'=>...))

-	 * @param string 				$openinghours 	Specify hour start and hour end for the select ex 8,20

-	 * @param int 					$stepminutes 	Specify step for minutes between 1 and 30

-	 * @param string 				$labeladddateof Label to use for the $adddateof parameter. Deprecated. Used only when $adddateof is not an array.

-	 * @param string 				$placeholder 	Placeholder

-	 * @param mixed 				$gm 			'auto' (for backward compatibility, avoid this), 'gmt' or 'tzserver' or 'tzuserrel'

-	 * @return string               	         	Html for selectDate

-	 * @see    form_date(), select_month(), select_year(), select_dayofweek()

-	 */

-	public function selectDate($set_time = '', $prefix = 're', $h = 0, $m = 0, $empty = 0, $form_name = "", $d = 1, $addnowlink = 0, $disabled = 0, $fullday = '', $addplusone = '', $adddateof = '', $openinghours = '', $stepminutes = 1, $labeladddateof = '', $placeholder = '', $gm = 'auto')

+	 *  @param  integer     $set_time       Pre-selected date (must be a local PHP server timestamp), -1 to keep date not preselected, '' to use current date with 00:00 hour (Parameter 'empty' must be 0 or 2).

+	 *  @param	string		$prefix			Prefix for fields name

+	 *  @param	int			$h				1 or 2=Show also hours (2=hours on a new line), -1 has same effect but hour and minutes are prefilled with 23:59 if date is empty, 3 show hour always empty

+	 *	@param	int			$m				1=Show also minutes, -1 has same effect but hour and minutes are prefilled with 23:59 if date is empty, 3 show minutes always empty

+	 *	@param	int			$empty			0=Fields required, 1=Empty inputs are allowed, 2=Empty inputs are allowed for hours only

+	 *	@param	string		$form_name 		Not used

+	 *	@param	int			$d				1=Show days, month, years

+	 * 	@param	int			$addnowlink		Add a link "Now", 1 with server time, 2 with local computer time

+	 * 	@param 	int			$disabled		Disable input fields

+	 *  @param  int			$fullday        When a checkbox with id #fullday is cheked, hours are set with 00:00 (if value if 'fulldaystart') or 23:59 (if value is 'fulldayend')

+	 *  @param	string		$addplusone		Add a link "+1 hour". Value must be name of another selectDate field.

+	 *  @param  datetime    $adddateof      Add a link "Date of ..." using the following date. See also $labeladddateof for the label used.

+     *  @param  string      $openinghours   Specify hour start and hour end for the select ex 8,20

+     *  @param  int         $stepminutes    Specify step for minutes between 1 and 30

+     *  @param	string		$labeladddateof Label to use for the $adddateof parameter.

+	 * 	@return string                      Html for selectDate

+	 *  @see    form_date(), select_month(), select_year(), select_dayofweek()

+	 */

+    public function selectDate($set_time = '', $prefix = 're', $h = 0, $m = 0, $empty = 0, $form_name = "", $d = 1, $addnowlink = 0, $disabled = 0, $fullday = '', $addplusone = '', $adddateof = '', $openinghours = '', $stepminutes = 1, $labeladddateof = '')

@@ -6761,4 +5497,0 @@
-		if ($gm === 'auto') {

-			$gm = (empty($conf) ? 'tzserver' : $conf->tzuserinputkey);

-		}

-

@@ -6767,9 +5500,3 @@
-		if ($prefix == '') {

-			$prefix = 're';

-		}

-		if ($h == '') {

-			$h = 0;

-		}

-		if ($m == '') {

-			$m = 0;

-		}

+		if ($prefix == '') $prefix = 're';

+		if ($h == '') $h = 0;

+		if ($m == '') $m = 0;

@@ -6778,11 +5505,3 @@
-		if ($stepminutes <= 0 || $stepminutes > 30) {

-			$stepminutes = 1;

-		}

-		if ($empty == 1) {

-			$emptydate = 1;

-			$emptyhours = 1;

-		}

-		if ($empty == 2) {

-			$emptydate = 0;

-			$emptyhours = 1;

-		}

+        if ($stepminutes <= 0 || $stepminutes > 30) $stepminutes = 1;

+		if ($empty == 1) { $emptydate = 1; $emptyhours = 1; }

+		if ($empty == 2) { $emptydate = 0; $emptyhours = 1; }

@@ -6791,7 +5510,4 @@
-		if ($set_time === '' && $emptydate == 0) {

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

-			if ($gm == 'tzuser' || $gm == 'tzuserrel') {

-				$set_time = dol_now($gm);

-			} else {

-				$set_time = dol_now('tzuser') - (getServerTimeZoneInt('now') * 3600); // set_time must be relative to PHP server timezone

-			}

+		if ($set_time === '' && $emptydate == 0)

+		{

+			include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';

+			$set_time = dol_now('tzuser') - (getServerTimeZoneInt('now') * 3600); // set_time must be relative to PHP server timezone

@@ -6801,5 +5517,2 @@
-		$reg = array();

-		$shour = '';

-		$smin = '';

-		$ssec = '';

-		if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?/', $set_time, $reg)) {    // deprecated usage

+		if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?/', $set_time, $reg))	// deprecated usage

+		{

@@ -6807 +5520 @@
-			$syear = (!empty($reg[1]) ? $reg[1] : '');

+			$syear	= (!empty($reg[1]) ? $reg[1] : '');

@@ -6809,4 +5522,6 @@
-			$sday = (!empty($reg[3]) ? $reg[3] : '');

-			$shour = (!empty($reg[4]) ? $reg[4] : '');

-			$smin = (!empty($reg[5]) ? $reg[5] : '');

-		} elseif (strval($set_time) != '' && $set_time != -1) {

+			$sday	= (!empty($reg[3]) ? $reg[3] : '');

+			$shour	= (!empty($reg[4]) ? $reg[4] : '');

+			$smin	= (!empty($reg[5]) ? $reg[5] : '');

+		}

+		elseif (strval($set_time) != '' && $set_time != -1)

+		{

@@ -6814,9 +5529,18 @@
-			$syear = dol_print_date($set_time, "%Y", $gm);

-			$smonth = dol_print_date($set_time, "%m", $gm);

-			$sday = dol_print_date($set_time, "%d", $gm);

-			if ($orig_set_time != '') {

-				$shour = dol_print_date($set_time, "%H", $gm);

-				$smin = dol_print_date($set_time, "%M", $gm);

-				$ssec = dol_print_date($set_time, "%S", $gm);

-			}

-		} else {

+			$syear = dol_print_date($set_time, "%Y");

+			$smonth = dol_print_date($set_time, "%m");

+			$sday = dol_print_date($set_time, "%d");

+			if ($orig_set_time != '')

+			{

+				$shour = dol_print_date($set_time, "%H");

+				$smin = dol_print_date($set_time, "%M");

+				$ssec = dol_print_date($set_time, "%S");

+			}

+			else

+			{

+				$shour = '';

+				$smin = '';

+				$ssec = '';

+			}

+		}

+		else

+		{

@@ -6831,9 +5555,2 @@
-		if ($h == 3) {

-			$shour = '';

-		}

-		if ($m == 3) {

-			$smin = '';

-		}

-

-		$nowgmt = dol_now('gmt');

-		//var_dump(dol_print_date($nowgmt, 'dayhourinputnoreduce', 'tzuserrel'));

+		if ($h == 3) $shour = '';

+		if ($m == 3) $smin = '';

@@ -6843,5 +5560,6 @@
-		if (!empty($conf->use_javascript_ajax) && (!getDolGlobalString('MAIN_POPUP_CALENDAR') || getDolGlobalString('MAIN_POPUP_CALENDAR') != "none")) {

-			$usecalendar = ((!getDolGlobalString('MAIN_POPUP_CALENDAR') || getDolGlobalString('MAIN_POPUP_CALENDAR') == 'eldy') ? 'jquery' : $conf->global->MAIN_POPUP_CALENDAR);

-		}

-

-		if ($d) {

+		if (!empty($conf->use_javascript_ajax) && (empty($conf->global->MAIN_POPUP_CALENDAR) || $conf->global->MAIN_POPUP_CALENDAR != "none")) {

+			$usecalendar = ((empty($conf->global->MAIN_POPUP_CALENDAR) || $conf->global->MAIN_POPUP_CALENDAR == 'eldy') ? 'jquery' : $conf->global->MAIN_POPUP_CALENDAR);

+		}

+

+		if ($d)

+		{

@@ -6849 +5567,2 @@
-			if ($usecalendar != 'combo') {

+			if ($usecalendar != 'combo')

+			{

@@ -6852 +5571,2 @@
-				if (strval($set_time) != '' && $set_time != -1) {

+				if (strval($set_time) != '' && $set_time != -1)

+				{

@@ -6854 +5574 @@
-					$formated_date = dol_print_date($set_time, $langs->trans("FormatDateShortInput"), $gm); // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript

+					$formated_date = dol_print_date($set_time, $langs->trans("FormatDateShortInput")); // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript

@@ -6858,3 +5578,4 @@
-				if ($usecalendar == "eldy") {

-					// Input area to enter date manually

-					$retstring .= '<input id="' . $prefix . '" name="' . $prefix . '" type="text" class="maxwidthdate" maxlength="11" value="' . $formated_date . '"';

+				if ($usecalendar == "eldy")

+				{

+					// Zone de saisie manuelle de la date

+					$retstring .= '<input id="'.$prefix.'" name="'.$prefix.'" type="text" class="maxwidth75" maxlength="11" value="'.$formated_date.'"';

@@ -6862 +5583 @@
-					$retstring .= ' onChange="dpChangeDay(\'' . $prefix . '\',\'' . $langs->trans("FormatDateShortJavaInput") . '\'); "'; // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript

+					$retstring .= ' onChange="dpChangeDay(\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\'); "'; // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript

@@ -6865,17 +5586,18 @@
-					// Icon calendar

-					$retstringbuttom = '';

-					if (!$disabled) {

-						$retstringbuttom = '<button id="' . $prefix . 'Button" type="button" class="dpInvisibleButtons"';

-						$base = DOL_URL_ROOT . '/core/';

-						$retstringbuttom .= ' onClick="showDP(\'' . $base . '\',\'' . $prefix . '\',\'' . $langs->trans("FormatDateShortJavaInput") . '\',\'' . $langs->defaultlang . '\');"';

-						$retstringbuttom .= '>' . img_object($langs->trans("SelectDate"), 'calendarday', 'class="datecallink"') . '</button>';

-					} else {

-						$retstringbuttom = '<button id="' . $prefix . 'Button" type="button" class="dpInvisibleButtons">' . img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"') . '</button>';

-					}

-					$retstring = $retstringbuttom . $retstring;

-

-					$retstring .= '<input type="hidden" id="' . $prefix . 'day"   name="' . $prefix . 'day"   value="' . $sday . '">' . "\n";

-					$retstring .= '<input type="hidden" id="' . $prefix . 'month" name="' . $prefix . 'month" value="' . $smonth . '">' . "\n";

-					$retstring .= '<input type="hidden" id="' . $prefix . 'year"  name="' . $prefix . 'year"  value="' . $syear . '">' . "\n";

-				} elseif ($usecalendar == 'jquery') {

-					if (!$disabled) {

+					// Icone calendrier

+					if (!$disabled)

+					{

+						$retstring .= '<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons"';

+						$base = DOL_URL_ROOT.'/core/';

+						$retstring .= ' onClick="showDP(\''.$base.'\',\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\',\''.$langs->defaultlang.'\');"';

+						$retstring .= '>'.img_object($langs->trans("SelectDate"), 'calendarday', 'class="datecallink"').'</button>';

+					}

+					else $retstring .= '<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons">'.img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"').'</button>';

+

+					$retstring .= '<input type="hidden" id="'.$prefix.'day"   name="'.$prefix.'day"   value="'.$sday.'">'."\n";

+					$retstring .= '<input type="hidden" id="'.$prefix.'month" name="'.$prefix.'month" value="'.$smonth.'">'."\n";

+					$retstring .= '<input type="hidden" id="'.$prefix.'year"  name="'.$prefix.'year"  value="'.$syear.'">'."\n";

+				}

+				elseif ($usecalendar == 'jquery')

+				{

+					if (!$disabled)

+					{

@@ -6883,6 +5605,3 @@
-						$minYear = getDolGlobalInt('MIN_YEAR_SELECT_DATE', (date('Y') - 100));

-						$maxYear = getDolGlobalInt('MAX_YEAR_SELECT_DATE', (date('Y') + 100));

-

-						$retstring .= '<script nonce="' . getNonce() . '" type="text/javascript">';

-						$retstring .= "$(function(){ $('#" . $prefix . "').datepicker({

-							dateFormat: '" . $langs->trans("FormatDateShortJQueryInput") . "',

+						$retstring .= "<script type='text/javascript'>";

+						$retstring .= "$(function(){ $('#".$prefix."').datepicker({

+							dateFormat: '".$langs->trans("FormatDateShortJQueryInput")."',

@@ -6890,3 +5609,3 @@
-							todayHighlight: true,

-							yearRange: '" . $minYear . ":" . $maxYear . "',";

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

+							todayHighlight: true,";

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

+						{

@@ -6903 +5622,2 @@
-						if (!getDolGlobalString('MAIN_POPUP_CALENDAR_ON_FOCUS')) {

+						if (empty($conf->global->MAIN_POPUP_CALENDAR_ON_FOCUS))

+						{

@@ -6905,2 +5625,2 @@
-								showOn: 'button',	/* both has problem with autocompletion */

-								buttonImage: '" . DOL_URL_ROOT . "/theme/" . dol_escape_js($conf->theme) . "/img/object_calendarday.png',

+								showOn: 'button',

+								buttonImage: '".DOL_URL_ROOT."/theme/".$conf->theme."/img/object_calendarday.png',

@@ -6915,2 +5635,2 @@
-					$retstring .= '<div class="nowraponall inline-block divfordateinput">';

-					$retstring .= '<input id="'.$prefix.'" name="'.$prefix.'" type="text" class="maxwidthdate" maxlength="11" value="'.$formated_date.'"';

+					$retstring .= '<div class="nowrap inline-block">';

+					$retstring .= '<input id="'.$prefix.'" name="'.$prefix.'" type="text" class="maxwidth75" maxlength="11" value="'.$formated_date.'"';

@@ -6918,2 +5638 @@
-					$retstring .= ($placeholder ? ' placeholder="' . dol_escape_htmltag($placeholder) . '"' : '');

-					$retstring .= ' onChange="dpChangeDay(\'' . dol_escape_js($prefix) . '\',\'' . dol_escape_js($langs->trans("FormatDateShortJavaInput")) . '\'); "'; // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript

+					$retstring .= ' onChange="dpChangeDay(\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\'); "'; // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript

@@ -6923 +5642,2 @@
-					if (!$disabled) {

+					if (!$disabled)

+					{

@@ -6925,11 +5645,12 @@
-						$retstring.=img_object($langs->trans("SelectDate"),'calendarday','id="'.$prefix.'id" class="datecallink"');

-						$retstring.='<script nonce="'.getNonce().'" type="text/javascript">';

-						$retstring.="jQuery(document).ready(function() {";

-						$retstring.='	jQuery("#'.$prefix.'id").click(function() {';

-						$retstring.="    	jQuery('#".$prefix."').focus();";

-						$retstring.='    });';

-						$retstring.='});';

-						$retstring.="</script>";*/

-					} else {

-						$retstringbutton = '<button id="' . $prefix . 'Button" type="button" class="dpInvisibleButtons">' . img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"') . '</button>';

-						$retsring = $retstringbutton . $retstring;

+                		$retstring.=img_object($langs->trans("SelectDate"),'calendarday','id="'.$prefix.'id" class="datecallink"');

+                		$retstring.="<script type='text/javascript'>";

+                		$retstring.="jQuery(document).ready(function() {";

+                		$retstring.='	jQuery("#'.$prefix.'id").click(function() {';

+                		$retstring.="    	jQuery('#".$prefix."').focus();";

+                		$retstring.='    });';

+                		$retstring.='});';

+                		$retstring.="</script>";*/

+					}

+					else

+					{

+						$retstring .= '<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons">'.img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"').'</button>';

@@ -6939,4 +5660,6 @@
-					$retstring .= '<input type="hidden" id="' . $prefix . 'day"   name="' . $prefix . 'day"   value="' . $sday . '">' . "\n";

-					$retstring .= '<input type="hidden" id="' . $prefix . 'month" name="' . $prefix . 'month" value="' . $smonth . '">' . "\n";

-					$retstring .= '<input type="hidden" id="' . $prefix . 'year"  name="' . $prefix . 'year"  value="' . $syear . '">' . "\n";

-				} else {

+					$retstring .= '<input type="hidden" id="'.$prefix.'day"   name="'.$prefix.'day"   value="'.$sday.'">'."\n";

+					$retstring .= '<input type="hidden" id="'.$prefix.'month" name="'.$prefix.'month" value="'.$smonth.'">'."\n";

+					$retstring .= '<input type="hidden" id="'.$prefix.'year"  name="'.$prefix.'year"  value="'.$syear.'">'."\n";

+				}

+				else

+				{

@@ -6945,2 +5668,5 @@
-			} else {

-				// Show date with combo selects

+			}

+			// Show date with combo selects

+			else

+			{

+				//$retstring.='<div class="inline-block">';

@@ -6948,3 +5674,4 @@
-				$retstring .= '<select' . ($disabled ? ' disabled' : '') . ' class="flat valignmiddle maxwidth50imp" id="' . $prefix . 'day" name="' . $prefix . 'day">';

-

-				if ($emptydate || $set_time == -1) {

+				$retstring .= '<select'.($disabled ? ' disabled' : '').' class="flat valignmiddle maxwidth50imp" id="'.$prefix.'day" name="'.$prefix.'day">';

+

+				if ($emptydate || $set_time == -1)

+				{

@@ -6954,2 +5681,3 @@
-				for ($day = 1; $day <= 31; $day++) {

-					$retstring .= '<option value="' . $day . '"' . ($day == $sday ? ' selected' : '') . '>' . $day . '</option>';

+				for ($day = 1; $day <= 31; $day++)

+				{

+					$retstring .= '<option value="'.$day.'"'.($day == $sday ? ' selected' : '').'>'.$day.'</option>';

@@ -6960,2 +5688,3 @@
-				$retstring .= '<select' . ($disabled ? ' disabled' : '') . ' class="flat valignmiddle maxwidth75imp" id="' . $prefix . 'month" name="' . $prefix . 'month">';

-				if ($emptydate || $set_time == -1) {

+				$retstring .= '<select'.($disabled ? ' disabled' : '').' class="flat valignmiddle maxwidth75imp" id="'.$prefix.'month" name="'.$prefix.'month">';

+				if ($emptydate || $set_time == -1)

+				{

@@ -6966,2 +5695,3 @@
-				for ($month = 1; $month <= 12; $month++) {

-					$retstring .= '<option value="' . $month . '"' . ($month == $smonth ? ' selected' : '') . '>';

+				for ($month = 1; $month <= 12; $month++)

+				{

+					$retstring .= '<option value="'.$month.'"'.($month == $smonth ? ' selected' : '').'>';

@@ -6974,7 +5704,11 @@
-				if ($emptydate || $set_time == -1) {

-					$retstring .= '<input' . ($disabled ? ' disabled' : '') . ' placeholder="' . dol_escape_htmltag($langs->trans("Year")) . '" class="flat maxwidth50imp valignmiddle" type="number" min="0" max="3000" maxlength="4" id="' . $prefix . 'year" name="' . $prefix . 'year" value="' . $syear . '">';

-				} else {

-					$retstring .= '<select' . ($disabled ? ' disabled' : '') . ' class="flat valignmiddle maxwidth75imp" id="' . $prefix . 'year" name="' . $prefix . 'year">';

-

-					for ($year = $syear - 10; $year < $syear + 10; $year++) {

-						$retstring .= '<option value="' . $year . '"' . ($year == $syear ? ' selected' : '') . '>' . $year . '</option>';

+				if ($emptydate || $set_time == -1)

+				{

+					$retstring .= '<input'.($disabled ? ' disabled' : '').' placeholder="'.dol_escape_htmltag($langs->trans("Year")).'" class="flat maxwidth50imp valignmiddle" type="number" min="0" max="3000" maxlength="4" id="'.$prefix.'year" name="'.$prefix.'year" value="'.$syear.'">';

+				}

+				else

+				{

+					$retstring .= '<select'.($disabled ? ' disabled' : '').' class="flat valignmiddle maxwidth75imp" id="'.$prefix.'year" name="'.$prefix.'year">';

+

+					for ($year = $syear - 10; $year < $syear + 10; $year++)

+					{

+						$retstring .= '<option value="'.$year.'"'.($year == $syear ? ' selected' : '').'>'.$year.'</option>';

@@ -6984,9 +5718,8 @@
-			}

-		}

-

-		if ($d && $h) {

-			$retstring .= ($h == 2 ? '<br>' : ' ');

-			$retstring .= '<span class="nowraponall">';

-		}

-

-		if ($h) {

+				//$retstring.='</div>';

+			}

+		}

+

+		if ($d && $h) $retstring .= ($h == 2 ? '<br>' : ' ');

+

+		if ($h)

+		{

@@ -6999,3 +5732 @@
-				if ($hourend < $hourstart) {

-					$hourend = $hourstart;

-				}

+				if ($hourend < $hourstart) $hourend = $hourstart;

@@ -7004,11 +5735,6 @@
-			$retstring .= '<select' . ($disabled ? ' disabled' : '') . ' class="flat valignmiddle maxwidth50 ' . ($fullday ? $fullday . 'hour' : '') . '" id="' . $prefix . 'hour" name="' . $prefix . 'hour">';

-			if ($emptyhours) {

-				$retstring .= '<option value="-1">&nbsp;</option>';

-			}

-			for ($hour = $hourstart; $hour < $hourend; $hour++) {

-				if (strlen($hour) < 2) {

-					$hour = "0" . $hour;

-				}

-				$retstring .= '<option value="' . $hour . '"' . (($hour == $shour) ? ' selected' : '') . '>' . $hour;

-				//$retstring .= (empty($conf->dol_optimize_smallscreen) ? '' : 'H');

-				$retstring .= '</option>';

+			$retstring .= '<select'.($disabled ? ' disabled' : '').' class="flat valignmiddle maxwidth50 '.($fullday ? $fullday.'hour' : '').'" id="'.$prefix.'hour" name="'.$prefix.'hour">';

+			if ($emptyhours) $retstring .= '<option value="-1">&nbsp;</option>';

+			for ($hour = $hourstart; $hour < $hourend; $hour++)

+			{

+				if (strlen($hour) < 2) $hour = "0".$hour;

+				$retstring .= '<option value="'.$hour.'"'.(($hour == $shour) ? ' selected' : '').'>'.$hour.(empty($conf->dol_optimize_smallscreen) ? '' : 'H').'</option>';

@@ -7017,7 +5743,5 @@
-			//if ($m && empty($conf->dol_optimize_smallscreen)) $retstring .= ":";

-			if ($m) {

-				$retstring .= ":";

-			}

-		}

-

-		if ($m) {

+			if ($m && empty($conf->dol_optimize_smallscreen)) $retstring .= ":";

+		}

+

+		if ($m)

+		{

@@ -7025,9 +5749,6 @@
-			$retstring .= '<select' . ($disabled ? ' disabled' : '') . ' class="flat valignmiddle maxwidth50 ' . ($fullday ? $fullday . 'min' : '') . '" id="' . $prefix . 'min" name="' . $prefix . 'min">';

-			if ($emptyhours) {

-				$retstring .= '<option value="-1">&nbsp;</option>';

-			}

-			for ($min = 0; $min < 60; $min += $stepminutes) {

-				if (strlen($min) < 2) {

-					$min = "0" . $min;

-				}

-				$retstring .= '<option value="' . $min . '"' . (($min == $smin) ? ' selected' : '') . '>' . $min . (empty($conf->dol_optimize_smallscreen) ? '' : '') . '</option>';

+			$retstring .= '<select'.($disabled ? ' disabled' : '').' class="flat valignmiddle maxwidth50 '.($fullday ? $fullday.'min' : '').'" id="'.$prefix.'min" name="'.$prefix.'min">';

+			if ($emptyhours) $retstring .= '<option value="-1">&nbsp;</option>';

+			for ($min = 0; $min < 60; $min += $stepminutes)

+			{

+				if (strlen($min) < 2) $min = "0".$min;

+				$retstring .= '<option value="'.$min.'"'.(($min == $smin) ? ' selected' : '').'>'.$min.(empty($conf->dol_optimize_smallscreen) ? '' : '').'</option>';

@@ -7037,5 +5758 @@
-			$retstring .= '<input type="hidden" name="' . $prefix . 'sec" value="' . $ssec . '">';

-		}

-

-		if ($d && $h) {

-			$retstring .= '</span>';

+			$retstring .= '<input type="hidden" name="'.$prefix.'sec" value="'.$ssec.'">';

@@ -7045 +5762,2 @@
-		if (!empty($conf->use_javascript_ajax) && $addnowlink) {

+		if ($conf->use_javascript_ajax && $addnowlink)

+		{

@@ -7048,3 +5766,4 @@
-			if ($addnowlink == 2) { // local computer time

-				// pad add leading 0 on numbers

-				$reset_scripts .= "Number.prototype.pad = function(size) {

+            if ($addnowlink == 2) // local computer time

+            {

+                // pad add leading 0 on numbers

+                $reset_scripts .= "Number.prototype.pad = function(size) {

@@ -7056 +5775 @@
-			}

+            }

@@ -7059,18 +5778,21 @@
-			if ($addnowlink == 1) { // server time expressed in user time setup

-				$reset_scripts .= 'jQuery(\'#' . $prefix . '\').val(\'' . dol_print_date($nowgmt, 'day', 'tzuserrel') . '\');';

-				$reset_scripts .= 'jQuery(\'#' . $prefix . 'day\').val(\'' . dol_print_date($nowgmt, '%d', 'tzuserrel') . '\');';

-				$reset_scripts .= 'jQuery(\'#' . $prefix . 'month\').val(\'' . dol_print_date($nowgmt, '%m', 'tzuserrel') . '\');';

-				$reset_scripts .= 'jQuery(\'#' . $prefix . 'year\').val(\'' . dol_print_date($nowgmt, '%Y', 'tzuserrel') . '\');';

-			} elseif ($addnowlink == 2) {

-				/* Disabled because the output does not use the string format defined by FormatDateShort key to forge the value into #prefix.

-				 * This break application for foreign languages.

-				$reset_scripts .= 'jQuery(\'#'.$prefix.'\').val(d.toLocaleDateString(\''.str_replace('_', '-', $langs->defaultlang).'\'));';

-				$reset_scripts .= 'jQuery(\'#'.$prefix.'day\').val(d.getDate().pad());';

-				$reset_scripts .= 'jQuery(\'#'.$prefix.'month\').val(parseInt(d.getMonth().pad()) + 1);';

-				$reset_scripts .= 'jQuery(\'#'.$prefix.'year\').val(d.getFullYear());';

-				*/

-				$reset_scripts .= 'jQuery(\'#' . $prefix . '\').val(\'' . dol_print_date($nowgmt, 'day', 'tzuserrel') . '\');';

-				$reset_scripts .= 'jQuery(\'#' . $prefix . 'day\').val(\'' . dol_print_date($nowgmt, '%d', 'tzuserrel') . '\');';

-				$reset_scripts .= 'jQuery(\'#' . $prefix . 'month\').val(\'' . dol_print_date($nowgmt, '%m', 'tzuserrel') . '\');';

-				$reset_scripts .= 'jQuery(\'#' . $prefix . 'year\').val(\'' . dol_print_date($nowgmt, '%Y', 'tzuserrel') . '\');';

-			}

+            if ($addnowlink == 1) // server time expressed in user time setup

+            {

+                $reset_scripts .= 'jQuery(\'#'.$prefix.'\').val(\''.dol_print_date(dol_now(), 'day', 'tzuser').'\');';

+                $reset_scripts .= 'jQuery(\'#'.$prefix.'day\').val(\''.dol_print_date(dol_now(), '%d', 'tzuser').'\');';

+                $reset_scripts .= 'jQuery(\'#'.$prefix.'month\').val(\''.dol_print_date(dol_now(), '%m', 'tzuser').'\');';

+                $reset_scripts .= 'jQuery(\'#'.$prefix.'year\').val(\''.dol_print_date(dol_now(), '%Y', 'tzuser').'\');';

+            }

+            elseif ($addnowlink == 2)

+            {

+            	/* Disabled because the output does not use the string format defined by FormatDateShort key to forge the value into #prefix.

+            	 * This break application for foreign languages.

+                $reset_scripts .= 'jQuery(\'#'.$prefix.'\').val(d.toLocaleDateString(\''.str_replace('_', '-', $langs->defaultlang).'\'));';

+                $reset_scripts .= 'jQuery(\'#'.$prefix.'day\').val(d.getDate().pad());';

+                $reset_scripts .= 'jQuery(\'#'.$prefix.'month\').val(parseInt(d.getMonth().pad()) + 1);';

+                $reset_scripts .= 'jQuery(\'#'.$prefix.'year\').val(d.getFullYear());';

+                */

+                $reset_scripts .= 'jQuery(\'#'.$prefix.'\').val(\''.dol_print_date(dol_now(), 'day', 'tzuser').'\');';

+                $reset_scripts .= 'jQuery(\'#'.$prefix.'day\').val(\''.dol_print_date(dol_now(), '%d', 'tzuser').'\');';

+                $reset_scripts .= 'jQuery(\'#'.$prefix.'month\').val(\''.dol_print_date(dol_now(), '%m', 'tzuser').'\');';

+                $reset_scripts .= 'jQuery(\'#'.$prefix.'year\').val(\''.dol_print_date(dol_now(), '%Y', 'tzuser').'\');';

+            }

@@ -7078,10 +5800,10 @@
-			{

-				$base=DOL_URL_ROOT.'/core/';

-				$reset_scripts .= 'resetDP(\''.$base.'\',\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\',\''.$langs->defaultlang.'\');';

-			}

-			else

-			{

-				$reset_scripts .= 'this.form.elements[\''.$prefix.'day\'].value=formatDate(new Date(), \'d\'); ';

-				$reset_scripts .= 'this.form.elements[\''.$prefix.'month\'].value=formatDate(new Date(), \'M\'); ';

-				$reset_scripts .= 'this.form.elements[\''.$prefix.'year\'].value=formatDate(new Date(), \'yyyy\'); ';

-			}*/

+            {

+                $base=DOL_URL_ROOT.'/core/';

+                $reset_scripts .= 'resetDP(\''.$base.'\',\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\',\''.$langs->defaultlang.'\');';

+            }

+            else

+            {

+                $reset_scripts .= 'this.form.elements[\''.$prefix.'day\'].value=formatDate(new Date(), \'d\'); ';

+                $reset_scripts .= 'this.form.elements[\''.$prefix.'month\'].value=formatDate(new Date(), \'M\'); ';

+                $reset_scripts .= 'this.form.elements[\''.$prefix.'year\'].value=formatDate(new Date(), \'yyyy\'); ';

+            }*/

@@ -7089,4 +5811,3 @@
-			if ($h) {

-				if ($fullday) {

-					$reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";

-				}

+			if ($h)

+			{

+				if ($fullday) $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";

@@ -7094,11 +5815,10 @@
-				if ($addnowlink == 1) {

-					$reset_scripts .= 'jQuery(\'#' . $prefix . 'hour\').val(\'' . dol_print_date($nowgmt, '%H', 'tzuserrel') . '\');';

-					$reset_scripts .= 'jQuery(\'#' . $prefix . 'hour\').change();';

-				} elseif ($addnowlink == 2) {

-					$reset_scripts .= 'jQuery(\'#' . $prefix . 'hour\').val(d.getHours().pad());';

-					$reset_scripts .= 'jQuery(\'#' . $prefix . 'hour\').change();';

-				}

-

-				if ($fullday) {

-					$reset_scripts .= ' } ';

-				}

+                if ($addnowlink == 1)

+                {

+                    $reset_scripts .= 'jQuery(\'#'.$prefix.'hour\').val(\''.dol_print_date(dol_now(), '%H', 'tzuser').'\');';

+                }

+                elseif ($addnowlink == 2)

+                {

+                    $reset_scripts .= 'jQuery(\'#'.$prefix.'hour\').val(d.getHours().pad());';

+                }

+

+				if ($fullday) $reset_scripts .= ' } ';

@@ -7107,4 +5827,3 @@
-			if ($m) {

-				if ($fullday) {

-					$reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";

-				}

+			if ($m)

+			{

+				if ($fullday) $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";

@@ -7112,10 +5831,9 @@
-				if ($addnowlink == 1) {

-					$reset_scripts .= 'jQuery(\'#' . $prefix . 'min\').val(\'' . dol_print_date($nowgmt, '%M', 'tzuserrel') . '\');';

-					$reset_scripts .= 'jQuery(\'#' . $prefix . 'min\').change();';

-				} elseif ($addnowlink == 2) {

-					$reset_scripts .= 'jQuery(\'#' . $prefix . 'min\').val(d.getMinutes().pad());';

-					$reset_scripts .= 'jQuery(\'#' . $prefix . 'min\').change();';

-				}

-				if ($fullday) {

-					$reset_scripts .= ' } ';

-				}

+                if ($addnowlink == 1)

+                {

+                    $reset_scripts .= 'jQuery(\'#'.$prefix.'min\').val(\''.dol_print_date(dol_now(), '%M', 'tzuser').'\');';

+                }

+                elseif ($addnowlink == 2)

+                {

+                    $reset_scripts .= 'jQuery(\'#'.$prefix.'min\').val(d.getMinutes().pad());';

+                }

+				if ($fullday) $reset_scripts .= ' } ';

@@ -7124,2 +5842,3 @@
-			if ($reset_scripts && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {

-				$retstring .= ' <button class="dpInvisibleButtons datenowlink" id="' . $prefix . 'ButtonNow" type="button" name="_useless" value="now" onClick="' . $reset_scripts . '">';

+			if ($reset_scripts && empty($conf->dol_optimize_smallscreen))

+			{

+				$retstring .= ' <button class="dpInvisibleButtons datenowlink" id="'.$prefix.'ButtonNow" type="button" name="_useless" value="now" onClick="'.$reset_scripts.'">';

@@ -7132 +5851,2 @@
-		if ($conf->use_javascript_ajax && $addplusone) {

+		if ($conf->use_javascript_ajax && $addplusone)

+		{

@@ -7137,4 +5857,4 @@
-			$reset_scripts .= 'jQuery(\'#' . $prefix . '\').val(\'' . dol_print_date($nowgmt, 'dayinputnoreduce', 'tzuserrel') . '\');';

-			$reset_scripts .= 'jQuery(\'#' . $prefix . 'day\').val(\'' . dol_print_date($nowgmt, '%d', 'tzuserrel') . '\');';

-			$reset_scripts .= 'jQuery(\'#' . $prefix . 'month\').val(\'' . dol_print_date($nowgmt, '%m', 'tzuserrel') . '\');';

-			$reset_scripts .= 'jQuery(\'#' . $prefix . 'year\').val(\'' . dol_print_date($nowgmt, '%Y', 'tzuserrel') . '\');';

+			$reset_scripts .= 'jQuery(\'#'.$prefix.'\').val(\''.dol_print_date(dol_now(), 'day').'\');';

+			$reset_scripts .= 'jQuery(\'#'.$prefix.'day\').val(\''.dol_print_date(dol_now(), '%d').'\');';

+			$reset_scripts .= 'jQuery(\'#'.$prefix.'month\').val(\''.dol_print_date(dol_now(), '%m').'\');';

+			$reset_scripts .= 'jQuery(\'#'.$prefix.'year\').val(\''.dol_print_date(dol_now(), '%Y').'\');';

@@ -7142,8 +5862,5 @@
-			if ($h) {

-				if ($fullday) {

-					$reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";

-				}

-				$reset_scripts .= 'jQuery(\'#' . $prefix . 'hour\').val(\'' . dol_print_date($nowgmt, '%H', 'tzuserrel') . '\');';

-				if ($fullday) {

-					$reset_scripts .= ' } ';

-				}

+			if ($h)

+			{

+				if ($fullday) $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";

+				$reset_scripts .= 'jQuery(\'#'.$prefix.'hour\').val(\''.dol_print_date(dol_now(), '%H').'\');';

+				if ($fullday) $reset_scripts .= ' } ';

@@ -7152,8 +5869,5 @@
-			if ($m) {

-				if ($fullday) {

-					$reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";

-				}

-				$reset_scripts .= 'jQuery(\'#' . $prefix . 'min\').val(\'' . dol_print_date($nowgmt, '%M', 'tzuserrel') . '\');';

-				if ($fullday) {

-					$reset_scripts .= ' } ';

-				}

+			if ($m)

+			{

+				if ($fullday) $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";

+				$reset_scripts .= 'jQuery(\'#'.$prefix.'min\').val(\''.dol_print_date(dol_now(), '%M').'\');';

+				if ($fullday) $reset_scripts .= ' } ';

@@ -7162,2 +5876,3 @@
-			if ($reset_scripts && empty($conf->dol_optimize_smallscreen)) {

-				$retstring .= ' <button class="dpInvisibleButtons datenowlink" id="' . $prefix . 'ButtonPlusOne" type="button" name="_useless2" value="plusone" onClick="' . $reset_scripts . '">';

+			if ($reset_scripts && empty($conf->dol_optimize_smallscreen))

+			{

+				$retstring .= ' <button class="dpInvisibleButtons datenowlink" id="'.$prefix.'ButtonPlusOne" type="button" name="_useless2" value="plusone" onClick="'.$reset_scripts.'">';

@@ -7169,21 +5884,6 @@
-		// Add a link to set data

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

-			if (!is_array($adddateof)) {

-				$arrayofdateof = array(array('adddateof'=>$adddateof, 'labeladddateof'=>$labeladddateof));

-			} else {

-				$arrayofdateof = $adddateof;

-			}

-			foreach ($arrayofdateof as $valuedateof) {

-				$tmpadddateof = empty($valuedateof['adddateof']) ? 0 : $valuedateof['adddateof'];

-				$tmplabeladddateof = empty($valuedateof['labeladddateof']) ? '' : $valuedateof['labeladddateof'];

-				$tmparray = dol_getdate($tmpadddateof);

-				if (empty($tmplabeladddateof)) {

-					$tmplabeladddateof = $langs->trans("DateInvoice");

-				}

-				$reset_scripts = 'console.log(\'Click on now link\'); ';

-				$reset_scripts .= 'jQuery(\'#'.$prefix.'\').val(\''.dol_print_date($tmpadddateof, 'dayinputnoreduce').'\');';

-				$reset_scripts .= 'jQuery(\'#'.$prefix.'day\').val(\''.$tmparray['mday'].'\');';

-				$reset_scripts .= 'jQuery(\'#'.$prefix.'month\').val(\''.$tmparray['mon'].'\');';

-				$reset_scripts .= 'jQuery(\'#'.$prefix.'year\').val(\''.$tmparray['year'].'\');';

-				$retstring .= ' - <button class="dpInvisibleButtons datenowlink" id="dateofinvoice" type="button" name="_dateofinvoice" value="now" onclick="'.$reset_scripts.'">'.$tmplabeladddateof.'</button>';

-			}

+		// Add a "Plus one hour" link

+		if ($conf->use_javascript_ajax && $adddateof)

+		{

+			$tmparray = dol_getdate($adddateof);

+			if (empty($labeladddateof)) $labeladddateof = $langs->trans("DateInvoice");

+			$retstring .= ' - <button class="dpInvisibleButtons datenowlink" id="dateofinvoice" type="button" name="_dateofinvoice" value="now" onclick="jQuery(\'#re\').val(\''.dol_print_date($adddateof, 'day').'\');jQuery(\'#reday\').val(\''.$tmparray['mday'].'\');jQuery(\'#remonth\').val(\''.$tmparray['mon'].'\');jQuery(\'#reyear\').val(\''.$tmparray['year'].'\');">'.$labeladddateof.'</a>';

@@ -7195,10 +5895,17 @@
-	/**

-	 * selectTypeDuration

-	 *

-	 * @param string $prefix Prefix

-	 * @param string $selected Selected duration type

-	 * @param array $excludetypes Array of duration types to exclude. Example array('y', 'm')

-	 * @return  string                    HTML select string

-	 */

-	public function selectTypeDuration($prefix, $selected = 'i', $excludetypes = array())

-	{

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     *  Function to show a form to select a duration on a page

+	 *

+	 *	@param	string		$prefix   		Prefix for input fields

+	 *	@param  int			$iSecond  		Default preselected duration (number of seconds or '')

+	 * 	@param	int			$disabled       Disable the combo box

+	 * 	@param	string		$typehour		If 'select' then input hour and input min is a combo,

+	 *						            	If 'text' input hour is in text and input min is a text,

+	 *						            	If 'textselect' input hour is in text and input min is a combo

+	 *  @param	integer		$minunderhours	If 1, show minutes selection under the hours

+	 * 	@param	int			$nooutput		Do not output html string but return it

+	 *  @return	string|void

+	 */

+    public function select_duration($prefix, $iSecond = '', $disabled = 0, $typehour = 'select', $minunderhours = 0, $nooutput = 0)

+	{

+        // phpcs:enable

@@ -7207,53 +5914,3 @@
-		$TDurationTypes = array(

-			'y' => $langs->trans('Years'),

-			'm' => $langs->trans('Month'),

-			'w' => $langs->trans('Weeks'),

-			'd' => $langs->trans('Days'),

-			'h' => $langs->trans('Hours'),

-			'i' => $langs->trans('Minutes')

-		);

-

-		// Removed undesired duration types

-		foreach ($excludetypes as $value) {

-			unset($TDurationTypes[$value]);

-		}

-

-		$retstring = '<select class="flat minwidth75 maxwidth100" id="select_' . $prefix . 'type_duration" name="' . $prefix . 'type_duration">';

-		foreach ($TDurationTypes as $key => $typeduration) {

-			$retstring .= '<option value="' . $key . '"';

-			if ($key == $selected) {

-				$retstring .= " selected";

-			}

-			$retstring .= ">" . $typeduration . "</option>";

-		}

-		$retstring .= "</select>";

-

-		$retstring .= ajax_combobox('select_' . $prefix . 'type_duration');

-

-		return $retstring;

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-

-	/**

-	 *  Function to show a form to select a duration on a page

-	 *

-	 * @param string $prefix Prefix for input fields

-	 * @param int|string $iSecond Default preselected duration (number of seconds or '')

-	 * @param int $disabled Disable the combo box

-	 * @param string $typehour If 'select' then input hour and input min is a combo,

-	 *                         If 'text' input hour is in text and input min is a text,

-	 *                         If 'textselect' input hour is in text and input min is a combo

-	 * @param integer $minunderhours If 1, show minutes selection under the hours

-	 * @param int $nooutput Do not output html string but return it

-	 * @return    string                        HTML component

-	 */

-	public function select_duration($prefix, $iSecond = '', $disabled = 0, $typehour = 'select', $minunderhours = 0, $nooutput = 0)

-	{

-		// phpcs:enable

-		global $langs;

-

-		$retstring = '<span class="nowraponall">';

-

-		$hourSelected = '';

-		$minSelected = '';

+		$retstring = '';

+

+		$hourSelected = 0; $minSelected = 0;

@@ -7262,2 +5919,3 @@
-		if ($iSecond != '') {

-			require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';

+		if ($iSecond != '')

+		{

+			require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';

@@ -7269,5 +5927,8 @@
-		if ($typehour == 'select') {

-			$retstring .= '<select class="flat" id="select_' . $prefix . 'hour" name="' . $prefix . 'hour"' . ($disabled ? ' disabled' : '') . '>';

-			for ($hour = 0; $hour < 25; $hour++) {    // For a duration, we allow 24 hours

-				$retstring .= '<option value="' . $hour . '"';

-				if (is_numeric($hourSelected) && $hourSelected == $hour) {

+		if ($typehour == 'select')

+		{

+			$retstring .= '<select class="flat" id="select_'.$prefix.'hour" name="'.$prefix.'hour"'.($disabled ? ' disabled' : '').'>';

+			for ($hour = 0; $hour < 25; $hour++)	// For a duration, we allow 24 hours

+			{

+				$retstring .= '<option value="'.$hour.'"';

+				if ($hourSelected == $hour)

+				{

@@ -7276 +5937 @@
-				$retstring .= ">" . $hour . "</option>";

+				$retstring .= ">".$hour."</option>";

@@ -7279,11 +5940,9 @@
-		} elseif ($typehour == 'text' || $typehour == 'textselect') {

-			$retstring .= '<input placeholder="' . $langs->trans('HourShort') . '" type="number" min="0" name="' . $prefix . 'hour"' . ($disabled ? ' disabled' : '') . ' class="flat maxwidth50 inputhour right" value="' . (($hourSelected != '') ? ((int) $hourSelected) : '') . '">';

-		} else {

-			return 'BadValueForParameterTypeHour';

-		}

-

-		if ($typehour != 'text') {

-			$retstring .= ' ' . $langs->trans('HourShort');

-		} else {

-			$retstring .= '<span class="">:</span>';

-		}

+		}

+		elseif ($typehour == 'text' || $typehour == 'textselect')

+		{

+			$retstring .= '<input placeholder="'.$langs->trans('HourShort').'" type="number" min="0" name="'.$prefix.'hour"'.($disabled ? ' disabled' : '').' class="flat maxwidth50 inputhour" value="'.(($hourSelected != '') ? ((int) $hourSelected) : '').'">';

+		}

+		else return 'BadValueForParameterTypeHour';

+

+		if ($typehour != 'text') $retstring .= ' '.$langs->trans('HourShort');

+		else $retstring .= '<span class="hideonsmartphone">:</span>';

@@ -7292,16 +5951,11 @@
-		if ($minunderhours) {

-			$retstring .= '<br>';

-		} else {

-			if ($typehour != 'text') {

-				$retstring .= '<span class="hideonsmartphone">&nbsp;</span>';

-			}

-		}

-

-		if ($typehour == 'select' || $typehour == 'textselect') {

-			$retstring .= '<select class="flat" id="select_' . $prefix . 'min" name="' . $prefix . 'min"' . ($disabled ? ' disabled' : '') . '>';

-			for ($min = 0; $min <= 55; $min = $min + 5) {

-				$retstring .= '<option value="' . $min . '"';

-				if (is_numeric($minSelected) && $minSelected == $min) {

-					$retstring .= ' selected';

-				}

-				$retstring .= '>' . $min . '</option>';

+		if ($minunderhours) $retstring .= '<br>';

+		else $retstring .= '<span class="hideonsmartphone">&nbsp;</span>';

+

+		if ($typehour == 'select' || $typehour == 'textselect')

+		{

+			$retstring .= '<select class="flat" id="select_'.$prefix.'min" name="'.$prefix.'min"'.($disabled ? ' disabled' : '').'>';

+			for ($min = 0; $min <= 55; $min = $min + 5)

+			{

+				$retstring .= '<option value="'.$min.'"';

+				if ($minSelected == $min) $retstring .= ' selected';

+				$retstring .= '>'.$min.'</option>';

@@ -7310,13 +5964,11 @@
-		} elseif ($typehour == 'text') {

-			$retstring .= '<input placeholder="' . $langs->trans('MinuteShort') . '" type="number" min="0" name="' . $prefix . 'min"' . ($disabled ? ' disabled' : '') . ' class="flat maxwidth50 inputminute right" value="' . (($minSelected != '') ? ((int) $minSelected) : '') . '">';

-		}

-

-		if ($typehour != 'text') {

-			$retstring .= ' ' . $langs->trans('MinuteShort');

-		}

-

-		$retstring .= "</span>";

-

-		if (!empty($nooutput)) {

-			return $retstring;

-		}

+		}

+		elseif ($typehour == 'text')

+		{

+			$retstring .= '<input placeholder="'.$langs->trans('MinuteShort').'" type="number" min="0" name="'.$prefix.'min"'.($disabled ? ' disabled' : '').' class="flat maxwidth50 inputminute" value="'.(($minSelected != '') ? ((int) $minSelected) : '').'">';

+		}

+

+		if ($typehour != 'text') $retstring .= ' '.$langs->trans('MinuteShort');

+

+		//$retstring.="&nbsp;";

+

+		if (!empty($nooutput)) return $retstring;

@@ -7325,27 +5977,61 @@
-

-		return '';

-	}

-

-	/**

-	 *  Return list of tickets in Ajax if Ajax activated or go to selectTicketsList

-	 *

-	 * @param string $selected Preselected tickets

-	 * @param string $htmlname Name of HTML select field (must be unique in page).

-	 * @param string $filtertype To add a filter

-	 * @param int $limit Limit on number of returned lines

-	 * @param int $status Ticket status

-	 * @param string $selected_input_value Value of preselected input text (for use with ajax)

-	 * @param int $hidelabel Hide label (0=no, 1=yes, 2=show search icon (before) and placeholder, 3 search icon after)

-	 * @param array $ajaxoptions Options for ajax_autocompleter

-	 * @param int $socid Thirdparty Id (to get also price dedicated to this customer)

-	 * @param string $showempty '' to not show empty line. Translation key to show an empty line. '1' show empty line with no text.

-	 * @param int $forcecombo Force to use combo box

-	 * @param string $morecss Add more css on select

-	 * @param array $selected_combinations Selected combinations. Format: array([attrid] => attrval, [...])

-	 * @param int $nooutput No print, return the output into a string

-	 * @return        string

-	 */

-	public function selectTickets($selected = '', $htmlname = 'ticketid', $filtertype = '', $limit = 0, $status = 1, $selected_input_value = '', $hidelabel = 0, $ajaxoptions = array(), $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $selected_combinations = null, $nooutput = 0)

-	{

-		global $langs, $conf;

-

+		return;

+	}

+

+

+	/**

+	 * Generic method to select a component from a combo list.

+	 * This is the generic method that will replace all specific existing methods.

+	 *

+	 * @param 	string			$objectdesc			ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]

+	 * @param	string			$htmlname			Name of HTML select component

+	 * @param	int				$preselectedvalue	Preselected value (ID of element)

+	 * @param	string			$showempty			''=empty values not allowed, 'string'=value show if we allow empty values (for example 'All', ...)

+	 * @param	string			$searchkey			Search criteria

+	 * @param	string			$placeholder		Place holder

+	 * @param	string			$morecss			More CSS

+	 * @param	string			$moreparams			More params provided to ajax call

+	 * @param	int				$forcecombo			Force to load all values and output a standard combobox (with no beautification)

+	 * @param	int				$disabled			1=Html component is disabled

+	 * @param	string	        $selected_input_value	Value of preselected input text (for use with ajax)

+	 * @return	string								Return HTML string

+	 * @see selectForFormsList() select_thirdparty

+	 */

+	public function selectForForms($objectdesc, $htmlname, $preselectedvalue, $showempty = '', $searchkey = '', $placeholder = '', $morecss = '', $moreparams = '', $forcecombo = 0, $disabled = 0, $selected_input_value = '')

+	{

+		global $conf, $user;

+

+		$objecttmp = null;

+

+		$InfoFieldList = explode(":", $objectdesc);

+		$classname = $InfoFieldList[0];

+		$classpath = $InfoFieldList[1];

+		$addcreatebuttonornot = empty($InfoFieldList[2]) ? 0 : $InfoFieldList[2];

+		$filter = empty($InfoFieldList[3]) ? '' : $InfoFieldList[3];

+

+		if (!empty($classpath))

+		{

+			dol_include_once($classpath);

+			if ($classname && class_exists($classname))

+			{

+				$objecttmp = new $classname($this->db);

+				// Make some replacement

+				$sharedentities = getEntity(strtolower($classname));

+				$objecttmp->filter = str_replace(

+					array('__ENTITY__', '__SHARED_ENTITIES__', '__USER_ID__'),

+					array($conf->entity, $sharedentities, $user->id),

+					$filter);

+			}

+		}

+		if (!is_object($objecttmp))

+		{

+			dol_syslog('Error bad setup of type for field '.$InfoFieldList, LOG_WARNING);

+			return 'Error bad setup of type for field '.join(',', $InfoFieldList);

+		}

+

+		//var_dump($objecttmp->filter);

+		$prefixforautocompletemode = $objecttmp->element;

+		if ($prefixforautocompletemode == 'societe') $prefixforautocompletemode = 'company';

+		if ($prefixforautocompletemode == 'product') $prefixforautocompletemode = 'produit';

+		$confkeyforautocompletemode = strtoupper($prefixforautocompletemode).'_USE_SEARCH_TO_SELECT'; // For example COMPANY_USE_SEARCH_TO_SELECT

+

+		dol_syslog(get_class($this)."::selectForForms object->filter=".$objecttmp->filter, LOG_DEBUG);

@@ -7353,786 +6039,14 @@
-

-		// check parameters

-		if (is_null($ajaxoptions)) {

-			$ajaxoptions = array();

-		}

-

-		if (!empty($conf->use_javascript_ajax) && getDolGlobalString('TICKET_USE_SEARCH_TO_SELECT')) {

-			$placeholder = '';

-

-			if ($selected && empty($selected_input_value)) {

-				require_once DOL_DOCUMENT_ROOT . '/ticket/class/ticket.class.php';

-				$tickettmpselect = new Ticket($this->db);

-				$tickettmpselect->fetch($selected);

-				$selected_input_value = $tickettmpselect->ref;

-				unset($tickettmpselect);

-			}

-

-			$urloption = '';

-			$out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT . '/ticket/ajax/tickets.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 1, $ajaxoptions);

-

-			if (empty($hidelabel)) {

-				$out .= $langs->trans("RefOrLabel") . ' : ';

-			} elseif ($hidelabel > 1) {

-				$placeholder = ' placeholder="' . $langs->trans("RefOrLabel") . '"';

-				if ($hidelabel == 2) {

-					$out .= img_picto($langs->trans("Search"), 'search');

-				}

-			}

-			$out .= '<input type="text" class="minwidth100" name="search_' . $htmlname . '" id="search_' . $htmlname . '" value="' . $selected_input_value . '"' . $placeholder . ' ' . (getDolGlobalString('PRODUCT_SEARCH_AUTOFOCUS') ? 'autofocus' : '') . ' />';

-			if ($hidelabel == 3) {

-				$out .= img_picto($langs->trans("Search"), 'search');

-			}

-		} else {

-			$out .= $this->selectTicketsList($selected, $htmlname, $filtertype, $limit, $status, 0, $socid, $showempty, $forcecombo, $morecss);

-		}

-

-		if (empty($nooutput)) {

-			print $out;

-		} else {

-			return $out;

-		}

-		return '';

-	}

-

-

-	/**

-	 *    Return list of tickets.

-	 *  Called by selectTickets.

-	 *

-	 * @param string $selected Preselected ticket

-	 * @param string $htmlname Name of select html

-	 * @param string $filtertype Filter on ticket type

-	 * @param int $limit Limit on number of returned lines

-	 * @param string $filterkey Filter on ticket ref or subject

-	 * @param int $status Ticket status

-	 * @param int $outputmode 0=HTML select string, 1=Array

-	 * @param string $showempty '' to not show empty line. Translation key to show an empty line. '1' show empty line with no text.

-	 * @param int $forcecombo Force to use combo box

-	 * @param string $morecss Add more css on select

-	 * @return     array|string                Array of keys for json or HTML component

-	 */

-	public function selectTicketsList($selected = '', $htmlname = 'ticketid', $filtertype = '', $limit = 20, $filterkey = '', $status = 1, $outputmode = 0, $showempty = '1', $forcecombo = 0, $morecss = '')

-	{

-		global $langs, $conf;

-

-		$out = '';

-		$outarray = array();

-

-		$selectFields = " p.rowid, p.ref, p.message";

-

-		$sql = "SELECT ";

-		$sql .= $selectFields;

-		$sql .= " FROM " . $this->db->prefix() . "ticket as p";

-		$sql .= ' WHERE p.entity IN (' . getEntity('ticket') . ')';

-

-		// Add criteria on ref/label

-		if ($filterkey != '') {

-			$sql .= ' AND (';

-			$prefix = !getDolGlobalString('TICKET_DONOTSEARCH_ANYWHERE') ? '%' : ''; // Can use index if PRODUCT_DONOTSEARCH_ANYWHERE is on

-			// For natural search

-			$scrit = explode(' ', $filterkey);

-			$i = 0;

-			if (count($scrit) > 1) {

-				$sql .= "(";

-			}

-			foreach ($scrit as $crit) {

-				if ($i > 0) {

-					$sql .= " AND ";

-				}

-				$sql .= "(p.ref LIKE '" . $this->db->escape($prefix . $crit) . "%' OR p.subject LIKE '" . $this->db->escape($prefix . $crit) . "%'";

-				$sql .= ")";

-				$i++;

-			}

-			if (count($scrit) > 1) {

-				$sql .= ")";

-			}

-			$sql .= ')';

-		}

-

-		$sql .= $this->db->plimit($limit, 0);

-

-		// Build output string

-		dol_syslog(get_class($this) . "::selectTicketsList search tickets", LOG_DEBUG);

-		$result = $this->db->query($sql);

-		if ($result) {

-			require_once DOL_DOCUMENT_ROOT . '/ticket/class/ticket.class.php';

-			require_once DOL_DOCUMENT_ROOT . '/core/lib/ticket.lib.php';

-

-			$num = $this->db->num_rows($result);

-

-			$events = null;

-

-			if (!$forcecombo) {

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

-				$out .= ajax_combobox($htmlname, $events, $conf->global->TICKET_USE_SEARCH_TO_SELECT);

-			}

-

-			$out .= '<select class="flat' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '" id="' . $htmlname . '">';

-

-			$textifempty = '';

-			// Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.

-			//if (!empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';

-			if (getDolGlobalString('TICKET_USE_SEARCH_TO_SELECT')) {

-				if ($showempty && !is_numeric($showempty)) {

-					$textifempty = $langs->trans($showempty);

-				} else {

-					$textifempty .= $langs->trans("All");

-				}

-			} else {

-				if ($showempty && !is_numeric($showempty)) {

-					$textifempty = $langs->trans($showempty);

-				}

-			}

-			if ($showempty) {

-				$out .= '<option value="0" selected>' . $textifempty . '</option>';

-			}

-

-			$i = 0;

-			while ($num && $i < $num) {

-				$opt = '';

-				$optJson = array();

-				$objp = $this->db->fetch_object($result);

-

-				$this->constructTicketListOption($objp, $opt, $optJson, $selected, $filterkey);

-				// Add new entry

-				// "key" value of json key array is used by jQuery automatically as selected value

-				// "label" value of json key array is used by jQuery automatically as text for combo box

-				$out .= $opt;

-				array_push($outarray, $optJson);

-

-				$i++;

-			}

-

-			$out .= '</select>';

-

-			$this->db->free($result);

-

-			if (empty($outputmode)) {

-				return $out;

-			}

-			return $outarray;

-		} else {

-			dol_print_error($this->db);

-		}

-

-		return array();

-	}

-

-	/**

-	 * constructTicketListOption.

-	 * This define value for &$opt and &$optJson.

-	 *

-	 * @param object 	$objp 		Result set of fetch

-	 * @param string 	$opt 		Option (var used for returned value in string option format)

-	 * @param array 	$optJson 	Option (var used for returned value in json format)

-	 * @param string 	$selected 	Preselected value

-	 * @param string 	$filterkey 	Filter key to highlight

-	 * @return    void

-	 */

-	protected function constructTicketListOption(&$objp, &$opt, &$optJson, $selected, $filterkey = '')

-	{

-		$outkey = '';

-		$outref = '';

-		$outtype = '';

-

-		$outkey = $objp->rowid;

-		$outref = $objp->ref;

-		$outtype = $objp->fk_product_type;

-

-		$opt = '<option value="' . $objp->rowid . '"';

-		$opt .= ($objp->rowid == $selected) ? ' selected' : '';

-		$opt .= '>';

-		$opt .= $objp->ref;

-		$objRef = $objp->ref;

-		if (!empty($filterkey) && $filterkey != '') {

-			$objRef = preg_replace('/(' . preg_quote($filterkey, '/') . ')/i', '<strong>$1</strong>', $objRef, 1);

-		}

-

-		$opt .= "</option>\n";

-		$optJson = array('key' => $outkey, 'value' => $outref, 'type' => $outtype);

-	}

-

-	/**

-	 *  Return list of projects in Ajax if Ajax activated or go to selectTicketsList

-	 *

-	 * @param 	string 	$selected 				Preselected tickets

-	 * @param 	string 	$htmlname 				Name of HTML select field (must be unique in page).

-	 * @param 	string 	$filtertype				To add a filter

-	 * @param 	int 	$limit 					Limit on number of returned lines

-	 * @param 	int 	$status 				Ticket status

-	 * @param 	string 	$selected_input_value 	Value of preselected input text (for use with ajax)

-	 * @param 	int		$hidelabel 				Hide label (0=no, 1=yes, 2=show search icon (before) and placeholder, 3 search icon after)

-	 * @param 	array 	$ajaxoptions 			Options for ajax_autocompleter

-	 * @param 	int 	$socid 					Thirdparty Id (to get also price dedicated to this customer)

-	 * @param 	string 	$showempty 				'' to not show empty line. Translation key to show an empty line. '1' show empty line with no text.

-	 * @param 	int 	$forcecombo 			Force to use combo box

-	 * @param 	string 	$morecss 				Add more css on select

-	 * @param 	array 	$selected_combinations 	Selected combinations. Format: array([attrid] => attrval, [...])

-	 * @param 	int 	$nooutput 				No print, return the output into a string

-	 * @return 	string

-	 */

-	public function selectProjects($selected = '', $htmlname = 'projectid', $filtertype = '', $limit = 0, $status = 1, $selected_input_value = '', $hidelabel = 0, $ajaxoptions = array(), $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $selected_combinations = null, $nooutput = 0)

-	{

-		global $langs, $conf;

-

-		$out = '';

-

-		// check parameters

-		if (is_null($ajaxoptions)) {

-			$ajaxoptions = array();

-		}

-

-		if (!empty($conf->use_javascript_ajax) && getDolGlobalString('TICKET_USE_SEARCH_TO_SELECT')) {

-			$placeholder = '';

-

-			if ($selected && empty($selected_input_value)) {

-				require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';

-				$projecttmpselect = new Project($this->db);

-				$projecttmpselect->fetch($selected);

-				$selected_input_value = $projecttmpselect->ref;

-				unset($projecttmpselect);

-			}

-

-			$urloption = '';

-			$out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT . '/projet/ajax/projects.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 1, $ajaxoptions);

-

-			if (empty($hidelabel)) {

-				$out .= $langs->trans("RefOrLabel") . ' : ';

-			} elseif ($hidelabel > 1) {

-				$placeholder = ' placeholder="' . $langs->trans("RefOrLabel") . '"';

-				if ($hidelabel == 2) {

-					$out .= img_picto($langs->trans("Search"), 'search');

-				}

-			}

-			$out .= '<input type="text" class="minwidth100" name="search_' . $htmlname . '" id="search_' . $htmlname . '" value="' . $selected_input_value . '"' . $placeholder . ' ' . (getDolGlobalString('PRODUCT_SEARCH_AUTOFOCUS') ? 'autofocus' : '') . ' />';

-			if ($hidelabel == 3) {

-				$out .= img_picto($langs->trans("Search"), 'search');

-			}

-		} else {

-			$out .= $this->selectProjectsList($selected, $htmlname, $filtertype, $limit, $status, 0, $socid, $showempty, $forcecombo, $morecss);

-		}

-

-		if (empty($nooutput)) {

-			print $out;

-		} else {

-			return $out;

-		}

-		return '';

-	}

-

-	/**

-	 *    Return list of projects.

-	 *  Called by selectProjects.

-	 *

-	 * @param string $selected Preselected project

-	 * @param string $htmlname Name of select html

-	 * @param string $filtertype Filter on project type

-	 * @param int $limit Limit on number of returned lines

-	 * @param string $filterkey Filter on project ref or subject

-	 * @param int $status Ticket status

-	 * @param int $outputmode 0=HTML select string, 1=Array

-	 * @param string $showempty '' to not show empty line. Translation key to show an empty line. '1' show empty line with no text.

-	 * @param int $forcecombo Force to use combo box

-	 * @param string $morecss Add more css on select

-	 * @return     array|string                Array of keys for json or HTML component

-	 */

-	public function selectProjectsList($selected = '', $htmlname = 'projectid', $filtertype = '', $limit = 20, $filterkey = '', $status = 1, $outputmode = 0, $showempty = '1', $forcecombo = 0, $morecss = '')

-	{

-		global $langs, $conf;

-

-		$out = '';

-		$outarray = array();

-

-		$selectFields = " p.rowid, p.ref";

-

-		$sql = "SELECT ";

-		$sql .= $selectFields;

-		$sql .= " FROM " . $this->db->prefix() . "projet as p";

-		$sql .= ' WHERE p.entity IN (' . getEntity('project') . ')';

-

-		// Add criteria on ref/label

-		if ($filterkey != '') {

-			$sql .= ' AND (';

-			$prefix = !getDolGlobalString('TICKET_DONOTSEARCH_ANYWHERE') ? '%' : ''; // Can use index if PRODUCT_DONOTSEARCH_ANYWHERE is on

-			// For natural search

-			$scrit = explode(' ', $filterkey);

-			$i = 0;

-			if (count($scrit) > 1) {

-				$sql .= "(";

-			}

-			foreach ($scrit as $crit) {

-				if ($i > 0) {

-					$sql .= " AND ";

-				}

-				$sql .= "p.ref LIKE '" . $this->db->escape($prefix . $crit) . "%'";

-				$sql .= "";

-				$i++;

-			}

-			if (count($scrit) > 1) {

-				$sql .= ")";

-			}

-			$sql .= ')';

-		}

-

-		$sql .= $this->db->plimit($limit, 0);

-

-		// Build output string

-		dol_syslog(get_class($this) . "::selectProjectsList search projects", LOG_DEBUG);

-		$result = $this->db->query($sql);

-		if ($result) {

-			require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';

-			require_once DOL_DOCUMENT_ROOT . '/core/lib/project.lib.php';

-

-			$num = $this->db->num_rows($result);

-

-			$events = null;

-

-			if (!$forcecombo) {

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

-				$out .= ajax_combobox($htmlname, $events, $conf->global->PROJECT_USE_SEARCH_TO_SELECT);

-			}

-

-			$out .= '<select class="flat' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '" id="' . $htmlname . '">';

-

-			$textifempty = '';

-			// Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.

-			//if (!empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';

-			if (getDolGlobalString('PROJECT_USE_SEARCH_TO_SELECT')) {

-				if ($showempty && !is_numeric($showempty)) {

-					$textifempty = $langs->trans($showempty);

-				} else {

-					$textifempty .= $langs->trans("All");

-				}

-			} else {

-				if ($showempty && !is_numeric($showempty)) {

-					$textifempty = $langs->trans($showempty);

-				}

-			}

-			if ($showempty) {

-				$out .= '<option value="0" selected>' . $textifempty . '</option>';

-			}

-

-			$i = 0;

-			while ($num && $i < $num) {

-				$opt = '';

-				$optJson = array();

-				$objp = $this->db->fetch_object($result);

-

-				$this->constructProjectListOption($objp, $opt, $optJson, $selected, $filterkey);

-				// Add new entry

-				// "key" value of json key array is used by jQuery automatically as selected value

-				// "label" value of json key array is used by jQuery automatically as text for combo box

-				$out .= $opt;

-				array_push($outarray, $optJson);

-

-				$i++;

-			}

-

-			$out .= '</select>';

-

-			$this->db->free($result);

-

-			if (empty($outputmode)) {

-				return $out;

-			}

-			return $outarray;

-		} else {

-			dol_print_error($this->db);

-		}

-

-		return array();

-	}

-

-	/**

-	 * constructProjectListOption.

-	 * This define value for &$opt and &$optJson.

-	 *

-	 * @param object 	$objp 		Result set of fetch

-	 * @param string 	$opt 		Option (var used for returned value in string option format)

-	 * @param array 	$optJson 	Option (var used for returned value in json format)

-	 * @param string 	$selected 	Preselected value

-	 * @param string 	$filterkey 	Filter key to highlight

-	 * @return    void

-	 */

-	protected function constructProjectListOption(&$objp, &$opt, &$optJson, $selected, $filterkey = '')

-	{

-		$outkey = '';

-		$outref = '';

-		$outtype = '';

-

-		$label = $objp->label;

-

-		$outkey = $objp->rowid;

-		$outref = $objp->ref;

-		$outlabel = $objp->label;

-		$outtype = $objp->fk_product_type;

-

-		$opt = '<option value="' . $objp->rowid . '"';

-		$opt .= ($objp->rowid == $selected) ? ' selected' : '';

-		$opt .= '>';

-		$opt .= $objp->ref;

-		$objRef = $objp->ref;

-		if (!empty($filterkey) && $filterkey != '') {

-			$objRef = preg_replace('/(' . preg_quote($filterkey, '/') . ')/i', '<strong>$1</strong>', $objRef, 1);

-		}

-

-		$opt .= "</option>\n";

-		$optJson = array('key' => $outkey, 'value' => $outref, 'type' => $outtype);

-	}

-

-

-	/**

-	 *  Return list of members in Ajax if Ajax activated or go to selectTicketsList

-	 *

-	 * @param string $selected Preselected tickets

-	 * @param string $htmlname Name of HTML select field (must be unique in page).

-	 * @param string $filtertype To add a filter

-	 * @param int $limit Limit on number of returned lines

-	 * @param int $status Ticket status

-	 * @param string $selected_input_value Value of preselected input text (for use with ajax)

-	 * @param int $hidelabel Hide label (0=no, 1=yes, 2=show search icon before and placeholder, 3 search icon after)

-	 * @param array $ajaxoptions Options for ajax_autocompleter

-	 * @param int $socid Thirdparty Id (to get also price dedicated to this customer)

-	 * @param string $showempty '' to not show empty line. Translation key to show an empty line. '1' show empty line with no text.

-	 * @param int $forcecombo Force to use combo box

-	 * @param string $morecss Add more css on select

-	 * @param array $selected_combinations Selected combinations. Format: array([attrid] => attrval, [...])

-	 * @param int	$nooutput No print, return the output into a string

-	 * @return        string

-	 */

-	public function selectMembers($selected = '', $htmlname = 'adherentid', $filtertype = '', $limit = 0, $status = 1, $selected_input_value = '', $hidelabel = 0, $ajaxoptions = array(), $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $selected_combinations = null, $nooutput = 0)

-	{

-		global $langs, $conf;

-

-		$out = '';

-

-		// check parameters

-		if (is_null($ajaxoptions)) {

-			$ajaxoptions = array();

-		}

-

-		if (!empty($conf->use_javascript_ajax) && getDolGlobalString('TICKET_USE_SEARCH_TO_SELECT')) {

-			$placeholder = '';

-			$urloption = '';

-

-			if ($selected && empty($selected_input_value)) {

-				require_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php';

-				$adherenttmpselect = new Adherent($this->db);

-				$adherenttmpselect->fetch($selected);

-				$selected_input_value = $adherenttmpselect->ref;

-				unset($adherenttmpselect);

-			}

-

-			$urloption = '';

-

-			$out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT . '/adherents/ajax/adherents.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 1, $ajaxoptions);

-

-			if (empty($hidelabel)) {

-				$out .= $langs->trans("RefOrLabel") . ' : ';

-			} elseif ($hidelabel > 1) {

-				$placeholder = ' placeholder="' . $langs->trans("RefOrLabel") . '"';

-				if ($hidelabel == 2) {

-					$out .= img_picto($langs->trans("Search"), 'search');

-				}

-			}

-			$out .= '<input type="text" class="minwidth100" name="search_' . $htmlname . '" id="search_' . $htmlname . '" value="' . $selected_input_value . '"' . $placeholder . ' ' . (getDolGlobalString('PRODUCT_SEARCH_AUTOFOCUS') ? 'autofocus' : '') . ' />';

-			if ($hidelabel == 3) {

-				$out .= img_picto($langs->trans("Search"), 'search');

-			}

-		} else {

-			$filterkey = '';

-

-			$out .= $this->selectMembersList($selected, $htmlname, $filtertype, $limit, $filterkey, $status, 0, $showempty, $forcecombo, $morecss);

-		}

-

-		if (empty($nooutput)) {

-			print $out;

-		} else {

-			return $out;

-		}

-		return '';

-	}

-

-	/**

-	 *    Return list of adherents.

-	 *  Called by selectMembers.

-	 *

-	 * @param string $selected Preselected adherent

-	 * @param string $htmlname Name of select html

-	 * @param string $filtertype Filter on adherent type

-	 * @param int $limit Limit on number of returned lines

-	 * @param string $filterkey Filter on member status

-	 * @param int $status Member status

-	 * @param int $outputmode 0=HTML select string, 1=Array

-	 * @param string $showempty '' to not show empty line. Translation key to show an empty line. '1' show empty line with no text.

-	 * @param int $forcecombo Force to use combo box

-	 * @param string $morecss Add more css on select

-	 * @return     array|string                Array of keys for json or HTML string component

-	 */

-	public function selectMembersList($selected = '', $htmlname = 'adherentid', $filtertype = '', $limit = 20, $filterkey = '', $status = 1, $outputmode = 0, $showempty = '1', $forcecombo = 0, $morecss = '')

-	{

-		global $langs, $conf;

-

-		$out = '';

-		$outarray = array();

-

-		$selectFields = " p.rowid, p.ref, p.firstname, p.lastname, p.fk_adherent_type";

-

-		$sql = "SELECT ";

-		$sql .= $selectFields;

-		$sql .= " FROM " . $this->db->prefix() . "adherent as p";

-		$sql .= ' WHERE p.entity IN (' . getEntity('adherent') . ')';

-

-		// Add criteria on ref/label

-		if ($filterkey != '') {

-			$sql .= ' AND (';

-			$prefix = !getDolGlobalString('MEMBER_DONOTSEARCH_ANYWHERE') ? '%' : ''; // Can use index if PRODUCT_DONOTSEARCH_ANYWHERE is on

-			// For natural search

-			$scrit = explode(' ', $filterkey);

-			$i = 0;

-			if (count($scrit) > 1) {

-				$sql .= "(";

-			}

-			foreach ($scrit as $crit) {

-				if ($i > 0) {

-					$sql .= " AND ";

-				}

-				$sql .= "(p.firstname LIKE '" . $this->db->escape($prefix . $crit) . "%'";

-				$sql .= " OR p.lastname LIKE '" . $this->db->escape($prefix . $crit) . "%')";

-				$i++;

-			}

-			if (count($scrit) > 1) {

-				$sql .= ")";

-			}

-			$sql .= ')';

-		}

-		if ($status != -1) {

-			$sql .= ' AND statut = ' . ((int) $status);

-		}

-		$sql .= $this->db->plimit($limit, 0);

-

-		// Build output string

-		dol_syslog(get_class($this) . "::selectMembersList search adherents", LOG_DEBUG);

-		$result = $this->db->query($sql);

-		if ($result) {

-			require_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php';

-			require_once DOL_DOCUMENT_ROOT . '/core/lib/member.lib.php';

-

-			$num = $this->db->num_rows($result);

-

-			$events = null;

-

-			if (!$forcecombo) {

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

-				$out .= ajax_combobox($htmlname, $events, getDolGlobalString('PROJECT_USE_SEARCH_TO_SELECT') ? $conf->global->PROJECT_USE_SEARCH_TO_SELECT : '');

-			}

-

-			$out .= '<select class="flat' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '" id="' . $htmlname . '">';

-

-			$textifempty = '';

-			// Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.

-			//if (!empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';

-			if (getDolGlobalString('PROJECT_USE_SEARCH_TO_SELECT')) {

-				if ($showempty && !is_numeric($showempty)) {

-					$textifempty = $langs->trans($showempty);

-				} else {

-					$textifempty .= $langs->trans("All");

-				}

-			} else {

-				if ($showempty && !is_numeric($showempty)) {

-					$textifempty = $langs->trans($showempty);

-				}

-			}

-			if ($showempty) {

-				$out .= '<option value="-1" selected>' . $textifempty . '</option>';

-			}

-

-			$i = 0;

-			while ($num && $i < $num) {

-				$opt = '';

-				$optJson = array();

-				$objp = $this->db->fetch_object($result);

-

-				$this->constructMemberListOption($objp, $opt, $optJson, $selected, $filterkey);

-

-				// Add new entry

-				// "key" value of json key array is used by jQuery automatically as selected value

-				// "label" value of json key array is used by jQuery automatically as text for combo box

-				$out .= $opt;

-				array_push($outarray, $optJson);

-

-				$i++;

-			}

-

-			$out .= '</select>';

-

-			$this->db->free($result);

-

-			if (empty($outputmode)) {

-				return $out;

-			}

-			return $outarray;

-		} else {

-			dol_print_error($this->db);

-		}

-

-		return array();

-	}

-

-	/**

-	 * constructMemberListOption.

-	 * This define value for &$opt and &$optJson.

-	 *

-	 * @param object 	$objp 			Result set of fetch

-	 * @param string 	$opt 			Option (var used for returned value in string option format)

-	 * @param array 	$optJson 		Option (var used for returned value in json format)

-	 * @param string 	$selected 		Preselected value

-	 * @param string 	$filterkey 		Filter key to highlight

-	 * @return    void

-	 */

-	protected function constructMemberListOption(&$objp, &$opt, &$optJson, $selected, $filterkey = '')

-	{

-		$outkey = '';

-		$outlabel = '';

-		$outtype = '';

-

-		$outkey = $objp->rowid;

-		$outlabel = dolGetFirstLastname($objp->firstname, $objp->lastname);

-		$outtype = $objp->fk_adherent_type;

-

-		$opt = '<option value="' . $objp->rowid . '"';

-		$opt .= ($objp->rowid == $selected) ? ' selected' : '';

-		$opt .= '>';

-		if (!empty($filterkey) && $filterkey != '') {

-			$outlabel = preg_replace('/(' . preg_quote($filterkey, '/') . ')/i', '<strong>$1</strong>', $outlabel, 1);

-		}

-		$opt .= $outlabel;

-		$opt .= "</option>\n";

-

-		$optJson = array('key' => $outkey, 'value' => $outlabel, 'type' => $outtype);

-	}

-

-	/**

-	 * Generic method to select a component from a combo list.

-	 * Can use autocomplete with ajax after x key pressed or a full combo, depending on setup.

-	 * This is the generic method that will replace all specific existing methods.

-	 *

-	 * @param 	string $objectdesc           'ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter[:Sortfield]]]'. For hard coded custom needs. Try to prefer method using $objectfield instead of $objectdesc.

-	 * @param 	string $htmlname             Name of HTML select component

-	 * @param 	int    $preSelectedValue     Preselected value (ID of element)

-	 * @param 	string $showempty            ''=empty values not allowed, 'string'=value show if we allow empty values (for example 'All', ...)

-	 * @param 	string $searchkey            Search criteria

-	 * @param 	string $placeholder          Place holder

-	 * @param 	string $morecss              More CSS

-	 * @param 	string $moreparams           More params provided to ajax call

-	 * @param 	int    $forcecombo           Force to load all values and output a standard combobox (with no beautification)

-	 * @param 	int    $disabled             1=Html component is disabled

-	 * @param 	string $selected_input_value Value of preselected input text (for use with ajax)

-	 * @param	string $objectfield          Object:Field that contains the definition (in table $fields or $extrafields). Example: 'Object:xxx' or 'Module_Object:xxx' or 'Object:options_xxx' or 'Module_Object:options_xxx'

-	 * @return  string	                      	Return HTML string

-	 * @see selectForFormsList(), select_thirdparty_list()

-	 */

-	public function selectForForms($objectdesc, $htmlname, $preSelectedValue, $showempty = '', $searchkey = '', $placeholder = '', $morecss = '', $moreparams = '', $forcecombo = 0, $disabled = 0, $selected_input_value = '', $objectfield = '')

-	{

-		global $conf, $extrafields, $user;

-

-		//var_dump($objectdesc); debug_print_backtrace();

-

-		$objectdescorig = $objectdesc;

-		$objecttmp = null;

-		$InfoFieldList = array();

-

-		if ($objectfield) {	// We must retreive the objectdesc from the field or extrafield

-			// Example: $objectfield = 'product:options_package'

-			$tmparray = explode(':', $objectfield);

-

-			// Load object according to $id and $element

-			$objectforfieldstmp = fetchObjectByElement(0, strtolower($tmparray[0]));

-

-			if (is_object($objectforfieldstmp)) {

-				$objectdesc = '';

-

-				$reg = array();

-				if (preg_match('/^options_(.*)$/', $tmparray[1], $reg)) {

-					// For a property in extrafields

-					$key = $reg[1];

-					// fetch optionals attributes and labels

-					$extrafields->fetch_name_optionals_label($objectforfieldstmp->table_element);

-

-					if (!empty($extrafields->attributes[$objectforfieldstmp->table_element]['type'][$key]) && $extrafields->attributes[$objectforfieldstmp->table_element]['type'][$key] == 'link') {

-						if (!empty($extrafields->attributes[$objectforfieldstmp->table_element]['param'][$key]['options'])) {

-							$tmpextrafields = array_keys($extrafields->attributes[$objectforfieldstmp->table_element]['param'][$key]['options']);

-							$objectdesc = $tmpextrafields[0];

-						}

-					}

-				} else {

-					// For a property in ->fields

-					if (array_key_exists($tmparray[1], $objectforfieldstmp->fields)) {

-						$objectdesc = $objectforfieldstmp->fields[$tmparray[1]]['type'];

-						$objectdesc = preg_replace('/^integer[^:]*:/', '', $objectdesc);

-					}

-				}

-			}

-		}

-

-		if ($objectdesc) {

-			// Example of value for $objectdesc:

-			// Bom:bom/class/bom.class.php:0:t.status=1

-			// Bom:bom/class/bom.class.php:0:t.status=1:ref

-			// Bom:bom/class/bom.class.php:0:(t.status:=:1) OR (t.field2:=:2):ref

-			$InfoFieldList = explode(":", $objectdesc, 4);

-			$vartmp = (empty($InfoFieldList[3]) ? '' : $InfoFieldList[3]);

-			$reg = array();

-			if (preg_match('/^.*:(\w*)$/', $vartmp, $reg)) {

-				$InfoFieldList[4] = $reg[1];    // take the sort field

-			}

-			$InfoFieldList[3] = preg_replace('/:\w*$/', '', $vartmp);    // take the filter field

-

-			$classname = $InfoFieldList[0];

-			$classpath = empty($InfoFieldList[1]) ? '' : $InfoFieldList[1];

-			//$addcreatebuttonornot = empty($InfoFieldList[2]) ? 0 : $InfoFieldList[2];

-			$filter = empty($InfoFieldList[3]) ? '' : $InfoFieldList[3];

-			$sortfield = empty($InfoFieldList[4]) ? '' : $InfoFieldList[4];

-

-			// Load object according to $id and $element

-			$objecttmp = fetchObjectByElement(0, strtolower($InfoFieldList[0]));

-

-			// Fallback to another solution to get $objecttmp

-			if (empty($objecttmp) && !empty($classpath)) {

-				dol_include_once($classpath);

-

-				if ($classname && class_exists($classname)) {

-					$objecttmp = new $classname($this->db);

-				}

-			}

-		}

-

-		// Make some replacement in $filter. May not be used if we used the ajax mode with $objectfield. In such a case

-		// we propagate the $objectfield and not the filter and replacement is done by the ajax/selectobject.php component.

-		$sharedentities = getEntity($objecttmp->element);

-		$filter = str_replace(

-			array('__ENTITY__', '__SHARED_ENTITIES__', '__USER_ID__'),

-			array($conf->entity, $sharedentities, $user->id),

-			$filter

-		);

-

-		if (!is_object($objecttmp)) {

-			dol_syslog('selectForForms: Error bad setup of field objectdescorig=' . $objectdescorig.', objectfield='.$objectfield.', objectdesc='.$objectdesc, LOG_WARNING);

-			return 'selectForForms: Error bad setup of field objectdescorig=' . $objectdescorig.', objectfield='.$objectfield.', objectdesc='.$objectdesc;

-		}

-

-		//var_dump($filter);

-		$prefixforautocompletemode = $objecttmp->element;

-		if ($prefixforautocompletemode == 'societe') {

-			$prefixforautocompletemode = 'company';

-		}

-		if ($prefixforautocompletemode == 'product') {

-			$prefixforautocompletemode = 'produit';

-		}

-		$confkeyforautocompletemode = strtoupper($prefixforautocompletemode) . '_USE_SEARCH_TO_SELECT'; // For example COMPANY_USE_SEARCH_TO_SELECT

-

-		dol_syslog(get_class($this) . "::selectForForms filter=" . $filter, LOG_DEBUG);

-

-		// Generate the combo HTML component

-		$out = '';

-		if (!empty($conf->use_javascript_ajax) && getDolGlobalString($confkeyforautocompletemode) && !$forcecombo) {

+		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->$confkeyforautocompletemode) && !$forcecombo)

+		{

+		    // No immediate load of all database

+		    $placeholder = '';

+		    if ($preselectedvalue && empty($selected_input_value))

+		    {

+		        $objecttmp->fetch($preselectedvalue);

+		        $selected_input_value = ($prefixforautocompletemode == 'company' ? $objecttmp->name : $objecttmp->ref);

+		        //unset($objecttmp);

+		    }

+

+		    $objectdesc = $classname.':'.$classpath.':'.$addcreatebuttonornot.':'.$filter;

+			$urlforajaxcall = DOL_URL_ROOT.'/core/ajax/selectobject.php';

+

@@ -8140,24 +6054 @@
-			$placeholder = '';

-

-			if ($preSelectedValue && empty($selected_input_value)) {

-				$objecttmp->fetch($preSelectedValue);

-				$selected_input_value = ($prefixforautocompletemode == 'company' ? $objecttmp->name : $objecttmp->ref);

-

-				$oldValueForShowOnCombobox = 0;

-				foreach ($objecttmp->fields as $fieldK => $fielV) {

-					if (!$fielV['showoncombobox'] || empty($objecttmp->$fieldK)) continue;

-

-					if (!$oldValueForShowOnCombobox) {

-						$selected_input_value = '';

-					}

-

-					$selected_input_value .= $oldValueForShowOnCombobox ? ' - ' : '';

-					$selected_input_value .= $objecttmp->$fieldK;

-					$oldValueForShowOnCombobox = empty($fielV['showoncombobox']) ? 0 : $fielV['showoncombobox'];

-				}

-			}

-

-			// Set url and param to call to get json of the search results

-			$urlforajaxcall = DOL_URL_ROOT . '/core/ajax/selectobject.php';

-			$urloption = 'htmlname=' . urlencode($htmlname) . '&outjson=1&objectdesc=' . urlencode($objectdescorig) . '&objectfield='.urlencode($objectfield) . ($sortfield ? '&sortfield=' . urlencode($sortfield) : '');

-

+			$urloption = 'htmlname='.$htmlname.'&outjson=1&objectdesc='.$objectdesc.'&filter='.urlencode($objecttmp->filter).($moreparams ? $moreparams : '');

@@ -8165,6 +6056,9 @@
-			$out .= ajax_autocompleter($preSelectedValue, $htmlname, $urlforajaxcall, $urloption, getDolGlobalString($confkeyforautocompletemode), 0);

-			$out .= '<!-- force css to be higher than dialog popup --><style type="text/css">.ui-autocomplete { z-index: 1010; }</style>';

-			$out .= '<input type="text" class="' . $morecss . '"' . ($disabled ? ' disabled="disabled"' : '') . ' name="search_' . $htmlname . '" id="search_' . $htmlname . '" value="' . $selected_input_value . '"' . ($placeholder ? ' placeholder="' . dol_escape_htmltag($placeholder) . '"' : '') . ' />';

-		} else {

-			// Immediate load of table record.

-			$out .= $this->selectForFormsList($objecttmp, $htmlname, $preSelectedValue, $showempty, $searchkey, $placeholder, $morecss, $moreparams, $forcecombo, 0, $disabled, $sortfield, $filter);

+			$out .= ajax_autocompleter($preselectedvalue, $htmlname, $urlforajaxcall, $urloption, $conf->global->$confkeyforautocompletemode, 0, array());

+			$out .= '<style type="text/css">.ui-autocomplete { z-index: 250; }</style>';

+			if ($placeholder) $placeholder = ' placeholder="'.$placeholder.'"';

+			$out .= '<input type="text" class="'.$morecss.'"'.($disabled ? ' disabled="disabled"' : '').' name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' />';

+		}

+		else

+		{

+			// Immediate load of table record. Note: filter is inside $objecttmp->filter

+			$out .= $this->selectForFormsList($objecttmp, $htmlname, $preselectedvalue, $showempty, $searchkey, $placeholder, $morecss, $moreparams, $forcecombo, 0, $disabled);

@@ -8175,0 +6070,27 @@
+	/**

+	 * Function to forge a SQL criteria

+	 *

+	 * @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: "t.field like 'abc%'"

+	 */

+	protected static function forgeCriteriaCallback($matches)

+	{

+		global $db;

+

+		//dol_syslog("Convert matches ".$matches[1]);

+		if (empty($matches[1])) return '';

+		$tmp = explode(':', $matches[1]);

+		if (count($tmp) < 3) return '';

+

+		$tmpescaped = $tmp[2];

+		$regbis = array();

+		if (preg_match('/^\'(.*)\'$/', $tmpescaped, $regbis))

+		{

+			$tmpescaped = "'".$db->escape($regbis[1])."'";

+		}

+		else

+		{

+			$tmpescaped = $db->escape($tmpescaped);

+		}

+		return $db->escape($tmp[0]).' '.strtoupper($db->escape($tmp[1]))." ".$tmpescaped;

+	}

@@ -8181,14 +6102,12 @@
-	 * @param Object 		$objecttmp 			Object to know the table to scan for combo.

-	 * @param string 		$htmlname 			Name of HTML select component

-	 * @param int 			$preselectedvalue 	Preselected value (ID of element)

-	 * @param string 		$showempty 			''=empty values not allowed, 'string'=value show if we allow empty values (for example 'All', ...)

-	 * @param string 		$searchkey 			Search value

-	 * @param string 		$placeholder 		Place holder

-	 * @param string 		$morecss 			More CSS

-	 * @param string 		$moreparams 		More params provided to ajax call

-	 * @param int 			$forcecombo 		Force to load all values and output a standard combobox (with no beautification)

-	 * @param int 			$outputmode 		0=HTML select string, 1=Array

-	 * @param int 			$disabled 			1=Html component is disabled

-	 * @param string 		$sortfield 			Sort field

-	 * @param string 		$filter 			Add more filter (Universal Search Filter)

-	 * @return string|array                     Return HTML string

+	 * @param 	Object			$objecttmp			Object to knwo the table to scan for combo.

+	 * @param	string			$htmlname			Name of HTML select component

+	 * @param	int				$preselectedvalue	Preselected value (ID of element)

+	 * @param	string			$showempty			''=empty values not allowed, 'string'=value show if we allow empty values (for example 'All', ...)

+	 * @param	string			$searchkey			Search value

+	 * @param	string			$placeholder		Place holder

+	 * @param	string			$morecss			More CSS

+	 * @param	string			$moreparams			More params provided to ajax call

+	 * @param	int				$forcecombo			Force to load all values and output a standard combobox (with no beautification)

+	 * @param	int				$outputmode			0=HTML select string, 1=Array

+	 * @param	int				$disabled			1=Html component is disabled

+	 * @return	string|array						Return HTML string

@@ -8197,5 +6116,5 @@
-	public function selectForFormsList($objecttmp, $htmlname, $preselectedvalue, $showempty = '', $searchkey = '', $placeholder = '', $morecss = '', $moreparams = '', $forcecombo = 0, $outputmode = 0, $disabled = 0, $sortfield = '', $filter = '')

-	{

-		global $langs, $user, $hookmanager;

-

-		//print "$htmlname, $preselectedvalue, $showempty, $searchkey, $placeholder, $morecss, $moreparams, $forcecombo, $outputmode, $disabled";

+    public function selectForFormsList($objecttmp, $htmlname, $preselectedvalue, $showempty = '', $searchkey = '', $placeholder = '', $morecss = '', $moreparams = '', $forcecombo = 0, $outputmode = 0, $disabled = 0)

+	{

+		global $conf, $langs, $user;

+

+		//print "$objecttmp->filter, $htmlname, $preselectedvalue, $showempty = '', $searchkey = '', $placeholder = '', $morecss = '', $moreparams = '', $forcecombo = 0, $outputmode = 0, $disabled";

@@ -8204,6 +6123,5 @@
-		if ($prefixforautocompletemode == 'societe') {

-			$prefixforautocompletemode = 'company';

-		}

-		$confkeyforautocompletemode = strtoupper($prefixforautocompletemode) . '_USE_SEARCH_TO_SELECT'; // For example COMPANY_USE_SEARCH_TO_SELECT

-

-		if (!empty($objecttmp->fields)) {    // For object that declare it, it is better to use declared fields (like societe, contact, ...)

+		if ($prefixforautocompletemode == 'societe') $prefixforautocompletemode = 'company';

+		$confkeyforautocompletemode = strtoupper($prefixforautocompletemode).'_USE_SEARCH_TO_SELECT'; // For example COMPANY_USE_SEARCH_TO_SELECT

+

+		if (!empty($objecttmp->fields))	// For object that declare it, it is better to use declared fields (like societe, contact, ...)

+		{

@@ -8211,12 +6129,8 @@
-			foreach ($objecttmp->fields as $key => $val) {

-				if (!dol_eval($val['enabled'], 1, 1, '1')) {

-					continue;

-				}

-				if (!empty($val['showoncombobox'])) {

-					$tmpfieldstoshow .= ($tmpfieldstoshow ? ',' : '') . 't.' . $key;

-				}

-			}

-			if ($tmpfieldstoshow) {

-				$fieldstoshow = $tmpfieldstoshow;

-			}

-		} else {

+			foreach ($objecttmp->fields as $key => $val)

+			{

+				if ($val['showoncombobox']) $tmpfieldstoshow .= ($tmpfieldstoshow ? ',' : '').'t.'.$key;

+			}

+			if ($tmpfieldstoshow) $fieldstoshow = $tmpfieldstoshow;

+		}

+        else

+        {

@@ -8224,4 +6138,5 @@
-			$objecttmp->fields['ref'] = array('type' => 'varchar(30)', 'label' => 'Ref', 'showoncombobox' => 1);

-		}

-

-		if (empty($fieldstoshow)) {

+			$objecttmp->fields['ref'] = array('type'=>'varchar(30)', 'label'=>'Ref', 'showoncombobox'=>1);

+        }

+

+		if (empty($fieldstoshow))

+		{

@@ -8230 +6145,3 @@
-			} else {

+			}

+			else

+			{

@@ -8239 +6155,0 @@
-		$tmparray = array();

@@ -8244,62 +6160,29 @@
-		$sql = "SELECT t.rowid, " . $fieldstoshow . " FROM " . $this->db->prefix() . $objecttmp->table_element . " as t";

-		if (!empty($objecttmp->isextrafieldmanaged)) {

-			$sql .= " LEFT JOIN " . $this->db->prefix() . $objecttmp->table_element . "_extrafields as e ON t.rowid=e.fk_object";

-		}

-		if (isset($objecttmp->ismultientitymanaged)) {

-			if (!is_numeric($objecttmp->ismultientitymanaged)) {

-				$tmparray = explode('@', $objecttmp->ismultientitymanaged);

-				$sql .= " INNER JOIN " . $this->db->prefix() . $tmparray[1] . " as parenttable ON parenttable.rowid = t." . $tmparray[0];

-			}

-			if ($objecttmp->ismultientitymanaged === 'fk_soc@societe') {

-				if (!$user->hasRight('societe', 'client', 'voir') && !$user->socid) {

-					$sql .= ", " . $this->db->prefix() . "societe_commerciaux as sc";

-				}

-			}

-		}

-

-		// Add where from hooks

-		$parameters = array(

-			'object' => $objecttmp,

-			'htmlname' => $htmlname,

-			'filter' => $filter,

-			'searchkey' => $searchkey

-		);

-

-		$reshook = $hookmanager->executeHooks('selectForFormsListWhere', $parameters); // Note that $action and $object may have been modified by hook

-		if (!empty($hookmanager->resPrint)) {

-			$sql .= $hookmanager->resPrint;

-		} else {

-			$sql .= " WHERE 1=1";

-			if (isset($objecttmp->ismultientitymanaged)) {

-				if ($objecttmp->ismultientitymanaged == 1) {

-					$sql .= " AND t.entity IN (" . getEntity($objecttmp->table_element) . ")";

-				}

-				if (!is_numeric($objecttmp->ismultientitymanaged)) {

-					$sql .= " AND parenttable.entity = t." . $tmparray[0];

-				}

-				if ($objecttmp->ismultientitymanaged == 1 && !empty($user->socid)) {

-					if ($objecttmp->element == 'societe') {

-						$sql .= " AND t.rowid = " . ((int) $user->socid);

-					} else {

-						$sql .= " AND t.fk_soc = " . ((int) $user->socid);

-					}

-				}

-				if ($objecttmp->ismultientitymanaged === 'fk_soc@societe') {

-					if (!$user->hasRight('societe', 'client', 'voir') && !$user->socid) {

-						$sql .= " AND t.rowid = sc.fk_soc AND sc.fk_user = " . ((int) $user->id);

-					}

-				}

-			}

-			if ($searchkey != '') {

-				$sql .= natural_search(explode(',', $fieldstoshow), $searchkey);

-			}

-

-			if ($filter) {     // Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"

-				$errormessage = '';

-				$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);

-				if ($errormessage) {

-					return 'Error forging a SQL request from an universal criteria: ' . $errormessage;

-				}

-			}

-		}

-		$sql .= $this->db->order($sortfield ? $sortfield : $fieldstoshow, "ASC");

+		$sql = "SELECT t.rowid, ".$fieldstoshow." FROM ".MAIN_DB_PREFIX.$objecttmp->table_element." as t";

+		if (isset($objecttmp->ismultientitymanaged) && !is_numeric($objecttmp->ismultientitymanaged)) {

+			$tmparray = explode('@', $objecttmp->ismultientitymanaged);

+			$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.$tmparray[1].' as parenttable ON parenttable.rowid = t.'.$tmparray[0];

+		}

+		if ($objecttmp->ismultientitymanaged == 'fk_soc@societe')

+			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

+		$sql .= " WHERE 1=1";

+		if (isset($objecttmp->ismultientitymanaged) && $objecttmp->ismultientitymanaged == 1) $sql .= " AND t.entity IN (".getEntity($objecttmp->table_element).")";

+		if (isset($objecttmp->ismultientitymanaged) && !is_numeric($objecttmp->ismultientitymanaged)) {

+			$sql .= ' AND parenttable.entity = t.'.$tmparray[0];

+		}

+		if ($objecttmp->ismultientitymanaged == 1 && !empty($user->socid)) {

+			if ($objecttmp->element == 'societe') $sql .= " AND t.rowid = ".$user->socid;

+			else $sql .= " AND t.fk_soc = ".$user->socid;

+		}

+		if ($searchkey != '') $sql .= natural_search(explode(',', $fieldstoshow), $searchkey);

+		if ($objecttmp->ismultientitymanaged == 'fk_soc@societe') {

+			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND t.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;

+		}

+		if ($objecttmp->filter) {	 // Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"

+			/*if (! DolibarrApi::_checkFilters($objecttmp->filter))

+			{

+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$objecttmp->filter);

+			}*/

+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';

+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'Form::forgeCriteriaCallback', $objecttmp->filter).")";

+		}

+		$sql .= $this->db->order($fieldstoshow, "ASC");

@@ -8311 +6194,8 @@
-		if ($resql) {

+		if ($resql)

+		{

+			if (!$forcecombo)

+			{

+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

+				$out .= ajax_combobox($htmlname, null, $conf->global->$confkeyforautocompletemode);

+			}

+

@@ -8313 +6203 @@
-			$out .= '<select id="' . $htmlname . '" class="flat minwidth100' . ($morecss ? ' ' . $morecss : '') . '"' . ($disabled ? ' disabled="disabled"' : '') . ($moreparams ? ' ' . $moreparams : '') . ' name="' . $htmlname . '">' . "\n";

+			$out .= '<select id="'.$htmlname.'" class="flat'.($morecss ? ' '.$morecss : '').'"'.($disabled ? ' disabled="disabled"' : '').($moreparams ? ' '.$moreparams : '').' name="'.$htmlname.'">'."\n";

@@ -8318,11 +6208,7 @@
-			//if (!empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';

-			if (getDolGlobalInt($confkeyforautocompletemode)) {

-				if ($showempty && !is_numeric($showempty)) {

-					$textifempty = $langs->trans($showempty);

-				} else {

-					$textifempty .= $langs->trans("All");

-				}

-			}

-			if ($showempty) {

-				$out .= '<option value="-1">' . $textifempty . '</option>' . "\n";

-			}

+			//if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';

+			if (!empty($conf->global->$confkeyforautocompletemode))

+			{

+				if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);

+				else $textifempty .= $langs->trans("All");

+			}

+			if ($showempty) $out .= '<option value="-1">'.$textifempty.'</option>'."\n";

@@ -8332,2 +6218,4 @@
-			if ($num) {

-				while ($i < $num) {

+			if ($num)

+			{

+				while ($i < $num)

+				{

@@ -8336 +6223,0 @@
-					$labelhtml = '';

@@ -8338,2 +6225,2 @@
-					$oldvalueforshowoncombobox = 0;

-					foreach ($tmparray as $key => $val) {

+					foreach ($tmparray as $key => $val)

+					{

@@ -8341,12 +6228,7 @@
-						$label .= (($label && $obj->$val) ? ($oldvalueforshowoncombobox != $objecttmp->fields[$val]['showoncombobox'] ? ' - ' : ' ') : '');

-						$labelhtml .= (($label && $obj->$val) ? ($oldvalueforshowoncombobox != $objecttmp->fields[$val]['showoncombobox'] ? ' - ' : ' ') : '');

-						$label .= $obj->$val;

-						$labelhtml .= $obj->$val;

-

-						$oldvalueforshowoncombobox = empty($objecttmp->fields[$val]['showoncombobox']) ? 0 : $objecttmp->fields[$val]['showoncombobox'];

-					}

-					if (empty($outputmode)) {

-						if ($preselectedvalue > 0 && $preselectedvalue == $obj->rowid) {

-							$out .= '<option value="' . $obj->rowid . '" selected data-html="' . dol_escape_htmltag($labelhtml, 0, 0, '', 0, 1) . '">' . dol_escape_htmltag($label, 0, 0, '', 0, 1) . '</option>';

-						} else {

-							$out .= '<option value="' . $obj->rowid . '" data-html="' . dol_escape_htmltag($labelhtml, 0, 0, '', 0, 1) . '">' . dol_escape_htmltag($label, 0, 0, '', 0, 1) . '</option>';

+						$label .= (($label && $obj->$val) ? ' - ' : '').$obj->$val;

+					}

+					if (empty($outputmode))

+					{

+						if ($preselectedvalue > 0 && $preselectedvalue == $obj->rowid)

+						{

+							$out .= '<option value="'.$obj->rowid.'" selected>'.$label.'</option>';

@@ -8354,2 +6236,8 @@
-					} else {

-						array_push($outarray, array('key' => $obj->rowid, 'value' => $label, 'label' => $label));

+						else

+						{

+							$out .= '<option value="'.$obj->rowid.'">'.$label.'</option>';

+						}

+					}

+					else

+					{

+						array_push($outarray, array('key'=>$obj->rowid, 'value'=>$label, 'label'=>$label));

@@ -8359,13 +6247,8 @@
-					if (($i % 10) == 0) {

-						$out .= "\n";

-					}

-				}

-			}

-

-			$out .= '</select>' . "\n";

-

-			if (!$forcecombo) {

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

-				$out .= ajax_combobox($htmlname, null, getDolGlobalInt($confkeyforautocompletemode, 0));

-			}

-		} else {

+					if (($i % 10) == 0) $out .= "\n";

+				}

+			}

+

+			$out .= '</select>'."\n";

+		}

+		else

+		{

@@ -8375,5 +6258,3 @@
-		$this->result = array('nbofelement' => $num);

-

-		if ($outputmode) {

-			return $outarray;

-		}

+		$this->result = array('nbofelement'=>$num);

+

+		if ($outputmode) return $outarray;

@@ -8388,20 +6269,20 @@
-	 * @param string 		$htmlname 			Name of html select area. Must start with "multi" if this is a multiselect

-	 * @param array 		$array 				Array like array(key => value) or array(key=>array('label'=>..., 'data-...'=>..., 'disabled'=>..., 'css'=>...))

-	 * @param string|string[] $id				Preselected key or preselected keys for multiselect. Use 'ifone' to autoselect record if there is only one record.

-	 * @param int|string 	$show_empty 		0 no empty value allowed, 1 or string to add an empty value into list (If 1: key is -1 and value is '' or '&nbsp;', If placeholder string: key is -1 and value is the string), <0 to add an empty value with key that is this value.

-	 * @param int 			$key_in_label 		1 to show key into label with format "[key] value"

-	 * @param int 			$value_as_key 		1 to use value as key

-	 * @param string 		$moreparam 			Add more parameters onto the select tag. For example 'style="width: 95%"' to avoid select2 component to go over parent container

-	 * @param int 			$translate 			1=Translate and encode value

-	 * @param int 			$maxlen 			Length maximum for labels

-	 * @param int 			$disabled 			Html select box is disabled

-	 * @param string 		$sort 				'ASC' or 'DESC' = Sort on label, '' or 'NONE' or 'POS' = Do not sort, we keep original order

-	 * @param string 		$morecss 			Add more class to css styles

-	 * @param int 			$addjscombo 		Add js combo

-	 * @param string 		$moreparamonempty 	Add more param on the empty option line. Not used if show_empty not set

-	 * @param int 			$disablebademail 	1=Check if a not valid email, 2=Check string '---', and if found into value, disable and colorize entry

-	 * @param int 			$nohtmlescape 		No html escaping.

-	 * @return string							HTML select string.

-	 * @see multiselectarray(), selectArrayAjax(), selectArrayFilter()

-	 */

-	public static function selectarray($htmlname, $array, $id = '', $show_empty = 0, $key_in_label = 0, $value_as_key = 0, $moreparam = '', $translate = 0, $maxlen = 0, $disabled = 0, $sort = '', $morecss = 'minwidth75', $addjscombo = 1, $moreparamonempty = '', $disablebademail = 0, $nohtmlescape = 0)

+	 *	@param	string			$htmlname			Name of html select area. Must start with "multi" if this is a multiselect

+	 *	@param	array			$array				Array like array(key => value) or array(key=>array('label'=>..., 'data-...'=>...))

+	 *	@param	string|string[]	$id					Preselected key or preselected keys for multiselect

+	 *	@param	int|string		$show_empty			0 no empty value allowed, 1 or string to add an empty value into list (key is -1 and value is '' or '&nbsp;' if 1, key is -1 and value is text if string), <0 to add an empty value with key that is this value.

+	 *	@param	int				$key_in_label		1 to show key into label with format "[key] value"

+	 *	@param	int				$value_as_key		1 to use value as key

+	 *	@param  string			$moreparam			Add more parameters onto the select tag. For example 'style="width: 95%"' to avoid select2 component to go over parent container

+	 *	@param  int				$translate			1=Translate and encode value

+	 * 	@param	int				$maxlen				Length maximum for labels

+	 * 	@param	int				$disabled			Html select box is disabled

+	 *  @param	string			$sort				'ASC' or 'DESC' = Sort on label, '' or 'NONE' or 'POS' = Do not sort, we keep original order

+	 *  @param	string			$morecss			Add more class to css styles

+	 *  @param	int				$addjscombo			Add js combo

+	 *  @param  string          $moreparamonempty	Add more param on the empty option line. Not used if show_empty not set

+	 *  @param  int             $disablebademail	1=Check if a not valid email, 2=Check string '---', and if found into value, disable and colorize entry

+	 *  @param  int             $nohtmlescape		No html escaping.

+	 * 	@return	string								HTML select string.

+	 *  @see multiselectarray(), selectArrayAjax(), selectArrayFilter()

+	 */

+	public static function selectarray($htmlname, $array, $id = '', $show_empty = 0, $key_in_label = 0, $value_as_key = 0, $moreparam = '', $translate = 0, $maxlen = 0, $disabled = 0, $sort = '', $morecss = '', $addjscombo = 0, $moreparamonempty = '', $disablebademail = 0, $nohtmlescape = 0)

@@ -8416,3 +6297 @@
-		if ($value_as_key) {

-			$array = array_combine($array, $array);

-		}

+		if ($value_as_key) $array = array_combine($array, $array);

@@ -8422,13 +6301,17 @@
-		if ($addjscombo < 0) {

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

-				$addjscombo = 1;

-			} else {

-				$addjscombo = 0;

-			}

-		}

-		$idname = str_replace(array('[', ']'), array('', ''), $htmlname);

-		$out .= '<select id="' . preg_replace('/^\./', '', $idname) . '" ' . ($disabled ? 'disabled="disabled" ' : '') . 'class="flat ' . (preg_replace('/^\./', '', $htmlname)) . ($morecss ? ' ' . $morecss : '') . ' selectformat"';

-		$out .= ' name="' . preg_replace('/^\./', '', $htmlname) . '" ' . ($moreparam ? $moreparam : '');

-		$out .= '>'."\n";

-

-		if ($show_empty) {

+		// Add code for jquery to use multiselect

+		if ($addjscombo && $jsbeautify)

+		{

+			$minLengthToAutocomplete = 0;

+			$tmpplugin = empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) ? (constant('REQUIRE_JQUERY_MULTISELECT') ?constant('REQUIRE_JQUERY_MULTISELECT') : 'select2') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;

+

+			// Enhance with select2

+			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

+			$out .= ajax_combobox($htmlname);

+		}

+

+		$out .= '<select id="'.preg_replace('/^\./', '', $htmlname).'" '.($disabled ? 'disabled="disabled" ' : '').'class="flat '.(preg_replace('/^\./', '', $htmlname)).($morecss ? ' '.$morecss : '').'"';

+		$out .= ' name="'.preg_replace('/^\./', '', $htmlname).'" '.($moreparam ? $moreparam : '');

+		$out .= '>';

+

+		if ($show_empty)

+		{

@@ -8436,9 +6319,7 @@
-			if (!empty($conf->use_javascript_ajax)) {

-				$textforempty = '&nbsp;'; // If we use ajaxcombo, we need &nbsp; here to avoid to have an empty element that is too small.

-			}

-			if (!is_numeric($show_empty)) {

-				$textforempty = $show_empty;

-			}

-			$out .= '<option class="optiongrey" ' . ($moreparamonempty ? $moreparamonempty . ' ' : '') . 'value="' . (((int) $show_empty) < 0 ? $show_empty : -1) . '"' . ($id == $show_empty ? ' selected' : '') . '>' . $textforempty . '</option>' . "\n";

-		}

-		if (is_array($array)) {

+			if (!empty($conf->use_javascript_ajax)) $textforempty = '&nbsp;'; // If we use ajaxcombo, we need &nbsp; here to avoid to have an empty element that is too small.

+			if (!is_numeric($show_empty)) $textforempty = $show_empty;

+			$out .= '<option class="optiongrey" '.($moreparamonempty ? $moreparamonempty.' ' : '').'value="'.($show_empty < 0 ? $show_empty : -1).'"'.($id == $show_empty ? ' selected' : '').'>'.$textforempty.'</option>'."\n";

+		}

+

+		if (is_array($array))

+		{

@@ -8446,9 +6327,9 @@
-			if ($translate) {

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

-					if (!is_array($value)) {

-						$array[$key] = $langs->trans($value);

-					} else {

-						$array[$key]['label'] = $langs->trans($value['label']);

-					}

-				}

-			}

+			if ($translate)

+			{

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

+				{

+				    if (!is_array($value)) $array[$key] = $langs->trans($value);

+				    else $array[$key]['label'] = $langs->trans($value['label']);

+				}

+			}

+

@@ -8456,18 +6337,14 @@
-			if ($sort == 'ASC') {

-				asort($array);

-			} elseif ($sort == 'DESC') {

-				arsort($array);

-			}

-			foreach ($array as $key => $tmpvalue) {

-				if (is_array($tmpvalue)) {

-					$value = $tmpvalue['label'];

-					$disabled = empty($tmpvalue['disabled']) ? '' : ' disabled';

-					$style = empty($tmpvalue['css']) ? '' : ' class="' . $tmpvalue['css'] . '"';

-				} else {

-					$value = $tmpvalue;

-					$disabled = '';

-					$style = '';

-				}

-				if (!empty($disablebademail)) {

-					if (($disablebademail == 1 && !preg_match('/&lt;.+@.+&gt;/', $value))

-						|| ($disablebademail == 2 && preg_match('/---/', $value))) {

+			if ($sort == 'ASC') asort($array);

+			elseif ($sort == 'DESC') arsort($array);

+

+			foreach ($array as $key => $tmpvalue)

+			{

+			    if (is_array($tmpvalue)) $value = $tmpvalue['label'];

+			    else $value = $tmpvalue;

+

+				$disabled = ''; $style = '';

+				if (!empty($disablebademail))

+				{

+				    if (($disablebademail == 1 && !preg_match('/&lt;.+@.+&gt;/', $value))

+				        || ($disablebademail == 2 && preg_match('/---/', $value)))

+					{

@@ -8478,18 +6355,15 @@
-				if ($key_in_label) {

-					if (empty($nohtmlescape)) {

-						$selectOptionValue = dol_escape_htmltag($key . ' - ' . ($maxlen ? dol_trunc($value, $maxlen) : $value));

-					} else {

-						$selectOptionValue = $key . ' - ' . ($maxlen ? dol_trunc($value, $maxlen) : $value);

-					}

-				} else {

-					if (empty($nohtmlescape)) {

-						$selectOptionValue = dol_escape_htmltag($maxlen ? dol_trunc($value, $maxlen) : $value);

-					} else {

-						$selectOptionValue = $maxlen ? dol_trunc($value, $maxlen) : $value;

-					}

-					if ($value == '' || $value == '-') {

-						$selectOptionValue = '&nbsp;';

-					}

-				}

-				$out .= '<option value="' . $key . '"';

-				$out .= $style . $disabled;

+

+				if ($key_in_label)

+				{

+					if (empty($nohtmlescape)) $selectOptionValue = dol_escape_htmltag($key.' - '.($maxlen ?dol_trunc($value, $maxlen) : $value));

+					else $selectOptionValue = $key.' - '.($maxlen ?dol_trunc($value, $maxlen) : $value);

+				}

+				else

+				{

+					if (empty($nohtmlescape)) $selectOptionValue = dol_escape_htmltag($maxlen ?dol_trunc($value, $maxlen) : $value);

+					else $selectOptionValue = $maxlen ?dol_trunc($value, $maxlen) : $value;

+					if ($value == '' || $value == '-') $selectOptionValue = '&nbsp;';

+				}

+

+				$out .= '<option value="'.$key.'"';

+				$out .= $style.$disabled;

@@ -8497,3 +6371 @@
-					if (in_array($key, $id) && !$disabled) {

-						$out .= ' selected'; // To preselect a value

-					}

+					if (in_array($key, $id) && !$disabled) $out .= ' selected'; // To preselect a value

@@ -8502,13 +6374,9 @@
-					if ($id != '' && ($id == $key || ($id == 'ifone' && count($array) == 1)) && !$disabled) {

-						$out .= ' selected'; // To preselect a value

-					}

-				}

-				if ($nohtmlescape) {

-					$out .= ' data-html="' . dol_escape_htmltag($selectOptionValue) . '"';

-				}

-				if (is_array($tmpvalue)) {

-					foreach ($tmpvalue as $keyforvalue => $valueforvalue) {

-						if (preg_match('/^data-/', $keyforvalue)) {

-							$out .= ' '.$keyforvalue.'="'.dol_escape_htmltag($valueforvalue).'"';

-						}

-					}

+					if ($id != '' && $id == $key && !$disabled) $out .= ' selected'; // To preselect a value

+				}

+				if ($nohtmlescape) $out .= ' data-html="'.dol_escape_htmltag($selectOptionValue).'"';

+				if (is_array($tmpvalue))

+				{

+				    foreach ($tmpvalue as $keyforvalue => $valueforvalue)

+				    {

+				        if (preg_match('/^data-/', $keyforvalue)) $out .= ' '.$keyforvalue.'="'.$valueforvalue.'"';

+				    }

@@ -8516,0 +6385 @@
+				//var_dump($selectOptionValue);

@@ -8520,0 +6390 @@
+

@@ -8522,7 +6391,0 @@
-		// Add code for jquery to use multiselect

-		if ($addjscombo && $jsbeautify) {

-			// Enhance with select2

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

-			$out .= ajax_combobox($idname, array(), 0, 0, 'resolve', (((int) $show_empty) < 0 ? (string) $show_empty : '-1'), $morecss);

-		}

-

@@ -8532,2 +6395,3 @@
-	/**

-	 *    Return a HTML select string, built from an array of key+value, but content returned into select come from an Ajax call of an URL.

+

+	/**

+	 *	Return a HTML select string, built from an array of key+value, but content returned into select come from an Ajax call of an URL.

@@ -8536,13 +6400,13 @@
-	 * @param string $htmlname Name of html select area

-	 * @param string $url Url. Must return a json_encode of array(key=>array('text'=>'A text', 'url'=>'An url'), ...)

-	 * @param string $id Preselected key

-	 * @param string $moreparam Add more parameters onto the select tag

-	 * @param string $moreparamtourl Add more parameters onto the Ajax called URL

-	 * @param int $disabled Html select box is disabled

-	 * @param int $minimumInputLength Minimum Input Length

-	 * @param string $morecss Add more class to css styles

-	 * @param int $callurlonselect If set to 1, some code is added so an url return by the ajax is called when value is selected.

-	 * @param string $placeholder String to use as placeholder

-	 * @param integer $acceptdelayedhtml 1 = caller is requesting to have html js content not returned but saved into global $delayedhtmlcontent (so caller can show it at end of page to avoid flash FOUC effect)

-	 * @return    string                        HTML select string

-	 * @see selectArrayFilter(), ajax_combobox() in ajax.lib.php

+	 *	@param	string	$htmlname       		Name of html select area

+	 *	@param	string	$url					Url. Must return a json_encode of array(key=>array('text'=>'A text', 'url'=>'An url'), ...)

+	 *	@param	string	$id             		Preselected key

+	 *	@param  string	$moreparam      		Add more parameters onto the select tag

+	 *	@param  string	$moreparamtourl 		Add more parameters onto the Ajax called URL

+	 * 	@param	int		$disabled				Html select box is disabled

+	 *  @param	int		$minimumInputLength		Minimum Input Length

+	 *  @param	string	$morecss				Add more class to css styles

+	 *  @param  int     $callurlonselect        If set to 1, some code is added so an url return by the ajax is called when value is selected.

+	 *  @param  string  $placeholder            String to use as placeholder

+	 *  @param  integer $acceptdelayedhtml      1 = caller is requesting to have html js content not returned but saved into global $delayedhtmlcontent (so caller can show it at end of page to avoid flash FOUC effect)

+	 * 	@return	string   						HTML select string

+	 *  @see selectArrayFilter(), ajax_combobox() in ajax.lib.php

@@ -8553 +6417 @@
-		global $delayedhtmlcontent;    // Will be used later outside of this function

+		global $delayedhtmlcontent;

@@ -8556,73 +6420,69 @@
-		if (!getDolGlobalString('MAIN_USE_JQUERY_MULTISELECT') && !defined('REQUIRE_JQUERY_MULTISELECT')) {

-			return '';

-		}

-

-		$out = '<select type="text" class="' . $htmlname . ($morecss ? ' ' . $morecss : '') . '" ' . ($moreparam ? $moreparam . ' ' : '') . 'name="' . $htmlname . '"></select>';

-

-		$outdelayed = '';

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

-			$tmpplugin = 'select2';

-			$outdelayed = "\n" . '<!-- JS CODE TO ENABLE ' . $tmpplugin . ' for id ' . $htmlname . ' -->

-		    	<script nonce="' . getNonce() . '">

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

-

-	    	        ' . ($callurlonselect ? 'var saveRemoteData = [];' : '') . '

-

-	                $(".' . $htmlname . '").select2({

-				    	ajax: {

-					    	dir: "ltr",

-					    	url: "' . $url . '",

-					    	dataType: \'json\',

-					    	delay: 250,

-					    	data: function (params) {

-					    		return {

-							    	q: params.term, 	// search term

-					    			page: params.page

-					    		}

-				    		},

-				    		processResults: function (data) {

-				    			// parse the results into the format expected by Select2.

-				    			// since we are using custom formatting functions we do not need to alter the remote JSON data

-				    			//console.log(data);

-								saveRemoteData = data;

-					    	    /* format json result for select2 */

-					    	    result = []

-					    	    $.each( data, function( key, value ) {

-					    	       result.push({id: key, text: value.text});

-	                            });

-				    			//return {results:[{id:\'none\', text:\'aa\'}, {id:\'rrr\', text:\'Red\'},{id:\'bbb\', text:\'Search a into projects\'}], more:false}

-				    			//console.log(result);

-				    			return {results: result, more: false}

-				    		},

-				    		cache: true

-				    	},

-		 				language: select2arrayoflanguage,

-						containerCssClass: \':all:\',					/* Line to add class of origin SELECT propagated to the new <span class="select2-selection...> tag */

-					    placeholder: "' . dol_escape_js($placeholder) . '",

-				    	escapeMarkup: function (markup) { return markup; }, 	// let our custom formatter work

-				    	minimumInputLength: ' . ((int) $minimumInputLength) . ',

-				        formatResult: function (result, container, query, escapeMarkup) {

-	                        return escapeMarkup(result.text);

-	                    },

-				    });

-

-	                ' . ($callurlonselect ? '

-	                /* Code to execute a GET when we select a value */

-	                $(".' . $htmlname . '").change(function() {

-				    	var selected = $(".' . $htmlname . '").val();

-	                	console.log("We select in selectArrayAjax the entry "+selected)

-				        $(".' . $htmlname . '").val("");  /* reset visible combo value */

-	    			    $.each( saveRemoteData, function( key, value ) {

-	    				        if (key == selected)

-	    			            {

-	    			                 console.log("selectArrayAjax - Do a redirect to "+value.url)

-	    			                 location.assign(value.url);

-	    			            }

-	                    });

-	    			});' : '') . '

-

-	    	   });

-		       </script>';

-		}

-

-		if ($acceptdelayedhtml) {

+		if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && !defined('REQUIRE_JQUERY_MULTISELECT')) return '';

+

+		$out = '<select type="text" class="'.$htmlname.($morecss ? ' '.$morecss : '').'" '.($moreparam ? $moreparam.' ' : '').'name="'.$htmlname.'"></select>';

+

+		$tmpplugin = 'select2';

+		$outdelayed = "\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->

+	    	<script>

+	    	$(document).ready(function () {

+

+    	        '.($callurlonselect ? 'var saveRemoteData = [];' : '').'

+

+                $(".'.$htmlname.'").select2({

+			    	ajax: {

+				    	dir: "ltr",

+				    	url: "'.$url.'",

+				    	dataType: \'json\',

+				    	delay: 250,

+				    	data: function (params) {

+				    		return {

+						    	q: params.term, 	// search term

+				    			page: params.page

+				    		};

+			    		},

+			    		processResults: function (data) {

+			    			// parse the results into the format expected by Select2.

+			    			// since we are using custom formatting functions we do not need to alter the remote JSON data

+			    			//console.log(data);

+							saveRemoteData = data;

+				    	    /* format json result for select2 */

+				    	    result = []

+				    	    $.each( data, function( key, value ) {

+				    	       result.push({id: key, text: value.text});

+                            });

+			    			//return {results:[{id:\'none\', text:\'aa\'}, {id:\'rrr\', text:\'Red\'},{id:\'bbb\', text:\'Search a into projects\'}], more:false}

+			    			//console.log(result);

+			    			return {results: result, more: false}

+			    		},

+			    		cache: true

+			    	},

+	 				language: select2arrayoflanguage,

+					containerCssClass: \':all:\',					/* Line to add class of origin SELECT propagated to the new <span class="select2-selection...> tag */

+				    placeholder: "'.dol_escape_js($placeholder).'",

+			    	escapeMarkup: function (markup) { return markup; }, 	// let our custom formatter work

+			    	minimumInputLength: '.$minimumInputLength.',

+			        formatResult: function(result, container, query, escapeMarkup) {

+                        return escapeMarkup(result.text);

+                    },

+			    });

+

+                '.($callurlonselect ? '

+                /* Code to execute a GET when we select a value */

+                $(".'.$htmlname.'").change(function() {

+			    	var selected = $(".'.$htmlname.'").val();

+                	console.log("We select in selectArrayAjax the entry "+selected)

+			        $(".'.$htmlname.'").val("");  /* reset visible combo value */

+    			    $.each( saveRemoteData, function( key, value ) {

+    				        if (key == selected)

+    			            {

+    			                 console.log("selectArrayAjax - Do a redirect to "+value.url)

+    			                 location.assign(value.url);

+    			            }

+                    });

+    			});' : '').'

+

+    	   });

+	       </script>';

+

+		if ($acceptdelayedhtml)

+		{

@@ -8630 +6490,3 @@
-		} else {

+		}

+		else

+		{

@@ -8636,20 +6498,19 @@
-	/**

-	 *  Return a HTML select string, built from an array of key+value, but content returned into select is defined into $array parameter.

-	 *  Note: Do not apply langs->trans function on returned content of Ajax service, content may be entity encoded twice.

-	 *

-	 * @param string 	$htmlname 				Name of html select area

-	 * @param array 	$array 					Array (key=>array('text'=>'A text', 'url'=>'An url'), ...)

-	 * @param string 	$id 					Preselected key

-	 * @param string 	$moreparam 				Add more parameters onto the select tag

-	 * @param int 		$disableFiltering 		If set to 1, results are not filtered with searched string

-	 * @param int 		$disabled 				Html select box is disabled

-	 * @param int 		$minimumInputLength 	Minimum Input Length

-	 * @param string 	$morecss 				Add more class to css styles

-	 * @param int 		$callurlonselect 		If set to 1, some code is added so an url return by the ajax is called when value is selected.

-	 * @param string 	$placeholder 			String to use as placeholder

-	 * @param integer 	$acceptdelayedhtml 		1 = caller is requesting to have html js content not returned but saved into global $delayedhtmlcontent (so caller can show it at end of page to avoid flash FOUC effect)

-	 * @param string	$textfortitle			Text to show on title.

-	 * @return	string      					HTML select string

-	 * @see selectArrayAjax(), ajax_combobox() in ajax.lib.php

-	 */

-	public static function selectArrayFilter($htmlname, $array, $id = '', $moreparam = '', $disableFiltering = 0, $disabled = 0, $minimumInputLength = 1, $morecss = '', $callurlonselect = 0, $placeholder = '', $acceptdelayedhtml = 0, $textfortitle = '')

+    /**

+     *  Return a HTML select string, built from an array of key+value, but content returned into select is defined into $array parameter.

+     *  Note: Do not apply langs->trans function on returned content of Ajax service, content may be entity encoded twice.

+     *

+     *  @param  string	$htmlname               Name of html select area

+	 *	@param	string	$array					Array (key=>array('text'=>'A text', 'url'=>'An url'), ...)

+	 *	@param	string	$id             		Preselected key

+	 *	@param  string	$moreparam      		Add more parameters onto the select tag

+	 *	@param	int		$disableFiltering		If set to 1, results are not filtered with searched string

+	 * 	@param	int		$disabled				Html select box is disabled

+	 *  @param	int		$minimumInputLength		Minimum Input Length

+	 *  @param	string	$morecss				Add more class to css styles

+	 *  @param  int     $callurlonselect        If set to 1, some code is added so an url return by the ajax is called when value is selected.

+	 *  @param  string  $placeholder            String to use as placeholder

+	 *  @param  integer $acceptdelayedhtml      1 = caller is requesting to have html js content not returned but saved into global $delayedhtmlcontent (so caller can show it at end of page to avoid flash FOUC effect)

+	 *  @return	string   						HTML select string

+	 *  @see selectArrayAjax(), ajax_combobox() in ajax.lib.php

+	 */

+	public static function selectArrayFilter($htmlname, $array, $id = '', $moreparam = '', $disableFiltering = 0, $disabled = 0, $minimumInputLength = 1, $morecss = '', $callurlonselect = 0, $placeholder = '', $acceptdelayedhtml = 0)

@@ -8658 +6519 @@
-		global $delayedhtmlcontent;    // Will be used later outside of this function

+		global $delayedhtmlcontent;

@@ -8661,5 +6522,3 @@
-		if (!getDolGlobalString('MAIN_USE_JQUERY_MULTISELECT') && !defined('REQUIRE_JQUERY_MULTISELECT')) {

-			return '';

-		}

-

-		$out = '<select type="text"'.($textfortitle ? ' title="'.dol_escape_htmltag($textfortitle).'"' : '').' id="'.$htmlname.'" class="'.$htmlname.($morecss ? ' ' . $morecss : '').'"'.($moreparam ? ' '.$moreparam : '').' name="'.$htmlname.'"><option></option></select>';

+		if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && !defined('REQUIRE_JQUERY_MULTISELECT')) return '';

+

+		$out = '<select type="text" class="'.$htmlname.($morecss ? ' '.$morecss : '').'" '.($moreparam ? $moreparam.' ' : '').'name="'.$htmlname.'"><option></option></select>';

@@ -8677,49 +6536,23 @@
-		$outdelayed = '';

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

-			$tmpplugin = 'select2';

-			$outdelayed = "\n" . '<!-- JS CODE TO ENABLE ' . $tmpplugin . ' for id ' . $htmlname . ' -->

-				<script nonce="' . getNonce() . '">

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

-					var data = ' . json_encode($formattedarrayresult) . ';

-

-					' . ($callurlonselect ? 'var saveRemoteData = ' . json_encode($array) . ';' : '') . '

-

-					$(".' . $htmlname . '").select2({

-						data: data,

-						language: select2arrayoflanguage,

-						containerCssClass: \':all:\',					/* Line to add class of origin SELECT propagated to the new <span class="select2-selection...> tag */

-						placeholder: "' . dol_escape_js($placeholder) . '",

-						escapeMarkup: function (markup) { return markup; }, 	// let our custom formatter work

-						minimumInputLength: ' . $minimumInputLength . ',

-						formatResult: function (result, container, query, escapeMarkup) {

-							return escapeMarkup(result.text);

-						},

-						matcher: function (params, data) {

-

-							if(! data.id) return null;';

-

-			if ($callurlonselect) {

-				// We forge the url with 'sall='

-				$outdelayed .= '

-

-							var urlBase = data.url;

-							var separ = urlBase.indexOf("?") >= 0 ? "&" : "?";

-							/* console.log("params.term="+params.term); */

-							/* console.log("params.term encoded="+encodeURIComponent(params.term)); */

-							saveRemoteData[data.id].url = urlBase + separ + "search_all=" + encodeURIComponent(params.term.replace(/\"/g, ""));';

-			}

-

-			if (!$disableFiltering) {

-				$outdelayed .= '

-

-							if(data.text.match(new RegExp(params.term))) {

-								return data;

-							}

-

-							return null;';

-			} else {

-				$outdelayed .= '

-

-							return data;';

-			}

-

+		$tmpplugin = 'select2';

+		$outdelayed = "\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->

+			<script>

+			$(document).ready(function () {

+				var data = '.json_encode($formattedarrayresult).';

+

+				'.($callurlonselect ? 'var saveRemoteData = '.json_encode($array).';' : '').'

+

+				$(".'.$htmlname.'").select2({

+					data: data,

+					language: select2arrayoflanguage,

+					containerCssClass: \':all:\',					/* Line to add class of origin SELECT propagated to the new <span class="select2-selection...> tag */

+					placeholder: "'.dol_escape_js($placeholder).'",

+					escapeMarkup: function (markup) { return markup; }, 	// let our custom formatter work

+					minimumInputLength: '.$minimumInputLength.',

+					formatResult: function(result, container, query, escapeMarkup) {

+						return escapeMarkup(result.text);

+					},

+					matcher: function (params, data) {

+

+						if(! data.id) return null;';

+

+		if ($callurlonselect) {

@@ -8726,0 +6560,38 @@
+

+						var urlBase = data.url;

+						var separ = urlBase.indexOf("?") >= 0 ? "&" : "?";

+						/* console.log("params.term="+params.term); */

+						/* console.log("params.term encoded="+encodeURIComponent(params.term)); */

+						saveRemoteData[data.id].url = urlBase + separ + "sall=" + encodeURIComponent(params.term);';

+		}

+

+		if (!$disableFiltering) {

+			$outdelayed .= '

+

+						if(data.text.match(new RegExp(params.term))) {

+							return data;

+						}

+

+						return null;';

+		} else {

+			$outdelayed .= '

+

+						return data;';

+		}

+

+		$outdelayed .= '

+					}

+				});

+

+				'.($callurlonselect ? '

+				/* Code to execute a GET when we select a value */

+				$(".'.$htmlname.'").change(function() {

+					var selected = $(".'.$htmlname.'").val();

+					console.log("We select "+selected)

+

+					$(".'.$htmlname.'").val("");  /* reset visible combo value */

+					$.each( saveRemoteData, function( key, value ) {

+						if (key == selected)

+						{

+							console.log("selectArrayAjax - Do a redirect to "+value.url)

+							location.assign(value.url);

@@ -8729,22 +6600,7 @@
-

-					' . ($callurlonselect ? '

-					/* Code to execute a GET when we select a value */

-					$(".' . $htmlname . '").change(function() {

-						var selected = $(".' . $htmlname . '").val();

-						console.log("We select "+selected)

-

-						$(".' . $htmlname . '").val("");  /* reset visible combo value */

-						$.each( saveRemoteData, function( key, value ) {

-							if (key == selected)

-							{

-								console.log("selectArrayFilter - Do a redirect to "+value.url)

-								location.assign(value.url);

-							}

-						});

-					});' : '') . '

-

-				});

-				</script>';

-		}

-

-		if ($acceptdelayedhtml) {

+				});' : '').'

+

+			});

+			</script>';

+

+		if ($acceptdelayedhtml)

+		{

@@ -8752 +6608,3 @@
-		} else {

+		}

+		else

+		{

@@ -8759,16 +6617,16 @@
-	 * Show a multiselect form from an array. WARNING: Use this only for short lists.

-	 *

-	 * @param 	string 		$htmlname 		Name of select

-	 * @param 	array 		$array 			Array(key=>value) or Array(key=>array('id'=>key, 'label'=>value, 'color'=> , 'picto'=> , 'labelhtml'=> ))

-	 * @param 	array 		$selected 		Array of keys preselected

-	 * @param 	int 		$key_in_label 	1 to show key like in "[key] value"

-	 * @param 	int 		$value_as_key 	1 to use value as key

-	 * @param 	string 		$morecss 		Add more css style

-	 * @param 	int 		$translate 		Translate and encode value

-	 * @param 	int|string 	$width 			Force width of select box. May be used only when using jquery couch. Example: 250, '95%'

-	 * @param 	string 		$moreattrib 	Add more options on select component. Example: 'disabled'

-	 * @param 	string 		$elemtype 		Type of element we show ('category', ...). Will execute a formating function on it. To use in readonly mode if js component support HTML formatting.

-	 * @param 	string 		$placeholder 	String to use as placeholder

-	 * @param 	int 		$addjscombo 	Add js combo

-	 * @return 	string                      HTML multiselect string

-	 * @see selectarray(), selectArrayAjax(), selectArrayFilter()

+	 *	Show a multiselect form from an array.

+	 *

+	 *	@param	string	$htmlname		Name of select

+	 *	@param	array	$array			Array with key+value

+	 *	@param	array	$selected		Array with key+value preselected

+	 *	@param	int		$key_in_label   1 pour afficher la key dans la valeur "[key] value"

+	 *	@param	int		$value_as_key   1 to use value as key

+	 *	@param  string	$morecss        Add more css style

+	 *	@param  int		$translate		Translate and encode value

+	 *  @param	int		$width			Force width of select box. May be used only when using jquery couch. Example: 250, 95%

+	 *  @param	string	$moreattrib		Add more options on select component. Example: 'disabled'

+	 *  @param	string	$elemtype		Type of element we show ('category', ...). Will execute a formating function on it. To use in readonly mode if js component support HTML formatting.

+	 *  @param	string	$placeholder	String to use as placeholder

+	 *  @param	int		$addjscombo		Add js combo

+	 *	@return	string					HTML multiselect string

+	 *  @see selectarray(), selectArrayAjax(), selectArrayFilter()

@@ -8783,59 +6641,3 @@
-			if (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {

-				$addjscombo = 1;

-			} else {

-				$addjscombo = 0;

-			}

-		}

-

-		$useenhancedmultiselect = 0;

-		if (!empty($conf->use_javascript_ajax) && (getDolGlobalString('MAIN_USE_JQUERY_MULTISELECT') || defined('REQUIRE_JQUERY_MULTISELECT'))) {

-			if ($addjscombo) {

-				$useenhancedmultiselect = 1;	// Use the js multiselect in one line. Possible only if $addjscombo not 0.

-			}

-		}

-

-		// We need a hidden field because when using the multiselect, if we unselect all, there is no

-		// variable submitted at all, so no way to make a difference between variable not submited and variable

-		// submited to nothing.

-		$out .= '<input type="hidden" name="'.$htmlname.'_multiselect" value="1">';

-		// Output select component

-		$out .= '<select id="' . $htmlname . '" class="multiselect' . ($useenhancedmultiselect ? ' multiselectononeline' : '') . ($morecss ? ' ' . $morecss : '') . '" multiple name="' . $htmlname . '[]"' . ($moreattrib ? ' ' . $moreattrib : '') . ($width ? ' style="width: ' . (preg_match('/%/', $width) ? $width : $width . 'px') . '"' : '') . '>' . "\n";

-		if (is_array($array) && !empty($array)) {

-			if ($value_as_key) {

-				$array = array_combine($array, $array);

-			}

-

-			if (!empty($array)) {

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

-					$tmpkey = $key;

-					$tmpvalue = $value;

-					$tmpcolor = '';

-					$tmppicto = '';

-					$tmplabelhtml = '';

-					if (is_array($value) && array_key_exists('id', $value) && array_key_exists('label', $value)) {

-						$tmpkey = $value['id'];

-						$tmpvalue = empty($value['label']) ? '' : $value['label'];

-						$tmpcolor = empty($value['color']) ? '' : $value['color'];

-						$tmppicto = empty($value['picto']) ? '' : $value['picto'];

-						$tmplabelhtml = empty($value['labelhtml']) ? '' : $value['labelhtml'];

-					}

-					$newval = ($translate ? $langs->trans($tmpvalue) : $tmpvalue);

-					$newval = ($key_in_label ? $tmpkey . ' - ' . $newval : $newval);

-

-					$out .= '<option value="' . $tmpkey . '"';

-					if (is_array($selected) && !empty($selected) && in_array((string) $tmpkey, $selected) && ((string) $tmpkey != '')) {

-						$out .= ' selected';

-					}

-					if (!empty($tmplabelhtml)) {

-						$out .= ' data-html="' . dol_escape_htmltag($tmplabelhtml, 0, 0, '', 0, 1) . '"';

-					} else {

-						$tmplabelhtml = ($tmppicto ? img_picto('', $tmppicto, 'class="pictofixedwidth" style="color: #' . $tmpcolor . '"') : '') . $newval;

-						$out .= ' data-html="' . dol_escape_htmltag($tmplabelhtml, 0, 0, '', 0, 1) . '"';

-					}

-					$out .= '>';

-					$out .= dol_htmlentitiesbr($newval);

-					$out .= '</option>' . "\n";

-				}

-			}

-		}

-		$out .= '</select>' . "\n";

+		    if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $addjscombo = 1;

+		    else $addjscombo = 0;

+		}

@@ -8844,15 +6646,14 @@
-		if (!empty($conf->use_javascript_ajax) && getDolGlobalString('MAIN_USE_JQUERY_MULTISELECT') || defined('REQUIRE_JQUERY_MULTISELECT')) {

-			$out .= "\n" . '<!-- JS CODE TO ENABLE select for id ' . $htmlname . ', addjscombo=' . $addjscombo . ' -->';

-			$out .= "\n" . '<script nonce="' . getNonce() . '">' . "\n";

-			if ($addjscombo == 1) {

-				$tmpplugin = !getDolGlobalString('MAIN_USE_JQUERY_MULTISELECT') ? constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;

-				$out .= 'function formatResult(record, container) {' . "\n";

-				// 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.

-				$out .= '	if ($(record.element).attr("data-html") != undefined) { return htmlEntityDecodeJs($(record.element).attr("data-html")); }'."\n";

-				$out .= '	return record.text;';

-				$out .= '}' . "\n";

-				$out .= 'function formatSelection(record) {' . "\n";

-				if ($elemtype == 'category') {

-					$out .= 'return \'<span><img src="' . DOL_URL_ROOT . '/theme/eldy/img/object_category.png"> \'+record.text+\'</span>\';';

-				} else {

+		if (!empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT'))

+		{

+			if ($addjscombo == 1)

+			{

+				$tmpplugin = empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) ?constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;

+				$out .= "\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->'."\n";

+				$out .= '<script>'."\n";

+				$out .= 'function formatResult(record) {'."\n";

+				if ($elemtype == 'category')

+				{

+					$out .= 'return \'<span><img src="'.DOL_URL_ROOT.'/theme/eldy/img/object_category.png"> \'+record.text+\'</span>\';';

+				}

+				else

+				{

@@ -8861 +6662,11 @@
-				$out .= '}' . "\n";

+				$out .= '};'."\n";

+				$out .= 'function formatSelection(record) {'."\n";

+				if ($elemtype == 'category')

+				{

+					$out .= 'return \'<span><img src="'.DOL_URL_ROOT.'/theme/eldy/img/object_category.png"> \'+record.text+\'</span>\';';

+				}

+				else

+				{

+					$out .= 'return record.text;';

+				}

+				$out .= '};'."\n";

@@ -8863,11 +6674,2 @@
-							$(\'#' . $htmlname . '\').' . $tmpplugin . '({';

-				if ($placeholder) {

-					$out .= '

-								placeholder: {

-								    id: \'-1\',

-								    text: \'' . dol_escape_js($placeholder) . '\'

-								  },';

-				}

-				$out .= '		dir: \'ltr\',

-								containerCssClass: \':all:\',					/* Line to add class of origin SELECT propagated to the new <span class="select2-selection...> tag (ko with multiselect) */

-								dropdownCssClass: \'' . $morecss . '\',				/* Line to add class on the new <span class="select2-selection...> tag (ok with multiselect) */

+							$(\'#'.$htmlname.'\').'.$tmpplugin.'({

+								dir: \'ltr\',

@@ -8877 +6678,0 @@
-								escapeMarkup: function (markup) { return markup; }, 	// let our custom formatter work

@@ -8882,6 +6683,4 @@
-

-							/* Add also morecss to the css .select2 that is after the #htmlname, for component that are show dynamically after load, because select2 set

-								 the size only if component is not hidden by default on load */

-							$(\'#' . $htmlname . ' + .select2\').addClass(\'' . $morecss . '\');

-						});' . "\n";

-			} elseif ($addjscombo == 2 && !defined('DISABLE_MULTISELECT')) {

+						});'."\n";

+			}

+			elseif ($addjscombo == 2)

+			{

@@ -8891 +6690,2 @@
-				$out .= 'console.log(\'addjscombo=2 for htmlname=' . $htmlname . '\');';

+				$out .= "\n".'<!-- JS CODE TO ENABLE external lib for id '.$htmlname.' -->'."\n";

+				$out .= '<script>'."\n";

@@ -8893 +6693 @@
-							$(\'#' . $htmlname . '\').multiSelect({

+							$(\'#'.$htmlname.'\').multiSelect({

@@ -8896 +6696 @@
-								buttonHTML: \'<span class="multi-select-button ' . $morecss . '">\',

+								buttonHTML: \'<span class="multi-select-button '.$morecss.'">\',

@@ -8899 +6699 @@
-								noneText: \'' . $placeholder . '\'

+								noneText: \''.$placeholder.'\'

@@ -8905,0 +6706,26 @@
+		// Try also magic suggest

+		$out .= '<select id="'.$htmlname.'" class="multiselect'.($morecss ? ' '.$morecss : '').'" multiple name="'.$htmlname.'[]"'.($moreattrib ? ' '.$moreattrib : '').($width ? ' style="width: '.(preg_match('/%/', $width) ? $width : $width.'px').'"' : '').'>'."\n";

+		if (is_array($array) && !empty($array))

+		{

+			if ($value_as_key) $array = array_combine($array, $array);

+

+			if (!empty($array))

+			{

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

+				{

+					$out .= '<option value="'.$key.'"';

+                    if (is_array($selected) && !empty($selected) && in_array((string) $key, $selected) && ((string) $key != ''))

+					{

+						$out .= ' selected';

+					}

+					$out .= '>';

+

+					$newval = ($translate ? $langs->trans($value) : $value);

+					$newval = ($key_in_label ? $key.' - '.$newval : $newval);

+					$out .= dol_htmlentitiesbr($newval);

+					$out .= '</option>'."\n";

+				}

+			}

+		}

+		$out .= '</select>'."\n";

+

@@ -8911,23 +6737,17 @@
-	 *    Show a multiselect dropbox from an array. If a saved selection of fields exists for user (into $user->conf->MAIN_SELECTEDFIELDS_contextofpage), we use this one instead of default.

-	 *

-	 * @param string $htmlname Name of HTML field

-	 * @param array $array Array with array of fields we could show. This array may be modified according to setup of user.

-	 * @param string $varpage Id of context for page. Can be set by caller with $varpage=(empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage);

-	 * @param string $pos Position colon on liste value 'left' or '' (meaning 'right').

-	 * @return    string                    HTML multiselect string

-	 * @see selectarray()

-	 */

-	public static function multiSelectArrayWithCheckbox($htmlname, &$array, $varpage, $pos = '')

-	{

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

-

-		if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {

-			return '';

-		}

-		if (empty($array)) {

-			return '';

-		}

-

-		$tmpvar = "MAIN_SELECTEDFIELDS_" . $varpage; // To get list of saved selected fields to show

-

-		if (!empty($user->conf->$tmpvar)) {        // A list of fields was already customized for user

+	 *	Show a multiselect dropbox from an array.

+	 *

+	 *	@param	string	$htmlname		Name of HTML field

+	 *	@param	array	$array			Array with array of fields we could show. This array may be modified according to setup of user.

+	 *  @param  string  $varpage        Id of context for page. Can be set by caller with $varpage=(empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage);

+	 *	@return	string					HTML multiselect string

+	 *  @see selectarray()

+	 */

+	public static function multiSelectArrayWithCheckbox($htmlname, &$array, $varpage)

+	{

+		global $conf, $langs, $user;

+

+		if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) return '';

+

+		$tmpvar = "MAIN_SELECTEDFIELDS_".$varpage;

+		if (!empty($user->conf->$tmpvar))

+		{

@@ -8935 +6755,2 @@
-			foreach ($array as $key => $val) {

+			foreach ($array as $key => $val)

+			{

@@ -8938,15 +6759,6 @@
-				if (in_array($key, $tmparray)) {

-					$array[$key]['checked'] = 1;

-				} else {

-					$array[$key]['checked'] = 0;

-				}

-			}

-		} else {                                // There is no list of fields already customized for user

-			foreach ($array as $key => $val) {

-				if (!empty($array[$key]['checked']) && $array[$key]['checked'] < 0) {

-					$array[$key]['checked'] = 0;

-				}

-			}

-		}

-

-		$listoffieldsforselection = '';

+				if (in_array($key, $tmparray)) $array[$key]['checked'] = 1;

+				else $array[$key]['checked'] = 0;

+			}

+		}

+

+		$lis = '';

@@ -8955,25 +6767,18 @@
-		foreach ($array as $key => $val) {

-			// var_dump($val);

-			// var_dump(array_key_exists('enabled', $val));

-			// var_dump(!$val['enabled']);

-			if (array_key_exists('enabled', $val) && isset($val['enabled']) && !$val['enabled']) {

-				unset($array[$key]); // We don't want this field

-				continue;

-			}

-			if (!empty($val['type']) && $val['type'] == 'separate') {

-				// Field remains in array but we don't add it into $listoffieldsforselection

-				//$listoffieldsforselection .= '<li>-----</li>';

-				continue;

-			}

-			if ($val['label']) {

-				if (!empty($val['langfile']) && is_object($langs)) {

-					$langs->load($val['langfile']);

-				}

-

-				// Note: $val['checked'] <> 0 means we must show the field into the combo list

-				$listoffieldsforselection .= '<li><input type="checkbox" id="checkbox' . $key . '" value="' . $key . '"' . ((empty($val['checked']) || $val['checked'] == '-1') ? '' : ' checked="checked"') . '/><label for="checkbox' . $key . '">' . dol_escape_htmltag($langs->trans($val['label'])) . '</label></li>';

-				$listcheckedstring .= (empty($val['checked']) ? '' : $key . ',');

-			}

-		}

-

-		$out = '<!-- Component multiSelectArrayWithCheckbox ' . $htmlname . ' -->

+		foreach ($array as $key => $val)

+		{

+		    /* var_dump($val);

+            var_dump(array_key_exists('enabled', $val));

+            var_dump(!$val['enabled']);*/

+		    if (array_key_exists('enabled', $val) && isset($val['enabled']) && !$val['enabled'])

+		    {

+			    unset($array[$key]); // We don't want this field

+			    continue;

+		    }

+		    if ($val['label'])

+		    {

+		        $lis .= '<li><input type="checkbox" id="checkbox'.$key.'" value="'.$key.'"'.(empty($val['checked']) ? '' : ' checked="checked"').'/><label for="checkbox'.$key.'">'.dol_escape_htmltag($langs->trans($val['label'])).'</label></li>';

+			    $listcheckedstring .= (empty($val['checked']) ? '' : $key.',');

+		    }

+		}

+

+		$out = '<!-- Component multiSelectArrayWithCheckbox '.$htmlname.' -->

@@ -8983,2 +6788,2 @@
-            <a href="#' . $htmlname . '">

-              ' . img_picto('', 'list') . '

+            <a href="#'.$htmlname.'">

+              '.img_picto('', 'list').'

@@ -8986 +6791 @@
-            <input type="hidden" class="' . $htmlname . '" name="' . $htmlname . '" value="' . $listcheckedstring . '">

+            <input type="hidden" class="'.$htmlname.'" name="'.$htmlname.'" value="'.$listcheckedstring.'">

@@ -8990,3 +6795,2 @@
-                    <ul class="'.$htmlname.($pos == '1' ? 'left' : '').'">

-                    <li><input class="inputsearch_dropdownselectedfields width90p minwidth200imp" style="width:90%;" type="text" placeholder="'.$langs->trans('Search').'"></li>

-                    '.$listoffieldsforselection.'

+                    <ul class="ul'.$htmlname.'">

+                    '.$lis.'

@@ -8998 +6802 @@
-        <script nonce="' . getNonce() . '" type="text/javascript">

+        <script type="text/javascript">

@@ -9000 +6804 @@
-              $(\'.multiselectcheckbox' . $htmlname . ' input[type="checkbox"]\').on(\'click\', function () {

+              $(\'.multiselectcheckbox'.$htmlname.' input[type="checkbox"]\').on(\'click\', function () {

@@ -9007 +6811 @@
-                      $(\'.' . $htmlname . '\').val(title + $(\'.' . $htmlname . '\').val());

+                      $(\'.'.$htmlname.'\').val(title + $(\'.'.$htmlname.'\').val());

@@ -9010 +6814 @@
-                      $(\'.' . $htmlname . '\').val( $(\'.' . $htmlname . '\').val().replace(title, \'\') )

+                      $(\'.'.$htmlname.'\').val( $(\'.'.$htmlname.'\').val().replace(title, \'\') )

@@ -9015,6 +6818,0 @@
-              $("input.inputsearch_dropdownselectedfields").on("keyup", function() {

-			    var value = $(this).val().toLowerCase();

-			    $(\'.multiselectcheckbox'.$htmlname.' li > label\').filter(function() {

-			      $(this).parent().toggle($(this).text().toLowerCase().indexOf(value) > -1)

-			    });

-			  });

@@ -9031,13 +6829,14 @@
-	 * Render list of categories linked to object with id $id and type $type

-	 *

-	 * @param int 		$id 		Id of object

-	 * @param string 	$type 		Type of category ('member', 'customer', 'supplier', 'product', 'contact'). Old mode (0, 1, 2, ...) is deprecated.

-	 * @param int 		$rendermode 0=Default, use multiselect. 1=Emulate multiselect (recommended)

-	 * @param int 		$nolink 	1=Do not add html links

-	 * @return string               String with categories

-	 */

-	public function showCategories($id, $type, $rendermode = 0, $nolink = 0)

-	{

-		include_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';

-

-		$cat = new Categorie($this->db);

+	 * 	Render list of categories linked to object with id $id and type $type

+	 *

+	 * 	@param		int		$id				Id of object

+	 * 	@param		string	$type			Type of category ('member', 'customer', 'supplier', 'product', 'contact'). Old mode (0, 1, 2, ...) is deprecated.

+	 *  @param		int		$rendermode		0=Default, use multiselect. 1=Emulate multiselect (recommended)

+	 * 	@return		string					String with categories

+	 */

+    public function showCategories($id, $type, $rendermode = 0)

+	{

+		global $db;

+

+		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';

+

+		$cat = new Categorie($db);

@@ -9046 +6845,2 @@
-		if ($rendermode == 1) {

+		if ($rendermode == 1)

+		{

@@ -9048,10 +6848,13 @@
-			foreach ($categories as $c) {

-				$ways = $c->print_all_ways(' &gt;&gt; ', ($nolink ? 'none' : ''), 0, 1); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formated text

-				foreach ($ways as $way) {

-					$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"' . ($c->color ? ' style="background: #' . $c->color . ';"' : ' style="background: #bbb"') . '>' . $way . '</li>';

-				}

-			}

-			return '<div class="select2-container-multi-dolibarr"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';

-		}

-

-		if ($rendermode == 0) {

+			foreach ($categories as $c)

+			{

+				$ways = $c->print_all_ways(' &gt;&gt; ', '', 0, 1); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formated text

+				foreach ($ways as $way)

+				{

+					$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"'.($c->color ? ' style="background: #'.$c->color.';"' : ' style="background: #aaa"').'>'.$way.'</li>';

+				}

+			}

+			return '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';

+		}

+

+		if ($rendermode == 0)

+		{

@@ -9073,7 +6876,6 @@
-	 * @param 	CommonObject 	$object 						Object we want to show links to

-	 * @param 	string 			$morehtmlright 					More html to show on right of title

-	 * @param 	array 			$compatibleImportElementsList 	Array of compatibles elements object for "import from" action

-	 * @param 	string 			$title 							Title

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

-	 */

-	public function showLinkedObjectBlock($object, $morehtmlright = '', $compatibleImportElementsList = array(), $title = 'RelatedObjects')

+	 *  @param	CommonObject	$object		      Object we want to show links to

+	 *  @param  string          $morehtmlright    More html to show on right of title

+	 *  @param  array           $compatibleImportElementsList  Array of compatibles elements object for "import from" action

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

+	 */

+    public function showLinkedObjectBlock($object, $morehtmlright = '', $compatibleImportElementsList = false)

@@ -9090 +6892 @@
-			'compatibleImportElementsList' => &$compatibleImportElementsList,

+		    'compatibleImportElementsList' => &$compatibleImportElementsList,

@@ -9094,3 +6896,4 @@
-		$nbofdifferenttypes = count($object->linkedObjects);

-

-		if (empty($reshook)) {

+		if (empty($reshook))

+		{

+			$nbofdifferenttypes = count($object->linkedObjects);

+

@@ -9098 +6901 @@
-			print load_fiche_titre($langs->trans($title), $morehtmlright, '', 0, 0, 'showlinkedobjectblock');

+			print load_fiche_titre($langs->trans('RelatedObjects'), $morehtmlright, '', 0, 0, 'showlinkedobjectblock');

@@ -9102 +6905 @@
-			print '<table class="noborder allwidth" data-block="showLinkedObject" data-element="' . $object->element . '"  data-elementid="' . $object->id . '"   >';

+			print '<table class="noborder allwidth" data-block="showLinkedObject" data-element="'.$object->element.'"  data-elementid="'.$object->id.'"   >';

@@ -9105,2 +6908,2 @@
-			print '<td>' . $langs->trans("Type") . '</td>';

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

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

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

@@ -9108,3 +6911,3 @@
-			print '<td class="center">' . $langs->trans("Date") . '</td>';

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

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

+			print '<td class="center">'.$langs->trans("Date").'</td>';

+			print '<td class="right">'.$langs->trans("AmountHTShort").'</td>';

+			print '<td class="right">'.$langs->trans("Status").'</td>';

@@ -9116 +6919,2 @@
-			foreach ($object->linkedObjects as $objecttype => $objects) {

+			foreach ($object->linkedObjects as $objecttype => $objects)

+			{

@@ -9122 +6926 @@
-					$showImportButton = true;

+				    $showImportButton = true;

@@ -9126 +6930,2 @@
-				if ($objecttype != 'supplier_proposal' && preg_match('/^([^_]+)_([^_]+)/i', $objecttype, $regs)) {

+				if ($objecttype != 'supplier_proposal' && preg_match('/^([^_]+)_([^_]+)/i', $objecttype, $regs))

+				{

@@ -9129 +6934 @@
-					$tplpath = $element . '/' . $subelement;

+					$tplpath = $element.'/'.$subelement;

@@ -9135,5 +6940,4 @@
-					$tplpath = 'compta/' . $element;

-					if (!isModEnabled('facture')) {

-						continue; // Do not show if module disabled

-					}

-				} elseif ($objecttype == 'facturerec') {

+					$tplpath = 'compta/'.$element;

+					if (empty($conf->facture->enabled)) continue; // Do not show if module disabled

+				}

+				elseif ($objecttype == 'facturerec') {

@@ -9142,13 +6946,10 @@
-					if (!isModEnabled('facture')) {

-						continue; // Do not show if module disabled

-					}

-				} elseif ($objecttype == 'propal') {

-					$tplpath = 'comm/' . $element;

-					if (!isModEnabled('propal')) {

-						continue; // Do not show if module disabled

-					}

-				} elseif ($objecttype == 'supplier_proposal') {

-					if (!isModEnabled('supplier_proposal')) {

-						continue; // Do not show if module disabled

-					}

-				} elseif ($objecttype == 'shipping' || $objecttype == 'shipment' || $objecttype == 'expedition') {

+					if (empty($conf->facture->enabled)) continue; // Do not show if module disabled

+				}

+				elseif ($objecttype == 'propal') {

+					$tplpath = 'comm/'.$element;

+					if (empty($conf->propal->enabled)) continue; // Do not show if module disabled

+				}

+				elseif ($objecttype == 'supplier_proposal') {

+					if (empty($conf->supplier_proposal->enabled)) continue; // Do not show if module disabled

+				}

+				elseif ($objecttype == 'shipping' || $objecttype == 'shipment') {

@@ -9156,19 +6957,11 @@
-					if (!isModEnabled('expedition')) {

-						continue; // Do not show if module disabled

-					}

-				} elseif ($objecttype == 'reception') {

-					$tplpath = 'reception';

-					if (!isModEnabled('reception')) {

-						continue; // Do not show if module disabled

-					}

-				} elseif ($objecttype == 'delivery') {

-					$tplpath = 'delivery';

-					if (!isModEnabled('expedition')) {

-						continue; // Do not show if module disabled

-					}

-				} elseif ($objecttype == 'ficheinter') {

-					$tplpath = 'fichinter';

-					if (!isModEnabled('ficheinter')) {

-						continue; // Do not show if module disabled

-					}

-				} elseif ($objecttype == 'invoice_supplier') {

+					if (empty($conf->expedition->enabled)) continue; // Do not show if module disabled

+				}

+        		elseif ($objecttype == 'reception') {

+        			$tplpath = 'reception';

+        			if (empty($conf->reception->enabled)) continue; // Do not show if module disabled

+        		}

+				elseif ($objecttype == 'delivery') {

+					$tplpath = 'livraison';

+					if (empty($conf->expedition->enabled)) continue; // Do not show if module disabled

+				}

+				elseif ($objecttype == 'invoice_supplier') {

@@ -9176 +6969,2 @@
-				} elseif ($objecttype == 'order_supplier') {

+				}

+				elseif ($objecttype == 'order_supplier') {

@@ -9178 +6972,2 @@
-				} elseif ($objecttype == 'expensereport') {

+				}

+				elseif ($objecttype == 'expensereport') {

@@ -9180 +6975,2 @@
-				} elseif ($objecttype == 'subscription') {

+				}

+				elseif ($objecttype == 'subscription') {

@@ -9182,9 +6977,0 @@
-				} elseif ($objecttype == 'conferenceorbooth') {

-					$tplpath = 'eventorganization';

-				} elseif ($objecttype == 'conferenceorboothattendee') {

-					$tplpath = 'eventorganization';

-				} elseif ($objecttype == 'mo') {

-					$tplpath = 'mrp';

-					if (!isModEnabled('mrp')) {

-						continue; // Do not show if module disabled

-					}

@@ -9195,0 +6983 @@
+

@@ -9197,3 +6985,5 @@
-				$dirtpls = array_merge($conf->modules_parts['tpl'], array('/' . $tplpath . '/tpl'));

-				foreach ($dirtpls as $reldir) {

-					if ($nboftypesoutput == ($nbofdifferenttypes - 1)) {    // No more type to show after

+				$dirtpls = array_merge($conf->modules_parts['tpl'], array('/'.$tplpath.'/tpl'));

+				foreach ($dirtpls as $reldir)

+				{

+					if ($nboftypesoutput == ($nbofdifferenttypes - 1))    // No more type to show after

+					{

@@ -9204,2 +6994,3 @@
-					$res = @include dol_buildpath($reldir . '/' . $tplname . '.tpl.php');

-					if ($res) {

+					$res = @include dol_buildpath($reldir.'/'.$tplname.'.tpl.php');

+					if ($res)

+					{

@@ -9212,2 +7003,3 @@
-			if (!$nboftypesoutput) {

-				print '<tr><td class="impair" colspan="7"><span class="opacitymedium">' . $langs->trans("None") . '</span></td></tr>';

+			if (!$nboftypesoutput)

+			{

+				print '<tr><td class="impair opacitymedium" colspan="7">'.$langs->trans("None").'</td></tr>';

@@ -9218,3 +7010,5 @@
-			if (!empty($compatibleImportElementsList)) {

-				$res = @include dol_buildpath('core/tpl/objectlinked_lineimport.tpl.php');

-			}

+			if (!empty($compatibleImportElementsList))

+			{

+			    $res = @include dol_buildpath('core/tpl/ajax/objectlinked_lineimport.tpl.php');

+			}

+

@@ -9223,3 +7017,3 @@
-		}

-

-		return $nbofdifferenttypes;

+

+			return $nbofdifferenttypes;

+		}

@@ -9231,6 +7025,6 @@
-	 * @param 	CommonObject 	$object 			Object we want to show links to

-	 * @param 	array 			$restrictlinksto 	Restrict links to some elements, for exemple array('order') or array('supplier_order'). null or array() if no restriction.

-	 * @param 	array 			$excludelinksto 	Do not show links of this type, for exemple array('order') or array('supplier_order'). null or array() if no exclusion.

-	 * @return  string                              HTML block

-	 */

-	public function showLinkToObjectBlock($object, $restrictlinksto = array(), $excludelinksto = array())

+	 *  @param	CommonObject	$object				Object we want to show links to

+	 *  @param	array			$restrictlinksto	Restrict links to some elements, for exemple array('order') or array('supplier_order'). null or array() if no restriction.

+	 *  @param	array			$excludelinksto		Do not show links of this type, for exemple array('order') or array('supplier_order'). null or array() if no exclusion.

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

+	 */

+    public function showLinkToObjectBlock($object, $restrictlinksto = array(), $excludelinksto = array())

@@ -9239 +7033 @@
-		global $action;

+		global $bc, $action;

@@ -9245,3 +7039 @@
-		if (!is_object($object->thirdparty)) {

-			$object->fetch_thirdparty();

-		}

+		if (!is_object($object->thirdparty)) $object->fetch_thirdparty();

@@ -9250 +7042,2 @@
-		if (is_object($object->thirdparty) && !empty($object->thirdparty->id) && $object->thirdparty->id > 0) {

+		if (is_object($object->thirdparty) && !empty($object->thirdparty->id) && $object->thirdparty->id > 0)

+		{

@@ -9252,5 +7045,4 @@
-			if (($object->thirdparty->parent > 0) && getDolGlobalString('THIRDPARTY_INCLUDE_PARENT_IN_LINKTO')) {

-				$listofidcompanytoscan .= ',' . $object->thirdparty->parent;

-			}

-			if (($object->fk_project > 0) && getDolGlobalString('THIRDPARTY_INCLUDE_PROJECT_THIRDPARY_IN_LINKTO')) {

-				include_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';

+			if (($object->thirdparty->parent > 0) && !empty($conf->global->THIRDPARTY_INCLUDE_PARENT_IN_LINKTO)) $listofidcompanytoscan .= ','.$object->thirdparty->parent;

+			if (($object->fk_project > 0) && !empty($conf->global->THIRDPARTY_INCLUDE_PROJECT_THIRDPARY_IN_LINKTO))

+			{

+				include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';

@@ -9259,3 +7051 @@
-				if ($tmpproject->socid > 0 && ($tmpproject->socid != $object->thirdparty->id)) {

-					$listofidcompanytoscan .= ',' . $tmpproject->socid;

-				}

+				if ($tmpproject->socid > 0 && ($tmpproject->socid != $object->thirdparty->id)) $listofidcompanytoscan .= ','.$tmpproject->socid;

@@ -9266,61 +7056,11 @@
-				'propal' => array(

-					'enabled' => isModEnabled('propal'),

-					'perms' => 1,

-					'label' => 'LinkToProposal',

-					'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM " . $this->db->prefix() . "societe as s, " . $this->db->prefix() . "propal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $this->db->sanitize($listofidcompanytoscan) . ') AND t.entity IN (' . getEntity('propal') . ')'),

-				'shipping' => array(

-					'enabled' => isModEnabled('expedition'),

-					'perms' => 1,

-					'label' => 'LinkToExpedition',

-					'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref FROM " . $this->db->prefix() . "societe as s, " . $this->db->prefix() . "expedition as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $this->db->sanitize($listofidcompanytoscan) . ') AND t.entity IN (' . getEntity('shipping') . ')'),

-				'order' => array(

-					'enabled' => isModEnabled('commande'),

-					'perms' => 1,

-					'label' => 'LinkToOrder',

-					'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM " . $this->db->prefix() . "societe as s, " . $this->db->prefix() . "commande as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $this->db->sanitize($listofidcompanytoscan) . ') AND t.entity IN (' . getEntity('commande') . ')'),

-				'invoice' => array(

-					'enabled' => isModEnabled('facture'),

-					'perms' => 1,

-					'label' => 'LinkToInvoice',

-					'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM " . $this->db->prefix() . "societe as s, " . $this->db->prefix() . "facture as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $this->db->sanitize($listofidcompanytoscan) . ') AND t.entity IN (' . getEntity('invoice') . ')'),

-				'invoice_template' => array(

-					'enabled' => isModEnabled('facture'),

-					'perms' => 1,

-					'label' => 'LinkToTemplateInvoice',

-					'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.titre as ref, t.total_ht FROM " . $this->db->prefix() . "societe as s, " . $this->db->prefix() . "facture_rec as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $this->db->sanitize($listofidcompanytoscan) . ') AND t.entity IN (' . getEntity('invoice') . ')'),

-				'contrat' => array(

-					'enabled' => isModEnabled('contrat'),

-					'perms' => 1,

-					'label' => 'LinkToContract',

-					'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_customer as ref_client, t.ref_supplier, SUM(td.total_ht) as total_ht

-							FROM " . $this->db->prefix() . "societe as s, " . $this->db->prefix() . "contrat as t, " . $this->db->prefix() . "contratdet as td WHERE t.fk_soc = s.rowid AND td.fk_contrat = t.rowid AND t.fk_soc IN (" . $this->db->sanitize($listofidcompanytoscan) . ') AND t.entity IN (' . getEntity('contract') . ') GROUP BY s.rowid, s.nom, s.client, t.rowid, t.ref, t.ref_customer, t.ref_supplier'

-				),

-				'fichinter' => array(

-					'enabled' => isModEnabled('ficheinter'),

-					'perms' => 1,

-					'label' => 'LinkToIntervention',

-					'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref FROM " . $this->db->prefix() . "societe as s, " . $this->db->prefix() . "fichinter as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $this->db->sanitize($listofidcompanytoscan) . ') AND t.entity IN (' . getEntity('intervention') . ')'),

-				'supplier_proposal' => array(

-					'enabled' => isModEnabled('supplier_proposal'),

-					'perms' => 1,

-					'label' => 'LinkToSupplierProposal',

-					'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, '' as ref_supplier, t.total_ht FROM " . $this->db->prefix() . "societe as s, " . $this->db->prefix() . "supplier_proposal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $this->db->sanitize($listofidcompanytoscan) . ') AND t.entity IN (' . getEntity('supplier_proposal') . ')'),

-				'order_supplier' => array(

-					'enabled' => isModEnabled("supplier_order"),

-					'perms' => 1,

-					'label' => 'LinkToSupplierOrder',

-					'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM " . $this->db->prefix() . "societe as s, " . $this->db->prefix() . "commande_fournisseur as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $this->db->sanitize($listofidcompanytoscan) . ') AND t.entity IN (' . getEntity('commande_fournisseur') . ')'),

-				'invoice_supplier' => array(

-					'enabled' => isModEnabled("supplier_invoice"),

-					'perms' => 1, 'label' => 'LinkToSupplierInvoice',

-					'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM " . $this->db->prefix() . "societe as s, " . $this->db->prefix() . "facture_fourn as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $this->db->sanitize($listofidcompanytoscan) . ') AND t.entity IN (' . getEntity('facture_fourn') . ')'),

-				'ticket' => array(

-					'enabled' => isModEnabled('ticket'),

-					'perms' => 1,

-					'label' => 'LinkToTicket',

-					'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.track_id, '0' as total_ht FROM " . $this->db->prefix() . "societe as s, " . $this->db->prefix() . "ticket as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $this->db->sanitize($listofidcompanytoscan) . ') AND t.entity IN (' . getEntity('ticket') . ')'),

-				'mo' => array(

-					'enabled' => isModEnabled('mrp'),

-					'perms' => 1,

-					'label' => 'LinkToMo',

-					'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.rowid, '0' as total_ht FROM " . $this->db->prefix() . "societe as s INNER JOIN " . $this->db->prefix() . "mrp_mo as t ON t.fk_soc = s.rowid  WHERE  t.fk_soc IN (" . $this->db->sanitize($listofidcompanytoscan) . ') AND t.entity IN (' . getEntity('mo') . ')')

+				'propal'=>array('enabled'=>$conf->propal->enabled, 'perms'=>1, 'label'=>'LinkToProposal', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('propal').')'),

+				'order'=>array('enabled'=>$conf->commande->enabled, 'perms'=>1, 'label'=>'LinkToOrder', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('commande').')'),

+				'invoice'=>array('enabled'=>$conf->facture->enabled, 'perms'=>1, 'label'=>'LinkToInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('invoice').')'),

+				'invoice_template'=>array('enabled'=>$conf->facture->enabled, 'perms'=>1, 'label'=>'LinkToTemplateInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.titre as ref, t.total as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_rec as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('invoice').')'),

+				'contrat'=>array('enabled'=>$conf->contrat->enabled, 'perms'=>1, 'label'=>'LinkToContract',

+								'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_customer as ref_client, t.ref_supplier, '' as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('contract').')'),

+				'fichinter'=>array('enabled'=>$conf->ficheinter->enabled, 'perms'=>1, 'label'=>'LinkToIntervention', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."fichinter as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('intervention').')'),

+				'supplier_proposal'=>array('enabled'=>$conf->supplier_proposal->enabled, 'perms'=>1, 'label'=>'LinkToSupplierProposal', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, '' as ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."supplier_proposal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('supplier_proposal').')'),

+				'order_supplier'=>array('enabled'=>$conf->supplier_order->enabled, 'perms'=>1, 'label'=>'LinkToSupplierOrder', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande_fournisseur as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('commande_fournisseur').')'),

+				'invoice_supplier'=>array('enabled'=>$conf->supplier_invoice->enabled, 'perms'=>1, 'label'=>'LinkToSupplierInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('facture_fourn').')'),

+				'ticket'=>array('enabled'=>$conf->ticket->enabled, 'perms'=>1, 'label'=>'LinkToTicket', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.track_id, '0' as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."ticket as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('ticket').')')

@@ -9330,15 +7070,13 @@
-		if ($object->table_element == 'commande_fournisseur') {

-			$possiblelinks['mo']['sql'] = "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.rowid, '0' as total_ht FROM ".$this->db->prefix()."societe as s INNER JOIN ".$this->db->prefix().'mrp_mo as t ON t.fk_soc = s.rowid  WHERE t.entity IN ('.getEntity('mo').')';

-		} elseif ($object->table_element == 'mrp_mo') {

-			$possiblelinks['order_supplier']['sql'] = "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".$this->db->prefix()."societe as s, ".$this->db->prefix().'commande_fournisseur as t WHERE t.fk_soc = s.rowid AND t.entity IN ('.getEntity('commande_fournisseur').')';

-		}

-

-		if (!empty($listofidcompanytoscan)) {  // If empty, we don't have criteria to scan the object we can link to

-			// Can complete the possiblelink array

-			$hookmanager->initHooks(array('commonobject'));

-			$parameters = array('listofidcompanytoscan' => $listofidcompanytoscan, 'possiblelinks' => $possiblelinks);

-			$reshook = $hookmanager->executeHooks('showLinkToObjectBlock', $parameters, $object, $action); // Note that $action and $object may have been modified by hook

-		}

-

-		if (empty($reshook)) {

-			if (is_array($hookmanager->resArray) && count($hookmanager->resArray)) {

+		// Can complete the possiblelink array

+		$hookmanager->initHooks(array('commonobject'));

+		$parameters = array('listofidcompanytoscan' => $listofidcompanytoscan);

+

+		if (!empty($listofidcompanytoscan))  // If empty, we don't have criteria to scan the object we can link to

+		{

+            $reshook = $hookmanager->executeHooks('showLinkToObjectBlock', $parameters, $object, $action); // Note that $action and $object may have been modified by hook

+		}

+

+		if (empty($reshook))

+		{

+			if (is_array($hookmanager->resArray) && count($hookmanager->resArray))

+			{

@@ -9347,2 +7085,5 @@
-		} elseif ($reshook > 0) {

-			if (is_array($hookmanager->resArray) && count($hookmanager->resArray)) {

+		}

+		elseif ($reshook > 0)

+		{

+			if (is_array($hookmanager->resArray) && count($hookmanager->resArray))

+			{

@@ -9353 +7094,2 @@
-		foreach ($possiblelinks as $key => $possiblelink) {

+		foreach ($possiblelinks as $key => $possiblelink)

+		{

@@ -9356,26 +7098,5 @@
-			if (empty($possiblelink['enabled'])) {

-				continue;

-			}

-

-			if (!empty($possiblelink['perms']) && (empty($restrictlinksto) || in_array($key, $restrictlinksto)) && (empty($excludelinksto) || !in_array($key, $excludelinksto))) {

-				print '<div id="' . $key . 'list"' . (empty($conf->use_javascript_ajax) ? '' : ' style="display:none"') . '>';

-

-				if (getDolGlobalString('MAIN_LINK_BY_REF_IN_LINKTO')) {

-					print '<br>'."\n";

-					print '<!-- form to add a link from anywhere -->'."\n";

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

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

-					print '<input type="hidden" name="action" value="addlinkbyref">';

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

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

-					print '<table class="noborder">';

-					print '<tr>';

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

-					print '<td class="center"><input type="text" placeholder="'.dol_escape_htmltag($langs->trans("Ref")).'" name="reftolinkto" value="' . dol_escape_htmltag(GETPOST('reftolinkto', 'alpha')) . '">&nbsp;';

-					print '<input type="submit" class="button small valignmiddle" value="' . $langs->trans('ToLink') . '">&nbsp;';

-					print '<input type="submit" class="button small" name="cancel" value="' . $langs->trans('Cancel') . '"></td>';

-					print '</tr>';

-					print '</table>';

-					print '</form>';

-				}

-

+			if (empty($possiblelink['enabled'])) continue;

+

+			if (!empty($possiblelink['perms']) && (empty($restrictlinksto) || in_array($key, $restrictlinksto)) && (empty($excludelinksto) || !in_array($key, $excludelinksto)))

+			{

+				print '<div id="'.$key.'list"'.(empty($conf->use_javascript_ajax) ? '' : ' style="display:none"').'>';

@@ -9385 +7106,2 @@
-				if ($resqllist) {

+				if ($resqllist)

+				{

@@ -9390,2 +7112 @@
-					print '<!-- form to add a link from object to same thirdparty -->'."\n";

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

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

@@ -9393,3 +7114,3 @@
-					print '<input type="hidden" name="token" value="' . newToken() . '">';

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

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

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

+					print '<input type="hidden" name="id" value="'.$object->id.'">';

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

@@ -9399,4 +7120,4 @@
-					print '<td class="center">' . $langs->trans("Ref") . '</td>';

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

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

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

+					print '<td class="center">'.$langs->trans("Ref").'</td>';

+					print '<td class="left">'.$langs->trans("RefCustomer").'</td>';

+					print '<td class="right">'.$langs->trans("AmountHTShort").'</td>';

+					print '<td class="left">'.$langs->trans("Company").'</td>';

@@ -9404 +7125,2 @@
-					while ($i < $num) {

+					while ($i < $num)

+					{

@@ -9409 +7131 @@
-						print '<input type="radio" name="idtolinkto" id="' . $key . '_' . $objp->rowid . '" value="' . $objp->rowid . '">';

+						print '<input type="radio" name="idtolinkto" value='.$objp->rowid.'>';

@@ -9411,10 +7133,4 @@
-						print '<td class="center"><label for="' . $key . '_' . $objp->rowid . '">' . $objp->ref . '</label></td>';

-						print '<td>' . (!empty($objp->ref_client) ? $objp->ref_client : (!empty($objp->ref_supplier) ? $objp->ref_supplier : '')) . '</td>';

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

-						if ($possiblelink['label'] == 'LinkToContract') {

-							$form = new Form($this->db);

-							print $form->textwithpicto('', $langs->trans("InformationOnLinkToContract")) . ' ';

-						}

-						print '<span class="amount">' . (isset($objp->total_ht) ? price($objp->total_ht) : '') . '</span>';

-						print '</td>';

-						print '<td>' . $objp->name . '</td>';

+						print '<td class="center">'.$objp->ref.'</td>';

+						print '<td>'.$objp->ref_client.'</td>';

+						print '<td class="right">'.price($objp->total_ht).'</td>';

+						print '<td>'.$objp->name.'</td>';

@@ -9425,9 +7141,2 @@
-					print '<div class="center">';

-					if ($num) {

-						print '<input type="submit" class="button valignmiddle marginleftonly marginrightonly small" value="' . $langs->trans('ToLink') . '">';

-					}

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

-						print '<input type="submit" class="button button-cancel marginleftonly marginrightonly small" name="cancel" value="' . $langs->trans("Cancel") . '"></div>';

-					} else {

-						print '<input type="submit" onclick="jQuery(\'#' . $key . 'list\').toggle(); return false;" class="button button-cancel marginleftonly marginrightonly small" name="cancel" value="' . $langs->trans("Cancel") . '"></div>';

-					}

+					print '<div class="center"><input type="submit" class="button valignmiddle" value="'.$langs->trans('ToLink').'">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'"></div>';

+

@@ -9439,0 +7149,3 @@
+				if ($num > 0)

+				{

+				}

@@ -9442,10 +7154,8 @@
-				if ($num > 0 || getDolGlobalString('MAIN_LINK_BY_REF_IN_LINKTO')) {

-					$linktoelemlist .= '<li><a href="#linkto' . $key . '" class="linkto dropdowncloseonclick" rel="' . $key . '">' . $langs->trans($possiblelink['label']) . ' (' . $num . ')</a></li>';

-					// } else $linktoelem.=$langs->trans($possiblelink['label']);

-				} else {

-					$linktoelemlist .= '<li><span class="linktodisabled">' . $langs->trans($possiblelink['label']) . ' (0)</span></li>';

-				}

-			}

-		}

-

-		if ($linktoelemlist) {

+				if ($num > 0) $linktoelemlist .= '<li><a href="#linkto'.$key.'" class="linkto dropdowncloseonclick" rel="'.$key.'">'.$langs->trans($possiblelink['label']).' ('.$num.')</a></li>';

+				//else $linktoelem.=$langs->trans($possiblelink['label']);

+				else $linktoelemlist .= '<li><span class="linktodisabled">'.$langs->trans($possiblelink['label']).' (0)</span></li>';

+			}

+		}

+

+		if ($linktoelemlist)

+		{

@@ -9455,3 +7165 @@
-			if (!empty($conf->use_javascript_ajax)) {

-				$linktoelem .= '<dt><a href="#linktoobjectname"><span class="fas fa-link paddingrightonly"></span>' . $langs->trans("LinkTo") . '...</a></dt>';

-			}

+			if (!empty($conf->use_javascript_ajax)) $linktoelem .= '<dt><a href="#linktoobjectname">'.$langs->trans("LinkTo").'...</a></dt>';

@@ -9460 +7168 @@
-    		<ul class="ulselectedfields">' . $linktoelemlist . '

+    		<ul class="ulselectedfields">'.$linktoelemlist.'

@@ -9465 +7173,3 @@
-		} else {

+		}

+		else

+		{

@@ -9469,3 +7179,4 @@
-		if (!empty($conf->use_javascript_ajax)) {

-			print '<!-- Add js to show linkto box -->

-				<script nonce="' . getNonce() . '">

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

+		{

+		    print '<!-- Add js to show linkto box -->

+				<script>

@@ -9474 +7185 @@
-						console.log("We choose to show/hide links for rel="+jQuery(this).attr(\'rel\')+" so #"+jQuery(this).attr(\'rel\')+"list");

+						console.log("We choose to show/hide link for rel="+jQuery(this).attr(\'rel\'));

@@ -9486,14 +7197,10 @@
-	 *    Return an html string with a select combo box to choose yes or no

-	 *

-	 * @param string $htmlname Name of html select field

-	 * @param string $value Pre-selected value

-	 * @param int $option 0 return yes/no, 1 return 1/0

-	 * @param bool $disabled true or false

-	 * @param int $useempty 1=Add empty line

-	 * @param int $addjscombo 1=Add js beautifier on combo box

-	 * @param string $morecss More CSS

-	 * @param string $labelyes Label for Yes

-	 * @param string $labelno Label for No

-	 * @return    string                        See option

-	 */

-	public function selectyesno($htmlname, $value = '', $option = 0, $disabled = false, $useempty = 0, $addjscombo = 0, $morecss = '', $labelyes = 'Yes', $labelno = 'No')

+	 *	Return an html string with a select combo box to choose yes or no

+	 *

+	 *	@param	string		$htmlname		Name of html select field

+	 *	@param	string		$value			Pre-selected value

+	 *	@param	int			$option			0 return yes/no, 1 return 1/0

+	 *	@param	bool		$disabled		true or false

+	 *  @param	int      	$useempty		1=Add empty line

+	 *	@return	string						See option

+	 */

+    public function selectyesno($htmlname, $value = '', $option = 0, $disabled = false, $useempty = 0)

@@ -9503,3 +7210,3 @@
-		$yes = "yes";

-		$no = "no";

-		if ($option) {

+		$yes = "yes"; $no = "no";

+		if ($option)

+		{

@@ -9512,18 +7219,14 @@
-		$resultyesno = '<select class="flat width75' . ($morecss ? ' ' . $morecss : '') . '" id="' . $htmlname . '" name="' . $htmlname . '"' . $disabled . '>' . "\n";

-		if ($useempty) {

-			$resultyesno .= '<option value="-1"' . (($value < 0) ? ' selected' : '') . '>&nbsp;</option>' . "\n";

-		}

-		if (("$value" == 'yes') || ($value == 1)) {

-			$resultyesno .= '<option value="' . $yes . '" selected>' . $langs->trans($labelyes) . '</option>' . "\n";

-			$resultyesno .= '<option value="' . $no . '">' . $langs->trans($labelno) . '</option>' . "\n";

-		} else {

-			$selected = (($useempty && $value != '0' && $value != 'no') ? '' : ' selected');

-			$resultyesno .= '<option value="' . $yes . '">' . $langs->trans($labelyes) . '</option>' . "\n";

-			$resultyesno .= '<option value="' . $no . '"' . $selected . '>' . $langs->trans($labelno) . '</option>' . "\n";

-		}

-		$resultyesno .= '</select>' . "\n";

-

-		if ($addjscombo) {

-			$resultyesno .= ajax_combobox($htmlname, array(), 0, 0, 'resolve', ($useempty < 0 ? (string) $useempty : '-1'), $morecss);

-		}

-

+		$resultyesno = '<select class="flat width75" id="'.$htmlname.'" name="'.$htmlname.'"'.$disabled.'>'."\n";

+		if ($useempty) $resultyesno .= '<option value="-1"'.(($value < 0) ? ' selected' : '').'>&nbsp;</option>'."\n";

+		if (("$value" == 'yes') || ($value == 1))

+		{

+			$resultyesno .= '<option value="'.$yes.'" selected>'.$langs->trans("Yes").'</option>'."\n";

+			$resultyesno .= '<option value="'.$no.'">'.$langs->trans("No").'</option>'."\n";

+		}

+		else

+	    {

+	   		$selected = (($useempty && $value != '0' && $value != 'no') ? '' : ' selected');

+			$resultyesno .= '<option value="'.$yes.'">'.$langs->trans("Yes").'</option>'."\n";

+			$resultyesno .= '<option value="'.$no.'"'.$selected.'>'.$langs->trans("No").'</option>'."\n";

+		}

+		$resultyesno .= '</select>'."\n";

@@ -9533,2 +7236 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -9538,9 +7240,9 @@
-	 * @param string $selected Id modele pre-selectionne

-	 * @param string $htmlname Name of HTML select

-	 * @param string $type Type of searched templates

-	 * @param int $useempty Affiche valeur vide dans liste

-	 * @return    void

-	 */

-	public function select_export_model($selected = '', $htmlname = 'exportmodelid', $type = '', $useempty = 0)

-	{

-		// phpcs:enable

+	 *  @param	string	$selected          Id modele pre-selectionne

+	 *  @param  string	$htmlname          Name of HTML select

+	 *  @param  string	$type              Type of searched templates

+	 *  @param  int		$useempty          Affiche valeur vide dans liste

+	 *  @return	void

+	 */

+    public function select_export_model($selected = '', $htmlname = 'exportmodelid', $type = '', $useempty = 0)

+	{

+        // phpcs:enable

@@ -9548,2 +7250,2 @@
-		$sql .= " FROM " . $this->db->prefix() . "export_model";

-		$sql .= " WHERE type = '" . $this->db->escape($type) . "'";

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

+		$sql .= " WHERE type = '".$type."'";

@@ -9552,3 +7254,5 @@
-		if ($result) {

-			print '<select class="flat" id="select_' . $htmlname . '" name="' . $htmlname . '">';

-			if ($useempty) {

+		if ($result)

+		{

+			print '<select class="flat" id="select_'.$htmlname.'" name="'.$htmlname.'">';

+			if ($useempty)

+			{

@@ -9560 +7264,2 @@
-			while ($i < $num) {

+			while ($i < $num)

+			{

@@ -9562,4 +7267,7 @@
-				if ($selected == $obj->rowid) {

-					print '<option value="' . $obj->rowid . '" selected>';

-				} else {

-					print '<option value="' . $obj->rowid . '">';

+				if ($selected == $obj->rowid)

+				{

+					print '<option value="'.$obj->rowid.'" selected>';

+				}

+				else

+				{

+					print '<option value="'.$obj->rowid.'">';

@@ -9572 +7280,2 @@
-		} else {

+		}

+		else {

@@ -9578,20 +7287,20 @@
-	 * Return a HTML area with the reference of object and a navigation bar for a business object

-	 * Note: To complete search with a particular filter on select, you can set $object->next_prev_filter set to define SQL criterias.

-	 *

-	 * @param object 	$object 		Object to show.

-	 * @param string 	$paramid 		Name of parameter to use to name the id into the URL next/previous link.

-	 * @param string 	$morehtml 		More html content to output just before the nav bar.

-	 * @param int 		$shownav 		Show Condition (navigation is shown if value is 1).

-	 * @param string 	$fieldid 		Name of field id into database to use for select next and previous (we make the select max and min on this field compared to $object->ref). Use 'none' to disable next/prev.

-	 * @param string 	$fieldref 		Name of field ref of object (object->ref) to show or 'none' to not show ref.

-	 * @param string 	$morehtmlref 	More html to show after ref.

-	 * @param string 	$moreparam 		More param to add in nav link url. Must start with '&...'.

-	 * @param int 		$nodbprefix 	Do not include DB prefix to forge table name.

-	 * @param string 	$morehtmlleft 	More html code to show before ref.

-	 * @param string 	$morehtmlstatus More html code to show under navigation arrows (status place).

-	 * @param string 	$morehtmlright 	More html code to show after ref.

-	 * @return string                   Portion HTML with ref + navigation buttons

-	 */

-	public function showrefnav($object, $paramid, $morehtml = '', $shownav = 1, $fieldid = 'rowid', $fieldref = 'ref', $morehtmlref = '', $moreparam = '', $nodbprefix = 0, $morehtmlleft = '', $morehtmlstatus = '', $morehtmlright = '')

-	{

-		global $conf, $langs, $hookmanager, $extralanguages;

+	 *    Return a HTML area with the reference of object and a navigation bar for a business object

+	 *    Note: To complete search with a particular filter on select, you can set $object->next_prev_filter set to define SQL criterias.

+	 *

+	 *    @param	object	$object			Object to show.

+	 *    @param	string	$paramid   		Name of parameter to use to name the id into the URL next/previous link.

+	 *    @param	string	$morehtml  		More html content to output just before the nav bar.

+	 *    @param	int		$shownav	  	Show Condition (navigation is shown if value is 1).

+	 *    @param	string	$fieldid   		Name of field id into database to use for select next and previous (we make the select max and min on this field compared to $object->ref). Use 'none' to disable next/prev.

+	 *    @param	string	$fieldref   	Name of field ref of object (object->ref) to show or 'none' to not show ref.

+	 *    @param	string	$morehtmlref  	More html to show after ref.

+	 *    @param	string	$moreparam  	More param to add in nav link url. Must start with '&...'.

+	 *	  @param	int		$nodbprefix		Do not include DB prefix to forge table name.

+	 *	  @param	string	$morehtmlleft	More html code to show before ref.

+	 *	  @param	string	$morehtmlstatus	More html code to show under navigation arrows (status place).

+	 *	  @param	string	$morehtmlright	More html code to show after ref.

+	 * 	  @return	string    				Portion HTML with ref + navigation buttons

+	 */

+    public function showrefnav($object, $paramid, $morehtml = '', $shownav = 1, $fieldid = 'rowid', $fieldref = 'ref', $morehtmlref = '', $moreparam = '', $nodbprefix = 0, $morehtmlleft = '', $morehtmlstatus = '', $morehtmlright = '')

+	{

+		global $langs, $conf, $hookmanager, $extralanguages;

@@ -9600,23 +7309,2 @@
-		if (empty($fieldid)) {

-			$fieldid = 'rowid';

-		}

-		if (empty($fieldref)) {

-			$fieldref = 'ref';

-		}

-

-		// Preparing gender's display if there is one

-		$addgendertxt = '';

-		if (property_exists($object, 'gender') && !empty($object->gender)) {

-			$addgendertxt = ' ';

-			switch ($object->gender) {

-				case 'man':

-					$addgendertxt .= '<i class="fas fa-mars"></i>';

-					break;

-				case 'woman':

-					$addgendertxt .= '<i class="fas fa-venus"></i>';

-					break;

-				case 'other':

-					$addgendertxt .= '<i class="fas fa-transgender"></i>';

-					break;

-			}

-		}

+		if (empty($fieldid))  $fieldid = 'rowid';

+		if (empty($fieldref)) $fieldref = 'ref';

@@ -9625,2 +7313,3 @@
-		if (is_object($hookmanager)) {

-			$parameters = array('showrefnav' => true);

+		if (is_object($hookmanager))

+		{

+			$parameters = array();

@@ -9631 +7320,2 @@
-		if ($shownav) {

+		if ($shownav)

+		{

@@ -9637,5 +7327,7 @@
-			if ($paramid == 'project_ref') {

-				if (preg_match('/\/tasks\/(task|contact|note|document)\.php/', $navurl)) {     // TODO Remove this when nav with project_ref on task pages are ok

-					$navurl = preg_replace('/\/tasks\/(task|contact|time|note|document)\.php/', '/tasks.php', $navurl);

-					$paramid = 'ref';

-				}

+			if ($paramid == 'project_ref')

+			{

+			    if (preg_match('/\/tasks\/(task|contact|note|document)\.php/', $navurl))     // TODO Remove this when nav with project_ref on task pages are ok

+			    {

+				    $navurl = preg_replace('/\/tasks\/(task|contact|time|note|document)\.php/', '/tasks.php', $navurl);

+    				$paramid = 'ref';

+			    }

@@ -9647 +7339,2 @@
-			if ($conf->browser->name == 'chrome') {

+			if ($conf->browser->name == 'chrome')

+			{

@@ -9649 +7342,3 @@
-			} elseif ($conf->browser->name == 'firefox') {

+			}

+			elseif ($conf->browser->name == 'firefox')

+			{

@@ -9651 +7346,3 @@
-			} else {

+			}

+			else

+			{

@@ -9655,2 +7352,2 @@
-			$previous_ref = $object->ref_previous ? '<a accesskey="p" title="' . $stringforfirstkey . ' p" class="classfortooltip" href="' . $navurl . '?' . $paramid . '=' . urlencode($object->ref_previous) . $moreparam . '"><i class="fa fa-chevron-left"></i></a>' : '<span class="inactive"><i class="fa fa-chevron-left opacitymedium"></i></span>';

-			$next_ref = $object->ref_next ? '<a accesskey="n" title="' . $stringforfirstkey . ' n" class="classfortooltip" href="' . $navurl . '?' . $paramid . '=' . urlencode($object->ref_next) . $moreparam . '"><i class="fa fa-chevron-right"></i></a>' : '<span class="inactive"><i class="fa fa-chevron-right opacitymedium"></i></span>';

+			$previous_ref = $object->ref_previous ? '<a accesskey="p" title="'.$stringforfirstkey.' p" class="classfortooltip" href="'.$navurl.'?'.$paramid.'='.urlencode($object->ref_previous).$moreparam.'"><i class="fa fa-chevron-left"></i></a>' : '<span class="inactive"><i class="fa fa-chevron-left opacitymedium"></i></span>';

+			$next_ref     = $object->ref_next ? '<a accesskey="n" title="'.$stringforfirstkey.' n" class="classfortooltip" href="'.$navurl.'?'.$paramid.'='.urlencode($object->ref_next).$moreparam.'"><i class="fa fa-chevron-right"></i></a>' : '<span class="inactive"><i class="fa fa-chevron-right opacitymedium"></i></span>';

@@ -9663,5 +7360,4 @@
-		if ($morehtmlright) {

-			$ret .= '<div class="inline-block floatleft">' . $morehtmlright . '</div>';

-		}

-

-		if ($previous_ref || $next_ref || $morehtml) {

+		if ($morehtmlright) $ret .= '<div class="inline-block floatleft">'.$morehtmlright.'</div>';

+

+		if ($previous_ref || $next_ref || $morehtml)

+		{

@@ -9670,8 +7366,11 @@
-		if ($morehtml) {

-			$ret .= '<li class="noborder litext' . (($shownav && $previous_ref && $next_ref) ? ' clearbothonsmartphone' : '') . '">' . $morehtml . '</li>';

-		}

-		if ($shownav && ($previous_ref || $next_ref)) {

-			$ret .= '<li class="pagination">' . $previous_ref . '</li>';

-			$ret .= '<li class="pagination">' . $next_ref . '</li>';

-		}

-		if ($previous_ref || $next_ref || $morehtml) {

+		if ($morehtml)

+		{

+			$ret .= '<li class="noborder litext">'.$morehtml.'</li>';

+		}

+		if ($shownav && ($previous_ref || $next_ref))

+		{

+			$ret .= '<li class="pagination">'.$previous_ref.'</li>';

+			$ret .= '<li class="pagination">'.$next_ref.'</li>';

+		}

+		if ($previous_ref || $next_ref || $morehtml)

+		{

@@ -9681,2 +7380 @@
-		// Status

-		$parameters = array('morehtmlstatus' => $morehtmlstatus);

+		$parameters = array();

@@ -9684,8 +7382,3 @@
-		if (empty($reshook)) {

-			$morehtmlstatus .= $hookmanager->resPrint;

-		} else {

-			$morehtmlstatus = $hookmanager->resPrint;

-		}

-		if ($morehtmlstatus) {

-			$ret .= '<div class="statusref">' . $morehtmlstatus . '</div>';

-		}

+		if (empty($reshook)) $morehtmlstatus .= $hookmanager->resPrint;

+		else $morehtmlstatus = $hookmanager->resPrint;

+		if ($morehtmlstatus) $ret .= '<div class="statusref">'.$morehtmlstatus.'</div>';

@@ -9695,5 +7388,2 @@
-		if (empty($reshook)) {

-			$morehtmlref .= $hookmanager->resPrint;

-		} elseif ($reshook > 0) {

-			$morehtmlref = $hookmanager->resPrint;

-		}

+		if (empty($reshook)) $morehtmlref .= $hookmanager->resPrint;

+		elseif ($reshook > 0) $morehtmlref = $hookmanager->resPrint;

@@ -9702,6 +7392,4 @@
-		if ($morehtmlleft) {

-			if ($conf->browser->layout == 'phone') {

-				$ret .= '<!-- morehtmlleft --><div class="floatleft">' . $morehtmlleft . '</div>';

-			} else {

-				$ret .= '<!-- morehtmlleft --><div class="inline-block floatleft">' . $morehtmlleft . '</div>';

-			}

+		if ($morehtmlleft)

+		{

+			if ($conf->browser->layout == 'phone') $ret .= '<!-- morehtmlleft --><div class="floatleft">'.$morehtmlleft.'</div>'; // class="center" to have photo in middle

+			else $ret .= '<!-- morehtmlleft --><div class="inline-block floatleft">'.$morehtmlleft.'</div>';

@@ -9711 +7399 @@
-		$ret .= '<div class="inline-block floatleft valignmiddle maxwidth750 marginbottomonly refid' . (($shownav && ($previous_ref || $next_ref)) ? ' refidpadding' : '') . '">';

+		$ret .= '<div class="inline-block floatleft valignmiddle refid'.(($shownav && ($previous_ref || $next_ref)) ? ' refidpadding' : '').'">';

@@ -9714 +7402,2 @@
-		if ($object->element == 'societe') {

+		if ($object->element == 'societe')

+		{

@@ -9719,3 +7408 @@
-			if (getDolGlobalString('PDF_USE_ALSO_LANGUAGE_CODE')) {

-				$arrayoflangcode[] = $conf->global->PDF_USE_ALSO_LANGUAGE_CODE;

-			}

+			if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE)) $arrayoflangcode[] = $conf->global->PDF_USE_ALSO_LANGUAGE_CODE;

@@ -9725 +7412 @@
-					include_once DOL_DOCUMENT_ROOT . '/core/class/extralanguages.class.php';

+					include_once DOL_DOCUMENT_ROOT.'/core/class/extralanguages.class.php';

@@ -9730 +7417,2 @@
-				if (!empty($extralanguages->attributes['societe']['name'])) {

+				if (!empty($extralanguages->attributes['societe']['name']))

+				{

@@ -9740 +7428 @@
-							$htmltext .= '<span class="opacitymedium">' . $langs->trans("SwitchInEditModeToAddTranslation") . '</span>';

+							$htmltext .= '<span class="opacitymedium">'.$langs->trans("SwitchInEditModeToAddTranslation").'</span>';

@@ -9743 +7431 @@
-					$ret .= '<!-- Show translations of name -->' . "\n";

+					$ret .= '<!-- Show translations of name -->'."\n";

@@ -9747,2 +7435,4 @@
-		} elseif ($object->element == 'member') {

-			$ret .= $object->ref . '<br>';

+		}

+		elseif ($object->element == 'member')

+		{

+			$ret .= $object->ref.'<br>';

@@ -9751 +7441 @@
-				$ret .= dol_htmlentities($object->societe) . ((!empty($fullname) && $object->societe != $fullname) ? ' (' . dol_htmlentities($fullname) . $addgendertxt . ')' : '');

+				$ret .= dol_htmlentities($object->societe).((!empty($fullname) && $object->societe != $fullname) ? ' ('.dol_htmlentities($fullname).')' : '');

@@ -9753,9 +7443,13 @@
-				$ret .= dol_htmlentities($fullname) . $addgendertxt . ((!empty($object->societe) && $object->societe != $fullname) ? ' (' . dol_htmlentities($object->societe) . ')' : '');

-			}

-		} elseif (in_array($object->element, array('contact', 'user'))) {

-			$ret .= dol_htmlentities($object->getFullName($langs)) . $addgendertxt;

-		} elseif ($object->element == 'usergroup') {

-			$ret .= dol_htmlentities($object->name);

-		} elseif (in_array($object->element, array('action', 'agenda'))) {

-			$ret .= $object->ref . '<br>' . $object->label;

-		} elseif (in_array($object->element, array('adherent_type'))) {

+				$ret .= dol_htmlentities($fullname).((!empty($object->societe) && $object->societe != $fullname) ? ' ('.dol_htmlentities($object->societe).')' : '');

+			}

+		}

+		elseif (in_array($object->element, array('contact', 'user', 'usergroup')))

+		{

+			$ret .= dol_htmlentities($object->getFullName($langs));

+		}

+		elseif (in_array($object->element, array('action', 'agenda')))

+		{

+			$ret .= $object->ref.'<br>'.$object->label;

+		}

+		elseif (in_array($object->element, array('adherent_type')))

+		{

@@ -9763 +7457,3 @@
-		} elseif ($object->element == 'ecm_directories') {

+		}

+		elseif ($object->element == 'ecm_directories')

+		{

@@ -9765,4 +7461,8 @@
-		} elseif ($fieldref != 'none') {

-			$ret .= dol_htmlentities(!empty($object->$fieldref) ? $object->$fieldref : "");

-		}

-		if ($morehtmlref) {

+		}

+		elseif ($fieldref != 'none')

+		{

+			$ret .= dol_htmlentities($object->$fieldref);

+		}

+

+		if ($morehtmlref)

+		{

@@ -9770 +7470,2 @@
-			if (substr($morehtmlref, 0, 4) != '<div') {

+			if (substr($morehtmlref, 0, 4) != '<div')

+			{

@@ -9786,8 +7487,7 @@
-	 *  Return HTML code to output a barcode

-	 *

-	 * @param Object $object Object containing data to retrieve file name

-	 * @param int $width Width of photo

-	 * @param string $morecss More CSS on img of barcode

-	 * @return string                    HTML code to output barcode

-	 */

-	public function showbarcode(&$object, $width = 100, $morecss = '')

+	 *    	Return HTML code to output a barcode

+	 *

+	 *     	@param	Object	$object		Object containing data to retrieve file name

+	 * 		@param	int		$width			Width of photo

+	 * 	  	@return string    				HTML code to output barcode

+	 */

+    public function showbarcode(&$object, $width = 100)

@@ -9798,3 +7498 @@
-		if (empty($object->barcode)) {

-			return '';

-		}

+		if (empty($object->barcode)) return '';

@@ -9803 +7501,2 @@
-		if (empty($object->barcode_type_code) || empty($object->barcode_type_coder)) {

+		if (empty($object->barcode_type_code) || empty($object->barcode_type_coder))

+		{

@@ -9806,3 +7505 @@
-			if ($result < 1) {

-				return '<!-- ErrorFetchBarcode -->';

-			}

+			if ($result < 1) return '<!-- ErrorFetchBarcode -->';

@@ -9812,4 +7509,3 @@
-		$url = DOL_URL_ROOT . '/viewimage.php?modulepart=barcode&generator=' . urlencode($object->barcode_type_coder) . '&code=' . urlencode($object->barcode) . '&encoding=' . urlencode($object->barcode_type_code);

-		$out = '<!-- url barcode = ' . $url . ' -->';

-		$out .= '<img src="' . $url . '"' . ($morecss ? ' class="' . $morecss . '"' : '') . '>';

-

+		$url = DOL_URL_ROOT.'/viewimage.php?modulepart=barcode&generator='.urlencode($object->barcode_type_coder).'&code='.urlencode($object->barcode).'&encoding='.urlencode($object->barcode_type_code);

+		$out = '<!-- url barcode = '.$url.' -->';

+		$out .= '<img src="'.$url.'">';

@@ -9820,16 +7516,15 @@
-	 *        Return HTML code to output a photo

-	 *

-	 * @param string $modulepart Key to define module concerned ('societe', 'userphoto', 'memberphoto')

-	 * @param object $object Object containing data to retrieve file name

-	 * @param int $width Width of photo

-	 * @param int $height Height of photo (auto if 0)

-	 * @param int $caneditfield Add edit fields

-	 * @param string $cssclass CSS name to use on img for photo

-	 * @param string $imagesize 'mini', 'small' or '' (original)

-	 * @param int $addlinktofullsize Add link to fullsize image

-	 * @param int $cache 1=Accept to use image in cache

-	 * @param string $forcecapture '', 'user' or 'environment'. Force parameter capture on HTML input file element to ask a smartphone to allow to open camera to take photo. Auto if ''.

-	 * @param int $noexternsourceoverwrite No overwrite image with extern source (like 'gravatar' or other module)

-	 * @return string                            HTML code to output photo

-	 */

-	public static function showphoto($modulepart, $object, $width = 100, $height = 0, $caneditfield = 0, $cssclass = 'photowithmargin', $imagesize = '', $addlinktofullsize = 1, $cache = 0, $forcecapture = '', $noexternsourceoverwrite = 0)

+	 *    	Return HTML code to output a photo

+	 *

+	 *    	@param	string		$modulepart			Key to define module concerned ('societe', 'userphoto', 'memberphoto')

+	 *     	@param  object		$object				Object containing data to retrieve file name

+	 * 		@param	int			$width				Width of photo

+	 * 		@param	int			$height				Height of photo (auto if 0)

+	 * 		@param	int			$caneditfield		Add edit fields

+	 * 		@param	string		$cssclass			CSS name to use on img for photo

+	 * 		@param	string		$imagesize		    'mini', 'small' or '' (original)

+	 *      @param  int         $addlinktofullsize  Add link to fullsize image

+	 *      @param  int         $cache              1=Accept to use image in cache

+	 *      @param	string		$forcecapture		Force parameter capture on HTML input file element to ask a smartphone to allow to open camera to take photo. Auto if empty.

+	 * 	  	@return string    						HTML code to output photo

+	 */

+	public static function showphoto($modulepart, $object, $width = 100, $height = 0, $caneditfield = 0, $cssclass = 'photowithmargin', $imagesize = '', $addlinktofullsize = 1, $cache = 0, $forcecapture = '')

@@ -9839,11 +7534,6 @@
-		$entity = (empty($object->entity) ? $conf->entity : $object->entity);

-		$id = (empty($object->id) ? $object->rowid : $object->id);

-

-		$ret = '';

-		$dir = '';

-		$file = '';

-		$originalfile = '';

-		$altfile = '';

-		$email = '';

-		$capture = '';

-		if ($modulepart == 'societe') {

+		$entity = (!empty($object->entity) ? $object->entity : $conf->entity);

+		$id = (!empty($object->id) ? $object->id : $object->rowid);

+

+		$ret = ''; $dir = ''; $file = ''; $originalfile = ''; $altfile = ''; $email = ''; $capture = '';

+		if ($modulepart == 'societe')

+		{

@@ -9851,11 +7541,6 @@
-			if (!empty($object->logo)) {

-				if (dolIsAllowedForPreview($object->logo)) {

-					if ((string) $imagesize == 'mini') {

-						$file = get_exdir(0, 0, 0, 0, $object, 'thirdparty') . 'logos/' . getImageFileNameForSize($object->logo, '_mini'); // getImageFileNameForSize include the thumbs

-					} elseif ((string) $imagesize == 'small') {

-						$file = get_exdir(0, 0, 0, 0, $object, 'thirdparty') . 'logos/' . getImageFileNameForSize($object->logo, '_small');

-					} else {

-						$file = get_exdir(0, 0, 0, 0, $object, 'thirdparty') . 'logos/' . $object->logo;

-					}

-					$originalfile = get_exdir(0, 0, 0, 0, $object, 'thirdparty') . 'logos/' . $object->logo;

-				}

+			if (!empty($object->logo))

+			{

+				if ((string) $imagesize == 'mini') $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.getImageFileNameForSize($object->logo, '_mini'); // getImageFileNameForSize include the thumbs

+				elseif ((string) $imagesize == 'small') $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.getImageFileNameForSize($object->logo, '_small');

+				else $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.$object->logo;

+				$originalfile = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.$object->logo;

@@ -9864,13 +7549,10 @@
-		} elseif ($modulepart == 'contact') {

-			$dir = $conf->societe->multidir_output[$entity] . '/contact';

-			if (!empty($object->photo)) {

-				if (dolIsAllowedForPreview($object->photo)) {

-					if ((string) $imagesize == 'mini') {

-						$file = get_exdir(0, 0, 0, 0, $object, 'contact') . 'photos/' . getImageFileNameForSize($object->photo, '_mini');

-					} elseif ((string) $imagesize == 'small') {

-						$file = get_exdir(0, 0, 0, 0, $object, 'contact') . 'photos/' . getImageFileNameForSize($object->photo, '_small');

-					} else {

-						$file = get_exdir(0, 0, 0, 0, $object, 'contact') . 'photos/' . $object->photo;

-					}

-					$originalfile = get_exdir(0, 0, 0, 0, $object, 'contact') . 'photos/' . $object->photo;

-				}

+		}

+		elseif ($modulepart == 'contact')

+		{

+			$dir = $conf->societe->multidir_output[$entity].'/contact';

+			if (!empty($object->photo))

+			{

+				if ((string) $imagesize == 'mini') $file = get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.getImageFileNameForSize($object->photo, '_mini');

+				elseif ((string) $imagesize == 'small') $file = get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.getImageFileNameForSize($object->photo, '_small');

+				else $file = get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.$object->photo;

+				$originalfile = get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.$object->photo;

@@ -9880 +7562,3 @@
-		} elseif ($modulepart == 'userphoto') {

+		}

+		elseif ($modulepart == 'userphoto')

+		{

@@ -9882,15 +7566,8 @@
-			if (!empty($object->photo)) {

-				if (dolIsAllowedForPreview($object->photo)) {

-					if ((string) $imagesize == 'mini') {

-						$file = get_exdir(0, 0, 0, 0, $object, 'user') . 'photos/' . getImageFileNameForSize($object->photo, '_mini');

-					} elseif ((string) $imagesize == 'small') {

-						$file = get_exdir(0, 0, 0, 0, $object, 'user') . 'photos/' . getImageFileNameForSize($object->photo, '_small');

-					} else {

-						$file = get_exdir(0, 0, 0, 0, $object, 'user') . 'photos/' . $object->photo;

-					}

-					$originalfile = get_exdir(0, 0, 0, 0, $object, 'user') . 'photos/' . $object->photo;

-				}

-			}

-			if (getDolGlobalString('MAIN_OLD_IMAGE_LINKS')) {

-				$altfile = $object->id . ".jpg"; // For backward compatibility

-			}

+			if (!empty($object->photo))

+			{

+				if ((string) $imagesize == 'mini') $file = get_exdir(0, 0, 0, 0, $object, 'user').$object->id.'/'.getImageFileNameForSize($object->photo, '_mini');

+				elseif ((string) $imagesize == 'small') $file = get_exdir(0, 0, 0, 0, $object, 'user').$object->id.'/'.getImageFileNameForSize($object->photo, '_small');

+				else $file = get_exdir(0, 0, 0, 0, $object, 'user').'/'.$object->id.'/'.$object->photo;

+				$originalfile = get_exdir(0, 0, 0, 0, $object, 'user').'/'.$object->id.'/'.$object->photo;

+			}

+			if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile = $object->id.".jpg"; // For backward compatibility

@@ -9899 +7576,3 @@
-		} elseif ($modulepart == 'memberphoto') {

+		}

+		elseif ($modulepart == 'memberphoto')

+		{

@@ -9901,15 +7580,8 @@
-			if (!empty($object->photo)) {

-				if (dolIsAllowedForPreview($object->photo)) {

-					if ((string) $imagesize == 'mini') {

-						$file = get_exdir(0, 0, 0, 0, $object, 'member') . 'photos/' . getImageFileNameForSize($object->photo, '_mini');

-					} elseif ((string) $imagesize == 'small') {

-						$file = get_exdir(0, 0, 0, 0, $object, 'member') . 'photos/' . getImageFileNameForSize($object->photo, '_small');

-					} else {

-						$file = get_exdir(0, 0, 0, 0, $object, 'member') . 'photos/' . $object->photo;

-					}

-					$originalfile = get_exdir(0, 0, 0, 0, $object, 'member') . 'photos/' . $object->photo;

-				}

-			}

-			if (getDolGlobalString('MAIN_OLD_IMAGE_LINKS')) {

-				$altfile = $object->id . ".jpg"; // For backward compatibility

-			}

+			if (!empty($object->photo))

+			{

+				if ((string) $imagesize == 'mini') $file = get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.getImageFileNameForSize($object->photo, '_mini');

+				elseif ((string) $imagesize == 'small') $file = get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.getImageFileNameForSize($object->photo, '_small');

+				else $file = get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.$object->photo;

+				$originalfile = get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.$object->photo;

+			}

+			if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile = $object->id.".jpg"; // For backward compatibility

@@ -9918 +7590,3 @@
-		} else {

+		}

+		else

+		{

@@ -9921,15 +7595,8 @@
-			if (!empty($object->photo)) {

-				if (dolIsAllowedForPreview($object->photo)) {

-					if ((string) $imagesize == 'mini') {

-						$file = get_exdir($id, 2, 0, 0, $object, $modulepart) . 'photos/' . getImageFileNameForSize($object->photo, '_mini');

-					} elseif ((string) $imagesize == 'small') {

-						$file = get_exdir($id, 2, 0, 0, $object, $modulepart) . 'photos/' . getImageFileNameForSize($object->photo, '_small');

-					} else {

-						$file = get_exdir($id, 2, 0, 0, $object, $modulepart) . 'photos/' . $object->photo;

-					}

-					$originalfile = get_exdir($id, 2, 0, 0, $object, $modulepart) . 'photos/' . $object->photo;

-				}

-			}

-			if (getDolGlobalString('MAIN_OLD_IMAGE_LINKS')) {

-				$altfile = $object->id . ".jpg"; // For backward compatibility

-			}

+			if (!empty($object->photo))

+			{

+				if ((string) $imagesize == 'mini') $file = get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.getImageFileNameForSize($object->photo, '_mini');

+				elseif ((string) $imagesize == 'small') $file = get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.getImageFileNameForSize($object->photo, '_small');

+				else $file = get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.$object->photo;

+				$originalfile = get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.$object->photo;

+			}

+			if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile = $object->id.".jpg"; // For backward compatibility

@@ -9939,32 +7606,28 @@
-		if ($forcecapture) {

-			$capture = $forcecapture;

-		}

-

-		if ($dir) {

-			if ($file && file_exists($dir . "/" . $file)) {

-				if ($addlinktofullsize) {

-					$urladvanced = getAdvancedPreviewUrl($modulepart, $originalfile, 0, '&entity=' . $entity);

-					if ($urladvanced) {

-						$ret .= '<a href="' . $urladvanced . '">';

-					} else {

-						$ret .= '<a href="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $modulepart . '&entity=' . $entity . '&file=' . urlencode($originalfile) . '&cache=' . $cache . '">';

-					}

-				}

-				$ret .= '<img alt="Photo" class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . ' photologo' . (preg_replace('/[^a-z]/i', '_', $file)) . '" ' . ($width ? ' width="' . $width . '"' : '') . ($height ? ' height="' . $height . '"' : '') . ' src="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $modulepart . '&entity=' . $entity . '&file=' . urlencode($file) . '&cache=' . $cache . '">';

-				if ($addlinktofullsize) {

-					$ret .= '</a>';

-				}

-			} elseif ($altfile && file_exists($dir . "/" . $altfile)) {

-				if ($addlinktofullsize) {

-					$urladvanced = getAdvancedPreviewUrl($modulepart, $originalfile, 0, '&entity=' . $entity);

-					if ($urladvanced) {

-						$ret .= '<a href="' . $urladvanced . '">';

-					} else {

-						$ret .= '<a href="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $modulepart . '&entity=' . $entity . '&file=' . urlencode($originalfile) . '&cache=' . $cache . '">';

-					}

-				}

-				$ret .= '<img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="Photo alt" id="photologo' . (preg_replace('/[^a-z]/i', '_', $file)) . '" class="' . $cssclass . '" ' . ($width ? ' width="' . $width . '"' : '') . ($height ? ' height="' . $height . '"' : '') . ' src="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $modulepart . '&entity=' . $entity . '&file=' . urlencode($altfile) . '&cache=' . $cache . '">';

-				if ($addlinktofullsize) {

-					$ret .= '</a>';

-				}

-			} else {

+		if ($forcecapture) $capture = $forcecapture;

+

+		if ($dir)

+		{

+			if ($file && file_exists($dir."/".$file))

+			{

+				if ($addlinktofullsize)

+				{

+					$urladvanced = getAdvancedPreviewUrl($modulepart, $originalfile, 0, '&entity='.$entity);

+					if ($urladvanced) $ret .= '<a href="'.$urladvanced.'">';

+					else $ret .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($originalfile).'&cache='.$cache.'">';

+				}

+				$ret .= '<img alt="Photo" class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').' photologo'.(preg_replace('/[^a-z]/i', '_', $file)).'" '.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($file).'&cache='.$cache.'">';

+				if ($addlinktofullsize) $ret .= '</a>';

+			}

+			elseif ($altfile && file_exists($dir."/".$altfile))

+			{

+				if ($addlinktofullsize)

+				{

+					$urladvanced = getAdvancedPreviewUrl($modulepart, $originalfile, 0, '&entity='.$entity);

+					if ($urladvanced) $ret .= '<a href="'.$urladvanced.'">';

+					else $ret .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($originalfile).'&cache='.$cache.'">';

+				}

+				$ret .= '<img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="Photo alt" id="photologo'.(preg_replace('/[^a-z]/i', '_', $file)).'" class="'.$cssclass.'" '.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($altfile).'&cache='.$cache.'">';

+				if ($addlinktofullsize) $ret .= '</a>';

+			}

+			else

+			{

@@ -9972,5 +7635,6 @@
-				$defaultimg = 'identicon';        // For gravatar

-				if (in_array($modulepart, array('societe', 'userphoto', 'contact', 'memberphoto'))) {    // For modules that need a special image when photo not found

-					if ($modulepart == 'societe' || ($modulepart == 'memberphoto' && !empty($object->morphy) && strpos($object->morphy, 'mor')) !== false) {

-						$nophoto = 'company';

-					} else {

+				if (in_array($modulepart, array('userphoto', 'contact', 'memberphoto')))	// For module that are "physical" users

+				{

+					if ($modulepart == 'memberphoto' && strpos($object->morphy, 'mor') !== false) {

+						$nophoto = '/public/theme/common/company.png';

+					}

+					else {

@@ -9978,11 +7642,11 @@
-						if (!empty($object->gender) && $object->gender == 'man') {

-							$nophoto = '/public/theme/common/user_man.png';

-						}

-						if (!empty($object->gender) && $object->gender == 'woman') {

-							$nophoto = '/public/theme/common/user_woman.png';

-						}

-					}

-				}

-

-				if (isModEnabled('gravatar') && $email && empty($noexternsourceoverwrite)) {

-					// see https://gravatar.com/site/implement/images/php/

+						if ($object->gender == 'man') $nophoto = '/public/theme/common/user_man.png';

+						if ($object->gender == 'woman') $nophoto = '/public/theme/common/user_woman.png';

+					}

+				}

+

+				if (!empty($conf->gravatar->enabled) && $email)

+				{

+					/**

+					 * @see https://gravatar.com/site/implement/images/php/

+					 */

+					global $dolibarr_main_url_root;

@@ -9990,15 +7654,13 @@
-					$ret .= '<img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="" title="' . $email . ' Gravatar avatar" ' . ($width ? ' width="' . $width . '"' : '') . ($height ? ' height="' . $height . '"' : '') . ' src="https://www.gravatar.com/avatar/' . dol_hash(strtolower(trim($email)), 'sha256', 1) . '?s=' . $width . '&d=' . $defaultimg . '">'; // gravatar need md5 hash

-				} else {

-					if ($nophoto == 'company') {

-						$ret .= '<div class="divforspanimg photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="" ' . ($width ? ' width="' . $width . '"' : '') . ($height ? ' height="' . $height . '"' : '') . '>' . img_picto('', 'company') . '</div>';

-						$ret .= '<div class="difforspanimgright"></div>';

-					} else {

-						$ret .= '<img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="" ' . ($width ? ' width="' . $width . '"' : '') . ($height ? ' height="' . $height . '"' : '') . ' src="' . DOL_URL_ROOT . $nophoto . '">';

-					}

-				}

-			}

-

-			if ($caneditfield) {

-				if ($object->photo) {

-					$ret .= "<br>\n";

-				}

+					//$defaultimg=urlencode(dol_buildpath($nophoto,3));

+					$defaultimg = 'mm';

+					$ret .= '<img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="Gravatar avatar" title="'.$email.' Gravatar avatar" '.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').' src="https://www.gravatar.com/avatar/'.md5(strtolower(trim($email))).'?s='.$width.'&d='.$defaultimg.'">'; // gravatar need md5 hash

+				}

+				else

+				{

+					$ret .= '<img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo" '.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').' src="'.DOL_URL_ROOT.$nophoto.'">';

+				}

+			}

+

+			if ($caneditfield)

+			{

+				if ($object->photo) $ret .= "<br>\n";

@@ -10006,11 +7668,2 @@
-				if ($object->photo) {

-					$ret .= '<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> <label for="photodelete">' . $langs->trans("Delete") . '</label><br><br></td></tr>';

-				}

-				$ret .= '<tr><td class="tdoverflow">';

-				$maxfilesizearray = getMaxFileSizeArray();

-				$maxmin = $maxfilesizearray['maxmin'];

-				if ($maxmin > 0) {

-					$ret .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">';    // MAX_FILE_SIZE must precede the field type=file

-				}

-				$ret .= '<input type="file" class="flat maxwidth200onsmartphone" name="photo" id="photoinput" accept="image/*"' . ($capture ? ' capture="' . $capture . '"' : '') . '>';

-				$ret .= '</td></tr>';

+				if ($object->photo) $ret .= '<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';

+				$ret .= '<tr><td class="tdoverflow"><input type="file" class="flat maxwidth200onsmartphone" name="photo" id="photoinput" accept="image/*"'.($capture ? ' capture="'.$capture.'"' : '').'></td></tr>';

@@ -10019,0 +7673 @@
+		else dol_print_error('', 'Call of showphoto with wrong parameters modulepart='.$modulepart);

@@ -10024,21 +7678,20 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-

-	/**

-	 *    Return select list of groups

-	 *

-	 * @param string|object $selected Id group or group preselected

-	 * @param string $htmlname Field name in form

-	 * @param int $show_empty 0=liste sans valeur nulle, 1=ajoute valeur inconnue

-	 * @param string|array $exclude Array list of groups id to exclude

-	 * @param int $disabled If select list must be disabled

-	 * @param string|array $include Array list of groups id to include

-	 * @param array $enableonly Array list of groups id to be enabled. All other must be disabled

-	 * @param string $force_entity '0' or Ids of environment to force

-	 * @param bool $multiple add [] in the name of element and add 'multiple' attribut (not working with ajax_autocompleter)

-	 * @param string $morecss More css to add to html component

-	 * @return    string

-	 * @see select_dolusers()

-	 */

-	public function select_dolgroups($selected = '', $htmlname = 'groupid', $show_empty = 0, $exclude = '', $disabled = 0, $include = '', $enableonly = array(), $force_entity = '0', $multiple = false, $morecss = '')

-	{

-		// phpcs:enable

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+	/**

+	 *	Return select list of groups

+	 *

+	 *  @param	string	$selected       Id group preselected

+	 *  @param  string	$htmlname       Field name in form

+	 *  @param  int		$show_empty     0=liste sans valeur nulle, 1=ajoute valeur inconnue

+	 *  @param  string	$exclude        Array list of groups id to exclude

+	 * 	@param	int		$disabled		If select list must be disabled

+	 *  @param  string	$include        Array list of groups id to include

+	 * 	@param	int		$enableonly		Array list of groups id to be enabled. All other must be disabled

+	 * 	@param	string	$force_entity	'0' or Ids of environment to force

+	 * 	@param	bool	$multiple		add [] in the name of element and add 'multiple' attribut (not working with ajax_autocompleter)

+	 *  @param  string	$morecss		More css to add to html component

+	 *  @return	string

+	 *  @see select_dolusers()

+	 */

+    public function select_dolgroups($selected = '', $htmlname = 'groupid', $show_empty = 0, $exclude = '', $disabled = 0, $include = '', $enableonly = '', $force_entity = '0', $multiple = false, $morecss = '')

+	{

+        // phpcs:enable

@@ -10048,4 +7701 @@
-		$excludeGroups = null;

-		if (is_array($exclude)) {

-			$excludeGroups = implode(",", $exclude);

-		}

+		if (is_array($exclude))	$excludeGroups = implode("','", $exclude);

@@ -10053,8 +7703,3 @@
-		$includeGroups = null;

-		if (is_array($include)) {

-			$includeGroups = implode(",", $include);

-		}

-

-		if (!is_array($selected)) {

-			$selected = array($selected);

-		}

+		if (is_array($include))	$includeGroups = implode("','", $include);

+

+		if (!is_array($selected)) $selected = array($selected);

@@ -10066 +7711,2 @@
-		if (isModEnabled('multicompany') && $conf->entity == 1 && $user->admin && !$user->entity) {

+		if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity)

+		{

@@ -10069,17 +7715,13 @@
-		$sql .= " FROM " . $this->db->prefix() . "usergroup as ug ";

-		if (isModEnabled('multicompany') && $conf->entity == 1 && $user->admin && !$user->entity) {

-			$sql .= " LEFT JOIN " . $this->db->prefix() . "entity as e ON e.rowid=ug.entity";

-			if ($force_entity) {

-				$sql .= " WHERE ug.entity IN (0, " . $force_entity . ")";

-			} else {

-				$sql .= " WHERE ug.entity IS NOT NULL";

-			}

-		} else {

-			$sql .= " WHERE ug.entity IN (0, " . $conf->entity . ")";

-		}

-		if (is_array($exclude) && $excludeGroups) {

-			$sql .= " AND ug.rowid NOT IN (" . $this->db->sanitize($excludeGroups) . ")";

-		}

-		if (is_array($include) && $includeGroups) {

-			$sql .= " AND ug.rowid IN (" . $this->db->sanitize($includeGroups) . ")";

-		}

+		$sql .= " FROM ".MAIN_DB_PREFIX."usergroup as ug ";

+		if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity)

+		{

+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entity as e ON e.rowid=ug.entity";

+			if ($force_entity) $sql .= " WHERE ug.entity IN (0,".$force_entity.")";

+			else $sql .= " WHERE ug.entity IS NOT NULL";

+		}

+		else

+		{

+			$sql .= " WHERE ug.entity IN (0,".$conf->entity.")";

+		}

+		if (is_array($exclude) && $excludeGroups) $sql .= " AND ug.rowid NOT IN ('".$excludeGroups."')";

+		if (is_array($include) && $includeGroups) $sql .= " AND ug.rowid IN ('".$includeGroups."')";

@@ -10088 +7730 @@
-		dol_syslog(get_class($this) . "::select_dolgroups", LOG_DEBUG);

+		dol_syslog(get_class($this)."::select_dolgroups", LOG_DEBUG);

@@ -10090 +7732,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -10092,3 +7735,4 @@
-			include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

-

-			$out .= '<select class="flat minwidth200' . ($morecss ? ' ' . $morecss : '') . '" id="' . $htmlname . '" name="' . $htmlname . ($multiple ? '[]' : '') . '" ' . ($multiple ? 'multiple' : '') . ' ' . ($disabled ? ' disabled' : '') . '>';

+			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

+		   	$out .= ajax_combobox($htmlname);

+

+			$out .= '<select class="flat minwidth200'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.($disabled ? ' disabled' : '').'>';

@@ -10098,6 +7742,6 @@
-			if ($num) {

-				if ($show_empty && !$multiple) {

-					$out .= '<option value="-1"' . (in_array(-1, $selected) ? ' selected' : '') . '>&nbsp;</option>' . "\n";

-				}

-

-				while ($i < $num) {

+			if ($num)

+			{

+				if ($show_empty && !$multiple) $out .= '<option value="-1"'.(in_array(-1, $selected) ? ' selected' : '').'>&nbsp;</option>'."\n";

+

+				while ($i < $num)

+				{

@@ -10106,16 +7750,6 @@
-					if (is_array($enableonly) && count($enableonly) && !in_array($obj->rowid, $enableonly)) {

-						$disableline = 1;

-					}

-

-					$label = $obj->name;

-					$labelhtml = $obj->name;

-					if (isModEnabled('multicompany') && !getDolGlobalInt('MULTICOMPANY_TRANSVERSE_MODE') && $conf->entity == 1) {

-						$label .= " (" . $obj->label . ")";

-						$labelhtml .= ' <span class="opacitymedium">(' . $obj->label . ')</span>';

-					}

-

-					$out .= '<option value="' . $obj->rowid . '"';

-					if ($disableline) {

-						$out .= ' disabled';

-					}

-					if ((isset($selected[0]) && is_object($selected[0]) && $selected[0]->id == $obj->rowid) || ((!isset($selected[0]) || !is_object($selected[0])) && !empty($selected) && in_array($obj->rowid, $selected))) {

+					if (is_array($enableonly) && count($enableonly) && !in_array($obj->rowid, $enableonly)) $disableline = 1;

+

+					$out .= '<option value="'.$obj->rowid.'"';

+					if ($disableline) $out .= ' disabled';

+					if ((is_object($selected[0]) && $selected[0]->id == $obj->rowid) || (!is_object($selected[0]) && in_array($obj->rowid, $selected)))

+					{

@@ -10124 +7757,0 @@
-					$out .= ' data-html="'.dol_escape_htmltag($labelhtml).'"';

@@ -10126 +7759,7 @@
-					$out .= $label;

+

+					$out .= $obj->name;

+					if (!empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1)

+					{

+						$out .= " (".$obj->label.")";

+					}

+

@@ -10130,5 +7769,5 @@
-			} else {

-				if ($show_empty) {

-					$out .= '<option value="-1"' . (in_array(-1, $selected) ? ' selected' : '') . '></option>' . "\n";

-				}

-				$out .= '<option value="" disabled>' . $langs->trans("NoUserGroupDefined") . '</option>';

+			}

+			else

+			{

+				if ($show_empty) $out .= '<option value="-1"'.(in_array(-1, $selected) ? ' selected' : '').'></option>'."\n";

+				$out .= '<option value="" disabled>'.$langs->trans("NoUserGroupDefined").'</option>';

@@ -10137,3 +7776,3 @@
-

-			$out .= ajax_combobox($htmlname);

-		} else {

+		}

+		else

+		{

@@ -10148,15 +7787,9 @@
-	 *    Return HTML to show the search and clear seach button

-	 *

-	 * @param string $pos Position of colon on the list. Value 'left' or 'right'

-	 * @return    string

-	 */

-	public function showFilterButtons($pos = '')

-	{

-		$out = '<div class="nowraponall">';

-		if ($pos == 'left') {

-			$out .= '<button type="submit" class="liste_titre button_search reposition" name="button_search_x" value="x"><span class="fas fa-search"></span></button>';

-			$out .= '<button type="submit" class="liste_titre button_removefilter reposition" name="button_removefilter_x" value="x"><span class="fas fa-times"></span></button>';

-		} else {

-			$out .= '<button type="submit" class="liste_titre button_search reposition" name="button_search_x" value="x"><span class="fas fa-search"></span></button>';

-			$out .= '<button type="submit" class="liste_titre button_removefilter reposition" name="button_removefilter_x" value="x"><span class="fas fa-times"></span></button>';

-		}

+	 *	Return HTML to show the search and clear seach button

+	 *

+	 *  @return	string

+	 */

+    public function showFilterButtons()

+	{

+		$out = '<div class="nowrap">';

+		$out .= '<button type="submit" class="liste_titre button_search" name="button_search_x" value="x"><span class="fa fa-search"></span></button>';

+		$out .= '<button type="submit" class="liste_titre button_removefilter" name="button_removefilter_x" value="x"><span class="fa fa-remove"></span></button>';

@@ -10169,10 +7802,9 @@
-	 *    Return HTML to show the search and clear search button

-	 *

-	 * @param string $cssclass CSS class

-	 * @param int $calljsfunction 0=default. 1=call function initCheckForSelect() after changing status of checkboxes

-	 * @param string $massactionname Mass action button name that will launch an action on the selected items

-	 * @return    string

-	 */

-	public function showCheckAddButtons($cssclass = 'checkforaction', $calljsfunction = 0, $massactionname = "massaction")

-	{

-		global $conf;

+	 *	Return HTML to show the search and clear seach button

+	 *

+	 *  @param  string  $cssclass                  CSS class

+	 *  @param  int     $calljsfunction            0=default. 1=call function initCheckForSelect() after changing status of checkboxes

+	 *  @return	string

+	 */

+    public function showCheckAddButtons($cssclass = 'checkforaction', $calljsfunction = 0)

+	{

+		global $conf, $langs;

@@ -10181,5 +7813,3 @@
-

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

-			$out .= '<div class="inline-block checkallactions"><input type="checkbox" id="' . $cssclass . 's" name="' . $cssclass . 's" class="checkallactions"></div>';

-		}

-		$out .= '<script nonce="' . getNonce() . '">

+		$id = uniqid();

+		if (!empty($conf->use_javascript_ajax)) $out .= '<div class="inline-block checkallactions"><input type="checkbox" id="checkallactions'.$id.'" name="checkallactions" class="checkallactions"></div>';

+		$out .= '<script>

@@ -10187 +7817 @@
-                $("#' . $cssclass . 's").click(function() {

+            	$("#checkallactions'.$id.'").click(function() {

@@ -10189,2 +7819,2 @@
-                        console.log("We check all ' . $cssclass . ' and trigger the change method");

-                		$(".' . $cssclass . '").prop(\'checked\', true).trigger(\'change\');

+                        console.log("We check all '.$cssclass.'");

+                		$(".'.$cssclass.'").prop(\'checked\', true).trigger(\'change\');

@@ -10195,5 +7825,3 @@
-                		$(".' . $cssclass . '").prop(\'checked\', false).trigger(\'change\');

-                    }' . "\n";

-		if ($calljsfunction) {

-			$out .= 'if (typeof initCheckForSelect == \'function\') { initCheckForSelect(0, "' . $massactionname . '", "' . $cssclass . '"); } else { console.log("No function initCheckForSelect found. Call won\'t be done."); }';

-		}

+                		$(".'.$cssclass.'").prop(\'checked\', false).trigger(\'change\');

+                    }'."\n";

+		if ($calljsfunction) $out .= 'if (typeof initCheckForSelect == \'function\') { initCheckForSelect(0); } else { console.log("No function initCheckForSelect found. Call won\'t be done."); }';

@@ -10201,5 +7829,7 @@
-        	        $(".' . $cssclass . '").change(function() {

-					$(this).closest("tr").toggleClass("highlight", this.checked);

-				});

-		 	});

-    	</script>';

+

+        	$(".checkforselect").change(function() {

+				$(this).closest("tr").toggleClass("highlight", this.checked);

+			});

+

+ 	});

+    </script>';

@@ -10211,9 +7841,8 @@
-	 *    Return HTML to show the search and clear seach button

-	 *

-	 * @param int $addcheckuncheckall Add the check all/uncheck all checkbox (use javascript) and code to manage this

-	 * @param string $cssclass CSS class

-	 * @param int $calljsfunction 0=default. 1=call function initCheckForSelect() after changing status of checkboxes

-	 * @param string $massactionname Mass action name

-	 * @return    string

-	 */

-	public function showFilterAndCheckAddButtons($addcheckuncheckall = 0, $cssclass = 'checkforaction', $calljsfunction = 0, $massactionname = "massaction")

+	 *	Return HTML to show the search and clear seach button

+	 *

+	 *  @param	int  	$addcheckuncheckall        Add the check all/uncheck all checkbox (use javascript) and code to manage this

+	 *  @param  string  $cssclass                  CSS class

+	 *  @param  int     $calljsfunction            0=default. 1=call function initCheckForSelect() after changing status of checkboxes

+	 *  @return	string

+	 */

+    public function showFilterAndCheckAddButtons($addcheckuncheckall = 0, $cssclass = 'checkforaction', $calljsfunction = 0)

@@ -10222,2 +7851,3 @@
-		if ($addcheckuncheckall) {

-			$out .= $this->showCheckAddButtons($cssclass, $calljsfunction, $massactionname);

+		if ($addcheckuncheckall)

+		{

+			$out .= $this->showCheckAddButtons($cssclass, $calljsfunction);

@@ -10231,31 +7861,28 @@
-	 * @param string 	$selected 		preselected category

-	 * @param string 	$htmlname 		name of HTML select list

-	 * @param integer 	$useempty 		1=Add empty line

-	 * @param array 	$excludeid 		id to exclude

-	 * @param string 	$target 		htmlname of target select to bind event

-	 * @param int 		$default_selected default category to select if fk_c_type_fees change = EX_KME

-	 * @param array 	$params 		param to give

-	 * @param int 		$info_admin 	Show the tooltip help picto to setup list

-	 * @return    string

-	 */

-	public function selectExpenseCategories($selected = '', $htmlname = 'fk_c_exp_tax_cat', $useempty = 0, $excludeid = array(), $target = '', $default_selected = 0, $params = array(), $info_admin = 1)

-	{

-		global $langs, $user;

-

-		$out = '';

-		$sql = "SELECT rowid, label FROM " . $this->db->prefix() . "c_exp_tax_cat WHERE active = 1";

-		$sql .= " AND entity IN (0," . getEntity('exp_tax_cat') . ")";

-		if (!empty($excludeid)) {

-			$sql .= " AND rowid NOT IN (" . $this->db->sanitize(implode(',', $excludeid)) . ")";

-		}

-		$sql .= " ORDER BY label";

-

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

-		if ($resql) {

-			$out = '<select id="select_' . $htmlname . '" name="' . $htmlname . '" class="' . $htmlname . ' flat minwidth75imp maxwidth200">';

-			if ($useempty) {

-				$out .= '<option value="0">&nbsp;</option>';

-			}

-

-			while ($obj = $this->db->fetch_object($resql)) {

-				$out .= '<option ' . ($selected == $obj->rowid ? 'selected="selected"' : '') . ' value="' . $obj->rowid . '">' . $langs->trans($obj->label) . '</option>';

+	 * @param	string	$selected              preselected category

+	 * @param	string	$htmlname              name of HTML select list

+	 * @param	integer	$useempty              1=Add empty line

+	 * @param	array	$excludeid             id to exclude

+	 * @param	string	$target                htmlname of target select to bind event

+	 * @param	int		$default_selected      default category to select if fk_c_type_fees change = EX_KME

+	 * @param	array	$params                param to give

+	 * @return	string

+	 */

+    public function selectExpenseCategories($selected = '', $htmlname = 'fk_c_exp_tax_cat', $useempty = 0, $excludeid = array(), $target = '', $default_selected = 0, $params = array())

+	{

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

+

+        $out = '';

+        $sql = 'SELECT rowid, label FROM '.MAIN_DB_PREFIX.'c_exp_tax_cat WHERE active = 1';

+		$sql .= ' AND entity IN (0,'.getEntity('exp_tax_cat').')';

+		if (!empty($excludeid)) $sql .= ' AND rowid NOT IN ('.implode(',', $excludeid).')';

+		$sql .= ' ORDER BY label';

+

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

+		if ($resql)

+		{

+			$out = '<select id="select_'.$htmlname.'" name="'.$htmlname.'" class="'.$htmlname.' flat minwidth75imp">';

+			if ($useempty) $out .= '<option value="0">&nbsp;</option>';

+

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

+			{

+				$out .= '<option '.($selected == $obj->rowid ? 'selected="selected"' : '').' value="'.$obj->rowid.'">'.$langs->trans($obj->label).'</option>';

@@ -10264,13 +7891,12 @@
-			$out .= ajax_combobox('select_' . $htmlname);

-

-			if (!empty($htmlname) && $user->admin && $info_admin) {

-				$out .= ' ' . info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

-			}

-

-			if (!empty($target)) {

-				$sql = "SELECT c.id FROM " . $this->db->prefix() . "c_type_fees as c WHERE c.code = 'EX_KME' AND c.active = 1";

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

-				if ($resql) {

-					if ($this->db->num_rows($resql) > 0) {

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

-						$out .= '<script nonce="' . getNonce() . '">

+			if (!empty($htmlname) && $user->admin) $out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+

+			if (!empty($target))

+			{

+				$sql = "SELECT c.id FROM ".MAIN_DB_PREFIX."c_type_fees as c WHERE c.code = 'EX_KME' AND c.active = 1";

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

+				if ($resql)

+				{

+					if ($db->num_rows($resql) > 0)

+					{

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

+						$out .= '<script>

@@ -10278 +7904 @@
-								$("select[name=' . $target . ']").on("change", function() {

+								$("select[name='.$target.']").on("change", function() {

@@ -10280,4 +7906,2 @@
-									if (current_val == ' . $obj->id . ') {';

-						if (!empty($default_selected) || !empty($selected)) {

-							$out .= '$("select[name=' . $htmlname . ']").val("' . ($default_selected > 0 ? $default_selected : $selected) . '");';

-						}

+									if (current_val == '.$obj->id.') {';

+						if (!empty($default_selected) || !empty($selected)) $out .= '$("select[name='.$htmlname.']").val("'.($default_selected > 0 ? $default_selected : $selected).'");';

@@ -10286 +7910 @@
-										$("select[name=' . $htmlname . ']").change();

+										$("select[name='.$htmlname.']").change();

@@ -10290,3 +7914,3 @@
-								$("select[name=' . $htmlname . ']").change(function() {

-

-									if ($("select[name=' . $target . ']").val() == ' . $obj->id . ') {

+								$("select[name='.$htmlname.']").change(function() {

+

+									if ($("select[name='.$target.']").val() == '.$obj->id.') {

@@ -10293,0 +7918,3 @@
+										var data = '.json_encode($params).';

+										data.fk_c_exp_tax_cat = $(this).val();

+

@@ -10297,2 +7924,2 @@
-											data: { fk_c_exp_tax_cat: $(this).val(), token: \'' . currentToken() . '\' },

-											url: "' . (DOL_URL_ROOT . '/expensereport/ajax/ajaxik.php?' . join('&', $params)) . '",

+											data: data,

+											url: "'.(DOL_URL_ROOT.'/expensereport/ajax/ajaxik.php').'",

@@ -10303 +7930 @@
-												$("select[name=' . $htmlname . ']").attr("title", data.title);

+												$("select[name='.$htmlname.']").attr("title", data.title);

@@ -10306 +7933 @@
-												$("select[name=' . $htmlname . ']").attr("title", "");

+												$("select[name='.$htmlname.']").attr("title", "");

@@ -10316,2 +7943,4 @@
-		} else {

-			dol_print_error($this->db);

+		}

+		else

+		{

+			dol_print_error($db);

@@ -10326,8 +7955,104 @@
-	 * @param string $selected preselected category

-	 * @param string $htmlname name of HTML select list

-	 * @param integer $useempty 1=Add empty line

-	 * @return    string

-	 */

-	public function selectExpenseRanges($selected = '', $htmlname = 'fk_range', $useempty = 0)

-	{

-		global $conf, $langs;

+	 * @param	string	$selected    preselected category

+	 * @param	string	$htmlname    name of HTML select list

+	 * @param	integer	$useempty    1=Add empty line

+	 * @return	string

+	 */

+    public function selectExpenseRanges($selected = '', $htmlname = 'fk_range', $useempty = 0)

+	{

+		global $db, $conf, $langs;

+

+        $out = '';

+		$sql = 'SELECT rowid, range_ik FROM '.MAIN_DB_PREFIX.'c_exp_tax_range';

+		$sql .= ' WHERE entity = '.$conf->entity.' AND active = 1';

+

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

+		if ($resql)

+		{

+			$out = '<select id="select_'.$htmlname.'" name="'.$htmlname.'" class="'.$htmlname.' flat minwidth75imp">';

+			if ($useempty) $out .= '<option value="0"></option>';

+

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

+			{

+				$out .= '<option '.($selected == $obj->rowid ? 'selected="selected"' : '').' value="'.$obj->rowid.'">'.price($obj->range_ik, 0, $langs, 1, 0).'</option>';

+			}

+			$out .= '</select>';

+		}

+		else

+		{

+			dol_print_error($db);

+		}

+

+		return $out;

+	}

+

+	/**

+	 * Return HTML to show a select of expense

+	 *

+	 * @param	string	$selected    preselected category

+	 * @param	string	$htmlname    name of HTML select list

+	 * @param	integer	$useempty    1=Add empty choice

+	 * @param	integer	$allchoice   1=Add all choice

+	 * @param	integer	$useid       0=use 'code' as key, 1=use 'id' as key

+	 * @return	string

+	 */

+    public function selectExpense($selected = '', $htmlname = 'fk_c_type_fees', $useempty = 0, $allchoice = 1, $useid = 0)

+	{

+		global $db, $langs;

+

+        $out = '';

+		$sql = 'SELECT id, code, label FROM '.MAIN_DB_PREFIX.'c_type_fees';

+		$sql .= ' WHERE active = 1';

+

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

+		if ($resql)

+		{

+			$out = '<select id="select_'.$htmlname.'" name="'.$htmlname.'" class="'.$htmlname.' flat minwidth75imp">';

+			if ($useempty) $out .= '<option value="0"></option>';

+			if ($allchoice) $out .= '<option value="-1">'.$langs->trans('AllExpenseReport').'</option>';

+

+			$field = 'code';

+			if ($useid) $field = 'id';

+

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

+			{

+				$key = $langs->trans($obj->code);

+				$out .= '<option '.($selected == $obj->{$field} ? 'selected="selected"' : '').' value="'.$obj->{$field}.'">'.($key != $obj->code ? $key : $obj->label).'</option>';

+			}

+			$out .= '</select>';

+		}

+		else

+		{

+			dol_print_error($db);

+		}

+

+        return $out;

+    }

+

+	/**

+	 *  Output a combo list with invoices qualified for a third party

+	 *

+	 *  @param	int		$socid      	Id third party (-1=all, 0=only projects not linked to a third party, id=projects not linked or linked to third party id)

+	 *  @param  int		$selected   	Id invoice preselected

+	 *  @param  string	$htmlname   	Name of HTML select

+	 *	@param	int		$maxlength		Maximum length of label

+	 *	@param	int		$option_only	Return only html options lines without the select tag

+	 *	@param	string	$show_empty		Add an empty line ('1' or string to show for empty line)

+	 *  @param	int		$discard_closed Discard closed projects (0=Keep,1=hide completely,2=Disable)

+     *  @param	int		$forcefocus		Force focus on field (works with javascript only)

+     *  @param	int		$disabled		Disabled

+	 *  @param	string	$morecss        More css added to the select component

+	 *  @param	string	$projectsListId ''=Automatic filter on project allowed. List of id=Filter on project ids.

+	 *  @param	string	$showproject	'all' = Show project info, ''=Hide project info

+	 *  @param	User	$usertofilter	User object to use for filtering

+	 *	@return int         			Nbr of project if OK, <0 if KO

+	 */

+    public function selectInvoice($socid = -1, $selected = '', $htmlname = 'invoiceid', $maxlength = 24, $option_only = 0, $show_empty = '1', $discard_closed = 0, $forcefocus = 0, $disabled = 0, $morecss = 'maxwidth500', $projectsListId = '', $showproject = 'all', $usertofilter = null)

+	{

+		global $user, $conf, $langs;

+

+		require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';

+

+		if (is_null($usertofilter))

+		{

+			$usertofilter = $user;

+		}

@@ -10336,98 +8060,0 @@
-		$sql = "SELECT rowid, range_ik FROM " . $this->db->prefix() . "c_exp_tax_range";

-		$sql .= " WHERE entity = " . $conf->entity . " AND active = 1";

-

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

-		if ($resql) {

-			$out = '<select id="select_' . $htmlname . '" name="' . $htmlname . '" class="' . $htmlname . ' flat minwidth75imp">';

-			if ($useempty) {

-				$out .= '<option value="0"></option>';

-			}

-

-			while ($obj = $this->db->fetch_object($resql)) {

-				$out .= '<option ' . ($selected == $obj->rowid ? 'selected="selected"' : '') . ' value="' . $obj->rowid . '">' . price($obj->range_ik, 0, $langs, 1, 0) . '</option>';

-			}

-			$out .= '</select>';

-		} else {

-			dol_print_error($this->db);

-		}

-

-		return $out;

-	}

-

-	/**

-	 * Return HTML to show a select of expense

-	 *

-	 * @param string $selected preselected category

-	 * @param string $htmlname name of HTML select list

-	 * @param integer $useempty 1=Add empty choice

-	 * @param integer $allchoice 1=Add all choice

-	 * @param integer $useid 0=use 'code' as key, 1=use 'id' as key

-	 * @return    string

-	 */

-	public function selectExpense($selected = '', $htmlname = 'fk_c_type_fees', $useempty = 0, $allchoice = 1, $useid = 0)

-	{

-		global $langs;

-

-		$out = '';

-		$sql = "SELECT id, code, label";

-		$sql .= " FROM ".$this->db->prefix()."c_type_fees";

-		$sql .= " WHERE active = 1";

-

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

-		if ($resql) {

-			$out = '<select id="select_' . $htmlname . '" name="' . $htmlname . '" class="' . $htmlname . ' flat minwidth75imp">';

-			if ($useempty) {

-				$out .= '<option value="0"></option>';

-			}

-			if ($allchoice) {

-				$out .= '<option value="-1">' . $langs->trans('AllExpenseReport') . '</option>';

-			}

-

-			$field = 'code';

-			if ($useid) {

-				$field = 'id';

-			}

-

-			while ($obj = $this->db->fetch_object($resql)) {

-				$key = $langs->trans($obj->code);

-				$out .= '<option ' . ($selected == $obj->{$field} ? 'selected="selected"' : '') . ' value="' . $obj->{$field} . '">' . ($key != $obj->code ? $key : $obj->label) . '</option>';

-			}

-			$out .= '</select>';

-

-			$out .= ajax_combobox('select_'.$htmlname);

-		} else {

-			dol_print_error($this->db);

-		}

-

-		return $out;

-	}

-

-	/**

-	 *  Output a combo list with invoices qualified for a third party

-	 *

-	 * @param int $socid Id third party (-1=all, 0=only projects not linked to a third party, id=projects not linked or linked to third party id)

-	 * @param string $selected Id invoice preselected

-	 * @param string $htmlname Name of HTML select

-	 * @param int $maxlength Maximum length of label

-	 * @param int $option_only Return only html options lines without the select tag

-	 * @param string $show_empty Add an empty line ('1' or string to show for empty line)

-	 * @param int $discard_closed Discard closed projects (0=Keep,1=hide completely,2=Disable)

-	 * @param int $forcefocus Force focus on field (works with javascript only)

-	 * @param int $disabled Disabled

-	 * @param string $morecss More css added to the select component

-	 * @param string $projectsListId ''=Automatic filter on project allowed. List of id=Filter on project ids.

-	 * @param string $showproject 'all' = Show project info, ''=Hide project info

-	 * @param User $usertofilter User object to use for filtering

-	 * @return string            HTML Select Invoice

-	 */

-	public function selectInvoice($socid = -1, $selected = '', $htmlname = 'invoiceid', $maxlength = 24, $option_only = 0, $show_empty = '1', $discard_closed = 0, $forcefocus = 0, $disabled = 0, $morecss = 'maxwidth500', $projectsListId = '', $showproject = 'all', $usertofilter = null)

-	{

-		global $user, $conf, $langs;

-

-		require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';

-

-		if (is_null($usertofilter)) {

-			$usertofilter = $user;

-		}

-

-		$out = '';

@@ -10436,6 +8063,6 @@
-		if (getDolGlobalString('PROJECT_HIDE_UNSELECTABLES')) {

-			$hideunselectables = true;

-		}

-

-		if (empty($projectsListId)) {

-			if (!$usertofilter->hasRight('projet', 'all', 'lire')) {

+		if (!empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) $hideunselectables = true;

+

+		if (empty($projectsListId))

+		{

+			if (empty($usertofilter->rights->projet->all->lire))

+			{

@@ -10448,2 +8075,2 @@
-		$sql = "SELECT f.rowid, f.ref as fref, 'nolabel' as flabel, p.rowid as pid, f.ref,

-            p.title, p.fk_soc, p.fk_statut, p.public,";

+        $sql = 'SELECT f.rowid, f.ref as fref, "nolabel" as flabel, p.rowid as pid, f.ref,

+            p.title, p.fk_soc, p.fk_statut, p.public,';

@@ -10451,4 +8078,4 @@
-		$sql .= ' FROM ' . $this->db->prefix() . 'projet as p';

-		$sql .= ' LEFT JOIN ' . $this->db->prefix() . 'societe as s ON s.rowid = p.fk_soc,';

-		$sql .= ' ' . $this->db->prefix() . 'facture as f';

-		$sql .= " WHERE p.entity IN (" . getEntity('project') . ")";

+		$sql .= ' FROM '.MAIN_DB_PREFIX.'projet as p';

+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc,';

+		$sql .= ' '.MAIN_DB_PREFIX.'facture as f';

+		$sql .= " WHERE p.entity IN (".getEntity('project').")";

@@ -10456 +8083 @@
-		//if ($projectsListId) $sql.= " AND p.rowid IN (".$this->db->sanitize($projectsListId).")";

+		//if ($projectsListId) $sql.= " AND p.rowid IN (".$projectsListId.")";

@@ -10458,2 +8085,2 @@
-		//if ($socid > 0)  $sql.= " AND (p.fk_soc=".((int) $socid)." OR p.fk_soc IS NULL)";

-		$sql .= " ORDER BY p.ref, f.ref ASC";

+		//if ($socid > 0)  $sql.= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";

+		$sql .= " GROUP BY f.ref ORDER BY p.ref, f.ref ASC";

@@ -10462 +8089,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -10464,5 +8092,6 @@
-			if (!empty($conf->use_javascript_ajax)) {

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

-				$comboenhancement = ajax_combobox($htmlname, '', 0, $forcefocus);

-				$out .= $comboenhancement;

-				$morecss = 'minwidth200imp maxwidth500';

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

+			{

+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

+	           	$comboenhancement = ajax_combobox($htmlname, '', 0, $forcefocus);

+            	$out .= $comboenhancement;

+            	$morecss = 'minwidth200imp maxwidth500';

@@ -10472 +8101 @@
-				$out .= '<select class="valignmiddle flat' . ($morecss ? ' ' . $morecss : '') . '"' . ($disabled ? ' disabled="disabled"' : '') . ' id="' . $htmlname . '" name="' . $htmlname . '">';

+				$out .= '<select class="valignmiddle flat'.($morecss ? ' '.$morecss : '').'"'.($disabled ? ' disabled="disabled"' : '').' id="'.$htmlname.'" name="'.$htmlname.'">';

@@ -10476,5 +8105,2 @@
-				if (!is_numeric($show_empty)) {

-					$out .= $show_empty;

-				} else {

-					$out .= '&nbsp;';

-				}

+				if (!is_numeric($show_empty)) $out .= $show_empty;

+				else $out .= '&nbsp;';

@@ -10485,2 +8111,4 @@
-			if ($num) {

-				while ($i < $num) {

+			if ($num)

+			{

+				while ($i < $num)

+				{

@@ -10489 +8117,2 @@
-					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && !$usertofilter->hasRight('societe', 'lire')) {

+					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && empty($usertofilter->rights->societe->lire))

+					{

@@ -10491,2 +8120,5 @@
-					} else {

-						if ($discard_closed == 1 && $obj->fk_statut == Project::STATUS_CLOSED) {

+					}

+					else

+					{

+						if ($discard_closed == 1 && $obj->fk_statut == Project::STATUS_CLOSED)

+						{

@@ -10499 +8131,2 @@
-						if ($showproject == 'all') {

+						if ($showproject == 'all')

+						{

@@ -10501,2 +8134,7 @@
-							if ($obj->name) {

-								$labeltoshow .= ' - ' . $obj->name; // Soc name

+							if ($obj->name) $labeltoshow .= ' - '.$obj->name; // Soc name

+

+							$disabled = 0;

+							if ($obj->fk_statut == Project::STATUS_DRAFT)

+							{

+								$disabled = 1;

+								$labeltoshow .= ' - '.$langs->trans("Draft");

@@ -10504,3 +8142,7 @@
-

-							$disabled = 0;

-							if ($obj->fk_statut == Project::STATUS_DRAFT) {

+							elseif ($obj->fk_statut == Project::STATUS_CLOSED)

+							{

+								if ($discard_closed == 2) $disabled = 1;

+								$labeltoshow .= ' - '.$langs->trans("Closed");

+							}

+							elseif ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))

+							{

@@ -10508,9 +8150 @@
-								$labeltoshow .= ' - ' . $langs->trans("Draft");

-							} elseif ($obj->fk_statut == Project::STATUS_CLOSED) {

-								if ($discard_closed == 2) {

-									$disabled = 1;

-								}

-								$labeltoshow .= ' - ' . $langs->trans("Closed");

-							} elseif ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid)) {

-								$disabled = 1;

-								$labeltoshow .= ' - ' . $langs->trans("LinkedToAnotherCompany");

+								$labeltoshow .= ' - '.$langs->trans("LinkedToAnotherCompany");

@@ -10520,2 +8154,3 @@
-						if (!empty($selected) && $selected == $obj->rowid) {

-							$out .= '<option value="' . $obj->rowid . '" selected';

+						if (!empty($selected) && $selected == $obj->rowid)

+						{

+							$out .= '<option value="'.$obj->rowid.'" selected';

@@ -10523,3 +8158,6 @@
-							$out .= '>' . $labeltoshow . '</option>';

-						} else {

-							if ($hideunselectables && $disabled && ($selected != $obj->rowid)) {

+							$out .= '>'.$labeltoshow.'</option>';

+						}

+						else

+						{

+							if ($hideunselectables && $disabled && ($selected != $obj->rowid))

+							{

@@ -10527,5 +8165,5 @@
-							} else {

-								$resultat = '<option value="' . $obj->rowid . '"';

-								if ($disabled) {

-									$resultat .= ' disabled';

-								}

+							}

+							else

+							{

+								$resultat = '<option value="'.$obj->rowid.'"';

+								if ($disabled) $resultat .= ' disabled';

@@ -10548,94 +8185,0 @@
-			$this->db->free($resql);

-

-			return $out;

-		} else {

-			dol_print_error($this->db);

-			return '';

-		}

-	}

-

-	/**

-	 *  Output a combo list with invoices qualified for a third party

-	 *

-	 * @param string $selected Id invoice preselected

-	 * @param string $htmlname Name of HTML select

-	 * @param int $maxlength Maximum length of label

-	 * @param int $option_only Return only html options lines without the select tag

-	 * @param string $show_empty Add an empty line ('1' or string to show for empty line)

-	 * @param int $forcefocus Force focus on field (works with javascript only)

-	 * @param int $disabled Disabled

-	 * @param string $morecss More css added to the select component

-	 * @return int                    Nbr of project if OK, <0 if KO

-	 */

-	public function selectInvoiceRec($selected = '', $htmlname = 'facrecid', $maxlength = 24, $option_only = 0, $show_empty = '1', $forcefocus = 0, $disabled = 0, $morecss = 'maxwidth500')

-	{

-		global $conf, $langs;

-

-		$out = '';

-

-		dol_syslog('FactureRec::fetch', LOG_DEBUG);

-

-		$sql = 'SELECT f.rowid, f.entity, f.titre as title, f.suspended, f.fk_soc';

-		//$sql.= ', el.fk_source';

-		$sql .= ' FROM ' . MAIN_DB_PREFIX . 'facture_rec as f';

-		$sql .= " WHERE f.entity IN (" . getEntity('invoice') . ")";

-		$sql .= " ORDER BY f.titre ASC";

-

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

-		if ($resql) {

-			// Use select2 selector

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

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

-				$comboenhancement = ajax_combobox($htmlname, '', 0, $forcefocus);

-				$out .= $comboenhancement;

-				$morecss = 'minwidth200imp maxwidth500';

-			}

-

-			if (empty($option_only)) {

-				$out .= '<select class="valignmiddle flat' . ($morecss ? ' ' . $morecss : '') . '"' . ($disabled ? ' disabled="disabled"' : '') . ' id="' . $htmlname . '" name="' . $htmlname . '">';

-			}

-			if (!empty($show_empty)) {

-				$out .= '<option value="0" class="optiongrey">';

-				if (!is_numeric($show_empty)) {

-					$out .= $show_empty;

-				} else {

-					$out .= '&nbsp;';

-				}

-				$out .= '</option>';

-			}

-			$num = $this->db->num_rows($resql);

-			if ($num) {

-				while ($obj = $this->db->fetch_object($resql)) {

-					$labeltoshow = dol_trunc($obj->title, 18); // Invoice ref

-

-					$disabled = 0;

-					if (!empty($obj->suspended)) {

-						$disabled = 1;

-						$labeltoshow .= ' - ' . $langs->trans("Closed");

-					}

-

-

-					if (!empty($selected) && $selected == $obj->rowid) {

-						$out .= '<option value="' . $obj->rowid . '" selected';

-						//if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled

-						$out .= '>' . $labeltoshow . '</option>';

-					} else {

-						if ($disabled && ($selected != $obj->rowid)) {

-							$resultat = '';

-						} else {

-							$resultat = '<option value="' . $obj->rowid . '"';

-							if ($disabled) {

-								$resultat .= ' disabled';

-							}

-							$resultat .= '>';

-							$resultat .= $labeltoshow;

-							$resultat .= '</option>';

-						}

-						$out .= $resultat;

-					}

-				}

-			}

-			if (empty($option_only)) {

-				$out .= '</select>';

-			}

-

@@ -10646,302 +8190,3 @@
-		} else {

-			$this->errors[] = $this->db->lasterror;

-			return -1;

-		}

-	}

-

-	/**

-	 * Output the component to make advanced search criteries

-	 *

-	 * @param 	array 	$arrayofcriterias 					Array of available search criterias. Example: array($object->element => $object->fields, 'otherfamily' => otherarrayoffields, ...)

-	 * @param 	array 	$search_component_params 			Array of selected search criterias

-	 * @param 	array 	$arrayofinputfieldsalreadyoutput 	Array of input fields already inform. The component will not generate a hidden input field if it is in this list.

-	 * @param 	string 	$search_component_params_hidden 	String with $search_component_params criterias

-	 * @return	string                                    	HTML component for advanced search

-	 */

-	public function searchComponent($arrayofcriterias, $search_component_params, $arrayofinputfieldsalreadyoutput = array(), $search_component_params_hidden = '')

-	{

-		global $langs;

-

-		if ($search_component_params_hidden != '' && !preg_match('/^\(.*\)$/', $search_component_params_hidden)) {    // If $search_component_params_hidden does not start and end with ()

-			$search_component_params_hidden = '(' . $search_component_params_hidden . ')';

-		}

-

-		$ret = '';

-

-		$ret .= '<div class="divadvancedsearchfieldcomp inline-block">';

-		$ret .= '<a href="#" class="dropdownsearch-toggle unsetcolor">';

-		$ret .= '<span class="fas fa-filter linkobject boxfilter paddingright pictofixedwidth" title="' . dol_escape_htmltag($langs->trans("Filters")) . '" id="idsubimgproductdistribution"></span>';

-		$ret .= '</a>';

-

-		$ret .= '<div class="divadvancedsearchfieldcompinput inline-block minwidth500 maxwidth300onsmartphone">';

-

-		// Show select fields as tags.

-		$ret .= '<div name="divsearch_component_params" class="noborderbottom search_component_params inline-block valignmiddle">';

-

-		if ($search_component_params_hidden) {

-			// Split the criteria on each AND

-			//var_dump($search_component_params_hidden);

-

-			$nbofchars = dol_strlen($search_component_params_hidden);

-			$arrayofandtags = array();

-			$i = 0;

-			$s = '';

-			$countparenthesis = 0;

-			while ($i < $nbofchars) {

-				$char = dol_substr($search_component_params_hidden, $i, 1);

-

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

-					$countparenthesis++;

-				} elseif ($char == ')') {

-					$countparenthesis--;

-				}

-

-				if ($countparenthesis == 0) {

-					$char2 = dol_substr($search_component_params_hidden, $i+1, 1);

-					$char3 = dol_substr($search_component_params_hidden, $i+2, 1);

-					if ($char == 'A' && $char2 == 'N' && $char3 == 'D') {

-						// We found a AND

-						$arrayofandtags[] = trim($s);

-						$s = '';

-						$i+=2;

-					} else {

-						$s .= $char;

-					}

-				} else {

-					$s .= $char;

-				}

-				$i++;

-			}

-			if ($s) {

-				$arrayofandtags[] = trim($s);

-			}

-

-			// Show each AND part

-			foreach ($arrayofandtags as $tmpkey => $tmpval) {

-				$errormessage = '';

-				$searchtags = forgeSQLFromUniversalSearchCriteria($tmpval, $errormessage, 1, 1);

-				if ($errormessage) {

-					$this->error = 'ERROR in parsing search string: '.$errormessage;

-				}

-				// Remove first and last parenthesis but only if first is the opening and last the closing of the same group

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

-				$searchtags = removeGlobalParenthesis($searchtags);

-

-				$ret .= '<span class="marginleftonlyshort valignmiddle tagsearch" data-ufilterid="'.($tmpkey+1).'" data-ufilter="'.dol_escape_htmltag($tmpval).'">';

-				$ret .= '<span class="tagsearchdelete select2-selection__choice__remove" data-ufilterid="'.($tmpkey+1).'">x</span> ';

-				$ret .= dol_escape_htmltag($searchtags);

-				$ret .= '</span>';

-			}

-		}

-

-		//$ret .= '<button type="submit" class="liste_titre button_search paddingleftonly" name="button_search_x" value="x"><span class="fa fa-search"></span></button>';

-

-		//$ret .= search_component_params

-		//$texttoshow = '<div class="opacitymedium inline-block search_component_searchtext">'.$langs->trans("Search").'</div>';

-		//$ret .= '<div class="search_component inline-block valignmiddle">'.$texttoshow.'</div>';

-

-		$show_search_component_params_hidden = 1;

-		if ($show_search_component_params_hidden) {

-			$ret .= '<input type="hidden" name="show_search_component_params_hidden" value="1">';

-		}

-		$ret .= "<!-- We store the full Universal Search String into this field. For example: (t.ref:like:'SO-%') AND ((t.ref:like:'CO-%') OR (t.ref:like:'AA%')) -->";

-		$ret .= '<input type="hidden" name="search_component_params_hidden" value="' . dol_escape_htmltag($search_component_params_hidden) . '">';

-		// $ret .= "<!-- sql= ".forgeSQLFromUniversalSearchCriteria($search_component_params_hidden, $errormessage)." -->";

-

-		// For compatibility with forms that show themself the search criteria in addition of this component, we output these fields

-		foreach ($arrayofcriterias as $criterias) {

-			foreach ($criterias as $criteriafamilykey => $criteriafamilyval) {

-				if (in_array('search_' . $criteriafamilykey, $arrayofinputfieldsalreadyoutput)) {

-					continue;

-				}

-				if (in_array($criteriafamilykey, array('rowid', 'ref_ext', 'entity', 'extraparams'))) {

-					continue;

-				}

-				if (in_array($criteriafamilyval['type'], array('date', 'datetime', 'timestamp'))) {

-					$ret .= '<input type="hidden" name="search_' . $criteriafamilykey . '_start">';

-					$ret .= '<input type="hidden" name="search_' . $criteriafamilykey . '_startyear">';

-					$ret .= '<input type="hidden" name="search_' . $criteriafamilykey . '_startmonth">';

-					$ret .= '<input type="hidden" name="search_' . $criteriafamilykey . '_startday">';

-					$ret .= '<input type="hidden" name="search_' . $criteriafamilykey . '_end">';

-					$ret .= '<input type="hidden" name="search_' . $criteriafamilykey . '_endyear">';

-					$ret .= '<input type="hidden" name="search_' . $criteriafamilykey . '_endmonth">';

-					$ret .= '<input type="hidden" name="search_' . $criteriafamilykey . '_endday">';

-				} else {

-					$ret .= '<input type="hidden" name="search_' . $criteriafamilykey . '">';

-				}

-			}

-		}

-

-		$ret .= '</div>';

-

-		$ret .= "<!-- Field to enter a generic filter string: t.ref:like:'SO-%', t.date_creation:<:'20160101', t.date_creation:<:'2016-01-01 12:30:00', t.nature:is:NULL, t.field2:isnot:NULL -->\n";

-		$ret .= '<input type="text" placeholder="' . $langs->trans("Search") . '" name="search_component_params_input" class="noborderbottom search_component_input" value="">';

-

-		$ret .= '</div>';

-		$ret .= '</div>';

-

-		$ret .= '<script>

-		jQuery(".tagsearchdelete").click(function() {

-			var filterid = $(this).parents().data("ufilterid");

-			console.log("We click to delete a criteria nb "+filterid);

-			// TODO Update the search_component_params_hidden with all data-ufilter except the one delete and post page

-

-		});

-		</script>

-		';

-

-

-		return $ret;

-	}

-

-	/**

-	 * selectModelMail

-	 *

-	 * @param 	string 	$prefix 		Prefix

-	 * @param	string 	$modelType 		Model type

-	 * @param 	int 	$default 		1=Show also Default mail template

-	 * @param 	int 	$addjscombo 	Add js combobox

-	 * @return  string                	HTML select string

-	 */

-	public function selectModelMail($prefix, $modelType = '', $default = 0, $addjscombo = 0)

-	{

-		global $langs, $user;

-

-		$retstring = '';

-

-		$TModels = array();

-

-		include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';

-		$formmail = new FormMail($this->db);

-		$result = $formmail->fetchAllEMailTemplate($modelType, $user, $langs);

-

-		if ($default) {

-			$TModels[0] = $langs->trans('DefaultMailModel');

-		}

-		if ($result > 0) {

-			foreach ($formmail->lines_model as $model) {

-				$TModels[$model->id] = $model->label;

-			}

-		}

-

-		$retstring .= '<select class="flat" id="select_' . $prefix . 'model_mail" name="' . $prefix . 'model_mail">';

-

-		foreach ($TModels as $id_model => $label_model) {

-			$retstring .= '<option value="' . $id_model . '"';

-			$retstring .= ">" . $label_model . "</option>";

-		}

-

-		$retstring .= "</select>";

-

-		if ($addjscombo) {

-			$retstring .= ajax_combobox('select_' . $prefix . 'model_mail');

-		}

-

-		return $retstring;

-	}

-

-	/**

-	 * Output the buttons to submit a creation/edit form

-	 *

-	 * @param 	string 	$save_label 		Alternative label for save button

-	 * @param 	string 	$cancel_label 		Alternative label for cancel button

-	 * @param 	array 	$morebuttons 		Add additional buttons between save and cancel

-	 * @param 	bool 	$withoutdiv 		Option to remove enclosing centered div

-	 * @param 	string 	$morecss 			More CSS

-	 * @param 	string 	$dol_openinpopup 	If the button are shown in a context of a page shown inside a popup, we put here the string name of popup.

-	 * @return  string                      Html code with the buttons

-	 */

-	public function buttonsSaveCancel($save_label = 'Save', $cancel_label = 'Cancel', $morebuttons = array(), $withoutdiv = false, $morecss = '', $dol_openinpopup = '')

-	{

-		global $langs;

-

-		$buttons = array();

-

-		$save = array(

-			'name' => 'save',

-			'label_key' => $save_label,

-		);

-

-		if ($save_label == 'Create' || $save_label == 'Add') {

-			$save['name'] = 'add';

-		} elseif ($save_label == 'Modify') {

-			$save['name'] = 'edit';

-		}

-

-		$cancel = array(

-			'name' => 'cancel',

-			'label_key' => 'Cancel',

-		);

-

-		!empty($save_label) ? $buttons[] = $save : '';

-

-		if (!empty($morebuttons)) {

-			$buttons[] = $morebuttons;

-		}

-

-		!empty($cancel_label) ? $buttons[] = $cancel : '';

-

-		$retstring = $withoutdiv ? '' : '<div class="center">';

-

-		foreach ($buttons as $button) {

-			$addclass = empty($button['addclass']) ? '' : $button['addclass'];

-			$retstring .= '<input type="submit" class="button button-' . $button['name'] . ($morecss ? ' ' . $morecss : '') . ' ' . $addclass . '" name="' . $button['name'] . '" value="' . dol_escape_htmltag($langs->trans($button['label_key'])) . '">';

-		}

-		$retstring .= $withoutdiv ? '' : '</div>';

-

-		if ($dol_openinpopup) {

-			$retstring .= '<!-- buttons are shown into a $dol_openinpopup=' . $dol_openinpopup . ' context, so we enable the close of dialog on cancel -->' . "\n";

-			$retstring .= '<script nonce="' . getNonce() . '">';

-			$retstring .= 'jQuery(".button-cancel").click(function(e) {

-				e.preventDefault(); console.log(\'We click on cancel in iframe popup ' . $dol_openinpopup . '\');

-				window.parent.jQuery(\'#idfordialog' . $dol_openinpopup . '\').dialog(\'close\');

-				 });';

-			$retstring .= '</script>';

-		}

-

-		return $retstring;

-	}

-

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-

-	/**

-	* Load into cache list of invoice subtypes

-	*

-	* @return int             Nb of lines loaded, <0 if KO

-	*/

-	public function load_cache_invoice_subtype()

-	{

-		// phpcs:enable

-		global $langs;

-

-		$num = count($this->cache_invoice_subtype);

-		if ($num > 0) {

-			return 0; // Cache already loaded

-		}

-

-		dol_syslog(__METHOD__, LOG_DEBUG);

-

-		$sql = "SELECT rowid, code, label as label";

-		$sql .= " FROM " . MAIN_DB_PREFIX . 'c_invoice_subtype';

-		$sql .= " WHERE active = 1";

-

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

-		if ($resql) {

-			$num = $this->db->num_rows($resql);

-			$i = 0;

-			while ($i < $num) {

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

-

-				// If translation exists, we use it, otherwise we take the default wording

-				$label = ($langs->trans("InvoiceSubtype" . $obj->rowid) != "InvoiceSubtype" . $obj->rowid) ? $langs->trans("InvoiceSubtype" . $obj->rowid) : (($obj->label != '-') ? $obj->label : '');

-				$this->cache_invoice_subtype[$obj->rowid]['rowid'] = $obj->rowid;

-				$this->cache_invoice_subtype[$obj->rowid]['code'] = $obj->code;

-				$this->cache_invoice_subtype[$obj->rowid]['label'] = $label;

-				$i++;

-			}

-

-			$this->cache_invoice_subtype = dol_sort_array($this->cache_invoice_subtype, 'code', 'asc', 0, 0, 1);

-

-			return $num;

-		} else {

+		}

+		else

+		{

@@ -10953,43 +8198,51 @@
-

-	/**

-	* Return list of invoice subtypes.

-	*

-	* @param int    $selected     Id of invoice subtype to preselect by default

-	* @param string $htmlname     Select field name

-	* @param int    $addempty     Add an empty entry

-	* @param int    $noinfoadmin  0=Add admin info, 1=Disable admin info

-	* @param string $morecss       Add more CSS on select tag

-	* @return string  String for the HTML select component

-	*/

-	public function getSelectInvoiceSubtype($selected = 0, $htmlname = 'subtypeid', $addempty = 0, $noinfoadmin = 0, $morecss = '')

-	{

-		global $langs, $user;

-

-		$out = '';

-		dol_syslog(__METHOD__ . " selected=" . $selected . ", htmlname=" . $htmlname, LOG_DEBUG);

-

-		$this->load_cache_invoice_subtype();

-

-		$out .= '<select id="' . $htmlname . '" class="flat selectsubtype' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '">';

-		if ($addempty) {

-			$out .= '<option value="0">&nbsp;</option>';

-		}

-

-		foreach ($this->cache_invoice_subtype as $rowid => $subtype) {

-			$label = $subtype['label'];

-			$out .= '<option value="' . $subtype['rowid'] . '"';

-			if ($selected == $subtype['rowid']) {

-				$out .= ' selected="selected"';

-			}

-			$out .= '>';

-			$out .= $label;

-			$out .= '</option>';

-		}

-

-		$out .= '</select>';

-		if ($user->admin && empty($noinfoadmin)) {

-			$out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

-		}

-		$out .= ajax_combobox($htmlname);

-

-		return $out;

+	/**

+	 * Output the component to make advanced search criteries

+	 *

+	 * @param	array		$arrayofcriterias			          Array of available search criterias. Example: array($object->element => $object->fields, 'otherfamily' => otherarrayoffields, ...)

+	 * @param	array		$search_component_params	          Array of selected search criterias

+	 * @param   array       $arrayofinputfieldsalreadyoutput      Array of input fields already inform. The component will not generate a hidden input field if it is in this list.

+	 * @return	string									          HTML component for advanced search

+	 */

+	public function searchComponent($arrayofcriterias, $search_component_params, $arrayofinputfieldsalreadyoutput = array())

+	{

+	    global $conf, $langs;

+

+		$ret = '';

+

+		$ret .= '<div class="nowrap centpercent">';

+		//$ret .= '<button type="submit" class="liste_titre button_removefilter" name="button_removefilter_x" value="x"><span class="fa fa-remove"></span></button>';

+		$ret .= '<a href="#" class="dropdownsearch-toggle unsetcolor paddingright">';

+		$ret .= '<span class="fas fa-filter linkobject boxfilter" title="Filter" id="idsubimgproductdistribution"></span>';

+		$ret .= $langs->trans("Filters");

+		$ret .= '</a>';

+		//$ret .= '<button type="submit" class="liste_titre button_search paddingleftonly" name="button_search_x" value="x"><span class="fa fa-search"></span></button>';

+		$ret .= '<div name="search_component_params" class="search_component_params inline-block minwidth500 maxwidth300onsmartphone valignmiddle">';

+		$texttoshow = '<div class="opacitymedium inline-block search_component_searchtext">'.$langs->trans("Search").'</div>';

+

+		$ret .= '<div class="search_component inline-block valignmiddle">'.$texttoshow.'</div>';

+		$ret .= '</div>';

+		$ret .= '<input type="hidden" name="search_component_params_hidden" class="search_component_params_hidden" value="'.GETPOST("search_component_params_hidden").'">';

+		// For compatibility with forms that show themself the search criteria in addition of this component, we output the fields

+		foreach ($arrayofcriterias as $criterias) {

+		    foreach ($criterias as $criteriafamilykey => $criteriafamilyval) {

+		    	if (in_array('search_'.$criteriafamilykey, $arrayofinputfieldsalreadyoutput)) continue;

+		        if (in_array($criteriafamilykey, array('rowid', 'ref_ext', 'entity', 'extraparams'))) continue;

+		        if (in_array($criteriafamilyval['type'], array('date', 'datetime', 'timestamp'))) {

+		            $ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_start">';

+		            $ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_startyear">';

+		            $ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_startmonth">';

+		            $ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_startday">';

+		            $ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_end">';

+		            $ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_endyear">';

+		            $ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_endmonth">';

+		            $ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_endday">';

+		        }

+		        else {

+					$ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'">';

+		        }

+		    }

+		}

+        $ret .= '</div>';

+

+

+		return $ret;

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_html.formaccounting.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_html.formaccounting.class.php
@@ -34,0 +35 @@
+

@@ -38,3 +39,3 @@
-	 * @var DoliDB Database handler.

-	 */

-	public $db;

+     * @var DoliDB Database handler.

+     */

+    public $db;

@@ -47,11 +48 @@
-	/**

-	 * @var int Nb of accounts found

-	 */

-	public $nbaccounts;

-	/**

-	 * @var int Nb of accounts category found

-	 */

-	public $nbaccounts_category;

-

-

-	/**

+    /**

@@ -64,4 +55,4 @@
-		$this->db = $db;

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+	    $this->db = $db;

+	}

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -71 +62 @@
-	 * @param	string	$selectid	Preselected journal code

+	 * @param	string	$selectid	Preselected pcg_type

@@ -84 +75 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -89,5 +80,8 @@
-		$options = array();

-		if ($usecache && !empty($this->options_cache[$usecache])) {

-			$options = $this->options_cache[$usecache];

-			$selected = $selectid;

-		} else {

+    	$options = array();

+		if ($usecache && !empty($this->options_cache[$usecache]))

+		{

+		    $options = $this->options_cache[$usecache];

+		    $selected = $selectid;

+		}

+		else

+		{

@@ -95 +89 @@
-			$sql .= " FROM ".$this->db->prefix()."accounting_journal";

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

@@ -98,3 +92 @@
-			if ($nature && is_numeric($nature)) {

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

-			}

+			if ($nature && is_numeric($nature))   $sql .= " AND nature = ".$nature;

@@ -112 +104 @@
-			$selected = 0;

+    		$selected = 0;

@@ -114 +106,2 @@
-			while ($obj = $this->db->fetch_object($resql)) {

+			while ($obj = $this->db->fetch_object($resql))

+			{

@@ -117 +110 @@
-				$select_value_in = $obj->rowid;

+    			$select_value_in = $obj->rowid;

@@ -121,11 +114,11 @@
-				if ($select_in == 1) {

-					$select_value_in = $obj->code;

-				}

-				if ($select_out == 1) {

-					$select_value_out = $obj->code;

-				}

-				// Remember guy's we store in database llx_accounting_bookkeeping the code of accounting_journal and not the rowid

-				if ($selectid != '' && $selectid == $select_value_in) {

-					//var_dump("Found ".$selectid." ".$select_value_in);

-					$selected = $select_value_out;

-				}

+    			if ($select_in == 1) {

+    				$select_value_in = $obj->code;

+    			}

+    			if ($select_out == 1) {

+    				$select_value_out = $obj->code;

+    			}

+    			// Remember guy's we store in database llx_accounting_bookkeeping the code of accounting_journal and not the rowid

+    			if ($selectid != '' && $selectid == $select_value_in) {

+    			    //var_dump("Found ".$selectid." ".$select_value_in);

+    				$selected = $select_value_out;

+    			}

@@ -137 +130,2 @@
-			if ($usecache) {

+			if ($usecache)

+			{

@@ -147,106 +141,29 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 * Return list of journals with label by nature

-	 *

-	 * @param	array	$selectedIds		Preselected journal code array

-	 * @param	string	$htmlname			Name of field in html form

-	 * @param	int		$nature				Limit the list to a particular type of journals (1:various operations / 2:sale / 3:purchase / 4:bank / 9: has-new)

-	 * @param	int		$showempty			Add an empty field

-	 * @param	int		$select_in			0=selectid value is the journal rowid (default) or 1=selectid is journal code

-	 * @param	int		$select_out			Set value returned by select. 0=rowid (default), 1=code

-	 * @param	string	$morecss			More css non HTML object

-	 * @param	string	$usecache			Key to use to store result into a cache. Next call with same key will reuse the cache.

-	 * @param   int     $disabledajaxcombo 	Disable ajax combo box.

-	 * @return	string						String with HTML select

-	 */

-	public function multi_select_journal($selectedIds = array(), $htmlname = 'journal', $nature = 0, $showempty = 0, $select_in = 0, $select_out = 0, $morecss = '', $usecache = '', $disabledajaxcombo = 0)

-	{

-		// phpcs:enable

-		global $conf, $langs;

-

-		$out = '';

-

-		$options = array();

-		if ($usecache && !empty($this->options_cache[$usecache])) {

-			$options = $this->options_cache[$usecache];

-			$selected = $selectedIds;

-		} else {

-			$sql = "SELECT rowid, code, label, nature, entity, active";

-			$sql .= " FROM ".$this->db->prefix()."accounting_journal";

-			$sql .= " WHERE active = 1";

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

-			if ($nature && is_numeric($nature)) {

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

-			}

-			$sql .= " ORDER BY code";

-

-			dol_syslog(get_class($this)."::multi_select_journal", LOG_DEBUG);

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

-

-			if (!$resql) {

-				$this->error = "Error ".$this->db->lasterror();

-				dol_syslog(get_class($this)."::multi_select_journal ".$this->error, LOG_ERR);

-				return -1;

-			}

-

-			$selected = array();

-			$langs->load('accountancy');

-			while ($obj = $this->db->fetch_object($resql)) {

-				$label = $langs->trans($obj->label);

-

-				$select_value_in = $obj->rowid;

-				$select_value_out = $obj->rowid;

-

-				// Try to guess if we have found default value

-				if ($select_in == 1) {

-					$select_value_in = $obj->code;

-				}

-				if ($select_out == 1) {

-					$select_value_out = $obj->code;

-				}

-				// Remember guy's we store in database llx_accounting_bookkeeping the code of accounting_journal and not the rowid

-				if (!empty($selectedIds) && in_array($select_value_in, $selectedIds)) {

-					//var_dump("Found ".$selectid." ".$select_value_in);

-					$selected[] = $select_value_out;

-				}

-				$options[$select_value_out] = $label;

-			}

-			$this->db->free($resql);

-

-			if ($usecache) {

-				$this->options_cache[$usecache] = $options;

-			}

-		}

-

-		$out .= Form::multiselectarray($htmlname, $options, $selected, $showempty, 0, $morecss, 0, 0, 0, 'code_journal', '', ($disabledajaxcombo ? 0 : 1));

-

-		return $out;

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 *	Return list of accounting category.

-	 * 	Use mysoc->country_id or mysoc->country_code so they must be defined.

-	 *

-	 *	@param	string	$selected       Preselected type

-	 *	@param  string	$htmlname       Name of field in form

-	 * 	@param	int		$useempty		Set to 1 if we want an empty value

-	 * 	@param	int		$maxlen			Max length of text in combo box

-	 * 	@param	int		$help			Add or not the admin help picto

-	 *  @param  int     $allcountries   All countries

-	 * 	@return	string					HTML component with the select

-	 */

-	public function select_accounting_category($selected = '', $htmlname = 'account_category', $useempty = 0, $maxlen = 0, $help = 1, $allcountries = 0)

-	{

-		// phpcs:enable

-		global $langs, $mysoc;

-

-		if (empty($mysoc->country_id) && empty($mysoc->country_code) && empty($allcountries)) {

-			dol_print_error('', 'Call to select_accounting_account with mysoc country not yet defined');

-			exit;

-		}

-

-		if (!empty($mysoc->country_id)) {

-			$sql = "SELECT c.rowid, c.label as type, c.range_account";

-			$sql .= " FROM ".$this->db->prefix()."c_accounting_category as c";

-			$sql .= " WHERE c.active = 1";

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     *	Return list of accounting category.

+     * 	Use mysoc->country_id or mysoc->country_code so they must be defined.

+     *

+     *	@param	string	$selected       Preselected type

+     *	@param  string	$htmlname       Name of field in form

+     * 	@param	int		$useempty		Set to 1 if we want an empty value

+     * 	@param	int		$maxlen			Max length of text in combo box

+     * 	@param	int		$help			Add or not the admin help picto

+     *  @param  int     $allcountries   All countries

+     * 	@return	void

+     */

+    public function select_accounting_category($selected = '', $htmlname = 'account_category', $useempty = 0, $maxlen = 0, $help = 1, $allcountries = 0)

+    {

+        // phpcs:enable

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

+

+        if (empty($mysoc->country_id) && empty($mysoc->country_code) && empty($allcountries))

+        {

+            dol_print_error('', 'Call to select_accounting_account with mysoc country not yet defined');

+            exit;

+        }

+

+        if (!empty($mysoc->country_id))

+        {

+            $sql = "SELECT c.rowid, c.label as type, c.range_account";

+            $sql .= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c";

+            $sql .= " WHERE c.active = 1";

@@ -254,8 +171,8 @@
-			if (empty($allcountries)) {

-				$sql .= " AND c.fk_country = ".((int) $mysoc->country_id);

-			}

-			$sql .= " ORDER BY c.label ASC";

-		} else {

-			$sql = "SELECT c.rowid, c.label as type, c.range_account";

-			$sql .= " FROM ".$this->db->prefix()."c_accounting_category as c, ".$this->db->prefix()."c_country as co";

-			$sql .= " WHERE c.active = 1";

+            if (empty($allcountries)) $sql .= " AND c.fk_country = ".$mysoc->country_id;

+            $sql .= " ORDER BY c.label ASC";

+        }

+        else

+        {

+            $sql = "SELECT c.rowid, c.label as type, c.range_account";

+            $sql .= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c, ".MAIN_DB_PREFIX."c_country as co";

+            $sql .= " WHERE c.active = 1";

@@ -264,53 +181,43 @@
-			if (empty($allcountries)) {

-				$sql .= " AND co.code = '".$this->db->escape($mysoc->country_code)."'";

-			}

-			$sql .= " ORDER BY c.label ASC";

-		}

-

-		$this->nbaccounts_category = 0;

-

-		dol_syslog(get_class($this).'::'.__METHOD__, LOG_DEBUG);

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

-		if ($resql) {

-			$num = $this->db->num_rows($resql);

-			if ($num) {

-				$this->nbaccounts_category = $num;

-

-				$out = '<select class="flat minwidth200" id="'.$htmlname.'" name="'.$htmlname.'">';

-				$i = 0;

-

-				if ($useempty) {

-					$out .= '<option value="0">&nbsp;</option>';

-				}

-				while ($i < $num) {

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

-

-					$titletoshowhtml = ($maxlen ? dol_trunc($obj->type, $maxlen) : $obj->type).($obj->range_account ? ' <span class="opacitymedium">('.$obj->range_account.')</span>' : '');

-					$titletoshow = ($maxlen ? dol_trunc($obj->type, $maxlen) : $obj->type).($obj->range_account ? ' ('.$obj->range_account.')' : '');

-

-					$out .= '<option value="'.$obj->rowid.'"';

-					if ($obj->rowid == $selected) {

-						$out .= ' selected';

-					}

-					//$out .= ' data-html="'.dol_escape_htmltag(dol_string_onlythesehtmltags($titletoshowhtml, 1, 0, 0, 0, array('span'))).'"';

-					$out .= ' data-html="'.dolPrintHTMLForAttribute($titletoshowhtml).'"';

-					$out .= '>';

-					$out .= dol_escape_htmltag($titletoshow);

-					$out .= '</option>';

-					$i++;

-				}

-				$out .= '</select>';

-				//if ($user->admin && $help) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);

-			} else {

-				$out = $langs->trans("ErrorNoAccountingCategoryForThisCountry", $mysoc->country_code, $langs->transnoentitiesnoconv("Accounting"), $langs->transnoentitiesnoconv("Setup"), $langs->transnoentitiesnoconv("AccountingCategories"));

-			}

-		} else {

-			dol_print_error($this->db);

-		}

-

-		$out .= ajax_combobox($htmlname, array());

-

-		return $out;

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+            if (empty($allcountries)) $sql .= " AND co.code = '".$mysoc->country_code."'";

+            $sql .= " ORDER BY c.label ASC";

+        }

+

+        dol_syslog(get_class($this).'::'.__METHOD__, LOG_DEBUG);

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

+        if ($resql)

+        {

+            $num = $db->num_rows($resql);

+            if ($num)

+            {

+                $out = '<select class="flat minwidth200" id="'.$htmlname.'" name="'.$htmlname.'">';

+                $i = 0;

+

+                if ($useempty) $out .= '<option value="0">&nbsp;</option>';

+                while ($i < $num)

+                {

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

+                    $out .= '<option value="'.$obj->rowid.'"';

+                    if ($obj->rowid == $selected) $out .= ' selected';

+                    $out .= '>'.($maxlen ? dol_trunc($obj->type, $maxlen) : $obj->type);

+					$out .= ' ('.$obj->range_account.')';

+                    $i++;

+                }

+                $out .= '</select>';

+                //if ($user->admin && $help) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);

+            }

+            else

+            {

+                $out .= $langs->trans("ErrorNoAccountingCategoryForThisCountry", $mysoc->country_code);

+            }

+        }

+        else

+        {

+            dol_print_error($db, $db->lasterror());

+        }

+

+        $out .= ajax_combobox($htmlname, array());

+

+        print $out;

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -320,7 +227,7 @@
-	 * @param 	string 		$htmlname       Name of select field

-	 * @param 	string 		$selectedkey    Value

-	 * @return 	string|int                  HTML edit field

-	 */

-	public function select_bookkeeping_importkey($htmlname = 'importkey', $selectedkey = '')

-	{

-		// phpcs:enable

+	 * @param string $htmlname         Name of select field

+	 * @param string $selectedkey      Value

+	 * @return string                  HTML edit field

+	 */

+    public function select_bookkeeping_importkey($htmlname = 'importkey', $selectedkey = '')

+    {

+        // phpcs:enable

@@ -329,2 +236,2 @@
-		$sql = "SELECT DISTINCT import_key FROM ".$this->db->prefix()."accounting_bookkeeping";

-		$sql .= " WHERE entity IN (".getEntity('accountancy').")";

+		$sql = 'SELECT DISTINCT import_key from '.MAIN_DB_PREFIX.'accounting_bookkeeping';

+	    $sql .= " WHERE entity IN (".getEntity('accountancy').")";

@@ -349 +256 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -353,12 +260,11 @@
-	 * @param string   		$selectid          	Preselected id of accounting accounts (depends on $select_in)

-	 * @param string   		$htmlname          	Name of HTML field id. If name start with '.', it is name of HTML css class, so several component with same name in different forms can be used.

-	 * @param int|string    $showempty         	1=Add an empty field, 2=Add an empty field+'None' field

-	 * @param array    		$event             	Event options

-	 * @param int      		$select_in         	0=selectid value is a aa.rowid (default) or 1=selectid is aa.account_number

-	 * @param int      		$select_out        	Set value returned by select. 0=rowid (default), 1=account_number

-	 * @param string   		$morecss           	More css non HTML object

-	 * @param string   		$usecache          	Key to use to store result into a cache. Next call with same key will reuse the cache.

-	 * @param string		$active				Filter on status active or not: '0', '1' or '' for no filter

-	 * @return string       	               	String with HTML select

-	 */

-	public function select_account($selectid, $htmlname = 'account', $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $morecss = 'minwidth100 maxwidth300 maxwidthonsmartphone', $usecache = '', $active = '1')

+	 * @param string   $selectid           Preselected id of accounting accounts (depends on $select_in)

+	 * @param string   $htmlname           Name of HTML field id. If name start with '.', it is name of HTML css class, so several component with same name in different forms can be used.

+	 * @param int      $showempty          1=Add an empty field, 2=Add an empty field+'None' field

+	 * @param array    $event              Event options

+	 * @param int      $select_in          0=selectid value is a aa.rowid (default) or 1=selectid is aa.account_number

+	 * @param int      $select_out         Set value returned by select. 0=rowid (default), 1=account_number

+	 * @param string   $morecss            More css non HTML object

+	 * @param string   $usecache           Key to use to store result into a cache. Next call with same key will reuse the cache.

+	 * @return string                      String with HTML select

+	 */

+	public function select_account($selectid, $htmlname = 'account', $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $morecss = 'maxwidth300 maxwidthonsmartphone', $usecache = '')

@@ -366 +272 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -373,68 +279,109 @@
-		$options = array();

-

-		if ($showempty == 2) {

-			$options['0'] = '--- '.$langs->trans("None").' ---';

-		}

-

-		if ($usecache && !empty($this->options_cache[$usecache])) {

-			$options = $options + $this->options_cache[$usecache]; // We use + instead of array_merge because we don't want to reindex key from 0

-			$selected = $selectid;

-		} else {

-			$trunclength = getDolGlobalInt('ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT', 50);

-

-			$sql = "SELECT DISTINCT aa.account_number, aa.label, aa.labelshort, aa.rowid, aa.fk_pcg_version";

-			$sql .= " FROM ".$this->db->prefix()."accounting_account as aa";

-			$sql .= " INNER JOIN ".$this->db->prefix()."accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";

-			$sql .= " AND asy.rowid = ".((int) getDolGlobalInt('CHARTOFACCOUNTS'));

-			if ($active === '1') {

-				$sql .= " AND aa.active = 1";

-			} elseif ($active === '0') {

-				$sql .= " AND aa.active = 0";

-			}

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

-			$sql .= " ORDER BY aa.account_number";

-

-			dol_syslog(get_class($this)."::select_account", LOG_DEBUG);

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

-

-			if (!$resql) {

-				$this->error = "Error ".$this->db->lasterror();

-				dol_syslog(get_class($this)."::select_account ".$this->error, LOG_ERR);

-				return -1;

-			}

-

-			$num_rows = $this->db->num_rows($resql);

-

-			if ($num_rows == 0 && getDolGlobalInt('CHARTOFACCOUNTS') <= 0) {

-				$langs->load("errors");

-				$showempty = $langs->trans("ErrorYouMustFirstSetupYourChartOfAccount");

-			} else {

-				$selected = $selectid; // selectid can be -1, 0, 123

-				while ($obj = $this->db->fetch_object($resql)) {

-					if (empty($obj->labelshort)) {

-						$labeltoshow = $obj->label;

-					} else {

-						$labeltoshow = $obj->labelshort;

-					}

-

-					$label = length_accountg($obj->account_number).' - '.$labeltoshow;

-					$label = dol_trunc($label, $trunclength);

-

-					$select_value_in = $obj->rowid;

-					$select_value_out = $obj->rowid;

-

-					// Try to guess if we have found default value

-					if ($select_in == 1) {

-						$select_value_in = $obj->account_number;

-					}

-					if ($select_out == 1) {

-						$select_value_out = $obj->account_number;

-					}

-					// Remember guy's we store in database llx_facturedet the rowid of accounting_account and not the account_number

-					// Because same account_number can be share between different accounting_system and do have the same meaning

-					if ($selectid != '' && $selectid == $select_value_in) {

-						//var_dump("Found ".$selectid." ".$select_value_in);

-						$selected = $select_value_out;

-					}

-

-					$options[$select_value_out] = $label;

+    	$options = array();

+

+    	if ($showempty == 2)

+    	{

+    		$options['0'] = '--- '.$langs->trans("None").' ---';

+    	}

+

+		if ($usecache && !empty($this->options_cache[$usecache]))

+		{

+		    $options = $options + $this->options_cache[$usecache]; // We use + instead of array_merge because we don't want to reindex key from 0

+		    $selected = $selectid;

+		}

+		else

+		{

+    		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT) ? 50 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT;

+

+    		$sql = "SELECT DISTINCT aa.account_number, aa.label, aa.labelshort, aa.rowid, aa.fk_pcg_version";

+    		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as aa";

+    		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";

+    		$sql .= " AND asy.rowid = ".$conf->global->CHARTOFACCOUNTS;

+    		$sql .= " AND aa.active = 1";

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

+    		$sql .= " ORDER BY aa.account_number";

+

+    		dol_syslog(get_class($this)."::select_account", LOG_DEBUG);

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

+

+    		if (!$resql) {

+    			$this->error = "Error ".$this->db->lasterror();

+    			dol_syslog(get_class($this)."::select_account ".$this->error, LOG_ERR);

+    			return -1;

+    		}

+

+    		$selected = $selectid; // selectid can be -1, 0, 123

+    		while ($obj = $this->db->fetch_object($resql))

+    		{

+				if (empty($obj->labelshort))

+				{

+					$labeltoshow = $obj->label;

+				}

+				else

+				{

+					$labeltoshow = $obj->labelshort;

+				}

+

+				$label = length_accountg($obj->account_number).' - '.$labeltoshow;

+				$label = dol_trunc($label, $trunclength);

+

+    			$select_value_in = $obj->rowid;

+    			$select_value_out = $obj->rowid;

+

+    			// Try to guess if we have found default value

+    			if ($select_in == 1) {

+    				$select_value_in = $obj->account_number;

+    			}

+    			if ($select_out == 1) {

+    				$select_value_out = $obj->account_number;

+    			}

+    			// Remember guy's we store in database llx_facturedet the rowid of accounting_account and not the account_number

+    			// Because same account_number can be share between different accounting_system and do have the same meaning

+    			if ($selectid != '' && $selectid == $select_value_in) {

+    			    //var_dump("Found ".$selectid." ".$select_value_in);

+    				$selected = $select_value_out;

+    			}

+

+    			$options[$select_value_out] = $label;

+    		}

+    		$this->db->free($resql);

+

+    		if ($usecache)

+    		{

+                $this->options_cache[$usecache] = $options;

+                unset($this->options_cache[$usecache]['0']);

+    		}

+		}

+

+		$out .= Form::selectarray($htmlname, $options, $selected, ($showempty > 0 ? 1 : 0), 0, 0, '', 0, 0, 0, '', $morecss, 1);

+

+		return $out;

+	}

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+	/**

+	 * Return list of auxilary thirdparty accounts

+	 *

+	 * @param string   $selectid       Preselected pcg_type

+	 * @param string   $htmlname       Name of field in html form

+	 * @param int      $showempty      Add an empty field

+	 * @param string   $morecss        More css

+	 * @return string                  String with HTML select

+	 */

+    public function select_auxaccount($selectid, $htmlname = 'account_num_aux', $showempty = 0, $morecss = 'maxwidth200')

+    {

+        // phpcs:enable

+

+		$aux_account = array();

+

+		// Auxiliary customer account

+		$sql = "SELECT DISTINCT code_compta, nom ";

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

+	    $sql .= " WHERE entity IN (".getEntity('societe').")";

+		$sql .= " ORDER BY code_compta";

+

+		dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);

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

+		if ($resql) {

+			while ($obj = $this->db->fetch_object($resql)) {

+				if (!empty($obj->code_compta)) {

+					$aux_account[$obj->code_compta] = $obj->code_compta.' ('.$obj->nom.')';

@@ -443,6 +390,19 @@
-

-			$this->db->free($resql);

-

-			if ($usecache) {

-				$this->options_cache[$usecache] = $options;

-				unset($this->options_cache[$usecache]['0']);

+		} else {

+			$this->error = "Error ".$this->db->lasterror();

+			dol_syslog(get_class($this)."::select_auxaccount ".$this->error, LOG_ERR);

+			return -1;

+		}

+		$this->db->free($resql);

+

+		// Auxiliary supplier account

+		$sql = "SELECT DISTINCT code_compta_fournisseur, nom ";

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

+		$sql .= " WHERE entity IN (".getEntity('societe').")";

+		$sql .= " ORDER BY code_compta_fournisseur";

+		dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);

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

+		if ($resql) {

+			while ($obj = $this->db->fetch_object($resql)) {

+				if ($obj->code_compta_fournisseur != "") {

+					$aux_account[$obj->code_compta_fournisseur] = $obj->code_compta_fournisseur.' ('.$obj->nom.')';

+				}

@@ -450,6 +410,29 @@
-		}

-

-

-		$out .= Form::selectarray($htmlname, $options, $selected, ($showempty ? (is_numeric($showempty) ? 1 : $showempty) : 0), 0, 0, '', 0, 0, 0, '', $morecss, 1);

-

-		$this->nbaccounts = count($options) - ($showempty == 2 ? 1 : 0);

+		} else {

+			$this->error = "Error ".$this->db->lasterror();

+			dol_syslog(get_class($this)."::select_auxaccount ".$this->error, LOG_ERR);

+			return -1;

+		}

+		$this->db->free($resql);

+

+        // Auxiliary user account

+        $sql = "SELECT DISTINCT accountancy_code, lastname, firstname ";

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

+        $sql .= " WHERE entity IN (".getEntity('user').")";

+        $sql .= " ORDER BY accountancy_code";

+        dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);

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

+        if ($resql) {

+            while ($obj = $this->db->fetch_object($resql)) {

+                if (!empty($obj->accountancy_code)) {

+                    $aux_account[$obj->accountancy_code] = $obj->accountancy_code.' ('.dolGetFirstLastname($obj->firstname, $obj->lastname).')';

+                }

+            }

+        } else {

+            $this->error = "Error ".$this->db->lasterror();

+            dol_syslog(get_class($this)."::select_auxaccount ".$this->error, LOG_ERR);

+            return -1;

+        }

+        $this->db->free($resql);

+

+		// Build select

+		$out .= Form::selectarray($htmlname, $aux_account, $selectid, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, 1);

@@ -460,96 +443 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 * Return list of auxilary accounts. Cumulate list from customers, suppliers and users.

-	 *

-	 * @param string   		$selectid       Preselected pcg_type

-	 * @param string   		$htmlname       Name of field in html form

-	 * @param int|string    $showempty      Add an empty field

-	 * @param string   		$morecss        More css

-	 * @param string   		$usecache       Key to use to store result into a cache. Next call with same key will reuse the cache.

-	 * @param string		$labelhtmlname	HTML name of label for autofill of account from name.

-	 * @return string       	   			String with HTML select

-	 */

-	public function select_auxaccount($selectid, $htmlname = 'account_num_aux', $showempty = 0, $morecss = 'minwidth100 maxwidth300 maxwidthonsmartphone', $usecache = '', $labelhtmlname = '')

-	{

-		// phpcs:enable

-		global $conf;

-

-		$aux_account = array();

-

-		if ($usecache && !empty($this->options_cache[$usecache])) {

-			$aux_account = $aux_account + $this->options_cache[$usecache]; // We use + instead of array_merge because we don't want to reindex key from 0

-		} else {

-			dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);

-

-			// Auxiliary thirdparties account

-			$sql = "SELECT code_compta, code_compta_fournisseur, nom as name";

-			$sql .= " FROM ".$this->db->prefix()."societe";

-			$sql .= " WHERE entity IN (".getEntity('societe').")";

-			$sql .= " AND (client IN (1,3) OR fournisseur = 1)";

-

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

-			if ($resql) {

-				while ($obj = $this->db->fetch_object($resql)) {

-					if (!empty($obj->code_compta)) {

-						$aux_account[$obj->code_compta] = $obj->code_compta.' <span class="opacitymedium">('.$obj->name.')</span>';

-					}

-					if (!empty($obj->code_compta_fournisseur)) {

-						$aux_account[$obj->code_compta_fournisseur] = $obj->code_compta_fournisseur.' <span class="opacitymedium">('.$obj->name.')</span>';

-					}

-				}

-			} else {

-				$this->error = "Error ".$this->db->lasterror();

-				dol_syslog(get_class($this)."::select_auxaccount ".$this->error, LOG_ERR);

-				return -1;

-			}

-

-			ksort($aux_account);

-

-			$this->db->free($resql);

-

-			// Auxiliary user account

-			$sql = "SELECT DISTINCT accountancy_code, lastname, firstname ";

-			$sql .= " FROM ".$this->db->prefix()."user";

-			$sql .= " WHERE entity IN (".getEntity('user').")";

-			$sql .= " ORDER BY accountancy_code";

-

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

-			if ($resql) {

-				while ($obj = $this->db->fetch_object($resql)) {

-					if (!empty($obj->accountancy_code)) {

-						$aux_account[$obj->accountancy_code] = $obj->accountancy_code.' <span class="opacitymedium">('.dolGetFirstLastname($obj->firstname, $obj->lastname).')</span>';

-					}

-				}

-			} else {

-				$this->error = "Error ".$this->db->lasterror();

-				dol_syslog(get_class($this)."::select_auxaccount ".$this->error, LOG_ERR);

-				return -1;

-			}

-			$this->db->free($resql);

-

-			if ($usecache) {

-				$this->options_cache[$usecache] = $aux_account;

-			}

-		}

-

-		// Build select

-		$out = '';

-		$out .= Form::selectarray($htmlname, $aux_account, $selectid, ($showempty ? (is_numeric($showempty) ? 1 : $showempty) : 0), 0, 0, '', 0, 0, 0, '', $morecss, 1);

-		//automatic filling if we give the name of the subledger_label input

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

-			$out .= '<script nonce="'.getNonce().'">

-				jQuery(document).ready(() => {

-					$("#'.$htmlname.'").on("select2:select", function(e) {

-						var regExp = /\(([^)]+)\)/;

-						const match = regExp.exec(e.params.data.text);

-						$(\'input[name="'.dol_escape_js($labelhtmlname).'"]\').val(match[1]);

-					});

-				});

-

-			</script>';

-		}

-

-		return $out;

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -567,2 +455,2 @@
-		// phpcs:enable

-		global $conf;

+        // phpcs:enable

+	    global $conf;

@@ -573,2 +461,2 @@
-		$sql .= " FROM ".$this->db->prefix()."accounting_bookkeeping";

-		$sql .= " WHERE entity IN (".getEntity('accountancy').")";

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

+	    $sql .= " WHERE entity IN (".getEntity('accountancy').")";

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_html.formactions.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_html.formactions.class.php
@@ -23 +23 @@
- *      \brief      File of class with predefined functions and HTML components

+ *      \brief      Fichier de la classe des fonctions predefinie de composants html actions

@@ -32,6 +32,6 @@
-	/**

-	 * @var DoliDB Database handler.

-	 */

-	public $db;

-

-	/**

+    /**

+     * @var DoliDB Database handler.

+     */

+    public $db;

+

+    /**

@@ -43 +43 @@
-	/**

+    /**

@@ -46,32 +46,32 @@
-	 *  @param      DoliDB		$db      Database handler

-	 */

-	public function __construct($db)

-	{

-		$this->db = $db;

-	}

-

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 *  Show list of action status

-	 *

-	 * 	@param	string	$formname		Name of form where select is included

-	 * 	@param	string	$selected		Preselected value (-1..100)

-	 * 	@param	int		$canedit		1=can edit, 0=read only

-	 *  @param  string	$htmlname   	Name of html prefix for html fields (selectX and valX)

-	 *  @param	integer	$showempty		Show an empty line if select is used

-	 *  @param	integer	$onlyselect		0=Standard, 1=Hide percent of completion and force usage of a select list, 2=Same than 1 and add "Incomplete (Todo+Running)

-	 *  @param  string  $morecss        More css on select field

-	 * 	@return	void

-	 */

-	public function form_select_status_action($formname, $selected, $canedit = 1, $htmlname = 'complete', $showempty = 0, $onlyselect = 0, $morecss = 'maxwidth100')

-	{

-		// phpcs:enable

-		global $langs, $conf;

-

-		$listofstatus = array(

-			'na' => $langs->trans("ActionNotApplicable"),

-			'0' => $langs->trans("ActionsToDoShort"),

-			'50' => $langs->trans("ActionRunningShort"),

-			'100' => $langs->trans("ActionDoneShort")

-		);

+     *  @param      DoliDB		$db      Database handler

+     */

+    public function __construct($db)

+    {

+        $this->db = $db;

+    }

+

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     *  Show list of action status

+     *

+     * 	@param	string	$formname		Name of form where select is included

+     * 	@param	string	$selected		Preselected value (-1..100)

+     * 	@param	int		$canedit		1=can edit, 0=read only

+     *  @param  string	$htmlname   	Name of html prefix for html fields (selectX and valX)

+     *  @param	integer	$showempty		Show an empty line if select is used

+     *  @param	integer	$onlyselect		0=Standard, 1=Hide percent of completion and force usage of a select list, 2=Same than 1 and add "Incomplete (Todo+Running)

+     *  @param  string  $morecss        More css on select field

+     * 	@return	void

+     */

+    public function form_select_status_action($formname, $selected, $canedit = 1, $htmlname = 'complete', $showempty = 0, $onlyselect = 0, $morecss = 'maxwidth100')

+    {

+        // phpcs:enable

+        global $langs, $conf;

+

+        $listofstatus = array(

+            '-1' => $langs->trans("ActionNotApplicable"),

+            '0' => $langs->trans("ActionsToDoShort"),

+            '50' => $langs->trans("ActionRunningShort"),

+            '100' => $langs->trans("ActionDoneShort")

+        );

@@ -80,4 +80,4 @@
-		if (!empty($conf->use_javascript_ajax)) {

-			print "\n";

-			print '<script nonce="'.getNonce().'" type="text/javascript">';

-			print "

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

+        {

+            print "\n";

+            print "<script type=\"text/javascript\">

@@ -90 +89,0 @@
-						console.log('We change field select '+htmlname);

@@ -92,0 +92,4 @@
+                    // FIXME use another method for update combobox

+                    //$('#val' + htmlname).change(function() {

+                        //select_status();

+                    //});

@@ -97 +99,0 @@
-					console.log('val='+defaultvalue);

@@ -99 +101 @@
-                    var selected = '".(isset($selected) ? dol_escape_js($selected) : '')."';

+                    var selected = '".(isset($selected) ? $selected : '')."';

@@ -104 +106 @@
-                    if (defaultvalue == 'na' || defaultvalue == -1) {

+                    if (defaultvalue == -1) {

@@ -119 +121 @@
-                    	if (defaultvalue == 50 && (percentage.val() == 0 || percentage.val() == 100)) { percentage.val(50); }

+                    	if (defaultvalue == 50 && (percentage.val() == 0 || percentage.val() == 100)) { percentage.val(50) };

@@ -125,5 +127,81 @@
-		}

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

-			//var_dump($selected);

-			if ($selected == 'done') {

-				$selected = '100';

+        }

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

+        {

+        	//var_dump($selected);

+        	if ($selected == 'done') $selected = '100';

+            print '<select '.($canedit ? '' : 'disabled ').'name="'.$htmlname.'" id="select'.$htmlname.'" class="flat'.($morecss ? ' '.$morecss : '').'">';

+            if ($showempty) print '<option value=""'.($selected == '' ? ' selected' : '').'></option>';

+            foreach ($listofstatus as $key => $val)

+            {

+                print '<option value="'.$key.'"'.(($selected == $key && strlen($selected) == strlen($key)) || (($selected > 0 && $selected < 100) && $key == '50') ? ' selected' : '').'>'.$val.'</option>';

+                if ($key == '50' && $onlyselect == 2)

+                {

+                	print '<option value="todo"'.($selected == 'todo' ? ' selected' : '').'>'.$langs->trans("ActionUncomplete").' ('.$langs->trans("ActionsToDoShort")."+".$langs->trans("ActionRunningShort").')</option>';

+                }

+            }

+            print '</select>';

+            if ($selected == 0 || $selected == 100) $canedit = 0;

+

+            if (empty($onlyselect))

+            {

+	            print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat hideifna" value="'.($selected >= 0 ? $selected : '').'" size="2"'.($canedit && ($selected >= 0) ? '' : ' disabled').'>';

+    	        print '<span class="hideonsmartphone hideifna">%</span>';

+            }

+        }

+        else

+		{

+            print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat" value="'.($selected >= 0 ? $selected : '').'" size="2"'.($canedit ? '' : ' disabled').'>%';

+        }

+    }

+

+

+    /**

+     *  Show list of actions for element

+     *

+     *  @param	Object	$object					Object

+     *  @param  string	$typeelement			'invoice','propal','order','invoice_supplier','order_supplier','fichinter'

+     *	@param	int		$socid					Socid of user

+     *  @param	int		$forceshowtitle			Show title even if there is no actions to show

+     *  @param  string  $morecss        		More css on table

+     *  @param	int		$max					Max number of record

+     *  @param	string	$moreparambacktopage	More param for the backtopage

+     *  @param	string	$morehtmlcenter			More html text on center of title line

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

+     */

+    public function showactions($object, $typeelement, $socid = 0, $forceshowtitle = 0, $morecss = 'listactions', $max = 0, $moreparambacktopage = '', $morehtmlcenter = '')

+    {

+        global $langs, $conf, $user;

+

+        require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';

+

+        $sortfield = 'a.datep,a.id';

+        $sortorder = 'DESC,DESC';

+

+        $listofactions = ActionComm::getActions($this->db, $socid, $object->id, $typeelement, '', $sortfield, $sortorder, ($max ? ($max + 1) : 0));

+        if (!is_array($listofactions)) dol_print_error($this->db, 'FailedToGetActions');

+

+        $num = count($listofactions);

+        if ($num || $forceshowtitle)

+        {

+        	if ($typeelement == 'invoice')               $title = $langs->trans('ActionsOnBill');

+        	elseif ($typeelement == 'invoice_supplier' || $typeelement == 'supplier_invoice') $title = $langs->trans('ActionsOnBill');

+        	elseif ($typeelement == 'propal')            $title = $langs->trans('ActionsOnPropal');

+        	elseif ($typeelement == 'supplier_proposal') $title = $langs->trans('ActionsOnSupplierProposal');

+        	elseif ($typeelement == 'order')             $title = $langs->trans('ActionsOnOrder');

+        	elseif ($typeelement == 'order_supplier' || $typeelement == 'supplier_order')   $title = $langs->trans('ActionsOnOrder');

+        	elseif ($typeelement == 'shipping')          $title = $langs->trans('ActionsOnShipping');

+            elseif ($typeelement == 'fichinter')         $title = $langs->trans('ActionsOnFicheInter');

+            elseif ($typeelement == 'project')           $title = $langs->trans('LatestLinkedEvents', $max ? $max : '');

+            elseif ($typeelement == 'task')              $title = $langs->trans('LatestLinkedEvents', $max ? $max : '');

+            elseif ($typeelement == 'member')            $title = $langs->trans('LatestLinkedEvents', $max ? $max : '');

+            else $title = $langs->trans("LatestLinkedEvents", $max ? $max : '');

+

+            $urlbacktopage = $_SERVER['PHP_SELF'].'?id='.$object->id.($moreparambacktopage ? '&'.$moreparambacktopage : '');

+

+            $projectid = $object->fk_project;

+            if ($typeelement == 'project') $projectid = $object->id;

+

+            $newcardbutton = '';

+            if (!empty($conf->agenda->enabled) && !empty($user->rights->agenda->myactions->create))

+			{

+                $newcardbutton .= dolGetButtonTitle($langs->trans("AddEvent"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.dol_print_date(dol_now(), 'dayhourlog').'&origin='.$typeelement.'&originid='.$object->id.($object->socid > 0 ? '&socid='.$object->socid : ($socid > 0 ? '&socid='.$socid : '')).($projectid > 0 ? '&projectid='.$projectid : '').'&backtopage='.urlencode($urlbacktopage));

@@ -131,125 +209,34 @@
-			print '<select '.($canedit ? '' : 'disabled ').'name="'.$htmlname.'" id="select'.$htmlname.'" class="flat'.($morecss ? ' '.$morecss : '').'">';

-			if ($showempty) {

-				print '<option value="-1"'.($selected == '' ? ' selected' : '').'>&nbsp;</option>';

-			}

-			foreach ($listofstatus as $key => $val) {

-				print '<option value="'.$key.'"'.(($selected == $key && strlen($selected) == strlen($key)) || (($selected > 0 && $selected < 100) && $key == '50') ? ' selected' : '').'>'.$val.'</option>';

-				if ($key == '50' && $onlyselect == 2) {

-					print '<option value="todo"'.($selected == 'todo' ? ' selected' : '').'>'.$langs->trans("ActionUncomplete").' ('.$langs->trans("ActionsToDoShort")."+".$langs->trans("ActionRunningShort").')</option>';

-				}

-			}

-			print '</select>';

-			if ($selected == 0 || $selected == 100) {

-				$canedit = 0;

-			}

-

-			print ajax_combobox('select'.$htmlname, array(), 0, 0, 'resolve', '-1', $morecss);

-

-			if (empty($onlyselect)) {

-				print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat hideifna" value="'.($selected >= 0 ? $selected : '').'" size="2"'.($canedit && ($selected >= 0) ? '' : ' disabled').'>';

-				print '<span class="hideonsmartphone hideifna">%</span>';

-			}

-		} else {

-			print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat" value="'.($selected >= 0 ? $selected : '').'" size="2"'.($canedit ? '' : ' disabled').'>%';

-		}

-	}

-

-

-	/**

-	 *  Show list of actions for element

-	 *

-	 *  @param	Object	$object					Object

-	 *  @param  string	$typeelement			'invoice', 'propal', 'order', 'invoice_supplier', 'order_supplier', 'fichinter'

-	 *	@param	int		$socid					Socid of user

-	 *  @param	int		$forceshowtitle			Show title even if there is no actions to show

-	 *  @param  string  $morecss        		More css on table

-	 *  @param	int		$max					Max number of record

-	 *  @param	string	$moreparambacktopage	More param for the backtopage

-	 *  @param	string	$morehtmlcenter			More html text on center of title line

-	 *  @param	int		$assignedtouser			Assign event by default to this user id (will be ignored if not enough permissions)

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

-	 */

-	public function showactions($object, $typeelement, $socid = 0, $forceshowtitle = 0, $morecss = 'listactions', $max = 0, $moreparambacktopage = '', $morehtmlcenter = '', $assignedtouser = 0)

-	{

-		global $langs, $conf, $user;

-

-		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';

-

-		$sortfield = 'a.datep,a.id';

-		$sortorder = 'DESC,DESC';

-

-		$actioncomm = new ActionComm($this->db);

-		$listofactions = $actioncomm->getActions($socid, $object->id, $typeelement, '', $sortfield, $sortorder, ($max ? ($max + 1) : 0));

-		if (!is_array($listofactions)) {

-			dol_print_error($this->db, 'FailedToGetActions');

-		}

-

-		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';

-		$caction = new CActionComm($this->db);

-		$arraylist = $caction->liste_array(1, 'code', '', (!getDolGlobalString('AGENDA_USE_EVENT_TYPE') ? 1 : 0), '', 1);

-

-		$num = count($listofactions);

-		if ($num || $forceshowtitle) {

-			$title = $langs->trans("LatestLinkedEvents", $max ? $max : '');

-

-			$urlbacktopage = $_SERVER['PHP_SELF'].'?id='.$object->id.($moreparambacktopage ? '&'.$moreparambacktopage : '');

-

-			$projectid = $object->fk_project;

-			if ($typeelement == 'project') {

-				$projectid = $object->id;

-			}

-			$taskid = 0;

-			if ($typeelement == 'task') {

-				$taskid = $object->id;

-			}

-

-			$usercanaddaction = 0;

-			if (empty($assignedtouser) || $assignedtouser == $user->id) {

-				$usercanaddaction = $user->hasRight('agenda', 'myactions', 'create');

-				$assignedtouser = 0;

-			} else {

-				$usercanaddaction = $user->hasRight('agenda', 'allactions', 'create');

-			}

-

-			$newcardbutton = '';

-			if (isModEnabled('agenda') && $usercanaddaction) {

-				$url = DOL_URL_ROOT.'/comm/action/card.php?action=create&token='.newToken().'&datep='.urlencode(dol_print_date(dol_now(), 'dayhourlog', 'tzuser'));

-				$url .= '&origin='.urlencode($typeelement).'&originid='.((int) $object->id).((!empty($object->socid) && $object->socid > 0) ? '&socid='.((int) $object->socid) : ((!empty($socid) && $socid > 0) ? '&socid='.((int) $socid) : ''));

-				$url .= ($projectid > 0 ? '&projectid='.((int) $projectid) : '').($taskid > 0 ? '&taskid='.((int) $taskid) : '');

-				$url .= ($assignedtouser > 0 ? '&assignedtouser='.$assignedtouser : '');

-				$url .= '&backtopage='.urlencode($urlbacktopage);

-				$newcardbutton .= dolGetButtonTitle($langs->trans("AddEvent"), '', 'fa fa-plus-circle', $url);

-			}

-

-			print '<!-- formactions->showactions -->'."\n";

-			print load_fiche_titre($title, $newcardbutton, '', 0, 0, '', $morehtmlcenter);

-

-			$page = 0;

-			$param = '';

-

-			print '<div class="div-table-responsive-no-min">';

-			print '<table class="centpercent noborder'.($morecss ? ' '.$morecss : '').'">';

-			print '<tr class="liste_titre">';

-			print getTitleFieldOfList('Ref', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);

-			print getTitleFieldOfList('By', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);

-			print getTitleFieldOfList('Type', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);

-			print getTitleFieldOfList('Title', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);

-			print getTitleFieldOfList('Date', 0, $_SERVER["PHP_SELF"], 'a.datep', $page, $param, '', $sortfield, $sortorder, 'center ', 1);

-			print getTitleFieldOfList('', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, 'right ', 1);

-			print '</tr>';

-			print "\n";

-

-			if (is_array($listofactions) && count($listofactions)) {

-				$cacheusers = array();

-

-				$cursorevent = 0;

-				foreach ($listofactions as $actioncomm) {

-					if ($max && $cursorevent >= $max) {

-						break;

-					}

-

-					print '<tr class="oddeven">';

-

-					// Ref

-					print '<td class="nowraponall">'.$actioncomm->getNomUrl(1, -1).'</td>';

-

+

+

+        	print '<!-- formactions->showactions -->'."\n";

+        	print load_fiche_titre($title, $newcardbutton, '', 0, 0, '', $morehtmlcenter);

+

+        	$page = 0; $param = '';

+

+        	print '<div class="div-table-responsive-no-min">';

+        	print '<table class="centpercent noborder'.($morecss ? ' '.$morecss : '').'">';

+        	print '<tr class="liste_titre">';

+        	print getTitleFieldOfList('Ref', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);

+        	print getTitleFieldOfList('By', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);

+        	print getTitleFieldOfList('Type', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);

+        	print getTitleFieldOfList('Title', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);

+        	print getTitleFieldOfList('Date', 0, $_SERVER["PHP_SELF"], 'a.datep', $page, $param, '', $sortfield, $sortorder, 'center ', 1);

+        	print getTitleFieldOfList('', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, 'right ', 1);

+        	print '</tr>';

+        	print "\n";

+

+        	if (is_array($listofactions) && count($listofactions))

+        	{

+        		$cacheusers = array();

+

+	        	$cursorevent = 0;

+	        	foreach ($listofactions as $actioncomm)

+	        	{

+	        		if ($max && $cursorevent >= $max) break;

+

+	        		$ref = $actioncomm->getNomUrl(1, -1);

+	        		$label = $actioncomm->getNomUrl(0, 38);

+

+	        		print '<tr class="oddeven">';

+	        		// Ref

+					print '<td class="nowraponall">'.$ref.'</td>';

@@ -257,8 +244,28 @@
-					print '<td class="nowraponall tdoverflowmax125">';

-					if (!empty($actioncomm->userownerid)) {

-						if (isset($cacheusers[$actioncomm->userownerid]) && is_object($cacheusers[$actioncomm->userownerid])) {

-							$tmpuser = $cacheusers[$actioncomm->userownerid];

-						} else {

-							$tmpuser = new User($this->db);

-							$tmpuser->fetch($actioncomm->userownerid);

-							$cacheusers[$actioncomm->userownerid] = $tmpuser;

+	        		print '<td class="tdoverflowmax150">';

+	        		if (!empty($actioncomm->userownerid))

+	        		{

+	        			if (is_object($cacheusers[$actioncomm->userownerid]))

+	        			{

+	        				$tmpuser = $cacheusers[$actioncomm->userownerid];

+	        			}

+	        			else

+	        			{

+	        				$tmpuser = new User($this->db);

+	        				$tmpuser->fetch($actioncomm->userownerid);

+	        				$cacheusers[$actioncomm->userownerid] = $tmpuser;

+	        			}

+	        			if ($tmpuser->id > 0)

+	        			{

+	        				print $tmpuser->getNomUrl(-1, '', 0, 0, 16, 0, 'firstelselast', '');

+	        			}

+	        		}

+	        		print '</td>';

+

+					// Type

+	        		print '<td>';

+	        		// TODO Code common with code into comm/action/list.php

+					$imgpicto = '';

+					if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))

+					{

+						if ($actioncomm->type_picto) {

+							$imgpicto = img_picto('', $actioncomm->type_picto);

@@ -266,2 +273,8 @@
-						if ($tmpuser->id > 0) {

-							print $tmpuser->getNomUrl(-1, '', 0, 0, 16, 0, 'firstelselast', '');

+						else {

+							if ($actioncomm->type_code == 'AC_RDV')         $imgpicto = img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright').' ';

+							elseif ($actioncomm->type_code == 'AC_TEL')     $imgpicto = img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright').' ';

+							elseif ($actioncomm->type_code == 'AC_FAX')     $imgpicto = img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright').' ';

+							elseif ($actioncomm->type_code == 'AC_EMAIL')   $imgpicto = img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright').' ';

+							elseif ($actioncomm->type_code == 'AC_INT')     $imgpicto = img_picto('', 'object_intervention', '', false, 0, 0, '', 'paddingright').' ';

+							elseif ($actioncomm->type_code == 'AC_OTH' && $actioncomm->code == 'TICKET_MSG') $imgpicto = img_picto('', 'object_conversation', '', false, 0, 0, '', 'paddingright').' ';

+							elseif (!preg_match('/_AUTO/', $actioncomm->type_code)) $imgpicto = img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').' ';

@@ -270,12 +283,5 @@
-					print '</td>';

-

-					$actionstatic = $actioncomm;

-

-					// Example: Email sent from invoice card

-					//$actionstatic->code = 'AC_BILL_SENTBYMAIL

-					//$actionstatic->type_code = 'AC_OTHER_AUTO'

-

-					// Type

-					$labeltype = $actionstatic->type_code;

-					if (!getDolGlobalString('AGENDA_USE_EVENT_TYPE') && empty($arraylist[$labeltype])) {

-						$labeltype = 'AC_OTH';

+					print $imgpicto;

+					if ($actioncomm->type_code == 'AC_OTH' && $actioncomm->code == 'TICKET_MSG') {

+						print $langs->trans("Message");

+					} else {

+						print $actioncomm->type_short ? $actioncomm->type_short : $actioncomm->type;

@@ -283,51 +289,86 @@
-					if (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

-						}

-					}

-					print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($labeltype).'">';

-					print $actioncomm->getTypePicto();

-					print $labeltype;

-					print '</td>';

-

-					// Label

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

-					print $actioncomm->getNomUrl(0);

-					print '</td>';

-

-					// Date

-					print '<td class="center nowraponall">'.dol_print_date($actioncomm->datep, 'dayhour', 'tzuserrel');

-					if ($actioncomm->datef) {

-						$tmpa = dol_getdate($actioncomm->datep);

-						$tmpb = dol_getdate($actioncomm->datef);

-						if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) {

-							if ($tmpa['hours'] != $tmpb['hours'] || $tmpa['minutes'] != $tmpb['minutes']) {

-								print '-'.dol_print_date($actioncomm->datef, 'hour', 'tzuserrel');

-							}

-						} else {

-							print '-'.dol_print_date($actioncomm->datef, 'dayhour', 'tzuserrel');

-						}

-					}

-					print '</td>';

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

-					print $actioncomm->getLibStatut(3);

-					print '</td>';

-					print '</tr>';

-

-					$cursorevent++;

-				}

-			} else {

-				print '<tr class="oddeven"><td colspan="6"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';

-			}

-

-			if ($max && $num > $max) {

-				print '<tr class="oddeven"><td colspan="6"><span class="opacitymedium">'.$langs->trans("More").'...</span></td></tr>';

-			}

-

-			print '</table>';

-			print '</div>';

+	        		print '</td>';

+	        		// Label

+	        		print '<td>'.$label.'</td>';

+	        		// Date

+	        		print '<td class="center">'.dol_print_date($actioncomm->datep, 'dayhour', 'tzuserrel');

+	        		if ($actioncomm->datef)

+	        		{

+		        		$tmpa = dol_getdate($actioncomm->datep);

+		        		$tmpb = dol_getdate($actioncomm->datef);

+		        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year'])

+		        		{

+		        			if ($tmpa['hours'] != $tmpb['hours'] || $tmpa['minutes'] != $tmpb['minutes'] && $tmpa['seconds'] != $tmpb['seconds']) print '-'.dol_print_date($actioncomm->datef, 'hour', 'tzuserrel');

+		        		}

+		        		else print '-'.dol_print_date($actioncomm->datef, 'dayhour', 'tzuserrel');

+	        		}

+	        		print '</td>';

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

+        			print $actioncomm->getLibStatut(3);

+	        		print '</td>';

+	        		print '</tr>';

+

+	        		$cursorevent++;

+	        	}

+        	}

+        	else

+        	{

+        		print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';

+        	}

+

+        	if ($max && $num > $max)

+        	{

+        		print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("More").'...</td></tr>';

+        	}

+

+        	print '</table>';

+        	print '</div>';

+        }

+

+        return $num;

+    }

+

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     *  Output html select list of type of event

+     *

+     *  @param	array|string	$selected       Type pre-selected (can be 'manual', 'auto' or 'AC_xxx'). Can be an array too.

+     *  @param  string		    $htmlname       Name of select field

+     *  @param	string		    $excludetype	A type to exclude ('systemauto', 'system', '')

+     *  @param	integer		    $onlyautoornot	1=Group all type AC_XXX into 1 line AC_MANUAL. 0=Keep details of type, -1=Keep details and add a combined line "All manual"

+     *  @param	int		        $hideinfohelp	1=Do not show info help, 0=Show, -1=Show+Add info to tell how to set default value

+     *  @param  int		        $multiselect    1=Allow multiselect of action type

+     *  @param  int             $nooutput       1=No output

+     *  @param	string			$morecss		More css to add to SELECT component.

+     * 	@return	string

+     */

+    public function select_type_actions($selected = '', $htmlname = 'actioncode', $excludetype = '', $onlyautoornot = 0, $hideinfohelp = 0, $multiselect = 0, $nooutput = 0, $morecss = '')

+    {

+        // phpcs:enable

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

+

+        if (!is_object($form)) $form = new Form($this->db);

+

+        require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';

+        require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';

+        $caction = new CActionComm($this->db);

+

+        // Suggest a list with manual events or all auto events

+        $arraylist = $caction->liste_array(1, 'code', $excludetype, $onlyautoornot);

+        if (empty($multiselect)) {

+            // Add empty line at start only if no multiselect

+            array_unshift($arraylist, '&nbsp;');

+        }

+        //asort($arraylist);

+

+       	if ($selected == 'manual') $selected = 'AC_OTH';

+       	if ($selected == 'auto')   $selected = 'AC_OTH_AUTO';

+

+       	if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO)) unset($arraylist['AC_OTH_AUTO']);

+

+       	$out = '';

+

+		if (!empty($multiselect))

+		{

+	        if (!is_array($selected) && !empty($selected)) $selected = explode(',', $selected);

+			$out .= $form->multiselectarray($htmlname, $arraylist, $selected, 0, 0, 'centpercent', 0, 0);

@@ -335,26 +376,3 @@
-

-		return $num;

-	}

-

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 *  Output html select list of type of event

-	 *

-	 *  @param	array|string	$selected       Type pre-selected (can be 'manual', 'auto' or 'AC_xxx'). Can be an array too.

-	 *  @param  string		    $htmlname       Name of select field

-	 *  @param	string		    $excludetype	A type to exclude ('systemauto', 'system', '')

-	 *  @param	integer		    $onlyautoornot	1=Group all type AC_XXX into 1 line AC_MANUAL. 0=Keep details of type, -1=Keep details and add a combined line "All manual", -2=Combined line is disabled (not implemented yet)

-	 *  @param	int		        $hideinfohelp	1=Do not show info help, 0=Show, -1=Show+Add info to tell how to set default value

-	 *  @param  int		        $multiselect    1=Allow multiselect of action type

-	 *  @param  int             $nooutput       1=No output

-	 *  @param	string			$morecss		More css to add to SELECT component.

-	 * 	@return	string

-	 */

-	public function select_type_actions($selected = '', $htmlname = 'actioncode', $excludetype = '', $onlyautoornot = 0, $hideinfohelp = 0, $multiselect = 0, $nooutput = 0, $morecss = 'minwidth300')

-	{

-		// phpcs:enable

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

-

-		if (!is_object($form)) {

-			$form = new Form($this->db);

+		else

+		{

+			$out .= $form->selectarray($htmlname, $arraylist, $selected, 0, 0, 0, '', 0, 0, 0, '', 'minwidth200'.($morecss ? ' '.$morecss : ''), 1);

@@ -363,45 +381,9 @@
-		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';

-		require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';

-		$caction = new CActionComm($this->db);

-

-		// Suggest a list with manual events or all auto events

-		$arraylist = $caction->liste_array(1, 'code', $excludetype, $onlyautoornot, '', 0);		// If we use param 'all' instead of 'code', there is no group by include in answer but the key 'type' of answer array contains the key for the group by.

-		if (empty($multiselect)) {

-			// Add empty line at start only if no multiselect

-			array_unshift($arraylist, '&nbsp;');

-		}

-		//asort($arraylist);

-

-		if ($selected == 'manual') {

-			$selected = 'AC_OTH';

-		}

-		if ($selected == 'auto') {

-			$selected = 'AC_OTH_AUTO';

-		}

-

-		if (getDolGlobalString('AGENDA_ALWAYS_HIDE_AUTO')) {

-			unset($arraylist['AC_OTH_AUTO']);

-		}

-

-		$out = '';

-

-		if (!empty($multiselect)) {

-			if (!is_array($selected) && !empty($selected)) {

-				$selected = explode(',', $selected);

-			}

-			$out .= $form->multiselectarray($htmlname, $arraylist, $selected, 0, 0, 'centpercent', 0, 0);

-		} else {

-			$out .= $form->selectarray($htmlname, $arraylist, $selected, 0, 0, 0, '', 0, 0, 0, '', $morecss, 1);

-		}

-

-		if ($user->admin && empty($onlyautoornot) && $hideinfohelp <= 0) {

-			$out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup").($hideinfohelp == -1 ? ". ".$langs->trans("YouCanSetDefaultValueInModuleSetup") : ''), 1);

-		}

-

-		if ($nooutput) {

-			return $out;

-		} else {

-			print $out;

-		}

-		return '';

-	}

+        if ($user->admin && empty($onlyautoornot) && $hideinfohelp <= 0)

+        {

+            $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup").($hideinfohelp == -1 ? ". ".$langs->trans("YouCanSetDefaultValueInModuleSetup") : ''), 1);

+        }

+

+        if ($nooutput) return $out;

+        else print $out;

+        return '';

+    }

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_html.formadmin.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_html.formadmin.class.php
@@ -32,2 +32,2 @@
-	public $db;

-	public $error;

+    public $db;

+    public $error;

@@ -38,28 +38,28 @@
-	 *

-	 *  @param      DoliDB|null      $db      Database handler

-	 */

-	public function __construct($db)

-	{

-		$this->db = $db;

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 *  Return html select list with available languages (key='en_US', value='United States' for example)

-	 *

-	 *  @param      string|array	$selected       Language pre-selected. Can be an array if $multiselect is 1.

-	 *  @param      string			$htmlname       Name of HTML select

-	 *  @param      int				$showauto       Show 'auto' choice

-	 *  @param      array			$filter         Array of keys to exclude in list (opposite of $onlykeys)

-	 *  @param		int|string		$showempty		'1'=Add empty value or 'string to show'

-	 *  @param      int				$showwarning    Show a warning if language is not complete

-	 *  @param		int				$disabled		Disable edit of select

-	 *  @param		string			$morecss		Add more css styles

-	 *  @param      int         	$showcode       1=Add language code into label at begining, 2=Add language code into label at end

-	 *  @param		int				$forcecombo		Force to use combo box (so no ajax beautify effect)

-	 *  @param		int				$multiselect	Make the combo a multiselect

-	 *  @param		array			$onlykeys		Array of language keys to restrict list with the following keys (opposite of $filter). Example array('fr', 'es', ...)

-	 *  @param		int				$mainlangonly	1=Show only main languages ('fr_FR' no' fr_BE', 'es_ES' not 'es_MX', ...)

-	 *  @return		string							Return HTML select string with list of languages

-	 */

-	public function select_language($selected = '', $htmlname = 'lang_id', $showauto = 0, $filter = array(), $showempty = '', $showwarning = 0, $disabled = 0, $morecss = '', $showcode = 0, $forcecombo = 0, $multiselect = 0, $onlykeys = array(), $mainlangonly = 0)

+     *

+     *  @param      DoliDB      $db      Database handler

+     */

+    public function __construct($db)

+    {

+        $this->db = $db;

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     *  Return html select list with available languages (key='en_US', value='United States' for example)

+     *

+     *  @param      string		$selected       Language pre-selected

+     *  @param      string		$htmlname       Name of HTML select

+     *  @param      int			$showauto       Show 'auto' choice

+	 *  @param      array		$filter         Array of keys to exclude in list (opposite of $onlykeys)

+	 *  @param		string		$showempty		'1'=Add empty value or string to show

+	 *  @param      int			$showwarning    Show a warning if language is not complete

+	 *  @param		int			$disabled		Disable edit of select

+	 *  @param		string		$morecss		Add more css styles

+	 *  @param      int         $showcode       1=Add language code into label at begining, 2=Add language code into label at end

+     *  @param		int			$forcecombo		Force to use combo box (so no ajax beautify effect)

+     *  @param		int			$multiselect	Make the combo a multiselect

+     *  @param		array		$onlykeys		Show only the following keys (opposite of $filter). Example array('fr', 'es', ...)

+     *  @param		int			$mainlangonly	1=Show only main languages ('fr_FR' no' fr_BE', 'es_ES' not 'es_MX', ...)

+     *  @return		string						Return HTML select string with list of languages

+     */

+    public function select_language($selected = '', $htmlname = 'lang_id', $showauto = 0, $filter = null, $showempty = '', $showwarning = 0, $disabled = 0, $morecss = '', $showcode = 0, $forcecombo = 0, $multiselect = 0, $onlykeys = null, $mainlangonly = 0)

@@ -70,6 +70 @@
-		if (getDolGlobalString('MAIN_DEFAULT_LANGUAGE_FILTER')) {

-			if (!is_array($filter)) {

-				$filter = array();

-			}

-			$filter[getDolGlobalString('MAIN_DEFAULT_LANGUAGE_FILTER')] = 1;

-		}

+		if (!empty($conf->global->MAIN_DEFAULT_LANGUAGE_FILTER)) $filter[$conf->global->MAIN_DEFAULT_LANGUAGE_FILTER] = 1;

@@ -79,16 +73,0 @@
-		// If empty value is not allowed and the language to select is not inside the list of available language and we must find

-		// an alternative of the language code to pre-select (to avoid to have first element in list pre-selected).

-		if ($selected && empty($showempty)) {

-			if (!is_array($selected) && !array_key_exists($selected, $langs_available)) {

-				$tmparray = explode('_', $selected);

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

-					$selected = getLanguageCodeFromCountryCode($tmparray[1]);

-				}

-				if (empty($selected)) {

-					$selected = $langs->defaultlang;

-				}

-			} else {

-				// If the preselected value is an array, we do not try to find alternative to preselect

-			}

-		}

-

@@ -98,9 +77,4 @@
-		if ($showempty && !$multiselect) {

-			if (is_numeric($showempty)) {

-				$out .= '<option value="0"';

-			} else {

-				$out .= '<option value="-1"';

-			}

-			if ($selected === '') {

-				$out .= ' selected';

-			}

+		if ($showempty && !$multiselect)

+		{

+			$out .= '<option value="0"';

+			if ($selected == '') $out .= ' selected';

@@ -108,5 +82,2 @@
-			if ($showempty != '1') {

-				$out .= $showempty;

-			} else {

-				$out .= '&nbsp;';

-			}

+			if ($showempty != '1') $out .= $showempty;

+			else $out .= '&nbsp;';

@@ -115 +86,2 @@
-		if ($showauto) {

+		if ($showauto)

+		{

@@ -117,3 +89 @@
-			if ($selected === 'auto') {

-				$out .= ' selected';

-			}

+			if ($selected == 'auto') $out .= ' selected';

@@ -123,3 +93,4 @@
-		asort($langs_available);	// array('XX' => 'Language (Country)', ...)

-

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

+		asort($langs_available);

+

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

+		{

@@ -127,7 +98 @@
-			if ($showcode == 1) {

-				if ($mainlangonly) {

-					$valuetoshow = '<span class="opacitymedium">'.preg_replace('/[_-].*$/', '', $key).'</span> - '.$value;

-				} else {

-					$valuetoshow = '<span class="opacitymedium">'.$key.'</span> - '.$value;

-				}

-			}

+			if ($showcode == 1) $valuetoshow = $key.' - '.$value;

@@ -135,5 +100,2 @@
-				if ($mainlangonly) {

-					$valuetoshow = $value.' <span class="opacitymedium">('.preg_replace('/[_-].*$/', '', $key).')</span>';

-				} else {

-					$valuetoshow = $value.' <span class="opacitymedium">('.$key.')</span>';

-				}

+				if ($mainlangonly) $valuetoshow = $value.' ('.preg_replace('/[_-].*$/', '', $key).')';

+				else $valuetoshow = $value.' ('.$key.')';

@@ -143,3 +105 @@
-			if ($mainlangonly) {

-				$keytouse = preg_replace('/[_-].*$/', '', $key);

-			}

+			if ($mainlangonly) $keytouse = preg_replace('/[_-].*$/', '', $key);

@@ -154,5 +114,7 @@
-			$valuetoshow = picto_from_langcode($key, 'class="saturatemedium"').' '.$valuetoshow;

-			if ((is_string($selected) && (string) $selected == (string) $keytouse) || (is_array($selected) && in_array($keytouse, $selected))) {

-				$out .= '<option value="'.$keytouse.'" selected data-html="'.dol_escape_htmltag($valuetoshow).'">'.$valuetoshow.'</option>';

-			} else {

-				$out .= '<option value="'.$keytouse.'" data-html="'.dol_escape_htmltag($valuetoshow).'">'.$valuetoshow.'</option>';

+			if ($selected == $keytouse)

+			{

+				$out .= '<option value="'.$keytouse.'" selected>'.$valuetoshow.'</option>';

+			}

+			else

+			{

+				$out .= '<option value="'.$keytouse.'">'.$valuetoshow.'</option>';

@@ -164 +126,2 @@
-		if (!$forcecombo) {

+		if (!$forcecombo)

+		{

@@ -172,12 +135,12 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 *    Return list of available menus (eldy_backoffice, ...)

-	 *

-	 *    @param	string		$selected        Preselected menu value

-	 *    @param    string		$htmlname        Name of html select

-	 *    @param    array		$dirmenuarray    Array of directories to scan

-	 *    @param    string		$moreattrib      More attributes on html select tag

-	 *    @return	integer|null

-	 */

-	public function select_menu($selected, $htmlname, $dirmenuarray, $moreattrib = '')

-	{

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     *    Return list of available menus (eldy_backoffice, ...)

+     *

+     *    @param	string		$selected        Preselected menu value

+     *    @param    string		$htmlname        Name of html select

+     *    @param    array		$dirmenuarray    Array of directories to scan

+     *    @param    string		$moreattrib      More attributes on html select tag

+     *    @return	integer|null

+     */

+    public function select_menu($selected, $htmlname, $dirmenuarray, $moreattrib = '')

+    {

@@ -185,9 +148,7 @@
-		global $langs, $conf;

-

-		// Clean parameters

-

-

-		// Check parameters

-		if (!is_array($dirmenuarray)) {

-			return -1;

-		}

+        global $langs, $conf;

+

+        // Clean parameters

+

+

+        // Check parameters

+        if (!is_array($dirmenuarray)) return -1;

@@ -196,45 +157,42 @@
-		foreach ($conf->file->dol_document_root as $dirroot) {

-			foreach ($dirmenuarray as $dirtoscan) {

-				$dir = $dirroot.$dirtoscan;

-				//print $dir.'<br>';

-				if (is_dir($dir)) {

-					$handle = opendir($dir);

-					if (is_resource($handle)) {

-						while (($file = readdir($handle)) !== false) {

-							if (is_file($dir."/".$file) && substr($file, 0, 1) != '.' && substr($file, 0, 3) != 'CVS' && substr($file, 0, 5) != 'index') {

-								if (preg_match('/lib\.php$/i', $file)) {

-									continue; // We exclude library files

-								}

-								if (preg_match('/eldy_(backoffice|frontoffice)\.php$/i', $file)) {

-									continue; // We exclude all menu manager files

-								}

-								if (preg_match('/auguria_(backoffice|frontoffice)\.php$/i', $file)) {

-									continue; // We exclude all menu manager files

-								}

-								if (preg_match('/smartphone_(backoffice|frontoffice)\.php$/i', $file)) {

-									continue; // We exclude all menu manager files

-								}

-

-								$filelib = preg_replace('/\.php$/i', '', $file);

-								$prefix = '';

-								// 0=Recommanded, 1=Experimental, 2=Developpement, 3=Other

-								if (preg_match('/^eldy/i', $file)) {

-									$prefix = '0';

-								} elseif (preg_match('/^smartphone/i', $file)) {

-									$prefix = '2';

-								} else {

-									$prefix = '3';

-								}

-

-								if ($file == $selected) {

-									$menuarray[$prefix.'_'.$file] = '<option value="'.$file.'" selected>'.$filelib.'</option>';

-								} else {

-									$menuarray[$prefix.'_'.$file] = '<option value="'.$file.'">'.$filelib.'</option>';

-								}

-							}

-						}

-						closedir($handle);

-					}

-				}

-			}

-		}

+        foreach ($conf->file->dol_document_root as $dirroot)

+        {

+            foreach ($dirmenuarray as $dirtoscan)

+            {

+                $dir = $dirroot.$dirtoscan;

+                //print $dir.'<br>';

+                if (is_dir($dir))

+                {

+    	            $handle = opendir($dir);

+    	            if (is_resource($handle))

+    	            {

+    	                while (($file = readdir($handle)) !== false)

+    	                {

+    	                    if (is_file($dir."/".$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && substr($file, 0, 5) != 'index')

+    	                    {

+    	                        if (preg_match('/lib\.php$/i', $file)) continue; // We exclude library files

+    	                        if (preg_match('/eldy_(backoffice|frontoffice)\.php$/i', $file)) continue; // We exclude all menu manager files

+    	                        if (preg_match('/auguria_(backoffice|frontoffice)\.php$/i', $file)) continue; // We exclude all menu manager files

+    	                        if (preg_match('/smartphone_(backoffice|frontoffice)\.php$/i', $file)) continue; // We exclude all menu manager files

+

+    	                        $filelib = preg_replace('/\.php$/i', '', $file);

+    	        				$prefix = '';

+    	        				// 0=Recommanded, 1=Experimental, 2=Developpement, 3=Other

+    	        				if (preg_match('/^eldy/i', $file)) $prefix = '0';

+                                elseif (preg_match('/^smartphone/i', $file)) $prefix = '2';

+    	        				else $prefix = '3';

+

+    	                        if ($file == $selected)

+    	                        {

+    	        					$menuarray[$prefix.'_'.$file] = '<option value="'.$file.'" selected>'.$filelib.'</option>';

+    	                        }

+    	                        else

+    	                        {

+    	                            $menuarray[$prefix.'_'.$file] = '<option value="'.$file.'">'.$filelib.'</option>';

+    	                        }

+    	                    }

+    	                }

+    	                closedir($handle);

+    	            }

+                }

+            }

+        }

@@ -244,3 +202,4 @@
-		print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';

-		$oldprefix = '';

-		foreach ($menuarray as $key => $val) {

+        print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';

+        $oldprefix = '';

+		foreach ($menuarray as $key => $val)

+		{

@@ -249,7 +208,4 @@
-			if ($newprefix == '1' && (getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1)) {

-				continue;

-			}

-			if ($newprefix == '2' && (getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2)) {

-				continue;

-			}

-			if ($newprefix != $oldprefix) {	// Add separators

+			if ($newprefix == '1' && ($conf->global->MAIN_FEATURES_LEVEL < 1)) continue;

+			if ($newprefix == '2' && ($conf->global->MAIN_FEATURES_LEVEL < 2)) continue;

+			if ($newprefix != $oldprefix)	// Add separators

+			{

@@ -258,12 +214,4 @@
-				if ($newprefix == '0') {

-					print '-- '.$langs->trans("VersionRecommanded").' --';

-				}

-				if ($newprefix == '1') {

-					print '-- '.$langs->trans("VersionExperimental").' --';

-				}

-				if ($newprefix == '2') {

-					print '-- '.$langs->trans("VersionDevelopment").' --';

-				}

-				if ($newprefix == '3') {

-					print '-- '.$langs->trans("Other").' --';

-				}

+				if ($newprefix == '0') print '-- '.$langs->trans("VersionRecommanded").' --';

+                if ($newprefix == '1') print '-- '.$langs->trans("VersionExperimental").' --';

+				if ($newprefix == '2') print '-- '.$langs->trans("VersionDevelopment").' --';

+				if ($newprefix == '3') print '-- '.$langs->trans("Other").' --';

@@ -276,18 +224,18 @@
-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 *  Return combo list of available menu families

-	 *

-	 *  @param	string		$selected        Menu pre-selected

-	 *  @param	string		$htmlname        Name of html select

-	 *  @param	string[]	$dirmenuarray    Directories to scan

-	 *  @return	void

-	 */

-	public function select_menu_families($selected, $htmlname, $dirmenuarray)

-	{

-		// phpcs:enable

-		global $langs, $conf;

-

-		//$expdevmenu=array('smartphone_backoffice.php','smartphone_frontoffice.php');  // Menu to disable if $conf->global->MAIN_FEATURES_LEVEL is not set

-		$expdevmenu = array();

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     *  Return combo list of available menu families

+     *

+     *  @param	string		$selected        Menu pre-selected

+     *  @param	string		$htmlname        Name of html select

+     *  @param	string[]	$dirmenuarray    Directories to scan

+     *  @return	void

+     */

+    public function select_menu_families($selected, $htmlname, $dirmenuarray)

+    {

+        // phpcs:enable

+        global $langs, $conf;

+

+        //$expdevmenu=array('smartphone_backoffice.php','smartphone_frontoffice.php');  // Menu to disable if $conf->global->MAIN_FEATURES_LEVEL is not set

+        $expdevmenu = array();

@@ -297,33 +245,29 @@
-		foreach ($dirmenuarray as $dirmenu) {

-			foreach ($conf->file->dol_document_root as $dirroot) {

-				$dir = $dirroot.$dirmenu;

-				if (is_dir($dir)) {

-					$handle = opendir($dir);

-					if (is_resource($handle)) {

-						while (($file = readdir($handle)) !== false) {

-							if (is_file($dir."/".$file) && substr($file, 0, 1) != '.' && substr($file, 0, 3) != 'CVS') {

-								$filelib = preg_replace('/(_backoffice|_frontoffice)?\.php$/i', '', $file);

-								if (preg_match('/^index/i', $filelib)) {

-									continue;

-								}

-								if (preg_match('/^default/i', $filelib)) {

-									continue;

-								}

-								if (preg_match('/^empty/i', $filelib)) {

-									continue;

-								}

-								if (preg_match('/\.lib/i', $filelib)) {

-									continue;

-								}

-								if (getDolGlobalInt('MAIN_FEATURES_LEVEL') == 0 && in_array($file, $expdevmenu)) {

-									continue;

-								}

-

-								$menuarray[$filelib] = 1;

-							}

-							$menuarray['all'] = 1;

-						}

-						closedir($handle);

-					}

-				}

-			}

+		foreach ($dirmenuarray as $dirmenu)

+		{

+            foreach ($conf->file->dol_document_root as $dirroot)

+            {

+                $dir = $dirroot.$dirmenu;

+                if (is_dir($dir))

+                {

+	                $handle = opendir($dir);

+	                if (is_resource($handle))

+	                {

+	        			while (($file = readdir($handle)) !== false)

+	        			{

+	        				if (is_file($dir."/".$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS')

+	        				{

+	        					$filelib = preg_replace('/(_backoffice|_frontoffice)?\.php$/i', '', $file);

+	        					if (preg_match('/^index/i', $filelib)) continue;

+	        					if (preg_match('/^default/i', $filelib)) continue;

+	        					if (preg_match('/^empty/i', $filelib)) continue;

+	        					if (preg_match('/\.lib/i', $filelib)) continue;

+	        					if (empty($conf->global->MAIN_FEATURES_LEVEL) && in_array($file, $expdevmenu)) continue;

+

+	        					$menuarray[$filelib] = 1;

+	        				}

+	        				$menuarray['all'] = 1;

+	        			}

+	        			closedir($handle);

+	                }

+                }

+            }

@@ -335,3 +279,4 @@
-		print '<select class="flat maxwidth100" id="'.$htmlname.'" name="'.$htmlname.'">';

-		$oldprefix = '';

-		foreach ($menuarray as $key => $val) {

+        print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';

+        $oldprefix = '';

+		foreach ($menuarray as $key => $val)

+		{

@@ -341 +286,2 @@
-			if ($key == $selected) {

+            if ($key == $selected)

+			{

@@ -345,5 +291,2 @@
-			if ($key == 'all') {

-				print $langs->trans("AllMenus");

-			} else {

-				print $key;

-			}

+			if ($key == 'all') print $langs->trans("AllMenus");

+			else print $key;

@@ -353,20 +296,20 @@
-

-		print ajax_combobox($htmlname);

-	}

-

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 *  Return a HTML select list of timezones

-	 *

-	 *  @param	string		$selected        Menu pre-selectionnee

-	 *  @param  string		$htmlname        Nom de la zone select

-	 *  @return	void

-	 */

-	public function select_timezone($selected, $htmlname)

-	{

-		// phpcs:enable

-		print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';

-		print '<option value="-1">&nbsp;</option>';

-

-		$arraytz = array(

+    }

+

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     *  Return a HTML select list of timezones

+     *

+     *  @param	string		$selected        Menu pre-selectionnee

+     *  @param  string		$htmlname        Nom de la zone select

+     *  @return	void

+     */

+    public function select_timezone($selected, $htmlname)

+    {

+        // phpcs:enable

+        global $langs, $conf;

+

+        print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';

+        print '<option value="-1">&nbsp;</option>';

+

+        $arraytz = array(

@@ -399,13 +342,11 @@
-		foreach ($arraytz as $lib => $gmt) {

-			print '<option value="'.$lib.'"';

-			if ($selected == $lib || $selected == $gmt) {

-				print ' selected';

-			}

-			print '>'.$gmt.'</option>'."\n";

-		}

-		print '</select>';

-	}

-

-

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+        foreach ($arraytz as $lib => $gmt) {

+            print '<option value="'.$lib.'"';

+            if ($selected == $lib || $selected == $gmt) print ' selected';

+            print '>'.$gmt.'</option>'."\n";

+        }

+        print '</select>';

+    }

+

+

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -419 +359,0 @@
-	 * 	@param		int		$forcecombo		Force to load all values and output a standard combobox (with no beautification)

@@ -422 +362 @@
-	public function select_paper_format($selected = '', $htmlname = 'paperformat_id', $filter = 0, $showempty = 0, $forcecombo = 0)

+	public function select_paper_format($selected = '', $htmlname = 'paperformat_id', $filter = 0, $showempty = 0)

@@ -430 +370 @@
-		$sql .= " FROM ".$this->db->prefix()."c_paper_format";

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

@@ -432,17 +372,19 @@
-		if ($filter) {

-			$sql .= " AND code LIKE '%".$this->db->escape($filter)."%'";

-		}

-

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

-		if ($resql) {

-			$num = $this->db->num_rows($resql);

-			$i = 0;

-			while ($i < $num) {

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

-				$unitKey = $langs->trans('SizeUnit'.$obj->unit);

-

-				$paperformat[$obj->code] = $langs->trans('PaperFormat'.strtoupper($obj->code)).' - '.round($obj->width).'x'.round($obj->height).' '.($unitKey == 'SizeUnit'.$obj->unit ? $obj->unit : $unitKey);

-

-				$i++;

-			}

-		} else {

+        if ($filter) $sql .= " AND code LIKE '%".$this->db->escape($filter)."%'";

+

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

+        if ($resql)

+        {

+            $num = $this->db->num_rows($resql);

+            $i = 0;

+            while ($i < $num)

+            {

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

+                $unitKey = $langs->trans('SizeUnit'.$obj->unit);

+

+                $paperformat[$obj->code] = $langs->trans('PaperFormat'.strtoupper($obj->code)).' - '.round($obj->width).'x'.round($obj->height).' '.($unitKey == 'SizeUnit'.$obj->unit ? $obj->unit : $unitKey);

+

+                $i++;

+            }

+        }

+        else

+		{

@@ -455 +397,2 @@
-		if ($showempty) {

+		if ($showempty)

+		{

@@ -457,3 +400 @@
-			if ($selected == '') {

-				$out .= ' selected';

-			}

+			if ($selected == '') $out .= ' selected';

@@ -462,2 +403,4 @@
-		foreach ($paperformat as $key => $value) {

-			if ($selected == $key) {

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

+		{

+            if ($selected == $key)

+			{

@@ -465 +408,3 @@
-			} else {

+			}

+			else

+			{

@@ -470,42 +414,0 @@
-

-		if (!$forcecombo) {

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

-			$out .= ajax_combobox($htmlname);

-		}

-

-		return $out;

-	}

-

-

-	/**

-	 * Function to shwo the combo select to chose a type of field (varchar, int, email, ...)

-	 *

-	 * @param	string	$htmlname				Name of HTML select component

-	 * @param	string	$type					Type preselected

-	 * @param	string	$typewecanchangeinto	Array of possible switch combination from 1 type to another one. This will grey not possible combinations.

-	 * @return 	string							The combo HTML select component

-	 */

-	public function selectTypeOfFields($htmlname, $type, $typewecanchangeinto = array())

-	{

-		global $type2label;	// TODO Remove this

-

-		$out = '';

-

-		$out .= '<select class="flat type" id="'.$htmlname.'" name="'.$htmlname.'">';

-		foreach ($type2label as $key => $val) {

-			$selected = '';

-			if ($key == $type) {

-				$selected = ' selected="selected"';

-			}

-

-			// Set $valhtml with the picto for the type

-			$valhtml = ($key ? getPictoForType($key) : '').$val;

-

-			if (empty($typewecanchangeinto) || in_array($key, $typewecanchangeinto[$type])) {

-				$out .= '<option value="'.$key.'"'.$selected.' data-html="'.dol_escape_htmltag($valhtml).'">'.($val ? $val : '&nbsp;').'</option>';

-			} else {

-				$out .= '<option value="'.$key.'" disabled="disabled"'.$selected.' data-html="'.dol_escape_htmltag($valhtml).'">'.($val ? $val : '&nbsp;').'</option>';

-			}

-		}

-		$out .= '</select>';

-		$out .= ajax_combobox('type');

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_html.formbank.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_html.formbank.class.php
@@ -26,2 +25,0 @@
-include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';

-

@@ -34,4 +32,4 @@
-	/**

-	 * @var DoliDB Database handler.

-	 */

-	public $db;

+    /**

+     * @var DoliDB Database handler.

+     */

+    public $db;

@@ -39 +37 @@
-	/**

+    /**

@@ -45,9 +43,9 @@
-	/**

-	 * Constructor

-	 *

-	 * @param		DoliDB		$db      Database handler

-	 */

-	public function __construct($db)

-	{

-		$this->db = $db;

-	}

+    /**

+     * Constructor

+     *

+     * @param		DoliDB		$db      Database handler

+     */

+    public function __construct($db)

+    {

+        $this->db = $db;

+    }

@@ -55,10 +53,10 @@
-	/**

-	 *  Retourne la liste des types de comptes financiers

-	 *

-	 *  @param	integer	$selected        Type pre-selectionne

-	 *  @param  string	$htmlname        Nom champ formulaire

-	 *  @return	void

-	 */

-	public function selectTypeOfBankAccount($selected = Account::TYPE_CURRENT, $htmlname = 'type')

-	{

-		$account = new Account($this->db);

+    /**

+     *  Retourne la liste des types de comptes financiers

+     *

+     *  @param	integer	$selected        Type pre-selectionne

+     *  @param  string	$htmlname        Nom champ formulaire

+     *  @return	void

+     */

+    public function selectTypeOfBankAccount($selected = Account::TYPE_CURRENT, $htmlname = 'type')

+    {

+        $account = new Account($this->db);

@@ -66,2 +64,2 @@
-		print Form::selectarray($htmlname, $account->type_lib, $selected);

-	}

+        print Form::selectarray($htmlname, $account->type_lib, $selected);

+    }

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_html.formbarcode.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_html.formbarcode.class.php
@@ -32,40 +32,41 @@
-	/**

-	 * @var DoliDB Database handler.

-	 */

-	public $db;

-

-	/**

-	 * @var string Error code (or message)

-	 */

-	public $error = '';

-

-

-	/**

-	 *  Constructor

-	 *

-	 *  @param  DoliDB		$db		Database handler

-	 */

-	public function __construct($db)

-	{

-		$this->db = $db;

-	}

-

-

-	/**

-	 *	Return HTML select with list of bar code generators

-	 *

-	 *  @param	int		$selected       Id code pre-selected

-	 *  @param 	array	$barcodelist	Array of barcodes generators

-	 *  @param  int		$code_id        Id du code barre

-	 *  @param  int		$idForm			Id du formulaire

-	 * 	@return	string					HTML select string

-	 */

-	public function setBarcodeEncoder($selected, $barcodelist, $code_id, $idForm = 'formbarcode')

-	{

-		global $conf, $langs;

-

-		$disable = '';

-

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

-			print "\n".'<script nonce="'.getNonce().'" type="text/javascript">';

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

+    /**

+     * @var DoliDB Database handler.

+     */

+    public $db;

+

+    /**

+     * @var string Error code (or message)

+     */

+    public $error = '';

+

+

+    /**

+     *  Constructor

+     *

+     *  @param  DoliDB		$db		Database handler

+     */

+    public function __construct($db)

+    {

+        $this->db = $db;

+    }

+

+

+    /**

+     *	Return HTML select with list of bar code generators

+     *

+     *  @param	int		$selected       Id code pre-selected

+     *  @param 	array	$barcodelist	Array of barcodes generators

+     *  @param  int		$code_id        Id du code barre

+     *  @param  int		$idForm			Id du formulaire

+     * 	@return	string					HTML select string

+     */

+    public function setBarcodeEncoder($selected, $barcodelist, $code_id, $idForm = 'formbarcode')

+    {

+        global $conf, $langs;

+

+        $disable = '';

+

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

+        {

+            print "\n".'<script type="text/javascript" language="javascript">';

+            print 'jQuery(document).ready(function () {

@@ -78,143 +79,148 @@
-			print '</script>'."\n";

-			//onChange="barcode_coder_save(\''.$idForm.'\')

-		}

-

-		// We check if barcode is already selected by default

-		if (((isModEnabled("product") || isModEnabled("service")) && getDolGlobalString('PRODUIT_DEFAULT_BARCODE_TYPE') == $code_id) ||

-		(isModEnabled("societe") && getDolGlobalString('GENBARCODE_BARCODETYPE_THIRDPARTY') == $code_id)) {

-			$disable = 'disabled';

-		}

-

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

-			$select_encoder = '<form action="'.DOL_URL_ROOT.'/admin/barcode.php" method="POST" id="form'.$idForm.'">';

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

-			$select_encoder .= '<input type="hidden" name="action" value="update">';

-			$select_encoder .= '<input type="hidden" name="code_id" value="'.$code_id.'">';

-		}

-

-		$selectname = (!empty($conf->use_javascript_ajax) ? 'coder' : 'coder'.$code_id);

-		$select_encoder .= '<select id="select'.$idForm.'" class="flat" name="'.$selectname.'">';

-		$select_encoder .= '<option value="0"'.($selected == 0 ? ' selected' : '').' '.$disable.'>'.$langs->trans('Disable').'</option>';

-		$select_encoder .= '<option value="-1" disabled>--------------------</option>';

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

-			$select_encoder .= '<option value="'.$key.'"'.($selected == $key ? ' selected' : '').'>'.$value.'</option>';

-		}

-		$select_encoder .= '</select>';

-

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

-			$select_encoder .= '</form>';

-		}

-

-		return $select_encoder;

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 *  Print form to select type of barcode

-	 *

-	 *  @param  int     $selected          Id code pre-selected

-	 *  @param  string  $htmlname          Name of HTML select field

-	 *  @param  int     $useempty          Affiche valeur vide dans liste

-	 *  @return void

-	 *  @deprecated

-	 */

-	public function select_barcode_type($selected = '', $htmlname = 'barcodetype_id', $useempty = 0)

-	{

-		// phpcs:enable

-		print $this->selectBarcodeType($selected, $htmlname, $useempty);

-	}

-

-	/**

-	 *  Return html form to select type of barcode

-	 *

-	 *  @param  int     $selected          Id code pre-selected

-	 *  @param  string  $htmlname          Name of HTML select field

-	 *  @param  int     $useempty          Display empty value in select

-	 *  @return string

-	 */

-	public function selectBarcodeType($selected = '', $htmlname = 'barcodetype_id', $useempty = 0)

-	{

-		global $langs, $conf;

-

-		$out = '';

-

-		$sql = "SELECT rowid, code, libelle as label";

-		$sql .= " FROM ".$this->db->prefix()."c_barcode_type";

-		$sql .= " WHERE coder <> '0'";

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

-		$sql .= " ORDER BY code";

-

-		$result = $this->db->query($sql);

-		if ($result) {

-			$num = $this->db->num_rows($result);

-			$i = 0;

-

-			if ($useempty && $num > 0) {

-				$out .= '<select class="flat minwidth75imp" name="'.$htmlname.'" id="select_'.$htmlname.'">';

-				$out .= '<option value="0">&nbsp;</option>';

-			} else {

-				$langs->load("errors");

-				$out .= '<select disabled class="flat minwidth75imp" name="'.$htmlname.'" id="select_'.$htmlname.'">';

-				$out .= '<option value="0" selected>'.$langs->trans('ErrorNoActivatedBarcode').'</option>';

-			}

-

-			while ($i < $num) {

-				$obj = $this->db->fetch_object($result);

-				if ($selected == $obj->rowid) {

-					$out .= '<option value="'.$obj->rowid.'" selected>';

-				} else {

-					$out .= '<option value="'.$obj->rowid.'">';

-				}

-				$out .= $obj->label;

-				$out .= '</option>';

-				$i++;

-			}

-			$out .= "</select>";

-			$out .= ajax_combobox("select_".$htmlname);

-		} else {

-			dol_print_error($this->db);

-		}

-		return $out;

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 *  Show form to select type of barcode

-	 *

-	 *  @param  string		$page        	Page

-	 *  @param  int			$selected    	Id condition preselected

-	 *  @param  string		$htmlname    	Nom du formulaire select

-	 *  @return	void

-	 *  @deprecated

-	 */

-	public function form_barcode_type($page, $selected = '', $htmlname = 'barcodetype_id')

-	{

-		// phpcs:enable

-		print $this->formBarcodeType($page, $selected, $htmlname);

-	}

-

-	/**

-	 *  Return html form to select type of barcode

-	 *

-	 *  @param  string      $page           Page

-	 *  @param  int         $selected       Id condition preselected

-	 *  @param  string      $htmlname       Nom du formulaire select

-	 *  @return string

-	 */

-	public function formBarcodeType($page, $selected = '', $htmlname = 'barcodetype_id')

-	{

-		global $langs, $conf;

-		$out = '';

-		if ($htmlname != "none") {

-			$out .= '<form method="post" action="'.$page.'">';

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

-			$out .= '<input type="hidden" name="action" value="set'.$htmlname.'">';

-			$out .= '<table class="nobordernopadding">';

-			$out .= '<tr><td>';

-			$out .= $this->selectBarcodeType($selected, $htmlname, 1);

-			$out .= '</td>';

-			$out .= '<td class="left"><input type="submit" class="button smallpaddingimp" value="'.$langs->trans("Modify").'">';

-			$out .= '</td></tr></table></form>';

-		}

-		return $out;

-	}

+            print '</script>'."\n";

+            //onChange="barcode_coder_save(\''.$idForm.'\')

+        }

+

+        // We check if barcode is already selected by default

+        if (((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE == $code_id) ||

+        (!empty($conf->societe->enabled) && $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY == $code_id))

+        {

+            $disable = 'disabled';

+        }

+

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

+        {

+            $select_encoder = '<form action="'.DOL_URL_ROOT.'/admin/barcode.php" method="POST" id="form'.$idForm.'">';

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

+            $select_encoder .= '<input type="hidden" name="action" value="update">';

+            $select_encoder .= '<input type="hidden" name="code_id" value="'.$code_id.'">';

+        }

+

+        $selectname = (!empty($conf->use_javascript_ajax) ? 'coder' : 'coder'.$code_id);

+        $select_encoder .= '<select id="select'.$idForm.'" class="flat" name="'.$selectname.'">';

+        $select_encoder .= '<option value="0"'.($selected == 0 ? ' selected' : '').' '.$disable.'>'.$langs->trans('Disable').'</option>';

+        $select_encoder .= '<option value="-1" disabled>--------------------</option>';

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

+        {

+            $select_encoder .= '<option value="'.$key.'"'.($selected == $key ? ' selected' : '').'>'.$value.'</option>';

+        }

+        $select_encoder .= '</select>';

+

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

+        {

+            $select_encoder .= '</form>';

+        }

+

+        return $select_encoder;

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     *  Print form to select type of barcode

+     *

+     *  @param  int     $selected          Id code pre-selected

+     *  @param  string  $htmlname          Name of HTML select field

+     *  @param  int     $useempty          Affiche valeur vide dans liste

+     *  @return void

+     *  @deprecated

+     */

+    public function select_barcode_type($selected = '', $htmlname = 'barcodetype_id', $useempty = 0)

+    {

+        // phpcs:enable

+        print $this->selectBarcodeType($selected, $htmlname, $useempty);

+    }

+

+    /**

+     *  Return html form to select type of barcode

+     *

+     *  @param  int     $selected          Id code pre-selected

+     *  @param  string  $htmlname          Name of HTML select field

+     *  @param  int     $useempty          Display empty value in select

+     *  @return string

+     */

+    public function selectBarcodeType($selected = '', $htmlname = 'barcodetype_id', $useempty = 0)

+    {

+        global $langs, $conf;

+

+        $out = '';

+

+        $sql = "SELECT rowid, code, libelle";

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

+        $sql .= " WHERE coder <> '0'";

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

+        $sql .= " ORDER BY code";

+

+        $result = $this->db->query($sql);

+        if ($result) {

+            $num = $this->db->num_rows($result);

+            $i = 0;

+

+            if ($useempty && $num > 0) {

+                $out .= '<select class="flat minwidth75imp" name="'.$htmlname.'" id="select_'.$htmlname.'">';

+                $out .= '<option value="0">&nbsp;</option>';

+            } else {

+                $langs->load("errors");

+                $out .= '<select disabled class="flat minwidth75imp" name="'.$htmlname.'" id="select_'.$htmlname.'">';

+                $out .= '<option value="0" selected>'.$langs->trans('ErrorNoActivatedBarcode').'</option>';

+            }

+

+            while ($i < $num) {

+                $obj = $this->db->fetch_object($result);

+                if ($selected == $obj->rowid) {

+                    $out .= '<option value="'.$obj->rowid.'" selected>';

+                } else {

+                    $out .= '<option value="'.$obj->rowid.'">';

+                }

+                $out .= $obj->libelle;

+                $out .= '</option>';

+                $i++;

+            }

+            $out .= "</select>";

+            $out .= ajax_combobox("select_".$htmlname);

+        }

+        else {

+            dol_print_error($this->db);

+        }

+        return $out;

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     *  Show form to select type of barcode

+     *

+     *  @param  string		$page        	Page

+     *  @param  int			$selected    	Id condition preselected

+     *  @param  string		$htmlname    	Nom du formulaire select

+     *  @return	void

+     *  @deprecated

+     */

+    public function form_barcode_type($page, $selected = '', $htmlname = 'barcodetype_id')

+    {

+        // phpcs:enable

+        print $this->formBarcodeType($page, $selected, $htmlname);

+    }

+

+    /**

+     *  Return html form to select type of barcode

+     *

+     *  @param  string      $page           Page

+     *  @param  int         $selected       Id condition preselected

+     *  @param  string      $htmlname       Nom du formulaire select

+     *  @return string

+     */

+    public function formBarcodeType($page, $selected = '', $htmlname = 'barcodetype_id')

+    {

+        global $langs, $conf;

+        $out = '';

+        if ($htmlname != "none") {

+            $out .= '<form method="post" action="'.$page.'">';

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

+            $out .= '<input type="hidden" name="action" value="set'.$htmlname.'">';

+            $out .= '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';

+            $out .= '<tr><td>';

+            $out .= $this->selectBarcodeType($selected, $htmlname, 1);

+            $out .= '</td>';

+            $out .= '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'">';

+            $out .= '</td></tr></table></form>';

+        }

+        return $out;

+    }

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_html.formcategory.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_html.formcategory.class.php
@@ -35,8 +35,3 @@
-	 * @param 	string		$type								The categorie type (e.g Categorie::TYPE_WAREHOUSE)

-	 * @param 	array		$preSelected						A list with the elements that should pre-selected

-	 * @param	string		$morecss							More CSS

-	 * @param	int			$searchCategoryProductOperator		0 or 1 to enable the checkbox to search with a or (0=not preseleted, 1=preselected)

-	 * @param	int			$multiselect						0 or 1

-	 * @param	int			$nocateg							1=Add an entry '- No Category -'

-	 * @param	string		$showempty							1 or 'string' to add an empty entry

-	 * @return 	string											A HTML filter box (Note: selected results can get with GETPOST("search_category_".$type."_list"))

+	 * @param string $type			The categorie type (e.g Categorie::TYPE_WAREHOUSE)

+	 * @param Array $preSelected	A list with the elements that should pre-selected

+	 * @return string				A HTML filter box (Note: selected results can get with GETPOST("search_category_".$type."_list"))

@@ -44 +39 @@
-	public function getFilterBox($type, array $preSelected, $morecss = "minwidth300imp widthcentpercentminusx", $searchCategoryProductOperator = -1, $multiselect = 1, $nocateg = 1, $showempty = '')

+	public function getFilterBox($type, $preSelected)

@@ -46 +41,2 @@
-		global $langs, $db;

+		// phpcs:enable

+		global $langs;

@@ -48 +44,2 @@
-		if (empty($preSelected) || !is_array($preSelected)) {

+		if (empty($preSelected) || !is_array($preSelected))

+		{

@@ -52,5 +49,4 @@
-		if ($showempty && !is_numeric($showempty)) {

-			$tmptitle = $showempty;

-		} else {

-			$tmptitle = $langs->transnoentitiesnoconv("Category");

-		}

+		$htmlName = "search_category_".$type."_list";

+

+		$categoryArray = $this->select_all_categories($type, "", "", 64, 0, 1);

+		$categoryArray[-2] = "- ".$langs->trans('NotCategorized')." -";

@@ -60,21 +56,2 @@
-		$filter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"');

-		if ($multiselect) {

-			$categoryArray = $this->select_all_categories($type, '', '', 64, 0, 2);

-			if ($nocateg) {

-				$categoryArray[-2] = "- ".$langs->trans('NotCategorized')." -";

-			}

-			$htmlName = "search_category_".$type."_list";

-			$htmlName2 = "search_category_".$type."_operator";

-

-			$filter .= Form::multiselectarray($htmlName, $categoryArray, $preSelected, 0, 0, $morecss, 0, 0, '', '', $tmptitle);

-		} else {

-			$htmlName = "search_".$type."_category";

-			$htmlName2 = "";

-			require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';

-			$formother = new FormOther($db);

-

-			$filter .= $formother->select_categories($type, $preSelected[0], $htmlName, $nocateg, $tmptitle, $morecss);

-		}

-		if ($searchCategoryProductOperator >= 0) {

-			$filter .= ' <input type="checkbox" class="valignmiddle" id="'.$htmlName2.'" name="'.$htmlName2.'" value="1"'.($searchCategoryProductOperator == 1 ? ' checked="checked"' : '').'/><label class="none valignmiddle" for="'.$htmlName2.'">'.$langs->trans('UseOrOperatorForCategories').'</label>';

-		}

+		$filter .= $langs->trans('Categories').": ";

+		$filter .= Form::multiselectarray($htmlName, $categoryArray, $preSelected, 0, 0, "minwidth300");

@@ -85,43 +61,0 @@
-

-	/**

-	 *    Prints a select form for products categories

-	 *    @param    string	$selected          	Id category pre-selection

-	 *    @param    string	$htmlname          	Name of HTML field

-	 *    @param    int		$showempty         	Add an empty field

-	 *    @return	integer|null

-	 */

-	public function selectProductCategory($selected = 0, $htmlname = 'product_category_id', $showempty = 0)

-	{

-		global $conf;

-

-		$sql = "SELECT cp.fk_categorie as cat_index, cat.label";

-		$sql .= " FROM ".MAIN_DB_PREFIX."categorie_product as cp";

-		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."categorie as cat ON cat.rowid = cp.fk_categorie";

-		$sql .= " GROUP BY cp.fk_categorie, cat.label";

-

-		dol_syslog(get_class($this)."::selectProductCategory", LOG_DEBUG);

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

-		if ($resql) {

-			print '<select class="flat" id="select_'.$htmlname.'" name="'.$htmlname.'">';

-			if ($showempty) {

-				print '<option value="0">&nbsp;</option>';

-			}

-

-			$i = 0;

-			$num_rows = $this->db->num_rows($resql);

-			while ($i < $num_rows) {

-				$category = $this->db->fetch_object($resql);

-				if ($selected && $selected == $category->cat_index) {

-					print '<option value="'.$category->cat_index.'" selected>'.$category->label.'</option>';

-				} else {

-					print '<option value="'.$category->cat_index.'">'.$category->label.'</option>';

-				}

-				$i++;

-			}

-			print('</select>');

-

-			return $num_rows;

-		} else {

-			dol_print_error($this->db);

-		}

-	}

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_html.formcompany.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_html.formcompany.class.php
@@ -6 +5,0 @@
- * Copyright (C) 2020       Open-Dsi         	<support@open-dsi.fr>

@@ -34 +33 @@
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.form.class.php';

+require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';

@@ -42 +41,2 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -47 +47 @@
-	 *      @param  string	$filter     Add a SQL filter to select. Data must not come from user input.

+	 *      @param  string	$filter     Add a SQL filter to select

@@ -52 +52 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -57,6 +57,4 @@
-		$sql = "SELECT id, code, libelle as label";

-		$sql .= " FROM " . $this->db->prefix() . "c_typent";

-		$sql .= " WHERE active = 1 AND (fk_country IS NULL OR fk_country = " . (empty($mysoc->country_id) ? '0' : $mysoc->country_id) . ")";

-		if ($filter) {

-			$sql .= " " . $filter;

-		}

+		$sql = "SELECT id, code, libelle";

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

+		$sql .= " WHERE active = 1 AND (fk_country IS NULL OR fk_country = ".(empty($mysoc->country_id) ? '0' : $mysoc->country_id).")";

+		if ($filter) $sql .= " ".$filter;

@@ -64 +62 @@
-		dol_syslog(get_class($this) . '::typent_array', LOG_DEBUG);

+		dol_syslog(get_class($this).'::typent_array', LOG_DEBUG);

@@ -66 +64,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -70 +69,2 @@
-			while ($i < $num) {

+			while ($i < $num)

+			{

@@ -72,13 +72,5 @@
-				if (!$mode) {

-					$key = $objp->id;

-				} else {

-					$key = $objp->code;

-				}

-				if ($langs->trans($objp->code) != $objp->code) {

-					$effs[$key] = $langs->trans($objp->code);

-				} else {

-					$effs[$key] = $objp->label;

-				}

-				if ($effs[$key] == '-') {

-					$effs[$key] = '';

-				}

+				if (!$mode) $key = $objp->id;

+				else $key = $objp->code;

+				if ($langs->trans($objp->code) != $objp->code) $effs[$key] = $langs->trans($objp->code);

+				else $effs[$key] = $objp->libelle;

+				if ($effs[$key] == '-') $effs[$key] = '';

@@ -93 +85 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -98 +90 @@
-	 *	@param  string	$filter     Add a SQL filter to select. Data must not come from user input.

+	 *	@param  string	$filter     Add a SQL filter to select

@@ -103 +95 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -106,2 +98,2 @@
-		$sql = "SELECT id, code, libelle as label";

-		$sql .= " FROM " . $this->db->prefix() . "c_effectif";

+		$sql = "SELECT id, code, libelle";

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

@@ -109,3 +101 @@
-		if ($filter) {

-			$sql .= " " . $filter;

-		}

+		if ($filter) $sql .= " ".$filter;

@@ -113 +103 @@
-		dol_syslog(get_class($this) . '::effectif_array', LOG_DEBUG);

+		dol_syslog(get_class($this).'::effectif_array', LOG_DEBUG);

@@ -115 +105,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -119 +110,2 @@
-			while ($i < $num) {

+			while ($i < $num)

+			{

@@ -121,7 +113,4 @@
-				if (!$mode) {

-					$key = $objp->id;

-				} else {

-					$key = $objp->code;

-				}

-

-				$effs[$key] = $objp->label != '-' ? $objp->label : '';

+				if (!$mode) $key = $objp->id;

+				else $key = $objp->code;

+

+				$effs[$key] = $objp->libelle != '-' ? $objp->libelle : '';

@@ -136 +125 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -148 +137 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -151 +140 @@
-		print '<form method="post" action="' . $page . '">';

+		print '<form method="post" action="'.$page.'">';

@@ -153,3 +142,3 @@
-		print '<input type="hidden" name="token" value="' . newToken() . '">';

-

-		dol_syslog(get_class($this) . '::form_prospect_level', LOG_DEBUG);

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

+

+		dol_syslog(get_class($this).'::form_prospect_level', LOG_DEBUG);

@@ -157 +146 @@
-		$sql .= " FROM " . $this->db->prefix() . "c_prospectlevel";

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

@@ -161 +150,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -179,7 +169,4 @@
-		} else {

-			dol_print_error($this->db);

-		}

-		if (!empty($htmlname) && $user->admin) {

-			print ' ' . info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

-		}

-		print '<input type="submit" class="button button-save valignmiddle small" value="' . $langs->trans("Modify") . '">';

+		}

+		else dol_print_error($this->db);

+		if (!empty($htmlname) && $user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+		print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';

@@ -189,52 +176 @@
-	/**

-	 *  Affiche formulaire de selection des niveau de prospection pour les contacts

-	 *

-	 *  @param	int		$page        	Page

-	 *  @param  int		$selected    	Id or code preselected

-	 *  @param  string	$htmlname   	Nom du formulaire select

-	 *	@param	int		$empty			Add empty value in list

-	 *	@return	void

-	 */

-	public function formProspectContactLevel($page, $selected = '', $htmlname = 'prospect_contact_level_id', $empty = 0)

-	{

-		global $user, $langs;

-

-		print '<form method="post" action="' . $page . '">';

-		print '<input type="hidden" name="action" value="setprospectcontactlevel">';

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

-

-		dol_syslog(__METHOD__, LOG_DEBUG);

-		$sql = "SELECT code, label";

-		$sql .= " FROM " . $this->db->prefix() . "c_prospectcontactlevel";

-		$sql .= " WHERE active > 0";

-		$sql .= " ORDER BY sortorder";

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

-		if ($resql) {

-			$options = array();

-

-			if ($empty) {

-				$options[''] = '';

-			}

-

-			while ($obj = $this->db->fetch_object($resql)) {

-				$level = $langs->trans($obj->code);

-

-				if ($level == $obj->code) {

-					$level = $langs->trans($obj->label);

-				}

-

-				$options[$obj->code] = $level;

-			}

-

-			print Form::selectarray($htmlname, $options, $selected);

-		} else {

-			dol_print_error($this->db);

-		}

-		if (!empty($htmlname) && $user->admin) {

-			print ' ' . info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

-		}

-		print '<input type="submit" class="button button-save valignmiddle small" value="' . $langs->trans("Modify") . '">';

-		print '</form>';

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -243,3 +179,3 @@
-	 *   In the case of an all-country list, the display breaks on the country.

-	 *   The key of the list is the code (there can be several entries for a given code but in this case, the country field differs).

-	 *   Thus the links with the departments are done on a department independently of its name.

+     *   In the case of an all-country list, the display breaks on the country.

+     *   The key of the list is the code (there can be several entries for a given code but in this case, the country field differs).

+     *   Thus the links with the departments are done on a department independently of its name.

@@ -254 +190 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -258 +194 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -261,3 +197,3 @@
-	 *   In the case of an all-country list, the display breaks on the country.

-	 *   The key of the list is the code (there can be several entries for a given code but in this case, the country field differs).

-	 *   Thus the links with the departments are done on a department independently of its name.

+     *   In the case of an all-country list, the display breaks on the country.

+     *   The key of the list is the code (there can be several entries for a given code but in this case, the country field differs).

+     *   Thus the links with the departments are done on a department independently of its name.

@@ -268 +203,0 @@
-	 *    @param	string	$morecss			Add more css

@@ -272,3 +207,3 @@
-	public function select_state($selected = 0, $country_codeid = 0, $htmlname = 'state_id', $morecss = 'maxwidth200onsmartphone  minwidth300')

-	{

-		// phpcs:enable

+	public function select_state($selected = 0, $country_codeid = 0, $htmlname = 'state_id')

+	{

+        // phpcs:enable

@@ -277 +212 @@
-		dol_syslog(get_class($this) . "::select_departement selected=" . $selected . ", country_codeid=" . $country_codeid, LOG_DEBUG);

+		dol_syslog(get_class($this)."::select_departement selected=".$selected.", country_codeid=".$country_codeid, LOG_DEBUG);

@@ -285 +220 @@
-		$sql .= " " . $this->db->prefix() . "c_departements as d, " . $this->db->prefix() . "c_regions as r," . $this->db->prefix() . "c_country as c";

+		$sql .= " ".MAIN_DB_PREFIX."c_departements as d, ".MAIN_DB_PREFIX."c_regions as r,".MAIN_DB_PREFIX."c_country as c";

@@ -288,6 +223,2 @@
-		if ($country_codeid && is_numeric($country_codeid)) {

-			$sql .= " AND c.rowid = '" . $this->db->escape($country_codeid) . "'";

-		}

-		if ($country_codeid && !is_numeric($country_codeid)) {

-			$sql .= " AND c.code = '" . $this->db->escape($country_codeid) . "'";

-		}

+		if ($country_codeid && is_numeric($country_codeid))   $sql .= " AND c.rowid = '".$this->db->escape($country_codeid)."'";

+		if ($country_codeid && !is_numeric($country_codeid)) $sql .= " AND c.code = '".$this->db->escape($country_codeid)."'";

@@ -297,7 +228,4 @@
-		if ($result) {

-			if (!empty($htmlname)) {

-				$out .= '<select id="' . $htmlname . '" class="flat' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '">';

-			}

-			if ($country_codeid) {

-				$out .= '<option value="0">&nbsp;</option>';

-			}

+		if ($result)

+		{

+			if (!empty($htmlname)) $out .= '<select id="'.$htmlname.'" class="flat maxwidth200onsmartphone minwidth300" name="'.$htmlname.'">';

+			if ($country_codeid) $out .= '<option value="0">&nbsp;</option>';

@@ -306,2 +234,3 @@
-			dol_syslog(get_class($this) . "::select_departement num=" . $num, LOG_DEBUG);

-			if ($num) {

+			dol_syslog(get_class($this)."::select_departement num=".$num, LOG_DEBUG);

+			if ($num)

+			{

@@ -309 +238,2 @@
-				while ($i < $num) {

+				while ($i < $num)

+				{

@@ -311 +241,2 @@
-					if ($obj->code == '0') {		// Le code peut etre une chaine

+					if ($obj->code == '0')		// Le code peut etre une chaine

+					{

@@ -313,5 +244,8 @@
-					} else {

-						if (!$country || $country != $obj->country) {

-							// Show break if we are in list with multiple countries

-							if (!$country_codeid && $obj->country_code) {

-								$out .= '<option value="-1" disabled data-html="----- ' . $obj->country . ' -----">----- ' . $obj->country . " -----</option>\n";

+					}

+					else {

+						if (!$country || $country != $obj->country)

+						{

+							// Affiche la rupture si on est en mode liste multipays

+							if (!$country_codeid && $obj->country_code)

+							{

+								$out .= '<option value="-1" disabled>----- '.$obj->country." -----</option>\n";

@@ -322,4 +256,7 @@
-						if (!empty($selected) && $selected == $obj->rowid) {

-							$out .= '<option value="' . $obj->rowid . '" selected>';

-						} else {

-							$out .= '<option value="' . $obj->rowid . '">';

+						if (!empty($selected) && $selected == $obj->rowid)

+						{

+							$out .= '<option value="'.$obj->rowid.'" selected>';

+						}

+						else

+						{

+							$out .= '<option value="'.$obj->rowid.'">';

@@ -329,8 +266,4 @@
-						if (

-							getDolGlobalString('MAIN_SHOW_STATE_CODE') &&

-							(getDolGlobalInt('MAIN_SHOW_STATE_CODE') == 1 || getDolGlobalInt('MAIN_SHOW_STATE_CODE') == 2 || $conf->global->MAIN_SHOW_STATE_CODE === 'all')

-						) {

-							if (getDolGlobalInt('MAIN_SHOW_REGION_IN_STATE_SELECT') == 1) {

-								$out .= $obj->region_name . ' - ' . $obj->code . ' - ' . ($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));

-							} else {

-								$out .= $obj->code . ' - ' . ($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));

+						if (!empty($conf->global->MAIN_SHOW_STATE_CODE) &&

+						($conf->global->MAIN_SHOW_STATE_CODE == 1 || $conf->global->MAIN_SHOW_STATE_CODE == 2 || $conf->global->MAIN_SHOW_STATE_CODE === 'all')) {

+							if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1) {

+								$out .= $obj->region_name.' - '.$obj->code.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));

@@ -338,4 +271,9 @@
-						} else {

-							if (getDolGlobalInt('MAIN_SHOW_REGION_IN_STATE_SELECT') == 1) {

-								$out .= $obj->region_name . ' - ' . ($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));

-							} else {

+							else {

+								$out .= $obj->code.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));

+							}

+						}

+						else {

+							if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1) {

+								$out .= $obj->region_name.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));

+							}

+							else {

@@ -351,7 +289,5 @@
-			if (!empty($htmlname)) {

-				$out .= '</select>';

-			}

-			if (!empty($htmlname) && $user->admin) {

-				$out .= ' ' . info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

-			}

-		} else {

+			if (!empty($htmlname)) $out .= '</select>';

+			if (!empty($htmlname) && $user->admin) $out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+		}

+		else

+		{

@@ -362,2 +298,3 @@
-		if (!empty($htmlname)) {

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

+		if (!empty($htmlname))

+		{

+			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

@@ -370,28 +307,2 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 *   Returns the drop-down list of departments/provinces/cantons for all countries or for a given country.

-	 *   In the case of an all-country list, the display breaks on the country.

-	 *   The key of the list is the code (there can be several entries for a given code but in this case, the country field differs).

-	 *   Thus the links with the departments are done on a department independently of its name.

-	 *

-	 *    @param	string		$parent_field_id        Parent select name to monitor

-	 *    @param	integer		$selected        	Code state preselected (mus be state id)

-	 *    @param    integer		$country_codeid    	Country code or id: 0=list for all countries, otherwise country code or country rowid to show

-	 *    @param    string		$htmlname			Id of department. If '', we want only the string with <option>

-	 *    @param	string		$morecss			Add more css

-	 * 	  @return	string						String with HTML select

-	 *    @see select_country()

-	 */

-	public function select_state_ajax($parent_field_id = 'country_id', $selected = 0, $country_codeid = 0, $htmlname = 'state_id', $morecss = 'maxwidth200onsmartphone  minwidth300')

-	{

-		$html = '<script>';

-		$html.='$("select[name=\"'.$parent_field_id.'\"]").change(function(){

-				$.ajax( "'.dol_buildpath('/core/ajax/ziptown.php', 2).'", { data:{ selected: $("select[name=\"'.$htmlname.'\"]").val(), country_codeid: $(this).val(), htmlname:"'.$htmlname.'", morecss:"'.$morecss.'" } } )

-				.done(function(msg) {

-					$("span#target_'.$htmlname.'").html(msg);

-				})

-			});';

-		return $html.'</script><span id="target_'.$htmlname.'">'.$this->select_state($selected, $country_codeid, $htmlname, $morecss).'</span>';

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -410 +321 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -415 +326 @@
-		$sql .= " FROM " . $this->db->prefix() . "c_regions as r, " . $this->db->prefix() . "c_country as c";

+		$sql .= " FROM ".MAIN_DB_PREFIX."c_regions as r, ".MAIN_DB_PREFIX."c_country as c";

@@ -419 +330 @@
-		dol_syslog(get_class($this) . "::select_region", LOG_DEBUG);

+		dol_syslog(get_class($this)."::select_region", LOG_DEBUG);

@@ -421,2 +332,3 @@
-		if ($resql) {

-			print '<select class="flat" id="' . $htmlname . '" name="' . $htmlname . '">';

+		if ($resql)

+		{

+			print '<select class="flat" name="'.$htmlname.'">';

@@ -425 +337,2 @@
-			if ($num) {

+			if ($num)

+			{

@@ -427 +340,2 @@
-				while ($i < $num) {

+				while ($i < $num)

+				{

@@ -431,2 +345,4 @@
-					} else {

-						if ($country == '' || $country != $obj->country) {

+					}

+					else {

+						if ($country == '' || $country != $obj->country)

+						{

@@ -434,3 +350,3 @@
-							$key = $langs->trans("Country" . strtoupper($obj->country_code));

-							$valuetoshow = ($key != "Country" . strtoupper($obj->country_code)) ? $obj->country_code . " - " . $key : $obj->country;

-							print '<option value="-2" disabled>----- ' . $valuetoshow . " -----</option>\n";

+							$key = $langs->trans("Country".strtoupper($obj->country_code));

+							$valuetoshow = ($key != "Country".strtoupper($obj->country_code)) ? $obj->country_code." - ".$key : $obj->country;

+							print '<option value="-1" disabled>----- '.$valuetoshow." -----</option>\n";

@@ -440,4 +356,7 @@
-						if ($selected > 0 && $selected == $obj->code) {

-							print '<option value="' . $obj->code . '" selected>' . $obj->label . '</option>';

-						} else {

-							print '<option value="' . $obj->code . '">' . $obj->label . '</option>';

+						if ($selected > 0 && $selected == $obj->code)

+						{

+							print '<option value="'.$obj->code.'" selected>'.$obj->label.'</option>';

+						}

+						else

+						{

+							print '<option value="'.$obj->code.'">'.$obj->label.'</option>';

@@ -450,2 +369,3 @@
-			print ajax_combobox($htmlname);

-		} else {

+		}

+		else

+		{

@@ -456 +376 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -463 +382,0 @@
-	 *  @param	int		$addjscombo		Add js combo

@@ -466,3 +385,3 @@
-	public function select_civility($selected = '', $htmlname = 'civility_id', $morecss = 'maxwidth150', $addjscombo = 1)

-	{

-		// phpcs:enable

+	public function select_civility($selected = '', $htmlname = 'civility_id', $morecss = 'maxwidth100')

+	{

+        // phpcs:enable

@@ -474 +393 @@
-		$sql = "SELECT rowid, code, label, active FROM " . $this->db->prefix() . "c_civility";

+		$sql = "SELECT rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_civility";

@@ -479,2 +398,3 @@
-		if ($resql) {

-			$out .= '<select class="flat' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '" id="' . $htmlname . '">';

+		if ($resql)

+		{

+			$out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';

@@ -484,2 +404,4 @@
-			if ($num) {

-				while ($i < $num) {

+			if ($num)

+			{

+				while ($i < $num)

+				{

@@ -487,7 +409,10 @@
-					if ($selected == $obj->code) {

-						$out .= '<option value="' . $obj->code . '" selected>';

-					} else {

-						$out .= '<option value="' . $obj->code . '">';

-					}

-					// If translation exists, we use it, otherwise, we use tha had coded label

-					$out .= ($langs->trans("Civility" . $obj->code) != "Civility" . $obj->code ? $langs->trans("Civility" . $obj->code) : ($obj->label != '-' ? $obj->label : ''));

+					if ($selected == $obj->code)

+					{

+						$out .= '<option value="'.$obj->code.'" selected>';

+					}

+					else

+					{

+						$out .= '<option value="'.$obj->code.'">';

+					}

+					// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut

+					$out .= ($langs->trans("Civility".$obj->code) != "Civility".$obj->code ? $langs->trans("Civility".$obj->code) : ($obj->label != '-' ? $obj->label : ''));

@@ -499,10 +424,4 @@
-			if ($user->admin) {

-				$out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

-			}

-

-			if ($addjscombo) {

-				// Enhance with select2

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

-				$out .= ajax_combobox($htmlname);

-			}

-		} else {

+			if ($user->admin) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+		}

+		else

+		{

@@ -515 +434 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -529 +448 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -533 +452 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -540,4 +459,4 @@
-	 *    @param    string		$filter          	Add a SQL filter on list. Data must not come from user input.

-	 *    @param	string		$htmlname			HTML name of select

-	 *    @param	string		$morecss			More CSS

-	 *    @return	string							String with HTML select

+     *    @param    string		$filter          	Add a SQL filter on list

+     *    @param	string		$htmlname			HTML name of select

+     *    @param	string		$morecss			More CSS

+     *    @return	string							String with HTML select

@@ -547 +466 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -555 +474 @@
-		$sql .= " FROM " . $this->db->prefix() . "c_forme_juridique as f, " . $this->db->prefix() . "c_country as c";

+		$sql .= " FROM ".MAIN_DB_PREFIX."c_forme_juridique as f, ".MAIN_DB_PREFIX."c_country as c";

@@ -558,6 +477,2 @@
-		if ($country_codeid) {

-			$sql .= " AND c.code = '" . $this->db->escape($country_codeid) . "'";

-		}

-		if ($filter) {

-			$sql .= " " . $filter;

-		}

+		if ($country_codeid) $sql .= " AND c.code = '".$country_codeid."'";

+		if ($filter) $sql .= " ".$filter;

@@ -566 +481 @@
-		dol_syslog(get_class($this) . "::select_juridicalstatus", LOG_DEBUG);

+		dol_syslog(get_class($this)."::select_juridicalstatus", LOG_DEBUG);

@@ -568 +483,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -570,4 +486,2 @@
-			$out .= '<select class="flat minwidth200' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '" id="' . $htmlname . '">';

-			if ($country_codeid) {

-				$out .= '<option value="0">&nbsp;</option>'; // When country_codeid is set, we force to add an empty line because it does not appears from select. When not set, we already get the empty line from select.

-			}

+			$out .= '<select class="flat minwidth200'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';

+			if ($country_codeid) $out .= '<option value="0">&nbsp;</option>'; // When country_codeid is set, we force to add an empty line because it does not appears from select. When not set, we already get the empty line from select.

@@ -576 +490,2 @@
-			if ($num) {

+			if ($num)

+			{

@@ -578,3 +493,3 @@
-				$country = '';

-				$arraydata = array();

-				while ($i < $num) {

+				$country = ''; $arraydata = array();

+				while ($i < $num)

+				{

@@ -583,4 +498,5 @@
-					if ($obj->code) {		// We exclude empty line, we will add it later

-						$labelcountry = (($langs->trans("Country" . $obj->country_code) != "Country" . $obj->country_code) ? $langs->trans("Country" . $obj->country_code) : $obj->country);

-						$labeljs = (($langs->trans("JuridicalStatus" . $obj->code) != "JuridicalStatus" . $obj->code) ? $langs->trans("JuridicalStatus" . $obj->code) : ($obj->label != '-' ? $obj->label : '')); // $obj->label is already in output charset (converted by database driver)

-						$arraydata[$obj->code] = array('code' => $obj->code, 'label' => $labeljs, 'label_sort' => $labelcountry . '_' . $labeljs, 'country_code' => $obj->country_code, 'country' => $labelcountry);

+					if ($obj->code)		// We exclude empty line, we will add it later

+					{

+						$labelcountry = (($langs->trans("Country".$obj->country_code) != "Country".$obj->country_code) ? $langs->trans("Country".$obj->country_code) : $obj->country);

+						$labeljs = (($langs->trans("JuridicalStatus".$obj->code) != "JuridicalStatus".$obj->code) ? $langs->trans("JuridicalStatus".$obj->code) : ($obj->label != '-' ? $obj->label : '')); // $obj->label is already in output charset (converted by database driver)

+						$arraydata[$obj->code] = array('code'=>$obj->code, 'label'=>$labeljs, 'label_sort'=>$labelcountry.'_'.$labeljs, 'country_code'=>$obj->country_code, 'country'=>$labelcountry);

@@ -592,6 +508,9 @@
-				if (empty($country_codeid)) {	// Introduce empty value (if $country_codeid not empty, empty value was already added)

-					$arraydata[0] = array('code' => 0, 'label' => '', 'label_sort' => '_', 'country_code' => '', 'country' => '');

-				}

-

-				foreach ($arraydata as $key => $val) {

-					if (!$country || $country != $val['country']) {

+				if (empty($country_codeid))	// Introduce empty value (if $country_codeid not empty, empty value was already added)

+				{

+					$arraydata[0] = array('code'=>0, 'label'=>'', 'label_sort'=>'_', 'country_code'=>'', 'country'=>'');

+				}

+

+				foreach ($arraydata as $key => $val)

+				{

+					if (!$country || $country != $val['country'])

+					{

@@ -599,2 +518,3 @@
-						if (empty($country_codeid) && $val['country_code']) {

-							$out .= '<option value="0" disabled class="selectoptiondisabledwhite">----- ' . $val['country'] . " -----</option>\n";

+						if (empty($country_codeid) && $val['country_code'])

+						{

+							$out .= '<option value="0" disabled class="selectoptiondisabledwhite">----- '.$val['country']." -----</option>\n";

@@ -605,4 +525,7 @@
-					if ($selected > 0 && $selected == $val['code']) {

-						$out .= '<option value="' . $val['code'] . '" selected>';

-					} else {

-						$out .= '<option value="' . $val['code'] . '">';

+					if ($selected > 0 && $selected == $val['code'])

+					{

+						$out .= '<option value="'.$val['code'].'" selected>';

+					}

+					else

+					{

+						$out .= '<option value="'.$val['code'].'">';

@@ -616,7 +539,5 @@
-			if ($user->admin) {

-				$out .= ' ' . info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

-			}

-

-			// Make select dynamic

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

-			$out .= ajax_combobox($htmlname);

+			if ($user->admin) $out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+

+		    // Make select dynamic

+        	include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

+	        $out .= ajax_combobox($htmlname);

@@ -625 +546,3 @@
-		} else {

+		}

+		else

+		{

@@ -642,2 +565,2 @@
-	 *  @param	string		$moreparam		String with more param to add into url when noajax search is used.

-	 *  @param	string		$morecss		More CSS on select component

+     *  @param	string		$moreparam		String with more param to add into url when noajax search is used.

+     *  @param	string		$morecss		More CSS on select component

@@ -648,3 +571,4 @@
-		global $conf, $hookmanager;

-

-		if (!empty($conf->use_javascript_ajax) && getDolGlobalString('COMPANY_USE_SEARCH_TO_SELECT')) {

+		global $conf, $langs;

+

+		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT))

+		{

@@ -654,3 +578,3 @@
-			$socid = 0;

-			$name = '';

-			if ($selected > 0) {

+			$socid = 0; $name = '';

+			if ($selected > 0)

+			{

@@ -659 +583,2 @@
-				if ($result > 0) {

+				if ($result > 0)

+				{

@@ -674,2 +599,3 @@
-			if (count($events)) {	// If there is some ajax events to run once selection is done, we add code here to run events

-				print '<script nonce="' . getNonce() . '" type="text/javascript">

+			if (count($events))	// If there is some ajax events to run once selection is done, we add code here to run events

+			{

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

@@ -677,2 +603,2 @@
-					$("#search_' . $htmlname . '").change(function() {

-						var obj = ' . json_encode($events) . ';

+					$("#search_'.$htmlname.'").change(function() {

+						var obj = '.json_encode($events).';

@@ -681 +607 @@
-								runJsCodeForEvent' . $htmlname . '(values);

+								runJsCodeForEvent'.$htmlname.'(values);

@@ -689,2 +615,2 @@
-					function runJsCodeForEvent' . $htmlname . '(obj) {

-						var id = $("#' . $htmlname . '").val();

+					function runJsCodeForEvent'.$htmlname.'(obj) {

+						var id = $("#'.$htmlname.'").val();

@@ -695 +621 @@
-						console.log("Run runJsCodeForEvent-' . $htmlname . ' from selectCompaniesForNewContact id="+id+" method="+method+" showempty="+showempty+" url="+url+" htmlname="+htmlname);

+						console.log("Run runJsCodeForEvent-'.$htmlname.' from selectCompaniesForNewContact id="+id+" method="+method+" showempty="+showempty+" url="+url+" htmlname="+htmlname);

@@ -720 +646 @@
-					}

+					};

@@ -725,3 +651,3 @@
-			print "\n" . '<!-- Input text for third party with Ajax.Autocompleter (selectCompaniesForNewContact) -->' . "\n";

-			print '<input type="text" size="30" id="search_' . $htmlname . '" name="search_' . $htmlname . '" value="' . $name . '" />';

-			print ajax_autocompleter(($socid ? $socid : -1), $htmlname, DOL_URL_ROOT . '/societe/ajax/ajaxcompanies.php', '', $minLength, 0);

+			print "\n".'<!-- Input text for third party with Ajax.Autocompleter (selectCompaniesForNewContact) -->'."\n";

+			print '<input type="text" size="30" id="search_'.$htmlname.'" name="search_'.$htmlname.'" value="'.$name.'" />';

+			print ajax_autocompleter(($socid ? $socid : -1), $htmlname, DOL_URL_ROOT.'/societe/ajaxcompanies.php', '', $minLength, 0);

@@ -729 +655,3 @@
-		} else {

+		}

+		else

+		{

@@ -731,13 +659,3 @@
-			$sql = "SELECT s.rowid, s.nom as name ";

-			if (getDolGlobalString('SOCIETE_ADD_REF_IN_LIST')) {

-				$sql .= ", s.code_client, s.code_fournisseur";

-			}

-			if (getDolGlobalString('COMPANY_SHOW_ADDRESS_SELECTLIST')) {

-				$sql .= ", s.address, s.zip, s.town";

-				$sql .= ", dictp.code as country_code";

-			}

-			$sql .= " FROM " . $this->db->prefix() . "societe as s";

-			if (getDolGlobalString('COMPANY_SHOW_ADDRESS_SELECTLIST')) {

-				$sql .= " LEFT JOIN " . $this->db->prefix() . "c_country as dictp ON dictp.rowid = s.fk_pays";

-			}

-			$sql .= " WHERE s.entity IN (" . getEntity('societe') . ")";

+			$sql = "SELECT s.rowid, s.nom as name FROM";

+			$sql .= " ".MAIN_DB_PREFIX."societe as s";

+			$sql .= " WHERE s.entity IN (".getEntity('societe').")";

@@ -745,7 +663,4 @@
-			if (is_array($limitto) && count($limitto)) {

-				$sql .= " AND s.rowid IN (" . $this->db->sanitize(join(',', $limitto)) . ")";

-			}

-			// Add where from hooks

-			$parameters = array();

-			$reshook = $hookmanager->executeHooks('selectCompaniesForNewContactListWhere', $parameters); // Note that $action and $object may have been modified by hook

-			$sql .= $hookmanager->resPrint;

+			if (is_array($limitto) && count($limitto))

+			{

+				$sql .= " AND s.rowid IN (".join(',', $limitto).")";

+			}

@@ -755,5 +670,7 @@
-			if ($resql) {

-				print '<select class="flat' . ($morecss ? ' ' . $morecss : '') . '" id="' . $htmlname . '" name="' . $htmlname . '"';

-				if ($conf->use_javascript_ajax) {

-					$javaScript = "window.location='" . dol_escape_js($_SERVER['PHP_SELF']) . "?" . $var_id . "=" . ($forceid > 0 ? $forceid : $object->id) . $moreparam . "&" . $htmlname . "=' + form." . $htmlname . ".options[form." . $htmlname . ".selectedIndex].value;";

-					print ' onChange="' . $javaScript . '"';

+			if ($resql)

+			{

+				print '<select class="flat'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'"';

+				if ($conf->use_javascript_ajax)

+				{

+					$javaScript = "window.location='".$_SERVER['PHP_SELF']."?".$var_id."=".($forceid > 0 ? $forceid : $object->id).$moreparam."&".$htmlname."=' + form.".$htmlname.".options[form.".$htmlname.".selectedIndex].value;";

+					print ' onChange="'.$javaScript.'"';

@@ -762,2 +678,0 @@
-				print '<option value="-1">&nbsp;</option>';

-

@@ -766,2 +681,4 @@
-				if ($num) {

-					while ($i < $num) {

+				if ($num)

+				{

+					while ($i < $num)

+					{

@@ -769 +686,8 @@
-						if ($i == 0) {

+						if ($i == 0) $firstCompany = $obj->rowid;

+						$disabled = 0;

+						if (is_array($limitto) && count($limitto) && !in_array($obj->rowid, $limitto)) $disabled = 1;

+						if ($selected > 0 && $selected == $obj->rowid)

+						{

+							print '<option value="'.$obj->rowid.'"';

+							if ($disabled) print ' disabled';

+							print ' selected>'.dol_trunc($obj->name, 24).'</option>';

@@ -772,17 +696,5 @@
-						$disabled = 0;

-						if (is_array($limitto) && count($limitto) && !in_array($obj->rowid, $limitto)) {

-							$disabled = 1;

-						}

-						if ($selected > 0 && $selected == $obj->rowid) {

-							print '<option value="' . $obj->rowid . '"';

-							if ($disabled) {

-								print ' disabled';

-							}

-							print ' selected>' . dol_escape_htmltag($obj->name, 0, 0, '', 0, 1) . '</option>';

-							$firstCompany = $obj->rowid;

-						} else {

-							print '<option value="' . $obj->rowid . '"';

-							if ($disabled) {

-								print ' disabled';

-							}

-							print '>' . dol_escape_htmltag($obj->name, 0, 0, '', 0, 1) . '</option>';

+						else

+						{

+							print '<option value="'.$obj->rowid.'"';

+							if ($disabled) print ' disabled';

+							print '>'.dol_trunc($obj->name, 24).'</option>';

@@ -796 +708,3 @@
-			} else {

+			}

+			else

+			{

@@ -803,46 +717,34 @@
-	/**

-	 *  Return a select list with types of contacts

-	 *

-	 *  @param	object		$object         	Object to use to find type of contact

-	 *  @param  string		$selected       	Default selected value

-	 *  @param  string		$htmlname			HTML select name

-	 *  @param  string		$source				Source ('internal' or 'external')

-	 *  @param  string		$sortorder			Sort criteria ('position', 'code', ...)

-	 *  @param  int			$showempty      	1=Add en empty line

-	 *  @param  string      $morecss        	Add more css to select component

-	 *  @param  int      	$output         	0=return HTML, 1= direct print

-	 *  @param	int			$forcehidetooltip	Force hide tooltip for admin

-	 *  @return	string|void						Depending on $output param, return the HTML select list (recommended method) or nothing

-	 */

-	public function selectTypeContact($object, $selected, $htmlname = 'type', $source = 'internal', $sortorder = 'position', $showempty = 0, $morecss = '', $output = 1, $forcehidetooltip = 0)

-	{

-		global $user, $langs;

-

-		$out = '';

-		if (is_object($object) && method_exists($object, 'liste_type_contact')) {

-			$lesTypes = $object->liste_type_contact($source, $sortorder, 0, 1);	// List of types into c_type_contact for element=$object->element

-

-			$out .= '<select class="flat valignmiddle' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '" id="' . $htmlname . '">';

-			if ($showempty) {

-				$out .= '<option value="0">&nbsp;</option>';

-			}

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

-				$out .= '<option value="' . $key . '"';

-				if ($key == $selected) {

-					$out .= ' selected';

-				}

-				$out .= '>' . $value . '</option>';

-			}

-			$out .= "</select>";

-			if ($user->admin && empty($forcehidetooltip)) {

-				$out .= ' ' . info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

-			}

-

-			$out .= ajax_combobox($htmlname);

-

-			$out .= "\n";

-		}

-		if (empty($output)) {

-			return $out;

-		} else {

-			print $out;

+    /**

+     *  Return a select list with types of contacts

+     *

+     *  @param	object		$object         Object to use to find type of contact

+     *  @param  string		$selected       Default selected value

+     *  @param  string		$htmlname		HTML select name

+     *  @param  string		$source			Source ('internal' or 'external')

+     *  @param  string		$sortorder		Sort criteria ('position', 'code', ...)

+     *  @param  int			$showempty      1=Add en empty line

+     *  @param  string      $morecss        Add more css to select component

+     *  @return	void

+     */

+    public function selectTypeContact($object, $selected, $htmlname = 'type', $source = 'internal', $sortorder = 'position', $showempty = 0, $morecss = '')

+	{

+	    global $user, $langs;

+

+		if (is_object($object) && method_exists($object, 'liste_type_contact'))

+		{

+			$lesTypes = $object->liste_type_contact($source, $sortorder, 0, 1);

+

+			print '<select class="flat valignmiddle'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';

+			if ($showempty) print '<option value="0"></option>';

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

+			{

+				print '<option value="'.$key.'"';

+				if ($key == $selected) print ' selected';

+				print '>'.$value.'</option>';

+			}

+			print "</select>";

+			if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+

+			print ajax_combobox($htmlname);

+

+			print "\n";

@@ -855,8 +757,7 @@
-	 * @param 	string 		$htmlname 	Html component name and id

-	 * @param 	Contact 	$contact 	Contact Obejct

-	 * @param 	string 		$rendermode view, edit

-	 * @param 	array		$selected 	$key=>$val $val is selected Roles for input mode

-	 * @param	string		$morecss	More css

-	 * @return 	string   				String with contacts roles

-	 */

-	public function showRoles($htmlname, Contact $contact, $rendermode = 'view', $selected = array(), $morecss = 'minwidth500')

+	 * @param string $htmlname Html component name and id

+	 * @param Contact $contact Contact Obejct

+	 * @param string $rendermode view, edit

+	 * @param array $selected $key=>$val $val is selected Roles for input mode

+	 * @return string   String with contacts roles

+	 */

+	public function showRoles($htmlname, Contact $contact, $rendermode = 'view', $selected = array())

@@ -867,6 +768,7 @@
-				$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb;">' . $val['label'] . '</li>';

-			}

-			return '<div class="select2-container-multi-dolibarr" style="width: 90%;" id="' . $htmlname . '"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';

-		}

-

-		if ($rendermode === 'edit') {

+				$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa;">'.$val['label'].'</li>';

+			}

+			return '<div class="select2-container-multi-dolibarr" style="width: 90%;" id="'.$htmlname.'"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';

+		}

+

+		if ($rendermode === 'edit')

+		{

@@ -876 +778 @@
-				foreach ($selected as $key => $val) {

+				foreach ($selected as $key=>$val) {

@@ -883,5 +785,3 @@
-				if (count($newselected) > 0) {

-					$selected = $newselected;

-				}

-			}

-			return $this->multiselectarray($htmlname, $contactType, $selected, 0, 0, $morecss);

+				if (count($newselected) > 0) $selected = $newselected;

+			}

+			return $this->multiselectarray($htmlname, $contactType, $selected);

@@ -893 +793 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -899 +799 @@
-	 *    @param    array		$fields					Array with key of fields to refresh after selection

+	 *    @param    string		$fields					Fields

@@ -906,3 +806,3 @@
-	public function select_ziptown($selected = '', $htmlname = 'zipcode', $fields = array(), $fieldsize = 0, $disableautocomplete = 0, $moreattrib = '', $morecss = '')

-	{

-		// phpcs:enable

+	public function select_ziptown($selected = '', $htmlname = 'zipcode', $fields = '', $fieldsize = 0, $disableautocomplete = 0, $moreattrib = '', $morecss = '')

+	{

+        // phpcs:enable

@@ -914,6 +814,5 @@
-		if (!empty($fieldsize)) {

-			$size = 'size="' . $fieldsize . '"';

-		}

-

-		if ($conf->use_javascript_ajax && empty($disableautocomplete)) {

-			$out .= ajax_multiautocompleter($htmlname, $fields, DOL_URL_ROOT . '/core/ajax/ziptown.php') . "\n";

+		if (!empty($fieldsize)) $size = 'size="'.$fieldsize.'"';

+

+		if ($conf->use_javascript_ajax && empty($disableautocomplete))

+		{

+			$out .= ajax_multiautocompleter($htmlname, $fields, DOL_URL_ROOT.'/core/ajax/ziptown.php')."\n";

@@ -922 +821 @@
-		$out .= '<input id="' . $htmlname . '" class="maxwidthonsmartphone' . ($morecss ? ' ' . $morecss : '') . '" type="text"' . ($moreattrib ? ' ' . $moreattrib : '') . ' name="' . $htmlname . '" ' . $size . ' value="' . $selected . '">' . "\n";

+		$out .= '<input id="'.$htmlname.'" class="maxwidthonsmartphone'.($morecss ? ' '.$morecss : '').'" type="text"'.($moreattrib ? ' '.$moreattrib : '').' name="'.$htmlname.'" '.$size.' value="'.$selected.'">'."\n";

@@ -927,286 +826,154 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 *  Return HTML string to use as input of professional id into a HTML page (siren, siret, etc...)

-	 *

-	 *  @param	int		$idprof         1,2,3,4 (Example: 1=siren,2=siret,3=naf,4=rcs/rm)

-	 *  @param  string	$htmlname       Name of HTML select

-	 *  @param  string	$preselected    Default value to show

-	 *  @param  string	$country_code   FR, IT, ...

-	 *  @param  string  $morecss        More css

-	 *  @return	string					HTML string with prof id

-	 */

-	public function get_input_id_prof($idprof, $htmlname, $preselected, $country_code, $morecss = 'maxwidth200')

-	{

-		// phpcs:enable

-		global $conf, $langs, $hookmanager;

-

-		$formlength = 0;

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

-			if ($country_code == 'FR') {

-				if (isset($idprof)) {

-					if ($idprof == 1) {

-						$formlength = 9;

-					} elseif ($idprof == 2) {

-						$formlength = 14;

-					} elseif ($idprof == 3) {

-						$formlength = 5; // 4 chiffres et 1 lettre depuis janvier

-					} elseif ($idprof == 4) {

-						$formlength = 32; // No maximum as we need to include a town name in this id

-					}

-				}

-			} elseif ($country_code == 'ES') {

-				if ($idprof == 1) {

-					$formlength = 9; //CIF/NIF/NIE 9 digits

-				}

-				if ($idprof == 2) {

-					$formlength = 12; //NASS 12 digits without /

-				}

-				if ($idprof == 3) {

-					$formlength = 5; //CNAE 5 digits

-				}

-				if ($idprof == 4) {

-					$formlength = 32; //depend of college

-				}

-			}

-		}

-

-		$selected = $preselected;

-		if (!$selected && isset($idprof)) {

-			if ($idprof == 1 && !empty($this->idprof1)) {

-				$selected = $this->idprof1;

-			} elseif ($idprof == 2 && !empty($this->idprof2)) {

-				$selected = $this->idprof2;

-			} elseif ($idprof == 3 && !empty($this->idprof3)) {

-				$selected = $this->idprof3;

-			} elseif ($idprof == 4 && !empty($this->idprof4)) {

-				$selected = $this->idprof4;

-			}

-		}

-

-		$maxlength = $formlength;

-		if (empty($formlength)) {

-			$formlength = 24;

-			$maxlength = 128;

-		}

-

-		$out = '';

-

-		// Execute hook getInputIdProf to complete or replace $out

-		$parameters = array('formlength' => $formlength, 'selected' => $preselected, 'idprof' => $idprof, 'htmlname' => $htmlname, 'country_code' => $country_code);

-		$reshook = $hookmanager->executeHooks('getInputIdProf', $parameters);

-		if (empty($reshook)) {

-			$out .= '<input type="text" ' . ($morecss ? 'class="' . $morecss . '" ' : '') . 'name="' . $htmlname . '" id="' . $htmlname . '" maxlength="' . $maxlength . '" value="' . $selected . '">';

-		}

-		$out .= $hookmanager->resPrint;

-

-		return $out;

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 * Return a HTML select with localtax values for thirdparties

-	 *

-	 * @param 	int 		$local			LocalTax

-	 * @param 	float 		$selected		Preselected value

-	 * @param 	string      $htmlname		HTML select name

-	 * @return	void

-	 */

-	public function select_localtax($local, $selected, $htmlname)

-	{

-		// phpcs:enable

-		$tax = get_localtax_by_third($local);

-

-		if ($tax) {

-			$valors = explode(":", $tax);

-			$nbvalues = count($valors);

-

-			if ($nbvalues > 1) {

-				//montar select

-				print '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';

-				$i = 0;

-				while ($i < $nbvalues) {

-					if ($selected == $valors[$i]) {

-						print '<option value="' . $valors[$i] . '" selected>';

-					} else {

-						print '<option value="' . $valors[$i] . '">';

-					}

-					print $valors[$i];

-					print '</option>';

-					$i++;

-				}

-				print '</select>';

-			}

-		}

-	}

-

-	/**

-	 * Return a HTML select for thirdparty type

-	 *

-	 * @param int 		$selected 		Selected value

-	 * @param string 	$htmlname 		HTML select name

-	 * @param string 	$htmlidname 	HTML select id

-	 * @param string 	$typeinput 		HTML output

-	 * @param string 	$morecss 		More css

-	 * @param string	$allowempty		Allow empty value or not

-	 * @return string 					HTML string

-	 */

-	public function selectProspectCustomerType($selected, $htmlname = 'client', $htmlidname = 'customerprospect', $typeinput = 'form', $morecss = '', $allowempty = '')

-	{

-		global $conf, $langs;

-		if (getDolGlobalString('SOCIETE_DISABLE_PROSPECTS') && getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS') && !isModEnabled('fournisseur')) {

-			return '';

-		}

-

-		$out = '<select class="flat ' . $morecss . '" name="' . $htmlname . '" id="' . $htmlidname . '">';

-		if ($typeinput == 'form') {

-			if ($allowempty || ($selected == '' || $selected == '-1')) {

-				$out .= '<option value="-1">';

-				if (is_numeric($allowempty)) {

-					$out .= '&nbsp;';

-				} else {

-					$out .= $langs->trans($allowempty);

-				}

-				$out .= '</option>';

-			}

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

-				$out .= '<option value="2"' . ($selected == 2 ? ' selected' : '') . '>' . $langs->trans('Prospect') . '</option>';

-			}

-			if (!getDolGlobalString('SOCIETE_DISABLE_PROSPECTS') && !getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS') && !getDolGlobalString('SOCIETE_DISABLE_PROSPECTSCUSTOMERS')) {

-				$out .= '<option value="3"' . ($selected == 3 ? ' selected' : '') . '>' . $langs->trans('ProspectCustomer') . '</option>';

-			}

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

-				$out .= '<option value="1"' . ($selected == 1 ? ' selected' : '') . '>' . $langs->trans('Customer') . '</option>';

-			}

-			$out .= '<option value="0"' . ((string) $selected == '0' ? ' selected' : '') . '>' . $langs->trans('NorProspectNorCustomer') . '</option>';

-		} elseif ($typeinput == 'list') {

-			$out .= '<option value="-1"' . (($selected == '' || $selected == '-1') ? ' selected' : '') . '>&nbsp;</option>';

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

-				$out .= '<option value="2,3"' . ($selected == '2,3' ? ' selected' : '') . '>' . $langs->trans('Prospect') . '</option>';

-			}

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

-				$out .= '<option value="1,3"' . ($selected == '1,3' ? ' selected' : '') . '>' . $langs->trans('Customer') . '</option>';

-			}

-			if (isModEnabled("fournisseur")) {

-				$out .= '<option value="4"' . ($selected == '4' ? ' selected' : '') . '>' . $langs->trans('Supplier') . '</option>';

-			}

-			$out .= '<option value="0"' . ($selected == '0' ? ' selected' : '') . '>' . $langs->trans('Other') . '</option>';

-		} elseif ($typeinput == 'admin') {

-			if (!getDolGlobalString('SOCIETE_DISABLE_PROSPECTS') && !getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS') && !getDolGlobalString('SOCIETE_DISABLE_PROSPECTSCUSTOMERS')) {

-				$out .= '<option value="3"' . ($selected == 3 ? ' selected' : '') . '>' . $langs->trans('ProspectCustomer') . '</option>';

-			}

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

-				$out .= '<option value="1"' . ($selected == 1 ? ' selected' : '') . '>' . $langs->trans('Customer') . '</option>';

-			}

-		}

-		$out .= '</select>';

-		$out .= ajax_combobox($htmlidname);

-

-		return $out;

-	}

-

-	/**

-	 *  Output html select to select third-party type

-	 *

-	 *  @param	string	$page       	Page

-	 *  @param  string	$selected   	Id preselected

-	 *  @param  string	$htmlname		Name of HTML select

-	 *  @param  string	$filter         optional filters criteras

-	 *  @param  int     $nooutput       No print output. Return it only.

-	 *  @return	void|string

-	 */

-	public function formThirdpartyType($page, $selected = '', $htmlname = 'socid', $filter = '', $nooutput = 0)

-	{

-		// phpcs:enable

-		global $conf, $langs;

-

-		$out = '';

-		if ($htmlname != "none") {

-			$out .= '<form method="post" action="' . $page . '">';

-			$out .= '<input type="hidden" name="action" value="set_thirdpartytype">';

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

-			$sortparam = (!getDolGlobalString('SOCIETE_SORT_ON_TYPEENT') ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.

-			$out .= $this->selectarray($htmlname, $this->typent_array(0, $filter), $selected, 1, 0, 0, '', 0, 0, 0, $sortparam, '', 1);

-			$out .= '<input type="submit" class="button smallpaddingimp valignmiddle" value="' . $langs->trans("Modify") . '">';

-			$out .= '</form>';

-		} else {

-			if ($selected > 0) {

-				$arr = $this->typent_array(0);

-				$typent = $arr[$selected];

-				$out .= $typent;

-			} else {

-				$out .= "&nbsp;";

-			}

-		}

-

-		if ($nooutput) {

-			return $out;

-		} else {

-			print $out;

-		}

-	}

-

-	/**

-	 *  Output html select to select prospect status

-	 *

-	 *  @param  string			$htmlname		Name of HTML select

-	 *  @param	Societe|null	$prospectstatic Prospect object

-	 *  @param  int				$statusprospect	status of prospect

-	 *  @param  int				$idprospect     id of prospect

-	 *  @param  string  		$mode      		select if we want activate de html part or js

-	 *  @return	void

-	 */

-	public function selectProspectStatus($htmlname, $prospectstatic, $statusprospect, $idprospect, $mode = "html")

-	{

-		global $user, $langs;

-

-		if ($mode === "html") {

-			$actioncode = empty($prospectstatic->cacheprospectstatus[$statusprospect]) ? '' : $prospectstatic->cacheprospectstatus[$statusprospect]['code'];

-			$actionpicto = empty($prospectstatic->cacheprospectstatus[$statusprospect]['picto']) ? '' : $prospectstatic->cacheprospectstatus[$statusprospect]['picto'];

-

-			//print $prospectstatic->LibProspCommStatut($statusprospect, 2, $prospectstatic->cacheprospectstatus[$statusprospect]['label'], $prospectstatic->cacheprospectstatus[$statusprospect]['picto']);

-			print img_action('', $actioncode, $actionpicto, 'class="inline-block valignmiddle paddingright pictoprospectstatus"');

-			print '<select class="flat selectprospectstatus maxwidth150" id="'. $htmlname.$idprospect .'" data-socid="'.$idprospect.'" name="' . $htmlname .'"';

-			if (!$user->hasRight('societe', 'creer')) {

-				print ' disabled';

-			}

-			print '>';

-			foreach ($prospectstatic->cacheprospectstatus as $key => $val) {

-				//$titlealt = (empty($val['label']) ? 'default' : $val['label']);

-				$label = $val['label'];

-				if (!empty($val['code']) && !in_array($val['code'], array('ST_NO', 'ST_NEVER', 'ST_TODO', 'ST_PEND', 'ST_DONE'))) {

-					//$titlealt = $val['label'];

-					$label = (($langs->trans("StatusProspect".$val['code']) != "StatusProspect".$val['code']) ? $langs->trans("StatusProspect".$val['code']) : $label);

-				} else {

-					$label = (($langs->trans("StatusProspect".$val['id']) != "StatusProspect".$val['id']) ? $langs->trans("StatusProspect".$val['id']) : $label);

-				}

-				print '<option value="'.$val['id'].'" data-html="'.dol_escape_htmltag(img_action('', $val['code'], $val['picto']).' '.$label).'" title="'.dol_escape_htmltag($label).'"'.($statusprospect == $val['id'] ? ' selected' : '').'>';

-				print dol_escape_htmltag($label);

-				print '</option>';

-			}

-			print '</select>';

-			print ajax_combobox($htmlname.$idprospect);

-		} elseif ($mode === "js") {

-			print '<script>

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

-					$(".selectprospectstatus").on("change", function() {

-						console.log("We change a value into a field selectprospectstatus");

-						var statusid = $(this).val();

-						var prospectid = $(this).attr("data-socid");

-						var image = $(this).prev(".pictoprospectstatus");

-						$.ajax({

-							type: "POST",

-							url: \'' . DOL_URL_ROOT . '/core/ajax/ajaxstatusprospect.php\',

-							data: { id: statusid, prospectid: prospectid, token: \''. newToken() .'\', action: \'updatestatusprospect\' },

-							success: function(response) {

-								console.log(response.img);

-								image.replaceWith(response.img);

-							},

-							error: function() {

-								console.error("Error on status prospect");

-							},

-					});

-				});

-			});

-			</script>';

-		}

-	}

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     *  Return HTML string to use as input of professional id into a HTML page (siren, siret, etc...)

+     *

+     *  @param	int		$idprof         1,2,3,4 (Example: 1=siren,2=siret,3=naf,4=rcs/rm)

+     *  @param  string	$htmlname       Name of HTML select

+     *  @param  string	$preselected    Default value to show

+     *  @param  string	$country_code   FR, IT, ...

+     *  @param  string  $morecss        More css

+     *  @return	string					HTML string with prof id

+     */

+    public function get_input_id_prof($idprof, $htmlname, $preselected, $country_code, $morecss = 'maxwidth100onsmartphone quatrevingtpercent')

+    {

+        // phpcs:enable

+        global $conf, $langs, $hookmanager;

+

+        $formlength = 0;

+        if (empty($conf->global->MAIN_DISABLEPROFIDRULES)) {

+        	if ($country_code == 'FR')

+        	{

+        		if (isset($idprof)) {

+        			if ($idprof == 1) $formlength = 9;

+        			elseif ($idprof == 2) $formlength = 14;

+        			elseif ($idprof == 3) $formlength = 5; // 4 chiffres et 1 lettre depuis janvier

+        			elseif ($idprof == 4) $formlength = 32; // No maximum as we need to include a town name in this id

+        		}

+        	}

+        	elseif ($country_code == 'ES')

+        	{

+        		if ($idprof == 1) $formlength = 9; //CIF/NIF/NIE 9 digits

+        		if ($idprof == 2) $formlength = 12; //NASS 12 digits without /

+        		if ($idprof == 3) $formlength = 5; //CNAE 5 digits

+        		if ($idprof == 4) $formlength = 32; //depend of college

+        	}

+        }

+

+        $selected = $preselected;

+        if (!$selected && isset($idprof)) {

+        	if ($idprof == 1 && !empty($this->idprof1)) $selected = $this->idprof1;

+        	elseif ($idprof == 2 && !empty($this->idprof2)) $selected = $this->idprof2;

+        	elseif ($idprof == 3 && !empty($this->idprof3)) $selected = $this->idprof3;

+        	elseif ($idprof == 4 && !empty($this->idprof4)) $selected = $this->idprof4;

+        }

+

+        $maxlength = $formlength;

+        if (empty($formlength)) { $formlength = 24; $maxlength = 128; }

+

+        $out = '';

+

+        // Execute hook getInputIdProf to complete or replace $out

+        $parameters = array('formlength'=>$formlength, 'selected'=>$preselected, 'idprof'=>$idprof, 'htmlname'=>$htmlname, 'country_code'=>$country_code);

+        $reshook = $hookmanager->executeHooks('getInputIdProf', $parameters);

+        if (empty($reshook))

+        {

+        	$out .= '<input type="text" '.($morecss ? 'class="'.$morecss.'" ' : '').'name="'.$htmlname.'" id="'.$htmlname.'" maxlength="'.$maxlength.'" value="'.$selected.'">';

+        }

+        $out .= $hookmanager->resPrint;

+

+        return $out;

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     * Return a HTML select with localtax values for thirdparties

+     *

+     * @param 	int 		$local			LocalTax

+     * @param 	int 		$selected		Preselected value

+     * @param 	string      $htmlname		HTML select name

+     * @return	void

+     */

+    public function select_localtax($local, $selected, $htmlname)

+    {

+        // phpcs:enable

+        $tax = get_localtax_by_third($local);

+

+        $num = $this->db->num_rows($tax);

+        $i = 0;

+    	if ($num)

+    	{

+    		$valors = explode(":", $tax);

+

+    		if (count($valors) > 1)

+    		{

+    			//montar select

+    			print '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';

+    			while ($i <= (count($valors)) - 1)

+    			{

+    				if ($selected == $valors[$i])

+    				{

+    					print '<option value="'.$valors[$i].'" selected>';

+    				}

+    				else

+    				{

+    					print '<option value="'.$valors[$i].'">';

+    				}

+    				print $valors[$i];

+    				print '</option>';

+    				$i++;

+    			}

+    			print'</select>';

+    		}

+    	}

+    }

+

+    /**

+     * Return a HTML select for thirdparty type

+     *

+     * @param int $selected selected value

+     * @param string $htmlname HTML select name

+     * @param string $htmlidname HTML select id

+     * @param string $typeinput HTML output

+     * @param string $morecss More css

+     * @return string HTML string

+     */

+    public function selectProspectCustomerType($selected, $htmlname = 'client', $htmlidname = 'customerprospect', $typeinput = 'form', $morecss = '')

+    {

+

+    	global $conf, $langs;

+

+    	$out = '<select class="flat '.$morecss.'" name="'.$htmlname.'" id="'.$htmlidname.'">';

+    	if ($typeinput == 'form') {

+    		if ($selected == '' || $selected == '-1') $out .= '<option value="-1">&nbsp;</option>';

+	    	if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {

+	    		$out .= '<option value="2"'.($selected == 2 ? ' selected' : '').'>'.$langs->trans('Prospect').'</option>';

+	    	}

+	    	if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS)) {

+	    		$out .= '<option value="3"'.($selected == 3 ? ' selected' : '').'>'.$langs->trans('ProspectCustomer').'</option>';

+	    	}

+	    	if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {

+	    		$out .= '<option value="1"'.($selected == 1 ? ' selected' : '').'>'.$langs->trans('Customer').'</option>';

+	    	}

+	    	$out .= '<option value="0"'.((string) $selected == '0' ? ' selected' : '').'>'.$langs->trans('NorProspectNorCustomer').'</option>';

+    	} elseif ($typeinput == 'list') {

+    		$out .= '<option value="-1"'.(($selected == '' || $selected == '-1') ? ' selected' : '').'>&nbsp;</option>';

+    		if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {

+    			$out .= '<option value="1,3"'.($selected == '1,3' ? ' selected' : '').'>'.$langs->trans('Customer').'</option>';

+    		}

+    		if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {

+    			$out .= '<option value="2,3"'.($selected == '2,3' ? ' selected' : '').'>'.$langs->trans('Prospect').'</option>';

+    		}

+    		$out .= '<option value="4"'.($selected == '4' ? ' selected' : '').'>'.$langs->trans('Supplier').'</option>';

+    		$out .= '<option value="0"'.($selected == '0' ? ' selected' : '').'>'.$langs->trans('Other').'</option>';

+    	} elseif ($typeinput == 'admin') {

+    		if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS)) {

+    			$out .= '<option value="3"'.($selected == 3 ? ' selected' : '').'>'.$langs->trans('ProspectCustomer').'</option>';

+    		}

+    		if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {

+    			$out .= '<option value="1"'.($selected == 1 ? ' selected' : '').'>'.$langs->trans('Customer').'</option>';

+    		}

+    	}

+    	$out .= '</select>';

+

+    	return $out;

+    }

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_html.formcontract.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_html.formcontract.class.php
@@ -30,4 +30,4 @@
-	/**

-	 * @var DoliDB Database handler.

-	 */

-	public $db;

+    /**

+     * @var DoliDB Database handler.

+     */

+    public $db;

@@ -35 +35 @@
-	/**

+    /**

@@ -41,9 +41,9 @@
-	/**

-	 * Constructor

-	 *

-	 * @param		DoliDB		$db      Database handler

-	 */

-	public function __construct($db)

-	{

-		$this->db = $db;

-	}

+    /**

+     * Constructor

+     *

+     * @param		DoliDB		$db      Database handler

+     */

+    public function __construct($db)

+    {

+        $this->db = $db;

+    }

@@ -52 +52 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -61,4 +61 @@
-	 *	@param	int		$showRef	Show customer and supplier reference on each contract (when found)

-	 *  @param	int		$noouput	1=Return the output instead of display

-	 *  @param	string	$morecss	More CSS

-	 *	@return int         		Nbr of contract if OK, <0 if KO

+	 *	@return int         		Nbr of project if OK, <0 if KO

@@ -66,4 +63,4 @@
-	public function select_contract($socid = -1, $selected = '', $htmlname = 'contrattid', $maxlength = 16, $showempty = 1, $showRef = 0, $noouput = 0, $morecss = 'minwidth150')

-	{

-		// phpcs:enable

-		global $user, $conf, $langs;

+    public function select_contract($socid = -1, $selected = '', $htmlname = 'contrattid', $maxlength = 16, $showempty = 1)

+    {

+        // phpcs:enable

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

@@ -72,5 +69 @@
-		if (getDolGlobalString('CONTRACT_HIDE_UNSELECTABLES')) {

-			$hideunselectables = true;

-		}

-

-		$ret = '';

+		if (!empty($conf->global->CONTRACT_HIDE_UNSELECTABLES)) $hideunselectables = true;

@@ -79,3 +72,2 @@
-		$sql = "SELECT c.rowid, c.ref, c.fk_soc, c.statut,";

-		$sql .= " c.ref_customer, c.ref_supplier";

-		$sql .= " FROM ".$this->db->prefix()."contrat as c";

+		$sql = 'SELECT c.rowid, c.ref, c.fk_soc, c.statut';

+		$sql .= ' FROM '.MAIN_DB_PREFIX.'contrat as c';

@@ -83,2 +75,3 @@
-		//if ($contratListId) $sql.= " AND c.rowid IN (".$this->db->sanitize($contratListId).")";

-		if ($socid > 0) {

+		//if ($contratListId) $sql.= " AND c.rowid IN (".$contratListId.")";

+		if ($socid > 0)

+		{

@@ -86,4 +79,4 @@
-			if (!getDolGlobalString('CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY')) {

-				$sql .= " AND (c.fk_soc=".((int) $socid)." OR c.fk_soc IS NULL)";

-			} elseif (getDolGlobalString('CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY') != 'all') {

-				$sql .= " AND (c.fk_soc IN (".$this->db->sanitize(((int) $socid).",".((int) $conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY)).")";

+		    if (empty($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY)) {

+		        $sql .= " AND (c.fk_soc=".$socid." OR c.fk_soc IS NULL)";

+			} elseif ($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY != 'all') {

+		        $sql .= " AND (c.fk_soc IN (".$socid.", ".$conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY.") ";

@@ -91 +84 @@
-			}

+		    }

@@ -93,3 +86 @@
-		if ($socid == 0) {

-			$sql .= " AND (c.fk_soc = 0 OR c.fk_soc IS NULL)";

-		}

+		if ($socid == 0) $sql .= " AND (c.fk_soc = 0 OR c.fk_soc IS NULL)";

@@ -99,7 +90,6 @@
-		$resql = $this->db->query($sql);

-		if ($resql) {

-			$ret .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';

-			if ($showempty) {

-				$ret .= '<option value="0">&nbsp;</option>';

-			}

-			$num = $this->db->num_rows($resql);

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

+		if ($resql)

+		{

+			print '<select class="flat" name="'.$htmlname.'">';

+			if ($showempty) print '<option value="0">&nbsp;</option>';

+			$num = $db->num_rows($resql);

@@ -107,3 +97,5 @@
-			if ($num) {

-				while ($i < $num) {

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

+			if ($num)

+			{

+				while ($i < $num)

+				{

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

@@ -111 +103,2 @@
-					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && !$user->hasRight('societe', 'lire')) {

+					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && !$user->rights->societe->lire)

+					{

@@ -113 +106,3 @@
-					} else {

+					}

+					else

+					{

@@ -115,10 +109,0 @@
-

-						if ($showRef) {

-							if ($obj->ref_customer) {

-								$labeltoshow = $labeltoshow." - ".$obj->ref_customer;

-							}

-							if ($obj->ref_supplier) {

-								$labeltoshow = $labeltoshow." - ".$obj->ref_supplier;

-							}

-						}

-

@@ -127,3 +112,6 @@
-						if (!empty($selected) && $selected == $obj->rowid && $obj->statut > 0) {

-							$ret .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';

-						} else {

+						if (!empty($selected) && $selected == $obj->rowid && $obj->statut > 0)

+						{

+							print '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';

+						}

+						else

+						{

@@ -131 +119,2 @@
-							if ($obj->statut == 0) {

+							if ($obj->statut == 0)

+							{

@@ -135 +124,2 @@
-							if (!getDolGlobalString('CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY') && $socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid)) {

+							if (empty($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY) && $socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))

+							{

@@ -140 +130,2 @@
-							if ($hideunselectables && $disabled) {

+							if ($hideunselectables && $disabled)

+							{

@@ -142 +133,3 @@
-							} else {

+							}

+							else

+							{

@@ -144,3 +137 @@
-								if ($disabled) {

-									$resultat .= ' disabled';

-								}

+								if ($disabled) $resultat .= ' disabled';

@@ -152 +143 @@
-							$ret .= $resultat;

+							print $resultat;

@@ -158,2 +149,2 @@
-			$ret .= '</select>';

-			$this->db->free($resql);

+			print '</select>';

+			$db->free($resql);

@@ -161 +152,2 @@
-			if (!empty($conf->use_javascript_ajax)) {

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

+			{

@@ -164 +156 @@
-				$ret .= ajax_combobox($htmlname);

+				print ajax_combobox($htmlname);

@@ -167,6 +158,0 @@
-			if ($noouput) {

-				return $ret;

-			}

-

-			print $ret;

-

@@ -174,2 +160,4 @@
-		} else {

-			dol_print_error($this->db);

+		}

+		else

+		{

+			dol_print_error($db);

@@ -178 +166 @@
-	}

+    }

@@ -180,16 +168,14 @@
-	/**

-	 *  Show a form to select a contract

-	 *

-	 *  @param  int     $page       Page

-	 *  @param  int     $socid      Id third party (-1=all, 0=only contracts not linked to a third party, id=contracts not linked or linked to third party id)

-	 *  @param  int     $selected   Id contract preselected

-	 *  @param  string  $htmlname   Nom de la zone html

-	 *  @param  int     $maxlength	Maximum length of label

-	 *  @param  int     $showempty	Show empty line

-	 *  @param  int     $showRef    Show customer and supplier reference on each contract (when found)

-	 *  @param	int		$noouput	1=Return the output instead of display

-	 *  @return string|void         html string

-	 */

-	public function formSelectContract($page, $socid = -1, $selected = '', $htmlname = 'contrattid', $maxlength = 16, $showempty = 1, $showRef = 0, $noouput = 0)

-	{

-		global $langs;

+    /**

+     *  Show a form to select a contract

+     *

+     *  @param  int     $page       Page

+     *  @param  int     $socid      Id third party (-1=all, 0=only contracts not linked to a third party, id=contracts not linked or linked to third party id)

+     *  @param  int     $selected   Id contract preselected

+     *  @param  string  $htmlname   Nom de la zone html

+     *  @param  int     $maxlength	Maximum length of label

+     *  @param  int     $showempty	Show empty line

+     *  @return int                 Nbr of project if OK, <0 if KO

+     */

+    public function formSelectContract($page, $socid = -1, $selected = '', $htmlname = 'contrattid', $maxlength = 16, $showempty = 1)

+    {

+        global $langs;

@@ -197,13 +183,8 @@
-		$ret = '<form method="post" action="'.$page.'">';

-		$ret .= '<input type="hidden" name="action" value="setcontract">';

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

-		$ret .= $this->select_contract($socid, $selected, $htmlname, $maxlength, $showempty, $showRef, 1);

-		$ret .= '<input type="submit" class="button smallpaddingimp valignmiddle" value="'.$langs->trans("Modify").'">';

-		$ret .= '</form>';

-

-		if ($noouput) {

-			return $ret;

-		}

-

-		print $ret;

-	}

+        print "\n";

+        print '<form method="post" action="'.$page.'">';

+        print '<input type="hidden" name="action" value="setcontract">';

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

+        $this->select_contract($socid, $selected, $htmlname, $maxlength, $showempty);

+        print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';

+        print '</form>';

+    }

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_html.formcron.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_html.formcron.class.php
@@ -31,4 +31,4 @@
-	/**

-	 * @var DoliDB Database handler.

-	 */

-	public $db;

+    /**

+     * @var DoliDB Database handler.

+     */

+    public $db;

@@ -36,4 +36,4 @@
-	/**

-	 * @var string Error code (or message)

-	 */

-	public $error = '';

+    /**

+     * @var string Error code (or message)

+     */

+    public $error = '';

@@ -41,9 +41,9 @@
-	/**

-	 *  Constructor

-	 *

-	 *  @param      DoliDB      $db      Database handler

-	 */

-	public function __construct($db)

-	{

-		$this->db = $db;

-	}

+    /**

+     *  Constructor

+     *

+     *  @param      DoliDB      $db      Database handler

+     */

+    public function __construct($db)

+    {

+        $this->db = $db;

+    }

@@ -52,13 +52,13 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 *  Display On Off selector

-	 *

-	 *  @param  string      $htmlname       Html control name

-	 *  @param  integer     $selected       selected value

-	 *  @param  integer     $readonly       Select is read only or not

-	 *  @return string                      HTML select field

-	 */

-	public function select_typejob($htmlname, $selected = 0, $readonly = 0)

-	{

-		// phpcs:enable

-		global $langs;

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     *  Display On Off selector

+     *

+     *  @param  string      $htmlname       Html control name

+     *  @param  integer     $selected       selected value

+     *  @param  integer     $readonly       Select is read only or not

+     *  @return string                      HTML select field

+     */

+    public function select_typejob($htmlname, $selected = 0, $readonly = 0)

+    {

+        // phpcs:enable

+        global $langs;

@@ -66,16 +66,16 @@
-		$langs->load('cron@cron');

-		$out = '';

-		if (!empty($readonly)) {

-			if ($selected == 'command') {

-				$out = $langs->trans('CronType_command');

-				$out .= '<SELECT name="'.$htmlname.'" id="'.$htmlname.'" style="display:none"/>';

-				$out .= '<OPTION value="command" selected>'.$langs->trans('CronType_command').'</OPTION>';

-				$out .= '</SELECT>';

-			} elseif ($selected == 'method') {

-				$out = $langs->trans('CronType_method');

-				$out .= '<SELECT name="'.$htmlname.'" id="'.$htmlname.'" style="display:none"/>';

-				$out .= '<OPTION value="method" selected>'.$langs->trans('CronType_method').'</OPTION>';

-				$out .= '</SELECT>';

-			}

-		} else {

-			$out = '<SELECT class="flat" name="'.$htmlname.'" id="'.$htmlname.'" />';

+        $langs->load('cron@cron');

+        $out = '';

+        if (!empty($readonly)) {

+            if ($selected == 'command') {

+                $out = $langs->trans('CronType_command');

+                $out .= '<SELECT name="'.$htmlname.'" id="'.$htmlname.'" style="display:none"/>';

+                $out .= '<OPTION value="command" selected>'.$langs->trans('CronType_command').'</OPTION>';

+                $out .= '</SELECT>';

+            } elseif ($selected == 'method') {

+                $out = $langs->trans('CronType_method');

+                $out .= '<SELECT name="'.$htmlname.'" id="'.$htmlname.'" style="display:none"/>';

+                $out .= '<OPTION value="method" selected>'.$langs->trans('CronType_method').'</OPTION>';

+                $out .= '</SELECT>';

+            }

+        } else {

+            $out = '<SELECT class="flat" name="'.$htmlname.'" id="'.$htmlname.'" />';

@@ -83,6 +83,6 @@
-			if ($selected == 'command') {

-				$selected_attr = ' selected ';

-			} else {

-				$selected_attr = '';

-			}

-			$out .= '<OPTION value="command" '.$selected_attr.'>'.$langs->trans('CronType_command').'</OPTION>';

+            if ($selected == 'command') {

+                $selected_attr = ' selected ';

+            } else {

+                $selected_attr = '';

+            }

+            $out .= '<OPTION value="command" '.$selected_attr.'>'.$langs->trans('CronType_command').'</OPTION>';

@@ -90,6 +90,6 @@
-			if ($selected == 'method') {

-				$selected_attr = ' selected ';

-			} else {

-				$selected_attr = '';

-			}

-			$out .= '<OPTION value="method" '.$selected_attr.'>'.$langs->trans('CronType_method').'</OPTION>';

+            if ($selected == 'method') {

+                $selected_attr = ' selected ';

+            } else {

+                $selected_attr = '';

+            }

+            $out .= '<OPTION value="method" '.$selected_attr.'>'.$langs->trans('CronType_method').'</OPTION>';

@@ -97,5 +97,2 @@
-			$out .= '</SELECT>';

-		}

-		if (empty($readonly)) {

-			$out .= ajax_combobox($htmlname);

-		}

+            $out .= '</SELECT>';

+        }

@@ -103,2 +100,2 @@
-		return $out;

-	}

+        return $out;

+    }

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_html.formfile.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_html.formfile.class.php
@@ -10 +10 @@
- * Copyright (C) 2019-2023  Frédéric France     <frederic.france@netlogic.fr>

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

@@ -61 +61 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -73,2 +73,2 @@
-	 *  @param  integer     $useajax        Use fileupload ajax (0=never, 1=if enabled, 2=always whatever is option).

-	 *                                      Deprecated 2 should never be used and if 1 is used, option should not be enabled.

+     *  @param  integer     $useajax        Use fileupload ajax (0=never, 1=if enabled, 2=always whatever is option).

+     *                                      Deprecated 2 should never be used and if 1 is used, option should no be enabled.

@@ -80 +80 @@
-	 *  @param  int         $usewithoutform 0=Default, 1=Disable <form> and <input hidden> to use in existing form area, 2=Disable the tag <form> only

+	 *  @param  int         $usewithoutform 0=Default, 1=Disable <form> and style to use in existing area

@@ -82,3 +82 @@
-	 *  @param	int			$disablemulti	0=Default, 1=Disable multiple file upload

-	 *  @param	int			$nooutput		0=Output result with print, 1=Return result

-	 * 	@return	int|string					Return integer <0 if KO, >0 if OK, or string if $noouput=1

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

@@ -86 +84 @@
-	public function form_attach_new_file($url, $title = '', $addcancel = 0, $sectionid = 0, $perm = 1, $size = 50, $object = null, $options = '', $useajax = 1, $savingdocmask = '', $linkfiles = 1, $htmlname = 'formuserfile', $accept = '', $sectiondir = '', $usewithoutform = 0, $capture = 0, $disablemulti = 0, $nooutput = 0)

+	public function form_attach_new_file($url, $title = '', $addcancel = 0, $sectionid = 0, $perm = 1, $size = 50, $object = '', $options = '', $useajax = 1, $savingdocmask = '', $linkfiles = 1, $htmlname = 'formuserfile', $accept = '', $sectiondir = '', $usewithoutform = 0, $capture = 0)

@@ -88 +86 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -92,10 +90,9 @@
-		// Deprecation warning

-		if ($useajax == 2) {

-			dol_syslog(__METHOD__.": using 2 for useajax is deprecated and should be not used", LOG_WARNING);

-		}

-

-		if (!empty($conf->browser->layout) && $conf->browser->layout != 'classic') {

-			$useajax = 0;

-		}

-

-		if ((getDolGlobalString('MAIN_USE_JQUERY_FILEUPLOAD') && $useajax) || ($useajax == 2)) {

+        // Deprecation warning

+        if ($useajax == 2) {

+            dol_syslog(__METHOD__.": using 2 for useajax is deprecated and should be not used", LOG_WARNING);

+        }

+

+		if (!empty($conf->browser->layout) && $conf->browser->layout != 'classic') $useajax = 0;

+

+		if ((!empty($conf->global->MAIN_USE_JQUERY_FILEUPLOAD) && $useajax) || ($useajax == 2))

+		{

@@ -106,4 +103,4 @@
-			// TODO: Thisdoes not work when param nooutput=1

-			//return $this->_formAjaxFileUpload($object);

-			return 'Feature too bugged so removed';

-		} else {

+			return $this->_formAjaxFileUpload($object);

+		}

+		else

+	   	{

@@ -111,6 +108,2 @@
-			if (!$perm && getDolGlobalString('MAIN_BUTTON_HIDE_UNAUTHORIZED')) {

-				if ($nooutput) {

-					return '';

-				} else {

-					return 1;

-				}

+			if (!$perm && !empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) {

+				return 1;

@@ -121,23 +114,14 @@
-			if (empty($title)) {

-				$title = $langs->trans("AttachANewFile");

-			}

-			if ($title != 'none') {

-				$out .= load_fiche_titre($title, null, null);

-			}

-

-			if (empty($usewithoutform)) {		// Try to avoid this and set instead the form by the caller.

-				// Add a param as GET parameter to detect when POST were cleaned by PHP because a file larger than post_max_size

-				$url .= (strpos($url, '?') === false ? '?' : '&').'uploadform=1';

-

-				$out .= '<form name="'.$htmlname.'" id="'.$htmlname.'" action="'.$url.'" enctype="multipart/form-data" method="POST">'."\n";

-			}

-			if (empty($usewithoutform) || $usewithoutform == 2) {

-				$out .= '<input type="hidden" name="token" value="'.newToken().'">'."\n";

-				$out .= '<input type="hidden" id="'.$htmlname.'_section_dir" name="section_dir" value="'.$sectiondir.'">'."\n";

-				$out .= '<input type="hidden" id="'.$htmlname.'_section_id"  name="section_id" value="'.$sectionid.'">'."\n";

-				$out .= '<input type="hidden" name="sortfield" value="'.GETPOST('sortfield', 'aZ09comma').'">'."\n";

-				$out .= '<input type="hidden" name="sortorder" value="'.GETPOST('sortorder', 'aZ09comma').'">'."\n";

-				$out .= '<input type="hidden" name="page_y" value="">'."\n";

-			}

-

-			$out .= '<table class="nobordernopadding centpercent">';

+			if (empty($title)) $title = $langs->trans("AttachANewFile");

+			if ($title != 'none') $out .= load_fiche_titre($title, null, null);

+

+			if (empty($usewithoutform))		// Try to avoid this and set instead the form by the caller.

+			{

+    			$out .= '<form name="'.$htmlname.'" id="'.$htmlname.'" action="'.$url.'" enctype="multipart/form-data" method="POST">';

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

+    			$out .= '<input type="hidden" id="'.$htmlname.'_section_dir" name="section_dir" value="'.$sectiondir.'">';

+    			$out .= '<input type="hidden" id="'.$htmlname.'_section_id"  name="section_id" value="'.$sectionid.'">';

+    			$out .= '<input type="hidden" name="sortfield" value="'.GETPOST('sortfield', 'alpha').'">';

+    			$out .= '<input type="hidden" name="sortorder" value="'.GETPOST('sortorder', 'aZ09').'">';

+			}

+

+			$out .= '<table class="nobordernopadding cenpercent">';

@@ -146,3 +130 @@
-			if (!empty($options)) {

-				$out .= '<td>'.$options.'</td>';

-			}

+			if (!empty($options)) $out .= '<td>'.$options.'</td>';

@@ -152,8 +134,36 @@
-			$maxfilesizearray = getMaxFileSizeArray();

-			$max = $maxfilesizearray['max'];

-			$maxmin = $maxfilesizearray['maxmin'];

-			$maxphptoshow = $maxfilesizearray['maxphptoshow'];

-			$maxphptoshowparam = $maxfilesizearray['maxphptoshowparam'];

-			if ($maxmin > 0) {

-				$out .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file

-			}

+			$max = $conf->global->MAIN_UPLOAD_DOC; // In Kb

+			$maxphp = @ini_get('upload_max_filesize'); // In unknown

+			if (preg_match('/k$/i', $maxphp)) $maxphp = $maxphp * 1;

+			if (preg_match('/m$/i', $maxphp)) $maxphp = $maxphp * 1024;

+			if (preg_match('/g$/i', $maxphp)) $maxphp = $maxphp * 1024 * 1024;

+			if (preg_match('/t$/i', $maxphp)) $maxphp = $maxphp * 1024 * 1024 * 1024;

+			$maxphp2 = @ini_get('post_max_size'); // In unknown

+			if (preg_match('/k$/i', $maxphp2)) $maxphp2 = $maxphp2 * 1;

+			if (preg_match('/m$/i', $maxphp2)) $maxphp2 = $maxphp2 * 1024;

+			if (preg_match('/g$/i', $maxphp2)) $maxphp2 = $maxphp2 * 1024 * 1024;

+			if (preg_match('/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($max, $maxphp);

+				$maxphptoshow = $maxphp;

+				$maxphptoshowparam = 'upload_max_filesize';

+			}

+			if ($maxphp2 > 0)

+			{

+				$maxmin = min($max, $maxphp2);

+				if ($maxphp2 < $maxphp)

+				{

+					$maxphptoshow = $maxphp2;

+					$maxphptoshowparam = 'post_max_size';

+				}

+			}

+

+			if ($maxmin > 0)

+			{

+				// MAX_FILE_SIZE doit précéder le champ input de type file

+				$out .= '<input type="hidden" name="max_file_size" value="'.($maxmin * 1024).'">';

+			}

+

@@ -161,2 +171,3 @@
-			$out .= ((getDolGlobalString('MAIN_DISABLE_MULTIPLE_FILEUPLOAD') || $disablemulti) ? ' name="userfile"' : ' name="userfile[]" multiple');

-			$out .= (!getDolGlobalString('MAIN_UPLOAD_DOC') || empty($perm) ? ' disabled' : '');

+			//$out .= ((!empty($conf->global->MAIN_DISABLE_MULTIPLE_FILEUPLOAD) || $conf->browser->layout != 'classic') ? ' name="userfile"' : ' name="userfile[]" multiple');

+			$out .= ((!empty($conf->global->MAIN_DISABLE_MULTIPLE_FILEUPLOAD)) ? ' name="userfile"' : ' name="userfile[]" multiple');

+			$out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm) ? ' disabled' : '');

@@ -169,4 +180,4 @@
-				$out .= '<span class="nowraponsmartphone"><input style="margin-right: 2px;" type="checkbox" id="overwritefile" name="overwritefile" value="1"><label for="overwritefile">'.$langs->trans("OverwriteIfExists").'</label></span>';

-			}

-			$out .= '<input type="submit" class="button small reposition" name="sendit" value="'.$langs->trans("Upload").'"';

-			$out .= (!getDolGlobalString('MAIN_UPLOAD_DOC') || empty($perm) ? ' disabled' : '');

+				$out .= '<input style="margin-right: 2px;" type="checkbox" id="overwritefile" name="overwritefile" value="1"><label for="overwritefile">'.$langs->trans("OverwriteIfExists").'</label>';

+			}

+			$out .= '<input type="submit" class="button reposition" name="sendit" value="'.$langs->trans("Upload").'"';

+			$out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm) ? ' disabled' : '');

@@ -175 +186,2 @@
-			if ($addcancel) {

+			if ($addcancel)

+			{

@@ -177,6 +189,7 @@
-				$out .= '<input type="submit" class="button small button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';

-			}

-

-			if (getDolGlobalString('MAIN_UPLOAD_DOC')) {

-				if ($perm) {

-					$menudolibarrsetupmax = $langs->transnoentitiesnoconv("Home").' - '.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("Security");

+				$out .= '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';

+			}

+

+			if (!empty($conf->global->MAIN_UPLOAD_DOC))

+			{

+				if ($perm)

+				{

@@ -185,3 +198,5 @@
-					$out .= info_admin($langs->trans("ThisLimitIsDefinedInSetupAt", $menudolibarrsetupmax, $max, $maxphptoshowparam, $maxphptoshow), 1);

-				}

-			} else {

+					$out .= info_admin($langs->trans("ThisLimitIsDefinedInSetup", $max, $maxphptoshow), 1);

+				}

+			}

+			else

+			{

@@ -192,16 +207,12 @@
-			if ($savingdocmask) {

-				//add a global variable for disable the auto renaming on upload

-				$rename = (!getDolGlobalString('MAIN_DOC_UPLOAD_NOT_RENAME_BY_DEFAULT') ? 'checked' : '');

-

-				$out .= '<tr>';

-				if (!empty($options)) {

-					$out .= '<td>'.$options.'</td>';

-				}

-				$out .= '<td valign="middle" class="nowrap">';

-				$out .= '<input type="checkbox" '.$rename.' class="savingdocmask" name="savingdocmask" id="savingdocmask" value="'.dol_escape_js($savingdocmask).'"> ';

-				$out .= '<label class="opacitymedium small" for="savingdocmask">';

-				$out .= $langs->trans("SaveUploadedFileWithMask", preg_replace('/__file__/', $langs->transnoentitiesnoconv("OriginFileName"), $savingdocmask), $langs->transnoentitiesnoconv("OriginFileName"));

-				$out .= '</label>';

-				$out .= '</td>';

-				$out .= '</tr>';

-			}

+			if ($savingdocmask)

+            {

+            	//add a global variable for disable the auto renaming on upload

+                $rename = (empty($conf->global->MAIN_DOC_UPLOAD_NOT_RENAME_BY_DEFAULT) ? 'checked' : '');

+

+                $out .= '<tr>';

+   	            if (!empty($options)) $out .= '<td>'.$options.'</td>';

+	            $out .= '<td valign="middle" class="nowrap">';

+				$out .= '<input type="checkbox" '.$rename.' class="savingdocmask" name="savingdocmask" value="'.dol_escape_js($savingdocmask).'"> '.$langs->trans("SaveUploadedFileWithMask", preg_replace('/__file__/', $langs->transnoentitiesnoconv("OriginFileName"), $savingdocmask), $langs->transnoentitiesnoconv("OriginFileName"));

+            	$out .= '</td>';

+            	$out .= '</tr>';

+            }

@@ -211,5 +222,4 @@
-			if (empty($usewithoutform)) {

-				$out .= '</form>';

-				if (empty($sectionid)) {

-					$out .= '<br>';

-				}

+			if (empty($usewithoutform))

+			{

+    			$out .= '</form>';

+	       		if (empty($sectionid)) $out .= '<br>';

@@ -220 +230,2 @@
-			if ($linkfiles) {

+			if ($linkfiles)

+			{

@@ -226,6 +237,6 @@
-				if (empty($usewithoutform)) {

-					$out .= '<form name="'.$htmlname.'_link" id="'.$htmlname.'_link" action="'.$url.'" method="POST">'."\n";

-					$out .= '<input type="hidden" name="token" value="'.newToken().'">'."\n";

-					$out .= '<input type="hidden" id="'.$htmlname.'_link_section_dir" name="link_section_dir" value="">'."\n";

-					$out .= '<input type="hidden" id="'.$htmlname.'_link_section_id"  name="link_section_id" value="'.$sectionid.'">'."\n";

-					$out .= '<input type="hidden" name="page_y" value="">'."\n";

+				if (empty($usewithoutform))

+				{

+    				$out .= '<form name="'.$htmlname.'_link" id="'.$htmlname.'_link" action="'.$url.'" method="POST">'."\n";

+    				$out .= '<input type="hidden" name="token" value="'.newToken().'">'."\n";

+    				$out .= '<input type="hidden" id="'.$htmlname.'_link_section_dir" name="link_section_dir" value="">'."\n";

+    				$out .= '<input type="hidden" id="'.$htmlname.'_link_section_id"  name="link_section_id" value="'.$sectionid.'">'."\n";

@@ -236,3 +247 @@
-				if (getDolGlobalString('OPTIMIZEFORTEXTBROWSER')) {

-					$out .= '<label for="link">'.$langs->trans("URLToLink").':</label> ';

-				}

+				if (!empty($conf->global->OPTIMIZEFORTEXTBROWSER)) $out .= '<label for="link">'.$langs->trans("URLToLink").':</label> ';

@@ -242,3 +251 @@
-				if (getDolGlobalString('OPTIMIZEFORTEXTBROWSER')) {

-					$out .= '<label for="label">'.$langs->trans("Label").':</label> ';

-				}

+				if (!empty($conf->global->OPTIMIZEFORTEXTBROWSER)) $out .= '<label for="label">'.$langs->trans("Label").':</label> ';

@@ -250,2 +257,2 @@
-				$out .= '<input type="submit" class="button small reposition" name="linkit" value="'.$langs->trans("ToLink").'"';

-				$out .= (!getDolGlobalString('MAIN_UPLOAD_DOC') || empty($perm) ? ' disabled' : '');

+				$out .= '<input type="submit" class="button" name="linkit" value="'.$langs->trans("ToLink").'"';

+				$out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm) ? ' disabled' : '');

@@ -255,3 +262,4 @@
-				if (empty($usewithoutform)) {

-					$out .= '<div class="clearboth"></div>';

-					$out .= '</form><br>';

+				if (empty($usewithoutform))

+				{

+    				$out .= '<div class="clearboth"></div>';

+                    $out .= '</form><br>';

@@ -263 +271 @@
-			$parameters = array('socid'=>(isset($GLOBALS['socid']) ? $GLOBALS['socid'] : ''), 'id'=>(isset($GLOBALS['id']) ? $GLOBALS['id'] : ''), 'url'=>$url, 'perm'=>$perm, 'options'=>$options);

+			$parameters = array('socid'=>(isset($GLOBALS['socid']) ? $GLOBALS['socid'] : ''), 'id'=>(isset($GLOBALS['id']) ? $GLOBALS['id'] : ''), 'url'=>$url, 'perm'=>$perm);

@@ -265,8 +273,3 @@
-			if (empty($res)) {

-				$out = '<div class="'.($usewithoutform ? 'inline-block valignmiddle' : 'attacharea attacharea'.$htmlname).'">'.$out.'</div>';

-			}

-			$out .= $hookmanager->resPrint;

-

-			if ($nooutput) {

-				return $out;

-			} else {

+			if (empty($res))

+			{

+			    print '<div class="'.($usewithoutform ? 'inline-block valignmiddle' : 'attacharea attacharea'.$htmlname).'">';

@@ -274,2 +277,5 @@
-				return 1;

-			}

+				print '</div>';

+			}

+			print $hookmanager->resPrint;

+

+			return 1;

@@ -279 +285 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -299 +305 @@
-	 * 		@return		int										Return integer <0 if KO, number of shown files if OK

+	 * 		@return		int										<0 if KO, number of shown files if OK

@@ -304 +310 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -314,3 +320,3 @@
-	 *      @param      string				$modulepart         Module the files are related to ('propal', 'facture', 'facture_fourn', 'mymodule', 'mymodule:MyObject', 'mymodule_temp', ...)

-	 *      @param      string				$modulesubdir       Existing (so sanitized) sub-directory to scan (Example: '0/1/10', 'FA/DD/MM/YY/9999'). Use '' if file is not into a subdir of module.

-	 *      @param      string				$filedir            Directory to scan (must not end with a /). Example: '/mydolibarrdocuments/facture/FAYYMM-1234'

+	 *      @param      string				$modulepart         Module the files are related to ('propal', 'facture', 'facture_fourn', 'mymodule', 'mymodule:nameofsubmodule', 'mymodule_temp', ...)

+	 *      @param      string				$modulesubdir       Existing (so sanitized) sub-directory to scan (Example: '0/1/10', 'FA/DD/MM/YY/9999'). Use '' if file is not into subdir of module.

+	 *      @param      string				$filedir            Directory to scan

@@ -334 +339,0 @@
-	 *      @param		string				$tooltipontemplatecombo		Text to show on a tooltip after the combo list of templates

@@ -337 +342 @@
-	public function showdocuments($modulepart, $modulesubdir, $filedir, $urlsource, $genallowed, $delallowed = 0, $modelselected = '', $allowgenifempty = 1, $forcenomultilang = 0, $iconPDF = 0, $notused = 0, $noform = 0, $param = '', $title = '', $buttonlabel = '', $codelang = '', $morepicto = '', $object = null, $hideifempty = 0, $removeaction = 'remove_file', $tooltipontemplatecombo = '')

+	public function showdocuments($modulepart, $modulesubdir, $filedir, $urlsource, $genallowed, $delallowed = 0, $modelselected = '', $allowgenifempty = 1, $forcenomultilang = 0, $iconPDF = 0, $notused = 0, $noform = 0, $param = '', $title = '', $buttonlabel = '', $codelang = '', $morepicto = '', $object = null, $hideifempty = 0, $removeaction = 'remove_file')

@@ -339,2 +343,0 @@
-		global $dolibarr_main_url_root;

-

@@ -349,35 +352 @@
-		$reshook = 0;

-		if (is_object($hookmanager)) {

-			$parameters = array(

-				'modulepart'=>&$modulepart,

-				'modulesubdir'=>&$modulesubdir,

-				'filedir'=>&$filedir,

-				'urlsource'=>&$urlsource,

-				'genallowed'=>&$genallowed,

-				'delallowed'=>&$delallowed,

-				'modelselected'=>&$modelselected,

-				'allowgenifempty'=>&$allowgenifempty,

-				'forcenomultilang'=>&$forcenomultilang,

-				'noform'=>&$noform,

-				'param'=>&$param,

-				'title'=>&$title,

-				'buttonlabel'=>&$buttonlabel,

-				'codelang'=>&$codelang,

-				'morepicto'=>&$morepicto,

-				'hideifempty'=>&$hideifempty,

-				'removeaction'=>&$removeaction

-			);

-			$reshook = $hookmanager->executeHooks('showDocuments', $parameters, $object); // Note that parameters may have been updated by hook

-			// May report error

-			if ($reshook < 0) {

-				setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

-			}

-		}

-		// Remode default action if $reskook > 0

-		if ($reshook > 0) {

-			return $hookmanager->resPrint;

-		}

-

-		if (!is_object($form)) {

-			$form = new Form($this->db);

-		}

+		if (!is_object($form)) $form = new Form($this->db);

@@ -394 +363 @@
-			$param .= ($param ? '&' : '').'entity='.(empty($object->entity) ? $conf->entity : $object->entity);

+			$param .= 'entity='.(!empty($object->entity) ? $object->entity : $conf->entity);

@@ -398,3 +367,3 @@
-		// The direct print feature is implemented only for such elements

-		if (in_array($modulepart, array('contract', 'facture', 'supplier_proposal', 'propal', 'proposal', 'order', 'commande', 'expedition', 'commande_fournisseur', 'expensereport', 'delivery', 'ticket'))) {

-			$printer = (!empty($user->rights->printing->read) && !empty($conf->printing->enabled)) ? true : false;

+		if (in_array($modulepart, array('facture', 'supplier_proposal', 'propal', 'proposal', 'order', 'commande', 'expedition', 'commande_fournisseur', 'expensereport', 'livraison', 'ticket')))	// The direct print feature is implemented only for such elements

+		{

+			$printer = (!empty($user->rights->printing->read) && !empty($conf->printing->enabled)) ?true:false;

@@ -407 +376,2 @@
-		if (!empty($filedir)) {

+		if (!empty($filedir))

+		{

@@ -410,3 +380 @@
-		if ($hideifempty && empty($file_list)) {

-			return '';

-		}

+		if ($hideifempty && empty($file_list)) return '';

@@ -423 +391,2 @@
-		if (preg_match('/massfilesarea_/', $modulepart)) {

+		if (preg_match('/massfilesarea_/', $modulepart))

+		{

@@ -426 +395 @@
-			$title .= '<script nonce="'.getNonce().'">

+			$title .= '<script>

@@ -448,16 +417 @@
-		if (!empty($title)) {

-			$titletoshow = ($title == 'none' ? '' : $title);

-		}

-

-		$submodulepart = $modulepart;

-

-		// modulepart = 'nameofmodule' or 'nameofmodule:NameOfObject'

-		$tmp = explode(':', $modulepart);

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

-			$modulepart = $tmp[0];

-			$submodulepart = $tmp[1];

-		}

-

-		$addcolumforpicto = ($delallowed || $printer || $morepicto);

-		$colspan = (4 + ($addcolumforpicto ? 1 : 0));

-		$colspanmore = 0;

+		if (!empty($title)) $titletoshow = ($title == 'none' ? '' : $title);

@@ -466 +420,2 @@
-		if ($genallowed) {

+		if ($genallowed)

+		{

@@ -469,5 +424,6 @@
-			if ($modulepart == 'company') {

-				$showempty = 1; // can have no template active

-				if (is_array($genallowed)) {

-					$modellist = $genallowed;

-				} else {

+			if ($modulepart == 'company')

+			{

+				$showempty = 1;

+				if (is_array($genallowed)) $modellist = $genallowed;

+				else

+				{

@@ -477,4 +433,6 @@
-			} elseif ($modulepart == 'propal') {

-				if (is_array($genallowed)) {

-					$modellist = $genallowed;

-				} else {

+			}

+			elseif ($modulepart == 'propal')

+			{

+				if (is_array($genallowed)) $modellist = $genallowed;

+				else

+				{

@@ -484,4 +442,6 @@
-			} elseif ($modulepart == 'supplier_proposal') {

-				if (is_array($genallowed)) {

-					$modellist = $genallowed;

-				} else {

+			}

+			elseif ($modulepart == 'supplier_proposal')

+			{

+				if (is_array($genallowed)) $modellist = $genallowed;

+				else

+				{

@@ -491,4 +451,6 @@
-			} elseif ($modulepart == 'commande') {

-				if (is_array($genallowed)) {

-					$modellist = $genallowed;

-				} else {

+			}

+			elseif ($modulepart == 'commande')

+			{

+				if (is_array($genallowed)) $modellist = $genallowed;

+				else

+				{

@@ -498,4 +460,6 @@
-			} elseif ($modulepart == 'expedition') {

-				if (is_array($genallowed)) {

-					$modellist = $genallowed;

-				} else {

+			}

+			elseif ($modulepart == 'expedition')

+			{

+				if (is_array($genallowed)) $modellist = $genallowed;

+				else

+				{

@@ -503,6 +467,8 @@
-					$modellist = ModelePdfExpedition::liste_modeles($this->db);

-				}

-			} elseif ($modulepart == 'reception') {

-				if (is_array($genallowed)) {

-					$modellist = $genallowed;

-				} else {

+					$modellist = ModelePDFExpedition::liste_modeles($this->db);

+				}

+			}

+            elseif ($modulepart == 'reception')

+            {

+                if (is_array($genallowed)) $modellist = $genallowed;

+                else

+                {

@@ -512,5 +478,7 @@
-			} elseif ($modulepart == 'delivery') {

-				if (is_array($genallowed)) {

-					$modellist = $genallowed;

-				} else {

-					include_once DOL_DOCUMENT_ROOT.'/core/modules/delivery/modules_delivery.php';

+            }

+			elseif ($modulepart == 'livraison')

+			{

+				if (is_array($genallowed)) $modellist = $genallowed;

+				else

+				{

+					include_once DOL_DOCUMENT_ROOT.'/core/modules/livraison/modules_livraison.php';

@@ -519,4 +487,6 @@
-			} elseif ($modulepart == 'ficheinter') {

-				if (is_array($genallowed)) {

-					$modellist = $genallowed;

-				} else {

+			}

+			elseif ($modulepart == 'ficheinter')

+			{

+				if (is_array($genallowed)) $modellist = $genallowed;

+				else

+				{

@@ -526,4 +496,6 @@
-			} elseif ($modulepart == 'facture') {

-				if (is_array($genallowed)) {

-					$modellist = $genallowed;

-				} else {

+			}

+			elseif ($modulepart == 'facture')

+			{

+				if (is_array($genallowed)) $modellist = $genallowed;

+				else

+				{

@@ -533,5 +505,6 @@
-			} elseif ($modulepart == 'contract') {

-				$showempty = 1; // can have no template active

-				if (is_array($genallowed)) {

-					$modellist = $genallowed;

-				} else {

+			}

+			elseif ($modulepart == 'contract')

+			{

+				if (is_array($genallowed)) $modellist = $genallowed;

+				else

+				{

@@ -541,4 +514,6 @@
-			} elseif ($modulepart == 'project') {

-				if (is_array($genallowed)) {

-					$modellist = $genallowed;

-				} else {

+			}

+			elseif ($modulepart == 'project')

+			{

+				if (is_array($genallowed)) $modellist = $genallowed;

+				else

+				{

@@ -548,4 +523,6 @@
-			} elseif ($modulepart == 'project_task') {

-				if (is_array($genallowed)) {

-					$modellist = $genallowed;

-				} else {

+			}

+			elseif ($modulepart == 'project_task')

+			{

+				if (is_array($genallowed)) $modellist = $genallowed;

+				else

+				{

@@ -555,4 +532,6 @@
-			} elseif ($modulepart == 'product') {

-				if (is_array($genallowed)) {

-					$modellist = $genallowed;

-				} else {

+			}

+			elseif ($modulepart == 'product')

+			{

+				if (is_array($genallowed)) $modellist = $genallowed;

+				else

+				{

@@ -562,4 +541,6 @@
-			} elseif ($modulepart == 'product_batch') {

-				if (is_array($genallowed)) {

-					$modellist = $genallowed;

-				} else {

+			}

+			elseif ($modulepart == 'product_batch')

+			{

+				if (is_array($genallowed)) $modellist = $genallowed;

+				else

+				{

@@ -569,4 +550,6 @@
-			} elseif ($modulepart == 'stock') {

-				if (is_array($genallowed)) {

-					$modellist = $genallowed;

-				} else {

+			}

+			elseif ($modulepart == 'stock')

+			{

+				if (is_array($genallowed)) $modellist = $genallowed;

+				else

+				{

@@ -576,11 +559,6 @@
-			} elseif ($modulepart == 'hrm') {

-				if (is_array($genallowed)) {

-					$modellist = $genallowed;

-				} else {

-					include_once DOL_DOCUMENT_ROOT.'/core/modules/hrm/modules_evaluation.php';

-					$modellist = ModelePDFEvaluation::liste_modeles($this->db);

-				}

-			} elseif ($modulepart == 'movement') {

-				if (is_array($genallowed)) {

-					$modellist = $genallowed;

-				} else {

+			}

+			elseif ($modulepart == 'movement')

+			{

+				if (is_array($genallowed)) $modellist = $genallowed;

+				else

+				{

@@ -590,4 +568,6 @@
-			} elseif ($modulepart == 'export') {

-				if (is_array($genallowed)) {

-					$modellist = $genallowed;

-				} else {

+			}

+			elseif ($modulepart == 'export')

+			{

+				if (is_array($genallowed)) $modellist = $genallowed;

+				else

+				{

@@ -595,7 +575,8 @@
-					//$modellist = ModeleExports::liste_modeles($this->db);		// liste_modeles() does not exists. We are using listOfAvailableExportFormat() method instead that return a different array format.

-					$modellist = array();

-				}

-			} elseif ($modulepart == 'commande_fournisseur' || $modulepart == 'supplier_order') {

-				if (is_array($genallowed)) {

-					$modellist = $genallowed;

-				} else {

+					$modellist = ModeleExports::liste_modeles($this->db);

+				}

+			}

+			elseif ($modulepart == 'commande_fournisseur' || $modulepart == 'supplier_order')

+			{

+				if (is_array($genallowed)) $modellist = $genallowed;

+				else

+				{

@@ -605,5 +586,6 @@
-			} elseif ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice') {

-				$showempty = 1; // can have no template active

-				if (is_array($genallowed)) {

-					$modellist = $genallowed;

-				} else {

+			}

+			elseif ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice')

+			{

+				if (is_array($genallowed)) $modellist = $genallowed;

+				else

+				{

@@ -613,4 +595,6 @@
-			} elseif ($modulepart == 'supplier_payment') {

-				if (is_array($genallowed)) {

-					$modellist = $genallowed;

-				} else {

+			}

+			elseif ($modulepart == 'supplier_payment')

+			{

+				if (is_array($genallowed)) $modellist = $genallowed;

+				else

+				{

@@ -620,4 +604,6 @@
-			} elseif ($modulepart == 'remisecheque') {

-				if (is_array($genallowed)) {

-					$modellist = $genallowed;

-				} else {

+			}

+			elseif ($modulepart == 'remisecheque')

+			{

+				if (is_array($genallowed)) $modellist = $genallowed;

+				else

+				{

@@ -627,4 +613,6 @@
-			} elseif ($modulepart == 'donation') {

-				if (is_array($genallowed)) {

-					$modellist = $genallowed;

-				} else {

+			}

+			elseif ($modulepart == 'donation')

+			{

+				if (is_array($genallowed)) $modellist = $genallowed;

+				else

+				{

@@ -634,4 +622,6 @@
-			} elseif ($modulepart == 'member') {

-				if (is_array($genallowed)) {

-					$modellist = $genallowed;

-				} else {

+			}

+			elseif ($modulepart == 'member')

+			{

+				if (is_array($genallowed)) $modellist = $genallowed;

+				else

+				{

@@ -641,4 +631,6 @@
-			} elseif ($modulepart == 'agenda' || $modulepart == 'actions') {

-				if (is_array($genallowed)) {

-					$modellist = $genallowed;

-				} else {

+			}

+			elseif ($modulepart == 'agenda' || $modulepart == 'actions')

+			{

+				if (is_array($genallowed)) $modellist = $genallowed;

+				else

+				{

@@ -648,4 +640,6 @@
-			} elseif ($modulepart == 'expensereport') {

-				if (is_array($genallowed)) {

-					$modellist = $genallowed;

-				} else {

+			}

+			elseif ($modulepart == 'expensereport')

+			{

+				if (is_array($genallowed)) $modellist = $genallowed;

+				else

+				{

@@ -655 +649,3 @@
-			} elseif ($modulepart == 'unpaid') {

+			}

+			elseif ($modulepart == 'unpaid')

+			{

@@ -657,4 +653,6 @@
-			} elseif ($modulepart == 'user') {

-				if (is_array($genallowed)) {

-					$modellist = $genallowed;

-				} else {

+			}

+			elseif ($modulepart == 'user')

+			{

+				if (is_array($genallowed)) $modellist = $genallowed;

+				else

+				{

@@ -664,4 +662,6 @@
-			} elseif ($modulepart == 'usergroup') {

-				if (is_array($genallowed)) {

-					$modellist = $genallowed;

-				} else {

+			}

+			elseif ($modulepart == 'usergroup')

+			{

+				if (is_array($genallowed)) $modellist = $genallowed;

+				else

+				{

@@ -671,2 +671,13 @@
-			} else {

-				// For normalized standard modules

+			}

+			else

+			{

+			    $submodulepart = $modulepart;

+

+			    // modulepart = 'nameofmodule' or 'nameofmodule:NameOfObject'

+			    $tmp = explode(':', $modulepart);

+			    if (!empty($tmp[1])) {

+			    	$modulepart = $tmp[0];

+			    	$submodulepart = $tmp[1];

+			    }

+

+			    // For normalized standard modules

@@ -674 +685,2 @@
-				if (file_exists($file)) {

+				if (file_exists($file))

+				{

@@ -676,3 +688,4 @@
-				} else {

-					// For normalized external modules.

-					$file = dol_buildpath('/'.$modulepart.'/core/modules/'.$modulepart.'/modules_'.strtolower($submodulepart).'.php', 0);

+				}

+				// For normalized external modules.

+				else {

+				    $file = dol_buildpath('/'.$modulepart.'/core/modules/'.$modulepart.'/modules_'.strtolower($submodulepart).'.php', 0);

@@ -682,3 +695,4 @@
-				$class = 'ModelePDF'.ucfirst($submodulepart);

-

-				if (class_exists($class)) {

+				$class = 'ModelePDF'.$submodulepart;

+

+				if (class_exists($class))

+				{

@@ -686,2 +700,4 @@
-				} else {

-					dol_print_error($this->db, "Bad value for modulepart '".$modulepart."' in showdocuments (class ".$class." for Doc generation not found)");

+				}

+				else

+				{

+					dol_print_error($this->db, "Bad value for modulepart '".$modulepart."' in showdocuments");

@@ -695,10 +711,4 @@
-			if (empty($buttonlabel)) {

-				$buttonlabel = $langs->trans('Generate');

-			}

-

-			if ($conf->browser->layout == 'phone') {

-				$urlsource .= '#'.$forname.'_form'; // So we switch to form after a generation

-			}

-			if (empty($noform)) {

-				$out .= '<form action="'.$urlsource.'" id="'.$forname.'_form" method="post">';

-			}

+			if (empty($buttonlabel)) $buttonlabel = $langs->trans('Generate');

+

+			if ($conf->browser->layout == 'phone') $urlsource .= '#'.$forname.'_form'; // So we switch to form after a generation

+			if (empty($noform)) $out .= '<form action="'.$urlsource.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#builddoc').'" id="'.$forname.'_form" method="post">';

@@ -706 +715,0 @@
-			$out .= '<input type="hidden" name="page_y" value="">';

@@ -713,0 +723 @@
+

@@ -715,2 +725 @@
-			$colspan = (4 + ($addcolumforpicto ? 1 : 0));

-			$colspanmore = 0;

+			$colspan = (3 + ($addcolumforpicto ? 1 : 0)); $colspanmore = 0;

@@ -721 +730,2 @@
-			if (!empty($modellist)) {

+			if (!empty($modellist))

+			{

@@ -724 +734,2 @@
-				if (is_array($modellist) && count($modellist) == 1) {    // If there is only one element

+				if (is_array($modellist) && count($modellist) == 1)    // If there is only one element

+				{

@@ -728,39 +739,5 @@
-				$morecss = 'minwidth75 maxwidth200';

-				if ($conf->browser->layout == 'phone') {

-					$morecss = 'maxwidth100';

-				}

-				$out .= $form->selectarray('model', $modellist, $modelselected, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, 1, '', 0, 0);

-				// script for select the separator

-				/* TODO This must appear on export feature only

-				$out .= '<label class="forhide" for="delimiter">Delimiter:</label>';

-				$out .= '<input type="radio" class="testinput forhide" name="delimiter" value="," id="comma" checked><label class="forhide" for="comma">,</label>';

-				$out .= '<input type="radio" class="testinput forhide" name="delimiter" value=";" id="semicolon"><label class="forhide" for="semicolon">;</label>';

-

-				$out .= '<script>

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

-								$(".selectformat").on("change", function() {

-									var separator;

-									var selected = $(this).val();

-									if (selected == "excel2007" || selected == "tsv") {

-										$("input.testinput").prop("disabled", true);

-										$(".forhide").hide();

-									} else {

-										$("input.testinput").prop("disabled", false);

-										$(".forhide").show();

-									}

-

-									if ($("#semicolon").is(":checked")) {

-										separator = ";";

-									} else {

-										separator = ",";

-									}

-								});

-								if ("' . $conf->global->EXPORT_CSV_SEPARATOR_TO_USE . '" == ";") {

-									$("#semicolon").prop("checked", true);

-								} else {

-									$("#comma").prop("checked", true);

-								}

-							});

-						</script>';

-				*/

-				if ($conf->use_javascript_ajax) {

+				$morecss = 'maxwidth200';

+				if ($conf->browser->layout == 'phone') $morecss = 'maxwidth100';

+				$out .= $form->selectarray('model', $modellist, $modelselected, $showempty, 0, 0, '', 0, 0, 0, '', $morecss);

+				if ($conf->use_javascript_ajax)

+				{

@@ -769,2 +746,3 @@
-				$out .= $form->textwithpicto('', $tooltipontemplatecombo, 1, 'help', 'marginrightonly', 0, 3, '', 0);

-			} else {

+			}

+			else

+			{

@@ -775 +753,2 @@
-			if (($allowgenifempty || (is_array($modellist) && count($modellist) > 0)) && getDolGlobalInt('MAIN_MULTILANGS') && !$forcenomultilang && (!empty($modellist) || $showempty)) {

+			if (($allowgenifempty || (is_array($modellist) && count($modellist) > 0)) && $conf->global->MAIN_MULTILANGS && !$forcenomultilang && (!empty($modellist) || $showempty))

+			{

@@ -778 +757 @@
-				$defaultlang = ($codelang && $codelang != 'auto') ? $codelang : $langs->getDefaultLang();

+				$defaultlang = $codelang ? $codelang : $langs->getDefaultLang();

@@ -780,3 +759 @@
-				if ($conf->browser->layout == 'phone') {

-					$morecss = 'maxwidth100';

-				}

+				if ($conf->browser->layout == 'phone') $morecss = 'maxwidth100';

@@ -784 +761,3 @@
-			} else {

+			}

+			else

+			{

@@ -789 +768 @@
-			$genbutton = '<input class="button buttongen reposition nomargintop nomarginbottom" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';

+			$genbutton = '<input class="button buttongen" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';

@@ -791,3 +770 @@
-			if (!$allowgenifempty && !is_array($modellist) && empty($modellist)) {

-				$genbutton .= ' disabled';

-			}

+			if (!$allowgenifempty && !is_array($modellist) && empty($modellist)) $genbutton .= ' disabled';

@@ -795,10 +772,7 @@
-			if ($allowgenifempty && !is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid') {

-				$langs->load("errors");

-				$genbutton .= ' '.img_warning($langs->transnoentitiesnoconv("WarningNoDocumentModelActivated"));

-			}

-			if (!$allowgenifempty && !is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid') {

-				$genbutton = '';

-			}

-			if (empty($modellist) && !$showempty && $modulepart != 'unpaid') {

-				$genbutton = '';

-			}

+			if ($allowgenifempty && !is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid')

+			{

+			   	$langs->load("errors");

+			   	$genbutton .= ' '.img_warning($langs->transnoentitiesnoconv("WarningNoDocumentModelActivated"));

+			}

+			if (!$allowgenifempty && !is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid') $genbutton = '';

+			if (empty($modellist) && !$showempty && $modulepart != 'unpaid') $genbutton = '';

@@ -808,3 +782,6 @@
-			if (!empty($hookmanager->hooks['formfile'])) {

-				foreach ($hookmanager->hooks['formfile'] as $module) {

-					if (method_exists($module, 'formBuilddocLineOptions')) {

+			if (!empty($hookmanager->hooks['formfile']))

+			{

+				foreach ($hookmanager->hooks['formfile'] as $module)

+				{

+					if (method_exists($module, 'formBuilddocLineOptions'))

+					{

@@ -820 +797,2 @@
-			if (is_object($hookmanager)) {

+			if (is_object($hookmanager))

+			{

@@ -827 +805,2 @@
-		if (!empty($filedir)) {

+		if (!empty($filedir))

+		{

@@ -829 +808,2 @@
-			if (is_object($object)) {

+			if (is_object($object))

+			{

@@ -840 +820,2 @@
-				&& !$headershown) {

+				&& !$headershown)

+			{

@@ -848,19 +829,4 @@
-			if (is_array($file_list)) {

-				// Defined relative dir to DOL_DATA_ROOT

-				$relativedir = '';

-				if ($filedir) {

-					$relativedir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $filedir);

-					$relativedir = preg_replace('/^[\\/]/', '', $relativedir);

-				}

-

-				// Get list of files stored into database for same relative directory

-				if ($relativedir) {

-					completeFileArrayWithDatabaseInfo($file_list, $relativedir);

-

-					//var_dump($sortfield.' - '.$sortorder);

-					if (!empty($sortfield) && !empty($sortorder)) {	// If $sortfield is for example 'position_name', we will sort on the property 'position_name' (that is concat of position+name)

-						$file_list = dol_sort_array($file_list, $sortfield, $sortorder);

-					}

-				}

-

-				foreach ($file_list as $file) {

+			if (is_array($file_list))

+			{

+				foreach ($file_list as $file)

+				{

@@ -869,6 +835,2 @@
-					if ($modulesubdir) {

-						$relativepath = $modulesubdir."/".$file["name"]; // Cas propal, facture...

-					}

-					if ($modulepart == 'export') {

-						$relativepath = $file["name"]; // Other case

-					}

+					if ($modulesubdir) $relativepath = $modulesubdir."/".$file["name"]; // Cas propal, facture...

+					if ($modulepart == 'export') $relativepath = $file["name"]; // Other case

@@ -879,3 +841 @@
-					if (isset($conf->global->DOL_URL_ROOT_DOCUMENT_PHP)) {

-						$documenturl = $conf->global->DOL_URL_ROOT_DOCUMENT_PHP; // To use another wrapper

-					}

+					if (isset($conf->global->DOL_URL_ROOT_DOCUMENT_PHP)) $documenturl = $conf->global->DOL_URL_ROOT_DOCUMENT_PHP; // To use another wrapper

@@ -884,9 +844,2 @@
-					$imgpreview = $this->showPreview($file, $modulepart, $relativepath, 0, $param);

-

-					$out .= '<td class="minwidth200 tdoverflowmax300">';

-					if ($imgpreview) {

-						$out .= '<span class="spanoverflow widthcentpercentminusx valignmiddle">';

-					} else {

-						$out .= '<span class="spanoverflow">';

-					}

-					$out .= '<a class="documentdownload paddingright" href="'.$documenturl.'?modulepart='.$modulepart.'&file='.urlencode($relativepath).($param ? '&'.$param : '').'"';

+					$out .= '<td class="minwidth200">';

+					$out .= '<a class="documentdownload paddingright" href="'.$documenturl.'?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).($param ? '&'.$param : '').'"';

@@ -895,4 +848 @@
-					if (preg_match('/text/', $mime)) {

-						$out .= ' target="_blank" rel="noopener noreferrer"';

-					}

-					$out .= ' title="'.dol_escape_htmltag($file["name"]).'"';

+					if (preg_match('/text/', $mime)) $out .= ' target="_blank"';

@@ -902,3 +852,2 @@
-					$out .= '</a>';

-					$out .= '</span>'."\n";

-					$out .= $imgpreview;

+					$out .= '</a>'."\n";

+					$out .= $this->showPreview($file, $modulepart, $relativepath, 0, $param);

@@ -909 +858 @@
-					$out .= '<td class="nowraponall right">'.dol_print_size($size, 1, 1).'</td>';

+					$out .= '<td class="nowrap right">'.dol_print_size($size, 1, 1).'</td>';

@@ -915,30 +864,2 @@
-					// Show share link

-					$out .= '<td class="nowraponall">';

-					if (!empty($file['share'])) {

-						// 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

-

-						//print '<span class="opacitymedium">'.$langs->trans("Hash").' : '.$file['share'].'</span>';

-						$forcedownload = 0;

-						$paramlink = '';

-						if (!empty($file['share'])) {

-							$paramlink .= ($paramlink ? '&' : '').'hashp='.$file['share']; // Hash for public share

-						}

-						if ($forcedownload) {

-							$paramlink .= ($paramlink ? '&' : '').'attachment=1';

-						}

-

-						$fulllink = $urlwithroot.'/document.php'.($paramlink ? '?'.$paramlink : '');

-

-						$out .= '<a href="'.$fulllink.'" target="_blank" rel="noopener">'.img_picto($langs->trans("FileSharedViaALink"), 'globe').'</a> ';

-						$out .= '<input type="text" class="quatrevingtpercentminusx width75 nopadding small" id="downloadlink'.$file['rowid'].'" name="downloadexternallink" title="'.dol_escape_htmltag($langs->trans("FileSharedViaALink")).'" value="'.dol_escape_htmltag($fulllink).'">';

-						$out .= ajax_autoselect('downloadlink'.$file['rowid']);

-					} else {

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

-					}

-					$out .= '</td>';

-

-					// Show picto delete, print...

-					if ($delallowed || $printer || $morepicto) {

+					if ($delallowed || $printer || $morepicto)

+					{

@@ -946 +867,2 @@
-						if ($delallowed) {

+						if ($delallowed)

+						{

@@ -948,2 +870,2 @@
-							$out .= '<a class="reposition" href="'.$tmpurlsource.((strpos($tmpurlsource, '?') === false) ? '?' : '&').'action='.urlencode($removeaction).'&token='.newToken().'&file='.urlencode($relativepath);

-							$out .= ($param ? '&'.$param : '');

+							$out .= '<a href="'.$tmpurlsource.((strpos($tmpurlsource, '?') === false) ? '?' : '&amp;').'action='.$removeaction.'&amp;file='.urlencode($relativepath);

+							$out .= ($param ? '&amp;'.$param : '');

@@ -954,3 +876,5 @@
-						if ($printer) {

-							$out .= '<a class="marginleftonly reposition" href="'.$urlsource.(strpos($urlsource, '?') ? '&' : '?').'action=print_file&token='.newToken().'&printer='.urlencode($modulepart).'&file='.urlencode($relativepath);

-							$out .= ($param ? '&'.$param : '');

+						if ($printer)

+						{

+							//$out.= '<td class="right">';

+							$out .= '<a class="marginleftonly" href="'.$urlsource.(strpos($urlsource, '?') ? '&amp;' : '?').'action=print_file&amp;printer='.$modulepart.'&amp;file='.urlencode($relativepath);

+							$out .= ($param ? '&amp;'.$param : '');

@@ -959 +883,2 @@
-						if ($morepicto) {

+						if ($morepicto)

+						{

@@ -966,4 +891,2 @@
-					if (is_object($hookmanager)) {

-						$addcolumforpicto = ($delallowed || $printer || $morepicto);

-						$colspan = (4 + ($addcolumforpicto ? 1 : 0));

-						$colspanmore = 0;

+					if (is_object($hookmanager))

+					{

@@ -972 +895,2 @@
-						if (empty($res)) {

+						if (empty($res))

+						{

@@ -975 +899,3 @@
-						} else {

+						}

+						else

+						{

@@ -978 +904 @@
-					}

+			  		}

@@ -984 +910,2 @@
-			if (is_array($link_list)) {

+			if (is_array($link_list))

+			{

@@ -987 +914,2 @@
-				foreach ($link_list as $file) {

+				foreach ($link_list as $file)

+				{

@@ -990 +918 @@
-					$out .= '<a data-ajax="false" href="'.$file->url.'" target="_blank" rel="noopener noreferrer">';

+					$out .= '<a data-ajax="false" href="'.$file->url.'" target="_blank">';

@@ -997,5 +925 @@
-					// for share link of files

-					$out .= '<td></td>';

-					if ($delallowed || $printer || $morepicto) {

-						$out .= '<td></td>';

-					}

+					if ($delallowed || $printer || $morepicto) $out .= '<td></td>';

@@ -1007,6 +931,8 @@
-			if (count($file_list) == 0 && count($link_list) == 0 && $headershown) {

-				$out .= '<tr><td colspan="'.(3 + ($addcolumforpicto ? 1 : 0)).'"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>'."\n";

-			}

-		}

-

-		if ($headershown) {

+		 	if (count($file_list) == 0 && count($link_list) == 0 && $headershown)

+			{

+				$out .= '<tr><td colspan="'.(3 + ($addcolumforpicto ? 1 : 0)).'" class="opacitymedium">'.$langs->trans("None").'</td></tr>'."\n";

+			}

+		}

+

+		if ($headershown)

+		{

@@ -1016,4 +942,3 @@
-			if ($genallowed) {

-				if (empty($noform)) {

-					$out .= '</form>'."\n";

-				}

+			if ($genallowed)

+			{

+				if (empty($noform)) $out .= '</form>'."\n";

@@ -1023,12 +947,0 @@
-

-		$out .= '<script>

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

-			var selectedValue = $(".selectformat").val();

-

-			if (selectedValue === "excel2007" || selectedValue === "tsv") {

-			  $(".forhide").prop("disabled", true).hide();

-			} else {

-			  $(".forhide").prop("disabled", false).show();

-			}

-		  });

-			</script>';

@@ -1044 +957 @@
-	 *	@param	string	$modulepart		'propal', 'facture', 'facture_fourn', ...

+	 *	@param	string	$modulepart		propal, facture, facture_fourn, ...

@@ -1048,2 +960,0 @@
-	 *  @param	string	$morecss		Add more css to the download picto

-	 *  @param	int 	$allfiles		0=Only generated docs, 1=All files

@@ -1052 +963 @@
-	public function getDocumentsLink($modulepart, $modulesubdir, $filedir, $filter = '', $morecss = 'valignmiddle', $allfiles = 0)

+	public function getDocumentsLink($modulepart, $modulesubdir, $filedir, $filter = '')

@@ -1064 +975,2 @@
-		if (isModEnabled('multicompany')) {

+		if (!empty($conf->multicompany->enabled))

+		{

@@ -1070,5 +982,9 @@
-		// Get list of files starting with name of ref (Note: files with '^ref\.extension' are generated files, files with '^ref-...' are uploaded files)

-		if ($allfiles || getDolGlobalString('MAIN_SHOW_ALL_FILES_ON_DOCUMENT_TOOLTIP')) {

-			$filterforfilesearch = '^'.preg_quote(basename($modulesubdir), '/');

-		} else {

-			$filterforfilesearch = '^'.preg_quote(basename($modulesubdir), '/').'\.';

+		// Get list of files starting with name of ref (but not followed by "-" to discard uploaded files and get only generated files)

+		// @todo Why not showing by default all files by just removing the '[^\-]+' at end of regex ?

+		if (!empty($conf->global->MAIN_SHOW_ALL_FILES_ON_DOCUMENT_TOOLTIP))

+		{

+			$filterforfilesearch = preg_quote(basename($modulesubdir), '/');

+		}

+		else

+		{

+			$filterforfilesearch = preg_quote(basename($modulesubdir), '/').'[^\-]+';

@@ -1081 +997,2 @@
-		if (!empty($file_list)) {

+		if (!empty($file_list))

+		{

@@ -1083 +1000 @@
-    			<dt><a data-ajax="false" href="#" onClick="return false;">'.img_picto('', 'listlight', '', 0, 0, 0, '', $morecss).'</a></dt>

+    			<dt><a data-ajax="false" href="#" onClick="return false;">'.img_picto('', 'listlight', '', 0, 0, 0, '', 'valignmiddle').'</a></dt>

@@ -1089,2 +1006,2 @@
-			$i = 0;

-			foreach ($file_list as $file) {

+			foreach ($file_list as $file)

+			{

@@ -1092,3 +1009 @@
-				if ($filter && !preg_match('/'.$filter.'/i', $file["name"])) {

-					continue; // Discard this. It does not match provided filter.

-				}

+				if ($filter && !preg_match('/'.$filter.'/i', $file["name"])) continue; // Discard this. It does not match provided filter.

@@ -1099,3 +1014 @@
-				if ($modulesubdir) {

-					$relativepath = $modulesubdir."/".$file["name"]; // Cas propal, facture...

-				}

+				if ($modulesubdir) $relativepath = $modulesubdir."/".$file["name"]; // Cas propal, facture...

@@ -1113,5 +1026,2 @@
-				if (empty($this->infofiles[$ext])) {

-					$this->infofiles['extensions'][$ext] = 1;

-				} else {

-					$this->infofiles['extensions'][$ext]++;

-				}

+				if (empty($this->infofiles[$ext])) $this->infofiles['extensions'][$ext] = 1;

+				else $this->infofiles['extensions'][$ext]++;

@@ -1120 +1030,2 @@
-				if (!empty($conf->use_javascript_ajax) && ($conf->browser->layout != 'phone')) {

+				if (!empty($conf->use_javascript_ajax) && ($conf->browser->layout != 'phone'))

+				{

@@ -1122 +1033,2 @@
-					if ($tmparray && $tmparray['url']) {

+					if ($tmparray && $tmparray['url'])

+					{

@@ -1133,3 +1045 @@
-				if (preg_match('/text/', $mime)) {

-					$tmpout .= ' target="_blank" rel="noopener noreferrer"';

-				}

+				if (preg_match('/text/', $mime)) $tmpout .= ' target="_blank"';

@@ -1145,4 +1055,4 @@
-			if (!$found) {

-				$out = '';

-			}

-		} else {

+			if (!$found) $out = '';

+		}

+		else

+		{

@@ -1157 +1067 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -1162,27 +1072,26 @@
-	 *  @param	 array			$filearray          Array of files loaded by dol_dir_list('files') function before calling this.

-	 * 	@param	 Object|null	$object				Object on which document is linked to.

-	 * 	@param	 string			$modulepart			Value for modulepart used by download or viewimage wrapper.

-	 * 	@param	 string			$param				Parameters on sort links (param must start with &, example &aaa=bbb&ccc=ddd)

-	 * 	@param	 int			$forcedownload		Force to open dialog box "Save As" when clicking on file.

-	 * 	@param	 string			$relativepath		Relative path of docs (autodefined if not provided), relative to module dir, not to MAIN_DATA_ROOT.

-	 * 	@param	 int			$permonobject		Permission on object (so permission to delete or crop document)

-	 * 	@param	 int			$useinecm			Change output for use in ecm module:

-	 * 												0 or 6: Add a preview column. Show also a rename button. Show also a crop button for some values of $modulepart (must be supported into hard coded list in this function + photos_resize.php + restrictedArea + checkUserAccessToObject)

-	 * 												1: Add link to edit ECM entry

-	 * 												2: Add rename and crop link

-	 *                                  		    4: Add a preview column

-	 *                                  		    5: Add link to edit ECM entry and Add a preview column

-	 * 	@param	 string			$textifempty		Text to show if filearray is empty ('NoFileFound' if not defined)

-	 *  @param   int			$maxlength          Maximum length of file name shown.

-	 *  @param	 string			$title				Title before list. Use 'none' to disable title.

-	 *  @param	 string 		$url				Full url to use for click links ('' = autodetect)

-	 *  @param	 int			$showrelpart		0=Show only filename (default), 1=Show first level 1 dir

-	 *  @param   int    		$permtoeditline     Permission to edit document line (You must provide a value, -1 is deprecated and must not be used any more)

-	 *  @param   string 		$upload_dir         Full path directory so we can know dir relative to MAIN_DATA_ROOT. Fill this to complete file data with database indexes.

-	 *  @param   string 		$sortfield          Sort field ('name', 'size', 'position', ...)

-	 *  @param   string 		$sortorder          Sort order ('ASC' or 'DESC')

-	 *  @param   int    		$disablemove        1=Disable move button, 0=Position move is possible.

-	 *  @param	 int			$addfilterfields	Add the line with filters

-	 *  @param	 int			$disablecrop		Disable crop feature on images (-1 = auto, prefer to set it explicitely to 0 or 1)

-	 *  @param	 string			$moreattrondiv		More attributes on the div for responsive. Example 'style="height:280px; overflow: auto;"'

-	 * 	@return	 int								Return integer <0 if KO, nb of files shown if OK

+	 *  @param	 array	$filearray          Array of files loaded by dol_dir_list('files') function before calling this.

+	 * 	@param	 Object	$object				Object on which document is linked to.

+	 * 	@param	 string	$modulepart			Value for modulepart used by download or viewimage wrapper.

+	 * 	@param	 string	$param				Parameters on sort links (param must start with &, example &aaa=bbb&ccc=ddd)

+	 * 	@param	 int	$forcedownload		Force to open dialog box "Save As" when clicking on file.

+	 * 	@param	 string	$relativepath		Relative path of docs (autodefined if not provided), relative to module dir, not to MAIN_DATA_ROOT.

+	 * 	@param	 int	$permonobject		Permission on object (so permission to delete or crop document)

+	 * 	@param	 int	$useinecm			Change output for use in ecm module:

+	 * 										0 or 6: Add a preview column. Show also a rename button. Show also a crop button for some values of $modulepart (must be supported into hard coded list in this function + photos_resize.php + restrictedArea + checkUserAccessToObject)

+	 * 										1: Add link to edit ECM entry

+	 * 										2: Add rename and crop link

+	 *                                      4: Add a preview column

+	 *                                      5: Add link to edit ECM entry and Add a preview column

+	 * 	@param	 string	$textifempty		Text to show if filearray is empty ('NoFileFound' if not defined)

+	 *  @param   int	$maxlength          Maximum length of file name shown.

+	 *  @param	 string	$title				Title before list. Use 'none' to disable title.

+	 *  @param	 string $url				Full url to use for click links ('' = autodetect)

+	 *  @param	 int	$showrelpart		0=Show only filename (default), 1=Show first level 1 dir

+	 *  @param   int    $permtoeditline     Permission to edit document line (You must provide a value, -1 is deprecated and must not be used any more)

+	 *  @param   string $upload_dir         Full path directory so we can know dir relative to MAIN_DATA_ROOT. Fill this to complete file data with database indexes.

+	 *  @param   string $sortfield          Sort field ('name', 'size', 'position', ...)

+	 *  @param   string $sortorder          Sort order ('ASC' or 'DESC')

+	 *  @param   int    $disablemove        1=Disable move button, 0=Position move is possible.

+	 *  @param	 int	$addfilterfields	Add line with filters

+	 *  @param	 int	$disablecrop		Disable crop feature on images (-1 = auto, prefer to set it explicitely to 0 or 1)

+	 * 	@return	 int						<0 if KO, nb of files shown if OK

@@ -1191 +1100 @@
-	public function list_of_documents($filearray, $object, $modulepart, $param = '', $forcedownload = 0, $relativepath = '', $permonobject = 1, $useinecm = 0, $textifempty = '', $maxlength = 0, $title = '', $url = '', $showrelpart = 0, $permtoeditline = -1, $upload_dir = '', $sortfield = '', $sortorder = 'ASC', $disablemove = 1, $addfilterfields = 0, $disablecrop = -1, $moreattrondiv = '')

+	public function list_of_documents($filearray, $object, $modulepart, $param = '', $forcedownload = 0, $relativepath = '', $permonobject = 1, $useinecm = 0, $textifempty = '', $maxlength = 0, $title = '', $url = '', $showrelpart = 0, $permtoeditline = -1, $upload_dir = '', $sortfield = '', $sortorder = 'ASC', $disablemove = 1, $addfilterfields = 0, $disablecrop = -1)

@@ -1193,2 +1102,2 @@
-		// phpcs:enable

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

+        // phpcs:enable

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

@@ -1197,2 +1106,4 @@
-

-		if ($disablecrop == -1) {

+		global $form;

+

+		if ($disablecrop == -1)

+		{

@@ -1200,4 +1111 @@
-			// Values here must be supported by the photos_resize.php page.

-			if (in_array($modulepart, array('bank', 'bom', 'expensereport', 'facture', 'facture_fournisseur', 'holiday', 'medias', 'member', 'mrp', 'project', 'product', 'produit', 'propal', 'service', 'societe', 'tax', 'tax-vat', 'ticket', 'user'))) {

-				$disablecrop = 0;

-			}

+			if (in_array($modulepart, array('bank', 'bom', 'expensereport', 'holiday', 'medias', 'member', 'mrp', 'project', 'product', 'produit', 'propal', 'service', 'societe', 'tax', 'tax-vat', 'ticket', 'user'))) $disablecrop = 0;

@@ -1207,8 +1115,5 @@
-		if (empty($relativepath)) {

-			$relativepath = (!empty($object->ref) ? dol_sanitizeFileName($object->ref) : '').'/';

-			if (!empty($object->element) && $object->element == 'invoice_supplier') {

-				$relativepath = get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').$relativepath; // TODO Call using a defined value for $relativepath

-			}

-			if (!empty($object->element) && $object->element == 'project_task') {

-				$relativepath = 'Call_not_supported_._Call_function_using_a_defined_relative_path_.';

-			}

+		if (empty($relativepath))

+		{

+			$relativepath = (!empty($object->ref) ?dol_sanitizeFileName($object->ref) : '').'/';

+			if ($object->element == 'invoice_supplier') $relativepath = get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').$relativepath; // TODO Call using a defined value for $relativepath

+			if ($object->element == 'project_task') $relativepath = 'Call_not_supported_._Call_function_using_a_defined_relative_path_.';

@@ -1217,4 +1122,4 @@
-		if (getDolGlobalInt('PRODUCT_USE_OLD_PATH_FOR_PHOTO') && isset($filearray[0]) && $filearray[0]['level1name'] == 'photos') {

-			$relativepath = preg_replace('/^.*\/produit\//', '', $filearray[0]['path']).'/';

-		}

-

+		if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO) && $filearray[0]['level1name'] == 'photos')

+		{

+		    $relativepath = preg_replace('/^.*\/produit\//', '', $filearray[0]['path']).'/';

+		}

@@ -1223 +1128,2 @@
-		if ($upload_dir) {

+		if ($upload_dir)

+		{

@@ -1247 +1153,2 @@
-		if (!empty($reshook)) { // null or '' for bypass

+		if (isset($reshook) && $reshook != '') // null or '' for bypass

+		{

@@ -1249,2 +1156,5 @@
-		} else {

-			if (!is_object($form)) {

+		}

+		else

+		{

+			if (!is_object($form))

+			{

@@ -1255,3 +1165 @@
-			if (!preg_match('/&id=/', $param) && isset($object->id)) {

-				$param .= '&id='.$object->id;

-			}

+			if (!preg_match('/&id=/', $param) && isset($object->id)) $param .= '&id='.$object->id;

@@ -1259,5 +1167,4 @@
-			if ($relativepathwihtoutslashend) {

-				$param .= '&file='.urlencode($relativepathwihtoutslashend);

-			}

-

-			if ($permtoeditline < 0) {  // Old behaviour for backward compatibility. New feature should call method with value 0 or 1

+			if ($relativepathwihtoutslashend) $param .= '&file='.urlencode($relativepathwihtoutslashend);

+

+			if ($permtoeditline < 0)  // Old behaviour for backward compatibility. New feature should call method with value 0 or 1

+			{

@@ -1265,10 +1172,8 @@
-				if (in_array($modulepart, array('product', 'produit', 'service'))) {

-					if ($user->hasRight('produit', 'creer') && $object->type == Product::TYPE_PRODUCT) {

-						$permtoeditline = 1;

-					}

-					if ($user->hasRight('service', 'creer') && $object->type == Product::TYPE_SERVICE) {

-						$permtoeditline = 1;

-					}

-				}

-			}

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

+				if (in_array($modulepart, array('product', 'produit', 'service')))

+				{

+					if ($user->rights->produit->creer && $object->type == Product::TYPE_PRODUCT) $permtoeditline = 1;

+					if ($user->rights->service->creer && $object->type == Product::TYPE_SERVICE) $permtoeditline = 1;

+				}

+			}

+			if (empty($conf->global->MAIN_UPLOAD_DOC))

+			{

@@ -1280,6 +1185,2 @@
-			if ((empty($useinecm) || $useinecm == 6) && $title != 'none') {

-				print load_fiche_titre($title ? $title : $langs->trans("AttachedFiles"), '', 'file-upload', 0, '', 'table-list-of-attached-files');

-			}

-			if (empty($url)) {

-				$url = $_SERVER["PHP_SELF"];

-			}

+			if ((empty($useinecm) || $useinecm == 6) && $title != 'none') print load_fiche_titre($title ? $title : $langs->trans("AttachedFiles"), '', 'file-upload', 0, '', 'table-list-of-attached-files');

+			if (empty($url)) $url = $_SERVER["PHP_SELF"];

@@ -1288 +1189,2 @@
-			if (GETPOST('action', 'aZ09') == 'editfile' && $permtoeditline) {

+			if (GETPOST('action', 'aZ09') == 'editfile' && $permtoeditline)

+			{

@@ -1296,4 +1198,5 @@
-			print '<div class="div-table-responsive-no-min"'.($moreattrondiv ? ' '.$moreattrondiv : '').'>';

-			print '<table id="tablelines" class="centpercent liste noborder nobottom">'."\n";

-

-			if (!empty($addfilterfields)) {

+			print '<div class="div-table-responsive-no-min">';

+			print '<table width="100%" id="tablelines" class="liste noborder nobottom">'."\n";

+

+			if (!empty($addfilterfields))

+			{

@@ -1304,3 +1207 @@
-				if (empty($useinecm) || $useinecm == 4 || $useinecm == 5 || $useinecm == 6) {

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

-				}

+				if (empty($useinecm) || $useinecm == 4 || $useinecm == 5 || $useinecm == 6) print '<td></td>';

@@ -1309,3 +1210 @@
-				if (empty($disablemove) && count($filearray) > 1) {

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

-				}

+				if (!$disablemove) print '<td></td>';

@@ -1313,10 +1211,0 @@
-			}

-

-			// Get list of files stored into database for same relative directory

-			if ($relativedir) {

-				completeFileArrayWithDatabaseInfo($filearray, $relativedir);

-

-				//var_dump($sortfield.' - '.$sortorder);

-				if ($sortfield && $sortorder) {	// If $sortfield is for example 'position_name', we will sort on the property 'position_name' (that is concat of position+name)

-					$filearray = dol_sort_array($filearray, $sortfield, $sortorder);

-				}

@@ -1330,4 +1219 @@
-			if (empty($useinecm) || $useinecm == 4 || $useinecm == 5 || $useinecm == 6) {

-				print_liste_field_titre('', $url, "", "", $param, '', $sortfield, $sortorder, 'center '); // Preview

-			}

-			// Shared or not - Hash of file

+			if (empty($useinecm) || $useinecm == 4 || $useinecm == 5 || $useinecm == 6) print_liste_field_titre('', $url, "", "", $param, '', $sortfield, $sortorder, 'center '); // Preview

@@ -1335 +1220,0 @@
-			// Action button

@@ -1337,3 +1222 @@
-			if (empty($disablemove) && count($filearray) > 1) {

-				print_liste_field_titre('');

-			}

+			if (!$disablemove) print_liste_field_titre('');

@@ -1341,0 +1225,12 @@
+			// Get list of files stored into database for same relative directory

+			if ($relativedir)

+			{

+				completeFileArrayWithDatabaseInfo($filearray, $relativedir);

+

+				//var_dump($sortfield.' - '.$sortorder);

+				if ($sortfield && $sortorder)	// If $sortfield is for example 'position_name', we will sort on the property 'position_name' (that is concat of position+name)

+				{

+					$filearray = dol_sort_array($filearray, $sortfield, $sortorder);

+				}

+			}

+

@@ -1343,8 +1238,5 @@
-			if ($nboffiles > 0) {

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

-			}

-

-			$i = 0;

-			$nboflines = 0;

-			$lastrowid = 0;

-			foreach ($filearray as $key => $file) {      // filearray must be only files here

+			if ($nboffiles > 0) include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';

+

+			$i = 0; $nboflines = 0; $lastrowid = 0;

+			foreach ($filearray as $key => $file)      // filearray must be only files here

+			{

@@ -1353,4 +1245,3 @@
-						&& !preg_match('/\.meta$/i', $file['name'])) {

-					if (array_key_exists('rowid', $filearray[$key]) && $filearray[$key]['rowid'] > 0) {

-						$lastrowid = $filearray[$key]['rowid'];

-					}

+						&& !preg_match('/\.meta$/i', $file['name']))

+				{

+					if ($filearray[$key]['rowid'] > 0) $lastrowid = $filearray[$key]['rowid'];

@@ -1363,4 +1254,2 @@
-

-					print '<!-- In database: position='.(array_key_exists('position', $filearray[$key]) ? $filearray[$key]['position'] : 0).' -->'."\n";

-					print '<tr class="oddeven" id="row-'.((array_key_exists('rowid', $filearray[$key]) && $filearray[$key]['rowid'] > 0) ? $filearray[$key]['rowid'] : 'AFTER'.$lastrowid.'POS'.($i + 1)).'">';

-

+					print '<!-- In database: position='.$filearray[$key]['position'].' -->'."\n";

+					print '<tr class="oddeven" id="row-'.($filearray[$key]['rowid'] > 0 ? $filearray[$key]['rowid'] : 'AFTER'.$lastrowid.'POS'.($i + 1)).'">';

@@ -1369 +1258 @@
-					print '<td class="minwith200 tdoverflowmax500">';

+					print '<td class="minwith200">';

@@ -1373,7 +1262,3 @@
-					print '<a class="paddingright valignmiddle" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;

-					if ($forcedownload) {

-						print '&attachment=1';

-					}

-					if (!empty($object->entity)) {

-						print '&entity='.$object->entity;

-					}

+					print '<a class="paddingright" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;

+					if ($forcedownload) print '&attachment=1';

+					if (!empty($object->entity)) print '&entity='.$object->entity;

@@ -1382,4 +1267,2 @@
-					print img_mime($file['name'], $file['name'].' ('.dol_print_size($file['size'], 0, 0).')', 'inline-block valignmiddle paddingright');

-					if ($showrelpart == 1) {

-						print $relativepath;

-					}

+					print img_mime($file['name'], $file['name'].' ('.dol_print_size($file['size'], 0, 0).')', 'inline-block valignbottom paddingright');

+					if ($showrelpart == 1) print $relativepath;

@@ -1387 +1270,2 @@
-					if (GETPOST('action', 'aZ09') == 'editfile' && $file['name'] == basename(GETPOST('urlfile', 'alpha'))) {

+					if (GETPOST('action', 'aZ09') == 'editfile' && $file['name'] == basename(GETPOST('urlfile', 'alpha')))

+					{

@@ -1390,3 +1274 @@
-						if (!preg_match('/\/$/', $section_dir)) {

-							$section_dir .= '/';

-						}

+						if (! preg_match('/\/$/', $section_dir)) $section_dir.='/';

@@ -1397 +1279,3 @@
-					} else {

+					}

+					else

+					{

@@ -1399 +1283 @@
-						print dol_escape_htmltag(dol_trunc($filenametoshow, 200));

+						print dol_trunc($filenametoshow, 200);

@@ -1403,3 +1287 @@
-					if (!$editline) {

-						print $this->showPreview($file, $modulepart, $filepath, 0, '&entity='.(empty($object->entity) ? $conf->entity : $object->entity));

-					}

+					if (!$editline) print $this->showPreview($file, $modulepart, $filepath, 0, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity));

@@ -1411,0 +1294 @@
+

@@ -1413,3 +1296,2 @@
-					if ($sizetoshow == $sizetoshowbytes) {

-						print $sizetoshow;

-					} else {

+					if ($sizetoshow == $sizetoshowbytes) print $sizetoshow;

+					else {

@@ -1421 +1303 @@
-					print '<td class="center nowraponall">'.dol_print_date($file['date'], "dayhour", "tzuser").'</td>';

+					print '<td class="center" style="width: 140px">'.dol_print_date($file['date'], "dayhour", "tzuser").'</td>'; // 140px = width for date with PM format

@@ -1424 +1306,2 @@
-					if (empty($useinecm) || $useinecm == 4 || $useinecm == 5 || $useinecm == 6) {

+					if (empty($useinecm) || $useinecm == 4 || $useinecm == 5 || $useinecm == 6)

+					{

@@ -1427,9 +1310,11 @@
-						if (image_format_supported($file['name']) >= 0) {

-							if ($useinecm == 5 || $useinecm == 6) {

-								$smallfile = getImageFileNameForSize($file['name'], ''); // There is no thumb for ECM module and Media filemanager, so we use true image. TODO Change this it is slow on image dir.

-							} else {

-								$smallfile = getImageFileNameForSize($file['name'], '_small'); // For new thumbs using same ext (in lower case however) than original

-							}

-							if (!dol_is_file($file['path'].'/'.$smallfile)) {

-								$smallfile = getImageFileNameForSize($file['name'], '_small', '.png'); // For backward compatibility of old thumbs that were created with filename in lower case and with .png extension

-							}

+						if (image_format_supported($file['name']) >= 0)

+						{

+						    if ($useinecm == 5 || $useinecm == 6)

+						    {

+						        $smallfile = getImageFileNameForSize($file['name'], ''); // There is no thumb for ECM module and Media filemanager, so we use true image. TODO Change this it is slow on image dir.

+						    }

+						    else

+						    {

+						        $smallfile = getImageFileNameForSize($file['name'], '_small'); // For new thumbs using same ext (in lower case however) than original

+						    }

+						    if (!dol_is_file($file['path'].'/'.$smallfile)) $smallfile = getImageFileNameForSize($file['name'], '_small', '.png'); // For backward compatibility of old thumbs that were created with filename in lower case and with .png extension

@@ -1438 +1323 @@
-							$urlforhref = getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(empty($object->entity) ? $conf->entity : $object->entity));

+							$urlforhref = getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity));

@@ -1440,2 +1325,2 @@
-								$urlforhref = DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(empty($object->entity) ? $conf->entity : $object->entity).'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']));

-								print '<a href="'.$urlforhref.'" class="aphoto" target="_blank" rel="noopener noreferrer">';

+								$urlforhref = DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']));

+								print '<a href="'.$urlforhref.'" class="aphoto" target="_blank">';

@@ -1445 +1330 @@
-							print '<img class="photo maxwidth200 shadow valignmiddle" height="'.(($useinecm == 4 || $useinecm == 5 || $useinecm == 6) ? '20' : $maxheightmini).'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(empty($object->entity) ? $conf->entity : $object->entity).'&file='.urlencode($relativepath.$smallfile).'" title="">';

+							print '<img class="photo maxwidth200" height="'.(($useinecm == 4 || $useinecm == 5 || $useinecm == 6) ? '12' : $maxheightmini).'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($relativepath.$smallfile).'" title="">';

@@ -1447,2 +1331,0 @@
-						} else {

-							print '&nbsp;';

@@ -1449,0 +1333 @@
+						else print '&nbsp;';

@@ -1453 +1337 @@
-					// Shared or not - Hash of file

+					// Hash of file (only if we are in a mode where a scan of dir were done and we have id of file in ECM table)

@@ -1455,6 +1339,11 @@
-					if ($relativedir && $filearray[$key]['rowid'] > 0) {	// only if we are in a mode where a scan of dir were done and we have id of file in ECM table

-						if ($editline) {

-							print '<label for="idshareenabled'.$key.'">'.$langs->trans("FileSharedViaALink").'</label> ';

-							print '<input class="inline-block" type="checkbox" id="idshareenabled'.$key.'" name="shareenabled"'.($file['share'] ? ' checked="checked"' : '').' /> ';

-						} else {

-							if ($file['share']) {

+					if ($relativedir && $filearray[$key]['rowid'] > 0)

+					{

+						if ($editline)

+						{

+							print $langs->trans("FileSharedViaALink").' ';

+							print '<input class="inline-block" type="checkbox" name="shareenabled"'.($file['share'] ? ' checked="checked"' : '').' /> ';

+						}

+						else

+						{

+							if ($file['share'])

+							{

@@ -1469,6 +1358,2 @@
-								if (!empty($file['share'])) {

-									$paramlink .= ($paramlink ? '&' : '').'hashp='.$file['share']; // Hash for public share

-								}

-								if ($forcedownload) {

-									$paramlink .= ($paramlink ? '&' : '').'attachment=1';

-								}

+								if (!empty($file['share'])) $paramlink .= ($paramlink ? '&' : '').'hashp='.$file['share']; // Hash for public share

+								if ($forcedownload) $paramlink .= ($paramlink ? '&' : '').'attachment=1';

@@ -1478,3 +1363,5 @@
-								print '<a href="'.$fulllink.'" target="_blank" rel="noopener">'.img_picto($langs->trans("FileSharedViaALink"), 'globe').'</a> ';

-								print '<input type="text" class="quatrevingtpercent minwidth200imp nopadding small" id="downloadlink'.$filearray[$key]['rowid'].'" name="downloadexternallink" title="'.dol_escape_htmltag($langs->trans("FileSharedViaALink")).'" value="'.dol_escape_htmltag($fulllink).'">';

-							} else {

+								print img_picto($langs->trans("FileSharedViaALink"), 'globe').' ';

+								print '<input type="text" class="quatrevingtpercent minwidth200imp" id="downloadlink" name="downloadexternallink" value="'.dol_escape_htmltag($fulllink).'">';

+							}

+							else

+							{

@@ -1487,2 +1374,3 @@
-					// Actions buttons (1 column or 2 if !disablemove)

-					if (!$editline) {

+					// Actions buttons

+					if (!$editline)

+					{

@@ -1492 +1380,2 @@
-						if ($useinecm == 1 || $useinecm == 5) {	// ECM manual tree only

+						if ($useinecm == 1 || $useinecm == 5)	// ECM manual tree only

+						{

@@ -1494 +1383 @@
-							$newparam = preg_replace('/&file=.*$/', '', $param); // We don't need param file=

+							$newparam.=preg_replace('/&file=.*$/', '', $param);		// We don't need param file=

@@ -1496 +1385 @@
-							print '<a class="editfielda editfilelink" href="'.DOL_URL_ROOT.'/ecm/file_card.php?urlfile='.urlencode($file['name']).$param.'&backtopage='.urlencode($backtopage).'" rel="'.urlencode($file['name']).'">'.img_edit('default', 0, 'class="paddingrightonly"').'</a>';

+							print '<a class="editfielda" href="'.DOL_URL_ROOT.'/ecm/file_card.php?urlfile='.urlencode($file['name']).$param.'&backtopage='.urlencode($backtopage).'" class="editfilelink" rel="'.urlencode($file['name']).'">'.img_edit('default', 0, 'class="paddingrightonly"').'</a>';

@@ -1499 +1388,2 @@
-						if (empty($useinecm) || $useinecm == 2 || $useinecm == 6) {	// 6=Media file manager

+						if (empty($useinecm) || $useinecm == 2 || $useinecm == 6)	// 6=Media file manager

+						{

@@ -1501,8 +1391,10 @@
-							if (in_array($modulepart, array('product', 'produit', 'service'))) {

-								$newmodulepart = 'produit|service';

-							}

-							if (image_format_supported($file['name']) > 0) {

-								if ($permtoeditline) {

-									$moreparaminurl = '';

-									if (!empty($object->id) && $object->id > 0) {

-										$moreparaminurl .= '&id='.$object->id;

+							if (in_array($modulepart, array('product', 'produit', 'service'))) $newmodulepart = 'produit|service';

+

+							if (!$disablecrop && image_format_supported($file['name']) > 0)

+							{

+								if ($permtoeditline)

+								{

+	   								// Link to resize

+	   								$moreparaminurl = '';

+									if ($object->id > 0) {

+										$moreparaminurl = '&id='.$object->id;

@@ -1510 +1402 @@
-										$moreparaminurl .= '&website='.GETPOST('website', 'alpha');

+										$moreparaminurl = '&website='.GETPOST('website', 'alpha');

@@ -1512,28 +1403,0 @@
-									// Set the backtourl

-									if ($modulepart == 'medias' && !GETPOST('website')) {

-										$moreparaminurl .= '&backtourl='.urlencode(DOL_URL_ROOT.'/ecm/index_medias.php?file_manager=1&modulepart='.$modulepart.'&section_dir='.$relativepath);

-									}

-									// Link to convert into webp

-									if (!preg_match('/\.webp$/i', $file['name'])) {

-										if ($modulepart == 'medias' && !GETPOST('website')) {

-											print '<a href="'.DOL_URL_ROOT.'/ecm/index_medias.php?action=confirmconvertimgwebp&token='.newToken().'&section_dir='.urlencode($relativepath).'&filetoregenerate='.urlencode($fileinfo['basename']).'&module='.$modulepart.$param.$moreparaminurl.'" title="'.dol_escape_htmltag($langs->trans("GenerateChosenImgWebp")).'">'.img_picto('', 'images', 'class="flip marginrightonly"').'</a>';

-										} elseif ($modulepart == 'medias' && GETPOST('website')) {

-											print '<a href="'.DOL_URL_ROOT.'/website/index.php?action=confirmconvertimgwebp&token='.newToken().'&section_dir='.urlencode($relativepath).'&filetoregenerate='.urlencode($fileinfo['basename']).'&module='.$modulepart.$param.$moreparaminurl.'" title="'.dol_escape_htmltag($langs->trans("GenerateChosenImgWebp")).'">'.img_picto('', 'images', 'class="flip marginrightonly"').'</a>';

-										}

-									}

-								}

-							}

-							if (!$disablecrop && image_format_supported($file['name']) > 0) {

-								if ($permtoeditline) {

-									// Link to resize

-									$moreparaminurl = '';

-									if (!empty($object->id) && $object->id > 0) {

-										$moreparaminurl .= '&id='.$object->id;

-									} elseif (GETPOST('website', 'alpha')) {

-										$moreparaminurl .= '&website='.GETPOST('website', 'alpha');

-									}

-									// Set the backtourl

-									if ($modulepart == 'medias' && !GETPOST('website')) {

-										$moreparaminurl .= '&backtourl='.urlencode(DOL_URL_ROOT.'/ecm/index_medias.php?file_manager=1&modulepart='.$modulepart.'&section_dir='.$relativepath);

-									}

-									//var_dump($moreparaminurl);

@@ -1544 +1408,2 @@
-							if ($permtoeditline) {

+							if ($permtoeditline)

+							{

@@ -1546 +1411 @@
-								print '<a class="editfielda reposition editfilelink" href="'.(($useinecm == 1 || $useinecm == 5) ? '#' : ($url.'?action=editfile&token='.newToken().'&urlfile='.urlencode($filepath).$paramsectiondir.$param)).'" rel="'.$filepath.'">'.img_edit('default', 0, 'class="paddingrightonly"').'</a>';

+								print '<a class="editfielda reposition" href="'.(($useinecm == 1 || $useinecm == 5) ? '#' : ($url.'?action=editfile&urlfile='.urlencode($filepath).$paramsectiondir.$param)).'" class="editfilelink" rel="'.$filepath.'">'.img_edit('default', 0, 'class="paddingrightonly"').'</a>';

@@ -1549,2 +1414,2 @@
-						// Output link to delete file

-						if ($permonobject) {

+						if ($permonobject)

+						{

@@ -1552,10 +1417,4 @@
-							if (!empty($conf->dol_use_jmobile)) {

-								$useajax = 0;

-							}

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

-								$useajax = 0;

-							}

-							if (getDolGlobalString('MAIN_ECM_DISABLE_JS')) {

-								$useajax = 0;

-							}

-							print '<a href="'.((($useinecm && $useinecm != 6) && $useajax) ? '#' : ($url.'?action=deletefile&token='.newToken().'&urlfile='.urlencode($filepath).$param)).'" class="reposition deletefilelink" rel="'.$filepath.'">'.img_delete().'</a>';

+							if (!empty($conf->dol_use_jmobile)) $useajax = 0;

+							if (empty($conf->use_javascript_ajax)) $useajax = 0;

+							if (!empty($conf->global->MAIN_ECM_DISABLE_JS)) $useajax = 0;

+							print '<a href="'.((($useinecm && $useinecm != 6) && $useajax) ? '#' : ($url.'?action=delete&urlfile='.urlencode($filepath).$param)).'" class="reposition deletefilelink" rel="'.$filepath.'">'.img_delete().'</a>';

@@ -1565 +1424,2 @@
-						if (empty($disablemove) && count($filearray) > 1) {

+						if (empty($disablemove))

+						{

@@ -1569 +1429 @@
-									print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=up&rowid='.$object->id.'">'.img_up('default', 0, 'imgupforline').'</a>';

+									print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=up&amp;rowid='.$line->id.'">'.img_up('default', 0, 'imgupforline').'</a>';

@@ -1571,2 +1431,2 @@
-								if ($i < ($nboffiles - 1)) {

-									print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=down&rowid='.$object->id.'">'.img_down('default', 0, 'imgdownforline').'</a>';

+								if ($i < $nboffiles - 1) {

+									print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=down&amp;rowid='.$line->id.'">'.img_down('default', 0, 'imgdownforline').'</a>';

@@ -1575,3 +1434,0 @@
-							} else {

-								print '<td'.(($conf->browser->layout != 'phone') ? ' class="linecolmove tdlineupdown center"' : ' class="linecolmove center"').'>';

-								print '</td>';

@@ -1579,2 +1436,8 @@
-						}

-					} else {

+							else {

+							   	print '<td'.(($conf->browser->layout != 'phone' && empty($disablemove)) ? ' class="linecolmove tdlineupdown center"' : ' class="linecolmove center"').'>';

+							   	print '</td>';

+							}

+					    }

+					}

+					else

+					{

@@ -1583,2 +1446,2 @@
-						print '<input type="submit" class="button button-save smallpaddingimp" name="renamefilesave" value="'.dol_escape_htmltag($langs->trans("Save")).'">';

-						print '<input type="submit" class="button button-cancel smallpaddingimp" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';

+						print '<input type="submit" class="button" name="renamefilesave" value="'.dol_escape_htmltag($langs->trans("Save")).'">';

+						print '<input type="submit" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';

@@ -1586,3 +1449 @@
-						if (empty($disablemove) && count($filearray) > 1) {

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

-						}

+						if (empty($disablemove)) print '<td class="right"></td>';

@@ -1595 +1456,2 @@
-			if ($nboffiles == 0) {

+			if ($nboffiles == 0)

+			{

@@ -1597,9 +1459,4 @@
-				if (empty($disablemove) && count($filearray) > 1) {

-					$colspan++; // 6 columns or 7

-				}

-				print '<tr class="oddeven"><td colspan="'.$colspan.'">';

-				if (empty($textifempty)) {

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

-				} else {

-					print '<span class="opacitymedium">'.$textifempty.'</span>';

-				}

+				if (empty($disablemove)) $colspan++; // 6 columns or 7

+				print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">';

+				if (empty($textifempty)) print $langs->trans("NoFileFound");

+				else print $textifempty;

@@ -1608 +1464,0 @@
-

@@ -1621 +1477,2 @@
-			if (GETPOST('action', 'aZ09') == 'editfile' && $permtoeditline) {

+			if (GETPOST('action', 'aZ09') == 'editfile' && $permtoeditline)

+			{

@@ -1630 +1487 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -1632 +1489 @@
-	 *	Show list of documents in a directory of ECM module.

+	 *	Show list of documents in a directory

@@ -1634 +1491 @@
-	 *  @param	string	$upload_dir         Directory that was scanned. This directory will contains files into subdirs REF/files

+	 *  @param	string	$upload_dir         Directory that was scanned

@@ -1636 +1493 @@
-	 *  @param  string	$modulepart         Value for modulepart used by download wrapper. Value can be $object->table_name (that is 'myobject' or 'mymodule_myobject') or $object->element.'-'.$module (for compatibility purpose)

+	 *  @param  string	$modulepart         Value for modulepart used by download wrapper

@@ -1642 +1499 @@
-	 *  @param  string	$textifempty        Text to show if filearray is empty

+	 *  @param  int		$textifempty        Text to show if filearray is empty

@@ -1646 +1503 @@
-	 *  @return int                 		Return integer <0 if KO, nb of files shown if OK

+	 *  @return int                 		<0 if KO, nb of files shown if OK

@@ -1651,2 +1508,2 @@
-		// phpcs:enable

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

+        // phpcs:enable

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

@@ -1655 +1511,0 @@
-		global $dolibarr_main_url_root;

@@ -1660,8 +1516,5 @@
-		if (empty($useinecm) || $useinecm == 6) {

-			print load_fiche_titre($langs->trans("AttachedFiles"));

-		}

-		if (empty($url)) {

-			$url = $_SERVER["PHP_SELF"];

-		}

-

-		if (!empty($addfilterfields)) {

+		if (empty($useinecm) || $useinecm == 6) print load_fiche_titre($langs->trans("AttachedFiles"));

+		if (empty($url)) $url = $_SERVER["PHP_SELF"];

+

+		if (!empty($addfilterfields))

+		{

@@ -1676 +1529,2 @@
-		if (!empty($addfilterfields)) {

+		if (!empty($addfilterfields))

+		{

@@ -1683 +1537 @@
-			print '<td class="liste_titre right">';

+			print '<td class="liste_titre center">';

@@ -1692,3 +1546 @@
-		if ($modulepart == 'invoice_supplier') {

-			$sortref = 'level1name';

-		}

+		if ($modulepart == 'invoice_supplier') $sortref = 'level1name';

@@ -1699 +1551 @@
-		print_liste_field_titre("Shared", $url, 'share', '', $param, '', $sortfield, $sortorder, 'right ');

+		print_liste_field_titre('', '', '');

@@ -1703,2 +1555,2 @@
-		$object_instance = null;

-		if ($modulepart == 'company') {

+		if ($modulepart == 'company')

+		{

@@ -1707 +1559,3 @@
-		} elseif ($modulepart == 'invoice') {

+		}

+		elseif ($modulepart == 'invoice')

+		{

@@ -1710 +1564,3 @@
-		} elseif ($modulepart == 'invoice_supplier') {

+		}

+		elseif ($modulepart == 'invoice_supplier')

+		{

@@ -1713 +1569,3 @@
-		} elseif ($modulepart == 'propal') {

+		}

+		elseif ($modulepart == 'propal')

+		{

@@ -1716 +1574,3 @@
-		} elseif ($modulepart == 'supplier_proposal') {

+		}

+		elseif ($modulepart == 'supplier_proposal')

+		{

@@ -1719 +1579,3 @@
-		} elseif ($modulepart == 'order') {

+		}

+		elseif ($modulepart == 'order')

+		{

@@ -1722 +1584,3 @@
-		} elseif ($modulepart == 'order_supplier') {

+		}

+		elseif ($modulepart == 'order_supplier')

+		{

@@ -1725 +1589,3 @@
-		} elseif ($modulepart == 'contract') {

+		}

+		elseif ($modulepart == 'contract')

+		{

@@ -1728 +1594,3 @@
-		} elseif ($modulepart == 'product') {

+		}

+		elseif ($modulepart == 'product')

+		{

@@ -1731 +1599,3 @@
-		} elseif ($modulepart == 'tax') {

+		}

+		elseif ($modulepart == 'tax')

+		{

@@ -1734,7 +1604,3 @@
-		} elseif ($modulepart == 'tax-vat') {

-			include_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';

-			$object_instance = new Tva($this->db);

-		} elseif ($modulepart == 'salaries') {

-			include_once DOL_DOCUMENT_ROOT.'/salaries/class/salary.class.php';

-			$object_instance = new Salary($this->db);

-		} elseif ($modulepart == 'project') {

+		}

+		elseif ($modulepart == 'project')

+		{

@@ -1743,4 +1609,3 @@
-		} elseif ($modulepart == 'project_task') {

-			include_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';

-			$object_instance = new Task($this->db);

-		} elseif ($modulepart == 'fichinter') {

+		}

+		elseif ($modulepart == 'fichinter')

+		{

@@ -1749 +1614,3 @@
-		} elseif ($modulepart == 'user') {

+		}

+		elseif ($modulepart == 'user')

+		{

@@ -1752 +1619,3 @@
-		} elseif ($modulepart == 'expensereport') {

+		}

+		elseif ($modulepart == 'expensereport')

+		{

@@ -1755 +1624,3 @@
-		} elseif ($modulepart == 'holiday') {

+		}

+		elseif ($modulepart == 'holiday')

+		{

@@ -1758,45 +1629,9 @@
-		} elseif ($modulepart == 'recruitment-recruitmentcandidature') {

-			include_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentcandidature.class.php';

-			$object_instance = new RecruitmentCandidature($this->db);

-		} elseif ($modulepart == 'banque') {

-			include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';

-			$object_instance = new Account($this->db);

-		} elseif ($modulepart == 'chequereceipt') {

-			include_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';

-			$object_instance = new RemiseCheque($this->db);

-		} elseif ($modulepart == 'mrp-mo') {

-			include_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php';

-			$object_instance = new Mo($this->db);

-		} else {

-			$parameters = array('modulepart'=>$modulepart);

-			$reshook = $hookmanager->executeHooks('addSectionECMAuto', $parameters);

-			if ($reshook > 0 && is_array($hookmanager->resArray) && count($hookmanager->resArray) > 0) {

-				if (array_key_exists('classpath', $hookmanager->resArray) && !empty($hookmanager->resArray['classpath'])) {

-					dol_include_once($hookmanager->resArray['classpath']);

-					if (array_key_exists('classname', $hookmanager->resArray) && !empty($hookmanager->resArray['classname'])) {

-						if (class_exists($hookmanager->resArray['classname'])) {

-							$tmpclassname = $hookmanager->resArray['classname'];

-							$object_instance = new $tmpclassname($this->db);

-						}

-					}

-				}

-			}

-		}

-

-		//var_dump($filearray);

-		//var_dump($object_instance);

-

-		// Get list of files stored into database for same relative directory

-		$relativepathfromroot = preg_replace('/'.preg_quote(DOL_DATA_ROOT.'/', '/').'/', '', $upload_dir);

-		if ($relativepathfromroot) {

-			completeFileArrayWithDatabaseInfo($filearray, $relativepathfromroot.'/%');

-

-			//var_dump($sortfield.' - '.$sortorder);

-			if ($sortfield && $sortorder) {	// If $sortfield is for example 'position_name', we will sort on the property 'position_name' (that is concat of position+name)

-				$filearray = dol_sort_array($filearray, $sortfield, $sortorder, 1);

-			}

-		}

-

-		//var_dump($filearray);

-

-		foreach ($filearray as $key => $file) {

+		}

+		elseif ($modulepart == 'banque')

+		{

+		    include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';

+		    $object_instance = new Account($this->db);

+		}

+

+		foreach ($filearray as $key => $file)

+		{

@@ -1807 +1642,2 @@
-			&& !preg_match('/\.meta$/i', $file['name'])) {

+			&& !preg_match('/\.meta$/i', $file['name']))

+			{

@@ -1811,52 +1647,34 @@
-				$id = 0;

-				$ref = '';

-

-				// To show ref or specific information according to view to show (defined by $modulepart)

-				// $modulepart can be $object->table_name (that is 'mymodule_myobject') or $object->element.'-'.$module (for compatibility purpose)

-				$reg = array();

-				if ($modulepart == 'company' || $modulepart == 'tax' || $modulepart == 'tax-vat' || $modulepart == 'salaries') {

-					preg_match('/(\d+)\/[^\/]+$/', $relativefile, $reg);

-					$id = (isset($reg[1]) ? $reg[1] : '');

-				} elseif ($modulepart == 'invoice_supplier') {

-					preg_match('/([^\/]+)\/[^\/]+$/', $relativefile, $reg);

-					$ref = (isset($reg[1]) ? $reg[1] : '');

-					if (is_numeric($ref)) {

-						$id = $ref;

-						$ref = '';

-					}

-				} elseif ($modulepart == 'user') {

-					// $ref may be also id with old supplier invoices

-					preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg);

-					$id = (isset($reg[1]) ? $reg[1] : '');

-				} elseif ($modulepart == 'project_task') {

-					// $ref of task is the sub-directory of the project

-					$reg = explode("/", $relativefile);

-					$ref = (isset($reg[1]) ? $reg[1] : '');

-				} elseif (in_array($modulepart, array(

-					'invoice',

-					'propal',

-					'supplier_proposal',

-					'order',

-					'order_supplier',

-					'contract',

-					'product',

-					'project',

-					'project_task',

-					'fichinter',

-					'expensereport',

-					'recruitment-recruitmentcandidature',

-					'mrp-mo',

-					'banque',

-					'chequereceipt',

-					'holiday'))) {

-					preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg);

-					$ref = (isset($reg[1]) ? $reg[1] : '');

-				} else {

-					$parameters = array('modulepart'=>$modulepart, 'fileinfo'=>$file);

-					$reshook = $hookmanager->executeHooks('addSectionECMAuto', $parameters);

-					if ($reshook > 0 && is_array($hookmanager->resArray) && count($hookmanager->resArray) > 0) {

-						if (array_key_exists('ref', $hookmanager->resArray) && !empty($hookmanager->resArray['ref'])) {

-							$ref = $hookmanager->resArray['ref'];

-						}

-						if (array_key_exists('id', $hookmanager->resArray) && !empty($hookmanager->resArray['id'])) {

-							$id = $hookmanager->resArray['id'];

+				$id = 0; $ref = ''; $label = '';

+

+				// To show ref or specific information according to view to show (defined by $module)

+				if ($modulepart == 'company' || $modulepart == 'tax') { preg_match('/(\d+)\/[^\/]+$/', $relativefile, $reg); $id = (isset($reg[1]) ? $reg[1] : ''); }

+				elseif ($modulepart == 'invoice_supplier') { preg_match('/([^\/]+)\/[^\/]+$/', $relativefile, $reg); $ref = (isset($reg[1]) ? $reg[1] : ''); if (is_numeric($ref)) { $id = $ref; $ref = ''; } }	// $ref may be also id with old supplier invoices

+				elseif ($modulepart == 'user' || $modulepart == 'holiday') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $id = (isset($reg[1]) ? $reg[1] : ''); }

+                elseif (in_array($modulepart, array('invoice', 'propal', 'supplier_proposal', 'order', 'order_supplier', 'contract', 'product', 'project', 'fichinter', 'expensereport', 'banque')))

+				{

+					preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref = (isset($reg[1]) ? $reg[1] : '');

+				}

+				else

+				{

+				    //print 'Error: Value for modulepart = '.$modulepart.' is not yet implemented in function list_of_autoecmfiles'."\n";

+				}

+

+				if (!$id && !$ref) continue;

+				$found = 0;

+				if (!empty($this->cache_objects[$modulepart.'_'.$id.'_'.$ref]))

+				{

+					$found = 1;

+				}

+				else

+				{

+					//print 'Fetch '.$id." - ".$ref.'<br>';

+

+					if ($id) {

+						$result = $object_instance->fetch($id);

+					} else {

+						//fetchOneLike looks for objects with wildcards in its reference.

+						//It is useful for those masks who get underscores instead of their actual symbols

+						//fetchOneLike requires some info in the object. If it doesn't have it, then 0 is returned

+						//that's why we look only into fetchOneLike when fetch returns 0

+						if (!$result = $object_instance->fetch('', $ref)) {

+							$result = $object_instance->fetchOneLike($ref);

@@ -1865,29 +1683,3 @@
-					//print 'Error: Value for modulepart = '.$modulepart.' is not yet implemented in function list_of_autoecmfiles'."\n";

-				}

-

-				if (!$id && !$ref) {

-					continue;

-				}

-

-				$found = 0;

-				if (!empty($conf->cache['modulepartobject'][$modulepart.'_'.$id.'_'.$ref])) {

-					$found = 1;

-				} else {

-					//print 'Fetch '.$id." - ".$ref.' class='.get_class($object_instance).'<br>';

-

-					$result = 0;

-					if (is_object($object_instance)) {

-						$object_instance->id = 0;

-						$object_instance->ref = '';

-						if ($id) {

-							$result = $object_instance->fetch($id);

-						} else {

-							if (!($result = $object_instance->fetch('', $ref))) {

-								//fetchOneLike looks for objects with wildcards in its reference.

-								//It is useful for those masks who get underscores instead of their actual symbols (because the _ had replaced all forbidden chars into filename)

-								// TODO Example when this is needed ?

-								// This may find when ref is 'A_B' and date was stored as 'A~B' into database, but in which case do we have this ?

-								// May be we can add hidden option to enable this.

-								$result = $object_instance->fetchOneLike($ref);

-							}

-						}

+

+					if ($result > 0) {  // Save object loaded into a cache

+						$found = 1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref] = clone $object_instance;

@@ -1895,17 +1687,6 @@
-

-					if ($result > 0) {  // Save object loaded into a cache

-						$found = 1;

-						$conf->cache['modulepartobject'][$modulepart.'_'.$id.'_'.$ref] = clone $object_instance;

-					}

-					if ($result == 0) {

-						$found = 1;

-						$conf->cache['modulepartobject'][$modulepart.'_'.$id.'_'.$ref] = 'notfound';

-						unset($filearray[$key]);

-					}

-				}

-

-				if ($found <= 0 || !is_object($conf->cache['modulepartobject'][$modulepart.'_'.$id.'_'.$ref])) {

-					continue; // We do not show orphelins files

-				}

-

-				print '<!-- Line list_of_autoecmfiles key='.$key.' -->'."\n";

+					if ($result == 0) { $found = 1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref] = 'notfound'; unset($filearray[$key]); }

+				}

+

+				if (!$found > 0 || !is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) continue; // We do not show orphelins files

+

+				print '<!-- Line list_of_autoecmfiles '.$key.' -->'."\n";

@@ -1914,10 +1695,2 @@
-				if ($found > 0 && is_object($conf->cache['modulepartobject'][$modulepart.'_'.$id.'_'.$ref])) {

-					$tmpobject = $conf->cache['modulepartobject'][$modulepart.'_'.$id.'_'.$ref];

-					//if (! in_array($tmpobject->element, array('expensereport'))) {

-					print $tmpobject->getNomUrl(1, 'document');

-					//} else {

-					//	print $tmpobject->getNomUrl(1);

-					//}

-				} else {

-					print $langs->trans("ObjectDeleted", ($id ? $id : $ref));

-				}

+				if ($found > 0 && is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) print $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]->getNomUrl(1, 'document');

+				else print $langs->trans("ObjectDeleted", ($id ? $id : $ref));

@@ -1926 +1699 @@
-				//$modulesubdir = dirname($relativefile);

+				$modulesubdir = dirname($relativefile);

@@ -1929 +1702 @@
-				//$filedir = $file['path'];

+				$filedir = $file['path'];

@@ -1931,0 +1705 @@
+

@@ -1935 +1708,0 @@
-				// Check if document source has external module part, if it the case use it for module part on document.php

@@ -1938,4 +1711,2 @@
-				print '<a href="'.DOL_URL_ROOT.'/document.php?modulepart='.urlencode($modulepart);

-				if ($forcedownload) {

-					print '&attachment=1';

-				}

+				print '<a href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;

+				if ($forcedownload) print '&attachment=1';

@@ -1948 +1718,0 @@
-

@@ -1952,13 +1722 @@
-

-				// Size

-				$sizetoshow = dol_print_size($file['size'], 1, 1);

-				$sizetoshowbytes = dol_print_size($file['size'], 0, 1);

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

-				if ($sizetoshow == $sizetoshowbytes) {

-					print $sizetoshow;

-				} else {

-					print $form->textwithpicto($sizetoshow, $sizetoshowbytes, -1);

-				}

-				print '</td>';

-

-				// Date

+				print '<td class="right">'.dol_print_size($file['size'], 1, 1).'</td>';

@@ -1966,2 +1723,0 @@
-

-				// Share link

@@ -1969,22 +1725 @@
-				if (!empty($file['share'])) {

-					// 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

-

-					//print '<span class="opacitymedium">'.$langs->trans("Hash").' : '.$file['share'].'</span>';

-					$forcedownload = 0;

-					$paramlink = '';

-					if (!empty($file['share'])) {

-						$paramlink .= ($paramlink ? '&' : '').'hashp='.$file['share']; // Hash for public share

-					}

-					if ($forcedownload) {

-						$paramlink .= ($paramlink ? '&' : '').'attachment=1';

-					}

-

-					$fulllink = $urlwithroot.'/document.php'.($paramlink ? '?'.$paramlink : '');

-

-					print img_picto($langs->trans("FileSharedViaALink"), 'globe').' ';

-					print '<input type="text" class="quatrevingtpercent width100 nopadding nopadding small" id="downloadlink" name="downloadexternallink" value="'.dol_escape_htmltag($fulllink).'">';

-				}

-				//if (!empty($useinecm) && $useinecm != 6)  print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;

+				//if (! empty($useinecm) && $useinecm != 6)  print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;

@@ -1994 +1729 @@
-				//if ($permissiontodelete) print '<a href="'.$url.'?id='.$object->id.'&section='.$_REQUEST["section"].'&action=delete&token='.newToken().'&urlfile='.urlencode($file['name']).'">'.img_delete().'</a>';

+				//if ($permissiontodelete) print '<a href="'.$url.'?id='.$object->id.'&section='.$_REQUEST["section"].'&action=delete&urlfile='.urlencode($file['name']).'">'.img_delete().'</a>';

@@ -1996,7 +1731,6 @@
-				print "</td>";

-

-				print "</tr>\n";

-			}

-		}

-

-		if (count($filearray) == 0) {

+				print "</td></tr>\n";

+			}

+		}

+

+		if (count($filearray) == 0)

+		{

@@ -2004,5 +1738,2 @@
-			if (empty($textifempty)) {

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

-			} else {

-				print '<span class="opacitymedium">'.$textifempty.'</span>';

-			}

+			if (empty($textifempty)) print '<span class="opacitymedium">'.$langs->trans("NoFileFound").'</span>';

+			else print '<span class="opacitymedium">'.$textifempty.'</span>';

@@ -2014,4 +1745 @@
-		if (!empty($addfilterfields)) {

-			print '</form>';

-		}

-		return count($filearray);

+		if (!empty($addfilterfields)) print '</form>';

@@ -2018,0 +1747,31 @@
+	}

+

+	/**

+	 *    Show form to upload a new file with jquery fileupload.

+	 *    This form use the fileupload.php file.

+	 *

+	 *    @param	Object	$object		Object to use

+	 *    @return	void

+	 */

+	private function _formAjaxFileUpload($object)

+	{

+		global $langs, $conf;

+

+		// PHP post_max_size

+		$post_max_size				= ini_get('post_max_size');

+		$mul_post_max_size			= substr($post_max_size, -1);

+		$mul_post_max_size			= ($mul_post_max_size == 'M' ? 1048576 : ($mul_post_max_size == 'K' ? 1024 : ($mul_post_max_size == 'G' ? 1073741824 : 1)));

+		$post_max_size				= $mul_post_max_size * (int) $post_max_size;

+		// PHP upload_max_filesize

+		$upload_max_filesize		= ini_get('upload_max_filesize');

+		$mul_upload_max_filesize	= substr($upload_max_filesize, -1);

+		$mul_upload_max_filesize	= ($mul_upload_max_filesize == 'M' ? 1048576 : ($mul_upload_max_filesize == 'K' ? 1024 : ($mul_upload_max_filesize == 'G' ? 1073741824 : 1)));

+		$upload_max_filesize		= $mul_upload_max_filesize * (int) $upload_max_filesize;

+		// Max file size

+		$max_file_size = (($post_max_size < $upload_max_filesize) ? $post_max_size : $upload_max_filesize);

+

+		// Include main

+		include DOL_DOCUMENT_ROOT.'/core/tpl/ajax/fileupload_main.tpl.php';

+

+		// Include template

+		include DOL_DOCUMENT_ROOT.'/core/tpl/ajax/fileupload_view.tpl.php';

@@ -2046 +1805 @@
-			$sortfield = '';

+			$sortfield = null;

@@ -2054 +1813 @@
-		print load_fiche_titre($langs->trans("LinkedFiles"), '', 'link', 0, '', 'table-list-of-links');

+		print load_fiche_titre($langs->trans("LinkedFiles"), '', 'external-link-square-alt', 0, '', 'table-list-of-links');

@@ -2059 +1818 @@
-		print '<table class="liste noborder nobottom centpercent">';

+		print '<table width="100%" class="liste noborder nobottom">';

@@ -2061 +1820 @@
-		print_liste_field_titre(

+        print_liste_field_titre(

@@ -2070 +1829 @@
-			''

+            ''

@@ -2072 +1831 @@
-		print_liste_field_titre(

+        print_liste_field_titre(

@@ -2079,3 +1838,3 @@
-			'',

-			'',

-			'right '

+            '',

+            '',

+            'right '

@@ -2083 +1842 @@
-		print_liste_field_titre(

+        print_liste_field_titre(

@@ -2092 +1851 @@
-			'center '

+            'center '

@@ -2094 +1853 @@
-		print_liste_field_titre(

+        print_liste_field_titre(

@@ -2101,3 +1860,3 @@
-			'',

-			'',

-			'center '

+            '',

+            '',

+            'center '

@@ -2108,5 +1867,4 @@
-		if ($nboflinks > 0) {

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

-		}

-

-		foreach ($links as $link) {

+		if ($nboflinks > 0) include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';

+

+		foreach ($links as $link)

+		{

@@ -2115 +1873,2 @@
-			if ($action == 'update' && $selected === $link->id) {

+			if ($action == 'update' && $selected === $link->id)

+			{

@@ -2128,2 +1887,2 @@
-				print '<input type="submit" class="button button-save" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'">';

-				print '<input type="submit" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';

+				print '<input type="submit" name="save" class="button" value="'.dol_escape_htmltag($langs->trans('Save')).'">';

+				print '<input type="submit" name="cancel" class="button" value="'.dol_escape_htmltag($langs->trans('Cancel')).'">';

@@ -2131 +1890,3 @@
-			} else {

+			}

+			else

+			{

@@ -2134 +1895 @@
-				print '<a data-ajax="false" href="'.$link->url.'" target="_blank" rel="noopener noreferrer">';

+				print '<a data-ajax="false" href="'.$link->url.'" target="_blank">';

@@ -2142 +1903 @@
-				print '<a href="'.$_SERVER['PHP_SELF'].'?action=update&linkid='.$link->id.$param.'&token='.newToken().'" class="editfilelink editfielda reposition" >'.img_edit().'</a>'; // id= is included into $param

+				print '<a href="'.$_SERVER['PHP_SELF'].'?action=update&linkid='.$link->id.$param.'" class="editfilelink editfielda reposition" >'.img_edit().'</a>'; // id= is included into $param

@@ -2144 +1905 @@
-					print ' &nbsp; <a class="deletefilelink reposition" href="'.$_SERVER['PHP_SELF'].'?action=deletelink&token='.newToken().'&linkid='.((int) $link->id).$param.'">'.img_delete().'</a>'; // id= is included into $param

+					print ' &nbsp; <a class="deletefilelink" href="'.$_SERVER['PHP_SELF'].'?action=delete&linkid='.$link->id.$param.'">'.img_delete().'</a>'; // id= is included into $param

@@ -2152,3 +1913,4 @@
-		if ($nboflinks == 0) {

-			print '<tr class="oddeven"><td colspan="5">';

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

+		if ($nboflinks == 0)

+		{

+			print '<tr class="oddeven"><td colspan="5" class="opacitymedium">';

+			print $langs->trans("NoLinkFound");

@@ -2171 +1933 @@
-	 * @param   integer   $ruleforpicto   Rule for picto: 0=Use the generic preview picto, 1=Use the picto of mime type of file). Use a negative value to show a generic picto even if preview not available.

+	 * @param   integer   $ruleforpicto   Rule for picto: 0=Use the generic preview picto, 1=Use the picto of mime type of file)

@@ -2180 +1942,2 @@
-		if ($conf->browser->layout != 'phone' && !empty($conf->use_javascript_ajax)) {

+		if ($conf->browser->layout != 'phone' && !empty($conf->use_javascript_ajax))

+		{

@@ -2182 +1945,2 @@
-			if (count($urladvancedpreview)) {

+			if (count($urladvancedpreview))

+			{

@@ -2185 +1949,2 @@
-				if (empty($ruleforpicto)) {

+				if (empty($ruleforpicto))

+				{

@@ -2187,4 +1952,3 @@
-					$out .= '<span class="fa fa-search-plus pictofixedwidth" style="color: gray"></span>';

-				} else {

-					$out .= img_mime($relativepath, $langs->trans('Preview').' '.$file['name'], 'pictofixedwidth');

-				}

+					$out .= '<span class="fa fa-search-plus" style="color: gray"></span>';

+				}

+				else $out .= img_mime($relativepath, $langs->trans('Preview').' '.$file['name']);

@@ -2192,4 +1955,0 @@
-			} else {

-				if ($ruleforpicto < 0) {

-					$out .= img_picto('', 'generic', '', false, 0, 0, '', 'paddingright pictofixedwidth');

-				}

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_html.formintervention.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_html.formintervention.class.php
@@ -30,4 +30,4 @@
-	/**

-	 * @var DoliDB Database handler.

-	 */

-	public $db;

+    /**

+     * @var DoliDB Database handler.

+     */

+    public $db;

@@ -35 +35 @@
-	/**

+    /**

@@ -41,9 +41,9 @@
-	/**

-	 * Constructor

-	 *

-	 * @param		DoliDB		$db      Database handler

-	 */

-	public function __construct($db)

-	{

-		$this->db = $db;

-	}

+    /**

+     * Constructor

+     *

+     * @param		DoliDB		$db      Database handler

+     */

+    public function __construct($db)

+    {

+        $this->db = $db;

+    }

@@ -52 +52 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -60,2 +60 @@
-	 *	@param	int		$showempty	Show empty line ('1' or string to show for empty line)

-	 *	@param	bool	$draftonly	Show only drafts intervention

+	 *	@param	int		$showempty	Show empty line

@@ -64 +63 @@
-	public function select_interventions($socid = -1, $selected = 0, $htmlname = 'interventionid', $maxlength = 16, $showempty = 1, $draftonly = false)

+	public function select_interventions($socid = -1, $selected = '', $htmlname = 'interventionid', $maxlength = 16, $showempty = 1)

@@ -66,2 +65,2 @@
-		// phpcs:enable

-		global $user, $conf, $langs;

+        // phpcs:enable

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

@@ -74,2 +73,2 @@
-		$sql = "SELECT f.rowid, f.ref, f.fk_soc, f.fk_statut";

-		$sql .= " FROM ".$this->db->prefix()."fichinter as f";

+		$sql = 'SELECT f.rowid, f.ref, f.fk_soc, f.fk_statut';

+		$sql .= ' FROM '.MAIN_DB_PREFIX.'fichinter as f';

@@ -77,9 +76,4 @@
-		if ($socid != '') {

-			if ($socid == '0') {

-				$sql .= " AND (f.fk_soc = 0 OR f.fk_soc IS NULL)";

-			} else {

-				$sql .= " AND f.fk_soc = ".((int) $socid);

-			}

-		}

-		if ($draftonly) {

-			$sql .= " AND f.fk_statut = 0";

+		if ($socid != '')

+		{

+			if ($socid == '0') $sql .= " AND (f.fk_soc = 0 OR f.fk_soc IS NULL)";

+			else $sql .= " AND f.fk_soc = ".$socid;

@@ -89,13 +83,6 @@
-		$resql = $this->db->query($sql);

-		if ($resql) {

-			$out .= '<select id="interventionid" class="flat" name="'.dol_escape_htmltag($htmlname).'">';

-			if ($showempty) {

-				$out .= '<option value="0">';

-				if (!is_numeric($showempty)) {

-					$out .= $showempty;

-				} else {

-					$out .= '&nbsp;';

-				}

-				$out .= '</option>';

-			}

-			$num = $this->db->num_rows($resql);

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

+		if ($resql)

+		{

+			$out .= '<select id="interventionid" class="flat" name="'.$htmlname.'">';

+			if ($showempty) $out .= '<option value="0">&nbsp;</option>';

+			$num = $db->num_rows($resql);

@@ -103,3 +90,5 @@
-			if ($num) {

-				while ($i < $num) {

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

+			if ($num)

+			{

+				while ($i < $num)

+				{

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

@@ -107 +96,2 @@
-					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && !$user->hasRight('societe', 'lire')) {

+					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && !$user->rights->societe->lire)

+					{

@@ -109 +99,3 @@
-					} else {

+					}

+					else

+					{

@@ -111 +103,2 @@
-						if (!empty($selected) && $selected == $obj->rowid && $obj->statut > 0) {

+						if (!empty($selected) && $selected == $obj->rowid && $obj->statut > 0)

+						{

@@ -113 +106,3 @@
-						} else {

+						}

+						else

+						{

@@ -115 +110,2 @@
-							if (!$obj->fk_statut > 0 && ! $draftonly) {

+							if (!$obj->fk_statut > 0)

+							{

@@ -119 +115,2 @@
-							if ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid)) {

+							if ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))

+							{

@@ -124 +121,2 @@
-							if ($hideunselectables && $disabled) {

+							if ($hideunselectables && $disabled)

+							{

@@ -126 +124,3 @@
-							} else {

+							}

+							else

+							{

@@ -128,3 +128 @@
-								if ($disabled) {

-									$resultat .= ' disabled';

-								}

+								if ($disabled) $resultat .= ' disabled';

@@ -141 +139 @@
-			$this->db->free($resql);

+			$db->free($resql);

@@ -143,2 +141,4 @@
-		} else {

-			dol_print_error($this->db);

+		}

+		else

+		{

+			dol_print_error($db);

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_html.formmail.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_html.formmail.class.php
@@ -2,9 +2,6 @@
-/* Copyright (C) 2005-2012	Laurent Destailleur		<eldy@users.sourceforge.net>

- * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@inodbox.com>

- * Copyright (C) 2010-2011	Juanjo Menent			<jmenent@2byte.es>

- * Copyright (C) 2015-2017	Marcos García			<marcosgdf@gmail.com>

- * Copyright (C) 2015-2017	Nicolas ZABOURI			<info@inovea-conseil.com>

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

- * Copyright (C) 2022		Charlene Benke			<charlene@patas-monkey.com>

- * Copyright (C) 2023		Anthony Berton			<anthony.berton@bb2a.fr>

- *

+/* Copyright (C) 2005-2012 Laurent Destailleur  <eldy@users.sourceforge.net>

+ * Copyright (C) 2005-2012 Regis Houssin	    <regis.houssin@inodbox.com>

+ * Copyright (C) 2010-2011 Juanjo Menent	    <jmenent@2byte.es>

+ * Copyright (C) 2015-2017 Marcos García        <marcosgdf@gmail.com>

+ * Copyright (C) 2015-2017 Nicolas ZABOURI      <info@inovea-conseil.com>

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

@@ -43,9 +40,9 @@
-	 * @var DoliDB Database handler.

-	 */

-	public $db;

-

-	/**

-	 * @var int 1 = Include HTML form tag and show submit button

-	 *          0 = Do not include form tag and submit button

-	 *          -1 = Do not include form tag but include submit button

-	 */

+     * @var DoliDB Database handler.

+     */

+    public $db;

+

+    /**

+     * @var int 1 = Include HTML form tag and show submit button

+     *          0 = Do not include form tag and submit button

+     *          -1 = Do not include form tag but include submit button

+     */

@@ -54,3 +51,3 @@
-	/**

-	 * @var string name from

-	 */

+    /**

+     * @var string name from

+     */

@@ -59,3 +56,3 @@
-	/**

-	 * @var string email from

-	 */

+    /**

+     * @var string email from

+     */

@@ -64,33 +61,33 @@
-	/**

-	 * @var string user, company, robot

-	 */

-	public $fromtype;

-

-	/**

-	 * @var int from ID

-	 */

-	public $fromid;

-

-	/**

-	 * @var int also from robot

-	 */

-	public $fromalsorobot;

-

-	/**

-	 * @var string thirdparty etc

-	 */

-	public $totype;

-

-	/**

-	 * @var int ID

-	 */

-	public $toid;

-

-	/**

-	 * @var string 	Reply-to name

-	 */

-	public $replytoname;

-

-	/**

-	 * @var string replyto email

-	 */

+    /**

+     * @var string user, company, robot

+     */

+    public $fromtype;

+

+    /**

+     * @var int from ID

+     */

+    public $fromid;

+

+    /**

+     * @var int also from robot

+     */

+    public $fromalsorobot;

+

+    /**

+     * @var string thirdparty etc

+     */

+    public $totype;

+

+    /**

+     * @var int ID

+     */

+    public $toid;

+

+    /**

+     * @var string replyto name

+     */

+    public $replytoname;

+

+    /**

+     * @var string replyto email

+     */

@@ -99,3 +96,3 @@
-	/**

-	 * @var string 	To name

-	 */

+    /**

+     * @var string to name

+     */

@@ -104,3 +101,3 @@
-	/**

-	 * @var string 	To email

-	 */

+    /**

+     * @var string to email

+     */

@@ -109,3 +106,3 @@
-	/**

-	 * @var string 	Track id

-	 */

+    /**

+     * @var string trackid

+     */

@@ -113,5 +109,0 @@
-

-	/**

-	 * @var string	If you know a MSGID of an email and want to send the email in reply to it. Will be added into header as In-Reply-To: <...>

-	 */

-	public $inreplyto;

@@ -126,8 +118,2 @@
-	public $withreplyto;

-

-	/**

-	 * @var int|string 0 = Do not Show free text for recipient emails

-	 *                 1 = Show free text for recipient emails

-	 *                 or a free email

-	 */

-	public $withtofree;

+

+	public $withtofree; // Show free text for recipient emails

@@ -137,11 +123,2 @@
-	public $witherrorsto;

-

-	/**

-	 * @var int 0=No attaches files, 1=Show attached files, 2=Can add new attached files

-	 */

-	public $withfile;

-

-	/**

-	 * @var int 1=Add a checkbox "Attach also main document" for mass actions (checked by default), -1=Add checkbox (not checked by default)

-	 */

-	public $withmaindocfile;

+	public $withfile; // 0=No attaches files, 1=Show attached files, 2=Can add new attached files

+	public $withmaindocfile; // 1=Add a checkbox "Attach also main document" for mass actions (checked by default), -1=Add checkbox (not checked by default)

@@ -154 +130,0 @@
-	public $witherrorstoreadonly;

@@ -157 +132,0 @@
-	public $withbodyreadonly;

@@ -161 +135,0 @@
-	public $withdeliveryreceiptreadonly;

@@ -163,5 +136,0 @@
-

-	/**

-	 * @var string ckeditortoolbar

-	 */

-	public $ckeditortoolbar;

@@ -177,3 +145,0 @@
-

-	// -1 suggest the checkbox 'one email per recipient' not checked, 0 = no suggestion, 1 = suggest and checked

-	public $withoptiononeemailperrecipient;

@@ -217 +183 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -225 +191 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -232,3 +198 @@
-		if (is_dir($upload_dir)) {

-			dol_delete_dir_recursive($upload_dir);

-		}

+		if (is_dir($upload_dir)) dol_delete_dir_recursive($upload_dir);

@@ -242 +206 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -253 +217 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -258,6 +222,2 @@
-		if (empty($file)) {

-			$file = basename($path);

-		}

-		if (empty($type)) {

-			$type = dol_mimetype($file);

-		}

+		if (empty($file)) $file = basename($path);

+		if (empty($type)) $type = dol_mimetype($file);

@@ -266,10 +226,5 @@
-		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 (!in_array($file, $listofnames)) {

+		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 (!in_array($file, $listofnames))

+		{

@@ -285 +240 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -289 +244 @@
-	 * @param  	int		$keytodelete     Key index in file array (0, 1, 2, ...)

+	 * @param  	string	$keytodelete     Key index in file array (0, 1, 2, ...)

@@ -294 +249 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -300,10 +255,5 @@
-		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)

+		{

@@ -320 +270 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -328 +278 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -334,9 +284,3 @@
-		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 (!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]);

@@ -346 +290 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -355 +298,0 @@
-	 *  @deprecated

@@ -359 +302 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -363 +306 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -376 +319 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -379,7 +322 @@
-		// Required to show preview wof mail attachments

-		require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';

-		$formfile = new FormFile($this->db);

-

-		if (!is_object($form)) {

-			$form = new Form($this->db);

-		}

+		if (!is_object($form)) $form = new Form($this->db);

@@ -388,4 +325,5 @@
-		$langs->loadLangs(array('other', 'mails', 'members'));

-

-		// Clear temp files. Must be done before call of triggers, at beginning (mode = init), or when we select a new template

-		if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelselected') && GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1')) {

+        $langs->loadLangs(array('other', 'mails'));

+

+		// Clear temp files. Must be done at beginning, before call of triggers

+		if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1'))

+		{

@@ -405 +343,2 @@
-		if (!empty($reshook)) {

+		if (!empty($reshook))

+		{

@@ -407 +346,3 @@
-		} else {

+		}

+		else

+		{

@@ -415,4 +356,3 @@
-			if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($this->param['langsmodels'])) {

-				$newlang = $this->param['langsmodels'];

-			}

-			if (!empty($newlang)) {

+			if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $this->param['langsmodels'];

+			if (!empty($newlang))

+			{

@@ -426 +366,2 @@
-			if ($this->param['models'] != 'none') {

+			if ($this->param['models'] != 'none')

+			{

@@ -428 +369,2 @@
-				if (array_key_exists('models_id', $this->param)) {

+				if (array_key_exists('models_id', $this->param))

+				{

@@ -432 +374 @@
-				$arraydefaultmessage = $this->getEMailTemplate($this->db, $this->param["models"], $user, $outputlangs, $model_id, 1, '', ($model_id > 0 ? -1 : 1)); // If $model_id is empty, preselect the first one

+				$arraydefaultmessage = $this->getEMailTemplate($this->db, $this->param["models"], $user, $outputlangs, $model_id); // If $model_id is empty, preselect the first one

@@ -441,19 +383,14 @@
-			if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelselected') && GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1')) {

-				if (!empty($arraydefaultmessage->joinfiles) && !empty($this->param['fileinit']) && is_array($this->param['fileinit'])) {

-					foreach ($this->param['fileinit'] as $path) {

-						if (!empty($path)) {

-							$this->add_attached_files($path);

-						}

-					}

-				}

-			}

-

-			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 (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1'))

+			{

+				if (!empty($arraydefaultmessage->joinfiles) && is_array($this->param['fileinit']))

+				{

+					foreach ($this->param['fileinit'] as $file)

+					{

+						$this->add_attached_files($file, basename($file), dol_mimetype($file));

+					}

+				}

+			}

+

+	   		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]);

@@ -463 +400,2 @@
-			if ($this->withform == 1) {

+			if ($this->withform == 1)

+			{

@@ -467 +405 @@
-				$out .= '<input style="display:none" type="submit" id="sendmailhidden" name="sendmail">';

+				$out .= '<input style="display:none" type="submit" id="sendmail" name="sendmail">';

@@ -470,4 +408,5 @@
-				$out .= '<input type="hidden" name="inreplyto" value="'.$this->inreplyto.'" />';

-			}

-			if (!empty($this->withfrom)) {

-				if (!empty($this->withfromreadonly)) {

+			}

+			if (!empty($this->withfrom))

+			{

+				if (!empty($this->withfromreadonly))

+				{

@@ -478,6 +417,3 @@
-			foreach ($this->param as $key => $value) {

-				if (is_array($value)) {

-					$out .= "<!-- param key=".$key." is array, we do not output input field for it -->\n";

-				} else {

-					$out .= '<input type="hidden" id="'.$key.'" name="'.$key.'" value="'.$value.'" />'."\n";

-				}

+			foreach ($this->param as $key=>$value)

+			{

+				$out .= '<input type="hidden" id="'.$key.'" name="'.$key.'" value="'.$value.'" />'."\n";

@@ -487 +423,2 @@
-			if ($this->param['models'] != 'none') {

+			if ($this->param['models'] != 'none')

+			{

@@ -489 +426,3 @@
-				if ($result < 0) {

+

+				if ($result < 0)

+				{

@@ -492,17 +431,14 @@
-

-				foreach ($this->lines_model as $line) {

-					$reg = array();

-					if (preg_match('/\((.*)\)/', $line->label, $reg)) {

-						$labeltouse = $langs->trans($reg[1]); // langs->trans when label is __(xxx)__

-					} else {

-						$labeltouse = $line->label;

-					}

-

-					// We escape the $labeltouse to store it into $modelmail_array.

-					$modelmail_array[$line->id] = dol_escape_htmltag($labeltouse);

-					if ($line->lang) {

-						$modelmail_array[$line->id] .= ' '.picto_from_langcode($line->lang);

-					}

-					if ($line->private) {

-						$modelmail_array[$line->id] .= ' - <span class="opacitymedium">'.dol_escape_htmltag($langs->trans("Private")).'</span>';

-					}

+				foreach ($this->lines_model as $line)

+				{

+					$langs->trans("members");

+					if (preg_match('/\((.*)\)/', $line->label, $reg))

+					{

+						$modelmail_array[$line->id] = $langs->trans($reg[1]); // langs->trans when label is __(xxx)__

+					}

+					else

+					{

+						$modelmail_array[$line->id] = $line->label;

+					}

+					if ($line->lang) $modelmail_array[$line->id] .= ' ('.$line->lang.')';

+					if ($line->private) $modelmail_array[$line->id] .= ' - '.$langs->trans("Private");

+					//if ($line->fk_user != $user->id) $modelmail_array[$line->id].=' - '.$langs->trans("By").' ';

@@ -513,3 +449,2 @@
-			if (count($modelmail_array) > 0) {

-				$model_mail_selected_id = GETPOSTISSET('modelmailselected') ? GETPOST('modelmailselected', 'int') : ($arraydefaultmessage->id > 0 ? $arraydefaultmessage->id : 0);

-

+			if (count($modelmail_array) > 0)

+			{

@@ -518,8 +453,2 @@
-

-				$out .= '<span class="opacitymedium">'.$langs->trans('SelectMailModel').':</span> ';

-

-				$out .= $this->selectarray('modelmailselected', $modelmail_array, $model_mail_selected_id, 1, 0, 0, '', 0, 0, 0, '', 'minwidth100', 1, '', 0, 1);

-				if ($user->admin) {

-					$out .= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup').' - '.$langs->transnoentitiesnoconv('EMails')), 1);

-				}

-

+				$out .= '<span class="opacitymedium">'.$langs->trans('SelectMailModel').':</span> '.$this->selectarray('modelmailselected', $modelmail_array, 0, 1, 0, 0, '', 0, 0, 0, '', 'minwidth100');

+				if ($user->admin) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup').' - '.$langs->transnoentitiesnoconv('EMails')), 1);

@@ -527 +456 @@
-				$out .= '<input type="submit" class="button reposition smallpaddingimp" value="'.$langs->trans('Apply').'" name="modelselected" id="modelselected">';

+				$out .= '<input class="button" type="submit" value="'.$langs->trans('Apply').'" name="modelselected" id="modelselected">';

@@ -533,2 +462,3 @@
-					'invoice_supplier_send', 'thirdparty', 'contract', 'user', 'recruitmentcandidature_send', 'all'

-				))) {

+					'invoice_supplier_send', 'thirdparty', 'contract', 'user', 'all'

+                )))

+			{

@@ -537,5 +467,2 @@
-				$out .= '<span class="opacitymedium">'.$langs->trans('SelectMailModel').':</span> ';

-				$out .= '<select name="modelmailselected" disabled="disabled"><option value="none">'.$langs->trans("NoTemplateDefined").'</option></select>'; // Do not put 'disabled' on 'option' tag, it is already on 'select' and it makes chrome crazy.

-				if ($user->admin) {

-					$out .= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup').' - '.$langs->transnoentitiesnoconv('EMails')), 1);

-				}

+				$out .= $langs->trans('SelectMailModel').': <select name="modelmailselected" disabled="disabled"><option value="none">'.$langs->trans("NoTemplateDefined").'</option></select>'; // Do not put 'disabled' on 'option' tag, it is already on 'select' and it makes chrome crazy.

+				if ($user->admin) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup').' - '.$langs->transnoentitiesnoconv('EMails')), 1);

@@ -543 +470 @@
-				$out .= '<input type="submit" class="button" value="'.$langs->trans('Apply').'" name="modelselected" disabled="disabled" id="modelselected">';

+				$out .= '<input class="button" type="submit" value="'.$langs->trans('Apply').'" name="modelselected" disabled="disabled" id="modelselected">';

@@ -546,6 +473,5 @@
-			} else {

-				$out .= '<!-- No template available for $this->param["models"] = '.$this->param['models'].' -->';

-			}

-

-

-			$out .= '<table class="tableforemailform boxtablenotop centpercent">'."\n";

+			}

+

+

+

+			$out .= '<table class="tableforemailform boxtablenotop" width="100%">'."\n";

@@ -555,15 +481,7 @@
-			if (is_array($this->substit) && count($this->substit)) {

-				$helpforsubstitution .= $langs->trans('AvailableVariables').' :<br><br><span class="small">'."\n";

-			}

-			foreach ($this->substit as $key => $val) {

-				// Do not show deprecated variables into the tooltip help of substitution variables

-				if (in_array($key, array('__NEWREF__', '__REFCLIENT__', '__REFSUPPLIER__', '__SUPPLIER_ORDER_DATE_DELIVERY__', '__SUPPLIER_ORDER_DELAY_DELIVERY__'))) {

-					continue;

-				}

-				$helpforsubstitution .= $key.' -> '.$langs->trans(dol_string_nohtmltag(dolGetFirstLineOfText($val))).'<br>';

-			}

-			if (is_array($this->substit) && count($this->substit)) {

-				$helpforsubstitution .= '</span>';

-			}

-

-			if (!empty($this->withsubstit)) {	// Unset or set ->withsubstit=0 to disable this.

+			if (is_array($this->substit) && count($this->substit)) $helpforsubstitution .= $langs->trans('AvailableVariables').' :<br>'."\n";

+			foreach ($this->substit as $key => $val)

+			{

+				$helpforsubstitution .= $key.' -> '.$langs->trans(dol_string_nohtmltag($val)).'<br>';

+			}

+			if (!empty($this->withsubstit))		// Unset or set ->withsubstit=0 to disable this.

+			{

@@ -571,5 +489,3 @@
-				if (is_numeric($this->withsubstit)) {

-					$out .= $form->textwithpicto($langs->trans("EMailTestSubstitutionReplacedByGenericValues"), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltip'); // Old usage

-				} else {

-					$out .= $form->textwithpicto($langs->trans('AvailableVariables'), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltip'); // New usage

-				}

+				//$out.='<div class="floatright">';

+				if (is_numeric($this->withsubstit)) $out .= $form->textwithpicto($langs->trans("EMailTestSubstitutionReplacedByGenericValues"), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltip'); // Old usage

+				else $out .= $form->textwithpicto($langs->trans('AvailableVariables'), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltip'); // New usage

@@ -577 +493,7 @@
-			}

+				//$out.='</div>';

+			}

+

+			/*var_dump(! empty($this->withfromreadonly));

+			var_dump($this->withfrom);

+			var_dump($this->fromtype);

+			var_dump($this->fromname);*/

@@ -580,2 +502,4 @@
-			if (!empty($this->withfrom)) {

-				if (!empty($this->withfromreadonly)) {

+			if (!empty($this->withfrom))

+			{

+				if (!empty($this->withfromreadonly))

+				{

@@ -591 +515,2 @@
-						) {

+						)

+					{

@@ -594 +519,2 @@
-						if ($this->frommail) {

+						if ($this->frommail)

+						{

@@ -596,2 +522,5 @@
-						} else {

-							if ($this->fromtype) {

+						}

+						else

+						{

+							if ($this->fromtype)

+							{

@@ -606 +535,2 @@
-						if (empty($user->email)) {

+						if (empty($user->email))

+						{

@@ -608,5 +538,6 @@
-							$s = $user->getFullName($langs).' &lt;'.$langs->trans('ErrorNoMailDefinedForThisUser').'&gt;';

-						} else {

-							$s = $user->getFullName($langs).' &lt;'.$user->email.'&gt;';

-						}

-						$liste['user'] = array('label' => $s, 'data-html' => $s);

+							$liste['user'] = $user->getFullName($langs).' &lt;'.$langs->trans('ErrorNoMailDefinedForThisUser').'&gt;';

+						}

+						else

+						{

+							$liste['user'] = $user->getFullName($langs).' &lt;'.$user->email.'&gt;';

+						}

@@ -615,4 +546 @@
-						if (getDolGlobalString('MAIN_INFO_SOCIETE_MAIL')) {

-							$s = (!getDolGlobalString('MAIN_INFO_SOCIETE_NOM') ? $conf->global->MAIN_INFO_SOCIETE_EMAIL : $conf->global->MAIN_INFO_SOCIETE_NOM).' &lt;' . getDolGlobalString('MAIN_INFO_SOCIETE_MAIL').'&gt;';

-							$liste['company'] = array('label' => $s, 'data-html' => $s);

-						}

+						$liste['company'] = $conf->global->MAIN_INFO_SOCIETE_NOM.' &lt;'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'&gt;';

@@ -621,9 +549 @@
-						$listaliases = array(

-							'user_aliases' => (empty($user->email_aliases) ? '' : $user->email_aliases),

-							'global_aliases' => getDolGlobalString('MAIN_INFO_SOCIETE_MAIL_ALIASES'),

-						);

-

-						if (!empty($arraydefaultmessage->email_from)) {

-							$templatemailfrom = ' &lt;'.$arraydefaultmessage->email_from.'&gt;';

-							$liste['from_template_'.GETPOST('modelmailselected')] = array('label' => $templatemailfrom, 'data-html' => $templatemailfrom);

-						}

+						$listaliases = array('user_aliases'=>$user->email_aliases, 'global_aliases'=>$conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES);

@@ -632,5 +552,8 @@
-						if (!empty($this->fromalsorobot)) {

-							if (getDolGlobalString('MAIN_MAIL_EMAIL_FROM') && getDolGlobalString('MAIN_MAIL_EMAIL_FROM') != getDolGlobalString('MAIN_INFO_SOCIETE_MAIL')) {

-								$s = $conf->global->MAIN_MAIL_EMAIL_FROM;

-								if ($this->frommail) {

-									$s .= ' &lt;' . getDolGlobalString('MAIN_MAIL_EMAIL_FROM').'&gt;';

+						if (!empty($this->fromalsorobot))

+						{

+							if (!empty($conf->global->MAIN_MAIL_EMAIL_FROM) && $conf->global->MAIN_MAIL_EMAIL_FROM != $conf->global->MAIN_INFO_SOCIETE_MAIL)

+							{

+								$liste['robot'] = $conf->global->MAIN_MAIL_EMAIL_FROM;

+								if ($this->frommail)

+								{

+									$liste['robot'] .= ' &lt;'.$conf->global->MAIN_MAIL_EMAIL_FROM.'&gt;';

@@ -638 +560,0 @@
-								array('label' => $s, 'data-html' => $s);

@@ -643,3 +565,3 @@
-						$sql = "SELECT rowid, label, email FROM ".$this->db->prefix()."c_email_senderprofile";

-						$sql .= " WHERE active = 1 AND (private = 0 OR private = ".((int) $user->id).")";

-						$sql .= " ORDER BY position";

+						$sql = 'SELECT rowid, label, email FROM '.MAIN_DB_PREFIX.'c_email_senderprofile';

+						$sql .= ' WHERE active = 1 AND (private = 0 OR private = '.$user->id.')';

+						$sql .= ' ORDER BY position';

@@ -647 +569,2 @@
-						if ($resql) {

+						if ($resql)

+						{

@@ -650 +573,2 @@
-							while ($i < $num) {

+							while ($i < $num)

+							{

@@ -652 +576,2 @@
-								if ($obj) {

+								if ($obj)

+								{

@@ -657,5 +582,5 @@
-						} else {

-							dol_print_error($this->db);

-						}

-

-						foreach ($listaliases as $typealias => $listalias) {

+						}

+						else dol_print_error($this->db);

+

+						foreach ($listaliases as $typealias => $listalias)

+						{

@@ -664 +589,2 @@
-							foreach ($listaliasarray as $listaliasval) {

+							foreach ($listaliasarray as $listaliasval)

+							{

@@ -667 +593,2 @@
-								if ($listaliasval) {

+								if ($listaliasval)

+								{

@@ -670,4 +597,2 @@
-									if (!preg_match('/&lt;/', $listaliasval)) {

-										$listaliasval = '&lt;'.$listaliasval.'&gt;';

-									}

-									$liste[$typealias.'_'.$posalias] = array('label' => $listaliasval, 'data-html' => $listaliasval);

+									if (!preg_match('/&lt;/', $listaliasval)) $listaliasval = '&lt;'.$listaliasval.'&gt;';

+									$liste[$typealias.'_'.$posalias] = $listaliasval;

@@ -678,10 +603,12 @@
-						// Using ajaxcombo here make the '<email>' no more visible on list because <emailofuser> is not a valid html tag,

-						// so we transform before each record into $liste to be printable with ajaxcombo by replacing <> into ()

-						// $liste['senderprofile_0_0'] = array('label'=>'rrr', 'data-html'=>'rrr &lt;aaaa&gt;');

-						foreach ($liste as $key => $val) {

-							if (!empty($liste[$key]['data-html'])) {

-								$liste[$key]['data-html'] = str_replace(array('&lt;', '<', '&gt;', '>'), array('__LTCHAR__', '__LTCHAR__', '__GTCHAR__', '__GTCHAR__'), $liste[$key]['data-html']);

-								$liste[$key]['data-html'] = str_replace(array('__LTCHAR__', '__GTCHAR__'), array('<span class="opacitymedium">(', ')</span>'), $liste[$key]['data-html']);

-							}

-						}

-						$out .= ' '.$form->selectarray('fromtype', $liste, empty($arraydefaultmessage->email_from) ? $this->fromtype : 'from_template_'.GETPOST('modelmailselected'), 0, 0, 0, '', 0, 0, 0, '', 'fromforsendingprofile maxwidth200onsmartphone', 1, '', $disablebademails);

+						// Set the default "From"

+						$defaultfrom = '';

+						$reshook = $hookmanager->executeHooks('getDefaultFromEmail', $parameters, $this);

+						if (empty($reshook))

+						{

+							$defaultfrom = $this->fromtype;

+						}

+						if (!empty($hookmanager->resArray['defaultfrom'])) $defaultfrom = $hookmanager->resArray['defaultfrom'];

+

+						// Using combo here make the '<email>' no more visible on list.

+						//$out.= ' '.$form->selectarray('fromtype', $liste, $this->fromtype, 0, 0, 0, '', 0, 0, 0, '', 'fromforsendingprofile maxwidth200onsmartphone', 1, '', $disablebademails);

+						$out .= ' '.$form->selectarray('fromtype', $liste, $defaultfrom, 0, 0, 0, '', 0, 0, 0, '', 'fromforsendingprofile maxwidth200onsmartphone', 0, '', $disablebademails);

@@ -691 +618,3 @@
-				} else {

+				}

+				else

+				{

@@ -701,2 +630,66 @@
-			if (!empty($this->withto) || is_array($this->withto)) {

-				$out .= $this->getHtmlForTo();

+			if (!empty($this->withto) || is_array($this->withto))

+			{

+				$out .= '<tr><td class="fieldrequired">';

+				if ($this->withtofree) $out .= $form->textwithpicto($langs->trans("MailTo"), $langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));

+				else $out .= $langs->trans("MailTo");

+				$out .= '</td><td>';

+				if ($this->withtoreadonly)

+				{

+					if (!empty($this->toname) && !empty($this->tomail))

+					{

+						$out .= '<input type="hidden" id="toname" name="toname" value="'.$this->toname.'" />';

+						$out .= '<input type="hidden" id="tomail" name="tomail" value="'.$this->tomail.'" />';

+						if ($this->totype == 'thirdparty')

+						{

+							$soc = new Societe($this->db);

+							$soc->fetch($this->toid);

+							$out .= $soc->getNomUrl(1);

+						}

+						elseif ($this->totype == 'contact')

+						{

+							$contact = new Contact($this->db);

+							$contact->fetch($this->toid);

+							$out .= $contact->getNomUrl(1);

+						}

+						else

+						{

+							$out .= $this->toname;

+						}

+						$out .= ' &lt;'.$this->tomail.'&gt;';

+						if ($this->withtofree)

+						{

+							$out .= '<br>'.$langs->trans("and").' <input class="minwidth200" id="sendto" name="sendto" value="'.(!is_array($this->withto) && !is_numeric($this->withto) ? (isset($_REQUEST["sendto"]) ? $_REQUEST["sendto"] : $this->withto) : "").'" />';

+						}

+					}

+					else

+					{

+						// Note withto may be a text like 'AllRecipientSelected'

+						$out .= (!is_array($this->withto) && !is_numeric($this->withto)) ? $this->withto : "";

+					}

+				}

+				else

+				{

+					// The free input of email

+					if (!empty($this->withtofree))

+					{

+						$out .= '<input class="minwidth200" id="sendto" name="sendto" value="'.(($this->withtofree && !is_numeric($this->withtofree)) ? $this->withtofree : (!is_array($this->withto) && !is_numeric($this->withto) ? (isset($_REQUEST["sendto"]) ? $_REQUEST["sendto"] : $this->withto) : "")).'" />';

+					}

+					// The select combo

+					if (!empty($this->withto) && is_array($this->withto))

+					{

+						if (!empty($this->withtofree)) $out .= " ".$langs->trans("and")."/".$langs->trans("or")." ";

+						// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time

+						$tmparray = $this->withto;

+						foreach ($tmparray as $key => $val)

+						{

+							$tmparray[$key] = dol_htmlentities($tmparray[$key], null, 'UTF-8', true);

+						}

+						$withtoselected = GETPOST("receiver", 'none'); // Array of selected value

+						if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action', 'aZ09') == 'presend')

+						{

+							$withtoselected = array_keys($tmparray);

+						}

+						$out .= $form->multiselectarray("receiver", $tmparray, $withtoselected, null, null, 'inline-block minwidth500', null, "");

+					}

+				}

+				$out .= "</td></tr>\n";

@@ -706 +699,2 @@
-			if (!empty($this->withtouser) && is_array($this->withtouser) && getDolGlobalString('MAIN_MAIL_ENABLED_USER_DEST_SELECT')) {

+			if (!empty($this->withtouser) && is_array($this->withtouser) && !empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT))

+			{

@@ -713 +707,2 @@
-				foreach ($tmparray as $key => $val) {

+				foreach ($tmparray as $key => $val)

+				{

@@ -716,2 +711,3 @@
-				$withtoselected = GETPOST("receiveruser", 'array'); // Array of selected value

-				if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action', 'aZ09') == 'presend') {

+				$withtoselected = GETPOST("receiveruser", 'none'); // Array of selected value

+				if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action', 'aZ09') == 'presend')

+				{

@@ -724,23 +720,13 @@
-			// With option for one email per recipient

-			if (!empty($this->withoptiononeemailperrecipient)) {

-				if (abs($this->withoptiononeemailperrecipient) == 1) {

-					$out .= '<tr><td class="minwidth200">';

-					$out .= $langs->trans("GroupEmails");

-					$out .= '</td><td>';

-					$out .= ' <input type="checkbox" id="oneemailperrecipient" value="1" name="oneemailperrecipient"'.($this->withoptiononeemailperrecipient > 0 ? ' checked="checked"' : '').'> ';

-					$out .= '<label for="oneemailperrecipient">';

-					$out .= $form->textwithpicto($langs->trans("OneEmailPerRecipient"), $langs->trans("WarningIfYouCheckOneRecipientPerEmail"), 1, 'help');

-					$out .= '</label>';

-					//$out .= '<span class="hideonsmartphone opacitymedium">';

-					//$out .= ' - ';

-					//$out .= $langs->trans("WarningIfYouCheckOneRecipientPerEmail");

-					//$out .= '</span>';

-					if (getDolGlobalString('MASS_ACTION_EMAIL_ON_DIFFERENT_THIRPARTIES_ADD_CUSTOM_EMAIL')) {

-						if (!empty($this->withto) && !is_array($this->withto)) {

-							$out .= ' '.$langs->trans("or").' <input type="email" name="emailto" value="">';

-						}

-					}

-					$out .= '</td></tr>';

-				} else {

-					$out .= '<tr><td><input type="hidden" name="oneemailperrecipient" value="1"></td><td></td></tr>';

-				}

+			// With option one email per recipient

+			if (!empty($this->withoptiononeemailperrecipient))

+			{

+				$out .= '<tr><td class="minwidth200">';

+				$out .= $langs->trans("GroupEmails");

+				$out .= '</td><td>';

+				$out .= ' <input type="checkbox" name="oneemailperrecipient"'.($this->withoptiononeemailperrecipient > 0 ? ' checked="checked"' : '').'> ';

+				$out .= $langs->trans("OneEmailPerRecipient");

+				$out .= '<span class="hideonsmartphone">';

+				$out .= ' - ';

+				$out .= $langs->trans("WarningIfYouCheckOneRecipientPerEmail");

+				$out .= '</span>';

+				$out .= '</td></tr>';

@@ -750,2 +736,26 @@
-			if (!empty($this->withtocc) || is_array($this->withtocc)) {

-				$out .= $this->getHtmlForCc();

+			if (!empty($this->withtocc) || is_array($this->withtocc))

+			{

+				$out .= '<tr><td>';

+				$out .= $form->textwithpicto($langs->trans("MailCC"), $langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));

+				$out .= '</td><td>';

+				if ($this->withtoccreadonly)

+				{

+					$out .= (!is_array($this->withtocc) && !is_numeric($this->withtocc)) ? $this->withtocc : "";

+				}

+				else

+				{

+				    $out .= '<input class="minwidth200" id="sendtocc" name="sendtocc" value="'.(GETPOST("sendtocc", "alpha") ? GETPOST("sendtocc", "alpha") : ((!is_array($this->withtocc) && !is_numeric($this->withtocc)) ? $this->withtocc : '')).'" />';

+					if (!empty($this->withtocc) && is_array($this->withtocc))

+					{

+						$out .= " ".$langs->trans("and")."/".$langs->trans("or")." ";

+						// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time

+						$tmparray = $this->withtocc;

+						foreach ($tmparray as $key => $val)

+						{

+							$tmparray[$key] = dol_htmlentities($tmparray[$key], null, 'UTF-8', true);

+						}

+						$withtoccselected = GETPOST("receivercc"); // Array of selected value

+						$out .= $form->multiselectarray("receivercc", $tmparray, $withtoccselected, null, null, 'inline-block minwidth500', null, "");

+					}

+				}

+				$out .= "</td></tr>\n";

@@ -755 +765,2 @@
-			if (!empty($this->withtoccuser) && is_array($this->withtoccuser) && getDolGlobalString('MAIN_MAIL_ENABLED_USER_DEST_SELECT')) {

+			if (!empty($this->withtoccuser) && is_array($this->withtoccuser) && !empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT))

+			{

@@ -762 +773,2 @@
-				foreach ($tmparray as $key => $val) {

+				foreach ($tmparray as $key => $val)

+				{

@@ -765,2 +777,3 @@
-				$withtoselected = GETPOST("receiverccuser", 'array'); // Array of selected value

-				if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action', 'aZ09') == 'presend') {

+				$withtoselected = GETPOST("receiverccuser", 'none'); // Array of selected value

+				if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action', 'aZ09') == 'presend')

+				{

@@ -779,2 +792,4 @@
-			if (!empty($this->withreplyto)) {

-				if ($this->withreplytoreadonly) {

+			if (!empty($this->withreplyto))

+			{

+				if ($this->withreplytoreadonly)

+				{

@@ -794 +809 @@
-			if (!empty($this->withdeliveryreceipt) && getDolGlobalInt('MAIN_EMAIL_SUPPORT_ACK')) {

+			if (!empty($this->withdeliveryreceipt)) {

@@ -804 +819,2 @@
-			if (!empty($this->withfile)) {

+			if (!empty($this->withfile))

+			{

@@ -810,3 +826,4 @@
-				if ($this->withmaindocfile) {

-					// withmaindocfile is set to 1 or -1 to show the checkbox (-1 = checked or 1 = not checked)

-					if (GETPOSTISSET('sendmail')) {

+				if ($this->withmaindocfile)	// withmaindocfile is set to 1 or -1 to show the checkbox (-1 = checked or 1 = not checked)

+				{

+					if (GETPOSTISSET('sendmail'))

+					{

@@ -814,2 +831,4 @@
-					} elseif (is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {

-						// If a template was selected, we use setup of template to define if join file checkbox is selected or not.

+					}

+					// If a template was selected, we use setup of template to define if join file checkbox is selected or not.

+					elseif (is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0)

+					{

@@ -820,14 +839,15 @@
-				if (!empty($this->withmaindocfile)) {

-					if ($this->withmaindocfile == 1) {

-						$out .= '<input type="checkbox" id="addmaindocfile" name="addmaindocfile" value="1" />';

-					} elseif ($this->withmaindocfile == -1) {

-						$out .= '<input type="checkbox" id="addmaindocfile" name="addmaindocfile" value="1" checked="checked" />';

-					}

-					if (getDolGlobalString('MAIL_MASS_ACTION_ADD_LAST_IF_MAIN_DOC_NOT_FOUND')) {

-						$out .= ' <label for="addmaindocfile">'.$langs->trans("JoinMainDocOrLastGenerated").'.</label><br>';

-					} else {

-						$out .= ' <label for="addmaindocfile">'.$langs->trans("JoinMainDoc").'.</label><br>';

-					}

-				}

-

-				if (is_numeric($this->withfile)) {

+				if (!empty($this->withmaindocfile))

+				{

+					if ($this->withmaindocfile == 1)

+					{

+						$out .= '<input type="checkbox" name="addmaindocfile" value="1" />';

+					}

+					if ($this->withmaindocfile == -1)

+					{

+						$out .= '<input type="checkbox" name="addmaindocfile" value="1" checked="checked" />';

+					}

+					$out .= ' '.$langs->trans("JoinMainDoc").'.<br>';

+				}

+

+				if (is_numeric($this->withfile))

+				{

@@ -836 +856 @@
-					$out .= '<script nonce="'.getNonce().'" type="text/javascript">';

+					$out .= '<script type="text/javascript" language="javascript">';

@@ -843,12 +863,4 @@
-					if (count($listofpaths)) {

-						foreach ($listofpaths as $key => $val) {

-							$relativepathtofile = substr($val, (strlen(DOL_DATA_ROOT) - strlen($val)));

-

-							$entity = (isset($this->param['object_entity']) ? $this->param['object_entity'] : $conf->entity);

-							if ($entity > 1) {

-								$relativepathtofile = str_replace('/'.$entity.'/', '/', $relativepathtofile);

-							}

-							// Try to extract data from full path

-							$formfile_params = array();

-							preg_match('#^(/)(\w+)(/)(.+)$#', $relativepathtofile, $formfile_params);

-

+					if (count($listofpaths))

+					{

+						foreach ($listofpaths as $key => $val)

+						{

@@ -856 +867,0 @@
-							// Preview of attachment

@@ -858,3 +869,2 @@
-

-							$out .= $formfile->showPreview(array(), $formfile_params[2], $formfile_params[4], 0, ($entity == 1 ? '' : 'entity='.((int) $entity)));

-							if (!$this->withfilereadonly) {

+							if (!$this->withfilereadonly)

+							{

@@ -866,15 +876,9 @@
-					} elseif (empty($this->withmaindocfile)) {

-						//$out .= '<span class="opacitymedium">'.$langs->trans("NoAttachedFiles").'</span><br>';

-					}

-					if ($this->withfile == 2) {

-						$maxfilesizearray = getMaxFileSizeArray();

-						$maxmin = $maxfilesizearray['maxmin'];

-						if ($maxmin > 0) {

-							$out .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file

-						}

-						// Can add other files

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

-							$out .= '<input type="file" class="flat" id="addedfile" name="addedfile[]" value="'.$langs->trans("Upload").'" multiple />';

-						} else {

-							$out .= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';

-						}

+					}

+					elseif (empty($this->withmaindocfile))		// Do not show message if we asked to show the checkbox

+					{

+						$out .= $langs->trans("NoAttachedFiles").'<br>';

+					}

+					if ($this->withfile == 2)	// Can add other files

+					{

+						if (!empty($conf->global->FROM_MAIL_USE_INPUT_FILE_MULTIPLE)) $out .= '<input type="file" class="flat" id="addedfile" name="addedfile[]" value="'.$langs->trans("Upload").'" multiple />';

+						else $out .= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';

@@ -882,3 +886,5 @@
-						$out .= '<input type="submit" class="button smallpaddingimp" id="'.$addfileaction.'" name="'.$addfileaction.'" value="'.$langs->trans("MailingAddFile").'" />';

-					}

-				} else {

+						$out .= '<input class="button" type="submit" id="'.$addfileaction.'" name="'.$addfileaction.'" value="'.$langs->trans("MailingAddFile").'" />';

+					}

+				}

+				else

+				{

@@ -892,3 +898,5 @@
-			if (!empty($this->withbody)) {

-				$defaultmessage = GETPOST('message', 'restricthtml');

-				if (!GETPOST('modelselected', 'alpha') || GETPOST('modelmailselected') != '-1') {

+			if (!empty($this->withbody))

+			{

+				$defaultmessage = GETPOST('message', 'none');

+				if (!GETPOST('modelselected', 'alpha') || GETPOST('modelmailselected') != '-1')

+				{

@@ -903,3 +911,3 @@
-				$paymenturl = '';

-				$validpaymentmethod = array();

-				if (empty($this->substit['__REF__'])) {

+				$paymenturl = ''; $validpaymentmethod = array();

+				if (empty($this->substit['__REF__']))

+				{

@@ -907 +915,3 @@
-				} else {

+				}

+				else

+				{

@@ -912,9 +922,3 @@
-					if ($this->param["models"] == 'order' || $this->param["models"] == 'order_send') {

-						$typeforonlinepayment = 'order'; // TODO use detection on something else than template

-					}

-					if ($this->param["models"] == 'invoice' || $this->param["models"] == 'facture_send') {

-						$typeforonlinepayment = 'invoice'; // TODO use detection on something else than template

-					}

-					if ($this->param["models"] == 'member') {

-						$typeforonlinepayment = 'member'; // TODO use detection on something else than template

-					}

+					if ($this->param["models"] == 'order' || $this->param["models"] == 'order_send')   $typeforonlinepayment = 'order'; // TODO use detection on something else than template

+					if ($this->param["models"] == 'invoice' || $this->param["models"] == 'facture_send') $typeforonlinepayment = 'invoice'; // TODO use detection on something else than template

+					if ($this->param["models"] == 'member') $typeforonlinepayment = 'member'; // TODO use detection on something else than template

@@ -927 +931,2 @@
-				if (count($validpaymentmethod) > 0 && $paymenturl) {

+				if (count($validpaymentmethod) > 0 && $paymenturl)

+				{

@@ -931 +936,3 @@
-				} else {

+				}

+				else

+				{

@@ -935,2 +941,0 @@
-

-				$this->substit['__ONLINE_INTERVIEW_SCHEDULER_TEXT_AND_URL__'] = '';

@@ -941,2 +946,4 @@
-				if (isset($defaultlines)) {

-					foreach ($this->substit_lines as $substit_line) {

+				if (isset($defaultlines))

+				{

+					foreach ($this->substit_lines as $substit_line)

+					{

@@ -955,3 +961,0 @@
-				if (strpos($defaultmessage, '__SENDEREMAIL_SIGNATURE__') !== false && dol_textishtml($this->substit['__SENDEREMAIL_SIGNATURE__'])) {

-					$atleastonecomponentishtml++;

-				}

@@ -961,3 +964,0 @@
-				if (strpos($defaultmessage, '__ONLINE_INTERVIEW_SCHEDULER_TEXT_AND_URL__') !== false && dol_textishtml($this->substit['__ONLINE_INTERVIEW_SCHEDULER_TEXT_AND_URL__'])) {

-					$atleastonecomponentishtml++;

-				}

@@ -968 +969 @@
-					if (!dol_textishtml($this->substit['__USER_SIGNATURE__'])) {

+					if (! dol_textishtml($this->substit['__USER_SIGNATURE__'])) {

@@ -971,4 +972 @@
-					if (!dol_textishtml($this->substit['__SENDEREMAIL_SIGNATURE__'])) {

-						$this->substit['__SENDEREMAIL_SIGNATURE__'] = dol_nl2br($this->substit['__SENDEREMAIL_SIGNATURE__']);

-					}

-					if (!dol_textishtml($this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'])) {

+					if (! dol_textishtml($this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'])) {

@@ -977 +975 @@
-					if (!dol_textishtml($defaultmessage)) {

+					if (! dol_textishtml($defaultmessage)) {

@@ -982,3 +980,3 @@
-				if (GETPOSTISSET("message") && !GETPOST('modelselected')) {

-					$defaultmessage = GETPOST("message", "restricthtml");

-				} else {

+				if (GETPOSTISSET("message") && !$_POST['modelselected']) $defaultmessage = $_POST["message"];

+				else

+				{

@@ -992 +990 @@
-				$out .= '<td colspan="2">';

+				$out .= '<td class="tdtop">';

@@ -995,5 +993,3 @@
-				$out .= '</tr>';

-

-				$out .= '<tr>';

-				$out .= '<td colspan="2">';

-				if ($this->withbodyreadonly) {

+				$out .= '<td>';

+				if ($this->withbodyreadonly)

+				{

@@ -1002,4 +998,4 @@
-				} else {

-					if (!isset($this->ckeditortoolbar)) {

-						$this->ckeditortoolbar = 'dolibarr_mailings';

-					}

+				}

+				else

+				{

+					if (!isset($this->ckeditortoolbar)) $this->ckeditortoolbar = 'dolibarr_notes';

@@ -1009,6 +1005,4 @@
-					if ($this->withfckeditor == -1) {

-						if (getDolGlobalString('FCKEDITOR_ENABLE_MAIL')) {

-							$this->withfckeditor = 1;

-						} else {

-							$this->withfckeditor = 0;

-						}

+					if ($this->withfckeditor == -1)

+					{

+						if (!empty($conf->global->FCKEDITOR_ENABLE_MAIL)) $this->withfckeditor = 1;

+						else $this->withfckeditor = 0;

@@ -1025,3 +1019,4 @@
-			if ($this->withform == 1 || $this->withform == -1) {

-				$out .= '<div class="center">';

-				$out .= '<input type="submit" class="button button-add" id="sendmail" name="sendmail" value="'.$langs->trans("SendMail").'"';

+			if ($this->withform == 1 || $this->withform == -1)

+			{

+				$out .= '<br><div class="center">';

+				$out .= '<input class="button" type="submit" id="sendmail" name="sendmail" value="'.$langs->trans("SendMail").'"';

@@ -1029 +1024,2 @@
-				if ($this->withfile == 2 && $conf->use_javascript_ajax) {

+				if ($this->withfile == 2 && $conf->use_javascript_ajax)

+				{

@@ -1033,2 +1029,4 @@
-				if ($this->withcancel) {

-					$out .= '<input class="button button-cancel" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'" />';

+				if ($this->withcancel)

+				{

+					$out .= ' &nbsp; &nbsp; ';

+					$out .= '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'" />';

@@ -1039,3 +1037 @@
-			if ($this->withform == 1) {

-				$out .= '</form>'."\n";

-			}

+			if ($this->withform == 1) $out .= '</form>'."\n";

@@ -1044,2 +1040,3 @@
-			if (getDolGlobalString('MAIN_MAILFORM_DISABLE_ENTERKEY')) {

-				$out .= '<script nonce="'.getNonce().'" type="text/javascript">';

+			if (!empty($conf->global->MAIN_MAILFORM_DISABLE_ENTERKEY))

+			{

+				$out .= '<script type="text/javascript" language="javascript">';

@@ -1066,132 +1062,0 @@
-	 * get html For To

-	 *

-	 * @return string html

-	 */

-	public function getHtmlForTo()

-	{

-		global $langs, $form;

-		$out = '<tr><td class="fieldrequired">';

-		if ($this->withtofree) {

-			$out .= $form->textwithpicto($langs->trans("MailTo"), $langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));

-		} else {

-			$out .= $langs->trans("MailTo");

-		}

-		$out .= '</td><td>';

-		if ($this->withtoreadonly) {

-			if (!empty($this->toname) && !empty($this->tomail)) {

-				$out .= '<input type="hidden" id="toname" name="toname" value="'.$this->toname.'" />';

-				$out .= '<input type="hidden" id="tomail" name="tomail" value="'.$this->tomail.'" />';

-				if ($this->totype == 'thirdparty') {

-					$soc = new Societe($this->db);

-					$soc->fetch($this->toid);

-					$out .= $soc->getNomUrl(1);

-				} elseif ($this->totype == 'contact') {

-					$contact = new Contact($this->db);

-					$contact->fetch($this->toid);

-					$out .= $contact->getNomUrl(1);

-				} else {

-					$out .= $this->toname;

-				}

-				$out .= ' &lt;'.$this->tomail.'&gt;';

-				if ($this->withtofree) {

-					$out .= '<br>'.$langs->trans("and").' <input class="minwidth200" id="sendto" name="sendto" value="'.(!is_array($this->withto) && !is_numeric($this->withto) ? (GETPOSTISSET("sendto") ? GETPOST("sendto") : $this->withto) : "").'" />';

-				}

-			} else {

-				// Note withto may be a text like 'AllRecipientSelected'

-				$out .= (!is_array($this->withto) && !is_numeric($this->withto)) ? $this->withto : "";

-			}

-		} else {

-			// The free input of email

-			if (!empty($this->withtofree)) {

-				$out .= '<input class="minwidth200" id="sendto" name="sendto" value="'.(($this->withtofree && !is_numeric($this->withtofree)) ? $this->withtofree : (!is_array($this->withto) && !is_numeric($this->withto) ? (GETPOSTISSET("sendto") ? GETPOST("sendto") : $this->withto) : "")).'" />';

-			}

-			// The select combo

-			if (!empty($this->withto) && is_array($this->withto)) {

-				if (!empty($this->withtofree)) {

-					$out .= " ".$langs->trans("and")."/".$langs->trans("or")." ";

-				}

-

-				$tmparray = $this->withto;

-				foreach ($tmparray as $key => $val) {

-					if (is_array($val)) {

-						$label = $val['label'];

-					} else {

-						$label = $val;

-					}

-

-					$tmparray[$key] = array();

-					$tmparray[$key]['id'] = $key;

-

-					$tmparray[$key]['label'] = $label;

-					$tmparray[$key]['label'] = str_replace(array('<', '>'), array('(', ')'), $tmparray[$key]['label']);

-					// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time

-					$tmparray[$key]['label'] = dol_htmlentities($tmparray[$key]['label'], ENT_QUOTES|ENT_SUBSTITUTE, 'UTF-8', true);

-

-					$tmparray[$key]['labelhtml'] = $label;

-					$tmparray[$key]['labelhtml'] = str_replace(array('&lt;', '<', '&gt;', '>'), array('__LTCHAR__', '__LTCHAR__', '__GTCHAR__', '__GTCHAR__'), $tmparray[$key]['labelhtml']);

-					$tmparray[$key]['labelhtml'] = str_replace(array('__LTCHAR__', '__GTCHAR__'), array('<span class="opacitymedium">(', ')</span>'), $tmparray[$key]['labelhtml']);

-				}

-

-				$withtoselected = GETPOST("receiver", 'array'); // Array of selected value

-				if (!getDolGlobalInt('MAIN_MAIL_NO_WITH_TO_SELECTED')) {

-					if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action', 'aZ09') == 'presend') {

-						$withtoselected = array_keys($tmparray);

-					}

-				}

-

-				$out .= $form->multiselectarray("receiver", $tmparray, $withtoselected, null, null, 'inline-block minwidth500', 0, 0);

-			}

-		}

-		$out .= "</td></tr>\n";

-		return $out;

-	}

-

-	/**

-	 * get html For CC

-	 *

-	 * @return string html

-	 */

-	public function getHtmlForCc()

-	{

-		global $langs, $form;

-		$out = '<tr><td>';

-		$out .= $form->textwithpicto($langs->trans("MailCC"), $langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));

-		$out .= '</td><td>';

-		if ($this->withtoccreadonly) {

-			$out .= (!is_array($this->withtocc) && !is_numeric($this->withtocc)) ? $this->withtocc : "";

-		} else {

-			$out .= '<input class="minwidth200" id="sendtocc" name="sendtocc" value="'.(GETPOST("sendtocc", "alpha") ? GETPOST("sendtocc", "alpha") : ((!is_array($this->withtocc) && !is_numeric($this->withtocc)) ? $this->withtocc : '')).'" />';

-			if (!empty($this->withtocc) && is_array($this->withtocc)) {

-				$out .= " ".$langs->trans("and")."/".$langs->trans("or")." ";

-

-				$tmparray = $this->withtocc;

-				foreach ($tmparray as $key => $val) {

-					if (is_array($val)) {

-						$label = $val['label'];

-					} else {

-						$label = $val;

-					}

-

-					$tmparray[$key] = array();

-					$tmparray[$key]['id'] = $key;

-

-					$tmparray[$key]['label'] = $label;

-					$tmparray[$key]['label'] = str_replace(array('<', '>'), array('(', ')'), $tmparray[$key]['label']);

-					// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time

-					$tmparray[$key]['label'] = dol_htmlentities($tmparray[$key]['label'], ENT_QUOTES|ENT_SUBSTITUTE, 'UTF-8', true);

-

-					$tmparray[$key]['labelhtml'] = $label;

-					$tmparray[$key]['labelhtml'] = str_replace(array('&lt;', '<', '&gt;', '>'), array('__LTCHAR__', '__LTCHAR__', '__GTCHAR__', '__GTCHAR__'), $tmparray[$key]['labelhtml']);

-					$tmparray[$key]['labelhtml'] = str_replace(array('__LTCHAR__', '__GTCHAR__'), array('<span class="opacitymedium">(', ')</span>'), $tmparray[$key]['labelhtml']);

-				}

-

-				$withtoccselected = GETPOST("receivercc", 'array'); // Array of selected value

-

-				$out .= $form->multiselectarray("receivercc", $tmparray, $withtoccselected, null, null, 'inline-block minwidth500', 0, 0);

-			}

-		}

-		$out .= "</td></tr>\n";

-		return $out;

-	}

-

-	/**

@@ -1205 +1069,0 @@
-

@@ -1212 +1076 @@
-			$out .= '<input class="minwidth200" id="sendtoccc" name="sendtoccc" value="'.(GETPOSTISSET("sendtoccc") ? GETPOST("sendtoccc", "alpha") : ((!is_array($this->withtoccc) && !is_numeric($this->withtoccc)) ? $this->withtoccc : '')).'" />';

+		    $out .= '<input class="minwidth200" id="sendtoccc" name="sendtoccc" value="'.(GETPOST("sendtoccc", "alpha") ? GETPOST("sendtoccc", "alpha") : ((!is_array($this->withtoccc) && !is_numeric($this->withtoccc)) ? $this->withtoccc : '')).'" />';

@@ -1215 +1079 @@
-

+				// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time

@@ -1218,21 +1082,4 @@
-					if (is_array($val)) {

-						$label = $val['label'];

-					} else {

-						$label = $val;

-					}

-					$tmparray[$key] = array();

-					$tmparray[$key]['id'] = $key;

-

-					$tmparray[$key]['label'] = $label;

-					$tmparray[$key]['label'] = str_replace(array('<', '>'), array('(', ')'), $tmparray[$key]['label']);

-					// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time

-					$tmparray[$key]['label'] = dol_htmlentities($tmparray[$key]['label'], ENT_QUOTES|ENT_SUBSTITUTE, 'UTF-8', true);

-

-					$tmparray[$key]['labelhtml'] = $label;

-					$tmparray[$key]['labelhtml'] = str_replace(array('&lt;', '<', '&gt;', '>'), array('__LTCHAR__', '__LTCHAR__', '__GTCHAR__', '__GTCHAR__'), $tmparray[$key]['labelhtml']);

-					$tmparray[$key]['labelhtml'] = str_replace(array('__LTCHAR__', '__GTCHAR__'), array('<span class="opacitymedium">(', ')</span>'), $tmparray[$key]['labelhtml']);

-				}

-

-				$withtocccselected = GETPOST("receiverccc", 'array'); // Array of selected value

-

-				$out .= $form->multiselectarray("receiverccc", $tmparray, $withtocccselected, null, null, 'inline-block minwidth500', 0, 0);

+					$tmparray[$key] = dol_htmlentities($tmparray[$key], null, 'UTF-8', true);

+				}

+				$withtocccselected = GETPOST("receiverccc"); // Array of selected value

+				$out .= $form->multiselectarray("receiverccc", $tmparray, $withtocccselected, null, null, null, null, "90%");

@@ -1243,30 +1090,8 @@
-		if (getDolGlobalString('MAIN_MAIL_AUTOCOPY_PROPOSAL_TO') && !empty($this->param['models']) && $this->param['models'] == 'propal_send') {

-			$showinfobcc = getDolGlobalString('MAIN_MAIL_AUTOCOPY_PROPOSAL_TO');

-		}

-		if (getDolGlobalString('MAIN_MAIL_AUTOCOPY_ORDER_TO') && !empty($this->param['models']) && $this->param['models'] == 'order_send') {

-			$showinfobcc = getDolGlobalString('MAIN_MAIL_AUTOCOPY_ORDER_TO');

-		}

-		if (getDolGlobalString('MAIN_MAIL_AUTOCOPY_INVOICE_TO') && !empty($this->param['models']) && $this->param['models'] == 'facture_send') {

-			$showinfobcc = getDolGlobalString('MAIN_MAIL_AUTOCOPY_INVOICE_TO');

-		}

-		if (getDolGlobalString('MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO') && !empty($this->param['models']) && $this->param['models'] == 'supplier_proposal_send') {

-			$showinfobcc = getDolGlobalString('MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO');

-		}

-		if (getDolGlobalString('MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO') && !empty($this->param['models']) && $this->param['models'] == 'order_supplier_send') {

-			$showinfobcc = getDolGlobalString('MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO');

-		}

-		if (getDolGlobalString('MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO') && !empty($this->param['models']) && $this->param['models'] == 'invoice_supplier_send') {

-			$showinfobcc = getDolGlobalString('MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO');

-		}

-		if (getDolGlobalString('MAIN_MAIL_AUTOCOPY_PROJECT_TO') && !empty($this->param['models']) && $this->param['models'] == 'project') {

-			$showinfobcc = getDolGlobalString('MAIN_MAIL_AUTOCOPY_PROJECT_TO');

-		}

-		if (getDolGlobalString('MAIN_MAIL_AUTOCOPY_SHIPMENT_TO') && !empty($this->param['models']) && $this->param['models'] == 'shipping_send') {

-			$showinfobcc = getDolGlobalString('MAIN_MAIL_AUTOCOPY_SHIPMENT_TO');

-		}

-		if (getDolGlobalString('MAIN_MAIL_AUTOCOPY_RECEPTION_TO') && !empty($this->param['models']) && $this->param['models'] == 'reception_send') {

-			$showinfobcc = getDolGlobalString('MAIN_MAIL_AUTOCOPY_RECEPTION_TO');

-		}

-		if ($showinfobcc) {

-			$out .= ' + '.$showinfobcc;

-		}

+		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO) && !empty($this->param['models']) && $this->param['models'] == 'propal_send') $showinfobcc = $conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO;

+		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO) && !empty($this->param['models']) && $this->param['models'] == 'order_send') $showinfobcc = $conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO;

+		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO) && !empty($this->param['models']) && $this->param['models'] == 'facture_send') $showinfobcc = $conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO;

+		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO) && !empty($this->param['models']) && $this->param['models'] == 'supplier_proposal_send') $showinfobcc = $conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO;

+		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO) && !empty($this->param['models']) && $this->param['models'] == 'order_supplier_send') $showinfobcc = $conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO;

+		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO) && !empty($this->param['models']) && $this->param['models'] == 'invoice_supplier_send') $showinfobcc = $conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO;

+		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_PROJECT_TO) && !empty($this->param['models']) && $this->param['models'] == 'project') $showinfobcc = $conf->global->MAIN_MAIL_AUTOCOPY_PROJECT_TO;

+		if ($showinfobcc) $out .= ' + '.$showinfobcc;

@@ -1286 +1111 @@
-		$errorstomail = getDolGlobalString('MAIN_MAIL_ERRORS_TO', (!empty($this->errorstomail) ? $this->errorstomail : ''));

+		$errorstomail = (!empty($conf->global->MAIN_MAIL_ERRORS_TO) ? $conf->global->MAIN_MAIL_ERRORS_TO : $this->errorstomail);

@@ -1294 +1119 @@
-			$out .= '<input class="minwidth200" id="errorstomail" name="errorstomail" value="'.$errorstomail.'" />';

+			$out .= '<input size="30" id="errorstomail" name="errorstomail" value="'.$errorstomail.'" />';

@@ -1301 +1126 @@
-	 * get Html For Asking for Delivery Receipt

+	 * get Html For Asking for Deliveriy Receipt

@@ -1307,2 +1132,2 @@
-		global $conf, $langs;

-		$out = '<tr><td><label for="deliveryreceipt">'.$langs->trans("DeliveryReceipt").'</label></td><td>';

+		global $conf, $langs, $form;

+		$out = '<tr><td>'.$langs->trans("DeliveryReceipt").'</td><td>';

@@ -1314,17 +1139,5 @@
-			if (getDolGlobalString('MAIL_FORCE_DELIVERY_RECEIPT_PROPAL') && !empty($this->param['models']) && $this->param['models'] == 'propal_send') {

-				$defaultvaluefordeliveryreceipt = 1;

-			}

-			if (getDolGlobalString('MAIL_FORCE_DELIVERY_RECEIPT_SUPPLIER_PROPOSAL') && !empty($this->param['models']) && $this->param['models'] == 'supplier_proposal_send') {

-				$defaultvaluefordeliveryreceipt = 1;

-			}

-			if (getDolGlobalString('MAIL_FORCE_DELIVERY_RECEIPT_ORDER') && !empty($this->param['models']) && $this->param['models'] == 'order_send') {

-				$defaultvaluefordeliveryreceipt = 1;

-			}

-			if (getDolGlobalString('MAIL_FORCE_DELIVERY_RECEIPT_INVOICE') && !empty($this->param['models']) && $this->param['models'] == 'facture_send') {

-				$defaultvaluefordeliveryreceipt = 1;

-			}

-			if (getDolGlobalString('MAIL_FORCE_DELIVERY_RECEIPT_SUPPLIER_ORDER') && !empty($this->param['models']) && $this->param['models'] == 'order_supplier_send') {

-				$defaultvaluefordeliveryreceipt = 1;

-			}

-			//$out .= $form->selectyesno('deliveryreceipt', (GETPOSTISSET("deliveryreceipt") ? GETPOST("deliveryreceipt") : $defaultvaluefordeliveryreceipt), 1);

-			$out .= '<input type="checkbox" id="deliveryreceipt" name="deliveryreceipt" value="1"'.((GETPOSTISSET("deliveryreceipt") ? GETPOST("deliveryreceipt") : $defaultvaluefordeliveryreceipt) ? ' checked="checked"' : '').'>';

+			if (!empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_PROPAL) && !empty($this->param['models']) && $this->param['models'] == 'propal_send') $defaultvaluefordeliveryreceipt = 1;

+			if (!empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_SUPPLIER_PROPOSAL) && !empty($this->param['models']) && $this->param['models'] == 'supplier_proposal_send') $defaultvaluefordeliveryreceipt = 1;

+			if (!empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_ORDER) && !empty($this->param['models']) && $this->param['models'] == 'order_send') $defaultvaluefordeliveryreceipt = 1;

+			if (!empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_INVOICE) && !empty($this->param['models']) && $this->param['models'] == 'facture_send') $defaultvaluefordeliveryreceipt = 1;

+			$out .= $form->selectyesno('deliveryreceipt', (isset($_POST["deliveryreceipt"]) ? $_POST["deliveryreceipt"] : $defaultvaluefordeliveryreceipt), 1);

@@ -1347,2 +1160 @@
-		$defaulttopic = GETPOST('subject', 'restricthtml');

-

+		$defaulttopic = GETPOST('subject', 'none');

@@ -1368 +1180 @@
-			$out .= '<input type="text" class="quatrevingtpercent" id="subject" name="subject" value="'.((GETPOSTISSET("subject") && !GETPOST('modelselected')) ? GETPOST("subject") : ($defaulttopic ? $defaulttopic : '')).'" />';

+			$out .= '<input type="text" class="quatrevingtpercent" id="subject" name="subject" value="'.((isset($_POST["subject"]) && !$_POST['modelselected']) ? $_POST["subject"] : ($defaulttopic ? $defaulttopic : '')).'" />';

@@ -1378 +1190 @@
-	 *  @param	DoliDB		$dbs			Database handler

+	 *  @param	DoliDB		$db				Database handler

@@ -1380 +1192 @@
-	 *  @param	User		$user			Get templates public + limited to this user

+	 *  @param	string		$user			Get template public or limited to this user

@@ -1382,4 +1194 @@
-	 *  @param	int			$id				Id of template to get, or

-	 *  									-1 for first found with position 0, or

-	 *  									0 for first found whatever is position (priority order depends on lang provided or not) or

-	 *  									-2 for exact match with label (no answer if not found)

+	 *  @param	int			$id				Id of template to find, or -1 for first found with position 0, or 0 for first found whatever is position (priority order depends on lang provided or not) or -2 for exact match with label (no answer if not found)

@@ -1387,5 +1196,4 @@
-	 *  @param	string		$label			Label of template to get

-	 *  @param  int         $defaultfortype 1=Only default templates, 0=Only not default, -1=All

-	 *  @return ModelMail|integer			One instance of ModelMail or < 0 if error

-	 */

-	public function getEMailTemplate($dbs, $type_template, $user, $outputlangs, $id = 0, $active = 1, $label = '', $defaultfortype = -1)

+	 *  @param	string		$label			Label of template

+	 *  @return ModelMail|integer			One instance of ModelMail or -1 if error

+	 */

+	public function getEMailTemplate($db, $type_template, $user, $outputlangs, $id = 0, $active = 1, $label = '')

@@ -1393 +1201 @@
-		global $conf;

+        $ret = new ModelMail();

@@ -1396 +1204 @@
-			$this->error = 'LabelIsMandatoryWhenIdIs-2or-3';

+			$this->error = 'LabelIsMandatoryWhenIdIs-2';

@@ -1399,2 +1206,0 @@
-

-		$ret = new ModelMail();

@@ -1406,7 +1212,5 @@
-		if ($languagetosearchmain == $languagetosearch) {

-			$languagetosearchmain = '';

-		}

-

-		$sql = "SELECT rowid, module, label, type_template, topic, email_from, joinfiles, content, content_lines, lang, email_from, email_to, email_tocc, email_tobcc";

-		$sql .= " FROM ".$dbs->prefix().'c_email_templates';

-		$sql .= " WHERE (type_template = '".$dbs->escape($type_template)."' OR type_template = 'all')";

+		if ($languagetosearchmain == $languagetosearch) $languagetosearchmain = '';

+

+		$sql = "SELECT rowid, label, topic, joinfiles, content, content_lines, lang";

+		$sql .= " FROM ".MAIN_DB_PREFIX.'c_email_templates';

+		$sql .= " WHERE (type_template='".$db->escape($type_template)."' OR type_template='all')";

@@ -1414,25 +1218,9 @@
-		$sql .= " AND (private = 0 OR fk_user = ".((int) $user->id).")"; // Get all public or private owned

-		if ($active >= 0) {

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

-		}

-		if ($defaultfortype >= 0) {

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

-		}

-		if ($label) {

-			$sql .= " AND label = '".$dbs->escape($label)."'";

-		}

-		if (!($id > 0) && $languagetosearch) {

-			$sql .= " AND (lang = '".$dbs->escape($languagetosearch)."'".($languagetosearchmain ? " OR lang = '".$dbs->escape($languagetosearchmain)."'" : "")." OR lang IS NULL OR lang = '')";

-		}

-		if ($id > 0) {

-			$sql .= " AND rowid = ".(int) $id;

-		}

-		if ($id == -1) {

-			$sql .= " AND position = 0";

-		}

-		if ($languagetosearch) {

-			$sql .= $dbs->order("position,lang,label", "ASC,DESC,ASC"); // We want line with lang set first, then with lang null or ''

-		} else {

-			$sql .= $dbs->order("position,lang,label", "ASC,ASC,ASC"); // If no language provided, we give priority to lang not defined

-		}

-		//$sql .= $dbs->plimit(1);

+		$sql .= " AND (private = 0 OR fk_user = ".$user->id.")"; // Get all public or private owned

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

+		if ($label) $sql .= " AND label ='".$db->escape($label)."'";

+		if (!($id > 0) && $languagetosearch) $sql .= " AND (lang = '".$db->escape($languagetosearch)."'".($languagetosearchmain ? " OR lang = '".$db->escape($languagetosearchmain)."'" : "")." OR lang IS NULL OR lang = '')";

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

+		if ($id == -1) $sql .= " AND position=0";

+		if ($languagetosearch) $sql .= $db->order("position,lang,label", "ASC,DESC,ASC"); // We want line with lang set first, then with lang null or ''

+		else $sql .= $db->order("position,lang,label", "ASC,ASC,ASC"); // If no language provided, we give priority to lang not defined

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

@@ -1441,9 +1229,5 @@
-		$resql = $dbs->query($sql);

-		if (!$resql) {

-			dol_print_error($dbs);

-			return -1;

-		}

-

-		// Get first found

-		while (1) {

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

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

+		if ($resql)

+		{

+			// Get first found

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

@@ -1452,9 +1235,0 @@
-				// If template is for a module, check module is enabled; if not, take next template

-				if ($obj->module) {

-					$tempmodulekey = $obj->module;

-					if (empty($conf->$tempmodulekey) || !isModEnabled($tempmodulekey)) {

-						continue;

-					}

-				}

-

-				// If a record was found

@@ -1462 +1236,0 @@
-				$ret->module = $obj->module;

@@ -1469,54 +1243,37 @@
-				$ret->email_from = $obj->email_from;

-

-				break;

-			} else {

-				// If no record found

-				if ($id == -2) {

-					// Not found with the provided label

-					return -1;

-				} else {

-					// If there is no template at all

-					$defaultmessage = '';

-

-					if ($type_template == 'body') {

-						// Special case to use this->withbody as content

-						$defaultmessage = $this->withbody;

-					} elseif ($type_template == 'facture_send') {

-						$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendInvoice");

-					} elseif ($type_template == 'facture_relance') {

-						$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendInvoiceReminder");

-					} elseif ($type_template == 'propal_send') {

-						$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendProposal");

-					} elseif ($type_template == 'supplier_proposal_send') {

-						$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierProposal");

-					} elseif ($type_template == 'order_send') {

-						$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendOrder");

-					} elseif ($type_template == 'order_supplier_send') {

-						$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierOrder");

-					} elseif ($type_template == 'invoice_supplier_send') {

-						$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierInvoice");

-					} elseif ($type_template == 'shipping_send') {

-						$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendShipping");

-					} elseif ($type_template == 'fichinter_send') {

-						$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendFichInter");

-					} elseif ($type_template == 'actioncomm_send') {

-						$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendActionComm");

-					} elseif (!empty($type_template)) {

-						$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentGeneric");

-					}

-

-					$ret->label = 'default';

-					$ret->lang = $outputlangs->defaultlang;

-					$ret->topic = '';

-					$ret->joinfiles = 1;

-					$ret->content = $defaultmessage;

-					$ret->content_lines = '';

-

-					break;

-				}

-			}

-		}

-

-		$dbs->free($resql);

-

-		return $ret;

+			}

+			elseif ($id == -2) {

+				// Not found with the provided label

+				return -1;

+			}

+			else {	// If there is no template at all

+				$defaultmessage = '';

+				if ($type_template == 'body') { $defaultmessage = $this->withbody; }		// Special case to use this->withbody as content

+				elseif ($type_template == 'facture_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendInvoice"); }

+				elseif ($type_template == 'facture_relance') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendInvoiceReminder"); }

+				elseif ($type_template == 'propal_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendProposal"); }

+				elseif ($type_template == 'supplier_proposal_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierProposal"); }

+				elseif ($type_template == 'order_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendOrder"); }

+				elseif ($type_template == 'order_supplier_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierOrder"); }

+				elseif ($type_template == 'invoice_supplier_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierInvoice"); }

+				elseif ($type_template == 'shipping_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendShipping"); }

+				elseif ($type_template == 'fichinter_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendFichInter"); }

+				elseif ($type_template == 'thirdparty') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentThirdparty"); }

+				elseif ($type_template == 'user') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentUser"); }

+				elseif (!empty($type_template)) { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContent".ucfirst($type_template)); }

+

+				$ret->label = 'default';

+				$ret->lang = $outputlangs->defaultlang;

+				$ret->topic = '';

+				$ret->joinfiles = 1;

+				$ret->content = $defaultmessage;

+				$ret->content_lines = '';

+			}

+

+			$db->free($resql);

+			return $ret;

+		}

+		else

+		{

+			dol_print_error($db);

+			return -1;

+		}

@@ -1530 +1287 @@
-	 *      @param	User		$user			Use template public or limited to this user

+	 *      @param	string		$user			Use template public or limited to this user

@@ -1532 +1289 @@
-	 *      @return	int		Return integer <0 if KO,

+	 *      @return	int		<0 if KO,

@@ -1535,0 +1293,2 @@
+		$ret = array();

+

@@ -1537 +1296 @@
-		$sql .= " FROM ".$this->db->prefix().'c_email_templates';

+		$sql .= " FROM ".MAIN_DB_PREFIX.'c_email_templates';

@@ -1540,4 +1299,2 @@
-		$sql .= " AND (fk_user is NULL or fk_user = 0 or fk_user = ".((int) $user->id).")";

-		if (is_object($outputlangs)) {

-			$sql .= " AND (lang = '".$this->db->escape($outputlangs->defaultlang)."' OR lang IS NULL OR lang = '')";

-		}

+		$sql .= " AND (fk_user is NULL or fk_user = 0 or fk_user = ".$user->id.")";

+		if (is_object($outputlangs)) $sql .= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";

@@ -1548 +1305,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -1552 +1310,3 @@
-		} else {

+		}

+		else

+		{

@@ -1562,5 +1322,5 @@
-	 * 		@param	string		$type_template		Get message for key module

-	 *      @param	User		$user				Use template public or limited to this user

-	 *      @param	Translate	$outputlangs		Output lang object

-	 *      @param  int         $active         	1=Only active template, 0=Only disabled, -1=All

-	 *      @return	int		                    	Return integer <0 if KO, nb of records found if OK

+	 * 		@param	string		$type_template	Get message for key module

+	 *      @param	string		$user			Use template public or limited to this user

+	 *      @param	Translate	$outputlangs	Output lang object

+	 *      @param  int         $active         1=Only active template, 0=Only disabled, -1=All

+	 *      @return	int		                    <0 if KO, nb of records found if OK

@@ -1570,4 +1330,4 @@
-		global $conf;

-

-		$sql = "SELECT rowid, module, label, topic, content, content_lines, lang, fk_user, private, position";

-		$sql .= " FROM ".$this->db->prefix().'c_email_templates';

+		$ret = array();

+

+		$sql = "SELECT rowid, label, topic, content, content_lines, lang, fk_user, private, position";

+		$sql .= " FROM ".MAIN_DB_PREFIX.'c_email_templates';

@@ -1576,5 +1336,3 @@
-		$sql .= " AND (private = 0 OR fk_user = ".((int) $user->id).")"; // See all public templates or templates I own.

-		if ($active >= 0) {

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

-		}

-		//if (is_object($outputlangs)) $sql.= " AND (lang = '".$this->db->escape($outputlangs->defaultlang)."' OR lang IS NULL OR lang = '')";	// Return all languages

+		$sql .= " AND (private = 0 OR fk_user = ".$user->id.")"; // See all public templates or templates I own.

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

+		//if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";	// Return all languages

@@ -1585 +1343,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -1588,9 +1347,2 @@
-			while ($obj = $this->db->fetch_object($resql)) {

-				// If template is for a module, check module is enabled.

-				if ($obj->module) {

-					$tempmodulekey = $obj->module;

-					if (empty($conf->$tempmodulekey) || !isModEnabled($tempmodulekey)) {

-						continue;

-					}

-				}

-

+			while ($obj = $this->db->fetch_object($resql))

+			{

@@ -1612 +1364,3 @@
-		} else {

+		}

+		else

+		{

@@ -1621 +1375 @@
-	 * Set ->substit (and ->substit_line) array from object. This is call when suggesting the email template into forms before sending email.

+	 * Set substit array from object. This is call when suggesting the email template into forms before sending email.

@@ -1630 +1384 @@
-		global $conf, $user, $extrafields;

+		global $conf, $user;

@@ -1639,2 +1393,4 @@
-		if (is_array($object->lines)) {

-			foreach ($object->lines as $line) {

+		if (is_array($object->lines))

+		{

+			foreach ($object->lines as $line)

+			{

@@ -1656,4 +1412,4 @@
-				if (!empty($line->fk_product)) {

-					if (!is_object($extrafields)) {

-						$extrafields = new ExtraFields($this->db);

-					}

+				if (!empty($line->fk_product))

+				{

+					if (!is_object($extrafields)) $extrafields = new ExtraFields($this->db);

+					$extrafields->fetch_name_optionals_label('product', true);

@@ -1663,4 +1419,2 @@
-

-					$extrafields->fetch_name_optionals_label($product->table_element, true);

-

-					if (!empty($extrafields->attributes[$product->table_element]['label']) && is_array($extrafields->attributes[$product->table_element]['label']) && count($extrafields->attributes[$product->table_element]['label']) > 0) {

+					if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)

+					{

@@ -1668 +1422 @@
-							$substit_line['__PRODUCT_EXTRAFIELD_'.strtoupper($key).'__'] = isset($product->array_options['options_'.$key]) ? $product->array_options['options_'.$key] : '';

+							$substit_line['__PRODUCT_EXTRAFIELD_'.strtoupper($key).'__'] = $product->array_options['options_'.$key];

@@ -1690 +1444,2 @@
-		if ($mode == 'formemail' || $mode == 'formemailwithlines' || $mode == 'formemailforlines') {

+		if ($mode == 'formemail' || $mode == 'formemailwithlines' || $mode == 'formemailforlines')

+		{

@@ -1695 +1450,2 @@
-			if ($mode == 'formwithlines') {

+			if ($mode == 'formwithlines')

+			{

@@ -1698 +1454,2 @@
-			if ($mode == 'formforlines') {

+			if ($mode == 'formforlines')

+			{

@@ -1703 +1460,2 @@
-		if ($mode == 'emailing') {

+		if ($mode == 'emailing')

+		{

@@ -1708 +1466 @@
-			// For mass emailing, we have different keys specific to the data into tagerts list

+			// For mass emailing, we have different keys

@@ -1710 +1467,0 @@
-			$tmparray['__THIRDPARTY_CUSTOMER_CODE__'] = 'CustomerCode';

@@ -1720,3 +1477,4 @@
-			$tmparray['__CHECK_READ__'] = $langs->trans('TagCheckMail');

-			$tmparray['__UNSUBSCRIBE__'] = $langs->trans('TagUnsubscribe');

-			$tmparray['__UNSUBSCRIBE_URL__'] = $langs->trans('TagUnsubscribe').' (URL)';

+			$tmparray['__USER_SIGNATURE__'] = 'TagSignature';

+			$tmparray['__CHECK_READ__'] = 'TagCheckMail';

+			$tmparray['__UNSUBSCRIBE__'] = 'TagUnsubscribe';

+				//,'__PERSONALIZED__' => 'Personalized'	// Hidden because not used yet in mass emailing

@@ -1725,10 +1483,5 @@
-			if (isModEnabled('paypal')) {

-				$onlinepaymentenabled++;

-			}

-			if (isModEnabled('paybox')) {

-				$onlinepaymentenabled++;

-			}

-			if (isModEnabled('stripe')) {

-				$onlinepaymentenabled++;

-			}

-			if ($onlinepaymentenabled && getDolGlobalString('PAYMENT_SECURITY_TOKEN')) {

+			if (!empty($conf->paypal->enabled)) $onlinepaymentenabled++;

+			if (!empty($conf->paybox->enabled)) $onlinepaymentenabled++;

+			if (!empty($conf->stripe->enabled)) $onlinepaymentenabled++;

+			if ($onlinepaymentenabled && !empty($conf->global->PAYMENT_SECURITY_TOKEN))

+			{

@@ -1736,35 +1489,10 @@
-				if (getDolGlobalString('PAYMENT_SECURITY_TOKEN_UNIQUE')) {

-					if (isModEnabled('adherent')) {

-						$tmparray['__SECUREKEYPAYMENT_MEMBER__'] = 'SecureKeyPAYMENTUniquePerMember';

-					}

-					if (isModEnabled('don')) {

-						$tmparray['__SECUREKEYPAYMENT_DONATION__'] = 'SecureKeyPAYMENTUniquePerDonation';

-					}

-					if (isModEnabled('facture')) {

-						$tmparray['__SECUREKEYPAYMENT_INVOICE__'] = 'SecureKeyPAYMENTUniquePerInvoice';

-					}

-					if (isModEnabled('commande')) {

-						$tmparray['__SECUREKEYPAYMENT_ORDER__'] = 'SecureKeyPAYMENTUniquePerOrder';

-					}

-					if (isModEnabled('contrat')) {

-						$tmparray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = 'SecureKeyPAYMENTUniquePerContractLine';

-					}

-

-					//Online payment link

-					if (isModEnabled('adherent')) {

-						$tmparray['__ONLINEPAYMENTLINK_MEMBER__'] = 'OnlinePaymentLinkUniquePerMember';

-					}

-					if (isModEnabled('don')) {

-						$tmparray['__ONLINEPAYMENTLINK_DONATION__'] = 'OnlinePaymentLinkUniquePerDonation';

-					}

-					if (isModEnabled('facture')) {

-						$tmparray['__ONLINEPAYMENTLINK_INVOICE__'] = 'OnlinePaymentLinkUniquePerInvoice';

-					}

-					if (isModEnabled('commande')) {

-						$tmparray['__ONLINEPAYMENTLINK_ORDER__'] = 'OnlinePaymentLinkUniquePerOrder';

-					}

-					if (isModEnabled('contrat')) {

-						$tmparray['__ONLINEPAYMENTLINK_CONTRACTLINE__'] = 'OnlinePaymentLinkUniquePerContractLine';

-					}

-				}

-			} else {

+				if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))

+				{

+					if ($conf->adherent->enabled) $tmparray['__SECUREKEYPAYMENT_MEMBER__'] = 'SecureKeyPAYMENTUniquePerMember';

+					if ($conf->facture->enabled)  $tmparray['__SECUREKEYPAYMENT_INVOICE__'] = 'SecureKeyPAYMENTUniquePerInvoice';

+					if ($conf->commande->enabled) $tmparray['__SECUREKEYPAYMENT_ORDER__'] = 'SecureKeyPAYMENTUniquePerOrder';

+					if ($conf->contrat->enabled)  $tmparray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = 'SecureKeyPAYMENTUniquePerContractLine';

+				}

+			}

+			else

+			{

@@ -1779,9 +1507,5 @@
-			if (getDolGlobalString('MEMBER_ENABLE_PUBLIC')) {

-				$tmparray['__PUBLICLINK_NEWMEMBERFORM__'] = 'BlankSubscriptionForm';

-			}

-		}

-

-		foreach ($tmparray as $key => $val) {

-			if (empty($val)) {

-				$tmparray[$key] = $key;

-			}

+		}

+

+		foreach ($tmparray as $key => $val)

+		{

+			if (empty($val)) $tmparray[$key] = $key;

@@ -1797,2 +1520,0 @@
- *

- * Object of table llx_c_email_templates

@@ -1808,17 +1530,4 @@
-	 * @var string Model mail label

-	 */

-	public $label;

-

-	/**

-	 * @var int Owner of email template

-	 */

-	public $fk_user;

-

-	/**

-	 * @var int Is template private

-	 */

-	public $private;

-

-	/**

-	 * @var string Model mail topic

-	 */

+     * @var string Model mail label

+     */

+    public $label;

+

@@ -1826,4 +1534,0 @@
-

-	/**

-	 * @var string Model mail content

-	 */

@@ -1834,15 +1538,0 @@
-

-	public $email_from;

-	public $email_to;

-	public $email_tocc;

-	public $email_tobcc;

-

-	/**

-	 * @var string Module the template is dedicated for

-	 */

-	public $module;

-

-	/**

-	 * @var int Position of template in a combo list

-	 */

-	public $position;

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_html.formmailing.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_html.formmailing.class.php
@@ -30,4 +30,4 @@
-	/**

-	 * @var string[] Error codes (or messages)

-	 */

-	public $errors = array();

+    /**

+     * @var string[] Error codes (or messages)

+     */

+    public $errors = array();

@@ -34,0 +35,10 @@
+    /**

+     * Output a select with destinaries status

+     *

+     * @param string   $selectedid     The selected id

+     * @param string   $htmlname       Name of controm

+     * @param integer  $show_empty     Show empty option

+     * @return string HTML select

+     */

+    public function selectDestinariesStatus($selectedid = '', $htmlname = 'dest_status', $show_empty = 0)

+    {

@@ -36,12 +46,2 @@
-	/**

-	 * Output a select with destinaries status

-	 *

-	 * @param 	string  $selectedid     	The selected id

-	 * @param 	string  $htmlname       	Name of controm

-	 * @param 	integer $show_empty     	Show empty option

-	 * @param	string	$morecss			More CSS

-	 * @return 	string 						HTML select

-	 */

-	public function selectDestinariesStatus($selectedid = '', $htmlname = 'dest_status', $show_empty = 0, $morecss = 'minwidth75')

-	{

-		global $langs;

+        global $langs;

+        $langs->load("mails");

@@ -49 +49,2 @@
-		$langs->load("mails");

+        require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/mailing.class.php';

+        $mailing = new Mailing($this->db);

@@ -51,2 +52 @@
-		require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/mailing.class.php';

-		$mailing = new Mailing($this->db);

+        $options = array();

@@ -54 +54,3 @@
-		$options = array();

+        if ($show_empty) {

+            $options[-2] = ''; // Note -1 is used for error

+        }

@@ -56 +58 @@
-		$options = $options + $mailing->statut_dest;

+        $options = $options + $mailing->statut_dest;

@@ -58,3 +60,2 @@
-		// Note -1 is used for error, so we use -2 for tempty value

-		return Form::selectarray($htmlname, $options, $selectedid, ($show_empty ? -2 : 0), 0, 0, '', 1, 0, 0, '', $morecss);

-	}

+        return Form::selectarray($htmlname, $options, $selectedid, 0, 0, 0, '', 1);

+    }

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_html.formmargin.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_html.formmargin.class.php
@@ -31,6 +31,6 @@
-	/**

-	 * @var DoliDB Database handler.

-	 */

-	public $db;

-

-	/**

+    /**

+     * @var DoliDB Database handler.

+     */

+    public $db;

+

+    /**

@@ -42,9 +42,9 @@
-	/**

-	 *	Constructor

-	 *

-	 *	@param	DoliDB		$db      Database handler

-	 */

-	public function __construct($db)

-	{

-		$this->db = $db;

-	}

+    /**

+     *	Constructor

+     *

+     *	@param	DoliDB		$db      Database handler

+     */

+    public function __construct($db)

+    {

+        $this->db = $db;

+    }

@@ -85,2 +85,4 @@
-		foreach ($object->lines as $line) {

-			if (empty($line->pa_ht) && isset($line->fk_fournprice) && !$force_price) {

+		foreach ($object->lines as $line)

+		{

+			if (empty($line->pa_ht) && isset($line->fk_fournprice) && !$force_price)

+			{

@@ -88,2 +90,2 @@
-				$product = new ProductFournisseur($this->db);

-				if ($product->fetch_product_fournisseur_price($line->fk_fournprice)) {

+				$product = new ProductFournisseur($db);

+				if ($product->fetch_product_fournisseur_price($line->fk_fournprice))

@@ -91,6 +93,3 @@
-				}

-			}

-

-			// If buy price is not defined (null), we will use the sell price. If defined to 0 (it means it was forced to 0 during insert, for example for a free to get product), we must still use 0.

-			//if ((!isset($line->pa_ht) || $line->pa_ht == 0) && $line->subprice > 0 && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull > 0)) {

-			if ((!isset($line->pa_ht)) && $line->subprice > 0 && (isset($conf->global->ForceBuyingPriceIfNull) && getDolGlobalInt('ForceBuyingPriceIfNull') > 0)) {

+			}

+			// si prix d'achat non renseigné et devrait l'être, alors prix achat = prix vente

+			if ((!isset($line->pa_ht) || $line->pa_ht == 0) && $line->subprice > 0 && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)) {

@@ -101,10 +100,3 @@
-			// We choosed to have line->pa_ht always positive in database, so we guess the correct sign

-			$pa_ht = (($pv < 0 || ($pv == 0 && in_array($object->element, array('facture', 'facture_fourn')) && $object->type == $object::TYPE_CREDIT_NOTE)) ? -$line->pa_ht : $line->pa_ht);

-			if (getDolGlobalInt('INVOICE_USE_SITUATION') == 1) {	// Special case for old situation mode

-				if (($object->element == 'facture' && $object->type == $object::TYPE_SITUATION)

-					|| ($object->element == 'facture' && $object->type == $object::TYPE_CREDIT_NOTE && getDolGlobalInt('INVOICE_USE_SITUATION_CREDIT_NOTE') && $object->situation_counter > 0)) {

-					// We need a compensation relative to $line->situation_percent

-					$pa = $line->qty * $pa_ht * ($line->situation_percent / 100);

-				} else {

-					$pa = $line->qty * $pa_ht;

-				}

+			$pa_ht = ($pv < 0 ? -$line->pa_ht : $line->pa_ht); // We choosed to have line->pa_ht always positive in database, so we guess the correct sign

+			if ($object->element == 'facture' && $object->type == $object::TYPE_SITUATION) {

+				$pa = $line->qty * $pa_ht * ($line->situation_percent / 100);

@@ -117 +109 @@
-				if (getDolGlobalString('MARGIN_METHODE_FOR_DISCOUNT') == '1') { // remise globale considérée comme produit

+				if ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '1') { // remise globale considérée comme produit

@@ -128,2 +120,3 @@
-					$marginInfos['margin_on_products'] += $pv - $pa;

-				} elseif (getDolGlobalString('MARGIN_METHODE_FOR_DISCOUNT') == '2') { // remise globale considérée comme service

+						$marginInfos['margin_on_products'] += $pv - $pa;

+				}

+				elseif ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '2') { // remise globale considérée comme service

@@ -138,6 +131,8 @@
-					$marginInfos['margin_on_services'] += $pv - $pa;

-				} elseif (getDolGlobalString('MARGIN_METHODE_FOR_DISCOUNT') == '3') { // remise globale prise en compte uniqt sur total

-					$marginInfos['pa_total'] += $pa;

-					$marginInfos['pv_total'] += $pv;

-				}

-			} else {

+						$marginInfos['margin_on_services'] += $pv - $pa;

+				}

+				elseif ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '3') { // remise globale prise en compte uniqt sur total

+					$marginInfos['pa_total'] += $pa;

+					$marginInfos['pv_total'] += $pv;

+				}

+			}

+			else {

@@ -157 +152 @@
-					$marginInfos['margin_on_products'] += $pv - $pa;

+					    $marginInfos['margin_on_products'] += $pv - $pa;

@@ -159 +154,2 @@
-				} elseif ($type == 1) {  // service

+				}

+				elseif ($type == 1) {  // service

@@ -168,5 +164,5 @@
-					$marginInfos['margin_on_services'] += $pv - $pa;

-				}

-			}

-		}

-		if ($marginInfos['pa_products'] > 0) {

+						$marginInfos['margin_on_services'] += $pv - $pa;

+				}

+			}

+		}

+		if ($marginInfos['pa_products'] > 0)

@@ -174,2 +170 @@
-		}

-		if ($marginInfos['pv_products'] > 0) {

+		if ($marginInfos['pv_products'] > 0)

@@ -177,3 +172,2 @@
-		}

-

-		if ($marginInfos['pa_services'] > 0) {

+

+		if ($marginInfos['pa_services'] > 0)

@@ -181,2 +175 @@
-		}

-		if ($marginInfos['pv_services'] > 0) {

+		if ($marginInfos['pv_services'] > 0)

@@ -184 +176,0 @@
-		}

@@ -190,2 +182,2 @@
-		$marginInfos['total_margin'] = $marginInfos['pv_total'] - $marginInfos['pa_total'];

-		if ($marginInfos['pa_total'] > 0) {

+			$marginInfos['total_margin'] = $marginInfos['pv_total'] - $marginInfos['pa_total'];

+		if ($marginInfos['pa_total'] > 0)

@@ -193,2 +185 @@
-		}

-		if ($marginInfos['pv_total'] > 0) {

+		if ($marginInfos['pv_total'] > 0)

@@ -196 +186,0 @@
-		}

@@ -210,10 +200,5 @@
-		global $langs, $conf, $user, $hookmanager;

-		global $action;

-

-		if (!empty($user->socid)) {

-			return;

-		}

-

-		if (!$user->hasRight('margins', 'liretous')) {

-			return;

-		}

+		global $langs, $conf, $user;

+

+    	if (!empty($user->socid)) return;

+

+    	if (!$user->rights->margins->liretous) return;

@@ -223,39 +208,44 @@
-		$parameters=array('marginInfo' => &$marginInfo);

-		$reshook = $hookmanager->executeHooks('displayMarginInfos', $parameters, $object, $action);

-		if ($reshook < 0) {

-			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

-		} elseif (empty($reshook)) {

-			if (getDolGlobalString('MARGIN_ADD_SHOWHIDE_BUTTON')) {

-				print $langs->trans('ShowMarginInfos') . ' ';

-				$hidemargininfos = preg_replace('/[^a-zA-Z0-9_\-]/', '', $_COOKIE['DOLUSER_MARGININFO_HIDE_SHOW']) ?? ''; // Clean cookie

-				print '<span id="showMarginInfos" class="linkobject valignmiddle ' . (!empty($hidemargininfos) ? '' : 'hideobject') . '">' . img_picto($langs->trans("Disabled"), 'switch_off') . '</span>';

-				print '<span id="hideMarginInfos" class="linkobject valignmiddle ' . (!empty($hidemargininfos) ? 'hideobject' : '') . '">' . img_picto($langs->trans("Enabled"), 'switch_on') . '</span>';

-

-				print '<script nonce="'.getNonce().'">$(document).ready(function() {';

-				print '$("span#showMarginInfos").click(function() { console.log("click on showMargininfos"); date = new Date(); date.setTime(date.getTime()+(30*86400000)); document.cookie = "DOLUSER_MARGININFO_HIDE_SHOW=0; expires=" + date.toGMTString() + "; path=/ "; $(".margintable").show(); $("span#showMarginInfos").addClass("hideobject"); $("span#hideMarginInfos").removeClass("hideobject"); });';

-				print '$("span#hideMarginInfos").click(function() { console.log("click on hideMarginInfos"); date = new Date(); date.setTime(date.getTime()+(30*86400000)); document.cookie = "DOLUSER_MARGININFO_HIDE_SHOW=1; expires=" + date.toGMTString() + "; path=/ "; $(".margintable").hide(); $("span#hideMarginInfos").addClass("hideobject"); $("span#showMarginInfos").removeClass("hideobject"); });';

-				if (!empty($hidemargininfos)) {

-					print 'console.log("hide the margin info"); $("#margintable").hide();';

-				}

-				print '});</script>';

-			}

-

-			print '<!-- displayMarginInfos() - Show margin table -->' . "\n";

-			print '<div class="div-table-responsive-no-min">';

-

-			print '<table class="noborder margintable centpercent" id="margintable">';

-			print '<tr class="liste_titre">';

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

-			print '<td class="liste_titre right">' . $langs->trans('SellingPrice') . '</td>';

-			if (getDolGlobalString('MARGIN_TYPE') == "1") {

-				print '<td class="liste_titre right">' . $langs->trans('BuyingPrice') . '</td>';

-			} else {

-				print '<td class="liste_titre right">' . $langs->trans('CostPrice') . '</td>';

-			}

-			print '<td class="liste_titre right">' . $langs->trans('Margin') . '</td>';

-			if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {

-				print '<td class="liste_titre right">' . $langs->trans('MarginRate') . '</td>';

-			}

-			if (getDolGlobalString('DISPLAY_MARK_RATES')) {

-				print '<td class="liste_titre right">' . $langs->trans('MarkRate') . '</td>';

-			}

+		if (!empty($conf->global->MARGIN_ADD_SHOWHIDE_BUTTON))	// TODO Warning this feature rely on an external js file that may be removed. Using native js function document.cookie should be better

+		{

+			print $langs->trans('ShowMarginInfos').' : ';

+	        $hidemargininfos = $_COOKIE['DOLUSER_MARGININFO_HIDE_SHOW'];

+	    	print '<span id="showMarginInfos" class="linkobject '.(!empty($hidemargininfos) ? '' : 'hideobject').'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</span>';

+	    	print '<span id="hideMarginInfos" class="linkobject '.(!empty($hidemargininfos) ? 'hideobject' : '').'">'.img_picto($langs->trans("Enabled"), 'switch_on').'</span>';

+

+    	    print '<script>$(document).ready(function() {

+        	    $("span#showMarginInfos").click(function() { $.getScript( "'.dol_buildpath('/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js', 1).'", function( data, textStatus, jqxhr ) { $.cookie("DOLUSER_MARGININFO_HIDE_SHOW", 0); $(".margininfos").show(); $("span#showMarginInfos").addClass("hideobject"); $("span#hideMarginInfos").removeClass("hideobject");})});

+        	    $("span#hideMarginInfos").click(function() { $.getScript( "'.dol_buildpath('/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js', 1).'", function( data, textStatus, jqxhr ) { $.cookie("DOLUSER_MARGININFO_HIDE_SHOW", 1); $(".margininfos").hide(); $("span#hideMarginInfos").addClass("hideobject"); $("span#showMarginInfos").removeClass("hideobject");})});

+      	        });</script>';

+    	    if (!empty($hidemargininfos)) print '<script>$(document).ready(function() {$(".margininfos").hide();});</script>';

+		}

+

+		print '<div class="div-table-responsive-no-min">';

+		print '<!-- Margin table -->'."\n";

+

+		print '<table class="noborder margintable centpercent">';

+		print '<tr class="liste_titre">';

+		print '<td class="liste_titre">'.$langs->trans('Margins').'</td>';

+		print '<td class="liste_titre right">'.$langs->trans('SellingPrice').'</td>';

+		if ($conf->global->MARGIN_TYPE == "1")

+			print '<td class="liste_titre right">'.$langs->trans('BuyingPrice').'</td>';

+		else

+			print '<td class="liste_titre right">'.$langs->trans('CostPrice').'</td>';

+		print '<td class="liste_titre right">'.$langs->trans('Margin').'</td>';

+		if (!empty($conf->global->DISPLAY_MARGIN_RATES))

+			print '<td class="liste_titre right">'.$langs->trans('MarginRate').'</td>';

+		if (!empty($conf->global->DISPLAY_MARK_RATES))

+			print '<td class="liste_titre right">'.$langs->trans('MarkRate').'</td>';

+		print '</tr>';

+

+		if (!empty($conf->product->enabled))

+		{

+			//if ($marginInfo['margin_on_products'] != 0 && $marginInfo['margin_on_services'] != 0) {

+			print '<tr class="oddeven">';

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

+			print '<td class="right">'.price($marginInfo['pv_products']).'</td>';

+			print '<td class="right">'.price($marginInfo['pa_products']).'</td>';

+			print '<td class="right">'.price($marginInfo['margin_on_products']).'</td>';

+			if (!empty($conf->global->DISPLAY_MARGIN_RATES))

+				print '<td class="right">'.(($marginInfo['margin_rate_products'] == '') ? '' : price($marginInfo['margin_rate_products'], null, null, null, null, 2).'%').'</td>';

+			if (!empty($conf->global->DISPLAY_MARK_RATES))

+				print '<td class="right">'.(($marginInfo['mark_rate_products'] == '') ? '' : price($marginInfo['mark_rate_products'], null, null, null, null, 2).'%').'</td>';

@@ -263,52 +253,31 @@
-

-			if (isModEnabled("product")) {

-				//if ($marginInfo['margin_on_products'] != 0 && $marginInfo['margin_on_services'] != 0) {

-				print '<tr class="oddeven">';

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

-				print '<td class="right">' . price($marginInfo['pv_products']) . '</td>';

-				print '<td class="right">' . price($marginInfo['pa_products']) . '</td>';

-				print '<td class="right">' . price($marginInfo['margin_on_products']) . '</td>';

-				if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {

-					print '<td class="right">' . (($marginInfo['margin_rate_products'] == '') ? '' : price($marginInfo['margin_rate_products'], null, null, null, null, 2) . '%') . '</td>';

-				}

-				if (getDolGlobalString('DISPLAY_MARK_RATES')) {

-					print '<td class="right">' . (($marginInfo['mark_rate_products'] == '') ? '' : price($marginInfo['mark_rate_products'], null, null, null, null, 2) . '%') . '</td>';

-				}

-				print '</tr>';

-			}

-

-			if (isModEnabled("service")) {

-				print '<tr class="oddeven">';

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

-				print '<td class="right">' . price($marginInfo['pv_services']) . '</td>';

-				print '<td class="right">' . price($marginInfo['pa_services']) . '</td>';

-				print '<td class="right">' . price($marginInfo['margin_on_services']) . '</td>';

-				if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {

-					print '<td class="right">' . (($marginInfo['margin_rate_services'] == '') ? '' : price($marginInfo['margin_rate_services'], null, null, null, null, 2) . '%') . '</td>';

-				}

-				if (getDolGlobalString('DISPLAY_MARK_RATES')) {

-					print '<td class="right">' . (($marginInfo['mark_rate_services'] == '') ? '' : price($marginInfo['mark_rate_services'], null, null, null, null, 2) . '%') . '</td>';

-				}

-				print '</tr>';

-			}

-

-			if (isModEnabled("product") && isModEnabled("service")) {

-				print '<tr class="liste_total">';

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

-				print '<td class="right">' . price($marginInfo['pv_total']) . '</td>';

-				print '<td class="right">' . price($marginInfo['pa_total']) . '</td>';

-				print '<td class="right">' . price($marginInfo['total_margin']) . '</td>';

-				if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {

-					print '<td class="right">' . (($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], null, null, null, null, 2) . '%') . '</td>';

-				}

-				if (getDolGlobalString('DISPLAY_MARK_RATES')) {

-					print '<td class="right">' . (($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], null, null, null, null, 2) . '%') . '</td>';

-				}

-				print '</tr>';

-			}

-			print  $hookmanager->resPrint;

-			print '</table>';

-			print '</div>';

-		} elseif ($reshook > 0) {

-			print $hookmanager->resPrint;

-		}

+		}

+

+		if (!empty($conf->service->enabled))

+		{

+			print '<tr class="oddeven">';

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

+			print '<td class="right">'.price($marginInfo['pv_services']).'</td>';

+			print '<td class="right">'.price($marginInfo['pa_services']).'</td>';

+			print '<td class="right">'.price($marginInfo['margin_on_services']).'</td>';

+			if (!empty($conf->global->DISPLAY_MARGIN_RATES))

+				print '<td class="right">'.(($marginInfo['margin_rate_services'] == '') ? '' : price($marginInfo['margin_rate_services'], null, null, null, null, 2).'%').'</td>';

+			if (!empty($conf->global->DISPLAY_MARK_RATES))

+				print '<td class="right">'.(($marginInfo['mark_rate_services'] == '') ? '' : price($marginInfo['mark_rate_services'], null, null, null, null, 2).'%').'</td>';

+			print '</tr>';

+		}

+

+		if (!empty($conf->product->enabled) && !empty($conf->service->enabled))

+		{

+			print '<tr class="liste_total">';

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

+			print '<td class="right">'.price($marginInfo['pv_total']).'</td>';

+			print '<td class="right">'.price($marginInfo['pa_total']).'</td>';

+			print '<td class="right">'.price($marginInfo['total_margin']).'</td>';

+			if (!empty($conf->global->DISPLAY_MARGIN_RATES))

+				print '<td class="right">'.(($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], null, null, null, null, 2).'%').'</td>';

+			if (!empty($conf->global->DISPLAY_MARK_RATES))

+				print '<td class="right">'.(($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], null, null, null, null, 2).'%').'</td>';

+			print '</tr>';

+		}

+		print '</table>';

+		print '</div>';

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_html.formorder.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_html.formorder.class.php
@@ -33,12 +32,0 @@
-	/**

-	 *  Return combo list of differents status of a orders

-	 *

-	 *  @param	string	$selected   Preselected value

-	 *  @param	int		$short		Use short labels

-	 *  @param	string	$hmlname	Name of HTML select element

-	 *  @param	string	$morecss	More CSS

-	 *  @return	void

-	 */

-	public function selectSupplierOrderStatus($selected = '', $short = 0, $hmlname = 'order_status', $morecss = '')

-	{

-		$options = array();

@@ -46,11 +34,11 @@
-		// 7 is same label than 6. 8 does not exists (billed is another field)

-		$statustohow = array(

-			'0' => '0',

-			'1' => '1',

-			'2' => '2',

-			'3' => '3',

-			'4' => '4',

-			'5' => '5',

-			'6' => '6,7',

-			'9' => '9'

-		);

+    /**

+     *  Return combo list of differents status of a orders

+     *

+     *  @param	string	$selected   Preselected value

+     *  @param	int		$short		Use short labels

+     *  @param	string	$hmlname	Name of HTML select element

+     *  @return	void

+     */

+    public function selectSupplierOrderStatus($selected = '', $short = 0, $hmlname = 'order_status')

+    {

+	    $options = array();

@@ -58 +46,11 @@
-		$tmpsupplierorder = new CommandeFournisseur($this->db);

+	    // 7 is same label than 6. 8 does not exists (billed is another field)

+	    $statustohow = array(

+		    '0' => '0',

+		    '1' => '1',

+		    '2' => '2',

+		    '3' => '3',

+		    '4' => '4',

+		    '5' => '5',

+		    '6' => '6,7',

+		    '9' => '9'

+	    );

@@ -60,4 +58 @@
-		foreach ($statustohow as $key => $value) {

-			$tmpsupplierorder->statut = $key;

-			$options[$value] = $tmpsupplierorder->getLibStatut($short);

-		}

+	    $tmpsupplierorder = new CommandeFournisseur($this->db);

@@ -65,5 +60,4 @@
-		if (is_array($selected)) {

-			$selectedarray = $selected;

-		} else {

-			$selectedarray = explode(',', $selected);

-		}

+	    foreach ($statustohow as $key => $value) {

+		    $tmpsupplierorder->statut = $key;

+		    $options[$value] = $tmpsupplierorder->getLibStatut($short);

+	    }

@@ -71,2 +65,2 @@
-		print Form::multiselectarray($hmlname, $options, $selectedarray, 0, 0, $morecss);

-	}

+	    print Form::selectarray($hmlname, $options, $selected, 1);

+    }

@@ -81 +75 @@
-	 *  @return	int						Return integer <0 if KO, >0 if OK

+	 *  @return	array					Tableau des sources de commandes

@@ -87 +81 @@
-		$listofmethods = array();

+        $listofmethods = array();

@@ -90 +84 @@
-		$sql .= " FROM ".$this->db->prefix()."c_input_method";

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

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_html.formother.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_html.formother.class.php
@@ -41,3 +41,3 @@
-	private $db;

-

-	/**

+    private $db;

+

+    /**

@@ -49,243 +49,477 @@
-	/**

-	 *	Constructor

-	 *

-	 *	@param	DoliDB		$db      Database handler

-	 */

-	public function __construct($db)

-	{

-		$this->db = $db;

-	}

-

-	/**

-	 * Return the HTML code for scanner tool.

-	 * This must be called into an existing <form>

-	 *

-	 * @param	string	$jstoexecuteonadd	Name of javascript function to call once the barcode scanning session is complete and user has click on "Add".

-	 * @param	string	$mode				'all' (both product and lot barcode) or 'product' (product barcode only) or 'lot' (lot number only)

-	 * @param	int		$warehouseselect	0 (disable warehouse select) or 1 (enable warehouse select)

-	 * @return	string						HTML component

-	 */

-	public function getHTMLScannerForm($jstoexecuteonadd = 'barcodescannerjs', $mode = 'all', $warehouseselect = 0)

-	{

-		global $langs;

-

-		$out = '';

-

-		$out .= '<!-- Popup for mass barcode scanning -->'."\n";

-		$out .= '<div class="div-for-modal-topright" style="padding: 15px">';

-		$out .= '<center>'.img_picto('', 'barcode', 'class="pictofixedwidth"').'<strong>Barcode scanner tool...</strong></center><br>';

-

-		if ($mode == 'product') {

-			$out .= '<input type="hidden" name="barcodemode" value="barcodeforproduct" id="barcodeforproduct">';

-		} elseif ($mode == 'lot') {

-			$out .= '<input type="hidden" name="barcodemode" value="barcodeforlotserial" id="barcodeforlotserial">';

-		} else {	// $mode = 'all'

-			$out .= '<input type="radio" name="barcodemode" value="barcodeforautodetect" id="barcodeforautodetect" checked="checked"> <label for="barcodeforautodetect">Autodetect if we scan a product barcode or a lot/serial barcode</label><br>';

-			$out .= '<input type="radio" name="barcodemode" value="barcodeforproduct" id="barcodeforproduct"> <label for="barcodeforproduct">Scan a product barcode</label><br>';

-			$out .= '<input type="radio" name="barcodemode" value="barcodeforlotserial" id="barcodeforlotserial"> <label for="barcodeforlotserial">Scan a product lot or serial number</label><br>';

-		}

-		$stringaddbarcode = $langs->trans("QtyToAddAfterBarcodeScan", "tmphtml");

-		$htmltoreplaceby = '<select name="selectaddorreplace"><option selected value="add">'.$langs->trans("Add").'</option><option value="replace">'.$langs->trans("ToReplace").'</option></select>';

-		$stringaddbarcode = str_replace("tmphtml", $htmltoreplaceby, $stringaddbarcode);

-		$out .= $stringaddbarcode.': <input type="text" name="barcodeproductqty" class="width40 right" value="1"><br>';

-		if ($warehouseselect > 0) {

-			require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';

-			$formproduct = new FormProduct($this->db);

-			$formproduct->loadWarehouses();

-			$out .= img_picto('', 'stock', 'class="pictofixedwidth"');

-			$out .= $formproduct->selectWarehouses('', "warehousenew", '', 0, 0, 0, '', 0, 1);

-			$out .= '<br>';

-			$out .= '<br>';

-		}

-		$out .= '<textarea type="text" name="barcodelist" class="centpercent" autofocus rows="'.ROWS_3.'" placeholder="'.dol_escape_htmltag($langs->trans("ScanOrTypeOrCopyPasteYourBarCodes")).'"></textarea>';

-

-		/*print '<br>'.$langs->trans("or").'<br>';

-

-		print '<br>';

-

-		print '<input type="text" name="barcodelotserial" class="width200"> &nbsp; &nbsp; Qty <input type="text" name="barcodelotserialqty" class="width50 right" value="1"><br>';

-		*/

-		$out .= '<br>';

-		$out .= '<center>';

-		$out .= '<input type="submit" class="button marginleftonly marginrightonly" id ="exec'.dol_escape_js($jstoexecuteonadd).'" name="addscan" value="'.dol_escape_htmltag($langs->trans("Add")).'">';

-		$out .= '<input type="submit" class="button marginleftonly marginrightonly" name="cancel" value="'.dol_escape_htmltag($langs->trans("CloseWindow")).'">';

-		$out .= '</center>';

-		$out .= '<br>';

-		$out .= '<div type="text" id="scantoolmessage" class="scantoolmessage ok nopadding"></div>';

-

-		$out .= '<script nonce="'.getNonce().'">';

-		$out .= 'jQuery("#barcodeforautodetect, #barcodeforproduct, #barcodeforlotserial").click(function(){';

-		$out .= 'console.log("select choice");';

-		$out .= 'jQuery("#scantoolmessage").text("");';

-		$out .= '});'."\n";

-		$out .= '$("#exec'.dol_escape_js($jstoexecuteonadd).'").click(function(){

-			console.log("We call js to execute \''.dol_escape_js($jstoexecuteonadd).'\'");

-			'.dol_escape_js($jstoexecuteonadd).'();

-			return false;	/* We want to stay on the scan tool */

-		})';

-		$out .= '</script>';

-

-		$out .= '</center>';

-		$out .= '</div>';

-

-		return $out;

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 *    Return HTML select list of export models

-	 *

-	 *    @param    string	$selected          Id modele pre-selectionne

-	 *    @param    string	$htmlname          Nom de la zone select

-	 *    @param    string	$type              Type des modeles recherches

-	 *    @param    int		$useempty          Show an empty value in list

-	 *    @param    int		$fk_user           User we want templates

-	 *    @return	void

-	 */

-	public function select_export_model($selected = '', $htmlname = 'exportmodelid', $type = '', $useempty = 0, $fk_user = null)

-	{

-		// phpcs:enable

-		global $conf, $langs, $user;

-

-		$sql = "SELECT rowid, label, fk_user";

-		$sql .= " FROM ".$this->db->prefix()."export_model";

-		$sql .= " WHERE type = '".$this->db->escape($type)."'";

-		if (!getDolGlobalString('EXPORTS_SHARE_MODELS')) {	// EXPORTS_SHARE_MODELS means all templates are visible, whatever is owner.

-			$sql .= " AND fk_user IN (0, ".((int) $fk_user).")";

-		}

-		$sql .= " ORDER BY label";

-		$result = $this->db->query($sql);

-		if ($result) {

-			print '<select class="flat minwidth200" name="'.$htmlname.'" id="'.$htmlname.'">';

-			if ($useempty) {

-				print '<option value="-1">&nbsp;</option>';

-			}

-

-			$tmpuser = new User($this->db);

-

-			$num = $this->db->num_rows($result);

-			$i = 0;

-			while ($i < $num) {

-				$obj = $this->db->fetch_object($result);

-

-				$label = $obj->label;

-				if ($obj->fk_user == 0) {

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

-				} elseif ($obj->fk_user > 0) {

-					$tmpuser->fetch($obj->fk_user);

-					$label .= ' <span class="opacitymedium">('.$tmpuser->getFullName($langs).')</span>';

-				}

-

-				if ($selected == $obj->rowid) {

-					print '<option value="'.$obj->rowid.'" selected data-html="'.dol_escape_htmltag($label).'">';

-				} else {

-					print '<option value="'.$obj->rowid.'" data-html="'.dol_escape_htmltag($label).'">';

-				}

-				print $label;

-				print '</option>';

-				$i++;

-			}

-			print "</select>";

-			print ajax_combobox($htmlname);

-		} else {

-			dol_print_error($this->db);

-		}

-	}

-

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 *    Return list of export models

-	 *

-	 *    @param    string	$selected          Id modele pre-selectionne

-	 *    @param    string	$htmlname          Nom de la zone select

-	 *    @param    string	$type              Type des modeles recherches

-	 *    @param    int		$useempty          Affiche valeur vide dans liste

-	 *    @param    int		$fk_user           User that has created the template

-	 *    @return	void

-	 */

-	public function select_import_model($selected = '', $htmlname = 'importmodelid', $type = '', $useempty = 0, $fk_user = null)

-	{

-		// phpcs:enable

-		global $conf, $langs, $user;

-

-		$sql = "SELECT rowid, label, fk_user";

-		$sql .= " FROM ".$this->db->prefix()."import_model";

-		$sql .= " WHERE type = '".$this->db->escape($type)."'";

-		if (!getDolGlobalString('EXPORTS_SHARE_MODELS')) {	// EXPORTS_SHARE_MODELS means all templates are visible, whatever is owner.

-			$sql .= " AND fk_user IN (0, ".((int) $fk_user).")";

-		}

-		$sql .= " ORDER BY label";

-		$result = $this->db->query($sql);

-		if ($result) {

-			print '<select class="flat minwidth200" name="'.$htmlname.'" id="'.$htmlname.'">';

-			if ($useempty) {

-				print '<option value="-1">&nbsp;</option>';

-			}

-

-			$tmpuser = new User($this->db);

-

-			$num = $this->db->num_rows($result);

-			$i = 0;

-			while ($i < $num) {

-				$obj = $this->db->fetch_object($result);

-

-				$label = $obj->label;

-				if ($obj->fk_user == 0) {

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

-				} elseif ($obj->fk_user > 0) {

-					$tmpuser->fetch($obj->fk_user);

-					$label .= ' <span class="opacitymedium">('.$tmpuser->getFullName($langs).')</span>';

-				}

-

-				if ($selected == $obj->rowid) {

-					print '<option value="'.$obj->rowid.'" selected data-html="'.dol_escape_htmltag($label).'">';

-				} else {

-					print '<option value="'.$obj->rowid.'" data-html="'.dol_escape_htmltag($label).'">';

-				}

-				print $label;

-				print '</option>';

-				$i++;

-			}

-			print "</select>";

-			print ajax_combobox($htmlname);

-		} else {

-			dol_print_error($this->db);

-		}

-	}

-

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 *    Return list of ecotaxes with label

-	 *

-	 *    @param	string	$selected   Preselected ecotaxes

-	 *    @param    string	$htmlname	Name of combo list

-	 *    @return	integer

-	 */

-	public function select_ecotaxes($selected = '', $htmlname = 'ecotaxe_id')

-	{

-		// phpcs:enable

-		global $langs;

-

-		$sql = "SELECT e.rowid, e.code, e.label, e.price, e.organization,";

-		$sql .= " c.label as country";

-		$sql .= " FROM ".$this->db->prefix()."c_ecotaxe as e,".$this->db->prefix()."c_country as c";

-		$sql .= " WHERE e.active = 1 AND e.fk_pays = c.rowid";

-		$sql .= " ORDER BY country, e.organization ASC, e.code ASC";

-

-		dol_syslog(get_class($this).'::select_ecotaxes', LOG_DEBUG);

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

-		if ($resql) {

-			print '<select class="flat" name="'.$htmlname.'">';

-			$num = $this->db->num_rows($resql);

-			$i = 0;

-			print '<option value="-1">&nbsp;</option>'."\n";

-			if ($num) {

-				while ($i < $num) {

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

-					if ($selected && $selected == $obj->rowid) {

-						print '<option value="'.$obj->rowid.'" selected>';

-					} else {

-						print '<option value="'.$obj->rowid.'">';

-						//print '<option onmouseover="showtip(\''.$obj->label.'\')" onMouseout="hidetip()" value="'.$obj->rowid.'">';

+    /**

+     *	Constructor

+     *

+     *	@param	DoliDB		$db      Database handler

+     */

+    public function __construct($db)

+    {

+        $this->db = $db;

+    }

+

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     *    Return HTML select list of export models

+     *

+     *    @param    string	$selected          Id modele pre-selectionne

+     *    @param    string	$htmlname          Nom de la zone select

+     *    @param    string	$type              Type des modeles recherches

+     *    @param    int		$useempty          Show an empty value in list

+     *    @param    int		$fk_user           User that has created the template (this is set to null to get all export model when EXPORTS_SHARE_MODELS is on)

+     *    @return	void

+     */

+    public function select_export_model($selected = '', $htmlname = 'exportmodelid', $type = '', $useempty = 0, $fk_user = null)

+    {

+        // phpcs:enable

+        global $conf, $langs, $user;

+

+    	$sql = "SELECT rowid, label, fk_user";

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

+        $sql .= " WHERE type = '".$this->db->escape($type)."'";

+		if (!empty($fk_user)) $sql .= " AND fk_user IN (0, ".$fk_user.")"; // An export model

+        $sql .= " ORDER BY label";

+        $result = $this->db->query($sql);

+        if ($result)

+        {

+            print '<select class="flat minwidth200" name="'.$htmlname.'" id="'.$htmlname.'">';

+            if ($useempty)

+            {

+                print '<option value="-1">&nbsp;</option>';

+            }

+

+            $num = $this->db->num_rows($result);

+            $i = 0;

+            while ($i < $num)

+            {

+                $obj = $this->db->fetch_object($result);

+

+                $label = $obj->label;

+                if ($obj->fk_user == 0) {

+                	$label .= ' <span class="opacitymedium">('.$langs->trans("Everybody").')</span>';

+                }

+                elseif (!empty($conf->global->EXPORTS_SHARE_MODELS) && empty($fk_user) && is_object($user) && $user->id != $obj->fk_user) {

+                	$tmpuser = new User($this->db);

+                	$tmpuser->fetch($obj->fk_user);

+                	$label .= ' <span class="opacitymedium">('.$tmpuser->getFullName($langs).')</span>';

+                }

+

+                if ($selected == $obj->rowid)

+                {

+                    print '<option value="'.$obj->rowid.'" selected data-html="'.dol_escape_htmltag($label).'">';

+                }

+                else

+                {

+                    print '<option value="'.$obj->rowid.'" data-html="'.dol_escape_htmltag($label).'">';

+                }

+                print $label;

+                print '</option>';

+                $i++;

+            }

+            print "</select>";

+            print ajax_combobox($htmlname);

+        }

+        else {

+            dol_print_error($this->db);

+        }

+    }

+

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     *    Return list of export models

+     *

+     *    @param    string	$selected          Id modele pre-selectionne

+     *    @param    string	$htmlname          Nom de la zone select

+     *    @param    string	$type              Type des modeles recherches

+     *    @param    int		$useempty          Affiche valeur vide dans liste

+     *    @param    int		$fk_user           User that has created the template (this is set to null to get all export model when EXPORTS_SHARE_MODELS is on)

+     *    @return	void

+     */

+    public function select_import_model($selected = '', $htmlname = 'importmodelid', $type = '', $useempty = 0, $fk_user = null)

+    {

+        // phpcs:enable

+    	global $conf, $langs, $user;

+

+        $sql = "SELECT rowid, label, fk_user";

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

+        $sql .= " WHERE type = '".$this->db->escape($type)."'";

+        if (!empty($fk_user)) $sql .= " AND fk_user IN (0, ".$fk_user.")"; // An export model

+        $sql .= " ORDER BY rowid";

+        $result = $this->db->query($sql);

+        if ($result)

+        {

+            print '<select class="flat minwidth200" name="'.$htmlname.'" id="'.$htmlname.'">';

+            if ($useempty)

+            {

+                print '<option value="-1">&nbsp;</option>';

+            }

+

+            $num = $this->db->num_rows($result);

+            $i = 0;

+            while ($i < $num)

+            {

+                $obj = $this->db->fetch_object($result);

+

+                $label = $obj->label;

+                if ($obj->fk_user == 0) {

+                	$label .= ' <span class="opacitymedium">('.$langs->trans("Everybody").')</span>';

+                }

+                elseif (!empty($conf->global->EXPORTS_SHARE_MODELS) && empty($fk_user) && is_object($user) && $user->id != $obj->fk_user) {

+                	$tmpuser = new User($this->db);

+                	$tmpuser->fetch($obj->fk_user);

+                	$label .= ' <span class="opacitymedium">('.$tmpuser->getFullName($langs).')</span>';

+                }

+

+                if ($selected == $obj->rowid)

+                {

+                    print '<option value="'.$obj->rowid.'" selected data-html="'.dol_escape_htmltag($label).'">';

+                }

+                else

+                {

+                    print '<option value="'.$obj->rowid.'" data-html="'.dol_escape_htmltag($label).'">';

+                }

+                print $label;

+                print '</option>';

+                $i++;

+            }

+            print "</select>";

+            print ajax_combobox($htmlname);

+        }

+        else {

+            dol_print_error($this->db);

+        }

+    }

+

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     *    Return list of ecotaxes with label

+     *

+     *    @param	string	$selected   Preselected ecotaxes

+     *    @param    string	$htmlname	Name of combo list

+     *    @return	integer

+     */

+    public function select_ecotaxes($selected = '', $htmlname = 'ecotaxe_id')

+    {

+        // phpcs:enable

+        global $langs;

+

+        $sql = "SELECT e.rowid, e.code, e.label, e.price, e.organization,";

+        $sql .= " c.label as country";

+        $sql .= " FROM ".MAIN_DB_PREFIX."c_ecotaxe as e,".MAIN_DB_PREFIX."c_country as c";

+        $sql .= " WHERE e.active = 1 AND e.fk_pays = c.rowid";

+        $sql .= " ORDER BY country, e.organization ASC, e.code ASC";

+

+    	dol_syslog(get_class($this).'::select_ecotaxes', LOG_DEBUG);

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

+        if ($resql)

+        {

+            print '<select class="flat" name="'.$htmlname.'">';

+            $num = $this->db->num_rows($resql);

+            $i = 0;

+            print '<option value="-1">&nbsp;</option>'."\n";

+            if ($num)

+            {

+                while ($i < $num)

+                {

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

+                    if ($selected && $selected == $obj->rowid)

+                    {

+                        print '<option value="'.$obj->rowid.'" selected>';

+                    }

+                    else

+                    {

+                        print '<option value="'.$obj->rowid.'">';

+                        //print '<option onmouseover="showtip(\''.$obj->label.'\')" onMouseout="hidetip()" value="'.$obj->rowid.'">';

+                    }

+                    $selectOptionValue = $obj->code.' - '.$obj->label.' : '.price($obj->price).' '.$langs->trans("HT").' ('.$obj->organization.')';

+                    print $selectOptionValue;

+                    print '</option>';

+                    $i++;

+                }

+            }

+            print '</select>';

+            return 0;

+        }

+        else

+        {

+            dol_print_error($this->db);

+            return 1;

+        }

+    }

+

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     *    Return list of revenue stamp for country

+     *

+     *    @param	string	$selected   	Value of preselected revenue stamp

+     *    @param    string	$htmlname   	Name of combo list

+     *    @param    string	$country_code   Country Code

+     *    @return	string					HTML select list

+     */

+    public function select_revenue_stamp($selected = '', $htmlname = 'revenuestamp', $country_code = '')

+    {

+        // phpcs:enable

+    	global $langs;

+

+    	$out = '';

+

+    	$sql = "SELECT r.taux, r.revenuestamp_type";

+    	$sql .= " FROM ".MAIN_DB_PREFIX."c_revenuestamp as r,".MAIN_DB_PREFIX."c_country as c";

+    	$sql .= " WHERE r.active = 1 AND r.fk_pays = c.rowid";

+    	$sql .= " AND c.code = '".$country_code."'";

+

+    	dol_syslog(get_class($this).'::select_revenue_stamp', LOG_DEBUG);

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

+    	if ($resql)

+    	{

+    		$out .= '<select class="flat" name="'.$htmlname.'">';

+    		$num = $this->db->num_rows($resql);

+    		$i = 0;

+    		$out .= '<option value="0">&nbsp;</option>'."\n";

+    		if ($num)

+    		{

+    			while ($i < $num)

+    			{

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

+    				if (($selected && $selected == $obj->taux) || $num == 1)

+    				{

+    					$out .= '<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').' selected>';

+    				}

+    				else

+    				{

+    					$out .= '<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').'>';

+    					//print '<option onmouseover="showtip(\''.$obj->libelle.'\')" onMouseout="hidetip()" value="'.$obj->rowid.'">';

+    				}

+    				$out .= $obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '');

+    				$out .= '</option>';

+    				$i++;

+    			}

+    		}

+    		$out .= '</select>';

+    		return $out;

+    	}

+    	else

+    	{

+    		dol_print_error($this->db);

+    		return '';

+    	}

+    }

+

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     *    Return a HTML select list to select a percent

+     *

+     *    @param	integer	$selected      	pourcentage pre-selectionne

+     *    @param    string	$htmlname      	nom de la liste deroulante

+     *    @param	int		$disabled		Disabled or not

+     *    @param    int		$increment     	increment value

+     *    @param    int		$start         	start value

+     *    @param    int		$end           	end value

+     *    @param    int     $showempty      Add also an empty line

+     *    @return   string					HTML select string

+     */

+    public function select_percent($selected = 0, $htmlname = 'percent', $disabled = 0, $increment = 5, $start = 0, $end = 100, $showempty = 0)

+    {

+        // phpcs:enable

+        $return = '<select class="flat" name="'.$htmlname.'" '.($disabled ? 'disabled' : '').'>';

+        if ($showempty) $return .= '<option value="-1"'.(($selected == -1 || $selected == '') ? ' selected' : '').'>&nbsp;</option>';

+

+        for ($i = $start; $i <= $end; $i += $increment)

+        {

+            if ($selected != '' && (int) $selected == $i)

+            {

+                $return .= '<option value="'.$i.'" selected>';

+            }

+            else

+            {

+                $return .= '<option value="'.$i.'">';

+            }

+            $return .= $i.' % ';

+            $return .= '</option>';

+        }

+

+        $return .= '</select>';

+

+        return $return;

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     * Return select list for categories (to use in form search selectors)

+     *

+     * @param	int		$type			Type of category ('customer', 'supplier', 'contact', 'product', 'member'). Old mode (0, 1, 2, ...) is deprecated.

+     * @param   integer	$selected     	Preselected value

+     * @param   string	$htmlname      	Name of combo list

+     * @param	int		$nocateg		Show also an entry "Not categorized"

+     * @param   int     $showempty      Add also an empty line

+     * @param   string  $morecss        More CSS

+     * @return  string		        	Html combo list code

+     * @see	select_all_categories()

+     */

+    public function select_categories($type, $selected = 0, $htmlname = 'search_categ', $nocateg = 0, $showempty = 1, $morecss = '')

+    {

+        // phpcs:enable

+        global $conf, $langs;

+        require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';

+

+        // For backward compatibility

+        if (is_numeric($type))

+        {

+            dol_syslog(__METHOD__.': using numeric value for parameter type is deprecated. Use string code instead.', LOG_WARNING);

+        }

+

+        // Load list of "categories"

+        $static_categs = new Categorie($this->db);

+        $tab_categs = $static_categs->get_full_arbo($type);

+

+        $moreforfilter = '';

+        // Enhance with select2

+        if ($conf->use_javascript_ajax)

+        {

+            include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

+            $comboenhancement = ajax_combobox('select_categ_'.$htmlname);

+            $moreforfilter .= $comboenhancement;

+        }

+

+        // Print a select with each of them

+        $moreforfilter .= '<select class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" id="select_categ_'.$htmlname.'" name="'.$htmlname.'">';

+        if ($showempty) $moreforfilter .= '<option value="0">&nbsp;</option>'; // Should use -1 to say nothing

+

+        if (is_array($tab_categs))

+        {

+            foreach ($tab_categs as $categ)

+            {

+                $moreforfilter .= '<option value="'.$categ['id'].'"';

+                if ($categ['id'] == $selected) $moreforfilter .= ' selected';

+                $moreforfilter .= '>'.dol_trunc($categ['fulllabel'], 50, 'middle').'</option>';

+            }

+        }

+        if ($nocateg)

+        {

+        	$langs->load("categories");

+        	$moreforfilter .= '<option value="-2"'.($selected == -2 ? ' selected' : '').'>- '.$langs->trans("NotCategorized").' -</option>';

+        }

+        $moreforfilter .= '</select>';

+

+        return $moreforfilter;

+    }

+

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     *  Return select list for categories (to use in form search selectors)

+     *

+     *  @param	string	$selected     		Preselected value

+     *  @param  string	$htmlname      		Name of combo list (example: 'search_sale')

+     *  @param  User	$user           	Object user

+     *  @param	int		$showstatus			0=show user status only if status is disabled, 1=always show user status into label, -1=never show user status

+     *  @param	int		$showempty			1=show also an empty value

+     *  @param	string	$morecss			More CSS

+     *  @param	int		$norepresentative	Show also an entry "Not categorized"

+     *  @return string						Html combo list code

+     */

+    public function select_salesrepresentatives($selected, $htmlname, $user, $showstatus = 0, $showempty = 1, $morecss = '', $norepresentative = 0)

+    {

+        // phpcs:enable

+        global $conf, $langs, $hookmanager;

+

+        $langs->load('users');

+

+        $out = '';

+        // Enhance with select2

+        if ($conf->use_javascript_ajax)

+        {

+            include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

+

+            $comboenhancement = ajax_combobox($htmlname);

+            if ($comboenhancement)

+            {

+            	$out .= $comboenhancement;

+            }

+        }

+

+	    $reshook = $hookmanager->executeHooks('addSQLWhereFilterOnSelectSalesRep', array(), $this, $action);

+

+        // Select each sales and print them in a select input

+        $out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'">';

+        if ($showempty) $out .= '<option value="0">&nbsp;</option>';

+

+        // Get list of users allowed to be viewed

+        $sql_usr = "SELECT u.rowid, u.lastname, u.firstname, u.statut, u.login";

+        $sql_usr .= " FROM ".MAIN_DB_PREFIX."user as u";

+

+        if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))

+        {

+        	if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {

+        		$sql_usr .= " WHERE u.entity IS NOT NULL"; // Show all users

+        	} else {

+        		$sql_usr .= " WHERE EXISTS (SELECT ug.fk_user FROM ".MAIN_DB_PREFIX."usergroup_user as ug WHERE u.rowid = ug.fk_user AND ug.entity IN (".getEntity('usergroup')."))";

+        		$sql_usr .= " OR u.entity = 0"; // Show always superadmin

+        	}

+        }

+        else

+        {

+        	$sql_usr .= " WHERE u.entity IN (".getEntity('user').")";

+        }

+

+        if (empty($user->rights->user->user->lire)) $sql_usr .= " AND u.rowid = ".$user->id;

+        if (!empty($user->socid)) $sql_usr .= " AND u.fk_soc = ".$user->socid;

+

+	    //Add hook to filter on user (for exemple on usergroup define in custom modules)

+	    if (!empty($reshook)) $sql_usr .= $hookmanager->resArray[0];

+

+        // Add existing sales representatives of thirdparty of external user

+        if (empty($user->rights->user->user->lire) && $user->socid)

+        {

+            $sql_usr .= " UNION ";

+            $sql_usr .= "SELECT u2.rowid, u2.lastname, u2.firstname, u2.statut, u2.login";

+            $sql_usr .= " FROM ".MAIN_DB_PREFIX."user as u2, ".MAIN_DB_PREFIX."societe_commerciaux as sc";

+

+            if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))

+            {

+            	if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {

+            		$sql_usr .= " WHERE u2.entity IS NOT NULL"; // Show all users

+            	} else {

+            		$sql_usr .= " WHERE EXISTS (SELECT ug2.fk_user FROM ".MAIN_DB_PREFIX."usergroup_user as ug2 WHERE u2.rowid = ug2.fk_user AND ug2.entity IN (".getEntity('usergroup')."))";

+            	}

+            }

+            else

+            {

+            	$sql_usr .= " WHERE u2.entity IN (".getEntity('user').")";

+            }

+

+            $sql_usr .= " AND u2.rowid = sc.fk_user AND sc.fk_soc=".$user->socid;

+

+	        //Add hook to filter on user (for exemple on usergroup define in custom modules)

+	        if (!empty($reshook)) $sql_usr .= $hookmanager->resArray[1];

+        }

+	    $sql_usr .= " ORDER BY statut DESC, lastname ASC"; // Do not use 'ORDER BY u.statut' here, not compatible with the UNION.

+        //print $sql_usr;exit;

+

+        $resql_usr = $this->db->query($sql_usr);

+        if ($resql_usr)

+        {

+            while ($obj_usr = $this->db->fetch_object($resql_usr))

+            {

+                $out .= '<option value="'.$obj_usr->rowid.'"';

+

+                if ($obj_usr->rowid == $selected) $out .= ' selected';

+

+                $out .= '>';

+                $out .= dolGetFirstLastname($obj_usr->firstname, $obj_usr->lastname);

+                // Complete name with more info

+                $moreinfo = 0;

+                if (!empty($conf->global->MAIN_SHOW_LOGIN))

+                {

+                    $out .= ($moreinfo ? ' - ' : ' (').$obj_usr->login;

+                    $moreinfo++;

+                }

+                if ($showstatus >= 0)

+                {

+					if ($obj_usr->statut == 1 && $showstatus == 1)

+					{

+						$out .= ($moreinfo ? ' - ' : ' (').$langs->trans('Enabled');

+	                	$moreinfo++;

@@ -293,316 +527,2 @@
-					$selectOptionValue = $obj->code.' - '.$obj->label.' : '.price($obj->price).' '.$langs->trans("HT").' ('.$obj->organization.')';

-					print $selectOptionValue;

-					print '</option>';

-					$i++;

-				}

-			}

-			print '</select>';

-			return 0;

-		} else {

-			dol_print_error($this->db);

-			return 1;

-		}

-	}

-

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 *    Return list of revenue stamp for country

-	 *

-	 *    @param	string	$selected   	Value of preselected revenue stamp

-	 *    @param    string	$htmlname   	Name of combo list

-	 *    @param    string	$country_code   Country Code

-	 *    @return	string					HTML select list

-	 */

-	public function select_revenue_stamp($selected = '', $htmlname = 'revenuestamp', $country_code = '')

-	{

-		// phpcs:enable

-		global $langs;

-

-		$out = '';

-

-		$sql = "SELECT r.taux, r.revenuestamp_type";

-		$sql .= " FROM ".$this->db->prefix()."c_revenuestamp as r,".$this->db->prefix()."c_country as c";

-		$sql .= " WHERE r.active = 1 AND r.fk_pays = c.rowid";

-		$sql .= " AND c.code = '".$this->db->escape($country_code)."'";

-

-		dol_syslog(get_class($this).'::select_revenue_stamp', LOG_DEBUG);

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

-		if ($resql) {

-			$out .= '<select class="flat" name="'.$htmlname.'">';

-			$num = $this->db->num_rows($resql);

-			$i = 0;

-			$out .= '<option value="0">&nbsp;</option>'."\n";

-			if ($num) {

-				while ($i < $num) {

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

-					if (($selected && $selected == $obj->taux) || $num == 1) {

-						$out .= '<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').' selected>';

-					} else {

-						$out .= '<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').'>';

-					}

-					$out .= $obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '');

-					$out .= '</option>';

-					$i++;

-				}

-			}

-			$out .= '</select>';

-			return $out;

-		} else {

-			dol_print_error($this->db);

-			return '';

-		}

-	}

-

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 *    Return a HTML select list to select a percent

-	 *

-	 *    @param	integer	$selected      	pourcentage pre-selectionne

-	 *    @param    string	$htmlname      	nom de la liste deroulante

-	 *    @param	int		$disabled		Disabled or not

-	 *    @param    int		$increment     	increment value

-	 *    @param    int		$start         	start value

-	 *    @param    int		$end           	end value

-	 *    @param    int     $showempty      Add also an empty line

-	 *    @return   string					HTML select string

-	 */

-	public function select_percent($selected = 0, $htmlname = 'percent', $disabled = 0, $increment = 5, $start = 0, $end = 100, $showempty = 0)

-	{

-		// phpcs:enable

-		$return = '<select class="flat maxwidth75 right" name="'.$htmlname.'" '.($disabled ? 'disabled' : '').'>';

-		if ($showempty) {

-			$return .= '<option value="-1"'.(($selected == -1 || $selected == '') ? ' selected' : '').'>&nbsp;</option>';

-		}

-

-		for ($i = $start; $i <= $end; $i += $increment) {

-			if ($selected != '' && (int) $selected == $i) {

-				$return .= '<option value="'.$i.'" selected>';

-			} else {

-				$return .= '<option value="'.$i.'">';

-			}

-			$return .= $i.' % ';

-			$return .= '</option>';

-		}

-

-		$return .= '</select>';

-

-		return $return;

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 * Return select list for categories (to use in form search selectors)

-	 *

-	 * @param	int			$type			Type of category ('customer', 'supplier', 'contact', 'product', 'member'). Old mode (0, 1, 2, ...) is deprecated.

-	 * @param   integer		$selected     	Preselected value

-	 * @param   string		$htmlname      	Name of combo list

-	 * @param	int			$nocateg		Show also an entry "Not categorized"

-	 * @param   int|string  $showempty      Add also an empty line

-	 * @param   string  	$morecss        More CSS

-	 * @return  string			        	Html combo list code

-	 * @see	select_all_categories()

-	 */

-	public function select_categories($type, $selected = 0, $htmlname = 'search_categ', $nocateg = 0, $showempty = 1, $morecss = '')

-	{

-		// phpcs:enable

-		global $conf, $langs;

-		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';

-

-		// For backward compatibility

-		if (is_numeric($type)) {

-			dol_syslog(__METHOD__.': using numeric value for parameter type is deprecated. Use string code instead.', LOG_WARNING);

-		}

-

-		// Load list of "categories"

-		$static_categs = new Categorie($this->db);

-		$tab_categs = $static_categs->get_full_arbo($type);

-

-		$moreforfilter = '';

-

-		// Print a select with each of them

-		$moreforfilter .= '<select class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" id="select_categ_'.$htmlname.'" name="'.$htmlname.'">';

-		if ($showempty) {

-			$textforempty = ' ';

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

-				$textforempty = '&nbsp;'; // If we use ajaxcombo, we need &nbsp; here to avoid to have an empty element that is too small.

-			}

-			if (!is_numeric($showempty)) {

-				$textforempty = $showempty;

-			}

-			$moreforfilter .= '<option class="optiongrey" value="'.($showempty < 0 ? $showempty : -1).'"'.($selected == $showempty ? ' selected' : '');

-			//$moreforfilter .= ' data-html="'.dol_escape_htmltag($textforempty).'"';

-			$moreforfilter .= '>'.dol_escape_htmltag($textforempty).'</option>'."\n";

-		}

-

-		if (is_array($tab_categs)) {

-			foreach ($tab_categs as $categ) {

-				$moreforfilter .= '<option value="'.$categ['id'].'"';

-				if ($categ['id'] == $selected) {

-					$moreforfilter .= ' selected';

-				}

-				$moreforfilter .= ' data-html="'.dol_escape_htmltag(img_picto('', 'category', 'class="pictofixedwidth" style="color: #'.$categ['color'].'"').dol_trunc($categ['fulllabel'], 50, 'middle')).'"';

-				$moreforfilter .= '>'.dol_trunc($categ['fulllabel'], 50, 'middle').'</option>';

-			}

-		}

-		if ($nocateg) {

-			$langs->load("categories");

-			$moreforfilter .= '<option value="-2"'.($selected == -2 ? ' selected' : '').'>- '.$langs->trans("NotCategorized").' -</option>';

-		}

-		$moreforfilter .= '</select>';

-

-		// Enhance with select2

-		if ($conf->use_javascript_ajax) {

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

-			$comboenhancement = ajax_combobox('select_categ_'.$htmlname);

-			$moreforfilter .= $comboenhancement;

-		}

-

-		return $moreforfilter;

-	}

-

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 *  Return select list for categories (to use in form search selectors)

-	 *

-	 *  @param	string		$selected     		Preselected value

-	 *  @param  string		$htmlname      		Name of combo list (example: 'search_sale')

-	 *  @param  User		$user           	Object user

-	 *  @param	int			$showstatus			0=show user status only if status is disabled, 1=always show user status into label, -1=never show user status

-	 *  @param	int|string	$showempty			1=show also an empty value or text to show for empty

-	 *  @param	string		$morecss			More CSS

-	 *  @param	int			$norepresentative	Show also an entry "Not categorized"

-	 *  @return string							Html combo list code

-	 */

-	public function select_salesrepresentatives($selected, $htmlname, $user, $showstatus = 0, $showempty = 1, $morecss = '', $norepresentative = 0)

-	{

-		// phpcs:enable

-		global $conf, $langs, $hookmanager;

-		global $action;

-

-		$langs->load('users');

-

-		$out = '';

-

-		$reshook = $hookmanager->executeHooks('addSQLWhereFilterOnSelectSalesRep', array(), $this, $action);

-

-		// Select each sales and print them in a select input

-		$out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'">';

-		if ($showempty) {

-			$textforempty = ' ';

-			if (!is_numeric($showempty)) {

-				$textforempty = $showempty;

-			}

-			if (!empty($conf->use_javascript_ajax) && $textforempty == ' ') {

-				$textforempty = '&nbsp;'; // If we use ajaxcombo, we need &nbsp; here to avoid to have an empty element that is too small.

-			}

-			$out .= '<option class="optiongrey" value="'.($showempty < 0 ? $showempty : -1).'"'.($selected == $showempty ? ' selected' : '').'>'.$textforempty.'</option>'."\n";

-		}

-

-		// Get list of users allowed to be viewed

-		$sql_usr = "SELECT u.rowid, u.lastname, u.firstname, u.statut as status, u.login, u.photo, u.gender, u.entity, u.admin";

-		$sql_usr .= " FROM ".$this->db->prefix()."user as u";

-

-		if (getDolGlobalInt('MULTICOMPANY_TRANSVERSE_MODE')) {

-			if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {

-				$sql_usr .= " WHERE u.entity IS NOT NULL"; // Show all users

-			} else {

-				$sql_usr .= " WHERE EXISTS (SELECT ug.fk_user FROM ".$this->db->prefix()."usergroup_user as ug WHERE u.rowid = ug.fk_user AND ug.entity IN (".getEntity('usergroup')."))";

-				$sql_usr .= " OR u.entity = 0"; // Show always superadmin

-			}

-		} else {

-			$sql_usr .= " WHERE u.entity IN (".getEntity('user').")";

-		}

-

-		if (!$user->hasRight('user', 'user', 'lire')) {

-			$sql_usr .= " AND u.rowid = ".((int) $user->id);

-		}

-		if (!empty($user->socid)) {

-			$sql_usr .= " AND u.fk_soc = ".((int) $user->socid);

-		}

-

-		//Add hook to filter on user (for exemple on usergroup define in custom modules)

-		if (!empty($reshook)) {

-			$sql_usr .= $hookmanager->resArray[0];

-		}

-

-		// Add existing sales representatives of thirdparty of external user

-		if (!$user->hasRight('user', 'user', 'lire') && $user->socid) {

-			$sql_usr .= " UNION ";

-			$sql_usr .= "SELECT u2.rowid, u2.lastname, u2.firstname, u2.statut as status, u2.login, u2.photo, u2.gender, u2.entity, u2.admin";

-			$sql_usr .= " FROM ".$this->db->prefix()."user as u2, ".$this->db->prefix()."societe_commerciaux as sc";

-

-			if (getDolGlobalInt('MULTICOMPANY_TRANSVERSE_MODE')) {

-				if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {

-					$sql_usr .= " WHERE u2.entity IS NOT NULL"; // Show all users

-				} else {

-					$sql_usr .= " WHERE EXISTS (SELECT ug2.fk_user FROM ".$this->db->prefix()."usergroup_user as ug2 WHERE u2.rowid = ug2.fk_user AND ug2.entity IN (".getEntity('usergroup')."))";

-				}

-			} else {

-				$sql_usr .= " WHERE u2.entity IN (".getEntity('user').")";

-			}

-

-			$sql_usr .= " AND u2.rowid = sc.fk_user AND sc.fk_soc = ".((int) $user->socid);

-

-			//Add hook to filter on user (for exemple on usergroup define in custom modules)

-			if (!empty($reshook)) {

-				$sql_usr .= $hookmanager->resArray[1];

-			}

-		}

-

-		if (!getDolGlobalString('MAIN_FIRSTNAME_NAME_POSITION')) {	// MAIN_FIRSTNAME_NAME_POSITION is 0 means firstname+lastname

-			$sql_usr .= " ORDER BY status DESC, firstname ASC, lastname ASC";

-		} else {

-			$sql_usr .= " ORDER BY status DESC, lastname ASC, firstname ASC";

-		}

-		//print $sql_usr;exit;

-

-		$resql_usr = $this->db->query($sql_usr);

-		if ($resql_usr) {

-			$userstatic = new User($this->db);

-

-			while ($obj_usr = $this->db->fetch_object($resql_usr)) {

-				$userstatic->id = $obj_usr->rowid;

-				$userstatic->lastname = $obj_usr->lastname;

-				$userstatic->firstname = $obj_usr->firstname;

-				$userstatic->photo = $obj_usr->photo;

-				$userstatic->statut = $obj_usr->status;

-				$userstatic->entity = $obj_usr->entity;

-				$userstatic->admin = $obj_usr->admin;

-

-				$labeltoshow = dolGetFirstLastname($obj_usr->firstname, $obj_usr->lastname);

-				if (empty($obj_usr->firstname) && empty($obj_usr->lastname)) {

-					$labeltoshow = $obj_usr->login;

-				}

-

-				$out .= '<option value="'.$obj_usr->rowid.'"';

-				if ($obj_usr->rowid == $selected) {

-					$out .= ' selected';

-				}

-				$out .= ' data-html="';

-				$outhtml = $userstatic->getNomUrl(-3, '', 0, 1, 24, 1, 'login', '', 1).' ';

-				if ($showstatus >= 0 && $obj_usr->status == 0) {

-					$outhtml .= '<strike class="opacitymediumxxx">';

-				}

-				$outhtml .= $labeltoshow;

-				if ($showstatus >= 0 && $obj_usr->status == 0) {

-					$outhtml .= '</strike>';

-				}

-				$out .= dol_escape_htmltag($outhtml);

-				$out .= '">';

-

-				$out .= $labeltoshow;

-				// Complete name with more info

-				$moreinfo = 0;

-				if (getDolGlobalString('MAIN_SHOW_LOGIN')) {

-					$out .= ($moreinfo ? ' - ' : ' (').$obj_usr->login;

-					$moreinfo++;

-				}

-				if ($showstatus >= 0) {

-					if ($obj_usr->status == 1 && $showstatus == 1) {

-						$out .= ($moreinfo ? ' - ' : ' (').$langs->trans('Enabled');

-						$moreinfo++;

-					}

-					if ($obj_usr->status == 0) {

+					if ($obj_usr->statut == 0)

+					{

@@ -610 +530 @@
-						$moreinfo++;

+                		$moreinfo++;

@@ -614,38 +534,31 @@
-				$out .= '</option>';

-			}

-			$this->db->free($resql_usr);

-		} else {

-			dol_print_error($this->db);

-		}

-

-		if ($norepresentative) {

-			$langs->load("companies");

-			$out .= '<option value="-2"'.($selected == -2 ? ' selected' : '').'>- '.$langs->trans("NoSalesRepresentativeAffected").' -</option>';

-		}

-

-		$out .= '</select>';

-

-		// Enhance with select2

-		if ($conf->use_javascript_ajax) {

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

-

-			$comboenhancement = ajax_combobox($htmlname);

-			if ($comboenhancement) {

-				$out .= $comboenhancement;

-			}

-		}

-

-		return $out;

-	}

-

-	/**

-	 *	Return list of project and tasks

-	 *

-	 *	@param  int		$selectedtask   		Pre-selected task

-	 *  @param  int		$projectid				Project id

-	 * 	@param  string	$htmlname    			Name of html select

-	 * 	@param	int		$modeproject			1 to restrict on projects owned by user

-	 * 	@param	int		$modetask				1 to restrict on tasks associated to user

-	 * 	@param	int		$mode					0=Return list of tasks and their projects, 1=Return projects and tasks if exists

-	 *  @param  int		$useempty       		0=Allow empty values

-	 *  @param	int		$disablechildoftaskid	1=Disable task that are child of the provided task id

+                $out .= '</option>';

+            }

+            $this->db->free($resql_usr);

+        }

+        else

+        {

+            dol_print_error($this->db);

+        }

+

+        if ($norepresentative)

+        {

+        	$langs->load("companies");

+        	$out .= '<option value="-2"'.($selected == -2 ? ' selected' : '').'>- '.$langs->trans("NoSalesRepresentativeAffected").' -</option>';

+        }

+

+        $out .= '</select>';

+

+        return $out;

+    }

+

+    /**

+     *	Return list of project and tasks

+     *

+     *	@param  int		$selectedtask   		Pre-selected task

+     *  @param  int		$projectid				Project id

+     * 	@param  string	$htmlname    			Name of html select

+     * 	@param	int		$modeproject			1 to restrict on projects owned by user

+     * 	@param	int		$modetask				1 to restrict on tasks associated to user

+     * 	@param	int		$mode					0=Return list of tasks and their projects, 1=Return projects and tasks if exists

+     *  @param  int		$useempty       		0=Allow empty values

+     *  @param	int		$disablechildoftaskid	1=Disable task that are child of the provided task id

@@ -653,213 +566,192 @@
-	 *  @param	string	$morecss				More css

-	 *  @return	void

-	 */

-	public function selectProjectTasks($selectedtask = '', $projectid = 0, $htmlname = 'task_parent', $modeproject = 0, $modetask = 0, $mode = 0, $useempty = 0, $disablechildoftaskid = 0, $filteronprojstatus = '', $morecss = '')

-	{

-		global $user, $langs;

-

-		require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';

-

-		//print $modeproject.'-'.$modetask;

-		$task = new Task($this->db);

-		$tasksarray = $task->getTasksArray($modetask ? $user : 0, $modeproject ? $user : 0, $projectid, 0, $mode, '', $filteronprojstatus);

-		if ($tasksarray) {

-			print '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';

-			if ($useempty) {

-				print '<option value="0">&nbsp;</option>';

-			}

-			$j = 0;

-			$level = 0;

-			$this->_pLineSelect($j, 0, $tasksarray, $level, $selectedtask, $projectid, $disablechildoftaskid);

-			print '</select>';

-

-			print ajax_combobox($htmlname);

-		} else {

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

-		}

-	}

-

-	/**

-	 * Write lines of a project (all lines of a project if parent = 0)

-	 *

-	 * @param 	int		$inc					Cursor counter

-	 * @param 	int		$parent					Id of parent task we want to see

-	 * @param 	array	$lines					Array of task lines

-	 * @param 	int		$level					Level

-	 * @param 	int		$selectedtask			Id selected task

-	 * @param 	int		$selectedproject		Id selected project

-	 * @param	int		$disablechildoftaskid	1=Disable task that are child of the provided task id

-	 * @return	void

-	 */

-	private function _pLineSelect(&$inc, $parent, $lines, $level = 0, $selectedtask = 0, $selectedproject = 0, $disablechildoftaskid = 0)

-	{

-		global $langs, $user, $conf;

-

-		$lastprojectid = 0;

-

-		$numlines = count($lines);

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

-			if ($lines[$i]->fk_task_parent == $parent) {

-				//var_dump($selectedproject."--".$selectedtask."--".$lines[$i]->fk_project."_".$lines[$i]->id);		// $lines[$i]->id may be empty if project has no lines

-

-				// Break on a new project

-				if ($parent == 0) {	// We are on a task at first level

-					if ($lines[$i]->fk_project != $lastprojectid) {	// Break found on project

-						if ($i > 0) {

-							print '<option value="0" disabled>----------</option>';

-						}

-						print '<option value="'.$lines[$i]->fk_project.'_0"';

-						if ($selectedproject == $lines[$i]->fk_project) {

-							print ' selected';

-						}

-

-						$labeltoshow = $lines[$i]->projectref;

-						//$labeltoshow .= ' '.$lines[$i]->projectlabel;

-						if (empty($lines[$i]->public)) {

-							//$labeltoshow .= ' <span class="opacitymedium">('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')</span>';

-							$labeltoshow = img_picto($lines[$i]->projectlabel, 'project', 'class="pictofixedwidth"').$labeltoshow;

-						} else {

-							//$labeltoshow .= ' <span class="opacitymedium">('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')</span>';

-							$labeltoshow = img_picto($lines[$i]->projectlabel, 'projectpub', 'class="pictofixedwidth"').$labeltoshow;

-						}

-

-						print ' data-html="'.dol_escape_htmltag($labeltoshow).'"';

-						print '>'; // Project -> Task

-						print $labeltoshow;

-						print "</option>\n";

-

-						$lastprojectid = $lines[$i]->fk_project;

-						$inc++;

-					}

-				}

-

-				$newdisablechildoftaskid = $disablechildoftaskid;

-

-				// Print task

-				if (isset($lines[$i]->id)) {		// We use isset because $lines[$i]->id may be null if project has no task and are on root project (tasks may be caught by a left join). We enter here only if '0' or >0

-					// Check if we must disable entry

-					$disabled = 0;

-					if ($disablechildoftaskid && (($lines[$i]->id == $disablechildoftaskid || $lines[$i]->fk_task_parent == $disablechildoftaskid))) {

-						$disabled++;

-						if ($lines[$i]->fk_task_parent == $disablechildoftaskid) {

-							$newdisablechildoftaskid = $lines[$i]->id; // If task is child of a disabled parent, we will propagate id to disable next child too

-						}

-					}

-

-					print '<option value="'.$lines[$i]->fk_project.'_'.$lines[$i]->id.'"';

-					if (($lines[$i]->id == $selectedtask) || ($lines[$i]->fk_project.'_'.$lines[$i]->id == $selectedtask)) {

-						print ' selected';

-					}

-					if ($disabled) {

-						print ' disabled';

-					}

-

-					$labeltoshow = $lines[$i]->projectref;

-					//$labeltoshow .= ' '.$lines[$i]->projectlabel;

-					if (empty($lines[$i]->public)) {

-						//$labeltoshow .= ' <span class="opacitymedium">('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')</span>';

-						$labeltoshow = img_picto($lines[$i]->projectlabel, 'project', 'class="pictofixedwidth"').$labeltoshow;

-					} else {

-						//$labeltoshow .= ' <span class="opacitymedium">('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')</span>';

-						$labeltoshow = img_picto($lines[$i]->projectlabel, 'projectpub', 'class="pictofixedwidth"').$labeltoshow;

-					}

-					if ($lines[$i]->id) {

-						$labeltoshow .= ' > ';

-					}

-					for ($k = 0; $k < $level; $k++) {

-						$labeltoshow .= "&nbsp;&nbsp;&nbsp;";

-					}

-					$labeltoshow .= $lines[$i]->ref.' '.$lines[$i]->label;

-

-					print ' data-html="'.dol_escape_htmltag($labeltoshow).'"';

-					print '>';

-					print $labeltoshow;

-					print "</option>\n";

-					$inc++;

-				}

-

-				$level++;

-				if ($lines[$i]->id) {

-					$this->_pLineSelect($inc, $lines[$i]->id, $lines, $level, $selectedtask, $selectedproject, $newdisablechildoftaskid);

-				}

-				$level--;

-			}

-		}

-	}

-

-

-	/**

-	 *  Output a HTML thumb of color or a text if not defined.

-	 *

-	 *  @param	string		$color				String with hex (FFFFFF) or comma RGB ('255,255,255')

-	 *  @param	string		$textifnotdefined	Text to show if color not defined

-	 *  @return	string							Show color string

-	 *  @see selectColor()

-	 */

-	public static function showColor($color, $textifnotdefined = '')

-	{

-		$textcolor = 'FFF';

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

-		if (colorIsLight($color)) {

-			$textcolor = '000';

-		}

-

-		$color = colorArrayToHex(colorStringToArray($color, array()), '');

-

-		if ($color) {

-			return '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; color: #'.$textcolor.'; background-color: #'.$color.'" value="'.$color.'">';

-		} else {

-			return $textifnotdefined;

-		}

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 *  Output a HTML code to select a color

-	 *

-	 *  @param	string		$set_color		Pre-selected color

-	 *  @param	string		$prefix			Name of HTML field

-	 *  @param	string		$form_name		Deprecated. Not used.

-	 *  @param	int			$showcolorbox	1=Show color code and color box, 0=Show only color code

-	 *  @param 	array		$arrayofcolors	Array of colors. Example: array('29527A','5229A3','A32929','7A367A','B1365F','0D7813')

-	 *  @return	void

-	 *  @deprecated Use instead selectColor

-	 *  @see selectColor()

-	 */

-	public function select_color($set_color = '', $prefix = 'f_color', $form_name = '', $showcolorbox = 1, $arrayofcolors = '')

-	{

-		// phpcs:enable

-		print $this->selectColor($set_color, $prefix, $form_name, $showcolorbox, $arrayofcolors);

-	}

-

-	/**

-	 *  Output a HTML code to select a color. Field will return an hexa color like '334455'.

-	 *

-	 *  @param	string		$set_color				Pre-selected color with format '#......'

-	 *  @param	string		$prefix					Name of HTML field

-	 *  @param	string		$form_name				Deprecated. Not used.

-	 *  @param	int			$showcolorbox			1=Show color code and color box, 0=Show only color code

-	 *  @param 	array		$arrayofcolors			Array of possible colors to choose in the selector. All colors are possible if empty. Example: array('29527A','5229A3','A32929','7A367A','B1365F','0D7813')

-	 *  @param	string		$morecss				Add css style into input field

-	 *  @param	string		$setpropertyonselect	Set this property after selecting a color

-	 *  @param	string		$default				Default color

-	 *  @return	string

-	 *  @see showColor()

-	 */

-	public static function selectColor($set_color = '', $prefix = 'f_color', $form_name = '', $showcolorbox = 1, $arrayofcolors = '', $morecss = '', $setpropertyonselect = '', $default = '')

-	{

-		// Deprecation warning

-		if ($form_name) {

-			dol_syslog(__METHOD__.": form_name parameter is deprecated", LOG_WARNING);

-		}

-

-		global $langs, $conf;

-

-		$out = '';

-

-		if (!is_array($arrayofcolors) || count($arrayofcolors) < 1) {

-			// Case of selection of any color

-			$langs->load("other");

-			if (empty($conf->dol_use_jmobile) && !empty($conf->use_javascript_ajax) && !getDolGlobalInt('MAIN_USE_HTML5_COLOR_SELECTOR')) {

-				$out .= '<link rel="stylesheet" media="screen" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css" />';

-				$out .= '<script nonce="'.getNonce().'" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/jpicker-1.1.6.js"></script>';

-				$out .= '<script nonce="'.getNonce().'" type="text/javascript">

+     *  @param	string	$morecss				More css

+     *  @return	void

+     */

+    public function selectProjectTasks($selectedtask = '', $projectid = 0, $htmlname = 'task_parent', $modeproject = 0, $modetask = 0, $mode = 0, $useempty = 0, $disablechildoftaskid = 0, $filteronprojstatus = '', $morecss = '')

+    {

+        global $user, $langs;

+

+        require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';

+

+        //print $modeproject.'-'.$modetask;

+        $task = new Task($this->db);

+        $tasksarray = $task->getTasksArray($modetask ? $user : 0, $modeproject ? $user : 0, $projectid, 0, $mode, '', $filteronprojstatus);

+        if ($tasksarray)

+        {

+        	print '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';

+            if ($useempty) print '<option value="0">&nbsp;</option>';

+            $j = 0;

+            $level = 0;

+            $this->_pLineSelect($j, 0, $tasksarray, $level, $selectedtask, $projectid, $disablechildoftaskid);

+            print '</select>';

+

+            print ajax_combobox($htmlname);

+        }

+        else

+        {

+            print '<div class="warning">'.$langs->trans("NoProject").'</div>';

+        }

+    }

+

+    /**

+     * Write lines of a project (all lines of a project if parent = 0)

+     *

+     * @param 	int		$inc					Cursor counter

+     * @param 	int		$parent					Id of parent task we want to see

+     * @param 	array	$lines					Array of task lines

+     * @param 	int		$level					Level

+     * @param 	int		$selectedtask			Id selected task

+     * @param 	int		$selectedproject		Id selected project

+     * @param	int		$disablechildoftaskid	1=Disable task that are child of the provided task id

+     * @return	void

+     */

+    private function _pLineSelect(&$inc, $parent, $lines, $level = 0, $selectedtask = 0, $selectedproject = 0, $disablechildoftaskid = 0)

+    {

+        global $langs, $user, $conf;

+

+        $lastprojectid = 0;

+

+        $numlines = count($lines);

+        for ($i = 0; $i < $numlines; $i++) {

+            if ($lines[$i]->fk_parent == $parent) {

+                //var_dump($selectedproject."--".$selectedtask."--".$lines[$i]->fk_project."_".$lines[$i]->id);		// $lines[$i]->id may be empty if project has no lines

+

+                // Break on a new project

+                if ($parent == 0)	// We are on a task at first level

+                {

+                    if ($lines[$i]->fk_project != $lastprojectid)	// Break found on project

+                    {

+                        if ($i > 0) print '<option value="0" disabled>----------</option>';

+                        print '<option value="'.$lines[$i]->fk_project.'_0"';

+                        if ($selectedproject == $lines[$i]->fk_project) print ' selected';

+                        print '>'; // Project -> Task

+                        print $langs->trans("Project").' '.$lines[$i]->projectref;

+                        if (empty($lines[$i]->public))

+                        {

+                            print ' ('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')';

+                        }

+                        else

+                        {

+                            print ' ('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')';

+                        }

+                        //print '-'.$parent.'-'.$lines[$i]->fk_project.'-'.$lastprojectid;

+                        print "</option>\n";

+

+                        $lastprojectid = $lines[$i]->fk_project;

+                        $inc++;

+                    }

+                }

+

+                $newdisablechildoftaskid = $disablechildoftaskid;

+

+                // Print task

+                if (isset($lines[$i]->id))		// We use isset because $lines[$i]->id may be null if project has no task and are on root project (tasks may be caught by a left join). We enter here only if '0' or >0

+                {

+                	// Check if we must disable entry

+                	$disabled = 0;

+                	if ($disablechildoftaskid && (($lines[$i]->id == $disablechildoftaskid || $lines[$i]->fk_parent == $disablechildoftaskid)))

+                	{

+               			$disabled++;

+               			if ($lines[$i]->fk_parent == $disablechildoftaskid) $newdisablechildoftaskid = $lines[$i]->id; // If task is child of a disabled parent, we will propagate id to disable next child too

+                	}

+

+                    print '<option value="'.$lines[$i]->fk_project.'_'.$lines[$i]->id.'"';

+                    if (($lines[$i]->id == $selectedtask) || ($lines[$i]->fk_project.'_'.$lines[$i]->id == $selectedtask)) print ' selected';

+                    if ($disabled) print ' disabled';

+                    print '>';

+                    print $langs->trans("Project").' '.$lines[$i]->projectref;

+                    print ' '.$lines[$i]->projectlabel;

+                    if (empty($lines[$i]->public))

+                    {

+                        print ' ('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')';

+                    }

+                    else

+                    {

+                        print ' ('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')';

+                    }

+                    if ($lines[$i]->id) print ' > ';

+                    for ($k = 0; $k < $level; $k++)

+                    {

+                        print "&nbsp;&nbsp;&nbsp;";

+                    }

+                    print $lines[$i]->ref.' '.$lines[$i]->label."</option>\n";

+                    $inc++;

+                }

+

+                $level++;

+                if ($lines[$i]->id) $this->_pLineSelect($inc, $lines[$i]->id, $lines, $level, $selectedtask, $selectedproject, $newdisablechildoftaskid);

+                $level--;

+            }

+        }

+    }

+

+

+    /**

+     *  Output a HTML thumb of color or a text if not defined.

+     *

+     *  @param	string		$color				String with hex (FFFFFF) or comma RGB ('255,255,255')

+     *  @param	string		$textifnotdefined	Text to show if color not defined

+     *  @return	string							HTML code for color thumb

+     *  @see selectColor()

+     */

+    public static function showColor($color, $textifnotdefined = '')

+    {

+    	$textcolor = 'FFF';

+    	include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';

+    	if (colorIsLight($color)) $textcolor = '000';

+

+    	$color = colorArrayToHex(colorStringToArray($color, array()), '');

+

+		if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; color: #'.$textcolor.'; background-color: #'.$color.'" value="'.$color.'">';

+		else print $textifnotdefined;

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     *  Output a HTML code to select a color

+     *

+     *  @param	string		$set_color		Pre-selected color

+     *  @param	string		$prefix			Name of HTML field

+     *  @param	string		$form_name		Deprecated. Not used.

+     *  @param	int			$showcolorbox	1=Show color code and color box, 0=Show only color code

+     *  @param 	array		$arrayofcolors	Array of colors. Example: array('29527A','5229A3','A32929','7A367A','B1365F','0D7813')

+     *  @return	void

+     *  @deprecated Use instead selectColor

+     *  @see selectColor()

+     */

+    public function select_color($set_color = '', $prefix = 'f_color', $form_name = '', $showcolorbox = 1, $arrayofcolors = '')

+    {

+        // phpcs:enable

+    	print $this->selectColor($set_color, $prefix, $form_name, $showcolorbox, $arrayofcolors);

+    }

+

+    /**

+     *  Output a HTML code to select a color. Field will return an hexa color like '334455'.

+     *

+     *  @param	string		$set_color		Pre-selected color

+     *  @param	string		$prefix			Name of HTML field

+     *  @param	string		$form_name		Deprecated. Not used.

+     *  @param	int			$showcolorbox	1=Show color code and color box, 0=Show only color code

+     *  @param 	array		$arrayofcolors	Array of colors. Example: array('29527A','5229A3','A32929','7A367A','B1365F','0D7813')

+     *  @param	string		$morecss		Add css style into input field

+     *  @return	string

+     *  @see showColor()

+     */

+    public static function selectColor($set_color = '', $prefix = 'f_color', $form_name = '', $showcolorbox = 1, $arrayofcolors = '', $morecss = '')

+    {

+        // Deprecation warning

+        if ($form_name) {

+            dol_syslog(__METHOD__.": form_name parameter is deprecated", LOG_WARNING);

+        }

+

+        global $langs, $conf;

+

+        $out = '';

+

+        if (!is_array($arrayofcolors) || count($arrayofcolors) < 1)

+        {

+            $langs->load("other");

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

+            {

+	            $out .= '<link rel="stylesheet" media="screen" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css" />';

+	            $out .= '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/jpicker-1.1.6.js"></script>';

+	            $out .= '<script type="text/javascript">

@@ -867 +758,0 @@
-					var originalhex = null;

@@ -869,57 +760,33 @@
-		                window: {

-		                  title: \''.dol_escape_js($langs->trans("SelectAColor")).'\', /* any title for the jPicker window itself - displays "Drag Markers To Pick A Color" if left null */

-		                  effects:

-		                    {

-		                    type: \'show\', /* effect used to show/hide an expandable picker. Acceptable values "slide", "show", "fade" */

-		                    speed:

-		                    {

-		                      show: \'fast\', /* duration of "show" effect. Acceptable values are "fast", "slow", or time in ms */

-		                      hide: \'fast\' /* duration of "hide" effect. Acceptable values are "fast", "slow", or time in ms */

-		                    }

-		                    },

-		                  position:

-		                    {

-		                    x: \'screenCenter\', /* acceptable values "left", "center", "right", "screenCenter", or relative px value */

-		                    y: \'center\' /* acceptable values "top", "bottom", "center", or relative px value */

-		                    },

-		                },

-		                images: {

-		                    clientPath: \''.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/images/\',

-		                    picker: { file: \'../../../../../theme/common/colorpicker.png\', width: 14, height: 14 }

-		          		},

-		                localization: // alter these to change the text presented by the picker (e.g. different language)

-		                  {

-		                    text:

-		                    {

-		                      title: \''.dol_escape_js($langs->trans("SelectAColor")).'\',

-		                      newColor: \''.dol_escape_js($langs->trans("New")).'\',

-		                      currentColor: \''.dol_escape_js($langs->trans("Current")).'\',

-		                      ok: \''.dol_escape_js($langs->trans("Validate")).'\',

-		                      cancel: \''.dol_escape_js($langs->trans("Cancel")).'\'

-		                    }

-		                  }

-				        },

-						function(color, context) { console.log("close color selector"); },

-						function(color, context) { var hex = color.val(\'hex\'); console.log("new color selected in jpicker "+hex+" setpropertyonselect='.dol_escape_js($setpropertyonselect).'");';

-				if ($setpropertyonselect) {

-					$out .= 'if (originalhex == null) {';

-					$out .= ' 	originalhex = getComputedStyle(document.querySelector(":root")).getPropertyValue(\'--'.dol_escape_js($setpropertyonselect).'\');';

-					$out .= '   console.log("original color is saved into originalhex = "+originalhex);';

-					$out .= '}';

-					$out .= 'if (hex != null) {';

-					$out .= '	document.documentElement.style.setProperty(\'--'.dol_escape_js($setpropertyonselect).'\', \'#\'+hex);';

-					$out .= '}';

-				}

-				$out .= '},

-						function(color, context) {

-							console.log("cancel selection of color");';

-				if ($setpropertyonselect) {

-					$out .= 'if (originalhex != null) {

-								console.log("Restore old color "+originalhex);

-								document.documentElement.style.setProperty(\'--'.dol_escape_js($setpropertyonselect).'\', originalhex);

-							}';

-				}

-				$out .= '

-						}

-					);

-				 });

+	                window: {

+	                  title: \''.dol_escape_js($langs->trans("SelectAColor")).'\', /* any title for the jPicker window itself - displays "Drag Markers To Pick A Color" if left null */

+	                  effects:

+	                    {

+	                    type: \'show\', /* effect used to show/hide an expandable picker. Acceptable values "slide", "show", "fade" */

+	                    speed:

+	                    {

+	                      show: \'fast\', /* duration of "show" effect. Acceptable values are "fast", "slow", or time in ms */

+	                      hide: \'fast\' /* duration of "hide" effect. Acceptable values are "fast", "slow", or time in ms */

+	                    }

+	                    },

+	                  position:

+	                    {

+	                    x: \'screenCenter\', /* acceptable values "left", "center", "right", "screenCenter", or relative px value */

+	                    y: \'center\' /* acceptable values "top", "bottom", "center", or relative px value */

+	                    },

+	                },

+	                images: {

+	                    clientPath: \''.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/images/\',

+	                    picker: { file: \'../../../../../theme/common/colorpicker.png\', width: 14, height: 14 }

+	          		},

+	                localization: // alter these to change the text presented by the picker (e.g. different language)

+	                  {

+	                    text:

+	                    {

+	                      title: \''.dol_escape_js($langs->trans("SelectAColor")).'\',

+	                      newColor: \''.dol_escape_js($langs->trans("New")).'\',

+	                      currentColor: \''.dol_escape_js($langs->trans("Current")).'\',

+	                      ok: \''.dol_escape_js($langs->trans("Save")).'\',

+	                      cancel: \''.dol_escape_js($langs->trans("Cancel")).'\'

+	                    }

+	                  }

+			        } ); });

@@ -927,30 +794,10 @@
-				$out .= '<input id="colorpicker'.$prefix.'" name="'.$prefix.'" size="6" maxlength="7" class="flat valignmiddle'.($morecss ? ' '.$morecss : '').'" type="text" value="'.dol_escape_htmltag($set_color).'" />';

-			} else {

-				$color = ($set_color !== '' ? $set_color : ($default !== '' ? $default : 'FFFFFF'));

-				$out .= '<input id="colorpicker'.$prefix.'" name="'.$prefix.'" size="6" maxlength="7" class="flat input-nobottom colorselector valignmiddle '.($morecss ? ' '.$morecss : '').'" type="color" data-default="'.$default.'" value="'.dol_escape_htmltag(preg_match('/^#/', $color) ? $color : '#'.$color).'" />';

-				$out .= '<script nonce="'.getNonce().'" type="text/javascript">

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

-					var originalhex = null;

-					jQuery("#colorpicker'.$prefix.'").on(\'change\', function() {

-						var hex = jQuery("#colorpicker'.$prefix.'").val();

-						console.log("new color selected in input color "+hex+" setpropertyonselect='.dol_escape_js($setpropertyonselect).'");';

-				if ($setpropertyonselect) {

-					$out .= 'if (originalhex == null) {';

-					$out .= ' 	originalhex = getComputedStyle(document.querySelector(":root")).getPropertyValue(\'--'.dol_escape_js($setpropertyonselect).'\');';

-					$out .= '   console.log("original color is saved into originalhex = "+originalhex);';

-					$out .= '}';

-					$out .= 'if (hex != null) {';

-					$out .= '	document.documentElement.style.setProperty(\'--'.dol_escape_js($setpropertyonselect).'\', hex);';

-					$out .= '}';

-				}

-				$out .= '

-					});

-				});

-				</script>';

-			}

-		} else {

-			// In most cases, this is not used. We used instead function with no specific list of colors

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

-				$out .= '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.css" type="text/css" media="screen" />';

-				$out .= '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.js" type="text/javascript"></script>';

-				$out .= '<script nonce="'.getNonce().'" type="text/javascript">

+            }

+            $out .= '<input id="colorpicker'.$prefix.'" name="'.$prefix.'" size="6" maxlength="7" class="flat'.($morecss ? ' '.$morecss : '').'" type="text" value="'.dol_escape_htmltag($set_color).'" />';

+        }

+        else  // In most cases, this is not used. We used instead function with no specific list of colors

+        {

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

+            {

+	        	$out .= '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.css" type="text/css" media="screen" />';

+	            $out .= '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.js" type="text/javascript"></script>';

+	            $out .= '<script type="text/javascript">

@@ -965,243 +812,226 @@
-			}

-			$out .= '<select id="colorpicker'.$prefix.'" class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$prefix.'">';

-			//print '<option value="-1">&nbsp;</option>';

-			foreach ($arrayofcolors as $val) {

-				$out .= '<option value="'.$val.'"';

-				if ($set_color == $val) {

-					$out .= ' selected';

-				}

-				$out .= '>'.$val.'</option>';

-			}

-			$out .= '</select>';

-		}

-

-		return $out;

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 *	Creae an image for color

-	 *

-	 *	@param	string	$color		Color of image

-	 *	@param	string	$module 	Name of module

-	 *	@param	string	$name		Name of image

-	 *	@param	int		$x 			Largeur de l'image en pixels

-	 *	@param	int		$y      	Hauteur de l'image en pixels

-	 *	@return	void

-	 */

-	public function CreateColorIcon($color, $module, $name, $x = '12', $y = '12')

-	{

-		// phpcs:enable

-		global $conf;

-

-		$file = $conf->$module->dir_temp.'/'.$name.'.png';

-

-		// We create temp directory

-		if (!file_exists($conf->$module->dir_temp)) {

-			dol_mkdir($conf->$module->dir_temp);

-		}

-

-		// On cree l'image en vraies couleurs

-		$image = imagecreatetruecolor($x, $y);

-

-		$color = substr($color, 1, 6);

-

-		$rouge = hexdec(substr($color, 0, 2)); //conversion du canal rouge

-		$vert  = hexdec(substr($color, 2, 2)); //conversion du canal vert

-		$bleu  = hexdec(substr($color, 4, 2)); //conversion du canal bleu

-

-		$couleur = imagecolorallocate($image, $rouge, $vert, $bleu);

-		//print $rouge.$vert.$bleu;

-		imagefill($image, 0, 0, $couleur); //on remplit l'image

-		// On cree la couleur et on l'attribue a une variable pour ne pas la perdre

-		ImagePng($image, $file); //renvoie une image sous format png

-		ImageDestroy($image);

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 *    	Return HTML combo list of week

-	 *

-	 *    	@param	string		$selected          Preselected value

-	 *    	@param  string		$htmlname          Nom de la zone select

-	 *    	@param  int			$useempty          Affiche valeur vide dans liste

-	 *    	@return	string

-	 */

-	public function select_dayofweek($selected = '', $htmlname = 'weekid', $useempty = 0)

-	{

-		// phpcs:enable

-		global $langs;

-

-		$week = array(

-			0=>$langs->trans("Day0"),

-			1=>$langs->trans("Day1"),

-			2=>$langs->trans("Day2"),

-			3=>$langs->trans("Day3"),

-			4=>$langs->trans("Day4"),

-			5=>$langs->trans("Day5"),

-			6=>$langs->trans("Day6")

-		);

-

-		$select_week = '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';

-		if ($useempty) {

-			$select_week .= '<option value="-1">&nbsp;</option>';

-		}

-		foreach ($week as $key => $val) {

-			if ($selected == $key) {

-				$select_week .= '<option value="'.$key.'" selected>';

-			} else {

-				$select_week .= '<option value="'.$key.'">';

-			}

-			$select_week .= $val;

-			$select_week .= '</option>';

-		}

-		$select_week .= '</select>';

-

-		$select_week .= ajax_combobox($htmlname);

-

-		return $select_week;

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 *      Return HTML combo list of month

-	 *

-	 *      @param  string      $selected          	Preselected value

-	 *      @param  string      $htmlname          	Name of HTML select object

-	 *      @param  int         $useempty          	Show empty in list

-	 *      @param  int         $longlabel         	Show long label

-	 *      @param	string		$morecss			More Css

-	 *  	@param  bool		$addjscombo			Add js combo

-	 *      @return string

-	 */

-	public function select_month($selected = '', $htmlname = 'monthid', $useempty = 0, $longlabel = 0, $morecss = 'minwidth50 maxwidth75imp valignmiddle', $addjscombo = false)

-	{

-		// phpcs:enable

-		global $langs;

-

-		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';

-

-		if ($longlabel) {

-			$montharray = monthArray($langs, 0); // Get array

-		} else {

-			$montharray = monthArray($langs, 1);

-		}

-

-		$select_month = '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';

-		if ($useempty) {

-			$select_month .= '<option value="0">&nbsp;</option>';

-		}

-		foreach ($montharray as $key => $val) {

-			if ($selected == $key) {

-				$select_month .= '<option value="'.$key.'" selected>';

-			} else {

-				$select_month .= '<option value="'.$key.'">';

-			}

-			$select_month .= $val;

-			$select_month .= '</option>';

-		}

-		$select_month .= '</select>';

-

-		// Add code for jquery to use multiselect

-		if ($addjscombo) {

-			// Enhance with select2

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

-			$select_month .= ajax_combobox($htmlname);

-		}

-

-		return $select_month;

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 *	Return HTML combo list of years

-	 *

-	 *  @param  string		$selected       Preselected value (''=current year, -1=none, year otherwise)

-	 *  @param  string		$htmlname       Name of HTML select object

-	 *  @param  int			$useempty       Affiche valeur vide dans liste

-	 *  @param  int			$min_year       Offset of minimum year into list (by default current year -10)

-	 *  @param  int		    $max_year		Offset of maximum year into list (by default current year + 5)

-	 *  @param	int			$offset			Offset

-	 *  @param	int			$invert			Invert

-	 *  @param	string		$option			Option

-	 *  @param	string		$morecss		More CSS

-	 *  @param  bool		$addjscombo		Add js combo

-	 *  @return	void

-	 *  @deprecated

-	 */

-	public function select_year($selected = '', $htmlname = 'yearid', $useempty = 0, $min_year = 10, $max_year = 5, $offset = 0, $invert = 0, $option = '', $morecss = 'valignmiddle maxwidth75imp', $addjscombo = false)

-	{

-		// phpcs:enable

-		print $this->selectyear($selected, $htmlname, $useempty, $min_year, $max_year, $offset, $invert, $option, $morecss, $addjscombo);

-	}

-

-	/**

-	 *	Return HTML combo list of years

-	 *

-	 *  @param  string	$selected       Preselected value (''=current year, -1=none, year otherwise)

-	 *  @param  string	$htmlname       Name of HTML select object

-	 *  @param  int	    $useempty       Affiche valeur vide dans liste

-	 *  @param  int	    $min_year		Offset of minimum year into list (by default current year -10)

-	 *  @param  int	    $max_year       Offset of maximum year into list (by default current year + 5)

-	 *  @param	int		$offset			Offset

-	 *  @param	int		$invert			Invert

-	 *  @param	string	$option			Option

-	 *  @param	string	$morecss		More css

-	 *  @param  bool	$addjscombo		Add js combo

-	 *  @return	string

-	 */

-	public function selectyear($selected = '', $htmlname = 'yearid', $useempty = 0, $min_year = 10, $max_year = 5, $offset = 0, $invert = 0, $option = '', $morecss = 'valignmiddle width75', $addjscombo = false)

-	{

-		$out = '';

-

-		$currentyear = date("Y") + $offset;

-		$max_year = $currentyear + $max_year;

-		$min_year = $currentyear - $min_year;

-		if (empty($selected) && empty($useempty)) {

-			$selected = $currentyear;

-		}

-

-		$out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'"'.$option.' >';

-		if ($useempty) {

-			$selected_html = '';

-			if ($selected == '') {

-				$selected_html = ' selected';

-			}

-			$out .= '<option value=""'.$selected_html.'>&nbsp;</option>';

-		}

-		if (!$invert) {

-			for ($y = $max_year; $y >= $min_year; $y--) {

-				$selected_html = '';

-				if ($selected > 0 && $y == $selected) {

-					$selected_html = ' selected';

-				}

-				$out .= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';

-			}

-		} else {

-			for ($y = $min_year; $y <= $max_year; $y++) {

-				$selected_html = '';

-				if ($selected > 0 && $y == $selected) {

-					$selected_html = ' selected';

-				}

-				$out .= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';

-			}

-		}

-		$out .= "</select>\n";

-

-		// Add code for jquery to use multiselect

-		if ($addjscombo) {

-			// Enhance with select2

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

-			$out .= ajax_combobox($htmlname);

-		}

-

-		return $out;

-	}

-

-

-	/**

-	 * 	Get array with HTML tabs with boxes of a particular area including personalized choices of user.

-	 *  Class 'Form' must be known.

-	 *

-	 * 	@param	   User         $user		 Object User

-	 * 	@param	   String       $areacode    Code of area for pages - 0 = Home page ... See getListOfPagesForBoxes()

+            }

+            $out .= '<select id="colorpicker'.$prefix.'" class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$prefix.'">';

+            //print '<option value="-1">&nbsp;</option>';

+            foreach ($arrayofcolors as $val)

+            {

+                $out .= '<option value="'.$val.'"';

+                if ($set_color == $val) $out .= ' selected';

+                $out .= '>'.$val.'</option>';

+            }

+            $out .= '</select>';

+        }

+

+        return $out;

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     *	Creation d'un icone de couleur

+     *

+     *	@param	string	$color		Couleur de l'image

+     *	@param	string	$module 	Nom du module

+     *	@param	string	$name		Nom de l'image

+     *	@param	int		$x 			Largeur de l'image en pixels

+     *	@param	int		$y      	Hauteur de l'image en pixels

+     *	@return	void

+     */

+    public function CreateColorIcon($color, $module, $name, $x = '12', $y = '12')

+    {

+        // phpcs:enable

+        global $conf;

+

+        $file = $conf->$module->dir_temp.'/'.$name.'.png';

+

+        // On cree le repertoire contenant les icones

+        if (!file_exists($conf->$module->dir_temp))

+        {

+            dol_mkdir($conf->$module->dir_temp);

+        }

+

+        // On cree l'image en vraies couleurs

+        $image = imagecreatetruecolor($x, $y);

+

+        $color = substr($color, 1, 6);

+

+        $rouge = hexdec(substr($color, 0, 2)); //conversion du canal rouge

+        $vert  = hexdec(substr($color, 2, 2)); //conversion du canal vert

+        $bleu  = hexdec(substr($color, 4, 2)); //conversion du canal bleu

+

+        $couleur = imagecolorallocate($image, $rouge, $vert, $bleu);

+        //print $rouge.$vert.$bleu;

+        imagefill($image, 0, 0, $couleur); //on remplit l'image

+        // On cree la couleur et on l'attribue a une variable pour ne pas la perdre

+        ImagePng($image, $file); //renvoie une image sous format png

+        ImageDestroy($image);

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     *    	Return HTML combo list of week

+     *

+     *    	@param	string		$selected          Preselected value

+     *    	@param  string		$htmlname          Nom de la zone select

+     *    	@param  int			$useempty          Affiche valeur vide dans liste

+     *    	@return	string

+     */

+    public function select_dayofweek($selected = '', $htmlname = 'weekid', $useempty = 0)

+    {

+        // phpcs:enable

+        global $langs;

+

+        $week = array(

+            0=>$langs->trans("Day0"),

+            1=>$langs->trans("Day1"),

+            2=>$langs->trans("Day2"),

+            3=>$langs->trans("Day3"),

+            4=>$langs->trans("Day4"),

+            5=>$langs->trans("Day5"),

+            6=>$langs->trans("Day6")

+        );

+

+        $select_week = '<select class="flat" name="'.$htmlname.'">';

+        if ($useempty)

+        {

+            $select_week .= '<option value="-1">&nbsp;</option>';

+        }

+        foreach ($week as $key => $val)

+        {

+            if ($selected == $key)

+            {

+                $select_week .= '<option value="'.$key.'" selected>';

+            }

+            else

+            {

+                $select_week .= '<option value="'.$key.'">';

+            }

+            $select_week .= $val;

+            $select_week .= '</option>';

+        }

+        $select_week .= '</select>';

+        return $select_week;

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     *      Return HTML combo list of month

+     *

+     *      @param  string      $selected          	Preselected value

+     *      @param  string      $htmlname          	Name of HTML select object

+     *      @param  int         $useempty          	Show empty in list

+     *      @param  int         $longlabel         	Show long label

+     *      @param	string		$morecss			More Css

+     *      @return string

+     */

+    public function select_month($selected = '', $htmlname = 'monthid', $useempty = 0, $longlabel = 0, $morecss = 'maxwidth50imp valignmiddle')

+    {

+        // phpcs:enable

+        global $langs;

+

+        require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';

+

+        if ($longlabel) $montharray = monthArray($langs, 0); // Get array

+        else $montharray = monthArray($langs, 1);

+

+        $select_month = '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';

+        if ($useempty)

+        {

+            $select_month .= '<option value="0">&nbsp;</option>';

+        }

+        foreach ($montharray as $key => $val)

+        {

+            if ($selected == $key)

+            {

+                $select_month .= '<option value="'.$key.'" selected>';

+            }

+            else

+            {

+                $select_month .= '<option value="'.$key.'">';

+            }

+            $select_month .= $val;

+            $select_month .= '</option>';

+        }

+        $select_month .= '</select>';

+        return $select_month;

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     *	Return HTML combo list of years

+     *

+     *  @param  string		$selected       Preselected value (''=current year, -1=none, year otherwise)

+     *  @param  string		$htmlname       Name of HTML select object

+     *  @param  int			$useempty       Affiche valeur vide dans liste

+     *  @param  int			$min_year       Offset of minimum year into list (by default current year -10)

+     *  @param  int		    $max_year		Offset of maximum year into list (by default current year + 5)

+     *  @param	int			$offset			Offset

+     *  @param	int			$invert			Invert

+     *  @param	string		$option			Option

+     *  @param	string		$morecss		More CSS

+     *  @return	string

+     */

+    public function select_year($selected = '', $htmlname = 'yearid', $useempty = 0, $min_year = 10, $max_year = 5, $offset = 0, $invert = 0, $option = '', $morecss = 'valignmiddle maxwidth75imp')

+    {

+        // phpcs:enable

+        print $this->selectyear($selected, $htmlname, $useempty, $min_year, $max_year, $offset, $invert, $option, $morecss);

+    }

+

+    /**

+     *	Return HTML combo list of years

+     *

+     *  @param  string	$selected       Preselected value (''=current year, -1=none, year otherwise)

+     *  @param  string	$htmlname       Name of HTML select object

+     *  @param  int	    $useempty       Affiche valeur vide dans liste

+     *  @param  int	    $min_year		Offset of minimum year into list (by default current year -10)

+     *  @param  int	    $max_year       Offset of maximum year into list (by default current year + 5)

+     *  @param	int		$offset			Offset

+     *  @param	int		$invert			Invert

+     *  @param	string	$option			Option

+     *  @param	string	$morecss		More css

+     *  @return	string

+     */

+    public function selectyear($selected = '', $htmlname = 'yearid', $useempty = 0, $min_year = 10, $max_year = 5, $offset = 0, $invert = 0, $option = '', $morecss = 'valignmiddle maxwidth75imp')

+    {

+        $out = '';

+

+        $currentyear = date("Y") + $offset;

+        $max_year = $currentyear + $max_year;

+        $min_year = $currentyear - $min_year;

+        if (empty($selected) && empty($useempty)) $selected = $currentyear;

+

+        $out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'"'.$option.' >';

+        if ($useempty)

+        {

+        	$selected_html = '';

+            if ($selected == '') $selected_html = ' selected';

+            $out .= '<option value=""'.$selected_html.'>&nbsp;</option>';

+        }

+        if (!$invert)

+        {

+            for ($y = $max_year; $y >= $min_year; $y--)

+            {

+                $selected_html = '';

+                if ($selected > 0 && $y == $selected) $selected_html = ' selected';

+                $out .= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';

+            }

+        }

+        else

+        {

+            for ($y = $min_year; $y <= $max_year; $y++)

+            {

+                $selected_html = '';

+                if ($selected > 0 && $y == $selected) $selected_html = ' selected';

+                $out .= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';

+            }

+        }

+        $out .= "</select>\n";

+

+        return $out;

+    }

+

+

+    /**

+     * 	Get array with HTML tabs with boxes of a particular area including personalized choices of user.

+     *  Class 'Form' must be known.

+     *

+     * 	@param	   User         $user		 Object User

+     * 	@param	   String       $areacode    Code of area for pages - 0 = Home page ... See getListOfPagesForBoxes()

@@ -1209,49 +1039,48 @@
-	 */

-	public static function getBoxesArea($user, $areacode)

-	{

-		global $conf, $langs, $db;

-

-		include_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';

-

-		$confuserzone = 'MAIN_BOXES_'.$areacode;

-

-		// $boxactivated will be array of boxes enabled into global setup

-		// $boxidactivatedforuser will be array of boxes choosed by user

-

-		$selectboxlist = '';

-		$boxactivated = InfoBox::listBoxes($db, 'activated', $areacode, (empty($user->conf->$confuserzone) ? null : $user), array(), 0); // Search boxes of common+user (or common only if user has no specific setup)

-

-		$boxidactivatedforuser = array();

-		foreach ($boxactivated as $box) {

-			if (empty($user->conf->$confuserzone) || $box->fk_user == $user->id) {

-				$boxidactivatedforuser[$box->id] = $box->id; // We keep only boxes to show for user

-			}

-		}

-

-		// Define selectboxlist

-		$arrayboxtoactivatelabel = array();

-		if (!empty($user->conf->$confuserzone)) {

-			$boxorder = '';

-			$langs->load("boxes"); // Load label of boxes

-			foreach ($boxactivated as $box) {

-				if (!empty($boxidactivatedforuser[$box->id])) {

-					continue; // Already visible for user

-				}

-				$label = $langs->transnoentitiesnoconv($box->boxlabel);

-				//if (preg_match('/graph/',$box->class)) $label.=' ('.$langs->trans("Graph").')';

-				if (preg_match('/graph/', $box->class) && $conf->browser->layout != 'phone') {

-					$label = $label.' <span class="fas fa-chart-bar"></span>';

-				}

-				$arrayboxtoactivatelabel[$box->id] = array('label'=>$label, 'data-html'=>img_picto('', $box->boximg, 'class="pictofixedwidth"').$langs->trans($label)); // We keep only boxes not shown for user, to show into combo list

-			}

-			foreach ($boxidactivatedforuser as $boxid) {

-				if (empty($boxorder)) {

-					$boxorder .= 'A:';

-				}

-				$boxorder .= $boxid.',';

-			}

-

-			//var_dump($boxidactivatedforuser);

-

-			// Class Form must have been already loaded

-			$selectboxlist .= '<!-- Form with select box list -->'."\n";

+     */

+    public static function getBoxesArea($user, $areacode)

+    {

+        global $conf, $langs, $db;

+

+        include_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';

+

+        $confuserzone = 'MAIN_BOXES_'.$areacode;

+

+        // $boxactivated will be array of boxes enabled into global setup

+        // $boxidactivatedforuser will be array of boxes choosed by user

+

+        $selectboxlist = '';

+        $boxactivated = InfoBox::listBoxes($db, 'activated', $areacode, (empty($user->conf->$confuserzone) ?null:$user), array(), 0); // Search boxes of common+user (or common only if user has no specific setup)

+

+        $boxidactivatedforuser = array();

+        foreach ($boxactivated as $box)

+        {

+        	if (empty($user->conf->$confuserzone) || $box->fk_user == $user->id) $boxidactivatedforuser[$box->id] = $box->id; // We keep only boxes to show for user

+        }

+

+        // Define selectboxlist

+        $arrayboxtoactivatelabel = array();

+        if (!empty($user->conf->$confuserzone))

+        {

+        	$boxorder = '';

+        	$langs->load("boxes"); // Load label of boxes

+        	foreach ($boxactivated as $box)

+        	{

+        		if (!empty($boxidactivatedforuser[$box->id])) continue; // Already visible for user

+        		$label = $langs->transnoentitiesnoconv($box->boxlabel);

+        		//if (preg_match('/graph/',$box->class)) $label.=' ('.$langs->trans("Graph").')';

+        		if (preg_match('/graph/', $box->class) && $conf->browser->layout != 'phone')

+        		{

+        			$label = $label.' <span class="fa fa-bar-chart"></span>';

+        		}

+        		$arrayboxtoactivatelabel[$box->id] = $label; // We keep only boxes not shown for user, to show into combo list

+        	}

+            foreach ($boxidactivatedforuser as $boxid)

+        	{

+       			if (empty($boxorder)) $boxorder .= 'A:';

+  				$boxorder .= $boxid.',';

+        	}

+

+        	//var_dump($boxidactivatedforuser);

+

+        	// Class Form must have been already loaded

+        	$selectboxlist .= '<!-- Form with select box list -->'."\n";

@@ -1259 +1087,0 @@
-			$selectboxlist .= '<input type="hidden" name="token" value="'.newToken().'">';

@@ -1264,14 +1092,14 @@
-			$selectboxlist .= Form::selectarray('boxcombo', $arrayboxtoactivatelabel, -1, $langs->trans("ChooseBoxToAdd").'...', 0, 0, '', 0, 0, 0, 'ASC', 'maxwidth150onsmartphone hideonprint', 0, 'hidden selected', 0, 0);

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

-				$selectboxlist .= ' <input type="submit" class="button" value="'.$langs->trans("AddBox").'">';

-			}

-			$selectboxlist .= '</form>';

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

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

-				$selectboxlist .= ajax_combobox("boxcombo");

-			}

-		}

-

-		// Javascript code for dynamic actions

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

-			$selectboxlist .= '<script nonce="'.getNonce().'" type="text/javascript">

+			$selectboxlist .= Form::selectarray('boxcombo', $arrayboxtoactivatelabel, -1, $langs->trans("ChooseBoxToAdd").'...', 0, 0, '', 0, 0, 0, 'ASC', 'maxwidth150onsmartphone', 0, 'hidden selected', 0, 1);

+            if (empty($conf->use_javascript_ajax)) $selectboxlist .= ' <input type="submit" class="button" value="'.$langs->trans("AddBox").'">';

+            $selectboxlist .= '</form>';

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

+            {

+            	include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

+            	$selectboxlist .= ajax_combobox("boxcombo");

+            }

+        }

+

+        // Javascript code for dynamic actions

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

+        {

+	        $selectboxlist .= '<script type="text/javascript" language="javascript">

@@ -1287 +1115 @@
-	        			url: \''.DOL_URL_ROOT.'/core/ajax/box.php?closing=1&boxorder=\'+boxorder+\'&zone='.$areacode.'&userid=\'+'.$user->id.',

+	        			url: \''.DOL_URL_ROOT.'/core/ajax/box.php?closing=0&boxorder=\'+boxorder+\'&zone='.$areacode.'&userid=\'+'.$user->id.',

@@ -1291 +1119 @@
-	        		window.location.search=\'mainmenu='.GETPOST("mainmenu", "aZ09").'&leftmenu='.GETPOST('leftmenu', "aZ09").'&action=delbox&token='.newToken().'\';

+	        		window.location.search=\'mainmenu='.GETPOST("mainmenu", "aZ09").'&leftmenu='.GETPOST('leftmenu', "aZ09").'&action=delbox\';

@@ -1306 +1133,0 @@
-						console.log("A box widget has been selected for addition, we call ajax page to add it.")

@@ -1311,4 +1138,4 @@
-	    					url: \''.DOL_URL_ROOT.'/core/ajax/box.php?boxorder=\'+boxorder+\'&boxid=\'+boxid+\'&zone='.$areacode.'&userid='.$user->id.'\'

-	    		        }).done(function() {

-	        				window.location.search=\'mainmenu='.GETPOST("mainmenu", "aZ09").'&leftmenu='.GETPOST('leftmenu', "aZ09").'\';

-						});

+	    					url: \''.DOL_URL_ROOT.'/core/ajax/box.php?boxorder=\'+boxorder+\'&boxid=\'+boxid+\'&zone='.$areacode.'&userid='.$user->id.'\',

+	    			        async: false

+	    		        });

+	        			window.location.search=\'mainmenu='.GETPOST("mainmenu", "aZ09").'&leftmenu='.GETPOST('leftmenu', "aZ09").'&action=addbox&boxid=\'+boxid;

@@ -1317,4 +1144,2 @@
-			if (!count($arrayboxtoactivatelabel)) {

-				$selectboxlist .= 'jQuery("#boxcombo").hide();';

-			}

-			$selectboxlist .= '

+	        	if (!count($arrayboxtoactivatelabel)) $selectboxlist .= 'jQuery("#boxcombo").hide();';

+	        	$selectboxlist .= '

@@ -1329 +1153,0 @@
-		        		console.log("We moved box so we call updateBoxOrder with ajax actions");

@@ -1336,8 +1160,6 @@
-	        		var boxid = self.id.substring(8);

-					if (boxid > 0) {

-		        		var label = jQuery(\'#boxlabelentry\'+boxid).val();

-		        		console.log("We close box "+boxid);

-	    	    		jQuery(\'#boxto_\'+boxid).remove();

-	        			jQuery(\'#boxcombo\').append(new Option(label, boxid));

-	        			updateBoxOrder(1);  /* 1 to avoid message after a remove */

-					}

+	        		var boxid=self.id.substring(8);

+	        		var label=jQuery(\'#boxlabelentry\'+boxid).val();

+	        		console.log("We close box "+boxid);

+	        		jQuery(\'#boxto_\'+boxid).remove();

+	        		if (boxid > 0) jQuery(\'#boxcombo\').append(new Option(label, boxid));

+	        		updateBoxOrder(1);  /* 1 to avoid message after a remove */

@@ -1348,139 +1170,141 @@
-			$selectboxlist .= '</script>'."\n";

-		}

-

-		// Define boxlista and boxlistb

-		$boxlista = '';

-		$boxlistb = '';

-		$nbboxactivated = count($boxidactivatedforuser);

-

-		if ($nbboxactivated) {

-			// Load translation files required by the page

-			$langs->loadLangs(array("boxes", "projects"));

-

-			$emptybox = new ModeleBoxes($db);

-

-			$boxlista .= "\n<!-- Box left container -->\n";

-

-			// Define $box_max_lines

-			$box_max_lines = 5;

-			if (getDolGlobalString('MAIN_BOXES_MAXLINES')) {

-				$box_max_lines = $conf->global->MAIN_BOXES_MAXLINES;

-			}

-

-			$ii = 0;

-			foreach ($boxactivated as $key => $box) {

-				if ((!empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) {

-					continue;

-				}

-				if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) {

-					$box->box_order = 'A'.sprintf("%02d", ($ii + 1)); // When box_order was not yet set to Axx or Bxx and is still 0

-				}

-				if (preg_match('/^A/i', $box->box_order)) { // column A

-					$ii++;

-					//print 'box_id '.$boxactivated[$ii]->box_id.' ';

-					//print 'box_order '.$boxactivated[$ii]->box_order.'<br>';

-					// Show box

-					$box->loadBox($box_max_lines);

-					$boxlista .= $box->showBox(null, null, 1);

-				}

-			}

-

-			if ($conf->browser->layout != 'phone') {

-				$emptybox->box_id = 'A';

-				$emptybox->info_box_head = array();

-				$emptybox->info_box_contents = array();

-				$boxlista .= $emptybox->showBox(array(), array(), 1);

-			}

-			$boxlista .= "<!-- End box left container -->\n";

-

-			$boxlistb .= "\n<!-- Box right container -->\n";

-

-			$ii = 0;

-			foreach ($boxactivated as $key => $box) {

-				if ((!empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) {

-					continue;

-				}

-				if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) {

-					$box->box_order = 'B'.sprintf("%02d", ($ii + 1)); // When box_order was not yet set to Axx or Bxx and is still 0

-				}

-				if (preg_match('/^B/i', $box->box_order)) { // colonne B

-					$ii++;

-					//print 'box_id '.$boxactivated[$ii]->box_id.' ';

-					//print 'box_order '.$boxactivated[$ii]->box_order.'<br>';

-					// Show box

-					$box->loadBox($box_max_lines);

-					$boxlistb .= $box->showBox(null, null, 1);

-				}

-			}

-

-			if ($conf->browser->layout != 'phone') {

-				$emptybox->box_id = 'B';

-				$emptybox->info_box_head = array();

-				$emptybox->info_box_contents = array();

-				$boxlistb .= $emptybox->showBox(array(), array(), 1);

-			}

-

-			$boxlistb .= "<!-- End box right container -->\n";

-		}

-

-		return array('selectboxlist'=>count($boxactivated) ? $selectboxlist : '', 'boxactivated'=>$boxactivated, 'boxlista'=>$boxlista, 'boxlistb'=>$boxlistb);

-	}

-

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 *  Return a HTML select list of a dictionary

-	 *

-	 *  @param  string	$htmlname          	Name of select zone

-	 *  @param	string	$dictionarytable	Dictionary table

-	 *  @param	string	$keyfield			Field for key

-	 *  @param	string	$labelfield			Label field

-	 *  @param	string	$selected			Selected value

-	 *  @param  int		$useempty          	1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.

-	 *  @param  string  $moreattrib         More attributes on HTML select tag

-	 * 	@return	void

-	 */

-	public function select_dictionary($htmlname, $dictionarytable, $keyfield = 'code', $labelfield = 'label', $selected = '', $useempty = 0, $moreattrib = '')

-	{

-		// phpcs:enable

-		global $langs, $conf;

-

-		$langs->load("admin");

-

-		$sql = "SELECT rowid, ".$keyfield.", ".$labelfield;

-		$sql .= " FROM ".$this->db->prefix().$dictionarytable;

-		$sql .= " ORDER BY ".$labelfield;

-

-		dol_syslog(get_class($this)."::select_dictionary", LOG_DEBUG);

-		$result = $this->db->query($sql);

-		if ($result) {

-			$num = $this->db->num_rows($result);

-			$i = 0;

-			if ($num) {

-				print '<select id="select'.$htmlname.'" class="flat selectdictionary" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';

-				if ($useempty == 1 || ($useempty == 2 && $num > 1)) {

-					print '<option value="-1">&nbsp;</option>';

-				}

-

-				while ($i < $num) {

-					$obj = $this->db->fetch_object($result);

-					if ($selected == $obj->rowid || $selected == $obj->{$keyfield}) {

-						print '<option value="'.$obj->{$keyfield}.'" selected>';

-					} else {

-						print '<option value="'.$obj->{$keyfield}.'">';

-					}

-					$label = ($langs->trans($dictionarytable.$obj->{$keyfield}) != $dictionarytable.$obj->{$labelfield} ? $langs->trans($dictionarytable.$obj->{$keyfield}) : $obj->{$labelfield});

-					print $label;

-					print '</option>';

-					$i++;

-				}

-				print "</select>";

-			} else {

-				print $langs->trans("DictionaryEmpty");

-			}

-		} else {

-			dol_print_error($this->db);

-		}

-	}

-

-	/**

+	        $selectboxlist .= '</script>'."\n";

+        }

+

+        // Define boxlista and boxlistb

+        $nbboxactivated = count($boxidactivatedforuser);

+

+        if ($nbboxactivated)

+        {

+        	// Load translation files required by the page

+            $langs->loadLangs(array("boxes", "projects"));

+

+        	$emptybox = new ModeleBoxes($db);

+

+            $boxlista .= "\n<!-- Box left container -->\n";

+

+            // Define $box_max_lines

+            $box_max_lines = 5;

+            if (!empty($conf->global->MAIN_BOXES_MAXLINES)) $box_max_lines = $conf->global->MAIN_BOXES_MAXLINES;

+

+            $ii = 0;

+            foreach ($boxactivated as $key => $box)

+            {

+            	if ((!empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;

+				if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order = 'A'.sprintf("%02d", ($ii + 1)); // When box_order was not yet set to Axx or Bxx and is still 0

+            	if (preg_match('/^A/i', $box->box_order)) // column A

+                {

+                    $ii++;

+                    //print 'box_id '.$boxactivated[$ii]->box_id.' ';

+                    //print 'box_order '.$boxactivated[$ii]->box_order.'<br>';

+                    // Show box

+                    $box->loadBox($box_max_lines);

+                    $boxlista .= $box->outputBox();

+                }

+            }

+

+            if ($conf->browser->layout != 'phone')

+            {

+            	$emptybox->box_id = 'A';

+            	$emptybox->info_box_head = array();

+            	$emptybox->info_box_contents = array();

+            	$boxlista .= $emptybox->outputBox(array(), array());

+            }

+            $boxlista .= "<!-- End box left container -->\n";

+

+            $boxlistb .= "\n<!-- Box right container -->\n";

+

+            $ii = 0;

+            foreach ($boxactivated as $key => $box)

+            {

+            	if ((!empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;

+            	if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order = 'B'.sprintf("%02d", ($ii + 1)); // When box_order was not yet set to Axx or Bxx and is still 0

+            	if (preg_match('/^B/i', $box->box_order)) // colonne B

+                {

+                    $ii++;

+                    //print 'box_id '.$boxactivated[$ii]->box_id.' ';

+                    //print 'box_order '.$boxactivated[$ii]->box_order.'<br>';

+                    // Show box

+                    $box->loadBox($box_max_lines);

+                    $boxlistb .= $box->outputBox();

+                }

+            }

+

+            if ($conf->browser->layout != 'phone')

+            {

+            	$emptybox->box_id = 'B';

+            	$emptybox->info_box_head = array();

+            	$emptybox->info_box_contents = array();

+            	$boxlistb .= $emptybox->outputBox(array(), array());

+            }

+

+            $boxlistb .= "<!-- End box right container -->\n";

+        }

+

+        return array('selectboxlist'=>count($boxactivated) ? $selectboxlist : '', 'boxactivated'=>$boxactivated, 'boxlista'=>$boxlista, 'boxlistb'=>$boxlistb);

+    }

+

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     *  Return a HTML select list of a dictionary

+     *

+     *  @param  string	$htmlname          	Name of select zone

+     *  @param	string	$dictionarytable	Dictionary table

+     *  @param	string	$keyfield			Field for key

+     *  @param	string	$labelfield			Label field

+     *  @param	string	$selected			Selected value

+     *  @param  int		$useempty          	1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.

+     *  @param  string  $moreattrib         More attributes on HTML select tag

+     * 	@return	void

+     */

+    public function select_dictionary($htmlname, $dictionarytable, $keyfield = 'code', $labelfield = 'label', $selected = '', $useempty = 0, $moreattrib = '')

+    {

+        // phpcs:enable

+        global $langs, $conf;

+

+        $langs->load("admin");

+

+        $sql = "SELECT rowid, ".$keyfield.", ".$labelfield;

+        $sql .= " FROM ".MAIN_DB_PREFIX.$dictionarytable;

+        $sql .= " ORDER BY ".$labelfield;

+

+        dol_syslog(get_class($this)."::select_dictionary", LOG_DEBUG);

+        $result = $this->db->query($sql);

+        if ($result)

+        {

+            $num = $this->db->num_rows($result);

+            $i = 0;

+            if ($num)

+            {

+                print '<select id="select'.$htmlname.'" class="flat selectdictionary" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';

+                if ($useempty == 1 || ($useempty == 2 && $num > 1))

+                {

+                    print '<option value="-1">&nbsp;</option>';

+                }

+

+                while ($i < $num)

+                {

+                    $obj = $this->db->fetch_object($result);

+                    if ($selected == $obj->rowid || $selected == $obj->$keyfield)

+                    {

+                        print '<option value="'.$obj->$keyfield.'" selected>';

+                    }

+                    else

+                    {

+                        print '<option value="'.$obj->$keyfield.'">';

+                    }

+                    print $obj->$labelfield;

+                    print '</option>';

+                    $i++;

+                }

+                print "</select>";

+            } else {

+                print $langs->trans("DictionaryEmpty");

+            }

+        }

+        else {

+            dol_print_error($this->db);

+        }

+    }

+

+    /**

@@ -1496 +1320 @@
-	public function selectAutoManual($htmlname, $value = '', $option = 0, $disabled = false, $useempty = 0)

+    public function selectAutoManual($htmlname, $value = '', $option = 0, $disabled = false, $useempty = 0)

@@ -1500,3 +1324,3 @@
-		$automatic = "automatic";

-		$manual = "manual";

-		if ($option) {

+		$automatic = "automatic"; $manual = "manual";

+		if ($option)

+		{

@@ -1510,4 +1334,3 @@
-		if ($useempty) {

-			$resultautomanual .= '<option value="-1"'.(($value < 0) ? ' selected' : '').'>&nbsp;</option>'."\n";

-		}

-		if (("$value" == 'automatic') || ($value == 1)) {

+		if ($useempty) $resultautomanual .= '<option value="-1"'.(($value < 0) ? ' selected' : '').'>&nbsp;</option>'."\n";

+		if (("$value" == 'automatic') || ($value == 1))

+		{

@@ -1516,2 +1339,4 @@
-		} else {

-			$selected = (($useempty && $value != '0' && $value != 'manual') ? '' : ' selected');

+		}

+		else

+	    {

+	   		$selected = (($useempty && $value != '0' && $value != 'manual') ? '' : ' selected');

@@ -1532,2 +1356,0 @@
-	 * @param	string	$morecss			More CSS

-	 * @param	string  $showempty          '1' or 'text'

@@ -1536 +1359 @@
-	public function selectGroupByField($object, $search_groupby, &$arrayofgroupby, $morecss = 'minwidth200 maxwidth250', $showempty = '1')

+	public function selectGroupByField($object, $search_groupby, &$arrayofgroupby)

@@ -1539,0 +1363,36 @@
+		$YYYY = substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1);

+		$MM = substr($langs->trans("Month"), 0, 1).substr($langs->trans("Month"), 0, 1);

+		$DD = substr($langs->trans("Day"), 0, 1).substr($langs->trans("Day"), 0, 1);

+		$HH = substr($langs->trans("Hour"), 0, 1).substr($langs->trans("Hour"), 0, 1);

+		$MI = substr($langs->trans("Minute"), 0, 1).substr($langs->trans("Minute"), 0, 1);

+		$SS = substr($langs->trans("Second"), 0, 1).substr($langs->trans("Second"), 0, 1);

+

+		foreach ($object->fields as $key => $val) {

+			if (!$val['measure']) {

+				if (in_array($key, array(

+					'id', 'ref_int', 'ref_ext', 'rowid', 'entity', 'last_main_doc', 'logo', 'logo_squarred', 'extraparams',

+					'parent', 'photo', 'socialnetworks', 'webservices_url', 'webservices_key'))) continue;

+				if (isset($val['enabled']) && !dol_eval($val['enabled'], 1)) continue;

+				if (isset($val['visible']) && !dol_eval($val['visible'], 1)) continue;

+				if (preg_match('/^fk_/', $key) && !preg_match('/^fk_statu/', $key)) continue;

+				if (preg_match('/^pass/', $key)) continue;

+				if (in_array($val['type'], array('html', 'text'))) continue;

+				if (in_array($val['type'], array('timestamp', 'date', 'datetime'))) {

+					$arrayofgroupby['t.'.$key.'-year'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.')', 'position' => $val['position'].'-y');

+					$arrayofgroupby['t.'.$key.'-month'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.'-'.$MM.')', 'position' => $val['position'].'-m');

+					$arrayofgroupby['t.'.$key.'-day'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.'-'.$MM.'-'.$DD.')', 'position' => $val['position'].'-d');

+				} else {

+					$arrayofgroupby['t.'.$key] = array('label' => $langs->trans($val['label']), 'position' => (int) $val['position']);

+				}

+			}

+		}

+		// Add extrafields to Group by

+		if ($object->isextrafieldmanaged) {

+			foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {

+				if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate') continue;

+				if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key])) continue;

+				$arrayofgroupby['te.'.$key] = array('label' => $langs->trans($extrafields->attributes[$object->table_element]['label'][$key]), 'position' => 1000 + (int) $extrafields->attributes[$object->table_element]['pos'][$key]);

+			}

+		}

+

+		$arrayofgroupby = dol_sort_array($arrayofgroupby, 'position', 'asc', 0, 0, 1);

@@ -1544 +1403 @@
-		$result = $form->selectarray('search_groupby', $arrayofgroupbylabel, $search_groupby, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, 1);

+		$result = $form->selectarray('search_groupby', $arrayofgroupbylabel, $search_groupby, 1, 0, 0, '', 0, 0, 0, '', 'minwidth250', 1);

@@ -1555,3 +1414 @@
-	 * @param	string  $showempty          '1' or 'text'

-	 * @param	string	$morecss			More css

-	 * @return 	string						HTML string component

+	 * @return string						HTML string component

@@ -1559 +1416 @@
-	public function selectXAxisField($object, $search_xaxis, &$arrayofxaxis, $showempty = '1', $morecss = 'minwidth250 maxwidth500')

+	public function selectXAxisField($object, $search_xaxis, &$arrayofxaxis)

@@ -1561 +1418,40 @@
-		global $form;

+		global $langs, $extrafields, $form;

+

+		$YYYY = substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1);

+		$MM = substr($langs->trans("Month"), 0, 1).substr($langs->trans("Month"), 0, 1);

+		$DD = substr($langs->trans("Day"), 0, 1).substr($langs->trans("Day"), 0, 1);

+		$HH = substr($langs->trans("Hour"), 0, 1).substr($langs->trans("Hour"), 0, 1);

+		$MI = substr($langs->trans("Minute"), 0, 1).substr($langs->trans("Minute"), 0, 1);

+		$SS = substr($langs->trans("Second"), 0, 1).substr($langs->trans("Second"), 0, 1);

+

+

+		foreach ($object->fields as $key => $val) {

+			if (!$val['measure']) {

+				if (in_array($key, array(

+					'id', 'ref_int', 'ref_ext', 'rowid', 'entity', 'last_main_doc', 'logo', 'logo_squarred', 'extraparams',

+					'parent', 'photo', 'socialnetworks', 'webservices_url', 'webservices_key'))) continue;

+				if (isset($val['enabled']) && !dol_eval($val['enabled'], 1)) continue;

+				if (isset($val['visible']) && !dol_eval($val['visible'], 1)) continue;

+				if (preg_match('/^fk_/', $key) && !preg_match('/^fk_statu/', $key)) continue;

+				if (preg_match('/^pass/', $key)) continue;

+				if (in_array($val['type'], array('html', 'text'))) continue;

+				if (in_array($val['type'], array('timestamp', 'date', 'datetime'))) {

+					$arrayofxaxis['t.'.$key.'-year'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.')', 'position' => $val['position'].'-y');

+					$arrayofxaxis['t.'.$key.'-month'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.'-'.$MM.')', 'position' => $val['position'].'-m');

+					$arrayofxaxis['t.'.$key.'-day'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.'-'.$MM.'-'.$DD.')', 'position' => $val['position'].'-d');

+				} else {

+					$arrayofxaxis['t.'.$key] = array('label' => $langs->trans($val['label']), 'position' => (int) $val['position']);

+				}

+			}

+		}

+

+		// Add extrafields to X-Axis

+		if ($object->isextrafieldmanaged) {

+			foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {

+				if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate') continue;

+				if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key])) continue;

+				$arrayofxaxis['te.'.$key] = array('label' => $langs->trans($extrafields->attributes[$object->table_element]['label'][$key]), 'position' => 1000 + (int) $extrafields->attributes[$object->table_element]['pos'][$key]);

+			}

+		}

+

+		$arrayofxaxis = dol_sort_array($arrayofxaxis, 'position', 'asc', 0, 0, 1);

@@ -1567 +1463 @@
-		$result = $form->selectarray('search_xaxis', $arrayofxaxislabel, $search_xaxis, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, 1);

+		$result = $form->selectarray('search_xaxis', $arrayofxaxislabel, $search_xaxis, 1, 0, 0, '', 0, 0, 0, '', 'minwidth250', 1);

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_html.formprojet.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_html.formprojet.class.php
@@ -26 +25,0 @@
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';

@@ -31 +30 @@
-class FormProjets extends Form

+class FormProjets

@@ -43,8 +42,3 @@
-	public $errors = array();

-

-

-	public $nboftasks;

-

-

-	/**

-	 *    Constructor

+

+	/**

+	 *	Constructor

@@ -52 +46 @@
-	 * @param DoliDB $db Database handler

+	 *  @param		DoliDB		$db      Database handler

@@ -60,3 +54,2 @@
-

-	/**

-	 * Output a combo list with projects qualified for a third party / user

+	/**

+	 *	Output a combo list with projects qualified for a third party / user

@@ -64,19 +57,18 @@
-	 * @param int 		$socid 			Id third party (-1=all, 0=only projects not linked to a third party, id=projects not linked or linked to third party id)

-	 * @param string|Project $selected Id of preselected project or Project (or ''). Note: If you know the ref, you can also provide it into $selected_input_value to save one request in some cases.

-	 * @param string 	$htmlname 		Name of HTML field

-	 * @param int 		$maxlength 		Maximum length of label

-	 * @param int 		$option_only 	Return only html options lines without the select tag

-	 * @param int|string	$show_empty 	Add an empty line

-	 * @param int 		$discard_closed Discard closed projects (0=Keep, 1=hide completely, 2=Disable). Use a negative value to not show the "discarded" tooltip.

-	 * @param int 		$forcefocus 	Force focus on field (works with javascript only)

-	 * @param int 		$disabled 		Disabled

-	 * @param int 		$mode 			0 for HTML mode and 1 for JSON mode

-	 * @param string 	$filterkey 		Key to filter on ref or title

-	 * @param int 		$nooutput 		No print output. Return it only.

-	 * @param int 		$forceaddid 	Force to add project id in list, event if not qualified

-	 * @param string 	$morecss 		More css

-	 * @param int 		$htmlid 		Html id to use instead of htmlname

-	 * @param string 	$morefilter 	More filters (Must be a sql sanitized string)

-	 * @return string                   Return html content

-	 */

-	public function select_projects($socid = -1, $selected = '', $htmlname = 'projectid', $maxlength = 16, $option_only = 0, $show_empty = 1, $discard_closed = 0, $forcefocus = 0, $disabled = 0, $mode = 0, $filterkey = '', $nooutput = 0, $forceaddid = 0, $morecss = '', $htmlid = '', $morefilter = '')

+	 *	@param	int		$socid      	Id third party (-1=all, 0=only projects not linked to a third party, id=projects not linked or linked to third party id)

+	 *	@param  string	$selected   	Id project preselected ('' or id of project)

+	 *	@param  string	$htmlname   	Name of HTML field

+	 *	@param	int		$maxlength		Maximum length of label

+	 *	@param	int		$option_only	Return only html options lines without the select tag

+	 *	@param	int		$show_empty		Add an empty line

+	 *  @param	int		$discard_closed Discard closed projects (0=Keep, 1=hide completely, 2=Disable). Use a negative value to not show the "discarded" tooltip.

+	 *  @param	int		$forcefocus		Force focus on field (works with javascript only)

+	 *  @param	int		$disabled		Disabled

+	 *  @param  int     $mode           0 for HTML mode and 1 for JSON mode

+	 *  @param  string  $filterkey      Key to filter

+	 *  @param  int     $nooutput       No print output. Return it only.

+	 *  @param  int     $forceaddid     Force to add project id in list, event if not qualified

+	 *  @param  string  $morecss        More css

+	 *	@param  int     $htmlid         Html id to use instead of htmlname

+	 *	@return string           		Return html content

+	 */

+	public function select_projects($socid = -1, $selected = '', $htmlname = 'projectid', $maxlength = 16, $option_only = 0, $show_empty = 1, $discard_closed = 0, $forcefocus = 0, $disabled = 0, $mode = 0, $filterkey = '', $nooutput = 0, $forceaddid = 0, $morecss = '', $htmlid = '')

@@ -87,6 +78,0 @@
-		$selected_input_value = '';

-		if (is_object($selected)) {

-			$selected_input_value = $selected->ref;

-			$selected = $selected->id;

-		}

-

@@ -95 +81,2 @@
-		if (!empty($conf->use_javascript_ajax) && getDolGlobalString('PROJECT_USE_SEARCH_TO_SELECT')) {

+		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->PROJECT_USE_SEARCH_TO_SELECT))

+		{

@@ -98,2 +85,3 @@
-			if ($selected && empty($selected_input_value)) {

-				require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';

+			if ($selected && empty($selected_input_value))

+			{

+				require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';

@@ -104,12 +92,18 @@
-			$urloption = 'socid=' . ((int) $socid) . '&htmlname=' . urlencode($htmlname) . '&discardclosed=' . ((int) $discard_closed);

-			if ($morefilter == 'usage_organize_event=1') {

-				$urloption .= '&usage_organize_event=1';

-			}

-			$out .= '<input type="text" class="minwidth200' . ($morecss ? ' ' . $morecss : '') . '" name="search_' . $htmlname . '" id="search_' . $htmlname . '" value="' . $selected_input_value . '"' . $placeholder . ' />';

-

-			$out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT . '/projet/ajax/projects.php', $urloption, $conf->global->PROJECT_USE_SEARCH_TO_SELECT, 0, array());

-		} else {

-			$out .= $this->select_projects_list($socid, $selected, $htmlname, $maxlength, $option_only, $show_empty, abs($discard_closed), $forcefocus, $disabled, 0, $filterkey, 1, $forceaddid, $htmlid, $morecss, $morefilter);

-		}

-		if ($discard_closed > 0) {

-			if (!empty($form)) {

+			$urloption = 'socid='.$socid.'&htmlname='.$htmlname.'&discardclosed='.$discard_closed;

+			$out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/projet/ajax/projects.php', $urloption, $conf->global->PROJECT_USE_SEARCH_TO_SELECT, 0, array(

+				//  'update' => array(

+				//      'projectid' => 'id'

+				//  )

+			));

+

+			$out .= '<input type="text" class="minwidth200'.($morecss ? ' '.$morecss : '').'" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' />';

+		}

+		else

+		{

+			$out .= $this->select_projects_list($socid, $selected, $htmlname, $maxlength, $option_only, $show_empty, abs($discard_closed), $forcefocus, $disabled, 0, $filterkey, 1, $forceaddid, $htmlid, $morecss);

+		}

+		if ($discard_closed > 0)

+		{

+			if (class_exists('Form'))

+			{

+				if (!is_object($form)) $form = new Form($this->db);

@@ -120 +114,2 @@
-		if (empty($nooutput)) {

+		if (empty($nooutput))

+		{

@@ -123,3 +118,2 @@
-		} else {

-			return $out;

-		}

+		}

+		else return $out;

@@ -129 +122,0 @@
-

@@ -133,19 +126,18 @@
-	 * @param int 		$socid Id third party (-1=all, 0=only projects not linked to a third party, id=projects not linked or linked to third party id)

-	 * @param int 		$selected Id project preselected

-	 * @param string 	$htmlname Nom de la zone html

-	 * @param int 		$maxlength Maximum length of label

-	 * @param int 		$option_only Return only html options lines without the select tag

-	 * @param int|string	$show_empty Add an empty line

-	 * @param int 		$discard_closed Discard closed projects (0=Keep,1=hide completely,2=Disable)

-	 * @param int 		$forcefocus Force focus on field (works with javascript only)

-	 * @param int 		$disabled Disabled

-	 * @param int 		$mode 0 for HTML mode and 1 for array return (to be used by json_encode for example)

-	 * @param string 	$filterkey Key to filter on title or ref

-	 * @param int 		$nooutput No print output. Return it only.

-	 * @param int 		$forceaddid Force to add project id in list, event if not qualified

-	 * @param int 		$htmlid Html id to use instead of htmlname

-	 * @param string 	$morecss More CSS

-	 * @param string 	$morefilter More filters (Must be a sql sanitized string)

-	 * @return int|string|array                           HTML string or array of option or <0 if KO

-	 */

-	public function select_projects_list($socid = -1, $selected = '', $htmlname = 'projectid', $maxlength = 24, $option_only = 0, $show_empty = 1, $discard_closed = 0, $forcefocus = 0, $disabled = 0, $mode = 0, $filterkey = '', $nooutput = 0, $forceaddid = 0, $htmlid = '', $morecss = 'maxwidth500', $morefilter = '')

+	 * @param  int     $socid      	       Id third party (-1=all, 0=only projects not linked to a third party, id=projects not linked or linked to third party id)

+	 * @param  int     $selected   	       Id project preselected

+	 * @param  string  $htmlname   	       Nom de la zone html

+	 * @param  int     $maxlength          Maximum length of label

+	 * @param  int     $option_only	       Return only html options lines without the select tag

+	 * @param  int     $show_empty		   Add an empty line

+	 * @param  int     $discard_closed     Discard closed projects (0=Keep,1=hide completely,2=Disable)

+	 * @param  int     $forcefocus		   Force focus on field (works with javascript only)

+	 * @param  int     $disabled           Disabled

+	 * @param  int     $mode               0 for HTML mode and 1 for array return (to be used by json_encode for example)

+	 * @param  string  $filterkey          Key to filter

+	 * @param  int     $nooutput           No print output. Return it only.

+	 * @param  int     $forceaddid         Force to add project id in list, event if not qualified

+	 * @param  int     $htmlid             Html id to use instead of htmlname

+	 * @param  string  $morecss            More CSS

+	 * @return int         			       Nb of project if OK, <0 if KO

+	 */

+	public function select_projects_list($socid = -1, $selected = '', $htmlname = 'projectid', $maxlength = 24, $option_only = 0, $show_empty = 1, $discard_closed = 0, $forcefocus = 0, $disabled = 0, $mode = 0, $filterkey = '', $nooutput = 0, $forceaddid = 0, $htmlid = '', $morecss = 'maxwidth500')

@@ -156,5 +148,3 @@
-		require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';

-

-		if (empty($htmlid)) {

-			$htmlid = $htmlname;

-		}

+		require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';

+

+		if (empty($htmlid)) $htmlid = $htmlname;

@@ -166,3 +156 @@
-		if (getDolGlobalString('PROJECT_HIDE_UNSELECTABLES')) {

-			$hideunselectables = true;

-		}

+		if (!empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) $hideunselectables = true;

@@ -171 +159,2 @@
-		if (!$user->hasRight('projet', 'all', 'lire')) {

+		if (empty($user->rights->projet->all->lire))

+		{

@@ -177,22 +166,14 @@
-		$sql = "SELECT p.rowid, p.ref, p.title, p.fk_soc, p.fk_statut, p.public, s.nom as name, s.name_alias";

-		$sql .= " FROM " . $this->db->prefix() . "projet as p LEFT JOIN " . $this->db->prefix() . "societe as s ON s.rowid = p.fk_soc";

-		$sql .= " WHERE p.entity IN (" . getEntity('project') . ")";

-		if ($projectsListId !== false) {

-			$sql .= " AND p.rowid IN (" . $this->db->sanitize($projectsListId) . ")";

-		}

-		if ($socid == 0) {

-			$sql .= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";

-		}

-		if ($socid > 0) {

-			if (!getDolGlobalString('PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY')) {

-				$sql .= " AND (p.fk_soc=" . ((int) $socid) . " OR p.fk_soc IS NULL)";

-			} elseif (getDolGlobalString('PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY') != 'all') {    // PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY is 'all' or a list of ids separated by coma.

-				$sql .= " AND (p.fk_soc IN (" . $this->db->sanitize(((int) $socid) . ", " . getDolGlobalString('PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY')) . ") OR p.fk_soc IS NULL)";

-			}

-		}

-		if (!empty($filterkey)) {

-			$sql .= natural_search(array('p.title', 'p.ref'), $filterkey);

-		}

-		if ($morefilter) {

-			$sql .= ' AND (' . $this->db->sanitize($morefilter, 0, 1) . ')';

-		}

+		$sql = 'SELECT p.rowid, p.ref, p.title, p.fk_soc, p.fk_statut, p.public, s.nom as name, s.name_alias';

+		$sql .= ' FROM '.MAIN_DB_PREFIX.'projet as p LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc';

+		$sql .= " WHERE p.entity IN (".getEntity('project').")";

+		if ($projectsListId !== false) $sql .= " AND p.rowid IN (".$projectsListId.")";

+		if ($socid == 0) $sql .= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";

+		if ($socid > 0)

+		{

+			if (empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY))  $sql .= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";

+			elseif ($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY != 'all')    // PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY is 'all' or a list of ids separated by coma.

+			{

+				$sql .= " AND (p.fk_soc IN (".$socid.", ".$conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY.") OR p.fk_soc IS NULL)";

+			}

+		}

+		if (!empty($filterkey)) $sql .= natural_search(array('p.title', 'p.ref'), $filterkey);

@@ -202,2 +183,8 @@
-		if ($resql) {

-			if (!empty($conf->use_javascript_ajax)) {

+		if ($resql)

+		{

+			// Use select2 selector

+			if (!empty($conf->use_javascript_ajax))

+			{

+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

+			   	$comboenhancement = ajax_combobox($htmlid, array(), 0, $forcefocus);

+				$out .= $comboenhancement;

@@ -205,0 +193 @@
+

@@ -207 +195 @@
-				$out .= '<select class="flat' . ($morecss ? ' ' . $morecss : '') . '"' . ($disabled ? ' disabled="disabled"' : '') . ' id="' . $htmlid . '" name="' . $htmlname . '">';

+				$out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'"'.($disabled ? ' disabled="disabled"' : '').' id="'.$htmlid.'" name="'.$htmlname.'">';

@@ -210,5 +198 @@
-				if (is_numeric($show_empty)) {

-					$out .= '<option value="0">&nbsp;</option>';

-				} else {

-					$out .= '<option value="-1">'.$show_empty.'</option>';

-				}

+				$out .= '<option value="0">&nbsp;</option>';

@@ -218,2 +202,4 @@
-			if ($num) {

-				while ($i < $num) {

+			if ($num)

+			{

+				while ($i < $num)

+				{

@@ -222 +208,2 @@
-					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && !$user->hasRight('societe', 'lire')) {

+					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && !$user->rights->societe->lire)

+					{

@@ -224,2 +211,5 @@
-					} else {

-						if ($discard_closed == 1 && $obj->fk_statut == 2 && $obj->rowid != $selected) { // We discard closed except if selected

+					}

+					else

+					{

+						if ($discard_closed == 1 && $obj->fk_statut == 2 && $obj->rowid != $selected) // We discard closed except if selected

+						{

@@ -233,5 +223,35 @@
-						$labeltoshow .= ', ' . dol_trunc($obj->title, $maxlength);

-						if ($obj->name) {

-							$labeltoshow .= ' - ' . $obj->name;

-							if ($obj->name_alias) {

-								$labeltoshow .= ' (' . $obj->name_alias . ')';

+						$labeltoshow .= ', '.dol_trunc($obj->title, $maxlength);

+						if ($obj->name)

+						{

+							$labeltoshow .= ' - '.$obj->name;

+							if ($obj->name_alias) $labeltoshow .= ' ('.$obj->name_alias.')';

+						}

+

+						$disabled = 0;

+						if ($obj->fk_statut == 0)

+						{

+							$disabled = 1;

+							$labeltoshow .= ' - '.$langs->trans("Draft");

+						}

+						elseif ($obj->fk_statut == 2)

+						{

+							if ($discard_closed == 2) $disabled = 1;

+							$labeltoshow .= ' - '.$langs->trans("Closed");

+						}

+						elseif (empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY) && $socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))

+						{

+							$disabled = 1;

+							$labeltoshow .= ' - '.$langs->trans("LinkedToAnotherCompany");

+						}

+

+						if (!empty($selected) && $selected == $obj->rowid)

+						{

+							$out .= '<option value="'.$obj->rowid.'" selected';

+							//if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled

+							$out .= '>'.$labeltoshow.'</option>';

+						}

+						else

+						{

+							if ($hideunselectables && $disabled && ($selected != $obj->rowid))

+							{

+								$resultat = '';

@@ -239,28 +259,4 @@
-						}

-

-						$disabled = 0;

-						if ($obj->fk_statut == 0) {

-							$disabled = 1;

-							$labeltoshow .= ' - ' . $langs->trans("Draft");

-						} elseif ($obj->fk_statut == 2) {

-							if ($discard_closed == 2) {

-								$disabled = 1;

-							}

-							$labeltoshow .= ' - ' . $langs->trans("Closed");

-						} elseif (!getDolGlobalString('PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY') && $socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid)) {

-							$disabled = 1;

-							$labeltoshow .= ' - ' . $langs->trans("LinkedToAnotherCompany");

-						}

-

-						if (!empty($selected) && $selected == $obj->rowid) {

-							$out .= '<option value="' . $obj->rowid . '" selected';

-							//if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled

-							$out .= '>' . $labeltoshow . '</option>';

-						} else {

-							if ($hideunselectables && $disabled && ($selected != $obj->rowid)) {

-								$resultat = '';

-							} else {

-								$resultat = '<option value="' . $obj->rowid . '"';

-								if ($disabled) {

-									$resultat .= ' disabled';

-								}

+							else

+							{

+								$resultat = '<option value="'.$obj->rowid.'"';

+								if ($disabled) $resultat .= ' disabled';

@@ -279,2 +275 @@
-								'labelx' => $labeltoshow,

-								'label' => ($disabled ? '<span class="opacitymedium">' . $labeltoshow . '</span>' : $labeltoshow),

+								'label' => $labeltoshow,

@@ -292,13 +287,3 @@
-				if (empty($option_only)) {

-					$out .= '</select>';

-				}

-

-				// Use select2 selector

-				if (!empty($conf->use_javascript_ajax)) {

-					include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

-					$comboenhancement = ajax_combobox($htmlid, array(), 0, $forcefocus);

-					$out .= $comboenhancement;

-					$morecss .= ' minwidth100';

-				}

-

-				if (empty($nooutput)) {

+				if (empty($option_only)) $out .= '</select>';

+				if (empty($nooutput))

+				{

@@ -307,3 +292,2 @@
-				} else {

-					return $out;

-				}

+				}

+				else return $out;

@@ -313 +297,3 @@
-		} else {

+		}

+		else

+		{

@@ -322,16 +308,16 @@
-	 * @param int $socid Id third party (-1=all, 0=only projects not linked to a third party, id=projects not linked or linked to third party id)

-	 * @param int $selected Id task preselected

-	 * @param string $htmlname Name of HTML select

-	 * @param int $maxlength Maximum length of label

-	 * @param int $option_only Return only html options lines without the select tag

-	 * @param string $show_empty Add an empty line ('1' or string to show for empty line)

-	 * @param int $discard_closed Discard closed projects (0=Keep, 1=hide completely, 2=Disable)

-	 * @param int $forcefocus Force focus on field (works with javascript only)

-	 * @param int $disabled Disabled

-	 * @param string $morecss More css added to the select component

-	 * @param string $projectsListId ''=Automatic filter on project allowed. List of id=Filter on project ids.

-	 * @param string $showmore 'all' = Show project info, 'progress' = Show task progression, ''=Show nothing more

-	 * @param User $usertofilter User object to use for filtering

-	 * @return int                    Nbr of tasks if OK, <0 if KO

-	 */

-	public function selectTasks($socid = -1, $selected = '', $htmlname = 'taskid', $maxlength = 24, $option_only = 0, $show_empty = '1', $discard_closed = 0, $forcefocus = 0, $disabled = 0, $morecss = 'maxwidth500', $projectsListId = '', $showmore = 'all', $usertofilter = null)

+	 *  @param	int		$socid      	Id third party (-1=all, 0=only projects not linked to a third party, id=projects not linked or linked to third party id)

+	 *  @param  int		$selected   	Id task preselected

+	 *  @param  string	$htmlname   	Name of HTML select

+	 *	@param	int		$maxlength		Maximum length of label

+	 *	@param	int		$option_only	Return only html options lines without the select tag

+	 *	@param	string	$show_empty		Add an empty line ('1' or string to show for empty line)

+	 *  @param	int		$discard_closed Discard closed projects (0=Keep,1=hide completely,2=Disable)

+	 *  @param	int		$forcefocus		Force focus on field (works with javascript only)

+	 *  @param	int		$disabled		Disabled

+	 *  @param	string	$morecss        More css added to the select component

+	 *  @param	string	$projectsListId ''=Automatic filter on project allowed. List of id=Filter on project ids.

+	 *  @param	string	$showproject	'all' = Show project info, ''=Hide project info

+	 *  @param	User	$usertofilter	User object to use for filtering

+	 *	@return int         			Nbr of tasks if OK, <0 if KO

+	 */

+	public function selectTasks($socid = -1, $selected = '', $htmlname = 'taskid', $maxlength = 24, $option_only = 0, $show_empty = '1', $discard_closed = 0, $forcefocus = 0, $disabled = 0, $morecss = 'maxwidth500', $projectsListId = '', $showproject = 'all', $usertofilter = null)

@@ -341,3 +327,4 @@
-		require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';

-

-		if (is_null($usertofilter)) {

+		require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';

+

+		if (is_null($usertofilter))

+		{

@@ -350,6 +337,6 @@
-		if (getDolGlobalString('PROJECT_HIDE_UNSELECTABLES')) {

-			$hideunselectables = true;

-		}

-

-		if (empty($projectsListId)) {

-			if (!$usertofilter->hasRight('projet', 'all', 'lire')) {

+		if (!empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) $hideunselectables = true;

+

+		if (empty($projectsListId))

+		{

+			if (empty($usertofilter->rights->projet->all->lire))

+			{

@@ -362,7 +349,6 @@
-		$sql = "SELECT t.rowid, t.ref as tref, t.label as tlabel, t.progress,";

-		$sql .= " p.rowid as pid, p.ref, p.title, p.fk_soc, p.fk_statut, p.public, p.usage_task,";

-		$sql .= " s.nom as name";

-		$sql .= " FROM " . $this->db->prefix() . "projet as p";

-		$sql .= " LEFT JOIN " . $this->db->prefix() . "societe as s ON s.rowid = p.fk_soc,";

-		$sql .= " " . $this->db->prefix() . "projet_task as t";

-		$sql .= " WHERE p.entity IN (" . getEntity('project') . ")";

+		$sql = 'SELECT t.rowid, t.ref as tref, t.label as tlabel, p.rowid as pid, p.ref, p.title, p.fk_soc, p.fk_statut, p.public,';

+		$sql .= ' s.nom as name';

+		$sql .= ' FROM '.MAIN_DB_PREFIX.'projet as p';

+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc,';

+		$sql .= ' '.MAIN_DB_PREFIX.'projet_task as t';

+		$sql .= " WHERE p.entity IN (".getEntity('project').")";

@@ -370,9 +356,3 @@
-		if ($projectsListId) {

-			$sql .= " AND p.rowid IN (" . $this->db->sanitize($projectsListId) . ")";

-		}

-		if ($socid == 0) {

-			$sql .= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";

-		}

-		if ($socid > 0) {

-			$sql .= " AND (p.fk_soc=" . ((int) $socid) . " OR p.fk_soc IS NULL)";

-		}

+		if ($projectsListId) $sql .= " AND p.rowid IN (".$projectsListId.")";

+		if ($socid == 0) $sql .= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";

+		if ($socid > 0)  $sql .= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";

@@ -382 +362,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -384,3 +365,4 @@
-			if (empty($option_only) && !empty($conf->use_javascript_ajax)) {

-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

-				$comboenhancement = ajax_combobox($htmlname, '', 0, $forcefocus);

+			if (!empty($conf->use_javascript_ajax))

+			{

+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

+			   	$comboenhancement = ajax_combobox($htmlname, '', 0, $forcefocus);

@@ -388 +370 @@
-				$morecss .= ' minwidth150imp';

+				$morecss = 'minwidth200imp maxwidth500';

@@ -392 +374 @@
-				$out .= '<select class="valignmiddle flat' . ($morecss ? ' ' . $morecss : '') . '"' . ($disabled ? ' disabled="disabled"' : '') . ' id="' . $htmlname . '" name="' . $htmlname . '">';

+				$out .= '<select class="valignmiddle flat'.($morecss ? ' '.$morecss : '').'"'.($disabled ? ' disabled="disabled"' : '').' id="'.$htmlname.'" name="'.$htmlname.'">';

@@ -397 +379 @@
-					//if (!empty($conf->use_javascript_ajax)) $out .= '<span class="opacitymedium">aaa';

+					//if (! empty($conf->use_javascript_ajax)) $out .= '<span class="opacitymedium">aaa';

@@ -399,4 +381,3 @@
-					//if (!empty($conf->use_javascript_ajax)) $out .= '</span>';

-				} else {

-					$out .= '&nbsp;';

-				}

+					//if (! empty($conf->use_javascript_ajax)) $out .= '</span>';

+				}

+				else $out .= '&nbsp;';

@@ -405 +385,0 @@
-

@@ -408,2 +388,4 @@
-			if ($num) {

-				while ($i < $num) {

+			if ($num)

+			{

+				while ($i < $num)

+				{

@@ -412 +394,2 @@
-					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && !$usertofilter->hasRight('societe', 'lire')) {

+					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && empty($usertofilter->rights->societe->lire))

+					{

@@ -414,2 +397,5 @@
-					} else {

-						if ($discard_closed == 1 && $obj->fk_statut == Project::STATUS_CLOSED) {

+					}

+					else

+					{

+						if ($discard_closed == 1 && $obj->fk_statut == Project::STATUS_CLOSED)

+						{

@@ -421,14 +407,3 @@
-						$titletoshow = '';

-

-						$disabled = 0;

-						if ($obj->fk_statut == Project::STATUS_DRAFT) {

-							$disabled = 1;

-						} elseif ($obj->fk_statut == Project::STATUS_CLOSED) {

-							if ($discard_closed == 2) {

-								$disabled = 1;

-							}

-						} elseif ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid)) {

-							$disabled = 1;

-						}

-

-						if (preg_match('/all/', $showmore)) {

+

+						if ($showproject == 'all')

+						{

@@ -438,6 +413,9 @@
-							$labeltoshow .= ' ' . dol_trunc($obj->title, $maxlength);

-							$titletoshow = $labeltoshow;

-

-							if ($obj->name) {

-								$labeltoshow .= ' (' . $obj->name . ')';

-								$titletoshow .= ' <span class="opacitymedium">(' . $obj->name . ')</span>';

+							$labeltoshow .= ' '.dol_trunc($obj->title, $maxlength);

+

+							if ($obj->name) $labeltoshow .= ' ('.$obj->name.')';

+

+							$disabled = 0;

+							if ($obj->fk_statut == Project::STATUS_DRAFT)

+							{

+								$disabled = 1;

+								$labeltoshow .= ' - '.$langs->trans("Draft");

@@ -445,3 +423,7 @@
-

-							$disabled = 0;

-							if ($obj->fk_statut == Project::STATUS_DRAFT) {

+							elseif ($obj->fk_statut == Project::STATUS_CLOSED)

+							{

+								if ($discard_closed == 2) $disabled = 1;

+								$labeltoshow .= ' - '.$langs->trans("Closed");

+							}

+							elseif ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))

+							{

@@ -449,12 +431 @@
-								$labeltoshow .= ' - ' . $langs->trans("Draft");

-								$titletoshow .= ' -  <span class="opacitymedium">' . $langs->trans("Draft") . '</span>';

-							} elseif ($obj->fk_statut == Project::STATUS_CLOSED) {

-								if ($discard_closed == 2) {

-									$disabled = 1;

-								}

-								$labeltoshow .= ' - ' . $langs->trans("Closed");

-								$titletoshow .= ' - <span class="opacitymedium">' . $langs->trans("Closed") . '</span>';

-							} elseif ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid)) {

-								$disabled = 1;

-								$labeltoshow .= ' - ' . $langs->trans("LinkedToAnotherCompany");

-								$titletoshow .= ' - <span class="opacitymedium">' . $langs->trans("LinkedToAnotherCompany") . '</span>';

+								$labeltoshow .= ' - '.$langs->trans("LinkedToAnotherCompany");

@@ -463 +433,0 @@
-							$titletoshow .= ' - ';

@@ -467,10 +437,5 @@
-						$labeltoshow .= $obj->tref . ' ' . dol_trunc($obj->tlabel, $maxlength);

-						$titletoshow .= $obj->tref . ' ' . dol_trunc($obj->tlabel, $maxlength);

-						if ($obj->usage_task && preg_match('/progress/', $showmore)) {

-							$labeltoshow .= ' <span class="opacitymedium">(' . $obj->progress . '%)</span>';

-							$titletoshow .= ' <span class="opacitymedium">(' . $obj->progress . '%)</span>';

-						}

-

-						if (!empty($selected) && $selected == $obj->rowid) {

-							$out .= '<option value="' . $obj->rowid . '" selected';

-							$out .= ' data-html="' . dol_escape_htmltag($titletoshow) . '"';

+						$labeltoshow .= $obj->tref.' '.dol_trunc($obj->tlabel, $maxlength);

+

+						if (!empty($selected) && $selected == $obj->rowid)

+						{

+							$out .= '<option value="'.$obj->rowid.'" selected';

@@ -478,3 +443,6 @@
-							$out .= '>' . $labeltoshow . '</option>';

-						} else {

-							if ($hideunselectables && $disabled && ($selected != $obj->rowid)) {

+							$out .= '>'.$labeltoshow.'</option>';

+						}

+						else

+						{

+							if ($hideunselectables && $disabled && ($selected != $obj->rowid))

+							{

@@ -482,5 +450,5 @@
-							} else {

-								$resultat = '<option value="' . $obj->rowid . '"';

-								if ($disabled) {

-									$resultat .= ' disabled';

-								}

+							}

+							else

+							{

+								$resultat = '<option value="'.$obj->rowid.'"';

+								if ($disabled) $resultat .= ' disabled';

@@ -489 +456,0 @@
-								$resultat .= ' data-html="' . dol_escape_htmltag($titletoshow) . '"';

@@ -504,2 +470,0 @@
-			$this->nboftasks = $num;

-

@@ -510 +475,3 @@
-		} else {

+		}

+		else

+		{

@@ -518 +484,0 @@
-

@@ -522,9 +488,8 @@
-	 * @param string $table_element Table of the element to update

-	 * @param string $socid If of thirdparty to use as filter or 'id1,id2,...'

-	 * @param string $morecss More CSS

-	 * @param int $limitonstatus Add filters to limit length of list to opened status (for example to avoid ERR_RESPONSE_HEADERS_TOO_BIG on project/element.php page). TODO To implement

-	 * @param string $projectkey Equivalent key  to fk_projet for actual table_element

-	 * @param string $placeholder Placeholder

-	 * @return    int|string                        The HTML select list of element or '' if nothing or -1 if KO

-	 */

-	public function select_element($table_element, $socid = 0, $morecss = '', $limitonstatus = -2, $projectkey = "fk_projet", $placeholder = '')

+	 *    @param	string		$table_element		Table of the element to update

+	 *    @param	string		$socid				If of thirdparty to use as filter or 'id1,id2,...'

+	 *    @param	string		$morecss			More CSS

+	 *    @param    int         $limitonstatus      Add filters to limit length of list to opened status (for example to avoid ERR_RESPONSE_HEADERS_TOO_BIG on project/element.php page). TODO To implement

+	 *    @param	string		$projectkey			Equivalent key  to fk_projet for actual table_element

+	 *    @return	int|string						The HTML select list of element or '' if nothing or -1 if KO

+	 */

+	public function select_element($table_element, $socid = 0, $morecss = '', $limitonstatus = -2, $projectkey = "fk_projet")

@@ -535,3 +500 @@
-		if ($table_element == 'projet_task') {

-			return ''; // Special cas of element we never link to a project (already always done)

-		}

+		if ($table_element == 'projet_task') return ''; // Special cas of element we never link to a project (already always done)

@@ -540,15 +503 @@
-		if (!in_array(

-			$table_element,

-			array(

-				'don',

-				'expensereport_det',

-				'expensereport', 'loan',

-				'stock_mouvement',

-				'payment_salary',

-				'payment_various',

-				'salary',

-				'chargesociales',

-				'entrepot')

-		)) {

-			$linkedtothirdparty = true;

-		}

+		if (!in_array($table_element, array('don', 'expensereport_det', 'expensereport', 'loan', 'stock_mouvement', 'payment_salary', 'payment_various', 'chargesociales'))) $linkedtothirdparty = true;

@@ -559 +508,2 @@
-		switch ($table_element) {

+		switch ($table_element)

+		{

@@ -593 +543 @@
-				$sql = "SELECT t.rowid, t.label as ref";

+				$sql = 'SELECT t.rowid, t.label as ref';

@@ -607,24 +557,12 @@
-		if ($linkedtothirdparty) {

-			$sql .= ", s.nom as name";

-		}

-		$sql .= " FROM " . $this->db->prefix() . $table_element . " as t";

-		if ($linkedtothirdparty) {

-			$sql .= ", " . $this->db->prefix() . "societe as s";

-		}

-		$sql .= " WHERE " . $projectkey . " is null";

-		if (!empty($socid) && $linkedtothirdparty) {

-			if (is_numeric($socid)) {

-				$sql .= " AND t.fk_soc = " . ((int) $socid);

-			} else {

-				$sql .= " AND t.fk_soc IN (" . $this->db->sanitize($socid) . ")";

-			}

-		}

-		if (!in_array($table_element, array('expensereport_det', 'stock_mouvement'))) {

-			$sql .= ' AND t.entity IN (' . getEntity('project') . ')';

-		}

-		if ($linkedtothirdparty) {

-			$sql .= " AND s.rowid = t.fk_soc";

-		}

-		if ($sqlfilter) {

-			$sql .= " AND " . $sqlfilter;

-		}

+		if ($linkedtothirdparty) $sql .= ", s.nom as name";

+		$sql .= " FROM ".MAIN_DB_PREFIX.$table_element." as t";

+		if ($linkedtothirdparty) $sql .= ", ".MAIN_DB_PREFIX."societe as s";

+		$sql .= " WHERE ".$projectkey." is null";

+		if (!empty($socid) && $linkedtothirdparty)

+		{

+			if (is_numeric($socid)) $sql .= " AND t.fk_soc=".$socid;

+			else $sql .= " AND t.fk_soc IN (".$socid.")";

+		}

+		if (!in_array($table_element, array('expensereport_det', 'stock_mouvement'))) $sql .= ' AND t.entity IN ('.getEntity('project').')';

+		if ($linkedtothirdparty) $sql .= " AND s.rowid = t.fk_soc";

+		if ($sqlfilter) $sql .= " AND ".$sqlfilter;

@@ -633 +571 @@
-		dol_syslog(get_class($this) . '::select_element', LOG_DEBUG);

+		dol_syslog(get_class($this).'::select_element', LOG_DEBUG);

@@ -635 +573,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -638,6 +577,6 @@
-			$sellist = '';

-

-			if ($num > 0) {

-				$sellist = '<select class="flat elementselect css' . $table_element . ($morecss ? ' ' . $morecss : '') . '" name="elementselect">';

-				$sellist .= '<option value="-1"' . ($placeholder ? ' class="optiongrey"' : '') . '>' . $placeholder . '</option>';

-				while ($i < $num) {

+			if ($num > 0)

+			{

+				$sellist = '<select class="flat elementselect css'.$table_element.($morecss ? ' '.$morecss : '').'" name="elementselect">';

+				$sellist .= '<option value="-1"></option>';

+				while ($i < $num)

+				{

@@ -646,7 +585,3 @@
-					if (!empty($obj->ref_supplier)) {

-						$ref .= ' (' . $obj->ref_supplier . ')';

-					}

-					if (!empty($obj->name)) {

-						$ref .= ' - ' . $obj->name;

-					}

-					$sellist .= '<option value="' . $obj->rowid . '">' . $ref . '</option>';

+					if (!empty($obj->ref_supplier)) $ref .= ' ('.$obj->ref_supplier.')';

+					if (!empty($obj->name)) $ref .= ' - '.$obj->name;

+					$sellist .= '<option value="'.$obj->rowid.'">'.$ref.'</option>';

@@ -666 +601,3 @@
-		} else {

+		}

+		else

+		{

@@ -670 +607 @@
-			dol_syslog(get_class($this) . "::select_element " . $this->error, LOG_ERR);

+			dol_syslog(get_class($this)."::select_element ".$this->error, LOG_ERR);

@@ -679,12 +616,11 @@
-	 * @param string $htmlname HTML name

-	 * @param string $preselected Preselected (int or 'all' or 'none')

-	 * @param int $showempty Add an empty line

-	 * @param int $useshortlabel Use short label

-	 * @param int $showallnone Add choice "All" and "None"

-	 * @param int $showpercent Show default probability for status

-	 * @param string $morecss Add more css

-	 * @param int $noadmininfo 0=Add admin info, 1=Disable admin info

-	 * @param int $addcombojs 1=Add a js combo

-	 * @return  int|string                      The HTML select list of element or '' if nothing or -1 if KO

-	 */

-	public function selectOpportunityStatus($htmlname, $preselected = '-1', $showempty = 1, $useshortlabel = 0, $showallnone = 0, $showpercent = 0, $morecss = '', $noadmininfo = 0, $addcombojs = 0)

+	 *    @param   string      $htmlname           HTML name

+	 *    @param   string      $preselected        Preselected (int or 'all' or 'none')

+	 *    @param   int         $showempty          Add an empty line

+	 *    @param   int         $useshortlabel      Use short label

+	 *    @param   int         $showallnone        Add choice "All" and "None"

+	 *    @param   int         $showpercent        Show default probability for status

+	 *    @param   string      $morecss            Add more css

+	 * 	  @param   int	       $noadmininfo        0=Add admin info, 1=Disable admin info

+	 *    @return  int|string                      The HTML select list of element or '' if nothing or -1 if KO

+	 */

+	public function selectOpportunityStatus($htmlname, $preselected = '-1', $showempty = 1, $useshortlabel = 0, $showallnone = 0, $showpercent = 0, $morecss = '', $noadmininfo = 0)

@@ -695 +631 @@
-		$sql .= " FROM " . $this->db->prefix() . 'c_lead_status';

+		$sql .= " FROM ".MAIN_DB_PREFIX.'c_lead_status';

@@ -700 +636,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -703,2 +640,3 @@
-			if ($num > 0) {

-				$sellist = '<select class="flat oppstatus' . ($morecss ? ' ' . $morecss : '') . '" id="' . $htmlname . '" name="' . $htmlname . '">';

+			if ($num > 0)

+			{

+				$sellist = '<select class="flat oppstatus'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'">';

@@ -710,6 +648,7 @@
-					$sellist .= '<option value="all"' . ($preselected == 'all' ? ' selected="selected"' : '') . '>-- ' . $langs->trans("OnlyOpportunitiesShort") . '</option>';

-					$sellist .= '<option value="openedopp"' . ($preselected == 'openedopp' ? ' selected="selected"' : '') . '>-- ' . $langs->trans("OpenedOpportunitiesShort") . '</option>';

-					$sellist .= '<option value="notopenedopp"' . ($preselected == 'notopenedopp' ? ' selected="selected"' : '') . '>-- ' . $langs->trans("NotOpenedOpportunitiesShort") . '</option>';

-					$sellist .= '<option value="none"' . ($preselected == 'none' ? ' selected="selected"' : '') . '>-- ' . $langs->trans("NotAnOpportunityShort") . '</option>';

-				}

-				while ($i < $num) {

+					$sellist .= '<option value="all"'.($preselected == 'all' ? ' selected="selected"' : '').'>-- '.$langs->trans("OnlyOpportunitiesShort").' --</option>';

+					$sellist .= '<option value="openedopp"'.($preselected == 'openedopp' ? ' selected="selected"' : '').'>-- '.$langs->trans("OpenedOpportunitiesShort").' --</option>';

+					$sellist .= '<option value="notopenedopp"'.($preselected == 'notopenedopp' ? ' selected="selected"' : '').'>-- '.$langs->trans("NotOpenedOpportunitiesShort").' --</option>';

+					$sellist .= '<option value="none"'.($preselected == 'none' ? ' selected="selected"' : '').'>-- '.$langs->trans("NotAnOpportunityShort").' --</option>';

+				}

+				while ($i < $num)

+				{

@@ -718,3 +657,6 @@
-					$sellist .= '<option value="' . $obj->rowid . '" defaultpercent="' . $obj->percent . '" elemcode="' . $obj->code . '"';

-					if ($obj->rowid == $preselected) {

-						$sellist .= ' selected="selected"';

+					$sellist .= '<option value="'.$obj->rowid.'" defaultpercent="'.$obj->percent.'" elemcode="'.$obj->code.'"';

+					if ($obj->rowid == $preselected) $sellist .= ' selected="selected"';

+					$sellist .= '>';

+					if ($useshortlabel)

+					{

+						$finallabel = ($langs->transnoentitiesnoconv("OppStatus".$obj->code) != "OppStatus".$obj->code ? $langs->transnoentitiesnoconv("OppStatus".$obj->code) : $obj->label);

@@ -722,8 +664,4 @@
-					$sellist .= '>';

-					if ($useshortlabel) {

-						$finallabel = ($langs->transnoentitiesnoconv("OppStatus" . $obj->code) != "OppStatus" . $obj->code ? $langs->transnoentitiesnoconv("OppStatus" . $obj->code) : $obj->label);

-					} else {

-						$finallabel = ($langs->transnoentitiesnoconv("OppStatus" . $obj->code) != "OppStatus" . $obj->code ? $langs->transnoentitiesnoconv("OppStatus" . $obj->code) : $obj->label);

-						if ($showpercent) {

-							$finallabel .= ' (' . $obj->percent . '%)';

-						}

+					else

+					{

+						$finallabel = ($langs->transnoentitiesnoconv("OppStatus".$obj->code) != "OppStatus".$obj->code ? $langs->transnoentitiesnoconv("OppStatus".$obj->code) : $obj->label);

+						if ($showpercent) $finallabel .= ' ('.$obj->percent.'%)';

@@ -736,8 +674 @@
-

-				if ($user->admin && !$noadmininfo) {

-					$sellist .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

-				}

-

-				if ($addcombojs) {

-					$sellist .= ajax_combobox($htmlname);

-				}

+				if ($user->admin && !$noadmininfo) $sellist .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

@@ -754 +685,3 @@
-		} else {

+		}

+		else

+		{

@@ -757 +690 @@
-			dol_syslog(get_class($this) . "::selectOpportunityStatus " . $this->error, LOG_ERR);

+			dol_syslog(get_class($this)."::selectOpportunityStatus ".$this->error, LOG_ERR);

@@ -760,163 +692,0 @@
-	}

-

-	/**

-	 *  Return combo list of differents status of a orders

-	 *

-	 *  @param	string	$selected   Preselected value

-	 *  @param	int		$short		Use short labels

-	 *  @param	string	$hmlname	Name of HTML select element

-	 *  @return	void

-	 */

-	public function selectProjectsStatus($selected = '', $short = 0, $hmlname = 'order_status')

-	{

-		$options = array();

-

-		// 7 is same label than 6. 8 does not exists (billed is another field)

-		$statustohow = array(

-			'0' => '0',

-			'1' => '1',

-			'2' => '2',

-		);

-

-		$tmpproject = new Project($this->db);

-

-		foreach ($statustohow as $key => $value) {

-			$tmpproject->statut = $key;

-			$options[$value] = $tmpproject->getLibStatut($short);

-		}

-

-		if (is_array($selected)) {

-			$selectedarray = $selected;

-		} elseif ($selected == 99) {

-			$selectedarray = array(0,1);

-		} else {

-			$selectedarray = explode(',', $selected);

-		}

-

-		print Form::multiselectarray($hmlname, $options, $selectedarray, 0, 0, 'minwidth100');

-	}

-

-	/**

-	 *  Output a combo list with invoices and lines qualified for a project

-	 *

-	 * @param int $selectedInvoiceId Id invoice preselected

-	 * @param int $selectedLineId Id invoice line preselected

-	 * @param string $htmlNameInvoice Name of HTML select for Invoice

-	 * @param int $htmlNameInvoiceLine Name of HTML select for Invoice Line

-	 * @param string $morecss More css added to the select component

-	 * @param array $filters Array of filters

-	 * @param int $lineOnly return only option for line

-	 * @return string                    HTML Select

-	 */

-	public function selectInvoiceAndLine($selectedInvoiceId = 0, $selectedLineId = 0, $htmlNameInvoice = 'invoiceid', $htmlNameInvoiceLine = 'invoicelineid', $morecss = 'maxwidth500', $filters = array(), $lineOnly = 0)

-	{

-		global $user, $conf, $langs;

-

-		require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';

-

-		$out = '';

-		if (empty($lineOnly)) {

-			// Search Invoice

-			$sql = "SELECT f.rowid, f.ref as fref,";

-			$sql .= ' s.nom as name';

-			$sql .= ' FROM ' . $this->db->prefix() . 'projet as p';

-			$sql .= ' INNER JOIN ' . $this->db->prefix() . 'societe as s ON s.rowid = p.fk_soc';

-			$sql .= ' INNER JOIN ' . $this->db->prefix() . 'facture as f ON f.fk_projet = p.rowid';

-			$sql .= " WHERE p.entity IN (" . getEntity('project') . ")";

-			if (!empty($filters)) {

-				foreach ($filters as $key => $value) {

-					if ($key == 'p.rowid') {

-						$sql .= " AND p.rowid=" . (int) $value;

-					}

-					if ($key == 'f.rowid') {

-						$sql .= " AND f.rowid=" . (int) $value;

-					}

-				}

-			}

-			$sql .= " ORDER BY p.ref, f.ref ASC";

-

-			$resql = $this->db->query($sql);

-			if ($resql) {

-				// Use select2 selector

-				if (!empty($conf->use_javascript_ajax)) {

-					include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

-					$comboenhancement = ajax_combobox($htmlNameInvoice, array(array('method'=>'getLines', 'url'=>dol_buildpath('/core/ajax/ajaxinvoiceline.php', 1), 'htmlname'=>$htmlNameInvoiceLine)), 0, 0);

-					$out .= $comboenhancement;

-					$morecss = 'minwidth200imp maxwidth500';

-				}

-

-				$out .= '<select class="valignmiddle flat' . ($morecss ? ' ' . $morecss : '') . '" id="' . $htmlNameInvoice . '" name="' . $htmlNameInvoice . '">';

-				$num = $this->db->num_rows($resql);

-				if ($num) {

-					while ($obj = $this->db->fetch_object($resql)) {

-						$labeltoshow = $obj->fref; // Invoice ref

-						if ($obj->name) {

-							$labeltoshow .= ' - ' . $obj->name;

-						}

-

-						$out .= '<option value="' . $obj->rowid . '" ';

-						if (!empty($selectedInvoiceId) && $selectedInvoiceId == $obj->rowid) {

-							$out .= ' selected ';

-						}

-						$out .= '>' . $labeltoshow . '</option>';

-					}

-				}

-				$out .= '</select>';

-			} else {

-				dol_print_error($this->db->lasterror);

-				return '';

-			}

-		}

-

-		// Search Invoice Line

-		$sql = "SELECT fd.rowid, fd.label, fd.description";

-		$sql .= ' FROM ' . $this->db->prefix() . 'projet as p';

-		$sql .= ' INNER JOIN ' . $this->db->prefix() . 'societe as s ON s.rowid = p.fk_soc';

-		$sql .= ' INNER JOIN ' . $this->db->prefix() . 'facture as f ON f.fk_projet = p.rowid';

-		$sql .= ' INNER JOIN ' . $this->db->prefix() . 'facturedet as fd ON fd.fk_facture = f.rowid';

-		$sql .= " WHERE p.entity IN (" . getEntity('project') . ")";

-		if (!empty($filters)) {

-			foreach ($filters as $key => $value) {

-				if ($key == 'p.rowid') {

-					$sql .= " AND p.rowid=" . (int) $value;

-				}

-			}

-		}

-		if (!empty($selectedInvoiceId)) {

-			$sql .= " AND f.rowid=" . (int) $selectedInvoiceId;

-		}

-		$sql .= " ORDER BY p.ref, f.ref ASC";

-		$resql = $this->db->query($sql);

-		if ($resql) {

-			// Use select2 selector

-			if (empty($lineOnly)) {

-				if (!empty($conf->use_javascript_ajax)) {

-					include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

-					$comboenhancement = ajax_combobox($htmlNameInvoiceLine, '', 0, 0);

-					$out .= $comboenhancement;

-					$morecss = 'minwidth200imp maxwidth500';

-				}

-

-				$out .= '<select class="valignmiddle flat' . ($morecss ? ' ' . $morecss : '') . '" id="' . $htmlNameInvoiceLine . '" name="' . $htmlNameInvoiceLine . '">';

-			}

-			$num = $this->db->num_rows($resql);

-			if ($num) {

-				while ($obj = $this->db->fetch_object($resql)) {

-					$labeltoshow .= $obj->description; // Invoice ref

-

-					$out .= '<option value="' . $obj->rowid . '" ';

-					if (!empty($selectedLineId) && $selectedLineId == $obj->rowid) {

-						$out .= ' selected ';

-					}

-					$out .= '>' . $labeltoshow . '</option>';

-				}

-			}

-			if (empty($lineOnly)) {

-				$out .= '</select>';

-			}

-		} else {

-			dol_print_error($this->db->lasterror);

-			return '';

-		}

-

-		return $out;

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_html.formpropal.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_html.formpropal.class.php
@@ -3 +2,0 @@
- * Copyright (C) 2022 Josep Lluís Amador	<joseplluis@lliuretic.cat>

@@ -31,4 +30,4 @@
-	/**

-	 * @var DoliDB Database handler.

-	 */

-	public $db;

+    /**

+     * @var DoliDB Database handler.

+     */

+    public $db;

@@ -36,4 +35,4 @@
-	/**

-	 * @var string Error code (or message)

-	 */

-	public $error = '';

+    /**

+     * @var string Error code (or message)

+     */

+    public $error = '';

@@ -42,9 +41,9 @@
-	/**

-	 * Constructor

-	 *

-	 * @param		DoliDB		$db      Database handler

-	 */

-	public function __construct($db)

-	{

-		$this->db = $db;

-	}

+    /**

+     * Constructor

+     *

+     * @param		DoliDB		$db      Database handler

+     */

+    public function __construct($db)

+    {

+        $this->db = $db;

+    }

@@ -52,16 +51,15 @@
-	/**

-	 *    Return combo list of differents status of a proposal

-	 *    Values are id of table c_propalst

-	 *

-	 *    @param	string	$selected   	Preselected value

-	 *    @param	int		$short			Use short labels

-	 *    @param	int		$excludedraft	0=All status, 1=Exclude draft status

-	 *    @param	int 	$showempty		1=Add empty line

-	 *    @param    string  $mode           'customer', 'supplier'

-	 *    @param    string  $htmlname       Name of select field

-	 *    @param	string	$morecss		More css

-	 *    @return	void

-	 */

-	public function selectProposalStatus($selected = '', $short = 0, $excludedraft = 0, $showempty = 1, $mode = 'customer', $htmlname = 'propal_statut', $morecss = '')

-	{

-		global $langs;

+    /**

+     *    Return combo list of differents status of a proposal

+     *    Values are id of table c_propalst

+     *

+     *    @param	string	$selected   	Preselected value

+     *    @param	int		$short			Use short labels

+     *    @param	int		$excludedraft	0=All status, 1=Exclude draft status

+     *    @param	int 	$showempty		1=Add empty line

+     *    @param    string  $mode           'customer', 'supplier'

+     *    @param    string  $htmlname       Name of select field

+     *    @return	void

+     */

+    public function selectProposalStatus($selected = '', $short = 0, $excludedraft = 0, $showempty = 1, $mode = 'customer', $htmlname = 'propal_statut')

+    {

+        global $langs;

@@ -69,4 +67,4 @@
-		$prefix = '';

-		$listofstatus = array();

-		if ($mode == 'supplier') {

-			$prefix = 'SupplierProposalStatus';

+        $prefix = '';

+        $listofstatus = array();

+        if ($mode == 'supplier') {

+            $prefix = 'SupplierProposalStatus';

@@ -74,10 +72,10 @@
-			$langs->load("supplier_proposal");

-			$listofstatus = array(

-				0=>array('id'=>0, 'code'=>'PR_DRAFT'),

-				1=>array('id'=>1, 'code'=>'PR_OPEN'),

-				2=>array('id'=>2, 'code'=>'PR_SIGNED'),

-				3=>array('id'=>3, 'code'=>'PR_NOTSIGNED'),

-				4=>array('id'=>4, 'code'=>'PR_CLOSED')

-			);

-		} else {

-			$prefix = "PropalStatus";

+            $langs->load("supplier_proposal");

+            $listofstatus = array(

+                0=>array('id'=>0, 'code'=>'PR_DRAFT'),

+                1=>array('id'=>1, 'code'=>'PR_OPEN'),

+                2=>array('id'=>2, 'code'=>'PR_SIGNED'),

+                3=>array('id'=>3, 'code'=>'PR_NOTSIGNED'),

+                4=>array('id'=>4, 'code'=>'PR_CLOSED')

+            );

+        } else {

+            $prefix = "PropalStatus";

@@ -85,18 +83,23 @@
-			$sql = "SELECT id, code, label, active FROM ".$this->db->prefix()."c_propalst";

-			$sql .= " WHERE active = 1";

-			dol_syslog(get_class($this)."::selectProposalStatus", LOG_DEBUG);

-			$resql = $this->db->query($sql);

-			if ($resql) {

-				$num = $this->db->num_rows($resql);

-				$i = 0;

-				if ($num) {

-					while ($i < $num) {

-						$obj = $this->db->fetch_object($resql);

-						$listofstatus[$obj->id] = array('id'=>$obj->id, 'code'=>$obj->code, 'label'=>$obj->label);

-						$i++;

-					}

-				}

-			} else {

-				dol_print_error($this->db);

-			}

-		}

+            $sql = "SELECT id, code, label, active FROM ".MAIN_DB_PREFIX."c_propalst";

+            $sql .= " WHERE active = 1";

+            dol_syslog(get_class($this)."::selectProposalStatus", LOG_DEBUG);

+            $resql = $this->db->query($sql);

+            if ($resql)

+            {

+                $num = $this->db->num_rows($resql);

+                $i = 0;

+                if ($num)

+                {

+                    while ($i < $num)

+                    {

+                        $obj = $this->db->fetch_object($resql);

+                        $listofstatus[$obj->id] = array('id'=>$obj->id, 'code'=>$obj->code, 'label'=>$obj->label);

+                        $i++;

+                    }

+                }

+            }

+            else

+            {

+                dol_print_error($this->db);

+            }

+        }

@@ -104,4 +107,2 @@
-		print '<select id="'.$htmlname.'" name="'.$htmlname.'" class="flat'.($morecss ? ' '.$morecss : '').'">';

-		if ($showempty) {

-			print '<option value="-1">&nbsp;</option>';

-		}

+        print '<select class="flat" name="'.$htmlname.'">';

+        if ($showempty) print '<option value="-1">&nbsp;</option>';

@@ -109,21 +110,27 @@
-		$i = 0;

-		foreach ($listofstatus as $key => $obj) {

-			if ($excludedraft) {

-				if ($obj['code'] == 'Draft' || $obj['code'] == 'PR_DRAFT') {

-					$i++;

-					continue;

-				}

-			}

-			if ($selected != '' && $selected == $obj['id']) {

-				print '<option value="'.$obj['id'].'" selected>';

-			} else {

-				print '<option value="'.$obj['id'].'">';

-			}

-			$key = $obj['code'];

-			if ($langs->trans($prefix.$key.($short ? 'Short' : '')) != $prefix.$key.($short ? 'Short' : '')) {

-				print $langs->trans($prefix.$key.($short ? 'Short' : ''));

-			} else {

-				$conv_to_new_code = array('PR_DRAFT'=>'Draft', 'PR_OPEN'=>'Validated', 'PR_CLOSED'=>'Closed', 'PR_SIGNED'=>'Signed', 'PR_NOTSIGNED'=>'NotSigned', 'PR_FAC'=>'Billed');

-				if (!empty($conv_to_new_code[$obj['code']])) {

-					$key = $conv_to_new_code[$obj['code']];

-				}

+        foreach ($listofstatus as $key => $obj)

+        {

+            if ($excludedraft)

+            {

+                if ($obj['code'] == 'Draft' || $obj['code'] == 'PR_DRAFT')

+                {

+                    $i++;

+                    continue;

+                }

+            }

+            if ($selected != '' && $selected == $obj['id'])

+            {

+                print '<option value="'.$obj['id'].'" selected>';

+            }

+            else

+            {

+                print '<option value="'.$obj['id'].'">';

+            }

+            $key = $obj['code'];

+            if ($langs->trans($prefix.$key.($short ? 'Short' : '')) != $prefix.$key.($short ? 'Short' : ''))

+            {

+                print $langs->trans($prefix.$key.($short ? 'Short' : ''));

+            }

+            else

+            {

+                $conv_to_new_code = array('PR_DRAFT'=>'Draft', 'PR_OPEN'=>'Validated', 'PR_CLOSED'=>'Closed', 'PR_SIGNED'=>'Signed', 'PR_NOTSIGNED'=>'NotSigned', 'PR_FAC'=>'Billed');

+                if (!empty($conv_to_new_code[$obj['code']])) $key = $conv_to_new_code[$obj['code']];

@@ -131,19 +138,7 @@
-				print ($langs->trans($prefix.$key.($short ? 'Short' : '')) != $prefix.$key.($short ? 'Short' : '')) ? $langs->trans($prefix.$key.($short ? 'Short' : '')) : ($obj['label'] ? $obj['label'] : $obj['code']);

-			}

-			print '</option>';

-			$i++;

-		}

-		// Option for Signed+Billed

-		if ($mode == 'customer') {

-			if ($selected != '' && $selected == "2,4") {

-				print '<option value="2,4" selected>';

-			} else {

-				print '<option value="2,4">';

-			}

-			print($langs->trans($prefix.'Signed'.($short ? 'Short' : '')).' '.$langs->trans("or").' '.$langs->trans($prefix.'Billed'.($short ? 'Short' : '')));

-			print '</option>';

-		}

-		print '</select>';

-

-		print ajax_combobox($htmlname, array(), 0, 0, 'resolve', ($showempty < 0 ? (string) $showempty : '-1'), $morecss);

-	}

+                print ($langs->trans($prefix.$key.($short ? 'Short' : '')) != $prefix.$key.($short ? 'Short' : '')) ? $langs->trans($prefix.$key.($short ? 'Short' : '')) : ($obj['label'] ? $obj['label'] : $obj['code']);

+            }

+            print '</option>';

+            $i++;

+        }

+        print '</select>';

+    }

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_html.formsms.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_html.formsms.class.php
@@ -36,96 +36,94 @@
-	/**

-	 * @var DoliDB Database handler.

-	 */

-	public $db;

-

-	public $fromid;

-	public $fromname;

-	public $fromsms;

-	public $fromtype;

-	public $replytoname;

-	public $replytomail;

-	public $toname;

-	public $tomail;

-

-	public $withsubstit; // Show substitution array

-	public $withfrom;

-	public $withto;

-	public $withtopic;

-	public $withbody;

-

-	/**

-	 * @var int 	Id of company

-	 */

-	public $withtosocid;

-

-	public $withfromreadonly;

-	public $withreplytoreadonly;

-	public $withtoreadonly;

-	public $withtopicreadonly;

-	public $withbodyreadonly;

-	public $withcancel;

-

-	public $substit = array();

-	public $param = array();

-

-	/**

-	 * @var string Error code (or message)

-	 */

-	public $error = '';

-

-	/**

-	 * @var string[]	Array of error strings

-	 */

-	public $errors = array();

-

-

-	/**

-	 *	Constructor

-	 *

-	 *  @param		DoliDB		$db      Database handler

-	 */

-	public function __construct($db)

-	{

-		$this->db = $db;

-

-		$this->withfrom = 1;

-		$this->withto = 1;

-		$this->withtopic = 1;

-		$this->withbody = 1;

-

-		$this->withfromreadonly = 1;

-		$this->withreplytoreadonly = 1;

-		$this->withtoreadonly = 0;

-		$this->withtopicreadonly = 0;

-		$this->withbodyreadonly = 0;

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 *	Show the form to input an sms.

-	 *

-	 *	@param	string	$morecss Class on first column td

-	 *  @param int $showform Show form tags and submit button (recommanded is to use with value 0)

-	 *	@return	void

-	 */

-	public function show_form($morecss = 'titlefield', $showform = 1)

-	{

-		// phpcs:enable

-		global $conf, $langs, $form;

-

-		if (!is_object($form)) {

-			$form = new Form($this->db);

-		}

-

-		// Load translation files required by the page

-		$langs->loadLangs(array('other', 'mails', 'sms'));

-

-		$soc = new Societe($this->db);

-		if (!empty($this->withtosocid) && $this->withtosocid > 0) {

-			$soc->fetch($this->withtosocid);

-		}

-

-		print "\n<!-- Begin form SMS -->\n";

-

-		print '

-<script nonce="'.getNonce().'" type="text/javascript">

+    /**

+     * @var DoliDB Database handler.

+     */

+    public $db;

+

+    public $fromid;

+    public $fromname;

+    public $fromsms;

+    public $fromtype;

+    public $replytoname;

+    public $replytomail;

+    public $toname;

+    public $tomail;

+

+    public $withsubstit; // Show substitution array

+    public $withfrom;

+    public $withto;

+    public $withtopic;

+    public $withbody;

+

+    /**

+     * @var int 	Id of company

+     */

+    public $withtosocid;

+

+    public $withfromreadonly;

+    public $withreplytoreadonly;

+    public $withtoreadonly;

+    public $withtopicreadonly;

+    public $withcancel;

+

+    public $substit = array();

+    public $param = array();

+

+    /**

+     * @var string Error code (or message)

+     */

+    public $error = '';

+

+    /**

+     * @var string[]	Array of error strings

+     */

+    public $errors = array();

+

+

+    /**

+     *	Constructor

+     *

+     *  @param		DoliDB		$db      Database handler

+     */

+    public function __construct($db)

+    {

+        $this->db = $db;

+

+        $this->withfrom = 1;

+        $this->withto = 1;

+        $this->withtopic = 1;

+        $this->withbody = 1;

+

+        $this->withfromreadonly = 1;

+        $this->withreplytoreadonly = 1;

+        $this->withtoreadonly = 0;

+        $this->withtopicreadonly = 0;

+        $this->withbodyreadonly = 0;

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     *	Show the form to input an sms.

+     *

+     *	@param	string	$morecss Class on first column td

+     *  @param int $showform Show form tags and submit button (recommanded is to use with value 0)

+     *	@return	void

+     */

+    public function show_form($morecss = 'titlefield', $showform = 1)

+    {

+     // phpcs:enable

+        global $conf, $langs, $user, $form;

+

+        if (!is_object($form)) $form = new Form($this->db);

+

+        // Load translation files required by the page

+        $langs->loadLangs(array('other', 'mails', 'sms'));

+

+        $soc = new Societe($this->db);

+        if (!empty($this->withtosocid) && $this->withtosocid > 0)

+        {

+            $soc->fetch($this->withtosocid);

+        }

+

+        print "\n<!-- Begin form SMS -->\n";

+

+        print '

+<script language="javascript">

@@ -143,145 +141,189 @@
-		if ($showform) {

-			print "<form method=\"POST\" name=\"smsform\" enctype=\"multipart/form-data\" action=\"".$this->param["returnurl"]."\">\n";

-		}

-

-		print '<input type="hidden" name="token" value="'.newToken().'">';

-		foreach ($this->param as $key => $value) {

-			print "<input type=\"hidden\" name=\"$key\" value=\"$value\">\n";

-		}

-		print "<table class=\"border centpercent\">\n";

-

-		// Substitution array

-		if (!empty($this->withsubstit)) {		// Unset or set ->withsubstit=0 to disable this.

-			print "<tr><td colspan=\"2\">";

-			$help = "";

-			foreach ($this->substit as $key => $val) {

-				$help .= $key.' -> '.$langs->trans($val).'<br>';

-			}

-			print $form->textwithpicto($langs->trans("SmsTestSubstitutionReplacedByGenericValues"), $help);

-			print "</td></tr>\n";

-		}

-

-		// From

-		if ($this->withfrom) {

-			if ($this->withfromreadonly) {

-				print '<tr><td class="titlefield '.$morecss.'">'.$langs->trans("SmsFrom");

-				print '<input type="hidden" name="fromsms" value="'.$this->fromsms.'">';

-				print "</td><td>";

-				if ($this->fromtype == 'user') {

-					$langs->load("users");

-					$fuser = new User($this->db);

-					$fuser->fetch($this->fromid);

-					print $fuser->getNomUrl(1);

-					print ' &nbsp; ';

-				}

-				if ($this->fromsms) {

-					print $this->fromsms;

-				} else {

-					if ($this->fromtype) {

-						$langs->load("errors");

-						print '<span class="warning"> &lt;'.$langs->trans("ErrorNoPhoneDefinedForThisUser").'&gt; </span>';

-					}

-				}

-				print "</td></tr>\n";

-				print "</td></tr>\n";

-			} else {

-				print '<tr><td class="'.$morecss.'">'.$langs->trans("SmsFrom")."</td><td>";

-				if (getDolGlobalString('MAIN_SMS_SENDMODE')) {

-					$sendmode = getDolGlobalString('MAIN_SMS_SENDMODE');	// $conf->global->MAIN_SMS_SENDMODE looks like a value 'module'

-					$classmoduleofsender = getDolGlobalString('MAIN_MODULE_'.strtoupper($sendmode).'_SMS', $sendmode);	// $conf->global->MAIN_MODULE_XXX_SMS looks like a value 'class@module'

-					if ($classmoduleofsender == 'ovh') {

-						$classmoduleofsender = 'ovhsms@ovh';	// For backward compatibility

-					}

-

-					$tmp = explode('@', $classmoduleofsender);

-					$classfile = $tmp[0];

-					$module = (empty($tmp[1]) ? $tmp[0] : $tmp[1]);

-					dol_include_once('/'.$module.'/class/'.$classfile.'.class.php');

-					try {

-						$classname = ucfirst($classfile);

-						if (class_exists($classname)) {

-							$sms = new $classname($this->db);

-							$resultsender = $sms->SmsSenderList();

-						} else {

-							$sms = new stdClass();

-							$sms->error = 'The SMS manager "'.$classfile.'" defined into SMS setup MAIN_MODULE_'.strtoupper($sendmode).'_SMS is not found';

-						}

-					} catch (Exception $e) {

-						dol_print_error('', 'Error to get list of senders: '.$e->getMessage());

-						exit;

-					}

-				} else {

-					dol_syslog("Warning: The SMS sending method has not been defined into MAIN_SMS_SENDMODE", LOG_WARNING);

-					$resultsender = array();

-					$resultsender[0]->number = $this->fromsms;

-				}

-

-				if (is_array($resultsender) && count($resultsender) > 0) {

-					print '<select name="fromsms" id="fromsms" class="flat">';

-					foreach ($resultsender as $obj) {

-						print '<option value="'.$obj->number.'">'.$obj->number.'</option>';

-					}

-					print '</select>';

-				} else {

-					print '<span class="error wordbreak">'.$langs->trans("SmsNoPossibleSenderFound");

-					if (is_object($sms) && !empty($sms->error)) {

-						print ' '.$sms->error;

-					}

-					print '</span>';

-				}

-				print '</td>';

-				print "</tr>\n";

-			}

-		}

-

-		// To (target)

-		if ($this->withto || is_array($this->withto)) {

-			print '<tr><td>';

-			//$moretext=$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients");

-			$moretext = '';

-			print $form->textwithpicto($langs->trans("SmsTo"), $moretext);

-			print '</td><td>';

-			if ($this->withtoreadonly) {

-				print (!is_array($this->withto) && !is_numeric($this->withto)) ? $this->withto : "";

-			} else {

-				print '<input class="width150" id="sendto" name="sendto" value="'.dol_escape_htmltag(!is_array($this->withto) && $this->withto != '1' ? (GETPOSTISSET("sendto") ? GETPOST("sendto") : $this->withto) : "+").'">';

-				if (!empty($this->withtosocid) && $this->withtosocid > 0) {

-					$liste = array();

-					foreach ($soc->thirdparty_and_contact_phone_array() as $key => $value) {

-						$liste[$key] = $value;

-					}

-					print " ".$langs->trans("or")." ";

-					//var_dump($_REQUEST);exit;

-					print $form->selectarray("receiver", $liste, GETPOST("receiver"), 1);

-				}

-				print '<span class="opacitymedium hideonsmartphone"> '.$langs->trans("SmsInfoNumero").'</span>';

-			}

-			print "</td></tr>\n";

-		}

-

-		// Message

-		if ($this->withbody) {

-			$defaultmessage = '';

-			if ($this->param["models"] == 'body') {

-				$defaultmessage = $this->withbody;

-			}

-			$defaultmessage = make_substitutions($defaultmessage, $this->substit);

-			if (GETPOSTISSET("message")) {

-				$defaultmessage = GETPOST("message", 'restricthtml');

-			}

-			$defaultmessage = str_replace('\n', "\n", $defaultmessage);

-

-			print "<tr>";

-			print '<td class="tdtop">'.$langs->trans("SmsText")."</td>";

-			print "<td>";

-			if ($this->withbodyreadonly) {

-				print nl2br($defaultmessage);

-				print '<input type="hidden" name="message" value="'.dol_escape_htmltag($defaultmessage).'">';

-			} else {

-				print '<textarea class="quatrevingtpercent" name="message" id="message" rows="'.ROWS_4.'" onkeyup="limitChars(this, 160, \'charlimitinfospan\')">'.$defaultmessage.'</textarea>';

-				print '<div id="charlimitinfo" class="opacitymedium">'.$langs->trans("SmsInfoCharRemain").': <span id="charlimitinfospan">'.(160 - dol_strlen($defaultmessage)).'</span></div></td>';

-			}

-			print "</td></tr>\n";

-		}

-

-		print '

+        if ($showform) print "<form method=\"POST\" name=\"smsform\" enctype=\"multipart/form-data\" action=\"".$this->param["returnurl"]."\">\n";

+

+        print '<input type="hidden" name="token" value="'.newToken().'">';

+        foreach ($this->param as $key=>$value)

+        {

+            print "<input type=\"hidden\" name=\"$key\" value=\"$value\">\n";

+        }

+        print "<table class=\"border centpercent\">\n";

+

+        // Substitution array

+        if (!empty($this->withsubstit))		// Unset or set ->withsubstit=0 to disable this.

+        {

+            print "<tr><td colspan=\"2\">";

+            $help = "";

+            foreach ($this->substit as $key => $val)

+            {

+                $help .= $key.' -> '.$langs->trans($val).'<br>';

+            }

+            print $form->textwithpicto($langs->trans("SmsTestSubstitutionReplacedByGenericValues"), $help);

+            print "</td></tr>\n";

+        }

+

+        // From

+        if ($this->withfrom)

+        {

+            if ($this->withfromreadonly)

+            {

+                print '<tr><td class="titlefield '.$morecss.'">'.$langs->trans("SmsFrom");

+                print '<input type="hidden" name="fromsms" value="'.$this->fromsms.'">';

+                print "</td><td>";

+                if ($this->fromtype == 'user')

+                {

+                    $langs->load("users");

+                    $fuser = new User($this->db);

+                    $fuser->fetch($this->fromid);

+                    print $fuser->getNomUrl(1);

+                    print ' &nbsp; ';

+                }

+                if ($this->fromsms)

+                {

+                    print $this->fromsms;

+                }

+                else

+                {

+                    if ($this->fromtype)

+                    {

+                        $langs->load("errors");

+                        print '<font class="warning"> &lt;'.$langs->trans("ErrorNoPhoneDefinedForThisUser").'&gt; </font>';

+                    }

+                }

+                print "</td></tr>\n";

+                print "</td></tr>\n";

+            }

+            else

+            {

+                print '<tr><td class="'.$morecss.'">'.$langs->trans("SmsFrom")."</td><td>";

+                //print '<input type="text" name="fromname" size="30" value="'.$this->fromsms.'">';

+                if ($conf->global->MAIN_SMS_SENDMODE == 'ovh')        // For backward compatibility        @deprecated

+                {

+                    dol_include_once('/ovh/class/ovhsms.class.php');

+                    try

+                    {

+                        $sms = new OvhSms($this->db);

+                        if (empty($conf->global->OVHSMS_ACCOUNT))

+                        {

+                            $resultsender = 'ErrorOVHSMS_ACCOUNT not defined';

+                        }

+                        else

+                        {

+                            $resultsender = $sms->SmsSenderList();

+                        }

+                    }

+                    catch (Exception $e)

+                    {

+                        dol_print_error('', 'Error to get list of senders: '.$e->getMessage());

+                    }

+                }

+                elseif (!empty($conf->global->MAIN_SMS_SENDMODE))    // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'

+                {

+                    $tmp = explode('@', $conf->global->MAIN_SMS_SENDMODE);

+                    $classfile = $tmp[0]; $module = (empty($tmp[1]) ? $tmp[0] : $tmp[1]);

+                    dol_include_once('/'.$module.'/class/'.$classfile.'.class.php');

+                    try

+                    {

+                        $classname = ucfirst($classfile);

+                        if (class_exists($classname))

+                        {

+                        	$sms = new $classname($this->db);

+                        	$resultsender = $sms->SmsSenderList();

+                        }

+                        else

+                        {

+                        	$sms = new stdClass();

+                        	$sms->error = 'The SMS manager "'.$classfile.'" defined into SMS setup MAIN_SMS_SENDMODE is not found';

+                        }

+                    }

+                    catch (Exception $e)

+                    {

+                        dol_print_error('', 'Error to get list of senders: '.$e->getMessage());

+                        exit;

+                    }

+                }

+                else

+                {

+                    dol_syslog("Warning: The SMS sending method has not been defined into MAIN_SMS_SENDMODE", LOG_WARNING);

+	                $resultsender = array();

+                    $resultsender[0]->number = $this->fromsms;

+                }

+

+                if (is_array($resultsender) && count($resultsender) > 0)

+                {

+                    print '<select name="fromsms" id="fromsms" class="flat">';

+                    foreach ($resultsender as $obj)

+                    {

+                        print '<option value="'.$obj->number.'">'.$obj->number.'</option>';

+                    }

+                    print '</select>';

+                }

+                else

+                {

+                    print '<span class="error">'.$langs->trans("SmsNoPossibleSenderFound");

+                    if (is_object($sms) && !empty($sms->error)) print ' '.$sms->error;

+                    print '</span>';

+                }

+                print '</td>';

+                print "</tr>\n";

+            }

+        }

+

+        // To (target)

+        if ($this->withto || is_array($this->withto))

+        {

+            print '<tr><td>';

+            //$moretext=$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients");

+            $moretext = '';

+            print $form->textwithpicto($langs->trans("SmsTo"), $moretext);

+            print '</td><td>';

+            if ($this->withtoreadonly)

+            {

+                print (!is_array($this->withto) && !is_numeric($this->withto)) ? $this->withto : "";

+            }

+            else

+            {

+                print "<input size=\"16\" id=\"sendto\" name=\"sendto\" value=\"".dol_escape_htmltag(!is_array($this->withto) && $this->withto != '1' ? (isset($_REQUEST["sendto"]) ?GETPOST("sendto") : $this->withto) : "+")."\">";

+                if (!empty($this->withtosocid) && $this->withtosocid > 0)

+                {

+                    $liste = array();

+                    foreach ($soc->thirdparty_and_contact_phone_array() as $key => $value)

+                    {

+                        $liste[$key] = $value;

+                    }

+                    print " ".$langs->trans("or")." ";

+                    //var_dump($_REQUEST);exit;

+                    print $form->selectarray("receiver", $liste, GETPOST("receiver"), 1);

+                }

+                print ' <span class="opacitymedium">'.$langs->trans("SmsInfoNumero").'</span>';

+            }

+            print "</td></tr>\n";

+        }

+

+        // Message

+        if ($this->withbody)

+        {

+            $defaultmessage = '';

+            if ($this->param["models"] == 'body')

+            {

+                $defaultmessage = $this->withbody;

+            }

+            $defaultmessage = make_substitutions($defaultmessage, $this->substit);

+            if (isset($_POST["message"])) $defaultmessage = $_POST["message"];

+            $defaultmessage = str_replace('\n', "\n", $defaultmessage);

+

+            print "<tr>";

+            print '<td class="tdtop">'.$langs->trans("SmsText")."</td>";

+            print "<td>";

+            if ($this->withbodyreadonly)

+            {

+                print nl2br($defaultmessage);

+                print '<input type="hidden" name="message" value="'.dol_escape_htmltag($defaultmessage).'">';

+            }

+            else

+            {

+                print '<textarea class="quatrevingtpercent" name="message" id="message" rows="'.ROWS_4.'" onkeyup="limitChars(this, 160, \'charlimitinfospan\')">'.$defaultmessage.'</textarea>';

+                print '<div id="charlimitinfo">'.$langs->trans("SmsInfoCharRemain").': <span id="charlimitinfospan">'.(160 - dol_strlen($defaultmessage)).'</span></div></td>';

+            }

+            print "</td></tr>\n";

+        }

+

+        print '

@@ -314,17 +356,19 @@
-		print "</table>\n";

-

-

-		if ($showform) {

-			print '<div class="center">';

-			print '<input type="submit" class="button" name="sendmail" value="'.dol_escape_htmltag($langs->trans("SendSms")).'">';

-			if ($this->withcancel) {

-				print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';

-				print '<input class="button button-cancel" type="submit" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';

-			}

-			print '</div>';

-

-			print "</form>\n";

-		}

-

-		print "<!-- End form SMS -->\n";

-	}

+        print "</table>\n";

+

+

+        if ($showform)

+        {

+            print '<div class="center">';

+            print '<input class="button" type="submit" name="sendmail" value="'.dol_escape_htmltag($langs->trans("SendSms")).'">';

+            if ($this->withcancel)

+            {

+                print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';

+                print '<input class="button" type="submit" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';

+            }

+            print '</div>';

+

+            print "</form>\n";

+        }

+

+        print "<!-- End form SMS -->\n";

+    }

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_html.formsocialcontrib.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_html.formsocialcontrib.class.php
@@ -31,3 +31,3 @@
-	 * @var DoliDB Database handler.

-	 */

-	public $db;

+     * @var DoliDB Database handler.

+     */

+    public $db;

@@ -42,4 +42,4 @@
-	 * Constructor

-	 *

-	 * @param		DoliDB		$db      Database handler

-	 */

+	* Constructor

+	*

+	* @param		DoliDB		$db      Database handler

+	*/

@@ -48 +48 @@
-		$this->db = $db;

+	    $this->db = $db;

@@ -51,18 +51,17 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 *  Return list of social contributions.

-	 *  Use mysoc->country_id or mysoc->country_code so they must be defined.

-	 *

-	 *	@param	string	$selected       Preselected type

-	 *	@param  string	$htmlname       Name of field in form

-	 * 	@param	int		$useempty		Set to 1 if we want an empty value

-	 * 	@param	int		$maxlen			Max length of text in combo box

-	 * 	@param	int		$help			Add or not the admin help picto

-	 *  @param	string	$morecss		Add more CSS on select

-	 *  @param	int		$noerrorifempty	No print error if list is empty for the country

-	 * 	@return	void

-	 */

-	public function select_type_socialcontrib($selected = '', $htmlname = 'actioncode', $useempty = 0, $maxlen = 40, $help = 1, $morecss = 'minwidth300', $noerrorifempty = 0)

-	{

-		// phpcs:enable

-		global $conf, $db, $langs, $user, $mysoc;

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     *  Return list of social contributions.

+     *  Use mysoc->country_id or mysoc->country_code so they must be defined.

+     *

+     *	@param	string	$selected       Preselected type

+     *	@param  string	$htmlname       Name of field in form

+     * 	@param	int		$useempty		Set to 1 if we want an empty value

+     * 	@param	int		$maxlen			Max length of text in combo box

+     * 	@param	int		$help			Add or not the admin help picto

+     *  @param	string	$morecss		Add more CSS on select

+     * 	@return	void

+     */

+    public function select_type_socialcontrib($selected = '', $htmlname = 'actioncode', $useempty = 0, $maxlen = 40, $help = 1, $morecss = 'minwidth300')

+    {

+        // phpcs:enable

+        global $conf, $db, $langs, $user, $mysoc;

@@ -70,4 +69,5 @@
-		if (empty($mysoc->country_id) && empty($mysoc->country_code)) {

-			print $langs->trans("ErrorSetupOfCountryMustBeDone");

-			return;

-		}

+        if (empty($mysoc->country_id) && empty($mysoc->country_code))

+        {

+            dol_print_error('', 'Call to select_type_socialcontrib with mysoc country not yet defined');

+            exit;

+        }

@@ -75,13 +75,16 @@
-		if (!empty($mysoc->country_id)) {

-			$sql = "SELECT c.id, c.libelle as type";

-			$sql .= " FROM ".$this->db->prefix()."c_chargesociales as c";

-			$sql .= " WHERE c.active = 1";

-			$sql .= " AND c.fk_pays = ".((int) $mysoc->country_id);

-			$sql .= " ORDER BY c.libelle ASC";

-		} else {

-			$sql = "SELECT c.id, c.libelle as type";

-			$sql .= " FROM ".$this->db->prefix()."c_chargesociales as c, ".$this->db->prefix()."c_country as co";

-			$sql .= " WHERE c.active = 1 AND c.fk_pays = co.rowid";

-			$sql .= " AND co.code = '".$this->db->escape($mysoc->country_code)."'";

-			$sql .= " ORDER BY c.libelle ASC";

-		}

+        if (!empty($mysoc->country_id))

+        {

+            $sql = "SELECT c.id, c.libelle as type";

+            $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";

+            $sql .= " WHERE c.active = 1";

+            $sql .= " AND c.fk_pays = ".$mysoc->country_id;

+            $sql .= " ORDER BY c.libelle ASC";

+        }

+        else

+        {

+            $sql = "SELECT c.id, c.libelle as type";

+            $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."c_country as co";

+            $sql .= " WHERE c.active = 1 AND c.fk_pays = co.rowid";

+            $sql .= " AND co.code = '".$mysoc->country_code."'";

+            $sql .= " ORDER BY c.libelle ASC";

+        }

@@ -89,7 +92,9 @@
-		dol_syslog("Form::select_type_socialcontrib", LOG_DEBUG);

-		$resql = $this->db->query($sql);

-		if ($resql) {

-			$num = $this->db->num_rows($resql);

-			if ($num) {

-				print '<select class="'.($morecss ? $morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'">';

-				$i = 0;

+        dol_syslog("Form::select_type_socialcontrib", LOG_DEBUG);

+        $resql = $db->query($sql);

+        if ($resql)

+        {

+            $num = $db->num_rows($resql);

+            if ($num)

+            {

+            	print '<select class="'.($morecss ? $morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'">';

+                $i = 0;

@@ -97,28 +102,23 @@
-				if ($useempty) {

-					print '<option value="0">&nbsp;</option>';

-				}

-				while ($i < $num) {

-					$obj = $this->db->fetch_object($resql);

-					print '<option value="'.$obj->id.'"';

-					if ($obj->id == $selected) {

-						print ' selected';

-					}

-					print '>'.dol_trunc($obj->type, $maxlen);

-					$i++;

-				}

-				print '</select>';

-				if ($user->admin && $help) {

-					print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

-				}

-				if (!empty($conf->use_javascript_ajax)) {

-					print ajax_combobox($htmlname);

-				}

-			} else {

-				if (empty($noerrorifempty)) {

-					print $langs->trans("ErrorNoSocialContributionForSellerCountry", $mysoc->country_code);

-				}

-			}

-		} else {

-			dol_print_error($this->db);

-		}

-	}

+                if ($useempty) print '<option value="0">&nbsp;</option>';

+                while ($i < $num)

+                {

+                    $obj = $db->fetch_object($resql);

+                    print '<option value="'.$obj->id.'"';

+                    if ($obj->id == $selected) print ' selected';

+                    print '>'.dol_trunc($obj->type, $maxlen);

+                    $i++;

+                }

+                print '</select>';

+                if ($user->admin && $help) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+                if (!empty($conf->use_javascript_ajax)) print ajax_combobox($htmlname);

+            }

+            else

+            {

+                print $langs->trans("ErrorNoSocialContributionForSellerCountry", $mysoc->country_code);

+            }

+        }

+        else

+        {

+            dol_print_error($db, $db->lasterror());

+        }

+    }

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_html.formticket.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_html.formticket.class.php
@@ -2,6 +2,3 @@
-/* Copyright (C) 2013-2015 Jean-François FERRY     <hello@librethic.io>

- * Copyright (C) 2016      Christophe Battarel     <christophe@altairis.fr>

- * Copyright (C) 2019-2022 Frédéric France         <frederic.france@netlogic.fr>

- * Copyright (C) 2021      Juanjo Menent           <jmenent@2byte.es>

- * Copyright (C) 2021      Alexandre Spangaro      <aspangaro@open-dsi.fr>

- * Copyright (C) 2023      Charlene Benke	       <charlene.r@patas-monkey.com>

+/* Copyright (C) 2013-2015  Jean-François FERRY     <hello@librethic.io>

+ * Copyright (C) 2016       Christophe Battarel     <christophe@altairis.fr>

+ * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>

@@ -11 +8 @@
- * the Free Software Foundation; either version 3 of the License, or

+ * the Free Software Foundation; either version 2 of the License, or

@@ -16 +13 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

@@ -24,3 +21,3 @@
- *    \file       htdocs/core/class/html.formticket.class.php

- *    \ingroup    ticket

- *    \brief      File of class to generate the form for creating a new ticket.

+ *       \file       htdocs/core/class/html.formticket.class.php

+ *       \ingroup    ticket

+ *       \brief      Fichier de la classe permettant la generation du formulaire html d'envoi de mail unitaire

@@ -28,4 +25,3 @@
-

-require_once DOL_DOCUMENT_ROOT . '/core/class/html.form.class.php';

-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';

-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';

+require_once DOL_DOCUMENT_ROOT."/core/class/html.form.class.php";

+require_once DOL_DOCUMENT_ROOT."/core/class/html.formmail.class.php";

+require_once DOL_DOCUMENT_ROOT."/core/class/html.formprojet.class.php";

@@ -38,4 +34 @@
- * Class to generate the form for creating a new ticket.

- * Usage: 	$formticket = new FormTicket($db)

- * 			$formticket->proprietes = 1 or string or array of values

- * 			$formticket->show_form()  shows the form

+ * Classe permettant la generation du formulaire d'un nouveau ticket.

@@ -43,0 +37,3 @@
+ * \remarks Utilisation: $formticket = new FormTicket($db)

+ * \remarks $formticket->proprietes=1 ou chaine ou tableau de valeurs

+ * \remarks $formticket->show_form() affiche le formulaire

@@ -52,3 +47,0 @@
-	/**

-	 * @var string		A hash value of the ticket. Duplicate of ref but for public purposes.

-	 */

@@ -56,5 +48,0 @@
-

-	/**

-	 * @var string 		Email $trackid. Used also for the $keytoavoidconflict to name session vars to upload files.

-	 */

-	public $trackid;

@@ -74,2 +62,2 @@
-

-	/**

+	/**

+	 *

@@ -83,3 +71 @@
-	public $backtopage;

-

-	public $ispublic;  // to show information or not into public form

+	public $ispublic; // To show information or not into public form

@@ -88,4 +74 @@
-	public $withtopicreadonly;

-	public $withreadid;

-

-	public $withcompany;  // to show company drop-down list

+	public $withcompany; // affiche liste déroulante company

@@ -95 +78 @@
-	public $withusercreate;  // to show name of creating user in form

+	public $withusercreate; // Show name of creating user in form

@@ -98,6 +81,2 @@
-	/**

-	 * @var int withextrafields

-	 */

-	public $withextrafields;

-

-	public $withref;  // to show ref field

+	public $withref; // Show ref field

+

@@ -105,5 +83,0 @@
-

-	public $type_code;

-	public $category_code;

-	public $severity_code;

-

@@ -122 +95,0 @@
-	public $errors = array();

@@ -132,2 +104,0 @@
-		global $conf;

-

@@ -138 +109 @@
-		$this->withcompany = isModEnabled("societe");

+		$this->withcompany = 1;

@@ -141 +112 @@
-		$this->withreadid=0;

+		//$this->withthreadid=0;

@@ -148 +119 @@
-		$this->withextrafields = 0;  // to show extrafields or not

+		$this->withextrafields = 0; // Show extrafields or not

@@ -155,5 +126,2 @@
-	 * @param  	int	 			$withdolfichehead		With dol_get_fiche_head() and dol_get_fiche_end()

-	 * @param	string			$mode					Mode ('create' or 'edit')

-	 * @param	int				$public					1=If we show the form for the public interface

-	 * @param	Contact|null	$with_contact			[=NULL] Contact to link to this ticket if it exists

-	 * @param	string			$action					[=''] Action in card

+	 * @param  	int	 		$withdolfichehead		With dol_fiche_head

+	 * @param	string		$mode					Mode ('create' or 'edit')

@@ -162 +130 @@
-	public function showForm($withdolfichehead = 0, $mode = 'edit', $public = 0, Contact $with_contact = null, $action = '')

+	public function showForm($withdolfichehead = 0, $mode = 'edit')

@@ -185,5 +153,3 @@
-		if ($withdolfichehead) {

-			print dol_get_fiche_head(null, 'card', '', 0, '');

-		}

-

-		print '<form method="POST" '.($withdolfichehead ? '' : 'style="margin-bottom: 30px;" ').'name="ticket" id="form_create_ticket" enctype="multipart/form-data" action="'.(!empty($this->param["returnurl"]) ? $this->param["returnurl"] : $_SERVER['PHP_SELF']).'">';

+		if ($withdolfichehead) dol_fiche_head(null, 'card', '', 0, '');

+

+		print '<form method="POST" '.($withdolfichehead ? '' : 'style="margin-bottom: 30px;" ').'name="ticket" id="form_create_ticket" enctype="multipart/form-data" action="'.$this->param["returnurl"].'">';

@@ -192 +157,0 @@
-		print '<input type="hidden" name="trackid" value="'.$this->trackid.'">';

@@ -203,3 +168 @@
-			print '<tr><td class="titlefieldcreate"><span class="fieldrequired">'.$langs->trans("Ref").'</span></td><td>';

-			print '<input type="text" name="ref" value="'.dol_escape_htmltag(GETPOST("ref", 'alpha') ? GETPOST("ref", 'alpha') : $defaultref).'">';

-			print '</td></tr>';

+			print '<tr><td class="titlefieldcreate"><span class="fieldrequired">'.$langs->trans("Ref").'</span></td><td><input size="18" type="text" name="ref" value="'.(GETPOST("ref", 'alpha') ? GETPOST("ref", 'alpha') : $defaultref).'"></td></tr>';

@@ -209 +171,0 @@
-		$email = GETPOSTISSET('email') ? GETPOST('email', 'alphanohtml') : '';

@@ -212 +174 @@
-			print '<input class="text minwidth200" id="email" name="email" value="'.$email.'" autofocus>';

+			print '<input  class="text minwidth200" id="email" name="email" value="'.(GETPOST('email', 'alpha') ? GETPOST('email', 'alpha') : $subject).'" />';

@@ -214,93 +175,0 @@
-

-			if ($with_contact) {

-				// contact search and result

-				$html_contact_search  = '';

-				$html_contact_search .= '<tr id="contact_search_line">';

-				$html_contact_search .= '<td class="titlefield">';

-				$html_contact_search .= '<label for="contact"><span class="fieldrequired">' . $langs->trans('Contact') . '</span></label>';

-				$html_contact_search .= '<input type="hidden" id="contact_id" name="contact_id" value="" />';

-				$html_contact_search .= '</td>';

-				$html_contact_search .= '<td id="contact_search_result"></td>';

-				$html_contact_search .= '</tr>';

-				print $html_contact_search;

-				// contact lastname

-				$html_contact_lastname = '';

-				$html_contact_lastname .= '<tr id="contact_lastname_line" class="contact_field"><td class="titlefield"><label for="contact_lastname"><span class="fieldrequired">' . $langs->trans('Lastname') . '</span></label></td><td>';

-				$html_contact_lastname .= '<input type="text" id="contact_lastname" name="contact_lastname" value="' . dol_escape_htmltag(GETPOSTISSET('contact_lastname') ? GETPOST('contact_lastname', 'alphanohtml') : '') . '" />';

-				$html_contact_lastname .= '</td></tr>';

-				print $html_contact_lastname;

-				// contact firstname

-				$html_contact_firstname  = '';

-				$html_contact_firstname .= '<tr id="contact_firstname_line" class="contact_field"><td class="titlefield"><label for="contact_firstname"><span class="fieldrequired">' . $langs->trans('Firstname') . '</span></label></td><td>';

-				$html_contact_firstname .= '<input type="text" id="contact_firstname" name="contact_firstname" value="' . dol_escape_htmltag(GETPOSTISSET('contact_firstname') ? GETPOST('contact_firstname', 'alphanohtml') : '') . '" />';

-				$html_contact_firstname .= '</td></tr>';

-				print $html_contact_firstname;

-				// company name

-				$html_company_name  = '';

-				$html_company_name .= '<tr id="contact_company_name_line" class="contact_field"><td><label for="company_name"><span>' . $langs->trans('Company') . '</span></label></td><td>';

-				$html_company_name .= '<input type="text" id="company_name" name="company_name" value="' . dol_escape_htmltag(GETPOSTISSET('company_name') ? GETPOST('company_name', 'alphanohtml') : '') . '" />';

-				$html_company_name .= '</td></tr>';

-				print $html_company_name;

-				// contact phone

-				$html_contact_phone  = '';

-				$html_contact_phone .= '<tr id="contact_phone_line" class="contact_field"><td><label for="contact_phone"><span>' . $langs->trans('Phone') . '</span></label></td><td>';

-				$html_contact_phone .= '<input type="text" id="contact_phone" name="contact_phone" value="' . dol_escape_htmltag(GETPOSTISSET('contact_phone') ? GETPOST('contact_phone', 'alphanohtml') : '') . '" />';

-				$html_contact_phone .= '</td></tr>';

-				print $html_contact_phone;

-

-				// search contact form email

-				$langs->load('errors');

-				print '<script nonce="'.getNonce().'" type="text/javascript">

-                    jQuery(document).ready(function() {

-                        var contact = jQuery.parseJSON("'.dol_escape_js(json_encode($with_contact), 2).'");

-                        jQuery("#contact_search_line").hide();

-                        if (contact) {

-                        	if (contact.id > 0) {

-                        		jQuery("#contact_search_line").show();

-                        		jQuery("#contact_id").val(contact.id);

-								jQuery("#contact_search_result").html(contact.firstname+" "+contact.lastname);

-								jQuery(".contact_field").hide();

-                        	} else {

-                        		jQuery(".contact_field").show();

-                        	}

-                        }

-

-                    	jQuery("#email").change(function() {

-                            jQuery("#contact_search_line").show();

-                            jQuery("#contact_search_result").html("'.dol_escape_js($langs->trans('Select2SearchInProgress')).'");

-                            jQuery("#contact_id").val("");

-                            jQuery("#contact_lastname").val("");

-                            jQuery("#contact_firstname").val("");

-                            jQuery("#company_name").val("");

-                            jQuery("#contact_phone").val("");

-

-                            jQuery.getJSON(

-                                "'.dol_escape_js(dol_buildpath('/public/ticket/ajax/ajax.php', 1)).'",

-								{

-									action: "getContacts",

-									email: jQuery("#email").val()

-								},

-								function(response) {

-									if (response.error) {

-                                        jQuery("#contact_search_result").html("<span class=\"error\">"+response.error+"</span>");

-									} else {

-                                        var contact_list = response.contacts;

-										if (contact_list.length == 1) {

-                                            var contact = contact_list[0];

-											jQuery("#contact_id").val(contact.id);

-											jQuery("#contact_search_result").html(contact.firstname+" "+contact.lastname);

-                                            jQuery(".contact_field").hide();

-										} else if (contact_list.length <= 0) {

-                                            jQuery("#contact_search_line").hide();

-                                            jQuery(".contact_field").show();

-										}

-									}

-								}

-                            ).fail(function(jqxhr, textStatus, error) {

-    							var error_msg = "'.dol_escape_js($langs->trans('ErrorAjaxRequestFailed')).'"+" ["+textStatus+"] : "+error;

-                                jQuery("#contact_search_result").html("<span class=\"error\">"+error_msg+"</span>");

-                            });

-                        });

-                    });

-                    </script>';

-			}

@@ -310 +178,0 @@
-		$subelement = '';

@@ -314 +181,0 @@
-			$regs = array();

@@ -334 +201 @@
-		// Type of Ticket

+		// Type

@@ -336 +203 @@
-		$this->selectTypesTickets((GETPOST('type_code', 'alpha') ? GETPOST('type_code', 'alpha') : $this->type_code), 'type_code', '', 2, 1, 0, 0, 'minwidth200');

+		$this->selectTypesTickets((GETPOST('type_code', 'alpha') ? GETPOST('type_code', 'alpha') : $this->type_code), 'type_code', '', '2', 0, 0, 0, 'minwidth150');

@@ -339,8 +206,3 @@
-		// Group => Category

-		print '<tr><td><span class="fieldrequired"><label for="selectcategory_code">'.$langs->trans("TicketCategory").'</span></label></td><td>';

-		$filter = '';

-		if ($public) {

-			$filter = 'public=1';

-		}

-		$selected = (GETPOST('category_code') ? GETPOST('category_code') : $this->category_code);

-		$this->selectGroupTickets($selected, 'category_code', $filter, 2, 1, 0, 0, 'minwidth200');

+		// Severity

+		print '<tr><td><span class="fieldrequired"><label for="selectseverity_code">'.$langs->trans("TicketSeverity").'</span></label></td><td>';

+		$this->selectSeveritiesTickets((GETPOST('severity_code') ? GETPOST('severity_code') : $this->severity_code), 'severity_code', '', '2');

@@ -349,3 +211,3 @@
-		// Severity => Priority

-		print '<tr><td><span class="fieldrequired"><label for="selectseverity_code">'.$langs->trans("TicketSeverity").'</span></label></td><td>';

-		$this->selectSeveritiesTickets((GETPOST('severity_code') ? GETPOST('severity_code') : $this->severity_code), 'severity_code', '', 2, 1);

+		// Group

+		print '<tr><td><span class="fieldrequired"><label for="selectcategory_code">'.$langs->trans("TicketGroup").'</span></label></td><td>';

+		$this->selectGroupTickets((GETPOST('category_code') ? GETPOST('category_code') : $this->category_code), 'category_code', '', '2');

@@ -353,62 +214,0 @@
-

-		if (!empty($conf->knowledgemanagement->enabled)) {

-			// KM Articles

-			print '<tr id="KWwithajax" class="hidden"><td></td></tr>';

-			print '<!-- Script to manage change of ticket group -->

-			<script nonce="'.getNonce().'">

-			jQuery(document).ready(function() {

-				function groupticketchange() {

-					console.log("We called groupticketchange, so we try to load list KM linked to event");

-					$("#KWwithajax").html("");

-					idgroupticket = $("#selectcategory_code").val();

-

-					console.log("We have selected id="+idgroupticket);

-

-					if (idgroupticket != "") {

-						$.ajax({ url: \''.DOL_URL_ROOT.'/core/ajax/fetchKnowledgeRecord.php\',

-							 data: { action: \'getKnowledgeRecord\', idticketgroup: idgroupticket, token: \''.newToken().'\', lang:\''.$langs->defaultlang.'\', public:'.($public).' },

-							 type: \'GET\',

-							 success: function(response) {

-								var urllist = \'\';

-								console.log("We received response "+response);

-								if (typeof response == "object") {

-									console.log("response is already type object, no need to parse it");

-								} else {

-									console.log("response is type "+(typeof response));

-									response = JSON.parse(response);

-								}

-								for (key in response) {

-									answer = response[key].answer;

-									urllist += \'<li><a href="#" title="\'+response[key].title+\'" class="button_KMpopup" data-html="\'+answer+\'">\' +response[key].title+\'</a></li>\';

-								}

-								if (urllist != "") {

-									$("#KWwithajax").html(\'<td>'.$langs->trans("KMFoundForTicketGroup").'</td><td><ul>\'+urllist+\'</ul></td>\');

-									$("#KWwithajax").show();

-									$(".button_KMpopup").on("click",function(){

-										console.log("Open popup with jQuery(...).dialog() with KM article")

-										var $dialog = $("<div></div>").html($(this).attr("data-html"))

-											.dialog({

-												autoOpen: false,

-												modal: true,

-												height: (window.innerHeight - 150),

-												width: "80%",

-												title: $(this).attr("title"),

-											});

-										$dialog.dialog("open");

-										console.log($dialog);

-									})

-								}

-							 },

-							 error : function(output) {

-								console.error("Error on Fetch of KM articles");

-							 },

-						});

-					}

-				};

-				$("#selectcategory_code").on("change",function() { groupticketchange(); });

-				if ($("#selectcategory_code").val() != "") {

-					groupticketchange();

-				}

-			});

-			</script>'."\n";

-		}

@@ -419 +219,2 @@
-			// Answer to a ticket : display of the thread title in readonly

+

+			// Réponse à un ticket : affichage du titre du thread en readonly

@@ -421,0 +223 @@
+				print '</td></tr>';

@@ -423,8 +225,6 @@
-				if (isset($this->withreadid) && $this->withreadid > 0) {

-					$subject = $langs->trans('SubjectAnswerToTicket').' '.$this->withreadid.' : '.$this->topic_title;

-				} else {

-					$subject = GETPOST('subject', 'alpha');

-				}

-				print '<input class="text minwidth500" id="subject" name="subject" value="'.$subject.'"'.(empty($this->withemail) ? ' autofocus' : '').' />';

-			}

-			print '</td></tr>';

+				if ($this->withthreadid > 0) {

+					$subject = $langs->trans('SubjectAnswerToTicket').' '.$this->withthreadid.' : '.$this->topic_title.'';

+				}

+				print '<input class="text minwidth500" id="subject" name="subject" value="'.(GETPOST('subject', 'alpha') ? GETPOST('subject', 'alpha') : $subject).'" autofocus />';

+				print '</td></tr>';

+			}

@@ -434 +234 @@
-		$msg = GETPOSTISSET('message') ? GETPOST('message', 'restricthtml') : '';

+		$msg = GETPOSTISSET('message') ? GETPOST('message', 'none') : '';

@@ -439 +239,2 @@
-		if ($this->ispublic) {

+		if ($this->ispublic)

+		{

@@ -441 +242 @@
-			print '<div class="warning hideonsmartphone">'.(getDolGlobalString("TICKET_PUBLIC_TEXT_HELP_MESSAGE", $langs->trans('TicketPublicPleaseBeAccuratelyDescribe'))).'</div>';

+			print '<div class="warning">'.($conf->global->TICKET_PUBLIC_TEXT_HELP_MESSAGE ? $conf->global->TICKET_PUBLIC_TEXT_HELP_MESSAGE : $langs->trans('TicketPublicPleaseBeAccuratelyDescribe')).'</div>';

@@ -445 +246 @@
-		$doleditor = new DolEditor('message', $msg, '100%', 230, $toolbarname, 'In', true, $uselocalbrowser, getDolGlobalInt('FCKEDITOR_ENABLE_TICKET'), ROWS_8, '90%');

+		$doleditor = new DolEditor('message', $msg, '100%', 230, $toolbarname, 'In', true, $uselocalbrowser, $conf->global->FCKEDITOR_ENABLE_TICKET, ROWS_8, '90%');

@@ -448,83 +248,0 @@
-

-		if ($public && getDolGlobalString('MAIN_SECURITY_ENABLECAPTCHA_TICKET')) {

-			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';

-			print '<tr><td class="titlefield"><label for="email"><span class="fieldrequired">'.$langs->trans("SecurityCode").'</span></label></td><td>';

-			print '<span class="span-icon-security inline-block">';

-			print '<input id="securitycode" placeholder="'.$langs->trans("SecurityCode").'" class="flat input-icon-security width125" type="text" maxlength="5" name="code" tabindex="3" />';

-			print '</span>';

-			print '<span class="nowrap inline-block">';

-			print '<img class="inline-block valignmiddle" src="'.DOL_URL_ROOT.'/core/antispamimage.php" border="0" width="80" height="32" id="img_securitycode" />';

-			print '<a class="inline-block valignmiddle" href="" tabindex="4" data-role="button">'.img_picto($langs->trans("Refresh"), 'refresh', 'id="captcha_refresh_img"').'</a>';

-			print '</span>';

-			print '</td></tr>';

-		}

-

-		// Categories

-		if (isModEnabled('categorie')) {

-			include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';

-			$cate_arbo = $form->select_all_categories(Categorie::TYPE_TICKET, '', 'parent', 64, 0, 1);

-

-			if (count($cate_arbo)) {

-				// Categories

-				print '<tr><td class="wordbreak">'.$langs->trans("Categories").'</td><td>';

-				print img_picto('', 'category', 'class="pictofixedwidth"').$form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);

-				print "</td></tr>";

-			}

-		}

-

-		// Attached files

-		if (!empty($this->withfile)) {

-			// Define list of attached files

-			$listofpaths = array();

-			$listofnames = array();

-			$listofmimes = array();

-			if (!empty($_SESSION["listofpaths"])) {

-				$listofpaths = explode(';', $_SESSION["listofpaths"]);

-			}

-

-			if (!empty($_SESSION["listofnames"])) {

-				$listofnames = explode(';', $_SESSION["listofnames"]);

-			}

-

-			if (!empty($_SESSION["listofmimes"])) {

-				$listofmimes = explode(';', $_SESSION["listofmimes"]);

-			}

-

-			$out = '<tr>';

-			$out .= '<td>'.$langs->trans("MailFile").'</td>';

-			$out .= '<td>';

-			// TODO Trick to have param removedfile containing nb of image to delete. But this does not works without javascript

-			$out .= '<input type="hidden" class="removedfilehidden" name="removedfile" value="">'."\n";

-			$out .= '<script nonce="'.getNonce().'" type="text/javascript">';

-			$out .= 'jQuery(document).ready(function () {';

-			$out .= '    jQuery(".removedfile").click(function() {';

-			$out .= '        jQuery(".removedfilehidden").val(jQuery(this).val());';

-			$out .= '    });';

-			$out .= '})';

-			$out .= '</script>'."\n";

-			if (count($listofpaths)) {

-				foreach ($listofpaths as $key => $val) {

-					$out .= '<div id="attachfile_'.$key.'">';

-					$out .= img_mime($listofnames[$key]).' '.$listofnames[$key];

-					if (!$this->withfilereadonly) {

-						$out .= ' <input type="image" style="border: 0px;" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/delete.png" value="'.($key + 1).'" class="removedfile" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />';

-					}

-					$out .= '<br></div>';

-				}

-			} else {

-				$out .= $langs->trans("NoAttachedFiles").'<br>';

-			}

-			if ($this->withfile == 2) { // Can add other files

-				$maxfilesizearray = getMaxFileSizeArray();

-				$maxmin = $maxfilesizearray['maxmin'];

-				if ($maxmin > 0) {

-					$out .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file

-				}

-				$out .= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';

-				$out .= ' ';

-				$out .= '<input type="submit" class="button smallpaddingimp reposition" id="addfile" name="addfile" value="'.$langs->trans("MailingAddFile").'" />';

-			}

-			$out .= "</td></tr>\n";

-

-			print $out;

-		}

@@ -558 +276 @@
-				if (!empty($conf->use_javascript_ajax) && getDolGlobalString('COMPANY_USE_SEARCH_TO_SELECT')) {

+				if (!empty($conf->use_javascript_ajax) && !empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT)) {

@@ -560 +278 @@
-					print '<script nonce="'.getNonce().'" type="text/javascript">

+					print '<script type="text/javascript">

@@ -600,3 +318 @@
-											if (typeof(selecthtml_dom[0][0]) !== \'undefined\') {

-                                            	$("#inputautocomplete"+htmlname).val(selecthtml_dom[0][0].innerHTML);

-											}

+                                            $("#inputautocomplete"+htmlname).val(selecthtml_dom[0][0].innerHTML);

@@ -619 +335 @@
-				print $form->selectcontacts($selectedCompany, $this->withfromcontactid, 'contactid', 3, '', '', 0, 'minwidth200');

+				$nbofcontacts = $form->select_contacts($selectedCompany, $this->withfromcontactid, 'contactid', 3, '', '', 0, 'minwidth200');

@@ -625 +341 @@
-				print '<td><input type="hidden" name="contactid" value="'.$user->contact_id.'"/></td>';

+				print '<td><input type="hidden" name="contactid" value="'.$user->contactid.'"/></td>';

@@ -630 +346,2 @@
-			if (empty($this->ispublic)) {

+			if (empty($this->ispublic))

+			{

@@ -635,29 +352,60 @@
-

-			// User assigned

-			print '<tr><td>';

-			print $langs->trans("AssignedTo");

-			print '</td><td>';

-			print img_picto('', 'user', 'class="pictofixedwidth"');

-			print $form->select_dolusers(GETPOST('fk_user_assign', 'int'), 'fk_user_assign', 1);

-			print '</td>';

-			print '</tr>';

-		}

-

-		if ($subelement != 'project') {

-			if (isModEnabled('project') && !$this->ispublic) {

-				$formproject = new FormProjets($this->db);

-				print '<tr><td><label for="project"><span class="">'.$langs->trans("Project").'</span></label></td><td>';

-				print img_picto('', 'project').$formproject->select_projects(-1, GETPOST('projectid', 'int'), 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');

-				print '</td></tr>';

-			}

-		}

-

-		if ($subelement != 'contract') {

-			if (isModEnabled('contract') && !$this->ispublic) {

-				$langs->load('contracts');

-				$formcontract = new FormContract($this->db);

-				print '<tr><td><label for="contract"><span class="">'.$langs->trans("Contract").'</span></label></td><td>';

-				print img_picto('', 'contract');

-				print $formcontract->select_contract(-1, GETPOST('contactid', 'int'), 'contractid', 0, 1, 1, 1);

-				print '</td></tr>';

-			}

+		}

+

+		if (!empty($conf->projet->enabled) && !$this->ispublic)

+		{

+			$formproject = new FormProjets($this->db);

+			print '<tr><td><label for="project"><span class="">'.$langs->trans("Project").'</span></label></td><td>';

+			print $formproject->select_projects(-1, GETPOST('projectid', 'int'), 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth500');

+			print '</td></tr>';

+		}

+

+		// Attached files

+		if (!empty($this->withfile)) {

+			// Define list of attached files

+			$listofpaths = array();

+			$listofnames = array();

+			$listofmimes = array();

+			if (!empty($_SESSION["listofpaths"])) {

+				$listofpaths = explode(';', $_SESSION["listofpaths"]);

+			}

+

+			if (!empty($_SESSION["listofnames"])) {

+				$listofnames = explode(';', $_SESSION["listofnames"]);

+			}

+

+			if (!empty($_SESSION["listofmimes"])) {

+				$listofmimes = explode(';', $_SESSION["listofmimes"]);

+			}

+

+			$out = '<tr>';

+			$out .= '<td>'.$langs->trans("MailFile").'</td>';

+			$out .= '<td>';

+			// TODO Trick to have param removedfile containing nb of image to delete. But this does not works without javascript

+			$out .= '<input type="hidden" class="removedfilehidden" name="removedfile" value="">'."\n";

+			$out .= '<script type="text/javascript" language="javascript">';

+			$out .= 'jQuery(document).ready(function () {';

+			$out .= '    jQuery(".removedfile").click(function() {';

+			$out .= '        jQuery(".removedfilehidden").val(jQuery(this).val());';

+			$out .= '    });';

+			$out .= '})';

+			$out .= '</script>'."\n";

+			if (count($listofpaths)) {

+				foreach ($listofpaths as $key => $val) {

+					$out .= '<div id="attachfile_'.$key.'">';

+					$out .= img_mime($listofnames[$key]).' '.$listofnames[$key];

+					if (!$this->withfilereadonly) {

+						$out .= ' <input type="image" style="border: 0px;" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/delete.png" value="'.($key + 1).'" class="removedfile" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />';

+					}

+					$out .= '<br></div>';

+				}

+			} else {

+				$out .= $langs->trans("NoAttachedFiles").'<br>';

+			}

+			if ($this->withfile == 2) { // Can add other files

+				$out .= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';

+				$out .= ' ';

+				$out .= '<input type="submit" class="button" id="addfile" name="addfile" value="'.$langs->trans("MailingAddFile").'" />';

+			}

+			$out .= "</td></tr>\n";

+

+			print $out;

@@ -668,2 +416,3 @@
-		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $ticketstat, $action); // Note that $action and $object may have been modified by hook

-		if (empty($reshook)) {

+		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $ticketstat, $this->action); // Note that $action and $object may have been modified by hook

+		if (empty($reshook))

+		{

@@ -675,9 +424,2 @@
-		if ($withdolfichehead) {

-			print dol_get_fiche_end();

-		}

-

-		print '<br><br>';

-

-		print $form->buttonsSaveCancel(((isset($this->withreadid) && $this->withreadid > 0) ? "SendResponse" : "CreateTicket"), ($this->withcancel ? "Cancel" : ""));

-

-		/*

+		if ($withdolfichehead) dol_fiche_end();

+

@@ -685 +427 @@
-		print '<input type="submit" class="button" name="add" value="'.$langs->trans(($this->withreadid > 0 ? "SendResponse" : "CreateTicket")).'" />';

+		print '<input class="button" type="submit" name="add" value="'.$langs->trans(($this->withthreadid > 0 ? "SendResponse" : "NewTicket")).'" />';

@@ -688 +430 @@
-			print '<input class="button button-cancel" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';

+			print "<input class=\"button\" type=\"submit\" name=\"cancel\" value=\"".$langs->trans("Cancel")."\">";

@@ -691,3 +432,0 @@
-		*/

-

-		print '<input type="hidden" name="page_y">'."\n";

@@ -702,9 +441,8 @@
-	 *      @param  string|array	$selected		Id of preselected field or array of Ids

-	 *      @param  string			$htmlname		Nom de la zone select

-	 *      @param  string			$filtertype		To filter on field type in llx_c_ticket_type (array('code'=>xx,'label'=>zz))

-	 *      @param  int				$format			0=id+libelle, 1=code+code, 2=code+libelle, 3=id+code

-	 *      @param  int				$empty			1=peut etre vide, 0 sinon

-	 *      @param  int				$noadmininfo	0=Add admin info, 1=Disable admin info

-	 *      @param  int				$maxlength		Max length of label

-	 *      @param	string			$morecss		More CSS

-	 *      @param  int				$multiselect	Is multiselect ?

+	 *      @param  string $selected    Id du type pre-selectionne

+	 *      @param  string $htmlname    Nom de la zone select

+	 *      @param  string $filtertype  To filter on field type in llx_c_ticket_type (array('code'=>xx,'label'=>zz))

+	 *      @param  int    $format      0=id+libelle, 1=code+code, 2=code+libelle, 3=id+code

+	 *      @param  int    $empty       1=peut etre vide, 0 sinon

+	 *      @param  int    $noadmininfo 0=Add admin info, 1=Disable admin info

+	 *      @param  int    $maxlength   Max length of label

+	 *      @param	string	$morecss	More CSS

@@ -713 +451 @@
-	public function selectTypesTickets($selected = '', $htmlname = 'tickettype', $filtertype = '', $format = 0, $empty = 0, $noadmininfo = 0, $maxlength = 0, $morecss = '', $multiselect = 0)

+	public function selectTypesTickets($selected = '', $htmlname = 'tickettype', $filtertype = '', $format = 0, $empty = 0, $noadmininfo = 0, $maxlength = 0, $morecss = '')

@@ -717 +454,0 @@
-		$selected = is_array($selected) ? $selected : (!empty($selected) ? explode(',', $selected) : array());

@@ -720 +457 @@
-		dol_syslog(get_class($this) . "::select_types_tickets " . implode(';', $selected) . ", " . $htmlname . ", " . $filtertype . ", " . $format . ", " . $multiselect, LOG_DEBUG);

+		dol_syslog(get_class($this)."::select_types_tickets ".$selected.", ".$htmlname.", ".$filtertype.", ".$format, LOG_DEBUG);

@@ -730 +467 @@
-		print '<select id="select'.$htmlname.'" class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.($multiselect ? '[]' : '').'"'.($multiselect ? ' multiple' : '').'>';

+		print '<select id="select'.$htmlname.'" class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';

@@ -742 +479 @@
-				// If 'showempty' is enabled we discard empty line because an empty line has already been output.

+				// We discard empty line if showempty is on because an empty line has already been output.

@@ -763,2 +500,2 @@
-				// If text is selected, we compare with code, otherwise with id

-				if (in_array($arraytypes['code'], $selected)) {

+				// Si selected est text, on compare avec code, sinon avec id

+				if (preg_match('/[a-z]/i', $selected) && $selected == $arraytypes['code']) {

@@ -766 +503 @@
-				} elseif (in_array($id, $selected)) {

+				} elseif ($selected == $id) {

@@ -768 +505 @@
-				} elseif ($arraytypes['use_default'] == "1" && !$selected && !$empty) {

+				} elseif ($arraytypes['use_default'] == "1" && !$empty) {

@@ -773 +509,0 @@
-

@@ -784,0 +521,101 @@
+				print $value;

+				print '</option>';

+			}

+		}

+		print '</select>';

+		if ($user->admin && !$noadmininfo) {

+			print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+		}

+

+		print ajax_combobox('select'.$htmlname);

+	}

+

+	/**

+	 *      Return html list of ticket anaytic codes

+	 *

+	 *      @param  string $selected    Id categorie pre-selectionnée

+	 *      @param  string $htmlname    Nom de la zone select

+	 *      @param  string $filtertype  To filter on field type in llx_c_ticket_category (array('code'=>xx,'label'=>zz))

+	 *      @param  int    $format      0=id+libelle, 1=code+code, 2=code+libelle, 3=id+code

+	 *      @param  int    $empty       1=peut etre vide, 0 sinon

+	 *      @param  int    $noadmininfo 0=Add admin info, 1=Disable admin info

+	 *      @param  int    $maxlength   Max length of label

+	 *      @param	string	$morecss	More CSS

+	 *      @return void

+	 */

+	public function selectGroupTickets($selected = '', $htmlname = 'ticketcategory', $filtertype = '', $format = 0, $empty = 0, $noadmininfo = 0, $maxlength = 0, $morecss = '')

+	{

+		global $langs, $user;

+

+		$ticketstat = new Ticket($this->db);

+

+		dol_syslog(get_class($this)."::selectCategoryTickets ".$selected.", ".$htmlname.", ".$filtertype.", ".$format, LOG_DEBUG);

+

+		$filterarray = array();

+

+		if ($filtertype != '' && $filtertype != '-1') {

+			$filterarray = explode(',', $filtertype);

+		}

+

+		$ticketstat->loadCacheCategoriesTickets();

+

+		print '<select id="select'.$htmlname.'" class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';

+		if ($empty) {

+			print '<option value="">&nbsp;</option>';

+		}

+

+		if (is_array($ticketstat->cache_category_tickets) && count($ticketstat->cache_category_tickets)) {

+			foreach ($ticketstat->cache_category_tickets as $id => $arraycategories) {

+				// On passe si on a demande de filtrer sur des modes de paiments particuliers

+				if (count($filterarray) && !in_array($arraycategories['type'], $filterarray)) {

+					continue;

+				}

+

+				// We discard empty line if showempty is on because an empty line has already been output.

+				if ($empty && empty($arraycategories['code'])) {

+					continue;

+				}

+

+				if ($format == 0) {

+					print '<option value="'.$id.'"';

+				}

+

+				if ($format == 1) {

+					print '<option value="'.$arraycategories['code'].'"';

+				}

+

+				if ($format == 2) {

+					print '<option value="'.$arraycategories['code'].'"';

+				}

+

+				if ($format == 3) {

+					print '<option value="'.$id.'"';

+				}

+

+				// Si selected est text, on compare avec code, sinon avec id

+				if (preg_match('/[a-z]/i', $selected) && $selected == $arraycategories['code']) {

+					print ' selected="selected"';

+				} elseif ($selected == $id) {

+					print ' selected="selected"';

+				} elseif ($arraycategories['use_default'] == "1" && !$empty) {

+					print ' selected="selected"';

+				}

+

+				print '>';

+

+				if ($format == 0) {

+					$value = ($maxlength ? dol_trunc($arraycategories['label'], $maxlength) : $arraycategories['label']);

+				}

+

+				if ($format == 1) {

+					$value = $arraycategories['code'];

+				}

+

+				if ($format == 2) {

+					$value = ($maxlength ? dol_trunc($arraycategories['label'], $maxlength) : $arraycategories['label']);

+				}

+

+				if ($format == 3) {

+					$value = $arraycategories['code'];

+				}

+

@@ -790 +627 @@
-		if (isset($user->admin) && $user->admin && !$noadmininfo) {

+		if ($user->admin && !$noadmininfo) {

@@ -798 +635 @@
-	 *      Return html list of ticket anaytic codes

+	 *      Return html list of ticket severitys

@@ -800,358 +637,8 @@
-	 *      @param  string 		$selected   		Id pre-selected category

-	 *      @param  string 		$htmlname   		Name of select component

-	 *      @param  string 		$filtertype 		To filter on some properties in llx_c_ticket_category ('public = 1'). This parameter must not come from input of users.

-	 *      @param  int    		$format     		0 = id+label, 1 = code+code, 2 = code+label, 3 = id+code

-	 *      @param  int    		$empty      		1 = can be empty, 0 = or not

-	 *      @param  int    		$noadmininfo		0 = ddd admin info, 1 = disable admin info

-	 *      @param  int    		$maxlength  		Max length of label

-	 *      @param	string		$morecss			More CSS

-	 * 		@param	int 		$use_multilevel		If > 0 create a multilevel select which use $htmlname example: $use_multilevel = 1 permit to have 2 select boxes.

-	 * 		@param	Translate	$outputlangs		Output language

-	 *      @return string|void						String of HTML component

-	 */

-	public function selectGroupTickets($selected = '', $htmlname = 'ticketcategory', $filtertype = '', $format = 0, $empty = 0, $noadmininfo = 0, $maxlength = 0, $morecss = '', $use_multilevel = 0, $outputlangs = null)

-	{

-		global $conf, $langs, $user;

-

-		dol_syslog(get_class($this)."::selectCategoryTickets ".$selected.", ".$htmlname.", ".$filtertype.", ".$format, LOG_DEBUG);

-

-		if (is_null($outputlangs) || !is_object($outputlangs)) {

-			$outputlangs = $langs;

-		}

-		$outputlangs->load("ticket");

-

-		$publicgroups = ($filtertype == 'public=1' || $filtertype == '(public:=:1)');

-

-		$ticketstat = new Ticket($this->db);

-		$ticketstat->loadCacheCategoriesTickets($publicgroups ? 1 : -1);	// get list of active ticket groups

-

-		if ($use_multilevel <= 0) {

-			print '<select id="select'.$htmlname.'" class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';

-			if ($empty) {

-				print '<option value="">&nbsp;</option>';

-			}

-

-			if (is_array($ticketstat->cache_category_tickets) && count($ticketstat->cache_category_tickets)) {

-				foreach ($ticketstat->cache_category_tickets as $id => $arraycategories) {

-					// Exclude some record

-					if ($publicgroups) {

-						if (empty($arraycategories['public'])) {

-							continue;

-						}

-					}

-

-					// We discard empty line if showempty is on because an empty line has already been output.

-					if ($empty && empty($arraycategories['code'])) {

-						continue;

-					}

-

-					$label = ($arraycategories['label'] != '-' ? $arraycategories['label'] : '');

-					if ($outputlangs->trans("TicketCategoryShort".$arraycategories['code']) != "TicketCategoryShort".$arraycategories['code']) {

-						$label = $outputlangs->trans("TicketCategoryShort".$arraycategories['code']);

-					} elseif ($outputlangs->trans($arraycategories['code']) != $arraycategories['code']) {

-						$label = $outputlangs->trans($arraycategories['code']);

-					}

-

-					if ($format == 0) {

-						print '<option value="'.$id.'"';

-					}

-

-					if ($format == 1) {

-						print '<option value="'.$arraycategories['code'].'"';

-					}

-

-					if ($format == 2) {

-						print '<option value="'.$arraycategories['code'].'"';

-					}

-

-					if ($format == 3) {

-						print '<option value="'.$id.'"';

-					}

-

-					// If selected is text, we compare with code, otherwise with id

-					if (isset($selected) && preg_match('/[a-z]/i', $selected) && $selected == $arraycategories['code']) {

-						print ' selected="selected"';

-					} elseif (isset($selected) && $selected == $id) {

-						print ' selected="selected"';

-					} elseif ($arraycategories['use_default'] == "1" && !$selected && !$empty) {

-						print ' selected="selected"';

-					} elseif (count($ticketstat->cache_category_tickets) == 1) {

-						print ' selected="selected"';

-					}

-

-					print '>';

-

-					$value = '';

-					if ($format == 0) {

-						$value = ($maxlength ? dol_trunc($label, $maxlength) : $label);

-					}

-

-					if ($format == 1) {

-						$value = $arraycategories['code'];

-					}

-

-					if ($format == 2) {

-						$value = ($maxlength ? dol_trunc($label, $maxlength) : $label);

-					}

-

-					if ($format == 3) {

-						$value = $arraycategories['code'];

-					}

-

-					print $value ? $value : '&nbsp;';

-					print '</option>';

-				}

-			}

-			print '</select>';

-			if (isset($user->admin) && $user->admin && !$noadmininfo) {

-				print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

-			}

-

-			print ajax_combobox('select'.$htmlname);

-		} elseif ($htmlname != '') {

-			$selectedgroups = array();

-			$groupvalue = "";

-			$groupticket=GETPOST($htmlname, 'aZ09');

-			$child_id=GETPOST($htmlname.'_child_id', 'aZ09') ? GETPOST($htmlname.'_child_id', 'aZ09') : 0;

-			if (!empty($groupticket)) {

-				$tmpgroupticket = $groupticket;

-				$sql = "SELECT ctc.rowid, ctc.fk_parent, ctc.code";

-				$sql .= " FROM ".$this->db->prefix()."c_ticket_category as ctc WHERE ctc.code = '".$this->db->escape($tmpgroupticket)."'";

-				$resql = $this->db->query($sql);

-				if ($resql) {

-					$obj = $this->db->fetch_object($resql);

-					$selectedgroups[] = $obj->code;

-					while ($obj->fk_parent > 0) {

-						$sql = "SELECT ctc.rowid, ctc.fk_parent, ctc.code FROM ".$this->db->prefix()."c_ticket_category as ctc WHERE ctc.rowid ='".$this->db->escape($obj->fk_parent)."'";

-						$resql = $this->db->query($sql);

-						if ($resql) {

-							$obj = $this->db->fetch_object($resql);

-							$selectedgroups[] = $obj->code;

-						}

-					}

-				}

-			}

-

-			$arrayidused = array();

-			$arrayidusedconcat = array();

-			$arraycodenotparent = array();

-			$arraycodenotparent[] = "";

-

-			$stringtoprint = '<span class="supportemailfield bold">'.$langs->trans("GroupOfTicket").'</span> ';

-			$stringtoprint .= '<select id="'.$htmlname.'" class="minwidth500" child_id="0">';

-			$stringtoprint .= '<option value="">&nbsp;</option>';

-

-			$sql = "SELECT ctc.rowid, ctc.code, ctc.label, ctc.fk_parent, ctc.public, ";

-			$sql .= $this->db->ifsql("ctc.rowid NOT IN (SELECT ctcfather.rowid FROM llx_c_ticket_category as ctcfather JOIN llx_c_ticket_category as ctcjoin ON ctcfather.rowid = ctcjoin.fk_parent)", "'NOTPARENT'", "'PARENT'")." as isparent";

-			$sql .= " FROM ".$this->db->prefix()."c_ticket_category as ctc";

-			$sql .= " WHERE ctc.active > 0 AND ctc.entity = ".((int) $conf->entity);

-			if ($filtertype == 'public=1') {

-				$sql .= " AND ctc.public = 1";

-			}

-			$sql .= " AND ctc.fk_parent = 0";

-			$sql .= $this->db->order('ctc.pos', 'ASC');

-

-			$resql = $this->db->query($sql);

-			if ($resql) {

-				$num_rows_level0 = $this->db->num_rows($resql);

-				$i = 0;

-				while ($i < $num_rows_level0) {

-					$obj = $this->db->fetch_object($resql);

-					if ($obj) {

-						$label = ($obj->label != '-' ? $obj->label : '');

-						if ($outputlangs->trans("TicketCategoryShort".$obj->code) != "TicketCategoryShort".$obj->code) {

-							$label = $outputlangs->trans("TicketCategoryShort".$obj->code);

-						} elseif ($outputlangs->trans($obj->code) != $obj->code) {

-							$label = $outputlangs->trans($obj->code);

-						}

-

-						$grouprowid = $obj->rowid;

-						$groupvalue = $obj->code;

-						$grouplabel = $label;

-

-						$isparent = $obj->isparent;

-						if (is_array($selectedgroups)) {

-							$iselected = in_array($obj->code, $selectedgroups) ? 'selected' : '';

-						} else {

-							$iselected = $groupticket == $obj->code ? 'selected' : '';

-						}

-						$stringtoprint .= '<option '.$iselected.' class="'.$htmlname.dol_escape_htmltag($grouprowid).'" value="'.dol_escape_htmltag($groupvalue).'" data-html="'.dol_escape_htmltag($grouplabel).'">'.dol_escape_htmltag($grouplabel).'</option>';

-						if ($isparent == 'NOTPARENT') {

-							$arraycodenotparent[] = $groupvalue;

-						}

-						$arrayidused[] = $grouprowid;

-						$arrayidusedconcat[] = $grouprowid;

-					}

-					$i++;

-				}

-			} else {

-				dol_print_error($this->db);

-			}

-			if (count($arrayidused) == 1) {

-				return '<input type="hidden" name="'.$htmlname.'" id="'.$htmlname.'" value="'.dol_escape_htmltag($groupvalue).'">';

-			} else {

-				$stringtoprint .= '<input type="hidden" name="'.$htmlname.'" id="'.$htmlname.'_select" class="maxwidth500 minwidth400">';

-				$stringtoprint .= '<input type="hidden" name="'.$htmlname.'_child_id" id="'.$htmlname.'_select_child_id" class="maxwidth500 minwidth400">';

-			}

-			$stringtoprint .= '</select>&nbsp;';

-

-			$levelid = 1;	// The first combobox

-			while ($levelid <= $use_multilevel) {	// Loop to take the child of the combo

-				$tabscript = array();

-				$stringtoprint .= '<select id="'.$htmlname.'_child_'.$levelid.'" class="maxwidth500 minwidth400 groupticketchild" child_id="'.$levelid.'">';

-				$stringtoprint .= '<option value="">&nbsp;</option>';

-

-				$sql = "SELECT ctc.rowid, ctc.code, ctc.label, ctc.fk_parent, ctc.public, ctcjoin.code as codefather";

-				$sql .= " FROM ".$this->db->prefix()."c_ticket_category as ctc";

-				$sql .= " JOIN ".$this->db->prefix()."c_ticket_category as ctcjoin ON ctc.fk_parent = ctcjoin.rowid";

-				$sql .= " WHERE ctc.active > 0 AND ctc.entity = ".((int) $conf->entity);

-				$sql .= " AND ctc.rowid NOT IN (".$this->db->sanitize(join(',', $arrayidusedconcat)).")";

-

-				if ($filtertype == 'public=1') {

-					$sql .= " AND ctc.public = 1";

-				}

-				// Add a test to take only record that are direct child

-				if (!empty($arrayidused)) {

-					$sql .= " AND ctc.fk_parent IN ( ";

-					foreach ($arrayidused as $idused) {

-						$sql .= $idused.", ";

-					}

-					$sql = substr($sql, 0, -2);

-					$sql .= ")";

-				}

-				$sql .= $this->db->order('ctc.pos', 'ASC');

-

-				$resql = $this->db->query($sql);

-				if ($resql) {

-					$num_rows = $this->db->num_rows($resql);

-					$i = 0;

-					$arrayidused=array();

-					while ($i < $num_rows) {

-						$obj = $this->db->fetch_object($resql);

-						if ($obj) {

-							$label = ($obj->label != '-' ? $obj->label : '');

-							if ($outputlangs->trans("TicketCategoryShort".$obj->code) != "TicketCategoryShort".$obj->code) {

-								$label = $outputlangs->trans("TicketCategoryShort".$obj->code);

-							} elseif ($outputlangs->trans($obj->code) != $obj->code) {

-								$label = $outputlangs->trans($obj->code);

-							}

-

-							$grouprowid = $obj->rowid;

-							$groupvalue = $obj->code;

-							$grouplabel = $label;

-							$isparent = $obj->isparent;

-							$fatherid = $obj->fk_parent;

-							$arrayidused[] = $grouprowid;

-							$arrayidusedconcat[] = $grouprowid;

-							$groupcodefather = $obj->codefather;

-							if ($isparent == 'NOTPARENT') {

-								$arraycodenotparent[] = $groupvalue;

-							}

-							if (is_array($selectedgroups)) {

-								$iselected = in_array($obj->code, $selectedgroups) ? 'selected' : '';

-							} else {

-								$iselected = $groupticket == $obj->code ? 'selected' : '';

-							}

-							$stringtoprint .= '<option '.$iselected.' class="'.$htmlname.'_'.dol_escape_htmltag($fatherid).'_child_'.$levelid.'" value="'.dol_escape_htmltag($groupvalue).'" data-html="'.dol_escape_htmltag($grouplabel).'">'.dol_escape_htmltag($grouplabel).'</option>';

-							if (empty($tabscript[$groupcodefather])) {

-								$tabscript[$groupcodefather] = 'if ($("#'.$htmlname.($levelid > 1 ? '_child_'.($levelid-1) : '').'").val() == "'.dol_escape_js($groupcodefather).'"){

-									$(".'.$htmlname.'_'.dol_escape_htmltag($fatherid).'_child_'.$levelid.'").show()

-									console.log("We show childs tickets of '.$groupcodefather.' group ticket")

-								}else{

-									$(".'.$htmlname.'_'.dol_escape_htmltag($fatherid).'_child_'.$levelid.'").hide()

-									console.log("We hide childs tickets of '.$groupcodefather.' group ticket")

-								}';

-							}

-						}

-						$i++;

-					}

-				} else {

-					dol_print_error($this->db);

-				}

-				$stringtoprint .='</select>';

-

-				$stringtoprint .='<script nonce="'.getNonce().'">';

-				$stringtoprint .='arraynotparents = '.json_encode($arraycodenotparent).';';	// when the last visible combo list is number x, this is the array of group

-				$stringtoprint .='if (arraynotparents.includes($("#'.$htmlname.($levelid > 1 ? '_child_'.($levelid-1) : '').'").val())){

-					console.log("'.$htmlname.'_child_'.$levelid.'")

-					if($("#'.$htmlname.'_child_'.$levelid.'").val() == "" && ($("#'.$htmlname.'_child_'.$levelid.'").attr("child_id")>'.$child_id.')){

-						$("#'.$htmlname.'_child_'.$levelid.'").hide();

-						console.log("We hide '.$htmlname.'_child_'.$levelid.' input")

-					}

-					if(arraynotparents.includes("'.$groupticket.'") && '.$child_id.' == 0){

-						$("#ticketcategory_select_child_id").val($("#'.$htmlname.'").attr("child_id"))

-						$("#ticketcategory_select").val($("#'.$htmlname.'").val()) ;

-						console.log("We choose '.$htmlname.' input and reload hidden input");

-					}

-				}

-				$("#'.$htmlname.($levelid > 1 ? '_child_'.($levelid-1) : '').'").change(function() {

-					child_id = $("#'.$htmlname.($levelid > 1 ? '_child_'.$levelid : '').'").attr("child_id");

-

-					/* Change of value to select this value*/

-					if (arraynotparents.includes($(this).val()) || $(this).attr("child_id") == '.$use_multilevel.') {

-						$("#ticketcategory_select").val($(this).val());

-						$("#ticketcategory_select_child_id").val($(this).attr("child_id")) ;

-						console.log("We choose to select "+ $(this).val());

-					}else{

-						if ($("#'.$htmlname.'_child_'.$levelid.' option").length <= 1) {

-							$("#ticketcategory_select").val($(this).val());

-							$("#ticketcategory_select_child_id").val($(this).attr("child_id"));

-							console.log("We choose to select "+ $(this).val() + " and next combo has no item, so we keep this selection");

-						} else {

-							console.log("We choose to select "+ $(this).val() + " but next combo has some item, so we clean selected item");

-							$("#ticketcategory_select").val("");

-							$("#ticketcategory_select_child_id").val("");

-						}

-					}

-

-					console.log("We select a new value into combo child_id="+child_id);

-

-					// Hide all selected box that are child of the one modified

-					$(".groupticketchild").each(function(){

-						if ($(this).attr("child_id") > child_id) {

-							console.log("hide child_id="+$(this).attr("child_id"));

-							$(this).val("");

-							$(this).hide();

-						}

-					})

-

-					// Now we enable the next combo

-					$("#'.$htmlname.'_child_'.$levelid.'").val("");

-					if (!arraynotparents.includes($(this).val()) && $("#'.$htmlname.'_child_'.$levelid.' option").length > 1) {

-						console.log($("#'.$htmlname.'_child_'.$levelid.' option").length);

-						$("#'.$htmlname.'_child_'.$levelid.'").show()

-					} else {

-						$("#'.$htmlname.'_child_'.$levelid.'").hide()

-					}

-				';

-				$levelid++;

-				foreach ($tabscript as $script) {

-					$stringtoprint .= $script;

-				}

-				$stringtoprint .='})';

-				$stringtoprint .='</script>';

-			}

-			$stringtoprint .='<script nonce="'.getNonce().'">';

-			$stringtoprint .='$("#'.$htmlname.'_child_'.$use_multilevel.'").change(function() {

-				$("#ticketcategory_select").val($(this).val());

-				$("#ticketcategory_select_child_id").val($(this).attr("child_id"));

-				console.log($("#ticketcategory_select").val());

-			})';

-			$stringtoprint .='</script>';

-			$stringtoprint .= ajax_combobox($htmlname);

-

-			return $stringtoprint;

-		}

-	}

-

-	/**

-	 *      Return html list of ticket severitys (priorities)

-	 *

-	 *      @param  string  $selected    Id severity pre-selected

-	 *      @param  string  $htmlname    Name of the select area

-	 *      @param  string  $filtertype  To filter on field type in llx_c_ticket_severity (array('code'=>xx,'label'=>zz))

-	 *      @param  int     $format      0 = id+label, 1 = code+code, 2 = code+label, 3 = id+code

-	 *      @param  int     $empty       1 = can be empty, 0 = or not

-	 *      @param  int     $noadmininfo 0 = add admin info, 1 = disable admin info

-	 *      @param  int     $maxlength   Max length of label

-	 *      @param  string  $morecss     More CSS

+	 *      @param  string $selected    Id severity pre-selectionnée

+	 *      @param  string $htmlname    Nom de la zone select

+	 *      @param  string $filtertype  To filter on field type in llx_c_ticket_severity (array('code'=>xx,'label'=>zz))

+	 *      @param  int    $format      0=id+libelle, 1=code+code, 2=code+libelle, 3=id+code

+	 *      @param  int    $empty       1=peut etre vide, 0 sinon

+	 *      @param  int    $noadmininfo 0=Add admin info, 1=Disable admin info

+	 *      @param  int    $maxlength   Max length of label

+	 *      @param	string	$morecss	More CSS

@@ -1209,2 +696,2 @@
-				// If text is selected, we compare with code, otherwise with id

-				if (isset($selected) && preg_match('/[a-z]/i', $selected) && $selected == $arrayseverities['code']) {

+				// Si selected est text, on compare avec code, sinon avec id

+				if (preg_match('/[a-z]/i', $selected) && $selected == $arrayseverities['code']) {

@@ -1212 +699 @@
-				} elseif (isset($selected) && $selected == $id) {

+				} elseif ($selected == $id) {

@@ -1214 +701 @@
-				} elseif ($arrayseverities['use_default'] == "1" && !$selected && !$empty) {

+				} elseif ($arrayseverities['use_default'] == "1" && !$empty) {

@@ -1219,2 +705,0 @@
-

-				$value = '';

@@ -1242 +727 @@
-		if (isset($user->admin) && $user->admin && !$noadmininfo) {

+		if ($user->admin && !$noadmininfo) {

@@ -1264,9 +749,3 @@
-		if (is_dir($upload_dir)) {

-			dol_delete_dir_recursive($upload_dir);

-		}

-

-		if (!empty($this->trackid)) { // TODO Always use trackid (ticXXX) instead of track_id (abcd123)

-			$keytoavoidconflict = '-'.$this->trackid;

-		} else {

-			$keytoavoidconflict = empty($this->track_id) ? '' : '-'.$this->track_id;

-		}

+		if (is_dir($upload_dir)) dol_delete_dir_recursive($upload_dir);

+

+		$keytoavoidconflict = empty($this->trackid) ? '' : '-'.$this->trackid; // this->trackid must be defined

@@ -1291,3 +770 @@
-		if (!is_object($form)) {

-			$form = new Form($this->db);

-		}

+		if (!is_object($form)) $form = new Form($this->db);

@@ -1296 +773 @@
-		$langs->loadLangs(array('other', 'mails', 'ticket'));

+		$langs->loadLangs(array('other', 'mails'));

@@ -1299 +776,2 @@
-		if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelselected') && GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1')) {

+		if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1'))

+		{

@@ -1306 +784,46 @@
-		if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && isset($this->param['langsmodels'])) {

+		if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $this->param['langsmodels'];

+		if (!empty($newlang))

+		{

+			$outputlangs = new Translate("", $conf);

+			$outputlangs->setDefaultLang($newlang);

+			$outputlangs->load('other');

+		}

+

+		// Get message template for $this->param["models"] into c_email_templates

+		$arraydefaultmessage = -1;

+		if ($this->param['models'] != 'none')

+		{

+			$model_id = 0;

+			if (array_key_exists('models_id', $this->param))

+			{

+				$model_id = $this->param["models_id"];

+			}

+

+			$arraydefaultmessage = $formmail->getEMailTemplate($this->db, $this->param["models"], $user, $outputlangs, $model_id); // If $model_id is empty, preselect the first one

+		}

+

+		// Define list of attached files

+		$listofpaths = array();

+		$listofnames = array();

+		$listofmimes = array();

+		$keytoavoidconflict = empty($this->trackid) ? '' : '-'.$this->trackid; // this->trackid must be defined

+

+		if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1'))

+		{

+			if (!empty($arraydefaultmessage->joinfiles) && is_array($this->param['fileinit']))

+			{

+				foreach ($this->param['fileinit'] as $file)

+				{

+					$this->add_attached_files($file, basename($file), dol_mimetype($file));

+				}

+			}

+		}

+

+		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]);

+

+		// Define output language

+		$outputlangs = $langs;

+		$newlang = '';

+		if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {

@@ -1315,53 +837,0 @@
-		// Get message template for $this->param["models"] into c_email_templates

-		$arraydefaultmessage = -1;

-		if (isset($this->param['models']) && $this->param['models'] != 'none') {

-			$model_id = 0;

-			if (array_key_exists('models_id', $this->param)) {

-				$model_id = (int) $this->param["models_id"];

-			}

-

-			$arraydefaultmessage = $formmail->getEMailTemplate($this->db, $this->param["models"], $user, $outputlangs, $model_id); // If $model_id is empty, preselect the first one

-		}

-

-		// Define list of attached files

-		$listofpaths = array();

-		$listofnames = array();

-		$listofmimes = array();

-

-		if (!empty($this->trackid)) {

-			$keytoavoidconflict = '-'.$this->trackid;

-		} else {

-			$keytoavoidconflict = empty($this->track_id) ? '' : '-'.$this->track_id; // track_id instead of trackid

-		}

-		//var_dump($keytoavoidconflict);

-		if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelselected') && GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1')) {

-			if (!empty($arraydefaultmessage->joinfiles) && !empty($this->param['fileinit']) && is_array($this->param['fileinit'])) {

-				foreach ($this->param['fileinit'] as $file) {

-					$formmail->add_attached_files($file, basename($file), dol_mimetype($file));

-				}

-			}

-		}

-		//var_dump($_SESSION);

-		//var_dump($_SESSION["listofpaths".$keytoavoidconflict]);

-		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]);

-		}

-

-		// Define output language

-		$outputlangs = $langs;

-		$newlang = '';

-		if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && isset($this->param['langsmodels'])) {

-			$newlang = $this->param['langsmodels'];

-		}

-		if (!empty($newlang)) {

-			$outputlangs = new Translate("", $conf);

-			$outputlangs->setDefaultLang($newlang);

-			$outputlangs->load('other');

-		}

-

@@ -1373 +843 @@
-		print '<script nonce="'.getNonce().'" type="text/javascript">

+		print '<script type="text/javascript" language="javascript">

@@ -1377,3 +846,0 @@
-				if (!jQuery("#send_msg_email").is(":checked")) {

-					jQuery("#send_msg_email").prop("checked", true).trigger("change");

-				}

@@ -1382,3 +848,0 @@
-				if (!jQuery("#private_message").is(":checked")) {

-					jQuery("#private_message").prop("checked", true).trigger("change");

-				}

@@ -1387,28 +851,9 @@
-		';

-

-		// If constant set, allow to send private messages as email

-		if (!getDolGlobalString('TICKET_SEND_PRIVATE_EMAIL')) {

-			print 'jQuery("#send_msg_email").click(function() {

-					console.log("Click send_msg_email");

-					if(jQuery(this).is(":checked")) {

-						if (jQuery("#private_message").is(":checked")) {

-							jQuery("#private_message").prop("checked", false).trigger("change");

-						}

-						jQuery(".email_line").show();

-					}

-					else {

-						jQuery(".email_line").hide();

-					}

-				});

-

-				jQuery("#private_message").click(function() {

-					console.log("Click private_message");

-					if (jQuery(this).is(":checked")) {

-						if (jQuery("#send_msg_email").is(":checked")) {

-							jQuery("#send_msg_email").prop("checked", false).trigger("change");

-						}

-						jQuery(".email_line").hide();

-					}

-				});';

-		}

-

+

+			jQuery("#send_msg_email").click(function() {

+				if(jQuery(this).is(":checked")) {

+					jQuery(".email_line").show();

+				}

+				else {

+					jQuery(".email_line").hide();

+				}

+            });';

@@ -1418,2 +863 @@
-

-		print '<form method="post" name="ticket" id="ticket" enctype="multipart/form-data" action="'.$this->param["returnurl"].'">';

+		print '<form method="post" name="ticket" enctype="multipart/form-data" action="'.$this->param["returnurl"].'">';

@@ -1423,7 +866,0 @@
-		print '<input type="hidden" name="backtopage" value="'.$this->backtopage.'">';

-		if (!empty($this->trackid)) {

-			print '<input type="hidden" name="trackid" value="'.$this->trackid.'">';

-		} else {

-			print '<input type="hidden" name="trackid" value="'.(empty($this->track_id) ? '' : $this->track_id).'">';

-			$keytoavoidconflict = empty($this->track_id) ? '' : '-'.$this->track_id; // track_id instead of trackid

-		}

@@ -1441 +878 @@
-		$result = $formmail->fetchAllEMailTemplate(!empty($this->param["models"]) ? $this->param["models"] : "", $user, $outputlangs);

+		$result = $formmail->fetchAllEMailTemplate($this->param["models"], $user, $outputlangs);

@@ -1450 +887 @@
-		print '<table class="border" width="'.$width.'">';

+		print '<table class="border"  width="'.$width.'">';

@@ -1453,6 +890,4 @@
-		if ($user->hasRight("ticket", "write") && !$user->socid) {

-			$ticketstat = new Ticket($this->db);

-			$res = $ticketstat->fetch('', '', $this->track_id);

-

-			print '<tr><td></td><td>';

-			$checkbox_selected = (GETPOST('send_email') == "1" ? ' checked' : (getDolGlobalInt('TICKETS_MESSAGE_FORCE_MAIL') ? 'checked' : ''));

+		if ($user->rights->ticket->write && !$user->socid)

+		{

+			print '<tr><td width="30%"></td><td colspan="2">';

+			$checkbox_selected = (GETPOST('send_email') == "1" ? ' checked' : '');

@@ -1461,8 +895,0 @@
-			$texttooltip = $langs->trans("TicketMessageSendEmailHelp");

-			if (!getDolGlobalString('TICKET_SEND_PRIVATE_EMAIL')) {

-				$texttooltip .= ' '.$langs->trans("TicketMessageSendEmailHelp2b");

-			} else {

-				$texttooltip .= ' '.$langs->trans("TicketMessageSendEmailHelp2a", '{s1}');

-			}

-			$texttooltip = str_replace('{s1}', $langs->trans('MarkMessageAsPrivate'), $texttooltip);

-			print ' '.$form->textwithpicto('', $texttooltip, 1, 'help');

@@ -1469,0 +897,13 @@
+

+			// Zone to select its email template

+			if (count($modelmail_array) > 0) {

+				print '<tr class="email_line"><td></td><td colspan="2"><div style="padding: 3px 0 3px 0">'."\n";

+				print $langs->trans('SelectMailModel').': '.$formmail->selectarray('modelmailselected', $modelmail_array, $this->param['models_id'], 1);

+				if ($user->admin) {

+					print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+				}

+				print ' &nbsp; ';

+				print '<input class="button" type="submit" value="'.$langs->trans('Use').'" name="modelselected" id="modelselected">';

+				print ' &nbsp; ';

+				print '</div></td>';

+			}

@@ -1473 +913 @@
-				print '<tr><td></td><td>';

+				print '<tr><td width="30%"></td><td>';

@@ -1477 +917,2 @@
-				print ' '.$form->textwithpicto('', $langs->trans("TicketMessagePrivateHelp"), 1, 'help');

+				print '</td><td class="center">';

+				print $form->textwithpicto('', $langs->trans("TicketMessagePrivateHelp"), 1, 'help');

@@ -1481,25 +922,3 @@
-			// Zone to select its email template

-			if (count($modelmail_array) > 0) {

-				print '<tr class="email_line"><td></td><td colspan="2"><div style="padding: 3px 0 3px 0">'."\n";

-				print $langs->trans('SelectMailModel').': '.$formmail->selectarray('modelmailselected', $modelmail_array, $this->param['models_id'], 1, 0, "", "", 0, 0, 0, '', 'minwidth200');

-				if ($user->admin) {

-					print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

-				}

-				print ' &nbsp; ';

-				print '<input type="submit" class="button" value="'.$langs->trans('Apply').'" name="modelselected" id="modelselected">';

-				print '</div></td>';

-			}

-			// Subject/topic

-			$topic = "";

-			foreach ($formmail->lines_model as $line) {

-				if ($this->param['models_id'] == $line->id) {

-					$topic = $line->topic;

-					break;

-				}

-			}

-			print '<tr class="email_line"><td>'.$langs->trans('Subject').'</td>';

-			if (empty($topic)) {

-				print '<td><input type="text" class="text minwidth500" name="subject" value="['.getDolGlobalString('MAIN_INFO_SOCIETE_NOM').' - '.$langs->trans("Ticket").' '.$ticketstat->ref.'] '.$langs->trans('TicketNewMessage').'" />';

-			} else {

-				print '<td><input type="text" class="text minwidth500" name="subject" value="['.getDolGlobalString('MAIN_INFO_SOCIETE_NOM').' - '.$langs->trans("Ticket").' '.$ticketstat->ref.'] '.$topic.'" />';

-			}

+			print '<tr class="email_line"><td class="titlefieldcreate">'.$langs->trans('Subject').'</td>';

+			$label_title = empty($conf->global->MAIN_APPLICATION_TITLE) ? $mysoc->name : $conf->global->MAIN_APPLICATION_TITLE;

+			print '<td colspan="2"><input type="text" class="text" size="80" name="subject" value="['.$label_title.' - '.$langs->trans("Ticket").' #'.$this->ref.'] '.$langs->trans('TicketNewMessage').'" />';

@@ -1508,4 +927,4 @@
-			// Recipients / adressed-to

-			print '<tr class="email_line"><td>'.$langs->trans('MailRecipients');

-			print ' '.$form->textwithpicto('', $langs->trans("TicketMessageRecipientsHelp"), 1, 'help');

-			print '</td><td>';

+			// Destinataires

+			print '<tr class="email_line"><td>'.$langs->trans('MailRecipients').'</td><td colspan="2">';

+			$ticketstat = new Ticket($this->db);

+			$res = $ticketstat->fetch('', '', $this->track_id);

@@ -1514,4 +933,2 @@
-				$contacts = $ticketstat->getInfosTicketInternalContact(1);

-				$contacts = array_merge($contacts, $ticketstat->getInfosTicketExternalContact(1));

-

-				$sendto = array();

+				$contacts = $ticketstat->getInfosTicketInternalContact();

+				$contacts = array_merge($contacts, $ticketstat->getInfosTicketExternalContact());

@@ -1528 +945 @@
-				if ($ticketstat->origin_email && !in_array($ticketstat->origin_email, $sendto)) {

+				if ($ticketstat->origin_email && !in_array($this->dao->origin_email, $sendto)) {

@@ -1536 +953 @@
-					if (!empty($ticketstat->thirdparty->email) && !in_array($ticketstat->thirdparty->email, $sendto)) {

+					if (is_array($ticketstat->thirdparty->email) && !in_array($ticketstat->thirdparty->email, $sendto)) {

@@ -1541,2 +958,2 @@
-				if (getDolGlobalInt('TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS')) {

-					$sendto[] = getDolGlobalString('TICKET_NOTIFICATION_EMAIL_TO').' <small class="opacitymedium">(generic email)</small>';

+				if ($conf->global->TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS) {

+					$sendto[] = $conf->global->TICKET_NOTIFICATION_EMAIL_TO.' <small class="opacitymedium">(generic email)</small>';

@@ -1547 +963,0 @@
-					print img_picto('', 'email', 'class="pictofixedwidth"');

@@ -1556,2 +971,0 @@
-		$uselocalbrowser = false;

-

@@ -1560,2 +974 @@
-		/*

-		if ($user->rights->ticket->write && !$user->socid && !empty($conf->global->TICKET_MESSAGE_MAIL_INTRO)) {

+		if ($user->rights->ticket->write && !$user->socid) {

@@ -1563,3 +976 @@
-			print '<tr class="email_line"><td><label for="mail_intro">';

-			print $form->textwithpicto($langs->trans("TicketMessageMailIntro"), $langs->trans("TicketMessageMailIntroHelp"), 1, 'help');

-			print '</label>';

+			print '<tr class="email_line"><td><label for="mail_intro">'.$langs->trans("TicketMessageMailIntro").'</label>';

@@ -1569,2 +980,3 @@
-

-			$doleditor = new DolEditor('mail_intro', $mail_intro, '100%', 90, 'dolibarr_details', '', false, $uselocalbrowser, getDolGlobalInt('FCKEDITOR_ENABLE_TICKET'), ROWS_2, 70);

+			$uselocalbrowser = true;

+

+			$doleditor = new DolEditor('mail_intro', $mail_intro, '100%', 90, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_2, 70);

@@ -1572,0 +985,2 @@
+			print '</td><td class="center">';

+			print $form->textwithpicto('', $langs->trans("TicketMessageMailIntroHelp"), 1, 'help');

@@ -1575 +989,50 @@
-		*/

+

+        // MESSAGE

+        $defaultmessage="";

+		if (is_object($arraydefaultmessage) && $arraydefaultmessage->content) {

+			$defaultmessage = $arraydefaultmessage->content;

+		}

+        $defaultmessage = str_replace('\n', "\n", $defaultmessage);

+

+		// Deal with format differences between message and signature (text / HTML)

+		if (dol_textishtml($defaultmessage) && !dol_textishtml($this->substit['__SIGNATURE__'])) {

+			$this->substit['__SIGNATURE__'] = dol_nl2br($this->substit['__SIGNATURE__']);

+		} elseif (!dol_textishtml($defaultmessage) && dol_textishtml($this->substit['__SIGNATURE__'])) {

+			$defaultmessage = dol_nl2br($defaultmessage);

+		}

+		if (isset($_POST["message"]) && !$_POST['modelselected']) {

+			$defaultmessage = GETPOST('message');

+		} else {

+			$defaultmessage = make_substitutions($defaultmessage, $this->substit);

+			// Clean first \n and br (to avoid empty line when CONTACTCIVNAME is empty)

+			$defaultmessage = preg_replace("/^(<br>)+/", "", $defaultmessage);

+			$defaultmessage = preg_replace("/^\n+/", "", $defaultmessage);

+		}

+

+		print '<tr><td class="tdtop"><label for="message"><span class="fieldrequired">'.$langs->trans("Message").'</span></label></td><td>';

+		//$toolbarname = 'dolibarr_details';

+		$toolbarname = 'dolibarr_notes';

+		include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';

+		$doleditor = new DolEditor('message', $defaultmessage, '100%', 200, $toolbarname, '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, 70);

+		$doleditor->Create();

+		print '</td><td class="center">';

+		if ($user->rights->ticket->write && !$user->socid) {

+			print $form->textwithpicto('', $langs->trans("TicketMessageHelp"), 1, 'help');

+		}

+

+		print '</td></tr>';

+

+		// Signature

+		// External users can't send message email

+		if ($user->rights->ticket->write && !$user->socid) {

+			$mail_signature = GETPOST('mail_signature') ? GETPOST('mail_signature') : $conf->global->TICKET_MESSAGE_MAIL_SIGNATURE;

+			print '<tr class="email_line"><td><label for="mail_intro">'.$langs->trans("TicketMessageMailSignature").'</label>';

+

+			print '</td><td>';

+			include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';

+			$doleditor = new DolEditor('mail_signature', $mail_signature, '100%', 150, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_2, 70);

+			$doleditor->Create();

+			print '</td><td class="center">';

+			print $form->textwithpicto('', $langs->trans("TicketMessageMailSignatureHelp"), 1, 'help');

+			print '</td></tr>';

+		}

@@ -1580,2 +1043,2 @@
-			$out .= '<td>'.$langs->trans("MailFile").'</td>';

-			$out .= '<td>';

+			$out .= '<td width="180">'.$langs->trans("MailFile").'</td>';

+			$out .= '<td colspan="2">';

@@ -1584 +1047 @@
-			$out .= '<script nonce="'.getNonce().'" type="text/javascript">';

+			$out .= '<script type="text/javascript" language="javascript">';

@@ -1586,8 +1048,0 @@
-			$out .= '    jQuery("#'.$addfileaction.'").prop("disabled", true);';

-			$out .= '    jQuery("#addedfile").on("change", function() {';

-			$out .= '        if (jQuery(this).val().length) {';

-			$out .= '            jQuery("#'.$addfileaction.'").prop("disabled", false);';

-			$out .= '        } else {';

-			$out .= '            jQuery("#'.$addfileaction.'").prop("disabled", true);';

-			$out .= '        }';

-			$out .= '    });';

@@ -1599 +1053,0 @@
-

@@ -1610 +1064 @@
-				//$out .= $langs->trans("NoAttachedFiles").'<br>';

+				$out .= $langs->trans("NoAttachedFiles").'<br>';

@@ -1615 +1069 @@
-				$out .= '<input type="submit" class="button smallpaddingimp reposition" id="'.$addfileaction.'" name="'.$addfileaction.'" value="'.$langs->trans("MailingAddFile").'" />';

+				$out .= '<input type="submit" class="button" id="'.$addfileaction.'" name="'.$addfileaction.'" value="'.$langs->trans("MailingAddFile").'" />';

@@ -1622,62 +1075,0 @@
-		// MESSAGE

-

-		$defaultmessage = "";

-		if (is_object($arraydefaultmessage) && $arraydefaultmessage->content) {

-			$defaultmessage = $arraydefaultmessage->content;

-		}

-		$defaultmessage = str_replace('\n', "\n", $defaultmessage);

-

-		// Deal with format differences between message and signature (text / HTML)

-		if (dol_textishtml($defaultmessage) && !dol_textishtml($this->substit['__USER_SIGNATURE__'])) {

-			$this->substit['__USER_SIGNATURE__'] = dol_nl2br($this->substit['__USER_SIGNATURE__']);

-		} elseif (!dol_textishtml($defaultmessage) && isset($this->substit['__USER_SIGNATURE__']) && dol_textishtml($this->substit['__USER_SIGNATURE__'])) {

-			$defaultmessage = dol_nl2br($defaultmessage);

-		}

-		if (GETPOSTISSET("message") && !GETPOST('modelselected')) {

-			$defaultmessage = GETPOST('message', 'restricthtml');

-		} else {

-			$defaultmessage = make_substitutions($defaultmessage, $this->substit);

-			// Clean first \n and br (to avoid empty line when CONTACTCIVNAME is empty)

-			$defaultmessage = preg_replace("/^(<br>)+/", "", $defaultmessage);

-			$defaultmessage = preg_replace("/^\n+/", "", $defaultmessage);

-		}

-

-		print '<tr><td colspan="2"><label for="message"><span class="fieldrequired">'.$langs->trans("Message").'</span>';

-		if ($user->hasRight("ticket", "write") && !$user->socid) {

-			$texttooltip = $langs->trans("TicketMessageHelp");

-			if (getDolGlobalString('TICKET_MESSAGE_MAIL_INTRO') || getDolGlobalString('TICKET_MESSAGE_MAIL_SIGNATURE')) {

-				$texttooltip .= '<br><br>'.$langs->trans("ForEmailMessageWillBeCompletedWith").'...';

-			}

-			if (getDolGlobalString('TICKET_MESSAGE_MAIL_INTRO')) {

-				$texttooltip .= '<br><u>'.$langs->trans("TicketMessageMailIntro").'</u><br>'.getDolGlobalString('TICKET_MESSAGE_MAIL_INTRO');

-			}

-			if (getDolGlobalString('TICKET_MESSAGE_MAIL_SIGNATURE')) {

-				$texttooltip .= '<br><br><u>'.$langs->trans("TicketMessageMailFooter").'</u><br>'.getDolGlobalString('TICKET_MESSAGE_MAIL_SIGNATURE');

-			}

-			print $form->textwithpicto('', $texttooltip, 1, 'help');

-		}

-		print '</label></td></tr>';

-

-

-		print '<tr><td colspan="2">';

-		//$toolbarname = 'dolibarr_details';

-		$toolbarname = 'dolibarr_notes';

-		include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';

-		$doleditor = new DolEditor('message', $defaultmessage, '100%', 200, $toolbarname, '', false, $uselocalbrowser, getDolGlobalInt('FCKEDITOR_ENABLE_TICKET'), ROWS_5, '90%');

-		$doleditor->Create();

-		print '</td></tr>';

-

-		// Footer

-		// External users can't send message email

-		/*if ($user->rights->ticket->write && !$user->socid && !empty($conf->global->TICKET_MESSAGE_MAIL_SIGNATURE)) {

-			$mail_signature = GETPOST('mail_signature') ? GETPOST('mail_signature') : $conf->global->TICKET_MESSAGE_MAIL_SIGNATURE;

-			print '<tr class="email_line"><td><label for="mail_intro">'.$langs->trans("TicketMessageMailFooter").'</label>';

-			print $form->textwithpicto('', $langs->trans("TicketMessageMailFooterHelp"), 1, 'help');

-			print '</td><td>';

-			include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';

-			$doleditor = new DolEditor('mail_signature', $mail_signature, '100%', 90, 'dolibarr_details', '', false, $uselocalbrowser, getDolGlobalInt('FCKEDITOR_ENABLE_SOCIETE'), ROWS_2, 70);

-			$doleditor->Create();

-			print '</td></tr>';

-		}

-		*/

-

@@ -1686,8 +1078,3 @@
-		print '<br><center>';

-		print '<input type="submit" class="button" name="btn_add_message" value="'.$langs->trans("Add").'"';

-		// Add a javascript test to avoid to forget to submit file before sending email

-		if ($this->withfile == 2 && !empty($conf->use_javascript_ajax)) {

-			print ' onClick="if (document.ticket.addedfile.value != \'\') { alert(\''.dol_escape_js($langs->trans("FileWasNotUploaded")).'\'); return false; } else { return true; }"';

-		}

-		print ' />';

-		if (!empty($this->withcancel)) {

+		print '<center><br>';

+		print '<input class="button" type="submit" name="btn_add_message" value="'.$langs->trans("AddMessage").'" />';

+		if ($this->withcancel) {

@@ -1695 +1082 @@
-			print '<input class="button button-cancel" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';

+			print "<input class=\"button\" type=\"submit\" name=\"cancel\" value=\"".$langs->trans("Cancel")."\">";

@@ -1699,20 +1086 @@
-		print '<input type="hidden" name="page_y">'."\n";

-

-		print "</form><br>\n";

-

-		// Disable enter key if option MAIN_MAILFORM_DISABLE_ENTERKEY is set

-		if (getDolGlobalString('MAIN_MAILFORM_DISABLE_ENTERKEY')) {

-			print '<script type="text/javascript">';

-			print 'jQuery(document).ready(function () {';

-			print '		$(document).on("keypress", \'#ticket\', function (e) {		/* Note this is called at every key pressed ! */

-	    					var code = e.keyCode || e.which;

-	    					if (code == 13) {

-								console.log("Enter was intercepted and blocked");

-	        					e.preventDefault();

-	        					return false;

-	    					}

-						});';

-			print '})';

-			print '</script>';

-		}

-

+		print "</form>\n";

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_html.formwebsite.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_html.formwebsite.class.php
@@ -30,3 +30,3 @@
-	private $db;

-

-	/**

+    private $db;

+

+    /**

@@ -37,272 +37,265 @@
-	/**

-	 * var int		A number of lines

-	 */

-	public $num;

-

-

-	/**

-	 *	Constructor

-	 *

-	 *	@param	DoliDB		$db      Database handler

-	 */

-	public function __construct($db)

-	{

-		$this->db = $db;

-	}

-

-

-	/**

-	 *    Return HTML select list of websites

-	 *

-	 *    @param    string	$selected          Id modele pre-selectionne

-	 *    @param    string	$htmlname          Name of HTML select

-	 *    @param    int		$useempty          Show empty value or not

-	 *    @return	string					   Html component

-	 */

-	public function selectWebsite($selected = '', $htmlname = 'exportmodelid', $useempty = 0)

-	{

-		$out = '';

-

-		$sql = "SELECT rowid, ref";

-		$sql .= " FROM ".$this->db->prefix()."website";

-		$sql .= " WHERE 1 = 1";

-		$sql .= " ORDER BY rowid";

-		$result = $this->db->query($sql);

-		if ($result) {

-			$out .= '<select class="flat minwidth100" name="'.$htmlname.'" id="'.$htmlname.'">';

-			if ($useempty) {

-				$out .= '<option value="-1">&nbsp;</option>';

-			}

-

-			$num = $this->db->num_rows($result);

-			$i = 0;

-			while ($i < $num) {

-				$obj = $this->db->fetch_object($result);

-				if ($selected == $obj->rowid) {

-					$out .= '<option value="'.$obj->rowid.'" selected>';

-				} else {

-					$out .= '<option value="'.$obj->rowid.'">';

-				}

-				$out .= $obj->ref;

-				$out .= '</option>';

-				$i++;

-			}

-			$out .= "</select>";

-		} else {

-			dol_print_error($this->db);

-		}

-

-		return $out;

-	}

-

-

-	/**

-	 *  Return a HTML select list of type of containers from the dictionary

-	 *

-	 *  @param  string	$htmlname          	Name of select zone

-	 *  @param	string	$selected			Selected value

-	 *  @param  int		$useempty          	1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.

-	 *  @param  string  $moreattrib         More attributes on HTML select tag

-	 *  @param	int		$addjscombo			Add js combo

-	 *  @param	string	$morecss			More CSS

-	 * 	@return	void

-	 */

-	public function selectTypeOfContainer($htmlname, $selected = '', $useempty = 0, $moreattrib = '', $addjscombo = 0, $morecss = 'minwidth200')

-	{

-		global $langs, $conf, $user;

-

-		$langs->load("admin");

-

-		$sql = "SELECT rowid, code, label, entity";

-		$sql .= " FROM ".$this->db->prefix().'c_type_container';

-		$sql .= " WHERE active = 1 AND entity IN (".getEntity('c_type_container').")";

-		$sql .= " ORDER BY label";

-

-		dol_syslog(get_class($this)."::selectTypeOfContainer", LOG_DEBUG);

-		$result = $this->db->query($sql);

-		if ($result) {

-			$num = $this->db->num_rows($result);

-			$i = 0;

-			if ($num) {

-				print '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';

-				if ($useempty == 1 || ($useempty == 2 && $num > 1)) {

-					print '<option value="-1">&nbsp;</option>';

-				}

-

-				while ($i < $num) {

-					$obj = $this->db->fetch_object($result);

-					if ($selected == $obj->rowid || $selected == $obj->code) {

-						print '<option value="'.$obj->code.'" selected>';

-					} else {

-						print '<option value="'.$obj->code.'">';

-					}

-					print $langs->trans($obj->label);

-					print '</option>';

-					$i++;

-				}

-				print "</select>";

-				if ($user->admin) {

-					print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

-				}

-

-				if ($addjscombo) {

-					print ajax_combobox('select'.$htmlname);

-				}

-			} else {

-				print $langs->trans("NoTypeOfPagePleaseEditDictionary");

-			}

-		} else {

-			dol_print_error($this->db);

-		}

-	}

-

-

-	/**

-	 *  Return a HTML select list of samples of containers content

-	 *

-	 *  @param  string	$htmlname          	Name of select zone

-	 *  @param	string	$selected			Selected value

-	 *  @param  int		$useempty          	1=Add an empty value in list

-	 *  @param  string  $moreattrib         More attributes on HTML select tag

-	 *  @param	int		$addjscombo			Add js combo

-	 *  @param	string	$morecss			More css

-	 * 	@return	string						HTML select component with list of type of containers

-	 */

-	public function selectSampleOfContainer($htmlname, $selected = '', $useempty = 0, $moreattrib = '', $addjscombo = 0, $morecss = 'minwidth200')

-	{

-		global $langs, $conf, $user;

-

-		$langs->load("admin");

-

-		$listofsamples = dol_dir_list(DOL_DOCUMENT_ROOT.'/website/samples', 'files', 0, '^page-sample-.*\.html$');

-

-		$arrayofsamples = array();

-		$arrayofsamples['empty'] = 'EmptyPage'; // Always this one first

-		foreach ($listofsamples as $sample) {

-			$reg = array();

-			if (preg_match('/^page-sample-(.*)\.html$/', $sample['name'], $reg)) {

-				$key = $reg[1];

-				$labelkey = ucfirst($key);

-				if ($key == 'empty') {

-					$labelkey = 'EmptyPage';

-				}

-				$arrayofsamples[$key] = $labelkey;

-			}

-		}

-

-		$out = '';

-		$out .= '<select id="select'.$htmlname.'" class="selectSampleOfContainer'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';

-

-		if ($useempty == 1 || $useempty == 2) {

-			$out .= '<option value="-1">&nbsp;</option>';

-		}

-

-		foreach ($arrayofsamples as $key => $val) {

-			if ($selected == $key) {

-				$out .= '<option value="'.$key.'" selected>';

-			} else {

-				$out .= '<option value="'.$key.'">';

-			}

-			$out .= $langs->trans($val);

-			$out .= '</option>';

-		}

-		$out .= "</select>";

-

-		if ($addjscombo) {

-			$out .= ajax_combobox('select'.$htmlname);

-		}

-

-		return $out;

-	}

-

-

-	/**

-	 *  Return a HTML select list of containers of a website.

-	 *  Note: $website->lines must have been loaded.

-	 *

-	 *  @param  Website		$website       	Object Website

-	 *  @param	string		$htmlname		Name of select zone

-	 *  @param	int			$pageid			Preselected container ID

-	 *  @param	int			$showempty		Show empty record

-	 *  @param	string		$action			Action on page that use this select list

-	 *  @param	string		$morecss		More CSS

-	 *  @param	array		$excludeids		Exclude some ID in list

-	 * 	@return	string						HTML select component with list of block containers

-	 */

-	public function selectContainer($website, $htmlname = 'pageid', $pageid = 0, $showempty = 0, $action = '', $morecss = 'minwidth200', $excludeids = null)

-	{

-		global $conf, $langs;

-

-		$this->num = 0;

-

-		$atleastonepage = (is_array($website->lines) && count($website->lines) > 0);

-

-		$out = '';

-		if ($atleastonepage && $action != 'editsource') {

-			$out .= '<select name="'.$htmlname.'" id="'.$htmlname.'" class="maxwidth300'.($morecss ? ' '.$morecss : '').'">';

-		} else {

-			$out .= '<select name="pageidbis" id="pageid" class="maxwidth300'.($morecss ? ' '.$morecss : '').'"'.($action == 'editsource' ? ' disabled="disabled"' : '').'>';

-		}

-

-		if ($showempty || !$atleastonepage) {

-			$out .= '<option class="optiongrey" value="-1">'.(is_numeric($showempty) ? '&nbsp;' : $showempty).'</option>';

-		}

-

-		/*if (!empty($conf->use_javascript_ajax)) {

-			$valueoption = '<span class="classlink">'.img_picto('', 'add', 'class="paddingrightonly"').$langs->trans("AddPage").'</span>';

-			$out .= '<option value="-2" data-html="'.dol_escape_htmltag($valueoption).'">'.$valueoption.'</option>';

-		}*/

-

-		if ($atleastonepage) {

-			if (empty($pageid) && $action != 'createcontainer') {      // Page id is not defined, we try to take one

-				$firstpageid = 0;

-				$homepageid = 0;

-				foreach ($website->lines as $key => $valpage) {

-					if (empty($firstpageid)) {

-						$firstpageid = $valpage->id;

-					}

-					if ($website->fk_default_home && $key == $website->fk_default_home) {

-						$homepageid = $valpage->id;

-					}

-				}

-				$pageid = $homepageid ? $homepageid : $firstpageid; // We choose home page and if not defined yet, we take first page

-			}

-

-			foreach ($website->lines as $key => $valpage) {

-				if (is_array($excludeids) && count($excludeids) && in_array($valpage->id, $excludeids)) {

-					continue;

-				}

-

-				$valueforoption = '<span class="opacitymedium">['.$valpage->type_container.' '.sprintf("%03d", $valpage->id).']</span> ';

-				$valueforoption .= $valpage->pageurl.' - '.$valpage->title;

-				if ($website->otherlang) {	// If there is alternative lang for this web site, we show the language code

-					if ($valpage->lang) {

-						$valueforoption .= ' <span class="opacitymedium">('.$valpage->lang.')</span>';

-					}

-				}

-				if ($website->fk_default_home && $key == $website->fk_default_home) {

-					//$valueforoption .= ' <span class="opacitymedium">('.$langs->trans("HomePage").')</span>';

-					$valueforoption .= ' <span class="opacitymedium fas fa-home"></span>';

-				}

-

-				$out .= '<option value="'.$key.'"';

-				if ($pageid > 0 && $pageid == $key) {

-					$out .= ' selected'; // To preselect a value

-				}

-				$out .= ' data-html="'.dol_escape_htmltag($valueforoption).'"';

-				$out .= '>';

-				$out .= $valueforoption;

-				$out .= '</option>';

-

-				++$this->num;

-			}

-		}

-		$out .= '</select>';

-

-		if ($atleastonepage && $action != 'editsource') {

-			$out .= ajax_combobox($htmlname);

-		} else {

-			$out .= '<input type="hidden" name="'.$htmlname.'" value="'.$pageid.'">';

-			$out .= ajax_combobox($htmlname);

-		}

-		return $out;

+

+    /**

+     *	Constructor

+     *

+     *	@param	DoliDB		$db      Database handler

+     */

+    public function __construct($db)

+    {

+        $this->db = $db;

+    }

+

+

+    /**

+     *    Return HTML select list of websites

+     *

+     *    @param    string	$selected          Id modele pre-selectionne

+     *    @param    string	$htmlname          Name of HTML select

+     *    @param    int		$useempty          Show empty value or not

+     *    @return	string					   Html component

+     */

+    public function selectWebsite($selected = '', $htmlname = 'exportmodelid', $useempty = 0)

+    {

+        $out = '';

+

+        $sql = "SELECT rowid, ref";

+        $sql .= " FROM ".MAIN_DB_PREFIX."website";

+        $sql .= " WHERE 1 = 1";

+        $sql .= " ORDER BY rowid";

+        $result = $this->db->query($sql);

+        if ($result)

+        {

+            $out .= '<select class="flat minwidth100" name="'.$htmlname.'" id="'.$htmlname.'">';

+            if ($useempty)

+            {

+                $out .= '<option value="-1">&nbsp;</option>';

+            }

+

+            $num = $this->db->num_rows($result);

+            $i = 0;

+            while ($i < $num)

+            {

+                $obj = $this->db->fetch_object($result);

+                if ($selected == $obj->rowid)

+                {

+                    $out .= '<option value="'.$obj->rowid.'" selected>';

+                }

+                else

+                {

+                    $out .= '<option value="'.$obj->rowid.'">';

+                }

+                $out .= $obj->ref;

+                $out .= '</option>';

+                $i++;

+            }

+            $out .= "</select>";

+        }

+        else {

+            dol_print_error($this->db);

+        }

+

+        return $out;

+    }

+

+

+    /**

+     *  Return a HTML select list of type of containers from the dictionary

+     *

+     *  @param  string	$htmlname          	Name of select zone

+     *  @param	string	$selected			Selected value

+     *  @param  int		$useempty          	1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.

+     *  @param  string  $moreattrib         More attributes on HTML select tag

+     * 	@return	void

+     */

+    public function selectTypeOfContainer($htmlname, $selected = '', $useempty = 0, $moreattrib = '')

+    {

+        global $langs, $conf, $user;

+

+        $langs->load("admin");

+

+        $sql = "SELECT rowid, code, label, entity";

+        $sql .= " FROM ".MAIN_DB_PREFIX.'c_type_container';

+        $sql .= " WHERE active = 1 AND entity IN (".getEntity('c_type_container').")";

+        $sql .= " ORDER BY label";

+

+    	dol_syslog(get_class($this)."::selectTypeOfContainer", LOG_DEBUG);

+    	$result = $this->db->query($sql);

+    	if ($result)

+    	{

+    		$num = $this->db->num_rows($result);

+    		$i = 0;

+    		if ($num)

+    		{

+    			print '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';

+    			if ($useempty == 1 || ($useempty == 2 && $num > 1))

+    			{

+    				print '<option value="-1">&nbsp;</option>';

+    			}

+

+    			while ($i < $num)

+    			{

+    				$obj = $this->db->fetch_object($result);

+    				if ($selected == $obj->rowid || $selected == $obj->code)

+    				{

+    					print '<option value="'.$obj->code.'" selected>';

+    				}

+    				else

+    				{

+    					print '<option value="'.$obj->code.'">';

+    				}

+    				print $obj->label;

+    				print '</option>';

+    				$i++;

+    			}

+    			print "</select>";

+    			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+    		}

+    		else

+    		{

+    			print $langs->trans("NoTypeOfPagePleaseEditDictionary");

+    		}

+    	}

+    	else {

+    		dol_print_error($this->db);

+    	}

+    }

+

+

+    /**

+     *  Return a HTML select list of samples of containers content

+     *

+     *  @param  string	$htmlname          	Name of select zone

+     *  @param	string	$selected			Selected value

+     *  @param  int		$useempty          	1=Add an empty value in list

+     *  @param  string  $moreattrib         More attributes on HTML select tag

+     * 	@return	string						HTML select component with list of type of containers

+     */

+    public function selectSampleOfContainer($htmlname, $selected = '', $useempty = 0, $moreattrib = '')

+    {

+    	global $langs, $conf, $user;

+

+    	$langs->load("admin");

+

+    	$listofsamples = dol_dir_list(DOL_DOCUMENT_ROOT.'/website/samples', 'files', 0, '^page-sample-.*\.html$');

+

+    	$arrayofsamples = array();

+    	$arrayofsamples['empty'] = 'EmptyPage'; // Always this one first

+    	foreach ($listofsamples as $sample)

+    	{

+    		$reg = array();

+    		if (preg_match('/^page-sample-(.*)\.html$/', $sample['name'], $reg))

+    		{

+    			$key = $reg[1];

+	    		$labelkey = ucfirst($key);

+    			if ($key == 'empty') $labelkey = 'EmptyPage';

+    			$arrayofsamples[$key] = $labelkey;

+    		}

+    	}

+

+    	$out = '';

+    	$out .= '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';

+

+    	if ($useempty == 1 || $useempty == 2)

+    	{

+    		$out .= '<option value="-1">&nbsp;</option>';

+    	}

+

+    	foreach ($arrayofsamples as $key => $val)

+    	{

+    		if ($selected == $key)

+    		{

+    			$out .= '<option value="'.$key.'" selected>';

+    		}

+    		else

+    		{

+    			$out .= '<option value="'.$key.'">';

+    		}

+    		$out .= $langs->trans($val);

+    		$out .= '</option>';

+    	}

+    	$out .= "</select>";

+

+    	return $out;

+    }

+

+

+    /**

+     *  Return a HTML select list of containers of a website.

+     *  Note: $website->lines must have been loaded.

+     *

+     *  @param  Website		$website       	Object Website

+     *  @param	string		$htmlname		Name of select zone

+     *  @param	int			$pageid			Preselected container ID

+     *  @param	int			$showempty		Show empty record

+     *  @param	string		$action			Action on page that use this select list

+     *  @param	string		$morecss		More CSS

+     *  @param	array		$excludeids		Exclude some ID in list

+     * 	@return	string						HTML select component with list of type of containers

+     */

+    public function selectContainer($website, $htmlname = 'pageid', $pageid = 0, $showempty = 0, $action = '', $morecss = 'minwidth200', $excludeids = null)

+    {

+    	global $langs;

+

+    	$atleastonepage = (is_array($website->lines) && count($website->lines) > 0);

+

+	    $out = '';

+	    if ($atleastonepage && $action != 'editsource')

+	    {

+	    	$out .= '<select name="'.$htmlname.'" id="'.$htmlname.'" class="maxwidth300'.($morecss ? ' '.$morecss : '').'">';

+	    }

+	    else

+	    {

+	    	$out .= '<select name="pageidbis" id="pageid" class="maxwidth300'.($morecss ? ' '.$morecss : '').'" disabled="disabled">';

+	    }

+

+	    if ($showempty || !$atleastonepage) $out .= '<option value="-1">&nbsp;</option>';

+

+	    if ($atleastonepage)

+	    {

+	    	if (empty($pageid) && $action != 'createcontainer')      // Page id is not defined, we try to take one

+	    	{

+	    		$firstpageid = 0; $homepageid = 0;

+	    		foreach ($website->lines as $key => $valpage)

+	    		{

+	    			if (empty($firstpageid)) $firstpageid = $valpage->id;

+	    			if ($website->fk_default_home && $key == $website->fk_default_home) $homepageid = $valpage->id;

+	    		}

+	    		$pageid = $homepageid ? $homepageid : $firstpageid; // We choose home page and if not defined yet, we take first page

+	    	}

+

+	    	foreach ($website->lines as $key => $valpage)

+	    	{

+	    		if (is_array($excludeids) && count($excludeids) && in_array($valpage->id, $excludeids)) continue;

+

+	    		$valueforoption = '<span class="opacitymedium">['.$valpage->type_container.' '.sprintf("%03d", $valpage->id).']</span> ';

+	    		$valueforoption .= $valpage->pageurl.' - '.$valpage->title;

+	    		if ($website->otherlang) {	// If there is alternative lang for this web site, we show the language code

+	    			if ($valpage->lang) {

+	    				$valueforoption .= ' <span class="opacitymedium">('.$valpage->lang.')</span>';

+	    			}

+	    		}

+	    		if ($website->fk_default_home && $key == $website->fk_default_home) {

+	    			//$valueforoption .= ' <span class="opacitymedium">('.$langs->trans("HomePage").')</span>';

+	    			$valueforoption .= ' <span class="opacitymedium fa fa-home"></span>';

+	    		}

+

+	    		$out .= '<option value="'.$key.'"';

+	    		if ($pageid > 0 && $pageid == $key) $out .= ' selected'; // To preselect a value

+	    		$out .= ' data-html="'.dol_escape_htmltag($valueforoption).'"';

+	    		$out .= '>';

+	    		$out .= $valueforoption;

+	    		$out .= '</option>';

+	    	}

+	    }

+	    $out .= '</select>';

+

+	    if ($atleastonepage && $action != 'editsource')

+	    {

+	    	$out .= ajax_combobox($htmlname);

+	    }

+	    else

+	    {

+	    	$out .= '<input type="hidden" name="'.$htmlname.'" value="'.$pageid.'">';

+	    	$out .= ajax_combobox($htmlname);

+	    }

+	    return $out;

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_infobox.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_infobox.class.php
@@ -31,7 +31,7 @@
-	/**

-	 * Name of positions (See below)

-	 *

-	 * @return	string[]		Array with list of zones

-	 */

-	public static function getListOfPagesForBoxes()

-	{

+    /**

+     * Name of positions (See below)

+     *

+     * @return	string[]		Array with list of zones

+     */

+    public static function getListOfPagesForBoxes()

+    {

@@ -40 +40,9 @@
-		if (getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {

+		if (empty($conf->global->MAIN_FEATURES_LEVEL) || $conf->global->MAIN_FEATURES_LEVEL < 2)

+		{

+        	return array(

+        		0 => 'Home',

+        		27 => 'Accountancy Home'

+        	);

+		}

+		else

+		{

@@ -43,12 +51,3 @@
-				1 => 'UsersHome',

-				2 => 'MembersHome',

-				3 => 'ThirdpartiesHome',

-				11 => 'TicketsHome',

-				27 => 'AccountancyHome'

-			);

-		} else {

-			return array(

-				0 => 'Home',

-				1 => 'UsersHome',

-				2 => 'MembersHome',

-				3 => 'ThirdpartiesHome',

+				1 => 'userhome',

+				2 => 'membersindex',

+				3 => 'thirdpartiesindex',

@@ -62 +61 @@
-				11 => 'TicketsHome',

+				11 => 'ticketsindex',

@@ -78 +77 @@
-				27 => 'AccountancyHome'

+				27 => 'Accountancy Home'

@@ -81,226 +80,245 @@
-	}

-

-	/**

-	 *  Return array of boxes qualified for area and user

-	 *

-	 *  @param	DoliDB		$dbs			Database handler

-	 *  @param	string		$mode			'available' or 'activated'

-	 *  @param	int			$zone			Name or area (-1 for all, 0 for Homepage, 1 for Accountancy, 2 for xxx, ...)

-	 *  @param  User|null   $user	  		Object user to filter

-	 *  @param	array		$excludelist	Array of box id (box.box_id = boxes_def.rowid) to exclude

-	 *  @param  int         $includehidden  Include also hidden boxes

-	 *  @return array       	        	Array of boxes

-	 */

-	public static function listBoxes($dbs, $mode, $zone, $user = null, $excludelist = array(), $includehidden = 1)

-	{

-		global $conf;

-

-		$boxes = array();

-

-		if ($mode == 'activated') {	// activated

-			$sql = "SELECT b.rowid, b.position, b.box_order, b.fk_user,";

-			$sql .= " d.rowid as box_id, d.file, d.note, d.tms";

-			$sql .= " FROM ".$dbs->prefix()."boxes as b, ".$dbs->prefix()."boxes_def as d";

-			$sql .= " WHERE b.box_id = d.rowid";

-			$sql .= " AND b.entity IN (0,".$conf->entity.")";

-			if ($zone >= 0) {

-				$sql .= " AND b.position = ".((int) $zone);

-			}

-			if (is_object($user)) {

-				$sql .= " AND b.fk_user IN (0,".$user->id.")";

-			} else {

-				$sql .= " AND b.fk_user = 0";

-			}

-			$sql .= " ORDER BY b.box_order";

-		} else { // available

-			$sql = "SELECT d.rowid as box_id, d.file, d.note, d.tms";

-			$sql .= " FROM ".$dbs->prefix()."boxes_def as d";

-			$sql .= " WHERE d.entity IN (0, ".$conf->entity.")";

-		}

-

-		dol_syslog(get_class()."::listBoxes get default box list for mode=".$mode." userid=".(is_object($user) ? $user->id : ''), LOG_DEBUG);

-		$resql = $dbs->query($sql);

-		if ($resql) {

-			$num = $dbs->num_rows($resql);

-			$j = 0;

-			while ($j < $num) {

-				$obj = $dbs->fetch_object($resql);

-

-				if (!in_array($obj->box_id, $excludelist)) {

-					$regs = array();

-					if (preg_match('/^([^@]+)@([^@]+)$/i', $obj->file, $regs)) {

-						$boxname = preg_replace('/\.php$/i', '', $regs[1]);

-						$module = $regs[2];

-						$relsourcefile = "/".$module."/core/boxes/".$boxname.".php";

-					} else {

-						$boxname = preg_replace('/\.php$/i', '', $obj->file);

-						$relsourcefile = "/core/boxes/".$boxname.".php";

-					}

-

-					//print $obj->box_id.'-'.$boxname.'-'.$relsourcefile.'<br>';

-

-					// TODO PERF Do not make "dol_include_once" here, nor "new" later. This means, we must store a 'depends' field to store modules list, then

-					// the "enabled" condition for modules forbidden for external users and the depends condition can be done.

-					// Goal is to avoid making a "new" done for each boxes returned by select.

-					dol_include_once($relsourcefile);

-					if (class_exists($boxname)) {

-						$box = new $boxname($dbs, $obj->note); // Constructor may set properties like box->enabled. obj->note is note into box def, not user params.

-						//$box=new stdClass();

-

-						// box properties

-						$box->rowid = (empty($obj->rowid) ? '' : $obj->rowid);

-						$box->id = (empty($obj->box_id) ? '' : $obj->box_id);

-						$box->position = ((isset($obj->position) && $obj->position == '') ? '' : (isset($obj->position) ? $obj->position : '')); // '0' must stay '0'

-						$box->box_order = (empty($obj->box_order) ? '' : $obj->box_order);

-						$box->fk_user = (empty($obj->fk_user) ? 0 : $obj->fk_user);

-						$box->sourcefile = $relsourcefile;

-						$box->class = $boxname;

-

-						if ($mode == 'activated' && !is_object($user)) {	// List of activated box was not yet personalized into database

-							if (is_numeric($box->box_order)) {

-								if ($box->box_order % 2 == 1) {

-									$box->box_order = 'A'.$box->box_order;

-								} elseif ($box->box_order % 2 == 0) {

-									$box->box_order = 'B'.$box->box_order;

-								}

-							}

-						}

-						// box_def properties

-						$box->box_id = (empty($obj->box_id) ? '' : $obj->box_id);

-						$box->note = (empty($obj->note) ? '' : $obj->note);

-

-						// Filter on box->enabled (used for example by box_comptes)

-						// Filter also on box->depends. Example: array("product|service") or array("contrat", "service")

-						$enabled = $box->enabled;

-						if (isset($box->depends) && count($box->depends) > 0) {

-							foreach ($box->depends as $moduleelem) {

-								$arrayelem = explode('|', $moduleelem);

-								$tmpenabled = 0; // $tmpenabled is used for the '|' test (OR)

-								foreach ($arrayelem as $module) {

-									$tmpmodule = preg_replace('/@[^@]+/', '', $module);

-									if (!empty($conf->$tmpmodule->enabled)) {

-										$tmpenabled = 1;

-									}

-									//print $boxname.'-'.$module.'-module enabled='.(empty($conf->$tmpmodule->enabled)?0:1).'<br>';

-								}

-								if (empty($tmpenabled)) {	// We found at least one module required that is disabled

-									$enabled = 0;

-									break;

-								}

-							}

-						}

-						//print '=>'.$boxname.'-enabled='.$enabled.'<br>';

-

-						//print 'xx module='.$module.' enabled='.$enabled;

-						if ($enabled && ($includehidden || empty($box->hidden))) {

-							$boxes[] = $box;

-						} else {

-							unset($box);

-						}

-					} else {

-						dol_syslog("Failed to load box '".$boxname."' into file '".$relsourcefile."'", LOG_WARNING);

-					}

-				}

-				$j++;

-			}

-		} else {

-			dol_syslog($dbs->lasterror(), LOG_ERR);

-			return array('error'=>$dbs->lasterror());

-		}

-

-		return $boxes;

-	}

-

-

-	/**

-	 *  Save order of boxes for area and user

-	 *

-	 *  @param	DoliDB	$dbs			Database handler

-	 *  @param	int		$zone       	Name of area (0 for Homepage, ...)

-	 *  @param  string  $boxorder   	List of boxes with correct order 'A:123,456,...-B:789,321...'

-	 *  @param  int     $userid     	Id of user

-	 *  @return int                   	Return integer <0 if KO, 0=Nothing done, > 0 if OK

-	 */

-	public static function saveboxorder($dbs, $zone, $boxorder, $userid = 0)

-	{

-		global $conf;

-

-		$error = 0;

-

-		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';

-

-		dol_syslog(get_class()."::saveboxorder zone=".$zone." userid=".$userid);

-

-		if (!$userid || $userid == 0) {

-			return 0;

-		}

-

-		$user = new User($dbs);

-		$user->id = $userid;

-

-		$dbs->begin();

-

-		// Save parameters to say user has a dedicated setup

-		$tab = array();

-		$confuserzone = 'MAIN_BOXES_'.$zone;

-		$tab[$confuserzone] = 1;

-		if (dol_set_user_param($dbs, $conf, $user, $tab) < 0) {

-			$error = $dbs->lasterror();

-			$dbs->rollback();

-			return -3;

-		}

-

-		// Delete all lines

-		$sql = "DELETE FROM ".$dbs->prefix()."boxes";

-		$sql .= " WHERE entity = ".$conf->entity;

-		$sql .= " AND fk_user = ".((int) $userid);

-		$sql .= " AND position = ".((int) $zone);

-

-		dol_syslog(get_class()."::saveboxorder", LOG_DEBUG);

-		$result = $dbs->query($sql);

-		if ($result) {

-			$colonnes = explode('-', $boxorder);

-			foreach ($colonnes as $collist) {

-				$part = explode(':', $collist);

-				$colonne = $part[0];

-				$list = $part[1];

-				dol_syslog(get_class()."::saveboxorder column=".$colonne.' list='.$list);

-

-				$i = 0;

-				$listarray = explode(',', $list);

-				foreach ($listarray as $id) {

-					if (is_numeric($id)) {

-						//dol_syslog("aaaaa".count($listarray));

-						$i++;

-						$ii = sprintf('%02d', $i);

-

-						$sql = "INSERT INTO ".$dbs->prefix()."boxes";

-						$sql .= "(box_id, position, box_order, fk_user, entity)";

-						$sql .= " values (";

-						$sql .= " ".((int) $id).",";

-						$sql .= " ".((int) $zone).",";

-						$sql .= " '".$dbs->escape($colonne.$ii)."',";

-						$sql .= " ".((int) $userid).",";

-						$sql .= " ".((int) $conf->entity);

-						$sql .= ")";

-

-						$result = $dbs->query($sql);

-						if ($result < 0) {

-							$error++;

-							break;

-						}

-					}

-				}

-			}

-		} else {

-			$error++;

-		}

-

-		if ($error) {

-			$dbs->rollback();

-			return -2;

-		} else {

-			$dbs->commit();

-			return 1;

-		}

-	}

+    }

+

+    /**

+     *  Return array of boxes qualified for area and user

+     *

+     *  @param	DoliDB		$db				Database handler

+     *  @param	string		$mode			'available' or 'activated'

+     *  @param	string		$zone			Name or area (-1 for all, 0 for Homepage, 1 for Accountancy, 2 for xxx, ...)

+     *  @param  User|null   $user	  		Object user to filter

+     *  @param	array		$excludelist	Array of box id (box.box_id = boxes_def.rowid) to exclude

+     *  @param  int         $includehidden  Include also hidden boxes

+     *  @return array       	        	Array of boxes

+     */

+    public static function listBoxes($db, $mode, $zone, $user = null, $excludelist = array(), $includehidden = 1)

+    {

+        global $conf;

+

+        $boxes = array();

+

+        $confuserzone = 'MAIN_BOXES_'.$zone;

+        if ($mode == 'activated')	// activated

+        {

+            $sql = "SELECT b.rowid, b.position, b.box_order, b.fk_user,";

+            $sql .= " d.rowid as box_id, d.file, d.note, d.tms";

+            $sql .= " FROM ".MAIN_DB_PREFIX."boxes as b, ".MAIN_DB_PREFIX."boxes_def as d";

+            $sql .= " WHERE b.box_id = d.rowid";

+            $sql .= " AND b.entity IN (0,".$conf->entity.")";

+            if ($zone >= 0) $sql .= " AND b.position = ".$zone;

+            if (is_object($user)) $sql .= " AND b.fk_user IN (0,".$user->id.")";

+            else $sql .= " AND b.fk_user = 0";

+            $sql .= " ORDER BY b.box_order";

+        }

+        else	// available

+        {

+            $sql = "SELECT d.rowid as box_id, d.file, d.note, d.tms";

+            $sql .= " FROM ".MAIN_DB_PREFIX."boxes_def as d";

+            $sql .= " WHERE d.entity IN (0,".$conf->entity.")";

+        }

+

+        dol_syslog(get_class()."::listBoxes get default box list for mode=".$mode." userid=".(is_object($user) ? $user->id : '')."", LOG_DEBUG);

+        $resql = $db->query($sql);

+        if ($resql)

+        {

+            $num = $db->num_rows($resql);

+            $j = 0;

+            while ($j < $num)

+            {

+                $obj = $db->fetch_object($resql);

+

+                if (!in_array($obj->box_id, $excludelist))

+                {

+                    if (preg_match('/^([^@]+)@([^@]+)$/i', $obj->file, $regs))

+                    {

+                        $boxname = preg_replace('/\.php$/i', '', $regs[1]);

+                        $module = $regs[2];

+                        $relsourcefile = "/".$module."/core/boxes/".$boxname.".php";

+                    }

+                    else

+                    {

+                        $boxname = preg_replace('/\.php$/i', '', $obj->file);

+                        $relsourcefile = "/core/boxes/".$boxname.".php";

+                    }

+

+                    //print $obj->box_id.'-'.$boxname.'-'.$relsourcefile.'<br>';

+

+                    // TODO PERF Do not make "dol_include_once" here, nor "new" later. This means, we must store a 'depends' field to store modules list, then

+                    // the "enabled" condition for modules forbidden for external users and the depends condition can be done.

+                    // Goal is to avoid making a "new" done for each boxes returned by select.

+                    dol_include_once($relsourcefile);

+                    if (class_exists($boxname))

+                    {

+                        $box = new $boxname($db, $obj->note); // Constructor may set properties like box->enabled. obj->note is note into box def, not user params.

+                        //$box=new stdClass();

+

+                        // box properties

+                        $box->rowid = (empty($obj->rowid) ? '' : $obj->rowid);

+                        $box->id = (empty($obj->box_id) ? '' : $obj->box_id);

+                        $box->position = ($obj->position == '' ? '' : $obj->position); // '0' must stay '0'

+                        $box->box_order	= (empty($obj->box_order) ? '' : $obj->box_order);

+                        $box->fk_user = (empty($obj->fk_user) ? 0 : $obj->fk_user);

+                        $box->sourcefile = $relsourcefile;

+                        $box->class     = $boxname;

+

+                        if ($mode == 'activated' && !is_object($user))	// List of activated box was not yet personalized into database

+                        {

+                            if (is_numeric($box->box_order))

+                            {

+                                if ($box->box_order % 2 == 1) $box->box_order = 'A'.$box->box_order;

+                                elseif ($box->box_order % 2 == 0) $box->box_order = 'B'.$box->box_order;

+                            }

+                        }

+                        // box_def properties

+                        $box->box_id = (empty($obj->box_id) ? '' : $obj->box_id);

+                        $box->note = (empty($obj->note) ? '' : $obj->note);

+

+                        // Filter on box->enabled (used for example by box_comptes)

+                        // Filter also on box->depends. Example: array("product|service") or array("contrat", "service")

+                        $enabled = $box->enabled;

+                        if (isset($box->depends) && count($box->depends) > 0)

+                        {

+                            foreach ($box->depends as $moduleelem)

+                            {

+                                $arrayelem = explode('|', $moduleelem);

+                                $tmpenabled = 0; // $tmpenabled is used for the '|' test (OR)

+                                foreach ($arrayelem as $module)

+                                {

+                                    $tmpmodule = preg_replace('/@[^@]+/', '', $module);

+                                    if (!empty($conf->$tmpmodule->enabled)) $tmpenabled = 1;

+                                    //print $boxname.'-'.$module.'-module enabled='.(empty($conf->$tmpmodule->enabled)?0:1).'<br>';

+                                }

+                                if (empty($tmpenabled))	// We found at least one module required that is disabled

+                                {

+                                    $enabled = 0;

+                                    break;

+                                }

+                            }

+                        }

+                        //print '=>'.$boxname.'-enabled='.$enabled.'<br>';

+

+                        //print 'xx module='.$module.' enabled='.$enabled;

+                        if ($enabled && ($includehidden || empty($box->hidden))) $boxes[] = $box;

+                        else unset($box);

+                    }

+                    else

+                    {

+                        dol_syslog("Failed to load box '".$boxname."' into file '".$relsourcefile."'", LOG_WARNING);

+                    }

+                }

+                $j++;

+            }

+        }

+        else

+        {

+            dol_syslog($db->lasterror(), LOG_ERR);

+            return array('error'=>$db->lasterror());

+        }

+

+        return $boxes;

+    }

+

+

+    /**

+     *  Save order of boxes for area and user

+     *

+     *  @param	DoliDB	$db				Database handler

+     *  @param	string	$zone       	Name of area (0 for Homepage, ...)

+     *  @param  string  $boxorder   	List of boxes with correct order 'A:123,456,...-B:789,321...'

+     *  @param  int     $userid     	Id of user

+     *  @return int                   	<0 if KO, 0=Nothing done, > 0 if OK

+     */

+    public static function saveboxorder($db, $zone, $boxorder, $userid = 0)

+    {

+        global $conf;

+

+        $error = 0;

+

+        require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';

+

+        dol_syslog(get_class()."::saveboxorder zone=".$zone." userid=".$userid);

+

+        if (!$userid || $userid == 0) return 0;

+

+        $user = new User($db);

+        $user->id = $userid;

+

+        $db->begin();

+

+        // Save parameters to say user has a dedicated setup

+        $tab = array();

+        $confuserzone = 'MAIN_BOXES_'.$zone;

+        $tab[$confuserzone] = 1;

+        if (dol_set_user_param($db, $conf, $user, $tab) < 0)

+        {

+            $error = $db->lasterror();

+            $db->rollback();

+            return -3;

+        }

+

+        // Delete all lines

+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes";

+        $sql .= " WHERE entity = ".$conf->entity;

+        $sql .= " AND fk_user = ".$userid;

+        $sql .= " AND position = ".$zone;

+

+        dol_syslog(get_class()."::saveboxorder", LOG_DEBUG);

+        $result = $db->query($sql);

+        if ($result)

+        {

+            $colonnes = explode('-', $boxorder);

+            foreach ($colonnes as $collist)

+            {

+                $part = explode(':', $collist);

+                $colonne = $part[0];

+                $list = $part[1];

+                dol_syslog(get_class()."::saveboxorder column=".$colonne.' list='.$list);

+

+                $i = 0;

+                $listarray = explode(',', $list);

+                foreach ($listarray as $id)

+                {

+                    if (is_numeric($id))

+                    {

+                        //dol_syslog("aaaaa".count($listarray));

+                        $i++;

+                        $ii = sprintf('%02d', $i);

+                        $sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes";

+                        $sql .= "(box_id, position, box_order, fk_user, entity)";

+                        $sql .= " values (";

+                        $sql .= " ".$id.",";

+                        $sql .= " ".$zone.",";

+                        $sql .= " '".$colonne.$ii."',";

+                        $sql .= " ".$userid.",";

+                        $sql .= " ".$conf->entity;

+                        $sql .= ")";

+

+                        dol_syslog(get_class()."::saveboxorder", LOG_DEBUG);

+                        $result = $db->query($sql);

+                        if ($result < 0)

+                        {

+                            $error++;

+                            break;

+                        }

+                    }

+                }

+            }

+            if ($error)

+            {

+                $error = $db->error();

+                $db->rollback();

+                return -2;

+            }

+            else

+            {

+                $db->commit();

+                return 1;

+            }

+        }

+        else

+        {

+            $error = $db->lasterror();

+            $db->rollback();

+            dol_syslog(get_class()."::saveboxorder ".$error);

+            return -1;

+        }

+    }

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_interfaces.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_interfaces.class.php
@@ -34,131 +34,134 @@
-	/**

-	 * @var DoliDB Database handler.

-	 */

-	public $db;

-

-	public $dir; // Directory with all core and external triggers files

-

-	/**

-	 * @var string[] Error codes (or messages)

-	 */

-	public $errors = array();

-

-	/**

-	 *	Constructor

-	 *

-	 *  @param		DoliDB		$db      Database handler

-	 */

-	public function __construct($db)

-	{

-		$this->db = $db;

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 *   Function called when a Dolibarr business event occurs

-	 *   This function call all qualified triggers.

-	 *

-	 *   @param		string		$action     Trigger event code

-	 *   @param     object		$object     Objet concerned. Some context information may also be provided into array property object->context.

-	 *   @param     User		$user       Objet user

-	 *   @param     Translate	$langs      Objet lang

-	 *   @param     Conf		$conf       Objet conf

-	 *   @return    int         			Nb of triggers ran if no error, -Nb of triggers with errors otherwise.

-	 */

-	public function run_triggers($action, $object, $user, $langs, $conf)

-	{

-		// phpcs:enable

-

-		if (getDolGlobalInt('MAIN_TRIGGER_DEBUG')) {

-			// This his too much verbose, enabled if const enabled only

-			dol_syslog(get_class($this)."::run_triggers action=".$action." Launch run_triggers", LOG_DEBUG);

-		}

-

-		// Check parameters

-		if (!is_object($object) || !is_object($conf)) {	// Error

-			$error = 'function run_triggers called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf);

-			dol_syslog(get_class($this).'::run_triggers '.$error, LOG_ERR);

-			$this->errors[] = $error;

-			return -1;

-		}

-		if (!is_object($langs)) {	// Warning

-			dol_syslog(get_class($this).'::run_triggers was called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf), LOG_WARNING);

-		}

-		if (!is_object($user)) {	    // Warning

-			dol_syslog(get_class($this).'::run_triggers was called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf), LOG_WARNING);

-			$user = new User($this->db);

-		}

-

-		$nbfile = $nbtotal = $nbok = $nbko = 0;

-

-		$files = array();

-		$modules = array();

-		$orders = array();

-		$i = 0;

-

-

-		$dirtriggers = array_merge(array('/core/triggers'), $conf->modules_parts['triggers']);

-		foreach ($dirtriggers as $reldir) {

-			$dir = dol_buildpath($reldir, 0);

-			$newdir = dol_osencode($dir);

-			//print "xx".$dir;exit;

-

-			// Check if directory exists (we do not use dol_is_dir to avoir loading files.lib.php at each call)

-			if (!is_dir($newdir)) {

-				continue;

-			}

-

-			$handle = opendir($newdir);

-			if (is_resource($handle)) {

-				$fullpathfiles = array();

-				while (($file = readdir($handle)) !== false) {

-					$reg = array();

-					if (is_readable($newdir."/".$file) && preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php$/i', $file, $reg)) {

-						$part1 = $reg[1];

-						$part2 = $reg[2];

-						$part3 = $reg[3];

-

-						$nbfile++;

-

-						// Check if trigger file is disabled by name

-						if (preg_match('/NORUN$/i', $file)) {

-							continue;

-						}

-						// Check if trigger file is for a particular module

-						$qualified = true;

-						if (strtolower($reg[2]) != 'all') {

-							$module = preg_replace('/^mod/i', '', $reg[2]);

-							if (!isModEnabled(strtolower($module))) {

-								$qualified = false;

-							}

-						}

-

-						if (!$qualified) {

-							//dol_syslog(get_class($this)."::run_triggers action=".$action." Triggers for file '".$file."' need module to be enabled", LOG_DEBUG);

-							continue;

-						}

-

-						$modName = "Interface".ucfirst($reg[3]);

-						//print "file=$file - modName=$modName\n";

-						if (in_array($modName, $modules)) {    // $modules = list of modName already loaded

-							$langs->load("errors");

-							dol_syslog(get_class($this)."::run_triggers action=".$action." ".$langs->trans("ErrorDuplicateTrigger", $newdir."/".$file, $fullpathfiles[$modName]), LOG_WARNING);

-							continue;

-						}

-

-						try {

-							//print 'Todo for '.$modName." : ".$newdir.'/'.$file."\n";

-							include_once $newdir.'/'.$file;

-							//print 'Done for '.$modName."\n";

-						} catch (Exception $e) {

-							dol_syslog('ko for '.$modName." ".$e->getMessage()."\n", LOG_ERR);

-						}

-

-						$modules[$i] = $modName;

-						$files[$i] = $file;

-						$fullpathfiles[$modName] = $newdir.'/'.$file;

-						$orders[$i] = $part1.'_'.$part2.'_'.$part3; // Set sort criteria value

-

-						$i++;

-					}

-				}

+    /**

+     * @var DoliDB Database handler.

+     */

+    public $db;

+

+    public $dir; // Directory with all core and external triggers files

+

+    /**

+     * @var string[] Error codes (or messages)

+     */

+    public $errors = array();

+

+    /**

+     *	Constructor

+     *

+     *  @param		DoliDB		$db      Database handler

+     */

+    public function __construct($db)

+    {

+        $this->db = $db;

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     *   Function called when a Dolibarr business event occurs

+     *   This function call all qualified triggers.

+     *

+     *   @param		string		$action     Trigger event code

+     *   @param     object		$object     Objet concerned. Some context information may also be provided into array property object->context.

+     *   @param     User		$user       Objet user

+     *   @param     Translate	$langs      Objet lang

+     *   @param     Conf		$conf       Objet conf

+     *   @return    int         			Nb of triggers ran if no error, -Nb of triggers with errors otherwise.

+     */

+    public function run_triggers($action, $object, $user, $langs, $conf)

+    {

+        // phpcs:enable

+        // Check parameters

+        if (!is_object($object) || !is_object($conf))	// Error

+        {

+            $this->error = 'function run_triggers called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf);

+            dol_syslog(get_class($this).'::run_triggers '.$this->error, LOG_ERR);

+            $this->errors[] = $this->error;

+            return -1;

+        }

+        if (!is_object($langs))	// Warning

+        {

+            dol_syslog(get_class($this).'::run_triggers was called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf), LOG_WARNING);

+        }

+        if (!is_object($user))	    // Warning

+        {

+            dol_syslog(get_class($this).'::run_triggers was called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf), LOG_WARNING);

+            global $db;

+            $user = new User($db);

+        }

+        //dol_syslog(get_class($this)."::run_triggers action=".$action." Launch run_triggers", LOG_DEBUG);

+

+        $nbfile = $nbtotal = $nbok = $nbko = 0;

+

+        $files = array();

+        $modules = array();

+        $orders = array();

+        $i = 0;

+

+

+        $dirtriggers = array_merge(array('/core/triggers'), $conf->modules_parts['triggers']);

+        foreach ($dirtriggers as $reldir)

+        {

+            $dir = dol_buildpath($reldir, 0);

+            $newdir = dol_osencode($dir);

+            //print "xx".$dir;exit;

+

+            // Check if directory exists (we do not use dol_is_dir to avoir loading files.lib.php at each call)

+            if (!is_dir($newdir)) continue;

+

+            $handle = opendir($newdir);

+            if (is_resource($handle))

+            {

+            	$fullpathfiles = array();

+                while (($file = readdir($handle)) !== false)

+                {

+                	$reg = array();

+                    if (is_readable($newdir."/".$file) && preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php$/i', $file, $reg))

+                    {

+                        $part1 = $reg[1];

+                        $part2 = $reg[2];

+                        $part3 = $reg[3];

+

+                        $nbfile++;

+

+                        // Check if trigger file is disabled by name

+                        if (preg_match('/NORUN$/i', $file)) continue;

+                        // Check if trigger file is for a particular module

+                        $qualified = true;

+                        if (strtolower($reg[2]) != 'all')

+                        {

+                            $module = preg_replace('/^mod/i', '', $reg[2]);

+                            $constparam = 'MAIN_MODULE_'.strtoupper($module);

+                            if (empty($conf->global->$constparam)) $qualified = false;

+                        }

+

+                        if (!$qualified)

+                        {

+                            //dol_syslog(get_class($this)."::run_triggers action=".$action." Triggers for file '".$file."' need module to be enabled", LOG_DEBUG);

+                            continue;

+                        }

+

+                        $modName = "Interface".ucfirst($reg[3]);

+                        //print "file=$file - modName=$modName\n";

+                        if (in_array($modName, $modules))    // $modules = list of modName already loaded

+                        {

+                            $langs->load("errors");

+                            dol_syslog(get_class($this)."::run_triggers action=".$action." ".$langs->trans("ErrorDuplicateTrigger", $newdir."/".$file, $fullpathfiles[$modName]), LOG_WARNING);

+                            continue;

+                        }

+

+                        try {

+                            //print 'Todo for '.$modName." : ".$newdir.'/'.$file."\n";

+                            include_once $newdir.'/'.$file;

+                            //print 'Done for '.$modName."\n";

+                        }

+                        catch (Exception $e)

+                        {

+                            dol_syslog('ko for '.$modName." ".$e->getMessage()."\n", LOG_ERR);

+                        }

+

+                        $modules[$i] = $modName;

+                        $files[$i] = $file;

+                        $fullpathfiles[$modName] = $newdir.'/'.$file;

+                        $orders[$i] = $part1.'_'.$part2.'_'.$part3; // Set sort criteria value

+

+                        $i++;

+                    }

+                }

@@ -167,234 +170,223 @@
-			}

-		}

-

-		asort($orders, SORT_NATURAL);

-

-		// Loop on each trigger

-		foreach ($orders as $key => $value) {

-			$modName = $modules[$key];

-			if (empty($modName)) {

-				continue;

-			}

-

-			$objMod = new $modName($this->db);

-			if ($objMod) {

-				$dblevelbefore = $this->db->transaction_opened;

-

-				$result = 0;

-

-				if (method_exists($objMod, 'runTrigger')) {	// New method to implement

-					//dol_syslog(get_class($this)."::run_triggers action=".$action." Launch runTrigger for file '".$files[$key]."'", LOG_DEBUG);

-					$result = $objMod->runTrigger($action, $object, $user, $langs, $conf);

-				} elseif (method_exists($objMod, 'run_trigger')) {	// Deprecated method

-					dol_syslog(get_class($this)."::run_triggers action=".$action." Launch old method run_trigger (rename your trigger into runTrigger) for file '".$files[$key]."'", LOG_WARNING);

-					$result = $objMod->run_trigger($action, $object, $user, $langs, $conf);

-				} else {

-					dol_syslog(get_class($this)."::run_triggers action=".$action." A trigger was declared for class ".get_class($objMod)." but method runTrigger was not found", LOG_ERR);

-				}

-

-				$dblevelafter = $this->db->transaction_opened;

-

-				if ($dblevelbefore != $dblevelafter) {

-					$errormessage = "Error, the balance begin/close of db transactions has been broken into trigger ".$modName." with action=".$action." before=".$dblevelbefore." after=".$dblevelafter;

-					$this->errors[] = $errormessage;

-					dol_syslog($errormessage, LOG_ERR);

-					$result = -1;

-				}

-

-				if ($result > 0) {

-					// Action OK

-					$nbtotal++;

-					$nbok++;

-				}

-				if ($result == 0) {

-					// Aucune action faite

-					$nbtotal++;

-				}

-				if ($result < 0) {

-					// Action KO

-					//dol_syslog("Error in trigger ".$action." - result = ".$result." - Nb of error string returned = ".count($objMod->errors), LOG_ERR);

-					$nbtotal++;

-					$nbko++;

-					if (!empty($objMod->errors)) {

-						$this->errors = array_merge($this->errors, $objMod->errors);

-					} elseif (!empty($objMod->error)) {

-						$this->errors[] = $objMod->error;

-					}

-					//dol_syslog("Error in trigger ".$action." - Nb of error string returned = ".count($this->errors), LOG_ERR);

-				}

-			} else {

-				dol_syslog(get_class($this)."::run_triggers action=".$action." Failed to instantiate trigger for file '".$files[$key]."'", LOG_ERR);

-			}

-		}

-

-		if ($nbko) {

-			dol_syslog(get_class($this)."::run_triggers action=".$action." Files found: ".$nbfile.", Files launched: ".$nbtotal.", Done: ".$nbok.", Failed: ".$nbko." - Nb of error string returned in this->errors = ".count($this->errors), LOG_ERR);

-			return -$nbko;

-		} else {

-			//dol_syslog(get_class($this)."::run_triggers Files found: ".$nbfile.", Files launched: ".$nbtotal.", Done: ".$nbok.", Failed: ".$nbko, LOG_DEBUG);

-			return $nbok;

-		}

-	}

-

-	/**

-	 *  Return list of triggers. Function used by admin page htdoc/admin/triggers.

-	 *  List is sorted by trigger filename so by priority to run.

-	 *

-	 *  @param	array		$forcedirtriggers		null=All default directories. This parameter is used by modulebuilder module only.

-	 * 	@return	array								Array list of triggers

-	 */

-	public function getTriggersList($forcedirtriggers = null)

-	{

-		global $conf, $langs, $db;

-

-		$files = array();

-		$fullpath = array();

-		$relpath = array();

-		$iscoreorexternal = array();

-		$modules = array();

-		$orders = array();

-		$i = 0;

-

-		$dirtriggers = array_merge(array('/core/triggers/'), $conf->modules_parts['triggers']);

-		if (is_array($forcedirtriggers)) {

-			$dirtriggers = $forcedirtriggers;

-		}

-

-		foreach ($dirtriggers as $reldir) {

-			$dir = dol_buildpath($reldir, 0);

-			$newdir = dol_osencode($dir);

-

-			// Check if directory exists (we do not use dol_is_dir to avoid loading files.lib.php at each call)

-			if (!is_dir($newdir)) {

-				continue;

-			}

-

-			$handle = opendir($newdir);

-			if (is_resource($handle)) {

-				while (($file = readdir($handle)) !== false) {

-					$reg = array();

-					if (is_readable($newdir.'/'.$file) && preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php/', $file, $reg)) {

-						if (preg_match('/\.back$/', $file)) {

-							continue;

-						}

-

-						$part1 = $reg[1];

-						$part2 = $reg[2];

-						$part3 = $reg[3];

-

-						$modName = 'Interface'.ucfirst($reg[3]);

-						//print "file=$file"; print "modName=$modName"; exit;

-						if (in_array($modName, $modules)) {

-							$langs->load("errors");

-							print '<div class="error">'.$langs->trans("Error").' : '.$langs->trans("ErrorDuplicateTrigger", $modName, "/htdocs/core/triggers/").'</div>';

-						} else {

-							include_once $newdir.'/'.$file;

-						}

-

-						$files[$i] = $file;

-						$fullpath[$i] = $dir.'/'.$file;

-						$relpath[$i] = preg_replace('/^\//', '', $reldir).'/'.$file;

-						$iscoreorexternal[$i] = ($reldir == '/core/triggers/' ? 'internal' : 'external');

-						$modules[$i] = $modName;

-						$orders[$i] = $part1.'_'.$part2.'_'.$part3; // Set sort criteria value

-

-						$i++;

-					}

-				}

-				closedir($handle);

-			}

-		}

-

-		asort($orders, SORT_NATURAL);

-

-		$triggers = array();

-		$j = 0;

-

-		// Loop on each trigger

-		foreach ($orders as $key => $value) {

-			$modName = $modules[$key];

-			if (empty($modName)) {

-				continue;

-			}

-

-			if (!class_exists($modName)) {

-				print 'Error: A trigger file was found but its class "'.$modName.'" was not found.'."<br>\n";

-				continue;

-			}

-

-			$text = '';

-

-			try {

-				$objMod = new $modName($db);

-

-				if (is_subclass_of($objMod, 'DolibarrTriggers')) {

-					// Define disabledbyname and disabledbymodule

-					$disabledbyname = 0;

-					$disabledbymodule = 1;

-					$module = '';

-

-					// Check if trigger file is disabled by name

-					if (preg_match('/NORUN$/i', $files[$key])) {

-						$disabledbyname = 1;

-					}

-					// Check if trigger file is for a particular module

-					if (preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php/i', $files[$key], $reg)) {

-						$module = preg_replace('/^mod/i', '', $reg[2]);

-						if (strtolower($module) == 'all') {

-							$disabledbymodule = 0;

-						} elseif (!isModEnabled(strtolower($module))) {

-							$disabledbymodule = 2;

-						}

-						$triggers[$j]['module'] = strtolower($module);

-					}

-

-					// We set info of modules

-					$triggers[$j]['picto'] = (!empty($objMod->picto)) ? img_object('', $objMod->picto, 'class="valignmiddle pictomodule "') : img_object('', 'generic', 'class="valignmiddle pictomodule "');

-					$triggers[$j]['file'] = $files[$key];

-					$triggers[$j]['fullpath'] = $fullpath[$key];

-					$triggers[$j]['relpath'] = $relpath[$key];

-					$triggers[$j]['iscoreorexternal'] = $iscoreorexternal[$key];

-					$triggers[$j]['version'] = $objMod->getVersion();

-					$triggers[$j]['status'] = img_picto($langs->trans("Active"), 'tick');

-					if ($disabledbyname > 0 || $disabledbymodule > 1) {

-						$triggers[$j]['status'] = '';

-					}

-

-					$text = '<b>'.$langs->trans("Description").':</b><br>';

-					$text .= $objMod->getDesc().'<br>';

-					$text .= '<br><b>'.$langs->trans("Status").':</b><br>';

-					if ($disabledbyname == 1) {

-						$text .= $langs->trans("TriggerDisabledByName").'<br>';

-						if ($disabledbymodule == 2) {

-							$text .= $langs->trans("TriggerDisabledAsModuleDisabled", $module).'<br>';

-						}

-					} else {

-						if ($disabledbymodule == 0) {

-							$text .= $langs->trans("TriggerAlwaysActive").'<br>';

-						}

-						if ($disabledbymodule == 1) {

-							$text .= $langs->trans("TriggerActiveAsModuleActive", $module).'<br>';

-						}

-						if ($disabledbymodule == 2) {

-							$text .= $langs->trans("TriggerDisabledAsModuleDisabled", $module).'<br>';

-						}

-					}

-				} else {

-					$triggers[$j]['picto'] = (!empty($objMod->picto)) ? img_object('', $objMod->picto, 'class="valignmiddle pictomodule "') : img_object('', 'generic', 'class="valignmiddle pictomodule "');

-					$triggers[$j]['file'] = $files[$key];

-					$triggers[$j]['fullpath'] = $fullpath[$key];

-					$triggers[$j]['relpath'] = $relpath[$key];

-					$triggers[$j]['status'] = img_picto('Error: Trigger '.$modName.' does not extends DolibarrTriggers', 'warning');

-

-					//print 'Error: Trigger '.$modName.' does not extends DolibarrTriggers<br>';

-					$text = 'Error: Trigger '.$modName.' does not extends DolibarrTriggers';

-				}

-			} catch (Exception $e) {

-				print $e->getMessage();

-			}

-

-			$triggers[$j]['info'] = $text;

-			$j++;

-		}

-		return $triggers;

-	}

+            }

+        }

+

+        asort($orders);

+

+        // Loop on each trigger

+        foreach ($orders as $key => $value)

+        {

+            $modName = $modules[$key];

+            if (empty($modName)) continue;

+

+            $objMod = new $modName($this->db);

+            if ($objMod)

+            {

+                $result = 0;

+

+                if (method_exists($objMod, 'runTrigger'))	// New method to implement

+                {

+                    //dol_syslog(get_class($this)."::run_triggers action=".$action." Launch runTrigger for file '".$files[$key]."'", LOG_DEBUG);

+                    $result = $objMod->runTrigger($action, $object, $user, $langs, $conf);

+                }

+                elseif (method_exists($objMod, 'run_trigger'))	// Deprecated method

+                {

+                    dol_syslog(get_class($this)."::run_triggers action=".$action." Launch old method run_trigger (rename your trigger into runTrigger) for file '".$files[$key]."'", LOG_WARNING);

+                    $result = $objMod->run_trigger($action, $object, $user, $langs, $conf);

+                }

+                else

+                {

+                    dol_syslog(get_class($this)."::run_triggers action=".$action." A trigger was declared for class ".get_class($objMod)." but method runTrigger was not found", LOG_ERR);

+                }

+

+                if ($result > 0)

+                {

+                    // Action OK

+                    $nbtotal++;

+                    $nbok++;

+                }

+                if ($result == 0)

+                {

+                    // Aucune action faite

+                    $nbtotal++;

+                }

+                if ($result < 0)

+                {

+                    // Action KO

+                    //dol_syslog("Error in trigger ".$action." - Nb of error string returned = ".count($objMod->errors), LOG_ERR);

+                    $nbtotal++;

+                    $nbko++;

+                    if (!empty($objMod->errors)) $this->errors = array_merge($this->errors, $objMod->errors);

+                    elseif (!empty($objMod->error))  $this->errors[] = $objMod->error;

+                    //dol_syslog("Error in trigger ".$action." - Nb of error string returned = ".count($this->errors), LOG_ERR);

+                }

+            }

+            else

+            {

+                dol_syslog(get_class($this)."::run_triggers action=".$action." Failed to instantiate trigger for file '".$files[$key]."'", LOG_ERR);

+            }

+        }

+

+        if ($nbko)

+        {

+            dol_syslog(get_class($this)."::run_triggers action=".$action." Files found: ".$nbfile.", Files launched: ".$nbtotal.", Done: ".$nbok.", Failed: ".$nbko." - Nb of error string returned in this->errors = ".count($this->errors), LOG_ERR);

+            return -$nbko;

+        }

+        else

+        {

+            //dol_syslog(get_class($this)."::run_triggers Files found: ".$nbfile.", Files launched: ".$nbtotal.", Done: ".$nbok.", Failed: ".$nbko, LOG_DEBUG);

+            return $nbok;

+        }

+    }

+

+    /**

+     *  Return list of triggers. Function used by admin page htdoc/admin/triggers.

+     *  List is sorted by trigger filename so by priority to run.

+     *

+     *  @param	array		$forcedirtriggers		null=All default directories. This parameter is used by modulebuilder module only.

+     * 	@return	array								Array list of triggers

+     */

+    public function getTriggersList($forcedirtriggers = null)

+    {

+        global $conf, $langs, $db;

+

+        $files = array();

+        $fullpath = array();

+        $relpath = array();

+        $iscoreorexternal = array();

+        $modules = array();

+        $orders = array();

+        $i = 0;

+

+        $dirtriggers = array_merge(array('/core/triggers/'), $conf->modules_parts['triggers']);

+        if (is_array($forcedirtriggers))

+        {

+            $dirtriggers = $forcedirtriggers;

+        }

+

+        foreach ($dirtriggers as $reldir)

+        {

+            $dir = dol_buildpath($reldir, 0);

+            $newdir = dol_osencode($dir);

+

+            // Check if directory exists (we do not use dol_is_dir to avoid loading files.lib.php at each call)

+            if (!is_dir($newdir)) continue;

+

+            $handle = opendir($newdir);

+            if (is_resource($handle))

+            {

+                while (($file = readdir($handle)) !== false)

+                {

+                	$reg = array();

+                    if (is_readable($newdir.'/'.$file) && preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php/', $file, $reg))

+                    {

+                        if (preg_match('/\.back$/', $file)) continue;

+

+                        $part1 = $reg[1];

+                        $part2 = $reg[2];

+                        $part3 = $reg[3];

+

+                        $modName = 'Interface'.ucfirst($reg[3]);

+                        //print "file=$file"; print "modName=$modName"; exit;

+                        if (in_array($modName, $modules))

+                        {

+                            $langs->load("errors");

+                            print '<div class="error">'.$langs->trans("Error").' : '.$langs->trans("ErrorDuplicateTrigger", $modName, "/htdocs/core/triggers/").'</div>';

+                        }

+                        else

+                        {

+                            include_once $newdir.'/'.$file;

+                        }

+

+                        $files[$i] = $file;

+                        $fullpath[$i] = $dir.'/'.$file;

+                        $relpath[$i] = preg_replace('/^\//', '', $reldir).'/'.$file;

+                        $iscoreorexternal[$i] = ($reldir == '/core/triggers/' ? 'internal' : 'external');

+                        $modules[$i] = $modName;

+                        $orders[$i] = $part1.'_'.$part2.'_'.$part3; // Set sort criteria value

+

+                        $i++;

+                    }

+                }

+                closedir($handle);

+            }

+        }

+

+        asort($orders);

+

+        $triggers = array();

+        $j = 0;

+

+        // Loop on each trigger

+        foreach ($orders as $key => $value)

+        {

+            $modName = $modules[$key];

+            if (empty($modName)) continue;

+

+            if (!class_exists($modName))

+            {

+                print 'Error: A trigger file was found but its class "'.$modName.'" was not found.'."<br>\n";

+                continue;

+            }

+

+            $text = '';

+

+            try {

+	            $objMod = new $modName($db);

+

+	            if (is_subclass_of($objMod, 'DolibarrTriggers'))

+	            {

+		            // Define disabledbyname and disabledbymodule

+		            $disabledbyname = 0;

+		            $disabledbymodule = 1;

+		            $module = '';

+

+		            // Check if trigger file is disabled by name

+		            if (preg_match('/NORUN$/i', $files[$key])) $disabledbyname = 1;

+		            // Check if trigger file is for a particular module

+		            if (preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php/i', $files[$key], $reg))

+		            {

+		                $module = preg_replace('/^mod/i', '', $reg[2]);

+		                $constparam = 'MAIN_MODULE_'.strtoupper($module);

+		                if (strtolower($module) == 'all') $disabledbymodule = 0;

+		                elseif (empty($conf->global->$constparam)) $disabledbymodule = 2;

+		                $triggers[$j]['module'] = strtolower($module);

+		            }

+

+		            // We set info of modules

+		            $triggers[$j]['picto'] = $objMod->picto ?img_object('', $objMod->picto, 'class="valignmiddle pictomodule "') : img_object('', 'generic', 'class="valignmiddle pictomodule "');

+		            $triggers[$j]['file'] = $files[$key];

+		            $triggers[$j]['fullpath'] = $fullpath[$key];

+		            $triggers[$j]['relpath'] = $relpath[$key];

+		            $triggers[$j]['iscoreorexternal'] = $iscoreorexternal[$key];

+		            $triggers[$j]['version'] = $objMod->getVersion();

+		            $triggers[$j]['status'] = img_picto($langs->trans("Active"), 'tick');

+		            if ($disabledbyname > 0 || $disabledbymodule > 1) $triggers[$j]['status'] = '';

+

+		            $text = '<b>'.$langs->trans("Description").':</b><br>';

+		            $text .= $objMod->getDesc().'<br>';

+		            $text .= '<br><b>'.$langs->trans("Status").':</b><br>';

+		            if ($disabledbyname == 1)

+		            {

+		                $text .= $langs->trans("TriggerDisabledByName").'<br>';

+		                if ($disabledbymodule == 2) $text .= $langs->trans("TriggerDisabledAsModuleDisabled", $module).'<br>';

+		            }

+		            else

+		            {

+		                if ($disabledbymodule == 0) $text .= $langs->trans("TriggerAlwaysActive").'<br>';

+		                if ($disabledbymodule == 1) $text .= $langs->trans("TriggerActiveAsModuleActive", $module).'<br>';

+		                if ($disabledbymodule == 2) $text .= $langs->trans("TriggerDisabledAsModuleDisabled", $module).'<br>';

+		            }

+	            }

+	            else {

+	            	print 'Error: Trigger '.$modName.' does not extends DolibarrTriggers<br>';

+	            }

+            }

+            catch(Exception $e) {

+            	print $e->getMessage();

+            }

+

+            $triggers[$j]['info'] = $text;

+            $j++;

+        }

+        return $triggers;

+    }

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_ldap.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_ldap.class.php
@@ -4,2 +4,2 @@
- * Copyright (C) 2005-2021	Regis Houssin        <regis.houssin@inodbox.com>

- * Copyright (C) 2006-2021	Laurent Destailleur  <eldy@users.sourceforge.net>

+ * Copyright (C) 2005-2017	Regis Houssin        <regis.houssin@inodbox.com>

+ * Copyright (C) 2006-2015	Laurent Destailleur  <eldy@users.sourceforge.net>

@@ -25,4 +24,0 @@
- *

- *  Note:

- *  LDAP_ESCAPE_FILTER is to escape char  array('\\', '*', '(', ')', "\x00")

- *  LDAP_ESCAPE_DN is to escape char  array('\\', ',', '=', '+', '<', '>', ';', '"', '#')

@@ -49,11 +45 @@
-	public $server = array();

-

-	/**

-	 * Current connected server

-	 */

-	public $connectedServer;

-

-	/**

-	 * @var int server port

-	 */

-	public $serverPort;

+    public $server = array();

@@ -64 +50 @@
-	public $dn;

+    public $dn;

@@ -68 +54 @@
-	public $serverType;

+    public $serverType;

@@ -72,13 +58 @@
-	public $ldapProtocolVersion;

-	/**

-	 * Server DN

-	 */

-	public $domain;

-

-	public $domainFQDN;

-

-	/**

-	 * @var int bind

-	 */

-	public $bind;

-

+    public $domain;

@@ -89 +63 @@
-	public $searchUser;

+    public $searchUser;

@@ -94 +68 @@
-	public $searchPassword;

+    public $searchPassword;

@@ -98 +72 @@
-	public $people;

+    public $people;

@@ -102 +76 @@
-	public $groups;

+    public $groups;

@@ -106 +80 @@
-	public $ldapErrorCode;

+    public $ldapErrorCode;

@@ -110,64 +84,2 @@
-	public $ldapErrorText;

-

-	/**

-	 * @var string

-	 */

-	public $filter;

-	/**

-	 * @var string

-	 */

-	public $filtergroup;

-	/**

-	 * @var string

-	 */

-	public $filtermember;

-

-	/**

-	 * @var string attr_login

-	 */

-	public $attr_login;

-

-	/**

-	 * @var string attr_sambalogin

-	 */

-	public $attr_sambalogin;

-

-	/**

-	 * @var string attr_name

-	 */

-	public $attr_name;

-

-	/**

-	 * @var string attr_firstname

-	 */

-	public $attr_firstname;

-

-	/**

-	 * @var string attr_mail

-	 */

-	public $attr_mail;

-

-	/**

-	 * @var string attr_phone

-	 */

-	public $attr_phone;

-

-	/**

-	 * @var string attr_fax

-	 */

-	public $attr_fax;

-

-	/**

-	 * @var string attr_mobile

-	 */

-	public $attr_mobile;

-

-	/**

-	 * @var int badpwdtime

-	 */

-	public $badpwdtime;

-

-	/**

-	 * @var string ladpUserDN

-	 */

-	public $ldapUserDN;

+    public $ldapErrorText;

+

@@ -176,12 +88,13 @@
-	public $name;

-	public $firstname;

-	public $login;

-	public $phone;

-	public $fax;

-	public $mail;

-	public $mobile;

-

-	public $uacf;

-	public $pwdlastset;

-

-	public $ldapcharset = 'UTF-8'; // LDAP should be UTF-8 encoded

+    public $name;

+    public $firstname;

+    public $login;

+    public $phone;

+    public $skype;

+    public $fax;

+    public $mail;

+    public $mobile;

+

+    public $uacf;

+    public $pwdlastset;

+

+    public $ldapcharset = 'UTF-8'; // LDAP should be UTF-8 encoded

@@ -193 +106 @@
-	public $connection;

+    public $connection;

@@ -197,16 +110 @@
-	public $result;

-

-	/**

-	 * No Ldap synchronization

-	 */

-	const SYNCHRO_NONE = 0;

-

-	/**

-	 * Dolibarr to Ldap synchronization

-	 */

-	const SYNCHRO_DOLIBARR_TO_LDAP = 1;

-

-	/**

-	 * Ldap to Dolibarr synchronization

-	 */

-	const SYNCHRO_LDAP_TO_DOLIBARR = 2;

+    public $result;

@@ -218 +116 @@
-	public function __construct()

+    public function __construct()

@@ -223,20 +121,14 @@
-		if (getDolGlobalString('LDAP_SERVER_HOST')) {

-			$this->server[] = $conf->global->LDAP_SERVER_HOST;

-		}

-		if (getDolGlobalString('LDAP_SERVER_HOST_SLAVE')) {

-			$this->server[] = $conf->global->LDAP_SERVER_HOST_SLAVE;

-		}

-		$this->serverPort          = getDolGlobalInt('LDAP_SERVER_PORT', 389);

-		$this->ldapProtocolVersion = getDolGlobalString('LDAP_SERVER_PROTOCOLVERSION');

-		$this->dn                  = getDolGlobalString('LDAP_SERVER_DN');

-		$this->serverType          = getDolGlobalString('LDAP_SERVER_TYPE');

-

-		$this->domain              = getDolGlobalString('LDAP_SERVER_DN');

-		$this->searchUser          = getDolGlobalString('LDAP_ADMIN_DN');

-		$this->searchPassword      = getDolGlobalString('LDAP_ADMIN_PASS');

-		$this->people              = getDolGlobalString('LDAP_USER_DN');

-		$this->groups              = getDolGlobalString('LDAP_GROUP_DN');

-

-		$this->filter              = getDolGlobalString('LDAP_FILTER_CONNECTION'); // Filter on user

-		$this->filtergroup         = getDolGlobalString('LDAP_GROUP_FILTER'); // Filter on groups

-		$this->filtermember        = getDolGlobalString('LDAP_MEMBER_FILTER'); // Filter on member

+		if (!empty($conf->global->LDAP_SERVER_HOST))       $this->server[] = $conf->global->LDAP_SERVER_HOST;

+		if (!empty($conf->global->LDAP_SERVER_HOST_SLAVE)) $this->server[] = $conf->global->LDAP_SERVER_HOST_SLAVE;

+		$this->serverPort          = $conf->global->LDAP_SERVER_PORT;

+		$this->ldapProtocolVersion = $conf->global->LDAP_SERVER_PROTOCOLVERSION;

+		$this->dn                  = $conf->global->LDAP_SERVER_DN;

+		$this->serverType          = $conf->global->LDAP_SERVER_TYPE;

+		$this->domain              = $conf->global->LDAP_SERVER_DN;

+		$this->searchUser          = $conf->global->LDAP_ADMIN_DN;

+		$this->searchPassword      = $conf->global->LDAP_ADMIN_PASS;

+		$this->people              = $conf->global->LDAP_USER_DN;

+		$this->groups              = $conf->global->LDAP_GROUP_DN;

+

+		$this->filter              = $conf->global->LDAP_FILTER_CONNECTION; // Filter on user

+		$this->filtermember        = $conf->global->LDAP_MEMBER_FILTER; // Filter on member

@@ -245,9 +137,12 @@
-		$this->attr_login      = getDolGlobalString('LDAP_FIELD_LOGIN'); //unix

-		$this->attr_sambalogin = getDolGlobalString('LDAP_FIELD_LOGIN_SAMBA'); //samba, activedirectory

-		$this->attr_name       = getDolGlobalString('LDAP_FIELD_NAME');

-		$this->attr_firstname  = getDolGlobalString('LDAP_FIELD_FIRSTNAME');

-		$this->attr_mail       = getDolGlobalString('LDAP_FIELD_MAIL');

-		$this->attr_phone      = getDolGlobalString('LDAP_FIELD_PHONE');

-		$this->attr_fax        = getDolGlobalString('LDAP_FIELD_FAX');

-		$this->attr_mobile     = getDolGlobalString('LDAP_FIELD_MOBILE');

-	}

+		$this->attr_login      = $conf->global->LDAP_FIELD_LOGIN; //unix

+		$this->attr_sambalogin = $conf->global->LDAP_FIELD_LOGIN_SAMBA; //samba, activedirectory

+		$this->attr_name       = $conf->global->LDAP_FIELD_NAME;

+		$this->attr_firstname  = $conf->global->LDAP_FIELD_FIRSTNAME;

+		$this->attr_mail       = $conf->global->LDAP_FIELD_MAIL;

+		$this->attr_phone      = $conf->global->LDAP_FIELD_PHONE;

+		$this->attr_skype      = $conf->global->LDAP_FIELD_SKYPE;

+		$this->attr_fax        = $conf->global->LDAP_FIELD_FAX;

+		$this->attr_mobile     = $conf->global->LDAP_FIELD_MOBILE;

+	}

+

+

@@ -257 +152 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -263,7 +158,6 @@
-	 *	@return		int		Return integer <0 if KO, 1 if bind anonymous, 2 if bind auth

-	 */

-	public function connect_bind()

-	{

-		// phpcs:enable

-		global $conf;

-		global $dolibarr_main_auth_ldap_debug;

+	 *	@return		int		<0 if KO, 1 if bind anonymous, 2 if bind auth

+	 */

+    public function connect_bind()

+	{

+        // phpcs:enable

+		global $langs, $conf;

@@ -273,9 +166,0 @@
-		$this->error = 0;

-		$this->connectedServer = '';

-

-		$ldapdebug = ((empty($dolibarr_main_auth_ldap_debug) || $dolibarr_main_auth_ldap_debug == "false") ? false : true);

-

-		if ($ldapdebug) {

-			dol_syslog(get_class($this)."::connect_bind");

-			print "DEBUG: connect_bind<br>\n";

-		}

@@ -284 +169,2 @@
-		if (count($this->server) == 0 || empty($this->server[0])) {

+		if (count($this->server) == 0 || empty($this->server[0]))

+		{

@@ -290 +176,2 @@
-		if (!function_exists("ldap_connect")) {

+		if (!function_exists("ldap_connect"))

+		{

@@ -296 +183,2 @@
-		if (empty($this->error)) {

+		if (empty($this->error))

+		{

@@ -298,3 +186,7 @@
-			foreach ($this->server as $host) {

-				if ($connected) {

-					break;

+			foreach ($this->server as $key => $host)

+			{

+				if ($connected) break;

+				if (empty($host)) continue;

+

+				if ($this->serverPing($host, $this->serverPort) === true) {

+					$this->connection = ldap_connect($host, $this->serverPort);

@@ -302,36 +194,9 @@
-				if (empty($host)) {

-					continue;

-				}

-

-				if ($this->serverPing($host, $this->serverPort) === true) {

-					if ($ldapdebug) {

-						dol_syslog(get_class($this)."::connect_bind serverPing true, we try ldap_connect to ".$host);

-					}

-					$this->connection = ldap_connect($host, $this->serverPort);

-				} else {

-					if (preg_match('/^ldaps/i', $host)) {

-						// With host = ldaps://server, the serverPing to ssl://server sometimes fails, even if the ldap_connect succeed, so

-						// we test this case and continue in such a case even if serverPing fails.

-						if ($ldapdebug) {

-							dol_syslog(get_class($this)."::connect_bind serverPing false, we try ldap_connect to ".$host);

-						}

-						$this->connection = ldap_connect($host, $this->serverPort);

-					} else {

-						continue;

-					}

-				}

-

-				if (is_resource($this->connection) || is_object($this->connection)) {

-					if ($ldapdebug) {

-						dol_syslog(get_class($this)."::connect_bind this->connection is ok", LOG_DEBUG);

-					}

-

-					// Upgrade connexion to TLS, if requested by the configuration

-					if (getDolGlobalString('LDAP_SERVER_USE_TLS')) {

-						// For test/debug

-						//ldap_set_option($this->connection, LDAP_OPT_DEBUG_LEVEL, 7);

-						//ldap_set_option($this->connection, LDAP_OPT_PROTOCOL_VERSION, 3);

-						//ldap_set_option($this->connection, LDAP_OPT_REFERRALS, 0);

-

-						$resulttls = ldap_start_tls($this->connection);

-						if (!$resulttls) {

+				else continue;

+

+				if (is_resource($this->connection))

+				{

+					// Begin TLS if requested by the configuration

+					if (!empty($conf->global->LDAP_SERVER_USE_TLS))

+					{

+						if (!ldap_start_tls($this->connection))

+						{

@@ -339 +203,0 @@
-							$this->error = 'ldap_start_tls Failed to start TLS '.ldap_errno($this->connection).' '.ldap_error($this->connection);

@@ -341 +205 @@
-							$this->unbind();

+							$this->close();

@@ -350 +214,2 @@
-					if ($this->serverType == "activedirectory") {

+					if ($this->serverType == "activedirectory")

+					{

@@ -354 +219,2 @@
-						if ($this->result) {

+						if ($this->result)

+						{

@@ -357 +222,0 @@
-							$this->connectedServer = $host;

@@ -359 +224,3 @@
-						} else {

+						}

+						else

+						{

@@ -362 +229,3 @@
-					} else {

+					}

+					else

+					{

@@ -364 +233,2 @@
-						if ($this->searchUser && $this->searchPassword) {

+						if ($this->searchUser && $this->searchPassword)

+						{

@@ -367 +237,2 @@
-							if ($this->result) {

+							if ($this->result)

+							{

@@ -370 +240,0 @@
-								$this->connectedServer = $host;

@@ -372 +242,3 @@
-							} else {

+							}

+							else

+							{

@@ -377,2 +249,3 @@
-						if (!$this->bind) {

-							dol_syslog(get_class($this)."::connect_bind try bind anonymously on ".$host, LOG_DEBUG);

+						if (!$this->bind)

+						{

+							dol_syslog(get_class($this)."::connect_bind try bind on ".$host, LOG_DEBUG);

@@ -380 +253,2 @@
-							if ($result) {

+							if ($result)

+							{

@@ -383 +256,0 @@
-								$this->connectedServer = $host;

@@ -385 +258,3 @@
-							} else {

+							}

+							else

+							{

@@ -392,7 +267,6 @@
-				if (!$connected) {

-					$this->unbind();

-				}

-			}	// End loop on each server

-		}

-

-		if ($connected) {

+				if (!$connected) $this->close();

+			}

+		}

+

+		if ($connected)

+		{

@@ -401 +275,3 @@
-		} else {

+		}

+		else

+		{

@@ -406 +281,0 @@
-

@@ -410,3 +285,5 @@
-	/**

-	 * Simply closes the connection set up earlier. Returns true if OK, false if there was an error.

-	 * This method seems a duplicate/alias of unbind().

+

+

+	/**

+	 * Simply closes the connection set up earlier.

+	 * Returns true if OK, false if there was an error.

@@ -415,6 +292,11 @@
-	 * @deprecated ldap_close is an alias of ldap_unbind, so use unbind() instead.

-	 * @see unbind()

-	 */

-	public function close()

-	{

-		return $this->unbind();

+	 */

+    public function close()

+	{

+		if ($this->connection && !@ldap_close($this->connection))

+		{

+			return false;

+		}

+		else

+		{

+			return true;

+		}

@@ -429,3 +311,4 @@
-	public function bind()

-	{

-		if (!$this->result = @ldap_bind($this->connection)) {

+    public function bind()

+	{

+		if (!$this->result = @ldap_bind($this->connection))

+		{

@@ -436 +319,3 @@
-		} else {

+		}

+		else

+		{

@@ -451,3 +336,4 @@
-	public function bindauth($bindDn, $pass)

-	{

-		if (!$this->result = @ldap_bind($this->connection, $bindDn, $pass)) {

+    public function bindauth($bindDn, $pass)

+	{

+		if (!$this->result = @ldap_bind($this->connection, $bindDn, $pass))

+		{

@@ -457,0 +344,17 @@
+		}

+		else

+		{

+			return true;

+		}

+	}

+

+	/**

+	 * Unbind du serveur ldap.

+	 *

+	 * @return	boolean					true or false

+	 */

+    public function unbind()

+	{

+		if (!$this->result = @ldap_unbind($this->connection))

+		{

+			return false;

@@ -463,19 +365,0 @@
-	/**

-	 * Unbind of LDAP server (close connection).

-	 *

-	 * @return	boolean					true or false

-	 * @see close()

-	 */

-	public function unbind()

-	{

-		$this->result = true;

-		if (is_resource($this->connection) || is_object($this->connection)) {

-			$this->result = @ldap_unbind($this->connection);

-		}

-		if ($this->result) {

-			return true;

-		} else {

-			return false;

-		}

-	}

-

@@ -488 +372 @@
-	public function getVersion()

+    public function getVersion()

@@ -500,2 +384,2 @@
-	public function setVersion()

-	{

+    public function setVersion()

+    {

@@ -512,2 +396,2 @@
-	public function setReferrals()

-	{

+    public function setReferrals()

+    {

@@ -527,5 +411,7 @@
-	 *	@return	int					Return integer <0 if KO, >0 if OK

-	 */

-	public function add($dn, $info, $user)

-	{

-		dol_syslog(get_class($this)."::add dn=".$dn." info=".print_r($info, true));

+	 *	@return	int					<0 if KO, >0 if OK

+	 */

+    public function add($dn, $info, $user)

+	{

+		global $conf;

+

+		dol_syslog(get_class($this)."::add dn=".$dn." info=".join(',', $info));

@@ -534 +420,2 @@
-		if (!$this->connection) {

+		if (!$this->connection)

+		{

@@ -538 +425,2 @@
-		if (!$this->bind) {

+		if (!$this->bind)

+		{

@@ -545,4 +433,3 @@
-		foreach ($info as $key => $val) {

-			if (!is_array($val)) {

-				$info[$key] = $this->convFromOutputCharset($val, $this->ldapcharset);

-			}

+		foreach ($info as $key => $val)

+		{

+			if (!is_array($val)) $info[$key] = $this->convFromOutputCharset($val, $this->ldapcharset);

@@ -556 +443,2 @@
-		if ($result) {

+		if ($result)

+		{

@@ -559 +447,3 @@
-		} else {

+		}

+		else

+		{

@@ -574,6 +464,8 @@
-	 *	@param	User		$user		Objet user that modify

-	 *	@return	int						Return integer <0 if KO, >0 if OK

-	 */

-	public function modify($dn, $info, $user)

-	{

-		dol_syslog(get_class($this)."::modify dn=".$dn." info=".print_r($info, true));

+	 *	@param	User			$user		Objet user that modify

+	 *	@return	int						<0 if KO, >0 if OK

+	 */

+    public function modify($dn, $info, $user)

+	{

+		global $conf;

+

+		dol_syslog(get_class($this)."::modify dn=".$dn." info=".join(',', $info));

@@ -582 +474,2 @@
-		if (!$this->connection) {

+		if (!$this->connection)

+		{

@@ -586 +479,2 @@
-		if (!$this->bind) {

+		if (!$this->bind)

+		{

@@ -593,4 +487,3 @@
-		foreach ($info as $key => $val) {

-			if (!is_array($val)) {

-				$info[$key] = $this->convFromOutputCharset($val, $this->ldapcharset);

-			}

+		foreach ($info as $key => $val)

+		{

+			if (!is_array($val)) $info[$key] = $this->convFromOutputCharset($val, $this->ldapcharset);

@@ -602,10 +494,0 @@
-

-		// For better compatibility with Samba4 AD

-		if ($this->serverType == "activedirectory") {

-			unset($info['cn']); // To avoid error : Operation not allowed on RDN (Code 67)

-

-			// To avoid error : LDAP Error: 53 (Unwilling to perform)

-			if (isset($info['unicodePwd'])) {

-				$info['unicodePwd'] = mb_convert_encoding("\"".$info['unicodePwd']."\"", "UTF-16LE", "UTF-8");

-			}

-		}

@@ -614 +497,2 @@
-		if ($result) {

+		if ($result)

+		{

@@ -617 +501,3 @@
-		} else {

+		}

+		else

+		{

@@ -633,4 +519,6 @@
-	 *	@return	int							Return integer <0 if KO, >0 if OK

-	 */

-	public function rename($dn, $newrdn, $newparent, $user, $deleteoldrdn = true)

-	{

+	 *	@return	int							<0 if KO, >0 if OK

+	 */

+    public function rename($dn, $newrdn, $newparent, $user, $deleteoldrdn = true)

+	{

+		global $conf;

+

@@ -640 +528,2 @@
-		if (!$this->connection) {

+		if (!$this->connection)

+		{

@@ -644 +533,2 @@
-		if (!$this->bind) {

+		if (!$this->bind)

+		{

@@ -657 +547,2 @@
-		if ($result) {

+		if ($result)

+		{

@@ -660 +551,3 @@
-		} else {

+		}

+		else

+		{

@@ -677,4 +570,6 @@
-	 *	@return	int					Return integer <0 if KO, >0 if OK

-	 */

-	public function update($dn, $info, $user, $olddn, $newrdn = false, $newparent = false)

-	{

+	 *	@return	int					<0 if KO, >0 if OK

+	 */

+    public function update($dn, $info, $user, $olddn, $newrdn = false, $newparent = false)

+	{

+		global $conf;

+

@@ -684 +579,2 @@
-		if (!$this->connection) {

+		if (!$this->connection)

+		{

@@ -688 +584,2 @@
-		if (!$this->bind) {

+		if (!$this->bind)

+		{

@@ -693,2 +590,4 @@
-		if (!$olddn || $olddn != $dn) {

-			if (!empty($olddn) && !empty($newrdn) && !empty($newparent) && $this->ldapProtocolVersion === '3') {

+		if (!$olddn || $olddn != $dn)

+		{

+			if (!empty($olddn) && !empty($newrdn) && !empty($newparent) && $conf->global->LDAP_SERVER_PROTOCOLVERSION === '3')

+			{

@@ -697,2 +596,3 @@
-				$result = $this->modify($dn, $info, $user); // We force "modify" for avoid some fields not modify

-			} else {

+			}

+			else

+			{

@@ -701,5 +601,5 @@
-				if ($result > 0 && $olddn && $olddn != $dn) {

-					$result = $this->delete($olddn); // If add fails, we do not try to delete old one

-				}

-			}

-		} else {

+				if ($result > 0 && $olddn && $olddn != $dn) $result = $this->delete($olddn); // If add fails, we do not try to delete old one

+			}

+		}

+		else

+		{

@@ -710 +610,2 @@
-		if ($result <= 0) {

+		if ($result <= 0)

+		{

@@ -715 +616,3 @@
-		} else {

+		}

+		else

+		{

@@ -727,4 +630,6 @@
-	 *	@return	int					Return integer <0 if KO, >0 if OK

-	 */

-	public function delete($dn)

-	{

+	 *	@return	int					<0 if KO, >0 if OK

+	 */

+    public function delete($dn)

+	{

+		global $conf;

+

@@ -734 +639,2 @@
-		if (!$this->connection) {

+		if (!$this->connection)

+		{

@@ -738 +644,2 @@
-		if (!$this->bind) {

+		if (!$this->bind)

+		{

@@ -748,3 +655 @@
-		if ($result) {

-			return 1;

-		}

+		if ($result) return 1;

@@ -754 +659 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -762,3 +667,3 @@
-	public function dump_content($dn, $info)

-	{

-		// phpcs:enable

+    public function dump_content($dn, $info)

+	{

+        // phpcs:enable

@@ -768 +673,2 @@
-		if (preg_match('/^ldap/', $this->server[0])) {

+		if (preg_match('/^ldap/', $this->server[0]))

+		{

@@ -770 +676,3 @@
-		} else {

+		}

+		else

+		{

@@ -776,3 +684 @@
-		if (in_array('localhost', $this->server)) {

-			$content .= "# If commands fails to connect, try without -h and -p\n";

-		}

+		if (in_array('localhost', $this->server)) $content .= "# If commands fails to connect, try without -h and -p\n";

@@ -780,2 +686,4 @@
-		foreach ($info as $key => $value) {

-			if (!is_array($value)) {

+		foreach ($info as $key => $value)

+		{

+			if (!is_array($value))

+			{

@@ -783,2 +691,5 @@
-			} else {

-				foreach ($value as $valuevalue) {

+			}

+			else

+			{

+				foreach ($value as $valuekey => $valuevalue)

+				{

@@ -797,3 +708,3 @@
-	 *	@return	int						Return integer <0 if KO, >0 if OK

-	 */

-	public function dump($dn, $info)

+	 *	@return	int						<0 if KO, >0 if OK

+	 */

+    public function dump($dn, $info)

@@ -811 +722,2 @@
-		if ($fp) {

+		if ($fp)

+		{

@@ -814 +726,2 @@
-			dolChmod($outputfile);

+			if (!empty($conf->global->MAIN_UMASK))

+			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));

@@ -816 +729,3 @@
-		} else {

+		}

+		else

+		{

@@ -824 +739 @@
-	 * @param string	$host		Server host or address

+	 * @param string		$host		Server host or address

@@ -826 +741 @@
-	 * @param int		$timeout	Timeout in second (default 1s)

+	 * @param int		$timeout		Timeout in second (default 1s)

@@ -829,3 +744,3 @@
-	public function serverPing($host, $port = 389, $timeout = 1)

-	{

-		$regs = array();

+    public function serverPing($host, $port = 389, $timeout = 1)

+	{

+		// Replace ldaps:// by ssl://

@@ -833 +747,0 @@
-			// Replace ldaps:// by ssl://

@@ -835,2 +749,3 @@
-		} elseif (preg_match('/^ldap:\/\/([^\/]+)\/?$/', $host, $regs)) {

-			// Remove ldap://

+		}

+		// Remove ldap://

+		if (preg_match('/^ldap:\/\/([^\/]+)\/?$/', $host, $regs)) {

@@ -839,14 +753,0 @@
-

-		//var_dump($newhostforstream); var_dump($host); var_dump($port);

-		//$host = 'ssl://ldap.test.local:636';

-		//$port = 636;

-

-		$errno = $errstr = 0;

-		/*

-		if ($methodtochecktcpconnect == 'socket') {

-			Try to use socket_create() method.

-			Method that use stream_context_create() works only on registered listed in stream stream_get_wrappers(): http, https, ftp, ...

-		}

-		*/

-

-		// Use the method fsockopen to test tcp connect. No way to ignore ssl certificate errors with this method !

@@ -854,5 +755,2 @@
-

-		//var_dump($op);

-		if (!$op) {

-			return false; //DC is N/A

-		} else {

+		if (!$op) return false; //DC is N/A

+		else {

@@ -874,4 +772,6 @@
-	 *	@return	int						Return integer <0 if KO, >0 if OK

-	 */

-	public function addAttribute($dn, $info, $user)

-	{

+	 *	@return	int						<0 if KO, >0 if OK

+	 */

+    public function addAttribute($dn, $info, $user)

+	{

+		global $conf;

+

@@ -881 +781,2 @@
-		if (!$this->connection) {

+		if (!$this->connection)

+		{

@@ -885 +786,2 @@
-		if (!$this->bind) {

+		if (!$this->bind)

+		{

@@ -892,4 +794,3 @@
-		foreach ($info as $key => $val) {

-			if (!is_array($val)) {

-				$info[$key] = $this->convFromOutputCharset($val, $this->ldapcharset);

-			}

+		foreach ($info as $key => $val)

+		{

+			if (!is_array($val)) $info[$key] = $this->convFromOutputCharset($val, $this->ldapcharset);

@@ -903 +804,2 @@
-		if ($result) {

+		if ($result)

+		{

@@ -906 +808,3 @@
-		} else {

+		}

+		else

+		{

@@ -920,4 +824,6 @@
-	 *	@return	int						Return integer <0 if KO, >0 if OK

-	 */

-	public function updateAttribute($dn, $info, $user)

-	{

+	 *	@return	int						<0 if KO, >0 if OK

+	 */

+    public function updateAttribute($dn, $info, $user)

+	{

+		global $conf;

+

@@ -927 +833,2 @@
-		if (!$this->connection) {

+		if (!$this->connection)

+		{

@@ -931 +838,2 @@
-		if (!$this->bind) {

+		if (!$this->bind)

+		{

@@ -938,4 +846,3 @@
-		foreach ($info as $key => $val) {

-			if (!is_array($val)) {

-				$info[$key] = $this->convFromOutputCharset($val, $this->ldapcharset);

-			}

+		foreach ($info as $key => $val)

+		{

+			if (!is_array($val)) $info[$key] = $this->convFromOutputCharset($val, $this->ldapcharset);

@@ -949 +856,2 @@
-		if ($result) {

+		if ($result)

+		{

@@ -952 +860,3 @@
-		} else {

+		}

+		else

+		{

@@ -966,4 +876,6 @@
-	 *	@return	int						Return integer <0 if KO, >0 if OK

-	 */

-	public function deleteAttribute($dn, $info, $user)

-	{

+	 *	@return	int						<0 if KO, >0 if OK

+	 */

+    public function deleteAttribute($dn, $info, $user)

+	{

+		global $conf;

+

@@ -973 +885,2 @@
-		if (!$this->connection) {

+		if (!$this->connection)

+		{

@@ -977 +890,2 @@
-		if (!$this->bind) {

+		if (!$this->bind)

+		{

@@ -984,4 +898,3 @@
-		foreach ($info as $key => $val) {

-			if (!is_array($val)) {

-				$info[$key] = $this->convFromOutputCharset($val, $this->ldapcharset);

-			}

+		foreach ($info as $key => $val)

+		{

+			if (!is_array($val)) $info[$key] = $this->convFromOutputCharset($val, $this->ldapcharset);

@@ -995 +908,2 @@
-		if ($result) {

+		if ($result)

+		{

@@ -998 +912,3 @@
-		} else {

+		}

+		else

+		{

@@ -1010,3 +926,3 @@
-	 *	@return	int|array			Return integer <0 or false if KO, array if OK

-	 */

-	public function getAttribute($dn, $filter)

+	 *	@return	int|array			<0 or false if KO, array if OK

+	 */

+    public function getAttribute($dn, $filter)

@@ -1015 +931,2 @@
-		if (!$this->connection) {

+		if (!$this->connection)

+		{

@@ -1019 +936,2 @@
-		if (!$this->bind) {

+		if (!$this->bind)

+		{

@@ -1024 +942 @@
-		$search = @ldap_search($this->connection, $dn, $filter);

+		$search = ldap_search($this->connection, $dn, $filter);

@@ -1027,3 +945,4 @@
-		$entry = @ldap_first_entry($this->connection, $search);

-

-		if (!$entry) {

+		$entry = ldap_first_entry($this->connection, $search);

+

+		if (!$entry)

+		{

@@ -1036 +955,2 @@
-		if (!($values = ldap_get_attributes($this->connection, $entry))) {

+		if (!($values = ldap_get_attributes($this->connection, $entry)))

+		{

@@ -1051,3 +971,3 @@
-	 * 	@return array|boolean

-	 */

-	public function getAttributeValues($filterrecord, $attribute)

+	 * 	@return void

+	 */

+    public function getAttributeValues($filterrecord, $attribute)

@@ -1067 +987,2 @@
-		if (!$entry) {

+		if (!$entry)

+		{

@@ -1074 +995,2 @@
-		if (!$values = @ldap_get_values($this->connection, $entry, $attribute)) {

+		if (!$values = @ldap_get_values($this->connection, $entry, $attribute))

+		{

@@ -1085 +1007 @@
-	 * 	Returns an array containing a details or list of LDAP record(s).

+	 * 	Returns an array containing a details or list of LDAP record(s)

@@ -1088 +1010 @@
-	 *	@param	string	$search			 	Value of field to search, '*' for all. Not used if $activefilter is set.

+	 *	@param	string	$search			 	Value of fiel to search, '*' for all. Not used if $activefilter is set.

@@ -1090 +1012 @@
-	 *	@param	string	$useridentifier 	Name of key field (Ex: uid).

+	 *	@param	string	$useridentifier 	Name of key field (Ex: uid)

@@ -1092 +1014 @@
-	 *	@param	int		$activefilter		'1' or 'user'=use field this->filter as filter instead of parameter $search, 'group'=use field this->filtergroup as filter, 'member'=use field this->filtermember as filter

+	 *	@param	int		$activefilter		'1' or 'user'=use field this->filter as filter instead of parameter $search, 'member'=use field this->filtermember as filter

@@ -1094,3 +1016,3 @@
-	 *	@return	array|int					Array of [id_record][ldap_field]=value

-	 */

-	public function getRecords($search, $userDn, $useridentifier, $attributeArray, $activefilter = 0, $attributeAsArray = array())

+	 *	@return	array						Array of [id_record][ldap_field]=value

+	 */

+    public function getRecords($search, $userDn, $useridentifier, $attributeArray, $activefilter = 0, $attributeAsArray = array())

@@ -1103 +1025,2 @@
-		if ($this->serverType == "activedirectory") {

+		if ($this->serverType == "activedirectory")

+		{

@@ -1109,2 +1032,4 @@
-		if (!empty($activefilter)) {	// Use a predefined trusted filter (defined into setup by admin).

-			if (((string) $activefilter == '1' || (string) $activefilter == 'user') && $this->filter) {

+		if (!empty($activefilter))

+		{

+			if (((string) $activefilter == '1' || (string) $activefilter == 'user') && $this->filter)

+			{

@@ -1112,3 +1037,3 @@
-			} elseif (((string) $activefilter == 'group') && $this->filtergroup) {

-				$filter = '('.$this->filtergroup.')';

-			} elseif (((string) $activefilter == 'member') && $this->filter) {

+			}

+			elseif (((string) $activefilter == 'member') && $this->filter)

+			{

@@ -1116,9 +1041,13 @@
-			} else {

-				// If this->filter/this->filtergroup is empty, make fiter on * (all)

-				$filter = '('.ldap_escape($useridentifier, '', LDAP_ESCAPE_FILTER).'=*)';

-			}

-		} else {						// Use a filter forged using the $search value

-			$filter = '('.ldap_escape($useridentifier, '', LDAP_ESCAPE_FILTER).'='.ldap_escape($search, '', LDAP_ESCAPE_FILTER).')';

-		}

-

-		if (is_array($attributeArray)) {

+			}

+			else	// If this->filter is empty, make fiter on * (all)

+			{

+				$filter = '('.$useridentifier.'=*)';

+			}

+		}

+		else

+		{

+			$filter = '('.$useridentifier.'='.$search.')';

+		}

+

+		if (is_array($attributeArray))

+		{

@@ -1127 +1056 @@
-			dol_syslog(get_class($this)."::getRecords connection=".$this->connectedServer.":".$this->serverPort." userDn=".$userDn." filter=".$filter." attributeArray=(".join(',', $attributeArray).")");

+			dol_syslog(get_class($this)."::getRecords connection=".$this->connection." userDn=".$userDn." filter=".$filter." attributeArray=(".join(',', $attributeArray).")");

@@ -1130 +1059,3 @@
-		} else {

+		}

+		else

+		{

@@ -1132 +1063 @@
-			dol_syslog(get_class($this)."::getRecords connection=".$this->connectedServer.":".$this->serverPort." userDn=".$userDn." filter=".$filter);

+			dol_syslog(get_class($this)."::getRecords connection=".$this->connection." userDn=".$userDn." filter=".$filter);

@@ -1135 +1066,2 @@
-		if (!$this->result) {

+		if (!$this->result)

+		{

@@ -1146,3 +1078,5 @@
-		for ($i = 0; $i < $info["count"]; $i++) {

-			$recordid = $this->convToOutputCharset($info[$i][strtolower($useridentifier)][0], $this->ldapcharset);

-			if ($recordid) {

+		for ($i = 0; $i < $info["count"]; $i++)

+		{

+			$recordid = $this->convToOutputCharset($info[$i][$useridentifier][0], $this->ldapcharset);

+			if ($recordid)

+			{

@@ -1154 +1088,2 @@
-				for ($j = 0; $j < $num; $j++) {

+				for ($j = 0; $j < $num; $j++)

+				{

@@ -1159 +1094,2 @@
-					if ($this->serverType == "activedirectory" && $keyattributelower == "objectsid") {

+					if ($this->serverType == "activedirectory" && $keyattributelower == "objectsid")

+					{

@@ -1162 +1098,3 @@
-					} else {

+					}

+					else

+					{

@@ -1188,3 +1126,2 @@
-	public function littleEndian($hex)

-	{

-		$result = '';

+    public function littleEndian($hex)

+	{

@@ -1205 +1142 @@
-	public function getObjectSid($ldapUser)

+    public function getObjectSid($ldapUser)

@@ -1211 +1148,2 @@
-		if ($this->serverType == "activedirectory") {

+		if ($this->serverType == "activedirectory")

+		{

@@ -1218 +1156,2 @@
-		while ($i <= 2) {

+		while ($i <= 2)

+		{

@@ -1221 +1160,2 @@
-			if (!$ldapSearchResult) {

+			if (!$ldapSearchResult)

+			{

@@ -1228 +1168,2 @@
-			if (!$entry) {

+			if (!$entry)

+			{

@@ -1232 +1173,3 @@
-			} else {

+			}

+			else

+			{

@@ -1238 +1181,2 @@
-		if ($entry) {

+		if ($entry)

+		{

@@ -1242 +1186,3 @@
-		} else {

+		}

+		else

+		{

@@ -1255 +1201 @@
-	public function binSIDtoText($binsid)

+    public function binSIDtoText($binsid)

@@ -1262 +1208,2 @@
-		for ($x = 0; $x < $subcount; $x++) {

+		for ($x = 0; $x < $subcount; $x++)

+		{

@@ -1280 +1227 @@
-	public function search($checkDn, $filter)

+    public function search($checkDn, $filter)

@@ -1295 +1242,2 @@
-		if (!$result) {

+		if (!$result)

+		{

@@ -1298 +1246,3 @@
-		} else {

+		}

+		else

+		{

@@ -1308,6 +1258,6 @@
-	 * 		@param	User|string	$user		Not used.

-	 *      @param  string		$filter		Filter for search. Must start with &.

-	 *                       		       	Examples: &(objectClass=inetOrgPerson) &(objectClass=user)(objectCategory=person) &(isMemberOf=cn=Sales,ou=Groups,dc=opencsi,dc=com)

-	 *		@return	int						>0 if OK, <0 if KO

-	 */

-	public function fetch($user, $filter)

+	 * 		@param	User	$user		User to search for. Not used if a filter is provided.

+	 *      @param  string	$filter		Filter for search. Must start with &.

+	 *                       	       	Examples: &(objectClass=inetOrgPerson) &(objectClass=user)(objectCategory=person) &(isMemberOf=cn=Sales,ou=Groups,dc=opencsi,dc=com)

+	 *		@return	int					>0 if OK, <0 if KO

+	 */

+    public function fetch($user, $filter)

@@ -1326 +1276,2 @@
-		while ($i <= 2) {

+		while ($i <= 2)

+		{

@@ -1329 +1280,2 @@
-			if ($this->result) {

+			if ($this->result)

+			{

@@ -1331,5 +1283,2 @@
-				if ($result['count'] > 0) {

-					dol_syslog('Ldap::fetch search found '.$result['count'].' records');

-				} else {

-					dol_syslog('Ldap::fetch search returns but found no records');

-				}

+				if ($result['count'] > 0) dol_syslog('Ldap::fetch search found '.$result['count'].' records');

+				else dol_syslog('Ldap::fetch search returns but found no records');

@@ -1337 +1286,3 @@
-			} else {

+			}

+			else

+			{

@@ -1343 +1294,2 @@
-			if (!$result) {

+			if (!$result)

+			{

@@ -1347 +1299,3 @@
-			} else {

+			}

+			else

+			{

@@ -1352 +1306,2 @@
-		if (!$result) {

+		if (!$result)

+		{

@@ -1355 +1310,3 @@
-		} else {

+		}

+		else

+		{

@@ -1359,0 +1317 @@
+			$this->skype      = $this->convToOutputCharset($result[0][$this->attr_skype][0], $this->ldapcharset);

@@ -1365 +1323,2 @@
-			if (isset($result[0]["pwdlastset"][0])) {	// If expiration on password exists

+			if (isset($result[0]["pwdlastset"][0]))	// If expiration on password exists

+			{

@@ -1367 +1326,3 @@
-			} else {

+			}

+			else

+			{

@@ -1370,3 +1331 @@
-			if (!$this->name && !$this->login) {

-				$this->pwdlastset = -1;

-			}

+			if (!$this->name && !$this->login) $this->pwdlastset = -1;

@@ -1397 +1356 @@
-	public function getUserIdentifier()

+    public function getUserIdentifier()

@@ -1406,7 +1365,7 @@
-	/**

-	 * 	UserAccountControl Flgs to more human understandable form...

-	 *

-	 *	@param	string		$uacf		UACF

-	 *	@return	array

-	 */

-	public function parseUACF($uacf)

+    /**

+     * 	UserAccountControl Flgs to more human understandable form...

+     *

+     *	@param	string		$uacf		UACF

+     *	@return	void

+     */

+    public function parseUACF($uacf)

@@ -1450,10 +1409,10 @@
-		return $retval;

-	}

-

-	/**

-	 * 	SamAccountType value to text

-	 *

-	 *	@param	string	$samtype	SamType

-	 *	@return	string				Sam string

-	 */

-	public function parseSAT($samtype)

+		return($retval);

+	}

+

+    /**

+     * 	SamAccountType value to text

+     *

+     *	@param	string	$samtype	SamType

+     *	@return	string				Sam string

+     */

+    public function parseSAT($samtype)

@@ -1462,7 +1421,7 @@
-			805306368 => "NORMAL_ACCOUNT",

-			805306369 => "WORKSTATION_TRUST",

-			805306370 => "INTERDOMAIN_TRUST",

-			268435456 => "SECURITY_GLOBAL_GROUP",

-			268435457 => "DISTRIBUTION_GROUP",

-			536870912 => "SECURITY_LOCAL_GROUP",

-			536870913 => "DISTRIBUTION_LOCAL_GROUP"

+			805306368    =>    "NORMAL_ACCOUNT",

+			805306369    =>    "WORKSTATION_TRUST",

+			805306370    =>    "INTERDOMAIN_TRUST",

+			268435456    =>    "SECURITY_GLOBAL_GROUP",

+			268435457    =>    "DISTRIBUTION_GROUP",

+			536870912    =>    "SECURITY_LOCAL_GROUP",

+			536870913    =>    "DISTRIBUTION_LOCAL_GROUP"

@@ -1472 +1431 @@
-		foreach ($stypes as $sat => $val) {

+		while (list($sat, $val) = each($stypes)) {

@@ -1478,8 +1437,6 @@
-		if (empty($retval)) {

-			$retval = "UNKNOWN_TYPE_".$samtype;

-		}

-

-		return $retval;

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+		if (empty($retval)) $retval = "UNKNOWN_TYPE_".$samtype;

+

+		return($retval);

+	}

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -1492,3 +1449,3 @@
-	public function convert_time($value)

-	{

-		// phpcs:enable

+    public function convert_time($value)

+	{

+        // phpcs:enable

@@ -1513,6 +1470,2 @@
-		if ($pagecodefrom == 'ISO-8859-1' && $conf->file->character_set_client == 'UTF-8') {

-			$str = mb_convert_encoding($str, 'UTF-8', 'ISO-8859-1');

-		}

-		if ($pagecodefrom == 'UTF-8' && $conf->file->character_set_client == 'ISO-8859-1') {

-			$str = mb_convert_encoding($str, 'ISO-8859-1');

-		}

+		if ($pagecodefrom == 'ISO-8859-1' && $conf->file->character_set_client == 'UTF-8')  $str = utf8_encode($str);

+		if ($pagecodefrom == 'UTF-8' && $conf->file->character_set_client == 'ISO-8859-1')  $str = utf8_decode($str);

@@ -1529 +1482 @@
-	public function convFromOutputCharset($str, $pagecodeto = 'UTF-8')

+    public function convFromOutputCharset($str, $pagecodeto = 'UTF-8')

@@ -1532,6 +1485,2 @@
-		if ($pagecodeto == 'ISO-8859-1' && $conf->file->character_set_client == 'UTF-8') {

-			$str = mb_convert_encoding($str, 'ISO-8859-1');

-		}

-		if ($pagecodeto == 'UTF-8' && $conf->file->character_set_client == 'ISO-8859-1') {

-			$str = mb_convert_encoding($str, 'UTF-8', 'ISO-8859-1');

-		}

+		if ($pagecodeto == 'ISO-8859-1' && $conf->file->character_set_client == 'UTF-8') $str = utf8_decode($str);

+		if ($pagecodeto == 'UTF-8' && $conf->file->character_set_client == 'ISO-8859-1') $str = utf8_encode($str);

@@ -1548 +1497 @@
-	public function getNextGroupGid($keygroup = 'LDAP_KEY_GROUPS')

+    public function getNextGroupGid($keygroup = 'LDAP_KEY_GROUPS')

@@ -1552,5 +1501,3 @@
-		if (empty($keygroup)) {

-			$keygroup = 'LDAP_KEY_GROUPS';

-		}

-

-		$search = '(' . getDolGlobalString($keygroup).'=*)';

+		if (empty($keygroup)) $keygroup = 'LDAP_KEY_GROUPS';

+

+		$search = '('.$conf->global->$keygroup.'=*)';

@@ -1558 +1505,2 @@
-		if ($result) {

+		if ($result)

+		{

@@ -1561 +1509,2 @@
-			for ($i = 0; $i < $c; $i++) {

+			for ($i = 0; $i < $c; $i++)

+			{

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_lessc.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_lessc.class.php
@@ -2 +1,0 @@
-

@@ -4 +3 @@
- * lessphp v0.8.0

+ * lessphp v0.5.0

@@ -13 +11,0 @@
-// phpcs:disable

@@ -40,4 +38,2 @@
-class Lessc

-{

-

-	public static $VERSION = "v0.8.0";

+class Lessc {

+	public static $VERSION = "v0.5.0";

@@ -58,8 +53,0 @@
-

-	public $scope;

-	public $formatter;

-	public $formatterName;

-	public $parser;

-	public $_parseFile;

-	public $env;

-	public $count;

@@ -79,2 +67 @@
-	protected function findImport($url)

-	{

+	protected function findImport($url) {

@@ -94,2 +81,2 @@
-	 * @param       string  $name   Filename

-	 * @return      boolean

+	 * @param 	string 	$name	Filename

+	 * @return 	boolean

@@ -97,2 +84 @@
-	protected function fileExists($name)

-	{

+	protected function fileExists($name) {

@@ -102,11 +88,6 @@
-	public static function compressList($items, $delim)

-	{

-		if (!isset($items[1]) && isset($items[0])) {

-			return $items[0];

-		} else {

-			return array('list', $delim, $items);

-		}

-	}

-

-	public static function preg_quote($what)

-	{

+	public static function compressList($items, $delim) {

+		if (!isset($items[1]) && isset($items[0])) return $items[0];

+		else return array('list', $delim, $items);

+	}

+

+	public static function preg_quote($what) {

@@ -116,2 +97 @@
-	protected function tryImport($importPath, $parentBlock, $out)

-	{

+	protected function tryImport($importPath, $parentBlock, $out) {

@@ -123,3 +103 @@
-		if ($str === null) {

-			return false;

-		}

+		if ($str === null) return false;

@@ -130,3 +108 @@
-		if (substr_compare($url, '.css', -4, 4) === 0) {

-			return false;

-		}

+		if (substr_compare($url, '.css', -4, 4) === 0) return false;

@@ -136,3 +112 @@
-		if ($realPath === null) {

-			return false;

-		}

+		if ($realPath === null) return false;

@@ -166,2 +140 @@
-					$child

-				);

+					$child);

@@ -182,2 +155 @@
-	protected function compileImportedProps($props, $block, $out, $sourceParser, $importDir)

-	{

+	protected function compileImportedProps($props, $block, $out, $sourceParser, $importDir) {

@@ -218 +190 @@
-	 * See Lessc::compileProp()

+	 * See lessc::compileProp()

@@ -221,2 +193 @@
-	protected function compileBlock($block)

-	{

+	protected function compileBlock($block) {

@@ -246,2 +217 @@
-	protected function compileCSSBlock($block)

-	{

+	protected function compileCSSBlock($block) {

@@ -261,2 +231 @@
-	protected function compileMedia($media)

-	{

+	protected function compileMedia($media) {

@@ -287,2 +256 @@
-	protected function mediaParent($scope)

-	{

+	protected function mediaParent($scope) {

@@ -299,2 +267 @@
-	protected function compileNestedBlock($block, $selectors)

-	{

+	protected function compileNestedBlock($block, $selectors) {

@@ -311,2 +278 @@
-	protected function compileRoot($root)

-	{

+	protected function compileRoot($root) {

@@ -319,2 +285 @@
-	protected function compileProps($block, $out)

-	{

+	protected function compileProps($block, $out) {

@@ -332,2 +297 @@
-	protected function deduplicate($lines)

-	{

+	protected function deduplicate($lines) {

@@ -351,2 +315 @@
-	protected function sortProps($props, $split = false)

-	{

+	protected function sortProps($props, $split = false) {

@@ -396,2 +359 @@
-	protected function compileMediaQuery($queries)

-	{

+	protected function compileMediaQuery($queries) {

@@ -409 +371 @@
-								$this->compileValue($this->reduce($q[2])).")";

+							$this->compileValue($this->reduce($q[2])).")";

@@ -433,2 +395 @@
-	protected function multiplyMedia($env, $childQueries = null)

-	{

+	protected function multiplyMedia($env, $childQueries = null) {

@@ -437,26 +398,25 @@
-		) {

-			return $childQueries;

-		}

-

-		// plain old block, skip

-		if (empty($env->block->type)) {

-			return $this->multiplyMedia($env->parent, $childQueries);

-		}

-

-		$out = array();

-		$queries = $env->block->queries;

-		if (is_null($childQueries)) {

-			$out = $queries;

-		} else {

-			foreach ($queries as $parent) {

-				foreach ($childQueries as $child) {

-					$out[] = array_merge($parent, $child);

-				}

-			}

-		}

-

-		return $this->multiplyMedia($env->parent, $out);

-	}

-

-	protected function expandParentSelectors(&$tag, $replace)

-	{

+			) {

+				return $childQueries;

+			}

+

+			// plain old block, skip

+			if (empty($env->block->type)) {

+				return $this->multiplyMedia($env->parent, $childQueries);

+			}

+

+			$out = array();

+			$queries = $env->block->queries;

+			if (is_null($childQueries)) {

+				$out = $queries;

+			} else {

+				foreach ($queries as $parent) {

+					foreach ($childQueries as $child) {

+						$out[] = array_merge($parent, $child);

+					}

+				}

+			}

+

+			return $this->multiplyMedia($env->parent, $out);

+	}

+

+	protected function expandParentSelectors(&$tag, $replace) {

@@ -466 +425,0 @@
-			$c = 0;

@@ -474,2 +433 @@
-	protected function findClosestSelectors()

-	{

+	protected function findClosestSelectors() {

@@ -491,2 +449 @@
-	protected function multiplySelectors($selectors)

-	{

+	protected function multiplySelectors($selectors) {

@@ -523,2 +480 @@
-	protected function compileSelectors($selectors)

-	{

+	protected function compileSelectors($selectors) {

@@ -539,2 +495 @@
-	protected function eq($left, $right)

-	{

+	protected function eq($left, $right) {

@@ -544,2 +499 @@
-	protected function patternMatch($block, $orderedArgs, $keywordArgs)

-	{

+	protected function patternMatch($block, $orderedArgs, $keywordArgs) {

@@ -562,3 +516 @@
-					if ($negate) {

-						$passed = !$passed;

-					}

+					if ($negate) $passed = !$passed;

@@ -576,3 +528 @@
-				if ($groupPassed) {

-					break;

-				}

+				if ($groupPassed) break;

@@ -632,2 +582 @@
-	protected function patternMatchAll($blocks, $orderedArgs, $keywordArgs, $skip = array())

-	{

+	protected function patternMatchAll($blocks, $orderedArgs, $keywordArgs, $skip = array()) {

@@ -650,8 +599,3 @@
-	protected function findBlocks($searchIn, $path, $orderedArgs, $keywordArgs, $seen = array())

-	{

-		if ($searchIn == null) {

-			return null;

-		}

-		if (isset($seen[$searchIn->id])) {

-			return null;

-		}

+	protected function findBlocks($searchIn, $path, $orderedArgs, $keywordArgs, $seen = array()) {

+		if ($searchIn == null) return null;

+		if (isset($seen[$searchIn->id])) return null;

@@ -674,7 +618,2 @@
-					$subMatches = $this->findBlocks(

-						$subBlock,

-						array_slice($path, 1),

-						$orderedArgs,

-						$keywordArgs,

-						$seen

-					);

+					$subMatches = $this->findBlocks($subBlock,

+						array_slice($path, 1), $orderedArgs, $keywordArgs, $seen);

@@ -692,3 +631 @@
-		if ($searchIn->parent === $searchIn) {

-			return null;

-		}

+		if ($searchIn->parent === $searchIn) return null;

@@ -700,2 +637 @@
-	protected function zipSetArgs($args, $orderedValues, $keywordValues)

-	{

+	protected function zipSetArgs($args, $orderedValues, $keywordValues) {

@@ -717,0 +654 @@
+					$this->throwError("Failed to assign arg ".$a[1]);

@@ -719 +655,0 @@
-					$this->throwError("Failed to assign arg ".$a[1]); // This ends function by throwing an exception

@@ -733 +669 @@
-		if ($last && $last[0] == "rest") {

+		if ($last[0] == "rest") {

@@ -743,2 +679 @@
-	protected function compileProp($prop, $block, $out)

-	{

+	protected function compileProp($prop, $block, $out) {

@@ -754,4 +689,2 @@
-					$out->lines[] = $this->formatter->property(

-						$name,

-						$this->compileValue($this->reduce($value))

-					);

+					$out->lines[] = $this->formatter->property($name,

+						$this->compileValue($this->reduce($value)));

@@ -814,3 +747 @@
-					if ($mixin != $block) {

-						$mixin->parent = $block;

-					}

+					if ($mixin != $block) $mixin->parent = $block;

@@ -822,9 +753,9 @@
-							$subProp[1][0] != $this->vPrefix

-						) {

-							$subProp[2] = array(

-								'list', ' ',

-								array($subProp[2], array('keyword', $suffix))

-							);

-						}

-

-						$this->compileProp($subProp, $mixin, $out);

+							$subProp[1]{0} != $this->vPrefix

+							) {

+								$subProp[2] = array(

+									'list', ' ',

+									array($subProp[2], array('keyword', $suffix))

+								);

+							}

+

+							$this->compileProp($subProp, $mixin, $out);

@@ -835,6 +766,2 @@
-					if ($haveArgs) {

-						$this->popEnv();

-					}

-					if ($haveScope) {

-						$this->popEnv();

-					}

+					if ($haveArgs) $this->popEnv();

+					if ($haveScope) $this->popEnv();

@@ -865 +792 @@
-					array(false, "@import ".$this->compileValue($importPath).";") : $result;

+				array(false, "@import ".$this->compileValue($importPath).";") : $result;

@@ -869 +796 @@
-				list(, $importId) = $prop;

+				list(,$importId) = $prop;

@@ -898,2 +825 @@
-	public function compileValue($value)

-	{

+	public function compileValue($value) {

@@ -963,2 +889 @@
-	protected function lib_pow($args)

-	{

+	protected function lib_pow($args) {

@@ -969,2 +894 @@
-	protected function lib_pi()

-	{

+	protected function lib_pi() {

@@ -974,2 +898 @@
-	protected function lib_mod($args)

-	{

+	protected function lib_mod($args) {

@@ -980,2 +903 @@
-	protected function lib_tan($num)

-	{

+	protected function lib_tan($num) {

@@ -985,2 +907 @@
-	protected function lib_sin($num)

-	{

+	protected function lib_sin($num) {

@@ -990,2 +911 @@
-	protected function lib_cos($num)

-	{

+	protected function lib_cos($num) {

@@ -995,2 +915 @@
-	protected function lib_atan($num)

-	{

+	protected function lib_atan($num) {

@@ -1001,2 +920 @@
-	protected function lib_asin($num)

-	{

+	protected function lib_asin($num) {

@@ -1007,2 +925 @@
-	protected function lib_acos($num)

-	{

+	protected function lib_acos($num) {

@@ -1013,2 +930 @@
-	protected function lib_sqrt($num)

-	{

+	protected function lib_sqrt($num) {

@@ -1018,2 +934 @@
-	protected function lib_extract($value)

-	{

+	protected function lib_extract($value) {

@@ -1026,5 +941,3 @@
-		return '';

-	}

-

-	protected function lib_isnumber($value)

-	{

+	}

+

+	protected function lib_isnumber($value) {

@@ -1034,2 +947 @@
-	protected function lib_isstring($value)

-	{

+	protected function lib_isstring($value) {

@@ -1039,2 +951 @@
-	protected function lib_iscolor($value)

-	{

+	protected function lib_iscolor($value) {

@@ -1044,2 +955 @@
-	protected function lib_iskeyword($value)

-	{

+	protected function lib_iskeyword($value) {

@@ -1049,2 +959 @@
-	protected function lib_ispixel($value)

-	{

+	protected function lib_ispixel($value) {

@@ -1054,2 +963 @@
-	protected function lib_ispercentage($value)

-	{

+	protected function lib_ispercentage($value) {

@@ -1059,2 +967 @@
-	protected function lib_isem($value)

-	{

+	protected function lib_isem($value) {

@@ -1064,2 +971 @@
-	protected function lib_isrem($value)

-	{

+	protected function lib_isrem($value) {

@@ -1069,2 +975 @@
-	protected function lib_rgbahex($color)

-	{

+	protected function lib_rgbahex($color) {

@@ -1076,2 +981 @@
-		return sprintf(

-			"#%02x%02x%02x%02x",

+		return sprintf("#%02x%02x%02x%02x",

@@ -1082,5 +986,4 @@
-		);

-	}

-

-	protected function lib_argb($color)

-	{

+			);

+	}

+

+	protected function lib_argb($color) {

@@ -1096,2 +999 @@
-	protected function lib_data_uri($value)

-	{

+	protected function lib_data_uri($value) {

@@ -1116 +1018 @@
-				if (!is_null($mime)) { // fallback if the mime type is still unknown

+				if (!is_null($mime)) // fallback if the mime type is still unknown

@@ -1118 +1019,0 @@
-				}

@@ -1126,2 +1027 @@
-	protected function lib_e($arg)

-	{

+	protected function lib_e($arg) {

@@ -1134,2 +1034,2 @@
-				$this->throwError("unrecognised input"); // This ends function by throwing an exception

-				// no break

+				$this->throwError("unrecognised input");

+				return null;

@@ -1146,5 +1046,2 @@
-	protected function lib__sprintf($args)

-	{

-		if ($args[0] != "list") {

-			return $args;

-		}

+	protected function lib__sprintf($args) {

+		if ($args[0] != "list") return $args;

@@ -1160 +1057 @@
-					$this->reduce($values[$i]) : array('keyword', '');

+				$this->reduce($values[$i]) : array('keyword', '');

@@ -1169,6 +1066,2 @@
-				$template = preg_replace(

-					'/'.self::preg_quote($match).'/',

-					$rep,

-					$template,

-					1

-				);

+				$template = preg_replace('/'.self::preg_quote($match).'/',

+					$rep, $template, 1);

@@ -1182,2 +1075 @@
-	protected function lib_floor($arg)

-	{

+	protected function lib_floor($arg) {

@@ -1188,2 +1080 @@
-	protected function lib_ceil($arg)

-	{

+	protected function lib_ceil($arg) {

@@ -1194,2 +1085 @@
-	protected function lib_round($arg)

-	{

+	protected function lib_round($arg) {

@@ -1206,2 +1096 @@
-	protected function lib_unit($arg)

-	{

+	protected function lib_unit($arg) {

@@ -1221,2 +1110 @@
-	public function colorArgs($args)

-	{

+	public function colorArgs($args) {

@@ -1228 +1116 @@
-		$delta = (float) $delta[1];

+		$delta = floatval($delta[1]);

@@ -1233,2 +1121 @@
-	protected function lib_darken($args)

-	{

+	protected function lib_darken($args) {

@@ -1242,2 +1129 @@
-	protected function lib_lighten($args)

-	{

+	protected function lib_lighten($args) {

@@ -1251,2 +1137 @@
-	protected function lib_saturate($args)

-	{

+	protected function lib_saturate($args) {

@@ -1260,2 +1145 @@
-	protected function lib_desaturate($args)

-	{

+	protected function lib_desaturate($args) {

@@ -1269,2 +1153 @@
-	protected function lib_spin($args)

-	{

+	protected function lib_spin($args) {

@@ -1283,2 +1166 @@
-	protected function lib_fadeout($args)

-	{

+	protected function lib_fadeout($args) {

@@ -1290,2 +1172 @@
-	protected function lib_fadein($args)

-	{

+	protected function lib_fadein($args) {

@@ -1297,2 +1178 @@
-	protected function lib_hue($color)

-	{

+	protected function lib_hue($color) {

@@ -1303,2 +1183 @@
-	protected function lib_saturation($color)

-	{

+	protected function lib_saturation($color) {

@@ -1309,2 +1188 @@
-	protected function lib_lightness($color)

-	{

+	protected function lib_lightness($color) {

@@ -1317,2 +1195 @@
-	protected function lib_alpha($value)

-	{

+	protected function lib_alpha($value) {

@@ -1322 +1198,0 @@
-		return '';

@@ -1326,2 +1202 @@
-	protected function lib_fade($args)

-	{

+	protected function lib_fade($args) {

@@ -1333,2 +1208 @@
-	protected function lib_percentage($arg)

-	{

+	protected function lib_percentage($arg) {

@@ -1350,2 +1224 @@
-	protected function lib_tint($args)

-	{

+	protected function lib_tint($args) {

@@ -1360 +1232,0 @@
-		return array();

@@ -1374,2 +1246 @@
-	protected function lib_shade($args)

-	{

+	protected function lib_shade($args) {

@@ -1384,15 +1255,7 @@
-		return array();

-	}

-

-	/**

-	 * lib_mix

-	 * mixes two colors by weight

-	 * mix(@color1, @color2, [@weight: 50%]);

-	 * http://sass-lang.com/docs/yardoc/Sass/Script/Functions.html#mix-instance_method

-	 *

-	 * @param array         $args   Args

-	 * @return array

-	 */

-	protected function lib_mix($args)

-	{

-		if ($args[0] != "list" || count($args[2]) < 2) {

+	}

+

+	// mixes two colors by weight

+	// mix(@color1, @color2, [@weight: 50%]);

+	// http://sass-lang.com/docs/yardoc/Sass/Script/Functions.html#mix-instance_method

+	protected function lib_mix($args) {

+		if ($args[0] != "list" || count($args[2]) < 2)

@@ -1400,42 +1263,34 @@
-		}

-

-		list($first, $second) = $args[2];

-		$first = $this->assertColor($first);

-		$second = $this->assertColor($second);

-

-		$first_a = $this->lib_alpha($first);

-		$second_a = $this->lib_alpha($second);

-

-		if (isset($args[2][2])) {

-			$weight = $args[2][2][1] / 100.0;

-		} else {

-			$weight = 0.5;

-		}

-

-		$w = $weight * 2 - 1;

-		$a = $first_a - $second_a;

-

-		$w1 = (($w * $a == -1 ? $w : ($w + $a) / (1 + $w * $a)) + 1) / 2.0;

-		$w2 = 1.0 - $w1;

-

-		$new = array('color',

-			$w1 * $first[1] + $w2 * $second[1],

-			$w1 * $first[2] + $w2 * $second[2],

-			$w1 * $first[3] + $w2 * $second[3],

-		);

-

-		if ($first_a != 1.0 || $second_a != 1.0) {

-			$new[] = $first_a * $weight + $second_a * ($weight - 1);

-		}

-

-		return $this->fixColor($new);

-	}

-

-	/**

-	 * lib_contrast

-	 *

-	 * @param array         $args   Args

-	 * @return array

-	 */

-	protected function lib_contrast($args)

-	{

+

+			list($first, $second) = $args[2];

+			$first = $this->assertColor($first);

+			$second = $this->assertColor($second);

+

+			$first_a = $this->lib_alpha($first);

+			$second_a = $this->lib_alpha($second);

+

+			if (isset($args[2][2])) {

+				$weight = $args[2][2][1] / 100.0;

+			} else {

+				$weight = 0.5;

+			}

+

+			$w = $weight * 2 - 1;

+			$a = $first_a - $second_a;

+

+			$w1 = (($w * $a == -1 ? $w : ($w + $a) / (1 + $w * $a)) + 1) / 2.0;

+			$w2 = 1.0 - $w1;

+

+			$new = array('color',

+				$w1 * $first[1] + $w2 * $second[1],

+				$w1 * $first[2] + $w2 * $second[2],

+				$w1 * $first[3] + $w2 * $second[3],

+			);

+

+			if ($first_a != 1.0 || $second_a != 1.0) {

+				$new[] = $first_a * $weight + $second_a * ($weight - 1);

+			}

+

+			return $this->fixColor($new);

+	}

+

+	protected function lib_contrast($args) {

@@ -1451 +1306,2 @@
-		} else {

+		}

+		else {

@@ -1473,2 +1329 @@
-	private function toLuma($color)

-	{

+	private function toLuma($color) {

@@ -1488,2 +1343 @@
-	protected function lib_luma($color)

-	{

+	protected function lib_luma($color) {

@@ -1494,2 +1348 @@
-	public function assertColor($value, $error = "expected color value")

-	{

+	public function assertColor($value, $error = "expected color value") {

@@ -1497,3 +1350 @@
-		if (is_null($color)) {

-			$this->throwError($error);

-		}

+		if (is_null($color)) $this->throwError($error);

@@ -1503,5 +1354,2 @@
-	public function assertNumber($value, $error = "expecting number")

-	{

-		if ($value[0] == "number") {

-			return $value[1];

-		}

+	public function assertNumber($value, $error = "expecting number") {

+		if ($value[0] == "number") return $value[1];

@@ -1511,2 +1359 @@
-	public function assertArgs($value, $expectedArgs, $name = "")

-	{

+	public function assertArgs($value, $expectedArgs, $name = "") {

@@ -1516,3 +1363 @@
-			if ($value[0] !== "list" || $value[1] != ",") {

-				$this->throwError("expecting list");

-			}

+			if ($value[0] !== "list" || $value[1] != ",") $this->throwError("expecting list");

@@ -1526 +1371 @@
-				$this->throwError("{$name}expecting $expectedArgs arguments, got $numValues");

+				$this->throwError("${name}expecting $expectedArgs arguments, got $numValues");

@@ -1533,2 +1378 @@
-	protected function toHSL($color)

-	{

+	protected function toHSL($color) {

@@ -1561,0 +1406 @@
+

@@ -1577,2 +1422 @@
-	protected function toRGB_helper($comp, $temp1, $temp2)

-	{

+	protected function toRGB_helper($comp, $temp1, $temp2) {

@@ -1602,2 +1446 @@
-	protected function toRGB($color)

-	{

+	protected function toRGB($color) {

@@ -1616 +1459 @@
-				$L * (1.0 + $S) : $L + $S - $L * $S;

+			$L * (1.0 + $S) : $L + $S - $L * $S;

@@ -1634,2 +1477 @@
-	protected function clamp($v, $max = 1, $min = 0)

-	{

+	protected function clamp($v, $max = 1, $min = 0) {

@@ -1643,2 +1485 @@
-	protected function funcToColor($func)

-	{

+	protected function funcToColor($func) {

@@ -1657 +1498 @@
-				$val = isset($val[1]) ? (float) $val[1] : 0;

+				$val = isset($val[1]) ? floatval($val[1]) : 0;

@@ -1685 +1526 @@
-						$components[] = (float) $c[1];

+						$components[] = floatval($c[1]);

@@ -1691,5 +1532,3 @@
-						$components[] = (float) $c[1];

-					}

-				} else {

-					break;

-				}

+						$components[] = floatval($c[1]);

+					}

+				} else break;

@@ -1709,2 +1548 @@
-	protected function reduce($value, $forExpression = false)

-	{

+	protected function reduce($value, $forExpression = false) {

@@ -1721,3 +1559 @@
-				if (empty($value[2])) {

-					$res = $this->lib_e($res);

-				}

+				if (empty($value[2])) $res = $this->lib_e($res);

@@ -1755,3 +1591 @@
-						if ($strip) {

-							$part = $this->lib_e($part);

-						}

+						if ($strip) $part = $this->lib_e($part);

@@ -1762 +1596 @@
-				list(, $inner) = $value;

+				list(,$inner) = $value;

@@ -1766,3 +1600 @@
-				if ($color) {

-					return $color;

-				}

+				if ($color) return $color;

@@ -1771,3 +1603 @@
-				if ($name == "%") {

-					$name = "_sprintf";

-				}

+				if ($name == "%") $name = "_sprintf";

@@ -1776 +1606 @@
-					$this->libFunctions[$name] : array($this, 'lib_'.str_replace('-', '_', $name));

+				$this->libFunctions[$name] : array($this, 'lib_'.str_replace('-', '_', $name));

@@ -1779 +1609 @@
-					if ($args[0] == 'list') {

+					if ($args[0] == 'list')

@@ -1781,18 +1611,17 @@
-					}

-

-					$ret = call_user_func($f, $this->reduce($args, true), $this);

-

-					if (is_null($ret)) {

-						return array("string", "", array(

-							$name, "(", $args, ")"

-						));

-					}

-

-					// convert to a typed value if the result is a php primitive

-					if (is_numeric($ret)) {

-						$ret = array('number', $ret, "");

-					} elseif (!is_array($ret)) {

-						$ret = array('keyword', $ret);

-					}

-

-					return $ret;

+

+						$ret = call_user_func($f, $this->reduce($args, true), $this);

+

+						if (is_null($ret)) {

+							return array("string", "", array(

+								$name, "(", $args, ")"

+							));

+						}

+

+						// convert to a typed value if the result is a php primitive

+						if (is_numeric($ret)) {

+							$ret = array('number', $ret, "");

+						} elseif (!is_array($ret)) {

+							$ret = array('keyword', $ret);

+						}

+

+						return $ret;

@@ -1837,2 +1666 @@
-	protected function coerceColor($value)

-	{

+	protected function coerceColor($value) {

@@ -1840,2 +1668 @@
-			case 'color':

-				return $value;

+			case 'color': return $value;

@@ -1849 +1676 @@
-					$t = intval($num) % $width;

+					$t = $num % $width;

@@ -1852 +1679 @@
-					$c[$i] = $t * (256 / $width) + $t * floor(16/$width);

+					$c[$i] = $t * (256 / $width) + $t * floor(16 / $width);

@@ -1868 +1694,0 @@
-		return null;

@@ -1872,2 +1698 @@
-	protected function coerceString($value)

-	{

+	protected function coerceString($value) {

@@ -1884,2 +1709 @@
-	protected function flattenList($value)

-	{

+	protected function flattenList($value) {

@@ -1892,2 +1716 @@
-	public function toBool($a)

-	{

+	public function toBool($a) {

@@ -1898,2 +1721 @@
-	protected function evaluate($exp)

-	{

+	protected function evaluate($exp) {

@@ -1930 +1752 @@
-		$fname = "op_{$ltype}_{$rtype}";

+		$fname = "op_${ltype}_${rtype}";

@@ -1933,3 +1755 @@
-			if (!is_null($out)) {

-				return $out;

-			}

+			if (!is_null($out)) return $out;

@@ -1950,2 +1770 @@
-	protected function stringConcatenate($left, $right)

-	{

+	protected function stringConcatenate($left, $right) {

@@ -1964 +1782,0 @@
-		return '';

@@ -1969,2 +1787 @@
-	protected function fixColor($c)

-	{

+	protected function fixColor($c) {

@@ -1972,6 +1789,2 @@
-			if ($c[$i] < 0) {

-				$c[$i] = 0;

-			}

-			if ($c[$i] > 255) {

-				$c[$i] = 255;

-			}

+			if ($c[$i] < 0) $c[$i] = 0;

+			if ($c[$i] > 255) $c[$i] = 255;

@@ -1983,2 +1796 @@
-	protected function op_number_color($op, $lft, $rgt)

-	{

+	protected function op_number_color($op, $lft, $rgt) {

@@ -1988,18 +1800,10 @@
-		return array();

-	}

-

-	protected function op_color_number($op, $lft, $rgt)

-	{

-		if ($rgt[0] == '%') {

-			$rgt[1] /= 100;

-		}

-

-		return $this->op_color_color(

-			$op,

-			$lft,

-			array_fill(1, count($lft) - 1, $rgt[1])

-		);

-	}

-

-	protected function op_color_color($op, $left, $right)

-	{

+	}

+

+	protected function op_color_number($op, $lft, $rgt) {

+		if ($rgt[0] == '%') $rgt[1] /= 100;

+

+		return $this->op_color_color($op, $lft,

+			array_fill(1, count($lft) - 1, $rgt[1]));

+	}

+

+	protected function op_color_color($op, $left, $right) {

@@ -2037,2 +1841 @@
-	public function lib_red($color)

-	{

+	public function lib_red($color) {

@@ -2047,2 +1850 @@
-	public function lib_green($color)

-	{

+	public function lib_green($color) {

@@ -2057,2 +1859 @@
-	public function lib_blue($color)

-	{

+	public function lib_blue($color) {

@@ -2069,2 +1870 @@
-	protected function op_number_number($op, $left, $right)

-	{

+	protected function op_number_number($op, $left, $right) {

@@ -2088,3 +1888 @@
-				if ($right[1] == 0) {

-					$this->throwError('parse error: divide by zero');

-				}

+				if ($right[1] == 0) $this->throwError('parse error: divide by zero');

@@ -2111,3 +1909,2 @@
-	protected function makeOutputBlock($type, $selectors = null)

-	{

-		$b = new stdclass();

+	protected function makeOutputBlock($type, $selectors = null) {

+		$b = new stdclass;

@@ -2123,3 +1920,2 @@
-	protected function pushEnv($block = null)

-	{

-		$e = new stdclass();

+	protected function pushEnv($block = null) {

+		$e = new stdclass;

@@ -2135,2 +1931 @@
-	protected function popEnv()

-	{

+	protected function popEnv() {

@@ -2143,2 +1938 @@
-	protected function set($name, $value)

-	{

+	protected function set($name, $value) {

@@ -2150,2 +1944 @@
-	protected function get($name)

-	{

+	protected function get($name) {

@@ -2165 +1958 @@
-				$current->storeParent : $current->parent;

+			$current->storeParent : $current->parent;

@@ -2172,2 +1965 @@
-	protected function injectVariables($args)

-	{

+	protected function injectVariables($args) {

@@ -2176 +1967,0 @@
-		$value = null;

@@ -2195,2 +1986 @@
-	public function __construct($fname = null)

-	{

+	public function __construct($fname = null) {

@@ -2203,2 +1993 @@
-	public function compile($string, $name = null)

-	{

+	public function compile($string, $name = null) {

@@ -2230,2 +2019 @@
-	public function compileFile($fname, $outFname = null)

-	{

+	public function compileFile($fname, $outFname = null) {

@@ -2257,2 +2045 @@
-	public function checkedCompile($in, $out)

-	{

+	public function checkedCompile($in, $out) {

@@ -2286,2 +2073 @@
-	public function cachedCompile($in, $force = false)

-	{

+	public function cachedCompile($in, $force = false) {

@@ -2327,0 +2114 @@
+

@@ -2332,2 +2119 @@
-	public function parse($str = null, $initialVariables = null)

-	{

+	public function parse($str = null, $initialVariables = null) {

@@ -2358,2 +2144 @@
-	protected function makeParser($name)

-	{

+	protected function makeParser($name) {

@@ -2366,2 +2151 @@
-	public function setFormatter($name)

-	{

+	public function setFormatter($name) {

@@ -2371,2 +2155 @@
-	protected function newFormatter()

-	{

+	protected function newFormatter() {

@@ -2375 +2158 @@
-			if (!is_string($this->formatterName)) {

+			if (!is_string($this->formatterName))

@@ -2377,9 +2160,7 @@
-			}

-			$className = "lessc_formatter_$this->formatterName";

-		}

-

-		return new $className();

-	}

-

-	public function setPreserveComments($preserve)

-	{

+				$className = "lessc_formatter_$this->formatterName";

+		}

+

+		return new $className;

+	}

+

+	public function setPreserveComments($preserve) {

@@ -2389,2 +2170 @@
-	public function registerFunction($name, $func)

-	{

+	public function registerFunction($name, $func) {

@@ -2394,2 +2174 @@
-	public function unregisterFunction($name)

-	{

+	public function unregisterFunction($name) {

@@ -2399,2 +2178 @@
-	public function setVariables($variables)

-	{

+	public function setVariables($variables) {

@@ -2404,2 +2182 @@
-	public function unsetVariable($name)

-	{

+	public function unsetVariable($name) {

@@ -2409,2 +2186 @@
-	public function setImportDir($dirs)

-	{

+	public function setImportDir($dirs) {

@@ -2414,2 +2190 @@
-	public function addImportDir($dir)

-	{

+	public function addImportDir($dir) {

@@ -2420,2 +2195 @@
-	public function allParsedFiles()

-	{

+	public function allParsedFiles() {

@@ -2425,2 +2199 @@
-	public function addParsedFile($file)

-	{

+	public function addParsedFile($file) {

@@ -2433,2 +2206 @@
-	public function throwError($msg = null)

-	{

+	public function throwError($msg = null) {

@@ -2443,2 +2215 @@
-	public static function ccompile($in, $out, $less = null)

-	{

+	public static function ccompile($in, $out, $less = null) {

@@ -2446 +2217 @@
-			$less = new self();

+			$less = new self;

@@ -2451,2 +2222 @@
-	public static function cexecute($in, $force = false, $less = null)

-	{

+	public static function cexecute($in, $force = false, $less = null) {

@@ -2454 +2224 @@
-			$less = new self();

+			$less = new self;

@@ -2613,2 +2383 @@
-class lessc_parser

-{

+class lessc_parser {

@@ -2643 +2412 @@
-		array('/border-radius$/i', '/^font$/i');

+	array('/border-radius$/i', '/^font$/i');

@@ -2662,15 +2431 @@
-	public $env;

-	public $buffer;

-	public $count;

-	public $line;

-	public $eatWhiteDefault;

-	public $lessc;

-	public $sourceName;

-	public $writeComments;

-	public $seenComments;

-	public $currentProperty;

-	public $inExp;

-

-

-	public function __construct($lessc, $sourceName = null)

-	{

+	public function __construct($lessc, $sourceName = null) {

@@ -2687,11 +2442,9 @@
-				'('.implode('|', array_map(

-					array('lessc', 'preg_quote'),

-					array_keys(self::$precedence)

-				)).')';

-

-			$commentSingle = Lessc::preg_quote(self::$commentSingle);

-			$commentMultiLeft = Lessc::preg_quote(self::$commentMultiLeft);

-			$commentMultiRight = Lessc::preg_quote(self::$commentMultiRight);

-

-			self::$commentMulti = $commentMultiLeft.'.*?'.$commentMultiRight;

-			self::$whitePattern = '/'.$commentSingle.'[^\n]*\s*|('.self::$commentMulti.')\s*|\s+/Ais';

+			'('.implode('|', array_map(array('lessc', 'preg_quote'),

+				array_keys(self::$precedence))).')';

+

+				$commentSingle = lessc::preg_quote(self::$commentSingle);

+				$commentMultiLeft = lessc::preg_quote(self::$commentMultiLeft);

+				$commentMultiRight = lessc::preg_quote(self::$commentMultiRight);

+

+				self::$commentMulti = $commentMultiLeft.'.*?'.$commentMultiRight;

+				self::$whitePattern = '/'.$commentSingle.'[^\n]*\s*|('.self::$commentMulti.')\s*|\s+/Ais';

@@ -2704 +2457 @@
-	 * @param       string  $buffer         String to parse

+	 * @param 	string	$buffer		String to parse

@@ -2708,2 +2461 @@
-	public function parse($buffer)

-	{

+	public function parse($buffer) {

@@ -2722,101 +2474,68 @@
-		//  $this->buffer = ltrim($this->buffer);

-		// }

-		$this->whitespace();

-

-		// parse the entire file

-		while (false !== $this->parseChunk());

-

-		if ($this->count != strlen($this->buffer)) {

-			$this->throwError('parse error count '.$this->count.' != len buffer '.strlen($this->buffer));

-

-		}

-

-		// TODO report where the block was opened

-		if (!property_exists($this->env, 'parent') || !is_null($this->env->parent)) {

-			throw new exception('parse error: unclosed block');

-		}

-

-		return $this->env;

-	}

-

-	/**

-	 * Parse a single chunk off the head of the buffer and append it to the

-	 * current parse environment.

-	 * Returns false when the buffer is empty, or when there is an error.

-	 *

-	 * This function is called repeatedly until the entire document is

-	 * parsed.

-	 *

-	 * This parser is most similar to a recursive descent parser. Single

-	 * functions represent discrete grammatical rules for the language, and

-	 * they are able to capture the text that represents those rules.

-	 *

-	 * Consider the function Lessc::keyword(). (all parse functions are

-	 * structured the same)

-	 *

-	 * The function takes a single reference argument. When calling the

-	 * function it will attempt to match a keyword on the head of the buffer.

-	 * If it is successful, it will place the keyword in the referenced

-	 * argument, advance the position in the buffer, and return true. If it

-	 * fails then it won't advance the buffer and it will return false.

-	 *

-	 * All of these parse functions are powered by Lessc::match(), which behaves

-	 * the same way, but takes a literal regular expression. Sometimes it is

-	 * more convenient to use match instead of creating a new function.

-	 *

-	 * Because of the format of the functions, to parse an entire string of

-	 * grammatical rules, you can chain them together using &&.

-	 *

-	 * But, if some of the rules in the chain succeed before one fails, then

-	 * the buffer position will be left at an invalid state. In order to

-	 * avoid this, Lessc::seek() is used to remember and set buffer positions.

-	 *

-	 * Before parsing a chain, use $s = $this->seek() to remember the current

-	 * position into $s. Then if a chain fails, use $this->seek($s) to

-	 * go back where we started.

-	 */

-	protected function parseChunk()

-	{

-		if (empty($this->buffer)) {

-			return false;

-		}

-		$s = $this->seek();

-

-		if ($this->whitespace()) {

-			return true;

-		}

-

-		$key = null;

-		$value = null;

-		$mediaQueries = null;

-		$dirName = null;

-		$dirValue = null;

-		$importValue = null;

-		$guards = null;

-		$tag = null;

-		$args = null;

-		$isVararg = null;

-		$argv = null;

-		$suffix = null;

-		$var = null;

-		$tags = null;

-

-		// setting a property

-		if ($this->keyword($key) && $this->assign() &&

-			$this->propertyValue($value, $key) && $this->end()

-		) {

-			$this->append(array('assign', $key, $value), $s);

-			return true;

-		} else {

-			$this->seek($s);

-		}

-

-

-		// look for special css blocks

-		if ($this->literal('@', false)) {

-			$this->count--;

-

-			// media

-			if ($this->literal('@media')) {

-				if ($this->mediaQueryList($mediaQueries)

-					&& $this->literal('{')

+			//  $this->buffer = ltrim($this->buffer);

+			// }

+			$this->whitespace();

+

+			// parse the entire file

+			while (false !== $this->parseChunk());

+

+			if ($this->count != strlen($this->buffer))

+			{

+				$this->throwError('parse error count '.$this->count.' != len buffer '.strlen($this->buffer));

+			}

+

+			// TODO report where the block was opened

+			if (!property_exists($this->env, 'parent') || !is_null($this->env->parent))

+			{

+				throw new exception('parse error: unclosed block');

+			}

+

+			return $this->env;

+		}

+

+		/**

+		 * Parse a single chunk off the head of the buffer and append it to the

+		 * current parse environment.

+		 * Returns false when the buffer is empty, or when there is an error.

+		 *

+		 * This function is called repeatedly until the entire document is

+		 * parsed.

+		 *

+		 * This parser is most similar to a recursive descent parser. Single

+		 * functions represent discrete grammatical rules for the language, and

+		 * they are able to capture the text that represents those rules.

+		 *

+		 * Consider the function lessc::keyword(). (all parse functions are

+		 * structured the same)

+		 *

+		 * The function takes a single reference argument. When calling the

+		 * function it will attempt to match a keyword on the head of the buffer.

+		 * If it is successful, it will place the keyword in the referenced

+		 * argument, advance the position in the buffer, and return true. If it

+		 * fails then it won't advance the buffer and it will return false.

+		 *

+		 * All of these parse functions are powered by lessc::match(), which behaves

+		 * the same way, but takes a literal regular expression. Sometimes it is

+		 * more convenient to use match instead of creating a new function.

+		 *

+		 * Because of the format of the functions, to parse an entire string of

+		 * grammatical rules, you can chain them together using &&.

+		 *

+		 * But, if some of the rules in the chain succeed before one fails, then

+		 * the buffer position will be left at an invalid state. In order to

+		 * avoid this, lessc::seek() is used to remember and set buffer positions.

+		 *

+		 * Before parsing a chain, use $s = $this->seek() to remember the current

+		 * position into $s. Then if a chain fails, use $this->seek($s) to

+		 * go back where we started.

+		 */

+		protected function parseChunk() {

+			if (empty($this->buffer)) return false;

+			$s = $this->seek();

+

+			if ($this->whitespace()) {

+				return true;

+			}

+

+			// setting a property

+			if ($this->keyword($key) && $this->assign() &&

+				$this->propertyValue($value, $key) && $this->end()

@@ -2824,2 +2543 @@
-					$media = $this->pushSpecialBlock("media");

-					$media->queries = is_null($mediaQueries) ? array() : $mediaQueries;

+					$this->append(array('assign', $key, $value), $s);

@@ -2829,8 +2547,45 @@
-					return false;

-				}

-			}

-

-			if ($this->literal("@", false) && $this->keyword($dirName)) {

-				if ($this->isDirective($dirName, $this->blockDirectives)) {

-					if ($this->openString("{", $dirValue, null, array(";")) &&

-						$this->literal("{")

+				}

+

+

+				// look for special css blocks

+				if ($this->literal('@', false)) {

+					$this->count--;

+

+					// media

+					if ($this->literal('@media')) {

+						if (($this->mediaQueryList($mediaQueries) || true)

+							&& $this->literal('{')

+							) {

+								$media = $this->pushSpecialBlock("media");

+								$media->queries = is_null($mediaQueries) ? array() : $mediaQueries;

+								return true;

+							} else {

+								$this->seek($s);

+								return false;

+							}

+					}

+

+					if ($this->literal("@", false) && $this->keyword($dirName)) {

+						if ($this->isDirective($dirName, $this->blockDirectives)) {

+							if (($this->openString("{", $dirValue, null, array(";")) || true) &&

+								$this->literal("{")

+								) {

+									$dir = $this->pushSpecialBlock("directive");

+									$dir->name = $dirName;

+									if (isset($dirValue)) $dir->value = $dirValue;

+									return true;

+								}

+						} elseif ($this->isDirective($dirName, $this->lineDirectives)) {

+							if ($this->propertyValue($dirValue) && $this->end()) {

+								$this->append(array("directive", $dirName, $dirValue));

+								return true;

+							}

+						}

+					}

+

+					$this->seek($s);

+				}

+

+				// setting a variable

+				if ($this->variable($var) && $this->assign() &&

+					$this->propertyValue($value) && $this->end()

@@ -2838,4 +2593,23 @@
-						$dir = $this->pushSpecialBlock("directive");

-						$dir->name = $dirName;

-						if (isset($dirValue)) {

-							$dir->value = $dirValue;

+						$this->append(array('assign', $var, $value), $s);

+						return true;

+					} else {

+						$this->seek($s);

+					}

+

+					if ($this->import($importValue)) {

+						$this->append($importValue, $s);

+						return true;

+					}

+

+					// opening parametric mixin

+					if ($this->tag($tag, true) && $this->argumentDef($args, $isVararg) &&

+						($this->guards($guards) || true) &&

+						$this->literal('{')

+						) {

+							$block = $this->pushBlock($this->fixTags(array($tag)));

+							$block->args = $args;

+							$block->isVararg = $isVararg;

+							if (!empty($guards)) $block->guards = $guards;

+							return true;

+						} else {

+							$this->seek($s);

@@ -2842,0 +2617,233 @@
+

+						// opening a simple block

+						if ($this->tags($tags) && $this->literal('{', false)) {

+							$tags = $this->fixTags($tags);

+							$this->pushBlock($tags);

+							return true;

+						} else {

+							$this->seek($s);

+						}

+

+						// closing a block

+						if ($this->literal('}', false)) {

+							try {

+								$block = $this->pop();

+							} catch (exception $e) {

+								$this->seek($s);

+								$this->throwError($e->getMessage());

+							}

+

+							$hidden = false;

+							if (is_null($block->type)) {

+								$hidden = true;

+								if (!isset($block->args)) {

+									foreach ($block->tags as $tag) {

+										if (!is_string($tag) || $tag[0] != $this->lessc->mPrefix) {

+											$hidden = false;

+											break;

+										}

+									}

+								}

+

+								foreach ($block->tags as $tag) {

+									if (is_string($tag)) {

+										$this->env->children[$tag][] = $block;

+									}

+								}

+							}

+

+							if (!$hidden) {

+								$this->append(array('block', $block), $s);

+							}

+

+							// this is done here so comments aren't bundled into he block that

+							// was just closed

+							$this->whitespace();

+							return true;

+						}

+

+						// mixin

+						if ($this->mixinTags($tags) &&

+							($this->argumentDef($argv, $isVararg) || true) &&

+							($this->keyword($suffix) || true) && $this->end()

+							) {

+								$tags = $this->fixTags($tags);

+								$this->append(array('mixin', $tags, $argv, $suffix), $s);

+								return true;

+							} else {

+								$this->seek($s);

+							}

+

+							// spare ;

+							if ($this->literal(';')) return true;

+

+							return false; // got nothing, throw error

+		}

+

+		protected function isDirective($dirname, $directives) {

+			// TODO: cache pattern in parser

+			$pattern = implode("|",

+				array_map(array("lessc", "preg_quote"), $directives));

+			$pattern = '/^(-[a-z-]+-)?('.$pattern.')$/i';

+

+			return preg_match($pattern, $dirname);

+		}

+

+		protected function fixTags($tags) {

+			// move @ tags out of variable namespace

+			foreach ($tags as &$tag) {

+				if ($tag[0] == $this->lessc->vPrefix)

+					$tag[0] = $this->lessc->mPrefix;

+			}

+			return $tags;

+		}

+

+		// a list of expressions

+		protected function expressionList(&$exps) {

+			$values = array();

+

+			while ($this->expression($exp)) {

+				$values[] = $exp;

+			}

+

+			if (count($values) == 0) return false;

+

+			$exps = lessc::compressList($values, ' ');

+			return true;

+		}

+

+		/**

+		 * Attempt to consume an expression.

+		 * @link http://en.wikipedia.org/wiki/Operator-precedence_parser#Pseudo-code

+		 */

+		protected function expression(&$out) {

+			if ($this->value($lhs)) {

+				$out = $this->expHelper($lhs, 0);

+

+				// look for / shorthand

+				if (!empty($this->env->supressedDivision)) {

+					unset($this->env->supressedDivision);

+					$s = $this->seek();

+					if ($this->literal("/") && $this->value($rhs)) {

+						$out = array("list", "",

+							array($out, array("keyword", "/"), $rhs));

+					} else {

+						$this->seek($s);

+					}

+				}

+

+				return true;

+			}

+			return false;

+		}

+

+		/**

+		 * recursively parse infix equation with $lhs at precedence $minP

+		 */

+		protected function expHelper($lhs, $minP) {

+			$this->inExp = true;

+			$ss = $this->seek();

+

+			while (true) {

+				$whiteBefore = isset($this->buffer[$this->count - 1]) &&

+				ctype_space($this->buffer[$this->count - 1]);

+

+				// If there is whitespace before the operator, then we require

+				// whitespace after the operator for it to be an expression

+				$needWhite = $whiteBefore && !$this->inParens;

+

+				if ($this->match(self::$operatorString.($needWhite ? '\s' : ''), $m) && self::$precedence[$m[1]] >= $minP) {

+					if (!$this->inParens && isset($this->env->currentProperty) && $m[1] == "/" && empty($this->env->supressedDivision)) {

+						foreach (self::$supressDivisionProps as $pattern) {

+							if (preg_match($pattern, $this->env->currentProperty)) {

+								$this->env->supressedDivision = true;

+								break 2;

+							}

+						}

+					}

+

+

+					$whiteAfter = isset($this->buffer[$this->count - 1]) &&

+					ctype_space($this->buffer[$this->count - 1]);

+

+					if (!$this->value($rhs)) break;

+

+					// peek for next operator to see what to do with rhs

+					if ($this->peek(self::$operatorString, $next) && self::$precedence[$next[1]] > self::$precedence[$m[1]]) {

+						$rhs = $this->expHelper($rhs, self::$precedence[$next[1]]);

+					}

+

+					$lhs = array('expression', $m[1], $lhs, $rhs, $whiteBefore, $whiteAfter);

+					$ss = $this->seek();

+

+					continue;

+				}

+

+				break;

+			}

+

+			$this->seek($ss);

+

+			return $lhs;

+		}

+

+		// consume a list of values for a property

+		public function propertyValue(&$value, $keyName = null) {

+			$values = array();

+

+			if ($keyName !== null) $this->env->currentProperty = $keyName;

+

+			$s = null;

+			while ($this->expressionList($v)) {

+				$values[] = $v;

+				$s = $this->seek();

+				if (!$this->literal(',')) break;

+			}

+

+			if ($s) $this->seek($s);

+

+			if ($keyName !== null) unset($this->env->currentProperty);

+

+			if (count($values) == 0) return false;

+

+			$value = lessc::compressList($values, ', ');

+			return true;

+		}

+

+		protected function parenValue(&$out) {

+			$s = $this->seek();

+

+			// speed shortcut

+			if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] != "(") {

+				return false;

+			}

+

+			$inParens = $this->inParens;

+			if ($this->literal("(") &&

+				($this->inParens = true) && $this->expression($exp) &&

+				$this->literal(")")

+				) {

+					$out = $exp;

+					$this->inParens = $inParens;

+					return true;

+				} else {

+					$this->inParens = $inParens;

+					$this->seek($s);

+				}

+

+				return false;

+		}

+

+		// a single value

+		protected function value(&$value) {

+			$s = $this->seek();

+

+			// speed shortcut

+			if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] == "-") {

+				// negation

+				if ($this->literal("-", false) &&

+					(($this->variable($inner) && $inner = array("variable", $inner)) ||

+						$this->unit($inner) ||

+						$this->parenValue($inner))

+					) {

+						$value = array("unary", "-", $inner);

@@ -2844,319 +2851,25 @@
-					}

-				} elseif ($this->isDirective($dirName, $this->lineDirectives)) {

-					if ($this->propertyValue($dirValue) && $this->end()) {

-						$this->append(array("directive", $dirName, $dirValue));

-						return true;

-					}

-				}

-			}

-

-			$this->seek($s);

-		}

-

-		// setting a variable

-		if ($this->variable($var) && $this->assign() &&

-			$this->propertyValue($value) && $this->end()

-		) {

-			$this->append(array('assign', $var, $value), $s);

-			return true;

-		} else {

-			$this->seek($s);

-		}

-

-		if ($this->import($importValue)) {

-			$this->append($importValue, $s);

-			return true;

-		}

-

-		// opening parametric mixin

-		if ($this->tag($tag, true) && $this->argumentDef($args, $isVararg) &&

-			$this->guards($guards) &&

-			$this->literal('{')

-		) {

-			$block = $this->pushBlock($this->fixTags(array($tag)));

-			$block->args = $args;

-			$block->isVararg = $isVararg;

-			if (!empty($guards)) {

-				$block->guards = $guards;

-			}

-			return true;

-		} else {

-			$this->seek($s);

-		}

-

-		// opening a simple block

-		if ($this->tags($tags) && $this->literal('{', false)) {

-			$tags = $this->fixTags($tags);

-			$this->pushBlock($tags);

-			return true;

-		} else {

-			$this->seek($s);

-		}

-

-		// closing a block

-		if ($this->literal('}', false)) {

-			try {

-				$block = $this->pop();

-			} catch (exception $e) {

-				$this->seek($s);

-				$this->throwError($e->getMessage());

-			}

-

-			$hidden = false;

-			if (is_null($block->type)) {

-				$hidden = true;

-				if (!isset($block->args)) {

-					foreach ($block->tags as $tag) {

-						if (!is_string($tag) || $tag[0] != $this->lessc->mPrefix) {

-							$hidden = false;

-							break;

-						}

-					}

-				}

-

-				foreach ($block->tags as $tag) {

-					if (is_string($tag)) {

-						$this->env->children[$tag][] = $block;

-					}

-				}

-			}

-

-			if (!$hidden) {

-				$this->append(array('block', $block), $s);

-			}

-

-			// this is done here so comments aren't bundled into he block that

-			// was just closed

-			$this->whitespace();

-			return true;

-		}

-

-		// mixin

-		if ($this->mixinTags($tags) &&

-			$this->argumentDef($argv, $isVararg) &&

-			$this->keyword($suffix)  && $this->end()

-		) {

-			$tags = $this->fixTags($tags);

-			$this->append(array('mixin', $tags, $argv, $suffix), $s);

-			return true;

-		} else {

-			$this->seek($s);

-		}

-

-		// spare ;

-		if ($this->literal(';')) {

-			return true;

-		}

-

-		return false; // got nothing, throw error

-	}

-

-	protected function isDirective($dirname, $directives)

-	{

-		// TODO: cache pattern in parser

-		$pattern = implode(

-			"|",

-			array_map(array("lessc", "preg_quote"), $directives)

-		);

-		$pattern = '/^(-[a-z-]+-)?('.$pattern.')$/i';

-

-		return preg_match($pattern, $dirname);

-	}

-

-	protected function fixTags($tags)

-	{

-		// move @ tags out of variable namespace

-		foreach ($tags as &$tag) {

-			if ($tag[0] == $this->lessc->vPrefix) {

-				$tag[0] = $this->lessc->mPrefix;

-			}

-		}

-		return $tags;

-	}

-

-	// a list of expressions

-	protected function expressionList(&$exps)

-	{

-		$exp = null;

-

-		$values = array();

-

-		while ($this->expression($exp)) {

-			$values[] = $exp;

-		}

-

-		if (count($values) == 0) {

-			return false;

-		}

-

-		$exps = Lessc::compressList($values, ' ');

-		return true;

-	}

-

-	/**

-	 * Attempt to consume an expression.

-	 * @link http://en.wikipedia.org/wiki/Operator-precedence_parser#Pseudo-code

-	 */

-	protected function expression(&$out)

-	{

-		$lhs = null;

-		$rhs = null;

-

-		if ($this->value($lhs)) {

-			$out = $this->expHelper($lhs, 0);

-

-			// look for / shorthand

-			if (!empty($this->env->supressedDivision)) {

-				unset($this->env->supressedDivision);

-				$s = $this->seek();

-				if ($this->literal("/") && $this->value($rhs)) {

-					$out = array("list", "",

-						array($out, array("keyword", "/"), $rhs));

-				} else {

-					$this->seek($s);

-				}

-			}

-

-			return true;

-		}

-		return false;

-	}

-

-	/**

-	 * recursively parse infix equation with $lhs at precedence $minP

-	 */

-	protected function expHelper($lhs, $minP)

-	{

-		$next = null;

-		$rhs = null;

-

-		$this->inExp = true;

-		$ss = $this->seek();

-

-		while (true) {

-			$whiteBefore = isset($this->buffer[$this->count - 1]) &&

-				ctype_space($this->buffer[$this->count - 1]);

-

-			// If there is whitespace before the operator, then we require

-			// whitespace after the operator for it to be an expression

-			$needWhite = $whiteBefore && !$this->inParens;

-

-			$m = array();

-			if ($this->match(self::$operatorString.($needWhite ? '\s' : ''), $m) && self::$precedence[$m[1]] >= $minP) {

-				if (!$this->inParens && isset($this->env->currentProperty) && $m[1] == "/" && empty($this->env->supressedDivision)) {

-					foreach (self::$supressDivisionProps as $pattern) {

-						if (preg_match($pattern, $this->env->currentProperty)) {

-							$this->env->supressedDivision = true;

-							break 2;

-						}

-					}

-				}

-

-

-				$whiteAfter = isset($this->buffer[$this->count - 1]) &&

-					ctype_space($this->buffer[$this->count - 1]);

-

-				if (!$this->value($rhs)) {

-					break;

-				}

-

-				// peek for next operator to see what to do with rhs

-				if ($this->peek(self::$operatorString, $next) && self::$precedence[$next[1]] > self::$precedence[$m[1]]) {

-					$rhs = $this->expHelper($rhs, self::$precedence[$next[1]]);

-				}

-

-				$lhs = array('expression', $m[1], $lhs, $rhs, $whiteBefore, $whiteAfter);

-				$ss = $this->seek();

-

-				continue;

-			}

-

-			break;

-		}

-

-		$this->seek($ss);

-

-		return $lhs;

-	}

-

-	// consume a list of values for a property

-	public function propertyValue(&$value, $keyName = null)

-	{

-		$v = null;

-		$values = array();

-

-		if ($keyName !== null) {

-			$this->env->currentProperty = $keyName;

-		}

-

-		$s = null;

-		while ($this->expressionList($v)) {

-			$values[] = $v;

-			$s = $this->seek();

-			if (!$this->literal(',')) {

-				break;

-			}

-		}

-

-		if ($s) {

-			$this->seek($s);

-		}

-

-		if ($keyName !== null) {

-			unset($this->env->currentProperty);

-		}

-

-		if (count($values) == 0) {

-			return false;

-		}

-

-		$value = Lessc::compressList($values, ', ');

-		return true;

-	}

-

-	protected function parenValue(&$out)

-	{

-		$exp = null;

-

-		$s = $this->seek();

-

-		// speed shortcut

-		if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] != "(") {

-			return false;

-		}

-

-		$inParens = $this->inParens;

-		if ($this->literal("(") &&

-			($this->inParens = true) && $this->expression($exp) &&

-			$this->literal(")")

-		) {

-			$out = $exp;

-			$this->inParens = $inParens;

-			return true;

-		} else {

-			$this->inParens = $inParens;

-			$this->seek($s);

-		}

-

-		return false;

-	}

-

-	// a single value

-	protected function value(&$value)

-	{

-		$inner = null;

-		$word = null;

-		$str = null;

-		$var = null;

-

-		$s = $this->seek();

-

-		// speed shortcut

-		if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] == "-") {

-			// negation

-			if ($this->literal("-", false) &&

-				(($this->variable($inner) && $inner = array("variable", $inner)) ||

-				$this->unit($inner) ||

-				$this->parenValue($inner))

-			) {

-				$value = array("unary", "-", $inner);

+					} else {

+						$this->seek($s);

+					}

+			}

+

+			if ($this->parenValue($value)) return true;

+			if ($this->unit($value)) return true;

+			if ($this->color($value)) return true;

+			if ($this->func($value)) return true;

+			if ($this->string($value)) return true;

+

+			if ($this->keyword($word)) {

+				$value = array('keyword', $word);

+				return true;

+			}

+

+			// try a variable

+			if ($this->variable($var)) {

+				$value = array('variable', $var);

+				return true;

+			}

+

+			// unquote string (should this work on any type?

+			if ($this->literal("~") && $this->string($str)) {

+				$value = array("escape", $str);

@@ -3167,3 +2880,64 @@
-		}

-

-		if ($this->parenValue($value)) {

+

+			// css hack: \0

+			if ($this->literal('\\') && $this->match('([0-9]+)', $m)) {

+				$value = array('keyword', '\\'.$m[1]);

+				return true;

+			} else {

+				$this->seek($s);

+			}

+

+			return false;

+		}

+

+		// an import statement

+		protected function import(&$out) {

+			if (!$this->literal('@import')) return false;

+

+			// @import "something.css" media;

+			// @import url("something.css") media;

+			// @import url(something.css) media;

+

+			if ($this->propertyValue($value)) {

+				$out = array("import", $value);

+				return true;

+			}

+		}

+

+		protected function mediaQueryList(&$out) {

+			if ($this->genericList($list, "mediaQuery", ",", false)) {

+				$out = $list[2];

+				return true;

+			}

+			return false;

+		}

+

+		protected function mediaQuery(&$out) {

+			$s = $this->seek();

+

+			$expressions = null;

+			$parts = array();

+

+			if (($this->literal("only") && ($only = true) || $this->literal("not") && ($not = true) || true) && $this->keyword($mediaType)) {

+				$prop = array("mediaType");

+				if (isset($only)) $prop[] = "only";

+				if (isset($not)) $prop[] = "not";

+				$prop[] = $mediaType;

+				$parts[] = $prop;

+			} else {

+				$this->seek($s);

+			}

+

+

+			if (!empty($mediaType) && !$this->literal("and")) {

+				// ~

+			} else {

+				$this->genericList($expressions, "mediaExpression", "and", false);

+				if (is_array($expressions)) $parts = array_merge($parts, $expressions[2]);

+			}

+

+			if (count($parts) == 0) {

+				$this->seek($s);

+				return false;

+			}

+

+			$out = $parts;

@@ -3172 +2946,86 @@
-		if ($this->unit($value)) {

+

+		protected function mediaExpression(&$out) {

+			$s = $this->seek();

+			$value = null;

+			if ($this->literal("(") &&

+				$this->keyword($feature) &&

+				($this->literal(":") && $this->expression($value) || true) &&

+				$this->literal(")")

+				) {

+					$out = array("mediaExp", $feature);

+					if ($value) $out[] = $value;

+					return true;

+				} elseif ($this->variable($variable)) {

+					$out = array('variable', $variable);

+					return true;

+				}

+

+				$this->seek($s);

+				return false;

+		}

+

+		// an unbounded string stopped by $end

+		protected function openString($end, &$out, $nestingOpen = null, $rejectStrs = null) {

+			$oldWhite = $this->eatWhiteDefault;

+			$this->eatWhiteDefault = false;

+

+			$stop = array("'", '"', "@{", $end);

+			$stop = array_map(array("lessc", "preg_quote"), $stop);

+			// $stop[] = self::$commentMulti;

+

+			if (!is_null($rejectStrs)) {

+				$stop = array_merge($stop, $rejectStrs);

+			}

+

+			$patt = '(.*?)('.implode("|", $stop).')';

+

+			$nestingLevel = 0;

+

+			$content = array();

+			while ($this->match($patt, $m, false)) {

+				if (!empty($m[1])) {

+					$content[] = $m[1];

+					if ($nestingOpen) {

+						$nestingLevel += substr_count($m[1], $nestingOpen);

+					}

+				}

+

+				$tok = $m[2];

+

+				$this->count -= strlen($tok);

+				if ($tok == $end) {

+					if ($nestingLevel == 0) {

+						break;

+					} else {

+						$nestingLevel--;

+					}

+				}

+

+				if (($tok == "'" || $tok == '"') && $this->string($str)) {

+					$content[] = $str;

+					continue;

+				}

+

+				if ($tok == "@{" && $this->interpolation($inter)) {

+					$content[] = $inter;

+					continue;

+				}

+

+				if (!empty($rejectStrs) && in_array($tok, $rejectStrs)) {

+					break;

+				}

+

+				$content[] = $tok;

+				$this->count += strlen($tok);

+			}

+

+			$this->eatWhiteDefault = $oldWhite;

+

+			if (count($content) == 0) return false;

+

+			// trim the end

+			if (is_string(end($content))) {

+				$content[count($content) - 1] = rtrim(end($content));

+			}

+

+			$out = array("string", "", $content);

@@ -3175 +3034,204 @@
-		if ($this->color($value)) {

+

+		protected function string(&$out) {

+			$s = $this->seek();

+			if ($this->literal('"', false)) {

+				$delim = '"';

+			} elseif ($this->literal("'", false)) {

+				$delim = "'";

+			} else {

+				return false;

+			}

+

+			$content = array();

+

+			// look for either ending delim , escape, or string interpolation

+			$patt = '([^\n]*?)(@\{|\\\\|'.

+				lessc::preg_quote($delim).')';

+

+				$oldWhite = $this->eatWhiteDefault;

+				$this->eatWhiteDefault = false;

+

+				while ($this->match($patt, $m, false)) {

+					$content[] = $m[1];

+					if ($m[2] == "@{") {

+						$this->count -= strlen($m[2]);

+						if ($this->interpolation($inter)) {

+							$content[] = $inter;

+						} else {

+							$this->count += strlen($m[2]);

+							$content[] = "@{"; // ignore it

+						}

+					} elseif ($m[2] == '\\') {

+						$content[] = $m[2];

+						if ($this->literal($delim, false)) {

+							$content[] = $delim;

+						}

+					} else {

+						$this->count -= strlen($delim);

+						break; // delim

+					}

+				}

+

+				$this->eatWhiteDefault = $oldWhite;

+

+				if ($this->literal($delim)) {

+					$out = array("string", $delim, $content);

+					return true;

+				}

+

+				$this->seek($s);

+				return false;

+		}

+

+		protected function interpolation(&$out) {

+			$oldWhite = $this->eatWhiteDefault;

+			$this->eatWhiteDefault = true;

+

+			$s = $this->seek();

+			if ($this->literal("@{") &&

+				$this->openString("}", $interp, null, array("'", '"', ";")) &&

+				$this->literal("}", false)

+				) {

+					$out = array("interpolate", $interp);

+					$this->eatWhiteDefault = $oldWhite;

+					if ($this->eatWhiteDefault) $this->whitespace();

+					return true;

+				}

+

+				$this->eatWhiteDefault = $oldWhite;

+				$this->seek($s);

+				return false;

+		}

+

+		protected function unit(&$unit) {

+			// speed shortcut

+			if (isset($this->buffer[$this->count])) {

+				$char = $this->buffer[$this->count];

+				if (!ctype_digit($char) && $char != ".") return false;

+			}

+

+			if ($this->match('([0-9]+(?:\.[0-9]*)?|\.[0-9]+)([%a-zA-Z]+)?', $m)) {

+				$unit = array("number", $m[1], empty($m[2]) ? "" : $m[2]);

+				return true;

+			}

+			return false;

+		}

+

+		// a # color

+		protected function color(&$out) {

+			if ($this->match('(#(?:[0-9a-f]{8}|[0-9a-f]{6}|[0-9a-f]{3}))', $m)) {

+				if (strlen($m[1]) > 7) {

+					$out = array("string", "", array($m[1]));

+				} else {

+					$out = array("raw_color", $m[1]);

+				}

+				return true;

+			}

+

+			return false;

+		}

+

+		// consume an argument definition list surrounded by ()

+		// each argument is a variable name with optional value

+		// or at the end a ... or a variable named followed by ...

+		// arguments are separated by , unless a ; is in the list, then ; is the

+		// delimiter.

+		protected function argumentDef(&$args, &$isVararg) {

+			$s = $this->seek();

+			if (!$this->literal('(')) {

+				return false;

+			}

+

+			$values = array();

+			$delim = ",";

+			$method = "expressionList";

+

+			$isVararg = false;

+			while (true) {

+				if ($this->literal("...")) {

+					$isVararg = true;

+					break;

+				}

+

+				if ($this->$method($value)) {

+					if ($value[0] == "variable") {

+						$arg = array("arg", $value[1]);

+						$ss = $this->seek();

+

+						if ($this->assign() && $this->$method($rhs)) {

+							$arg[] = $rhs;

+						} else {

+							$this->seek($ss);

+							if ($this->literal("...")) {

+								$arg[0] = "rest";

+								$isVararg = true;

+							}

+						}

+

+						$values[] = $arg;

+						if ($isVararg) {

+							break;

+						}

+						continue;

+					} else {

+						$values[] = array("lit", $value);

+					}

+				}

+

+

+				if (!$this->literal($delim)) {

+					if ($delim == "," && $this->literal(";")) {

+						// found new delim, convert existing args

+						$delim = ";";

+						$method = "propertyValue";

+

+						// transform arg list

+						if (isset($values[1])) { // 2 items

+							$newList = array();

+							foreach ($values as $i => $arg) {

+								switch ($arg[0]) {

+									case "arg":

+										if ($i) {

+											$this->throwError("Cannot mix ; and , as delimiter types");

+										}

+										$newList[] = $arg[2];

+										break;

+									case "lit":

+										$newList[] = $arg[1];

+										break;

+									case "rest":

+										$this->throwError("Unexpected rest before semicolon");

+								}

+							}

+

+							$newList = array("list", ", ", $newList);

+

+							switch ($values[0][0]) {

+								case "arg":

+									$newArg = array("arg", $values[0][1], $newList);

+									break;

+								case "lit":

+									$newArg = array("lit", $newList);

+									break;

+							}

+

+						} elseif ($values) { // 1 item

+							$newArg = $values[0];

+						}

+

+						if ($newArg) {

+							$values = array($newArg);

+						}

+					} else {

+						break;

+					}

+				}

+			}

+

+			if (!$this->literal(')')) {

+				$this->seek($s);

+				return false;

+			}

+

+			$args = $values;

+

@@ -3178 +3240,11 @@
-		if ($this->func($value)) {

+

+		// consume a list of tags

+		// this accepts a hanging delimiter

+		protected function tags(&$tags, $simple = false, $delim = ',') {

+			$tags = array();

+			while ($this->tag($tt, $simple)) {

+				$tags[] = $tt;

+				if (!$this->literal($delim)) break;

+			}

+			if (count($tags) == 0) return false;

+

@@ -3181 +3253,14 @@
-		if ($this->string($value)) {

+

+		// list of tags of specifying mixin path

+		// optionally separated by > (lazy, accepts extra >)

+		protected function mixinTags(&$tags) {

+			$tags = array();

+			while ($this->tag($tt, true)) {

+				$tags[] = $tt;

+				$this->literal(">");

+			}

+

+			if (!$tags) {

+				return false;

+			}

+

@@ -3185,95 +3270,66 @@
-		if ($this->keyword($word)) {

-			$value = array('keyword', $word);

-			return true;

-		}

-

-		// try a variable

-		if ($this->variable($var)) {

-			$value = array('variable', $var);

-			return true;

-		}

-

-		// unquote string (should this work on any type?

-		if ($this->literal("~") && $this->string($str)) {

-			$value = array("escape", $str);

-			return true;

-		} else {

-			$this->seek($s);

-		}

-

-		// css hack: \0

-		$m = array();

-		if ($this->literal('\\') && $this->match('([0-9]+)', $m)) {

-			$value = array('keyword', '\\'.$m[1]);

-			return true;

-		} else {

-			$this->seek($s);

-		}

-

-		return false;

-	}

-

-	// an import statement

-	protected function import(&$out, $value = '')

-	{

-		if (!$this->literal('@import')) {

-			return false;

-		}

-

-		// @import "something.css" media;

-		// @import url("something.css") media;

-		// @import url(something.css) media;

-

-		if ($this->propertyValue($value)) {

-			$out = array("import", $value);

-			return true;

-		}

-

-		return false;

-	}

-

-	protected function mediaQueryList(&$out)

-	{

-		$list = null;

-

-		if ($this->genericList($list, "mediaQuery", ",", false)) {

-			$out = $list[2];

-			return true;

-		}

-		return false;

-	}

-

-	protected function mediaQuery(&$out)

-	{

-		$mediaType = null;

-

-		$s = $this->seek();

-

-		$expressions = null;

-		$parts = array();

-

-		if ((($this->literal("only") && ($only = true)) || ($this->literal("not") && ($not = true))) && $this->keyword($mediaType)) {

-			$prop = array("mediaType");

-			if (isset($only)) {

-				$prop[] = "only";

-			}

-			if (isset($not)) {

-				$prop[] = "not";

-			}

-			$prop[] = $mediaType;

-			$parts[] = $prop;

-		} else {

-			$this->seek($s);

-		}

-

-

-		if (!empty($mediaType) && !$this->literal("and")) {

-			// ~

-		} else {

-			$this->genericList($expressions, "mediaExpression", "and", false);

-			if (is_array($expressions)) {

-				$parts = array_merge($parts, $expressions[2]);

-			}

-		}

-

-		if (count($parts) == 0) {

+		// a bracketed value (contained within in a tag definition)

+		protected function tagBracket(&$parts, &$hasExpression) {

+			// speed shortcut

+			if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] != "[") {

+				return false;

+			}

+

+			$s = $this->seek();

+

+			$hasInterpolation = false;

+

+			if ($this->literal("[", false)) {

+				$attrParts = array("[");

+				// keyword, string, operator

+				while (true) {

+					if ($this->literal("]", false)) {

+						$this->count--;

+						break; // get out early

+					}

+

+					if ($this->match('\s+', $m)) {

+						$attrParts[] = " ";

+						continue;

+					}

+					if ($this->string($str)) {

+						// escape parent selector, (yuck)

+						foreach ($str[2] as &$chunk) {

+							$chunk = str_replace($this->lessc->parentSelector, "$&$", $chunk);

+						}

+

+						$attrParts[] = $str;

+						$hasInterpolation = true;

+						continue;

+					}

+

+					if ($this->keyword($word)) {

+						$attrParts[] = $word;

+						continue;

+					}

+

+					if ($this->interpolation($inter)) {

+						$attrParts[] = $inter;

+						$hasInterpolation = true;

+						continue;

+					}

+

+					// operator, handles attr namespace too

+					if ($this->match('[|-~\$\*\^=]+', $m)) {

+						$attrParts[] = $m[0];

+						continue;

+					}

+

+					break;

+				}

+

+				if ($this->literal("]", false)) {

+					$attrParts[] = "]";

+					foreach ($attrParts as $part) {

+						$parts[] = $part;

+					}

+					$hasExpression = $hasExpression || $hasInterpolation;

+					return true;

+				}

+				$this->seek($s);

+			}

+

@@ -3284,20 +3340,61 @@
-		$out = $parts;

-		return true;

-	}

-

-	protected function mediaExpression(&$out)

-	{

-		$feature = null;

-		$variable = null;

-

-		$s = $this->seek();

-		$value = null;

-		if ($this->literal("(") &&

-			$this->keyword($feature) &&

-			($this->literal(":") && $this->expression($value)) &&

-			$this->literal(")")

-		) {

-			$out = array("mediaExp", $feature);

-			if ($value) {

-				$out[] = $value;

-			}

+		// a space separated list of selectors

+		protected function tag(&$tag, $simple = false) {

+			if ($simple) {

+				$chars = '^@,:;{}\][>\(\) "\'';

+			} else {

+				$chars = '^@,;{}["\'';

+			}

+			$s = $this->seek();

+

+			$hasExpression = false;

+			$parts = array();

+			while ($this->tagBracket($parts, $hasExpression));

+

+			$oldWhite = $this->eatWhiteDefault;

+			$this->eatWhiteDefault = false;

+

+			while (true) {

+				if ($this->match('(['.$chars.'0-9]['.$chars.']*)', $m)) {

+					$parts[] = $m[1];

+					if ($simple) break;

+

+					while ($this->tagBracket($parts, $hasExpression));

+					continue;

+				}

+

+				if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] == "@") {

+					if ($this->interpolation($interp)) {

+						$hasExpression = true;

+						$interp[2] = true; // don't unescape

+						$parts[] = $interp;

+						continue;

+					}

+

+					if ($this->literal("@")) {

+						$parts[] = "@";

+						continue;

+					}

+				}

+

+				if ($this->unit($unit)) { // for keyframes

+					$parts[] = $unit[1];

+					$parts[] = $unit[2];

+					continue;

+				}

+

+				break;

+			}

+

+			$this->eatWhiteDefault = $oldWhite;

+			if (!$parts) {

+				$this->seek($s);

+				return false;

+			}

+

+			if ($hasExpression) {

+				$tag = array("exp", array("string", "", $parts));

+			} else {

+				$tag = trim(implode($parts));

+			}

+

+			$this->whitespace();

@@ -3305,229 +3402,13 @@
-		} elseif ($this->variable($variable)) {

-			$out = array('variable', $variable);

-			return true;

-		}

-

-		$this->seek($s);

-		return false;

-	}

-

-	// an unbounded string stopped by $end

-	protected function openString($end, &$out, $nestingOpen = null, $rejectStrs = null)

-	{

-		$str = null;

-		$inter = null;

-

-		$oldWhite = $this->eatWhiteDefault;

-		$this->eatWhiteDefault = false;

-

-		$stop = array("'", '"', "@{", $end);

-		$stop = array_map(array("lessc", "preg_quote"), $stop);

-		// $stop[] = self::$commentMulti;

-

-		if (!is_null($rejectStrs)) {

-			$stop = array_merge($stop, $rejectStrs);

-		}

-

-		$patt = '(.*?)('.implode("|", $stop).')';

-

-		$nestingLevel = 0;

-

-		$content = array();

-		$m = array();

-		while ($this->match($patt, $m, false)) {

-			if (!empty($m[1])) {

-				$content[] = $m[1];

-				if ($nestingOpen) {

-					$nestingLevel += substr_count($m[1], $nestingOpen);

-				}

-			}

-

-			$tok = $m[2];

-

-			$this->count -= strlen($tok);

-			if ($tok == $end) {

-				if ($nestingLevel == 0) {

-					break;

-				} else {

-					$nestingLevel--;

-				}

-			}

-

-			if (($tok == "'" || $tok == '"') && $this->string($str)) {

-				$content[] = $str;

-				continue;

-			}

-

-			if ($tok == "@{" && $this->interpolation($inter)) {

-				$content[] = $inter;

-				continue;

-			}

-

-			if (!empty($rejectStrs) && in_array($tok, $rejectStrs)) {

-				break;

-			}

-

-			$content[] = $tok;

-			$this->count += strlen($tok);

-		}

-

-		$this->eatWhiteDefault = $oldWhite;

-

-		if (count($content) == 0) {

-			return false;

-		}

-

-		// trim the end

-		if (is_string(end($content))) {

-			$content[count($content) - 1] = rtrim(end($content));

-		}

-

-		$out = array("string", "", $content);

-		return true;

-	}

-

-	protected function string(&$out)

-	{

-		$inter = null;

-

-		$s = $this->seek();

-		if ($this->literal('"', false)) {

-			$delim = '"';

-		} elseif ($this->literal("'", false)) {

-			$delim = "'";

-		} else {

-			return false;

-		}

-

-		$content = array();

-

-		// look for either ending delim , escape, or string interpolation

-		$patt = '([^\n]*?)(@\{|\\\\|'.

-			Lessc::preg_quote($delim).')';

-

-		$oldWhite = $this->eatWhiteDefault;

-		$this->eatWhiteDefault = false;

-

-		$m = array();

-		while ($this->match($patt, $m, false)) {

-			$content[] = $m[1];

-			if ($m[2] == "@{") {

-				$this->count -= strlen($m[2]);

-				if ($this->interpolation($inter)) {

-					$content[] = $inter;

-				} else {

-					$this->count += strlen($m[2]);

-					$content[] = "@{"; // ignore it

-				}

-			} elseif ($m[2] == '\\') {

-				$content[] = $m[2];

-				if ($this->literal($delim, false)) {

-					$content[] = $delim;

-				}

-			} else {

-				$this->count -= strlen($delim);

-				break; // delim

-			}

-		}

-

-		$this->eatWhiteDefault = $oldWhite;

-

-		if ($this->literal($delim)) {

-			$out = array("string", $delim, $content);

-			return true;

-		}

-

-		$this->seek($s);

-		return false;

-	}

-

-	protected function interpolation(&$out)

-	{

-		$interp = array();

-

-		$oldWhite = $this->eatWhiteDefault;

-		$this->eatWhiteDefault = true;

-

-		$s = $this->seek();

-		if ($this->literal("@{") &&

-			$this->openString("}", $interp, null, array("'", '"', ";")) &&

-			$this->literal("}", false)

-		) {

-			$out = array("interpolate", $interp);

-			$this->eatWhiteDefault = $oldWhite;

-			if ($this->eatWhiteDefault) {

-				$this->whitespace();

-			}

-			return true;

-		}

-

-		$this->eatWhiteDefault = $oldWhite;

-		$this->seek($s);

-		return false;

-	}

-

-	protected function unit(&$unit)

-	{

-		$m = array();

-

-		// speed shortcut

-		if (isset($this->buffer[$this->count])) {

-			$char = $this->buffer[$this->count];

-			if (!ctype_digit($char) && $char != ".") {

-				return false;

-			}

-		}

-

-		if ($this->match('([0-9]+(?:\.[0-9]*)?|\.[0-9]+)([%a-zA-Z]+)?', $m)) {

-			$unit = array("number", $m[1], empty($m[2]) ? "" : $m[2]);

-			return true;

-		}

-		return false;

-	}

-

-	// a # color

-	protected function color(&$out)

-	{

-		$m = array();

-

-		if ($this->match('(#(?:[0-9a-f]{8}|[0-9a-f]{6}|[0-9a-f]{3}))', $m)) {

-			if (strlen($m[1]) > 7) {

-				$out = array("string", "", array($m[1]));

-			} else {

-				$out = array("raw_color", $m[1]);

-			}

-			return true;

-		}

-

-		return false;

-	}

-

-	// consume an argument definition list surrounded by ()

-	// each argument is a variable name with optional value

-	// or at the end a ... or a variable named followed by ...

-	// arguments are separated by , unless a ; is in the list, then ; is the

-	// delimiter.

-	protected function argumentDef(&$args, &$isVararg)

-	{

-		$value = array();

-		$rhs = null;

-

-		$s = $this->seek();

-		if (!$this->literal('(')) {

-			return false;

-		}

-

-		$values = array();

-		$delim = ",";

-		$method = "expressionList";

-

-		$isVararg = false;

-		while (true) {

-			if ($this->literal("...")) {

-				$isVararg = true;

-				break;

-			}

-

-			if ($this->$method($value)) {

-				if ($value[0] == "variable") {

-					$arg = array("arg", $value[1]);

+		}

+

+		// a css function

+		protected function func(&$func) {

+			$s = $this->seek();

+

+			if ($this->match('(%|[\w\-_][\w\-_:\.]+|[\w_])', $m) && $this->literal('(')) {

+				$fname = $m[1];

+

+				$sPreArgs = $this->seek();

+

+				$args = array();

+				while (true) {

@@ -3535,3 +3416,3 @@
-

-					if ($this->assign() && $this->$method($rhs)) {

-						$arg[] = $rhs;

+					// this ugly nonsense is for ie filter properties

+					if ($this->keyword($name) && $this->literal('=') && $this->expressionList($value)) {

+						$args[] = array("string", "", array($name, "=", $value));

@@ -3540,3 +3421,2 @@
-						if ($this->literal("...")) {

-							$arg[0] = "rest";

-							$isVararg = true;

+						if ($this->expressionList($value)) {

+							$args[] = $value;

@@ -3546,61 +3426,17 @@
-					$values[] = $arg;

-					if ($isVararg) {

-						break;

-					}

-					continue;

-				} else {

-					$values[] = array("lit", $value);

-				}

-			}

-

-

-			if (!$this->literal($delim)) {

-				if ($delim == "," && $this->literal(";")) {

-					// found new delim, convert existing args

-					$delim = ";";

-					$method = "propertyValue";

-

-					// transform arg list

-					if (isset($values[1])) { // 2 items

-						$newList = array();

-						foreach ($values as $i => $arg) {

-							switch ($arg[0]) {

-								case "arg":

-									if ($i) {

-										$this->throwError("Cannot mix ; and , as delimiter types");

-									}

-									$newList[] = $arg[2];

-									break;

-								case "lit":

-									$newList[] = $arg[1];

-									break;

-								case "rest":

-									$this->throwError("Unexpected rest before semicolon");

-							}

-						}

-

-						$newList = array("list", ", ", $newList);

-

-						switch ($values[0][0]) {

-							case "arg":

-								$newArg = array("arg", $values[0][1], $newList);

-								break;

-							case "lit":

-								$newArg = array("lit", $newList);

-								break;

-						}

-

-					} elseif ($values) { // 1 item

-						$newArg = $values[0];

-					}

-

-					if ($newArg) {

-						$values = array($newArg);

-					}

-				} else {

-					break;

-				}

-			}

-		}

-

-		if (!$this->literal(')')) {

+					if (!$this->literal(',')) break;

+				}

+				$args = array('list', ',', $args);

+

+				if ($this->literal(')')) {

+					$func = array('function', $fname, $args);

+					return true;

+				} elseif ($fname == 'url') {

+					// couldn't parse and in url? treat as string

+					$this->seek($sPreArgs);

+					if ($this->openString(")", $string) && $this->literal(")")) {

+						$func = array('function', $fname, $string);

+						return true;

+					}

+				}

+			}

+

@@ -3611,19 +3447,34 @@
-		$args = $values;

-

-		return true;

-	}

-

-	// consume a list of tags

-	// this accepts a hanging delimiter

-	protected function tags(&$tags, $simple = false, $delim = ',')

-	{

-		$tt = array();

-

-		$tags = array();

-		while ($this->tag($tt, $simple)) {

-			$tags[] = $tt;

-			if (!$this->literal($delim)) {

-				break;

-			}

-		}

-		if (count($tags) == 0) {

+		// consume a less variable

+		protected function variable(&$name) {

+			$s = $this->seek();

+			if ($this->literal($this->lessc->vPrefix, false) &&

+				($this->variable($sub) || $this->keyword($name))

+				) {

+					if (!empty($sub)) {

+						$name = array('variable', $sub);

+					} else {

+						$name = $this->lessc->vPrefix.$name;

+					}

+					return true;

+				}

+

+				$name = null;

+				$this->seek($s);

+				return false;

+		}

+

+		/**

+		 * Consume an assignment operator

+		 * Can optionally take a name that will be set to the current property name

+		 */

+		protected function assign($name = null) {

+			if ($name) $this->currentProperty = $name;

+			return $this->literal(':') || $this->literal('=');

+		}

+

+		// consume a keyword

+		protected function keyword(&$word) {

+			if ($this->match('([\w_\-\*!"][\w\-_"]*)', $m)) {

+				$word = $m[1];

+				return true;

+			}

@@ -3633,16 +3484,8 @@
-		return true;

-	}

-

-	// list of tags of specifying mixin path

-	// optionally separated by > (lazy, accepts extra >)

-	protected function mixinTags(&$tags)

-	{

-		$tt = array();

-

-		$tags = array();

-		while ($this->tag($tt, true)) {

-			$tags[] = $tt;

-			$this->literal(">");

-		}

-

-		if (!$tags) {

+		// consume an end of statement delimiter

+		protected function end() {

+			if ($this->literal(';', false)) {

+				return true;

+			} elseif ($this->count == strlen($this->buffer) || $this->buffer[$this->count] == '}') {

+				// if there is end of file or a closing block next then we don't need a ;

+				return true;

+			}

@@ -3652,70 +3495,50 @@
-		return true;

-	}

-

-	// a bracketed value (contained within in a tag definition)

-	protected function tagBracket(&$parts, &$hasExpression)

-	{

-		$str = null;

-		$inter = null;

-		$word = null;

-

-		// speed shortcut

-		if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] != "[") {

-			return false;

-		}

-

-		$s = $this->seek();

-

-		$hasInterpolation = false;

-

-		if ($this->literal("[", false)) {

-			$attrParts = array("[");

-			// keyword, string, operator

-			while (true) {

-				if ($this->literal("]", false)) {

-					$this->count--;

-					break; // get out early

-				}

-

-				$m = array();

-				if ($this->match('\s+', $m)) {

-					$attrParts[] = " ";

-					continue;

-				}

-				if ($this->string($str)) {

-					// escape parent selector, (yuck)

-					foreach ($str[2] as &$chunk) {

-						$chunk = str_replace($this->lessc->parentSelector, "$&$", $chunk);

-					}

-

-					$attrParts[] = $str;

-					$hasInterpolation = true;

-					continue;

-				}

-

-				if ($this->keyword($word)) {

-					$attrParts[] = $word;

-					continue;

-				}

-

-				if ($this->interpolation($inter)) {

-					$attrParts[] = $inter;

-					$hasInterpolation = true;

-					continue;

-				}

-

-				// operator, handles attr namespace too

-				if ($this->match('[|-~\$\*\^=]+', $m)) {

-					$attrParts[] = $m[0];

-					continue;

-				}

-

-				break;

-			}

-

-			if ($this->literal("]", false)) {

-				$attrParts[] = "]";

-				foreach ($attrParts as $part) {

-					$parts[] = $part;

-				}

-				$hasExpression = $hasExpression || $hasInterpolation;

+		protected function guards(&$guards) {

+			$s = $this->seek();

+

+			if (!$this->literal("when")) {

+				$this->seek($s);

+				return false;

+			}

+

+			$guards = array();

+

+			while ($this->guardGroup($g)) {

+				$guards[] = $g;

+				if (!$this->literal(",")) break;

+			}

+

+			if (count($guards) == 0) {

+				$guards = null;

+				$this->seek($s);

+				return false;

+			}

+

+			return true;

+		}

+

+		// a bunch of guards that are and'd together

+		// TODO rename to guardGroup

+		protected function guardGroup(&$guardGroup) {

+			$s = $this->seek();

+			$guardGroup = array();

+			while ($this->guard($guard)) {

+				$guardGroup[] = $guard;

+				if (!$this->literal("and")) break;

+			}

+

+			if (count($guardGroup) == 0) {

+				$guardGroup = null;

+				$this->seek($s);

+				return false;

+			}

+

+			return true;

+		}

+

+		protected function guard(&$guard) {

+			$s = $this->seek();

+			$negate = $this->literal("not");

+

+			if ($this->literal("(") && $this->expression($exp) && $this->literal(")")) {

+				$guard = $exp;

+				if ($negate) $guard = array("negate", $guard);

@@ -3724,64 +3547 @@
-			$this->seek($s);

-		}

-

-		$this->seek($s);

-		return false;

-	}

-

-	// a space separated list of selectors

-	protected function tag(&$tag, $simple = false)

-	{

-		$interp = null;

-		$unit = null;

-

-		if ($simple) {

-			$chars = '^@,:;{}\][>\(\) "\'';

-		} else {

-			$chars = '^@,;{}["\'';

-		}

-		$s = $this->seek();

-

-		$hasExpression = false;

-		$parts = array();

-		while ($this->tagBracket($parts, $hasExpression));

-

-		$oldWhite = $this->eatWhiteDefault;

-		$this->eatWhiteDefault = false;

-

-		while (true) {

-			$m = array();

-			if ($this->match('(['.$chars.'0-9]['.$chars.']*)', $m)) {

-				$parts[] = $m[1];

-				if ($simple) {

-					break;

-				}

-

-				while ($this->tagBracket($parts, $hasExpression));

-				continue;

-			}

-

-			if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] == "@") {

-				if ($this->interpolation($interp)) {

-					$hasExpression = true;

-					$interp[2] = true; // don't unescape

-					$parts[] = $interp;

-					continue;

-				}

-

-				if ($this->literal("@")) {

-					$parts[] = "@";

-					continue;

-				}

-			}

-

-			if ($this->unit($unit)) { // for keyframes

-				$parts[] = $unit[1];

-				$parts[] = $unit[2];

-				continue;

-			}

-

-			break;

-		}

-

-		$this->eatWhiteDefault = $oldWhite;

-		if (!$parts) {

+

@@ -3792,26 +3552,179 @@
-		if ($hasExpression) {

-			$tag = array("exp", array("string", "", $parts));

-		} else {

-			$tag = trim(implode($parts));

-		}

-

-		$this->whitespace();

-		return true;

-	}

-

-	// a css function

-	protected function func(&$func)

-	{

-		$s = $this->seek();

-

-		$m = array();

-		$value = array();

-		$string = array();

-		$name = null;

-

-		if ($this->match('(%|[\w\-_][\w\-_:\.]+|[\w_])', $m) && $this->literal('(')) {

-			$fname = $m[1];

-

-			$sPreArgs = $this->seek();

-

-			$args = array();

+		/* raw parsing functions */

+

+		protected function literal($what, $eatWhitespace = null) {

+			if ($eatWhitespace === null) $eatWhitespace = $this->eatWhiteDefault;

+

+			// shortcut on single letter

+			if (!isset($what[1]) && isset($this->buffer[$this->count])) {

+				if ($this->buffer[$this->count] == $what) {

+					if (!$eatWhitespace) {

+						$this->count++;

+						return true;

+					}

+					// goes below...

+				} else {

+					return false;

+				}

+			}

+

+			if (!isset(self::$literalCache[$what])) {

+				self::$literalCache[$what] = lessc::preg_quote($what);

+			}

+

+			return $this->match(self::$literalCache[$what], $m, $eatWhitespace);

+		}

+

+		protected function genericList(&$out, $parseItem, $delim = "", $flatten = true) {

+			$s = $this->seek();

+			$items = array();

+			while ($this->$parseItem($value)) {

+				$items[] = $value;

+				if ($delim) {

+					if (!$this->literal($delim)) break;

+				}

+			}

+

+			if (count($items) == 0) {

+				$this->seek($s);

+				return false;

+			}

+

+			if ($flatten && count($items) == 1) {

+				$out = $items[0];

+			} else {

+				$out = array("list", $delim, $items);

+			}

+

+			return true;

+		}

+

+

+		// advance counter to next occurrence of $what

+		// $until - don't include $what in advance

+		// $allowNewline, if string, will be used as valid char set

+		protected function to($what, &$out, $until = false, $allowNewline = false) {

+			if (is_string($allowNewline)) {

+				$validChars = $allowNewline;

+			} else {

+				$validChars = $allowNewline ? "." : "[^\n]";

+			}

+			if (!$this->match('('.$validChars.'*?)'.lessc::preg_quote($what), $m, !$until)) return false;

+			if ($until) $this->count -= strlen($what); // give back $what

+			$out = $m[1];

+			return true;

+		}

+

+		// try to match something on head of buffer

+		protected function match($regex, &$out, $eatWhitespace = null) {

+			if ($eatWhitespace === null) $eatWhitespace = $this->eatWhiteDefault;

+

+			$r = '/'.$regex.($eatWhitespace && !$this->writeComments ? '\s*' : '').'/Ais';

+			if (preg_match($r, $this->buffer, $out, null, $this->count)) {

+				$this->count += strlen($out[0]);

+				if ($eatWhitespace && $this->writeComments) $this->whitespace();

+				return true;

+			}

+			return false;

+		}

+

+		// match some whitespace

+		protected function whitespace() {

+			if ($this->writeComments) {

+				$gotWhite = false;

+				while (preg_match(self::$whitePattern, $this->buffer, $m, null, $this->count)) {

+					if (isset($m[1]) && empty($this->seenComments[$this->count])) {

+						$this->append(array("comment", $m[1]));

+						$this->seenComments[$this->count] = true;

+					}

+					$this->count += strlen($m[0]);

+					$gotWhite = true;

+				}

+				return $gotWhite;

+			} else {

+				$this->match("", $m);

+				return strlen($m[0]) > 0;

+			}

+		}

+

+		// match something without consuming it

+		protected function peek($regex, &$out = null, $from = null) {

+			if (is_null($from)) $from = $this->count;

+			$r = '/'.$regex.'/Ais';

+			$result = preg_match($r, $this->buffer, $out, null, $from);

+

+			return $result;

+		}

+

+		// seek to a spot in the buffer or return where we are on no argument

+		protected function seek($where = null) {

+			if ($where === null) return $this->count;

+			else $this->count = $where;

+			return true;

+		}

+

+		/* misc functions */

+

+		public function throwError($msg = "parse error", $count = null) {

+			$count = is_null($count) ? $this->count : $count;

+

+			$line = $this->line +

+			substr_count(substr($this->buffer, 0, $count), "\n");

+

+			if (!empty($this->sourceName)) {

+				$loc = "$this->sourceName on line $line";

+			} else {

+				$loc = "line: $line";

+			}

+

+			// TODO this depends on $this->count

+			if ($this->peek("(.*?)(\n|$)", $m, $count)) {

+				throw new exception("$msg: failed at `$m[1]` $loc");

+			} else {

+				throw new exception("$msg: $loc");

+			}

+		}

+

+		protected function pushBlock($selectors = null, $type = null) {

+			$b = new stdclass;

+			$b->parent = $this->env;

+

+			$b->type = $type;

+			$b->id = self::$nextBlockId++;

+

+			$b->isVararg = false; // TODO: kill me from here

+			$b->tags = $selectors;

+

+			$b->props = array();

+			$b->children = array();

+

+			$this->env = $b;

+			return $b;

+		}

+

+		// push a block that doesn't multiply tags

+		protected function pushSpecialBlock($type) {

+			return $this->pushBlock(null, $type);

+		}

+

+		// append a property to the current block

+		protected function append($prop, $pos = null) {

+			if ($pos !== null) $prop[-1] = $pos;

+			$this->env->props[] = $prop;

+		}

+

+		// pop something off the stack

+		protected function pop() {

+			$old = $this->env;

+			$this->env = $this->env->parent;

+			return $old;

+		}

+

+		// remove comments from $text

+		// todo: make it work for all functions, not just url

+		protected function removeComments($text) {

+			$look = array(

+				'url(', '//', '/*', '"', "'"

+			);

+

+			$out = '';

+			$min = null;

@@ -3819,442 +3732,47 @@
-				$ss = $this->seek();

-				// this ugly nonsense is for ie filter properties

-				if ($this->keyword($name) && $this->literal('=') && $this->expressionList($value)) {

-					$args[] = array("string", "", array($name, "=", $value));

-				} else {

-					$this->seek($ss);

-					if ($this->expressionList($value)) {

-						$args[] = $value;

-					}

-				}

-

-				if (!$this->literal(',')) {

-					break;

-				}

-			}

-			$args = array('list', ',', $args);

-

-			if ($this->literal(')')) {

-				$func = array('function', $fname, $args);

-				return true;

-			} elseif ($fname == 'url') {

-				// couldn't parse and in url? treat as string

-				$this->seek($sPreArgs);

-				if ($this->openString(")", $string) && $this->literal(")")) {

-					$func = array('function', $fname, $string);

-					return true;

-				}

-			}

-		}

-

-		$this->seek($s);

-		return false;

-	}

-

-	// consume a less variable

-	protected function variable(&$name)

-	{

-		$sub = null;

-		$name = null;

-

-		$s = $this->seek();

-		if ($this->literal($this->lessc->vPrefix, false) &&

-			($this->variable($sub) || $this->keyword($name))

-		) {

-			if (!empty($sub)) {

-				$name = array('variable', $sub);

-			} else {

-				$name = $this->lessc->vPrefix.$name;

-			}

-			return true;

-		}

-

-		$name = null;

-		$this->seek($s);

-		return false;

-	}

-

-	/**

-	 * Consume an assignment operator

-	 * Can optionally take a name that will be set to the current property name

-	 */

-	protected function assign($name = null)

-	{

-		if ($name) {

-			$this->currentProperty = $name;

-		}

-		return $this->literal(':') || $this->literal('=');

-	}

-

-	// consume a keyword

-	protected function keyword(&$word)

-	{

-		$m = array();

-		if ($this->match('([\w_\-\*!"][\w\-_"]*)', $m)) {

-			$word = $m[1];

-			return true;

-		}

-		return false;

-	}

-

-	// consume an end of statement delimiter

-	protected function end()

-	{

-		if ($this->literal(';', false)) {

-			return true;

-		} elseif ($this->count == strlen($this->buffer) || $this->buffer[$this->count] == '}') {

-			// if there is end of file or a closing block next then we don't need a ;

-			return true;

-		}

-		return false;

-	}

-

-	protected function guards(&$guards)

-	{

-		$g = null;

-

-		$s = $this->seek();

-

-		if (!$this->literal("when")) {

-			$this->seek($s);

-			return false;

-		}

-

-		$guards = array();

-

-		while ($this->guardGroup($g)) {

-			$guards[] = $g;

-			if (!$this->literal(",")) {

-				break;

-			}

-		}

-

-		if (count($guards) == 0) {

-			$guards = null;

-			$this->seek($s);

-			return false;

-		}

-

-		return true;

-	}

-

-	// a bunch of guards that are and'd together

-	// TODO rename to guardGroup

-	protected function guardGroup(&$guardGroup)

-	{

-		$guard = null;

-

-		$s = $this->seek();

-		$guardGroup = array();

-		while ($this->guard($guard)) {

-			$guardGroup[] = $guard;

-			if (!$this->literal("and")) {

-				break;

-			}

-		}

-

-		if (count($guardGroup) == 0) {

-			$guardGroup = null;

-			$this->seek($s);

-			return false;

-		}

-

-		return true;

-	}

-

-	protected function guard(&$guard)

-	{

-		$exp = null;

-

-		$s = $this->seek();

-		$negate = $this->literal("not");

-

-		if ($this->literal("(") && $this->expression($exp) && $this->literal(")")) {

-			$guard = $exp;

-			if ($negate) {

-				$guard = array("negate", $guard);

-			}

-			return true;

-		}

-

-		$this->seek($s);

-		return false;

-	}

-

-	/* raw parsing functions */

-

-	protected function literal($what, $eatWhitespace = null)

-	{

-		if ($eatWhitespace === null) {

-			$eatWhitespace = $this->eatWhiteDefault;

-		}

-

-		// shortcut on single letter

-		if (!isset($what[1]) && isset($this->buffer[$this->count])) {

-			if ($this->buffer[$this->count] == $what) {

-				if (!$eatWhitespace) {

-					$this->count++;

-					return true;

-				}

-			// goes below...

-			} else {

-				return false;

-			}

-		}

-

-		if (!isset(self::$literalCache[$what])) {

-			self::$literalCache[$what] = Lessc::preg_quote($what);

-		}

-

-		$m = array();

-		return $this->match(self::$literalCache[$what], $m, $eatWhitespace);

-	}

-

-	protected function genericList(&$out, $parseItem, $delim = "", $flatten = true)

-	{

-		$value = null;

-

-		$s = $this->seek();

-		$items = array();

-		while ($this->$parseItem($value)) {

-			$items[] = $value;

-			if ($delim) {

-				if (!$this->literal($delim)) {

-					break;

-				}

-			}

-		}

-

-		if (count($items) == 0) {

-			$this->seek($s);

-			return false;

-		}

-

-		if ($flatten && count($items) == 1) {

-			$out = $items[0];

-		} else {

-			$out = array("list", $delim, $items);

-		}

-

-		return true;

-	}

-

-

-	// advance counter to next occurrence of $what

-	// $until - don't include $what in advance

-	// $allowNewline, if string, will be used as valid char set

-	protected function to($what, &$out, $until = false, $allowNewline = false)

-	{

-		if (is_string($allowNewline)) {

-			$validChars = $allowNewline;

-		} else {

-			$validChars = $allowNewline ? "." : "[^\n]";

-		}

-		$m = array();

-		if (!$this->match('('.$validChars.'*?)'.Lessc::preg_quote($what), $m, !$until)) {

-			return false;

-		}

-		if ($until) {

-			$this->count -= strlen($what); // give back $what

-		}

-		$out = $m[1];

-		return true;

-	}

-

-	// try to match something on head of buffer

-	protected function match($regex, &$out, $eatWhitespace = null)

-	{

-		if ($eatWhitespace === null) {

-			$eatWhitespace = $this->eatWhiteDefault;

-		}

-

-		$r = '/'.$regex.($eatWhitespace && !$this->writeComments ? '\s*' : '').'/Ais';

-		if (preg_match($r, $this->buffer, $out, 0, $this->count)) {

-			$this->count += strlen($out[0]);

-			if ($eatWhitespace && $this->writeComments) {

-				$this->whitespace();

-			}

-			return true;

-		}

-		return false;

-	}

-

-	// match some whitespace

-	protected function whitespace()

-	{

-		if ($this->writeComments) {

-			$gotWhite = false;

-			$m = array();

-			while (preg_match(self::$whitePattern, $this->buffer, $m, 0, $this->count)) {

-				if (isset($m[1]) && empty($this->seenComments[$this->count])) {

-					$this->append(array("comment", $m[1]));

-					$this->seenComments[$this->count] = true;

-				}

-				$this->count += strlen($m[0]);

-				$gotWhite = true;

-			}

-			return $gotWhite;

-		} else {

-			$this->match("", $m);

-			return strlen($m[0]) > 0;

-		}

-	}

-

-	// match something without consuming it

-	protected function peek($regex, &$out = null, $from = null)

-	{

-		if (is_null($from)) {

-			$from = $this->count;

-		}

-		$r = '/'.$regex.'/Ais';

-		$result = preg_match($r, $this->buffer, $out, 0, $from);

-

-		return $result;

-	}

-

-	// seek to a spot in the buffer or return where we are on no argument

-	protected function seek($where = null)

-	{

-		if ($where === null) {

-			return $this->count;

-		} else {

-			$this->count = $where;

-		}

-		return true;

-	}

-

-	/* misc functions */

-

-	public function throwError($msg = "parse error", $count = null)

-	{

-		$count = is_null($count) ? $this->count : $count;

-

-		$line = $this->line +

-			substr_count(substr($this->buffer, 0, $count), "\n");

-

-		if (!empty($this->sourceName)) {

-			$loc = "$this->sourceName on line $line";

-		} else {

-			$loc = "line: $line";

-		}

-

-		// TODO this depends on $this->count

-		$m = array();

-		if ($this->peek("(.*?)(\n|$)", $m, $count)) {

-			throw new exception("$msg: failed at `$m[1]` $loc");

-		} else {

-			throw new exception("$msg: $loc");

-		}

-	}

-

-	protected function pushBlock($selectors = null, $type = null)

-	{

-		$b = new stdclass();

-		$b->parent = $this->env;

-

-		$b->type = $type;

-		$b->id = self::$nextBlockId++;

-

-		$b->isVararg = false; // TODO: kill me from here

-		$b->tags = $selectors;

-

-		$b->props = array();

-		$b->children = array();

-

-		$this->env = $b;

-		return $b;

-	}

-

-	// push a block that doesn't multiply tags

-	protected function pushSpecialBlock($type)

-	{

-		return $this->pushBlock(null, $type);

-	}

-

-	// append a property to the current block

-	protected function append($prop, $pos = null)

-	{

-		if ($pos !== null) {

-			$prop[-1] = $pos;

-		}

-		$this->env->props[] = $prop;

-	}

-

-	// pop something off the stack

-	protected function pop()

-	{

-		$old = $this->env;

-		$this->env = $this->env->parent;

-		return $old;

-	}

-

-	// remove comments from $text

-	// todo: make it work for all functions, not just url

-	protected function removeComments($text)

-	{

-		$look = array(

-			'url(', '//', '/*', '"', "'"

-		);

-

-		$out = '';

-		$min = null;

-		while (true) {

-			// find the next item

-			foreach ($look as $token) {

-				$pos = strpos($text, $token);

-				if ($pos !== false) {

-					if (!isset($min) || $pos < $min[1]) {

-						$min = array($token, $pos);

-					}

-				}

-			}

-

-			if (is_null($min)) {

-				break;

-			}

-

-			$count = $min[1];

-			$skip = 0;

-			$newlines = 0;

-			switch ($min[0]) {

-				case 'url(':

-					$m = array();

-					if (preg_match('/url\(.*?\)/', $text, $m, 0, $count)) {

-						$count += strlen($m[0]) - strlen($min[0]);

-					}

-					break;

-				case '"':

-				case "'":

-					$m = array();

-					if (preg_match('/'.$min[0].'.*?(?<!\\\\)'.$min[0].'/', $text, $m, 0, $count)) {

-						$count += strlen($m[0]) - 1;

-					}

-					break;

-				case '//':

-					$skip = strpos($text, "\n", $count);

-					if ($skip === false) {

-						$skip = strlen($text) - $count;

-					} else {

-						$skip -= $count;

-					}

-					break;

-				case '/*':

-					$m = array();

-					if (preg_match('/\/\*.*?\*\//s', $text, $m, 0, $count)) {

-						$skip = strlen($m[0]);

-						$newlines = substr_count($m[0], "\n");

-					}

-					break;

-			}

-

-			if ($skip == 0) {

-				$count += strlen($min[0]);

-			}

-

-			$out .= substr($text, 0, $count).str_repeat("\n", $newlines);

-			$text = substr($text, $count + $skip);

-

-			$min = null;

-		}

-

-		return $out.$text;

-	}

+				// find the next item

+				foreach ($look as $token) {

+					$pos = strpos($text, $token);

+					if ($pos !== false) {

+						if (!isset($min) || $pos < $min[1]) $min = array($token, $pos);

+					}

+				}

+

+				if (is_null($min)) break;

+

+				$count = $min[1];

+				$skip = 0;

+				$newlines = 0;

+				switch ($min[0]) {

+					case 'url(':

+						if (preg_match('/url\(.*?\)/', $text, $m, 0, $count))

+							$count += strlen($m[0]) - strlen($min[0]);

+							break;

+					case '"':

+					case "'":

+						if (preg_match('/'.$min[0].'.*?(?<!\\\\)'.$min[0].'/', $text, $m, 0, $count))

+							$count += strlen($m[0]) - 1;

+							break;

+					case '//':

+						$skip = strpos($text, "\n", $count);

+						if ($skip === false) $skip = strlen($text) - $count;

+						else $skip -= $count;

+						break;

+					case '/*':

+						if (preg_match('/\/\*.*?\*\//s', $text, $m, 0, $count)) {

+							$skip = strlen($m[0]);

+							$newlines = substr_count($m[0], "\n");

+						}

+						break;

+				}

+

+				if ($skip == 0) $count += strlen($min[0]);

+

+				$out .= substr($text, 0, $count).str_repeat("\n", $newlines);

+				$text = substr($text, $count + $skip);

+

+				$min = null;

+			}

+

+			return $out.$text;

+		}

+

@@ -4263,2 +3781 @@
-class lessc_formatter_classic

-{

+class lessc_formatter_classic {

@@ -4280,4 +3797,2 @@
-	public $indentLevel;

-

-	public function __construct()

-	{

+

+	public function __construct() {

@@ -4287,2 +3802 @@
-	public function indentStr($n = 0)

-	{

+	public function indentStr($n = 0) {

@@ -4292,2 +3806 @@
-	public function property($name, $value)

-	{

+	public function property($name, $value) {

@@ -4297,2 +3810 @@
-	protected function isEmpty($block)

-	{

+	protected function isEmpty($block) {

@@ -4301,3 +3813 @@
-				if (!$this->isEmpty($child)) {

-					return false;

-				}

+				if (!$this->isEmpty($child)) return false;

@@ -4311,5 +3821,2 @@
-	public function block($block)

-	{

-		if ($this->isEmpty($block)) {

-			return;

-		}

+	public function block($block) {

+		if ($this->isEmpty($block)) return;

@@ -4320 +3827 @@
-			is_null($block->type) && count($block->lines) == 1;

+		is_null($block->type) && count($block->lines) == 1;

@@ -4332 +3839 @@
-				implode($selectorSeparator, $block->selectors);

+			implode($selectorSeparator, $block->selectors);

@@ -4339,0 +3847 @@
+

@@ -4355,3 +3863 @@
-			if (!$isSingle && empty($block->children)) {

-				echo $this->break;

-			}

+			if (!$isSingle && empty($block->children)) echo $this->break;

@@ -4371 +3877 @@
- *     Class for compressed result

+ *	Class for compressed result

@@ -4373,2 +3879 @@
-class lessc_formatter_compressed extends lessc_formatter_classic

-{

+class lessc_formatter_compressed extends lessc_formatter_classic {

@@ -4382,2 +3887 @@
-	public function indentStr($n = 0)

-	{

+	public function indentStr($n = 0) {

@@ -4389 +3893 @@
- *     Class for lessjs

+ *	Class for lessjs

@@ -4391,2 +3895 @@
-class lessc_formatter_lessjs extends lessc_formatter_classic

-{

+class lessc_formatter_lessjs extends lessc_formatter_classic {

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_link.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_link.class.php
@@ -31 +31 @@
-	/**

+    /**

@@ -36 +36 @@
-	/**

+    /**

@@ -41 +41 @@
-	/**

+    /**

@@ -46,339 +46,352 @@
-	public $datea;

-	public $url;

-

-	/**

-	 * @var string Links label

-	 */

-	public $label;

-

-	public $objecttype;

-	public $objectid;

-

-

-	/**

-	 *    Constructor

-	 *

-	 *    @param	DoliDB		$db		Database handler

-	 */

-	public function __construct($db)

-	{

-		$this->db = $db;

-	}

-

-

-	/**

-	 *    Create link in database

-	 *

-	 *    @param	User	$user       Object of user that ask creation

-	 *    @return   int         		>= 0 if OK, < 0 if KO

-	 */

-	public function create($user = '')

-	{

-		global $langs, $conf;

-

-		$error = 0;

-		$langs->load("errors");

-		// Clean parameters

-		if (empty($this->label)) {

-			$this->label = trim(basename($this->url));

-		}

-		if (empty($this->datea)) {

-			$this->datea = dol_now();

-		}

-		$this->url = trim($this->url);

-

-		dol_syslog(get_class($this)."::create ".$this->url);

-

-		// Check parameters

-		if (empty($this->url)) {

-			$this->error = $langs->trans("NoUrl");

-			return -1;

-		}

-

-		$this->db->begin();

-

-		$sql = "INSERT INTO ".$this->db->prefix()."links (entity, datea, url, label, objecttype, objectid)";

-		$sql .= " VALUES (".$conf->entity.", '".$this->db->idate($this->datea)."'";

-		$sql .= ", '".$this->db->escape($this->url)."'";

-		$sql .= ", '".$this->db->escape($this->label)."'";

-		$sql .= ", '".$this->db->escape($this->objecttype)."'";

-		$sql .= ", ".((int) $this->objectid).")";

-

-		dol_syslog(get_class($this)."::create", LOG_DEBUG);

-		$result = $this->db->query($sql);

-		if ($result) {

-			$this->id = $this->db->last_insert_id($this->db->prefix()."links");

-

-			if ($this->id > 0) {

-				// Call trigger

-				$result = $this->call_trigger('LINK_CREATE', $user);

-				if ($result < 0) {

-					$error++;

-				}

-				// End call triggers

-			} else {

-				$error++;

-			}

-

-			if (!$error) {

-				dol_syslog(get_class($this)."::Create success id=".$this->id);

-				$this->db->commit();

-				return $this->id;

-			} else {

-				dol_syslog(get_class($this)."::Create echec update ".$this->error, LOG_ERR);

-				$this->db->rollback();

-				return -3;

-			}

-		} else {

-			if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {

-				$this->error = $langs->trans("ErrorCompanyNameAlreadyExists", $this->name);

-				$result = -1;

-			} else {

-				$this->error = $this->db->lasterror();

-				$result = -2;

-			}

-			$this->db->rollback();

-			return $result;

-		}

-	}

-

-	/**

-	 *  Update parameters of third party

-	 *

-	 *  @param  User	$user            			User executing update

-	 *  @param  int		$call_trigger    			0=no, 1=yes

-	 *  @return int  			           			Return integer <0 if KO, >=0 if OK

-	 */

-	public function update($user = '', $call_trigger = 1)

-	{

-		global $langs, $conf;

-		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';

-

-		$langs->load("errors");

-		$error = 0;

-

-		dol_syslog(get_class($this)."::Update id = ".$this->id." call_trigger = ".$call_trigger);

-

-		// Check parameters

-		if (empty($this->url)) {

-			$this->error = $langs->trans("NoURL");

-			return -1;

-		}

-

-		// Clean parameters

-		$this->url       = clean_url($this->url, 1);

-		if (empty($this->label)) {

-			$this->label = basename($this->url);

-		}

-		$this->label     = trim($this->label);

-

-

-		$this->db->begin();

-

-		$sql  = "UPDATE ".$this->db->prefix()."links SET ";

-		$sql .= "entity = ".$conf->entity;

-		$sql .= ", datea = '".$this->db->idate(dol_now())."'";

-		$sql .= ", url = '".$this->db->escape($this->url)."'";

-		$sql .= ", label = '".$this->db->escape($this->label)."'";

-		$sql .= ", objecttype = '".$this->db->escape($this->objecttype)."'";

-		$sql .= ", objectid = ".$this->objectid;

-		$sql .= " WHERE rowid = ".((int) $this->id);

-

-		dol_syslog(get_class($this)."::update sql = ".$sql);

-		$resql = $this->db->query($sql);

-		if ($resql) {

-			if ($call_trigger) {

-				// Call trigger

-				$result = $this->call_trigger('LINK_MODIFY', $user);

-				if ($result < 0) {

-					$error++;

-				}

-				// End call triggers

-			}

-

-			if (!$error) {

-				dol_syslog(get_class($this)."::Update success");

-				$this->db->commit();

-				return 1;

-			} else {

-				setEventMessages('', $this->errors, 'errors');

-				$this->db->rollback();

-				return -1;

-			}

-		} else {

-			if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {

-				// Doublon

-				$this->error = $langs->trans("ErrorDuplicateField");

-				$result = -1;

-			} else {

-				$this->error = $langs->trans("Error sql = ".$sql);

-				$result = -2;

-			}

-			$this->db->rollback();

-			return $result;

-		}

-	}

-

-	/**

-	 *  Loads all links from database

-	 *

-	 *  @param  array   $links      array of Link objects to fill

-	 *  @param  string  $objecttype type of the associated object in dolibarr

-	 *  @param  int     $objectid   id of the associated object in dolibarr

-	 *  @param  string  $sortfield  field used to sort

-	 *  @param  string  $sortorder  sort order

-	 *  @return int                 1 if ok, 0 if no records, -1 if error

-	 **/

-	public function fetchAll(&$links, $objecttype, $objectid, $sortfield = null, $sortorder = null)

-	{

-		global $conf;

-

-		$sql = "SELECT rowid, entity, datea, url, label, objecttype, objectid FROM ".$this->db->prefix()."links";

-		$sql .= " WHERE objecttype = '".$this->db->escape($objecttype)."' AND objectid = ".((int) $objectid);

-		if ($conf->entity != 0) {

-			$sql .= " AND entity = ".$conf->entity;

-		}

-		if ($sortfield) {

-			if (empty($sortorder)) {

-				$sortorder = "ASC";

-			}

-			$sql .= " ORDER BY ".$sortfield." ".$sortorder;

-		}

-

-		dol_syslog(get_class($this)."::fetchAll", LOG_DEBUG);

-		$resql = $this->db->query($sql);

-		if ($resql) {

-			$num = $this->db->num_rows($resql);

-			dol_syslog(get_class($this)."::fetchAll num=".((int) $num), LOG_DEBUG);

-			if ($num > 0) {

-				while ($obj = $this->db->fetch_object($resql)) {

-					$link = new Link($this->db);

-					$link->id = $obj->rowid;

-					$link->entity = $obj->entity;

-					$link->datea = $this->db->jdate($obj->datea);

-					$link->url = $obj->url;

-					$link->label = $obj->label;

-					$link->objecttype = $obj->objecttype;

-					$link->objectid = $obj->objectid;

-					$links[] = $link;

-				}

-				return 1;

-			} else {

-				return 0;

-			}

-		} else {

-			return -1;

-		}

-	}

-

-	/**

-	 *  Return nb of links

-	 *

-	 *  @param  DoliDb  $dbs		Database handler

-	 *  @param  string  $objecttype Type of the associated object in dolibarr

-	 *  @param  int     $objectid   Id of the associated object in dolibarr

-	 *  @return int                 Nb of links, -1 if error

-	 **/

-	public static function count($dbs, $objecttype, $objectid)

-	{

-		global $conf;

-

-		$sql = "SELECT COUNT(rowid) as nb FROM ".$dbs->prefix()."links";

-		$sql .= " WHERE objecttype = '".$dbs->escape($objecttype)."' AND objectid = ".((int) $objectid);

-		if ($conf->entity != 0) {

-			$sql .= " AND entity = ".$conf->entity;

-		}

-

-		$resql = $dbs->query($sql);

-		if ($resql) {

-			$obj = $dbs->fetch_object($resql);

-			if ($obj) {

-				return $obj->nb;

-			}

-		}

-		return -1;

-	}

-

-	/**

-	 *  Loads a link from database

-	 *

-	 *  @param 	int		$rowid 		Id of link to load

-	 *  @return int 				1 if ok, 0 if no record found, -1 if error

-	 **/

-	public function fetch($rowid = null)

-	{

-		global $conf;

-

-		if (empty($rowid)) {

-			$rowid = $this->id;

-		}

-

-		$sql = "SELECT rowid, entity, datea, url, label, objecttype, objectid FROM ".$this->db->prefix()."links";

-		$sql .= " WHERE rowid = ".((int) $rowid);

-		if ($conf->entity != 0) {

-			$sql .= " AND entity = ".$conf->entity;

-		}

-

-		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);

-		$resql = $this->db->query($sql);

-		if ($resql) {

-			if ($this->db->num_rows($resql) > 0) {

-				$obj = $this->db->fetch_object($resql);

-

-				$this->id = $obj->rowid;

-				$this->entity = $obj->entity;

-				$this->datea = $this->db->jdate($obj->datea);

-				$this->url = $obj->url;

-				$this->label = $obj->label;

-				$this->objecttype = $obj->objecttype;

-				$this->objectid = $obj->objectid;

-				return 1;

-			} else {

-				return 0;

-			}

-		} else {

-			$this->error = $this->db->lasterror();

-			return -1;

-		}

-	}

-

-	/**

-	 *    Delete a link from database

-	 *

-	 *	  @param	User		$user		Object suer

-	 *    @return	int						Return integer <0 if KO, 0 if nothing done, >0 if OK

-	 */

-	public function delete($user)

-	{

-		dol_syslog(get_class($this)."::delete", LOG_DEBUG);

-		$error = 0;

-

-		$this->db->begin();

-

-		// Call trigger

-		$result = $this->call_trigger('LINK_DELETE', $user);

-		if ($result < 0) {

-			$this->db->rollback();

-			return -1;

-		}

-		// End call triggers

-

-		// Remove link

-		$sql = "DELETE FROM ".$this->db->prefix()."links";

-		$sql .= " WHERE rowid = ".((int) $this->id);

-

-		dol_syslog(get_class($this)."::delete", LOG_DEBUG);

-		if (!$this->db->query($sql)) {

-			$error++;

-			$this->error = $this->db->lasterror();

-		}

-

-		if (!$error) {

-			$this->db->commit();

-

-			return 1;

-		} else {

-			$this->db->rollback();

-			return -1;

-		}

-	}

+    public $datea;

+    public $url;

+

+    /**

+     * @var string Links label

+     */

+    public $label;

+

+    public $objecttype;

+    public $objectid;

+

+

+    /**

+     *    Constructor

+     *

+     *    @param	DoliDB		$db		Database handler

+     */

+    public function __construct($db)

+    {

+        $this->db = $db;

+    }

+

+

+    /**

+     *    Create link in database

+     *

+     *    @param	User	$user       Object of user that ask creation

+     *    @return   int         		>= 0 if OK, < 0 if KO

+     */

+    public function create($user = '')

+    {

+        global $langs, $conf;

+

+        $error = 0;

+        $langs->load("errors");

+        // Clean parameters

+        if (empty($this->label)) {

+            $this->label = trim(basename($this->url));

+        }

+        if (empty($this->datea)) {

+            $this->datea = dol_now();

+        }

+        $this->url = trim($this->url);

+

+        dol_syslog(get_class($this)."::create ".$this->url);

+

+        // Check parameters

+        if (empty($this->url)) {

+            $this->error = $langs->trans("NoUrl");

+            return -1;

+        }

+

+        $this->db->begin();

+

+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."links (entity, datea, url, label, objecttype, objectid)";

+        $sql .= " VALUES ('".$conf->entity."', '".$this->db->idate($this->datea)."'";

+        $sql .= ", '".$this->db->escape($this->url)."'";

+        $sql .= ", '".$this->db->escape($this->label)."'";

+        $sql .= ", '".$this->db->escape($this->objecttype)."'";

+        $sql .= ", ".$this->objectid.")";

+

+        dol_syslog(get_class($this)."::create", LOG_DEBUG);

+        $result = $this->db->query($sql);

+        if ($result) {

+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."links");

+

+            if ($this->id > 0) {

+                // Call trigger

+                $result = $this->call_trigger('LINK_CREATE', $user);

+                if ($result < 0) $error++;

+                // End call triggers

+            } else {

+                $error++;

+            }

+

+            if (!$error)

+            {

+                dol_syslog(get_class($this)."::Create success id=".$this->id);

+                $this->db->commit();

+                return $this->id;

+            }

+            else

+            {

+                dol_syslog(get_class($this)."::Create echec update ".$this->error, LOG_ERR);

+                $this->db->rollback();

+                return -3;

+            }

+        }

+        else

+        {

+            if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')

+            {

+                $this->error = $langs->trans("ErrorCompanyNameAlreadyExists", $this->name);

+                $result = -1;

+            }

+            else

+            {

+                $this->error = $this->db->lasterror();

+                $result = -2;

+            }

+            $this->db->rollback();

+            return $result;

+        }

+    }

+

+    /**

+     *  Update parameters of third party

+     *

+     *  @param  User	$user            			User executing update

+     *  @param  int		$call_trigger    			0=no, 1=yes

+     *  @return int  			           			<0 if KO, >=0 if OK

+     */

+    public function update($user = '', $call_trigger = 1)

+    {

+        global $langs, $conf;

+        require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';

+

+        $langs->load("errors");

+        $error = 0;

+

+        dol_syslog(get_class($this)."::Update id = ".$this->id." call_trigger = ".$call_trigger);

+

+        // Check parameters

+        if (empty($this->url))

+        {

+            $this->error = $langs->trans("NoURL");

+            return -1;

+        }

+

+        // Clean parameters

+        $this->url       = clean_url($this->url, 1);

+        if (empty($this->label)) $this->label = basename($this->url);

+        $this->label     = trim($this->label);

+

+

+        $this->db->begin();

+

+        $sql  = "UPDATE ".MAIN_DB_PREFIX."links SET ";

+        $sql .= "entity = '".$conf->entity."'";

+        $sql .= ", datea = '".$this->db->idate(dol_now())."'";

+        $sql .= ", url = '".$this->db->escape($this->url)."'";

+        $sql .= ", label = '".$this->db->escape($this->label)."'";

+        $sql .= ", objecttype = '".$this->db->escape($this->objecttype)."'";

+        $sql .= ", objectid = ".$this->objectid;

+        $sql .= " WHERE rowid = ".$this->id;

+

+        dol_syslog(get_class($this)."::update sql = ".$sql);

+        $resql = $this->db->query($sql);

+        if ($resql)

+        {

+            if ($call_trigger)

+            {

+                // Call trigger

+                $result = $this->call_trigger('LINK_MODIFY', $user);

+                if ($result < 0) $error++;

+                // End call triggers

+            }

+

+            if (!$error)

+            {

+                dol_syslog(get_class($this)."::Update success");

+                $this->db->commit();

+                return 1;

+            } else {

+                setEventMessages('', $this->errors, 'errors');

+                $this->db->rollback();

+                return -1;

+            }

+        }

+        else

+        {

+            if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')

+            {

+                // Doublon

+                $this->error = $langs->trans("ErrorDuplicateField");

+                $result = -1;

+            }

+            else

+            {

+                $this->error = $langs->trans("Error sql = ".$sql);

+                $result = -2;

+            }

+            $this->db->rollback();

+            return $result;

+        }

+    }

+

+    /**

+     *  Loads all links from database

+     *

+     *  @param  array   $links      array of Link objects to fill

+     *  @param  string  $objecttype type of the associated object in dolibarr

+     *  @param  int     $objectid   id of the associated object in dolibarr

+     *  @param  string  $sortfield  field used to sort

+     *  @param  string  $sortorder  sort order

+     *  @return int                 1 if ok, 0 if no records, -1 if error

+     **/

+    public function fetchAll(&$links, $objecttype, $objectid, $sortfield = null, $sortorder = null)

+    {

+        global $conf;

+

+        $sql = "SELECT rowid, entity, datea, url, label, objecttype, objectid FROM ".MAIN_DB_PREFIX."links";

+        $sql .= " WHERE objecttype = '".$objecttype."' AND objectid = ".$objectid;

+        if ($conf->entity != 0) $sql .= " AND entity = ".$conf->entity;

+        if ($sortfield) {

+            if (empty($sortorder)) {

+                $sortorder = "ASC";

+            }

+            $sql .= " ORDER BY ".$sortfield." ".$sortorder;

+        }

+

+        dol_syslog(get_class($this)."::fetchAll", LOG_DEBUG);

+        $resql = $this->db->query($sql);

+        if ($resql)

+        {

+            $num = $this->db->num_rows($resql);

+            dol_syslog(get_class($this)."::fetchAll ".$num."records", LOG_DEBUG);

+            if ($num > 0)

+            {

+                while ($obj = $this->db->fetch_object($resql))

+                {

+                    $link = new Link($this->db);

+                    $link->id = $obj->rowid;

+                    $link->entity = $obj->entity;

+                    $link->datea = $this->db->jdate($obj->datea);

+                    $link->url = $obj->url;

+                    $link->label = $obj->label;

+                    $link->objecttype = $obj->objecttype;

+                    $link->objectid = $obj->objectid;

+                    $links[] = $link;

+                }

+                return 1;

+            } else {

+                return 0;

+            }

+        } else {

+            return -1;

+        }

+    }

+

+    /**

+     *  Return nb of links

+     *

+     *  @param  DoliDb  $db         Database handler

+     *  @param  string  $objecttype Type of the associated object in dolibarr

+     *  @param  int     $objectid   Id of the associated object in dolibarr

+     *  @return int                 Nb of links, -1 if error

+     **/

+    public static function count($db, $objecttype, $objectid)

+    {

+        global $conf;

+

+        $sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."links";

+        $sql .= " WHERE objecttype = '".$objecttype."' AND objectid = ".$objectid;

+        if ($conf->entity != 0) $sql .= " AND entity = ".$conf->entity;

+

+        $resql = $db->query($sql);

+        if ($resql)

+        {

+            $obj = $db->fetch_object($resql);

+            if ($obj) return $obj->nb;

+        }

+        return -1;

+    }

+

+    /**

+     *  Loads a link from database

+     *

+     *  @param 	int		$rowid 		Id of link to load

+     *  @return int 				1 if ok, 0 if no record found, -1 if error

+     **/

+    public function fetch($rowid = null)

+    {

+        global $conf;

+

+        if (empty($rowid)) {

+            $rowid = $this->id;

+        }

+

+        $sql = "SELECT rowid, entity, datea, url, label, objecttype, objectid FROM ".MAIN_DB_PREFIX."links";

+        $sql .= " WHERE rowid = ".$rowid;

+        if ($conf->entity != 0) $sql .= " AND entity = ".$conf->entity;

+

+        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);

+        $resql = $this->db->query($sql);

+        if ($resql)

+        {

+            if ($this->db->num_rows($resql) > 0)

+            {

+                $obj = $this->db->fetch_object($resql);

+

+                $this->id = $obj->rowid;

+                $this->entity = $obj->entity;

+                $this->datea = $this->db->jdate($obj->datea);

+                $this->url = $obj->url;

+                $this->label = $obj->label;

+                $this->objecttype = $obj->objecttype;

+                $this->objectid = $obj->objectid;

+                return 1;

+            }

+            else

+			{

+                return 0;

+            }

+        } else {

+            $this->error = $this->db->lasterror();

+            return -1;

+        }

+    }

+

+    /**

+     *    Delete a link from database

+     *

+     *	  @param	User		$user		Object suer

+     *    @return	int						<0 if KO, 0 if nothing done, >0 if OK

+     */

+    public function delete($user)

+    {

+        dol_syslog(get_class($this)."::delete", LOG_DEBUG);

+        $error = 0;

+

+        $this->db->begin();

+

+        // Call trigger

+        $result = $this->call_trigger('LINK_DELETE', $user);

+        if ($result < 0)

+        {

+        	$this->db->rollback();

+        	return -1;

+        }

+        // End call triggers

+

+        // Remove link

+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."links";

+        $sql .= " WHERE rowid = ".$this->id;

+

+        dol_syslog(get_class($this)."::delete", LOG_DEBUG);

+        if (!$this->db->query($sql))

+        {

+            $error++;

+            $this->error = $this->db->lasterror();

+        }

+

+        if (!$error) {

+            $this->db->commit();

+

+            return 1;

+        } else {

+            $this->db->rollback();

+            return -1;

+        }

+    }

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_menu.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_menu.class.php
@@ -31 +31 @@
-	public $liste;

+    public $liste;

@@ -33,7 +33,7 @@
-	/**

-	 *	Constructor

-	 */

-	public function __construct()

-	{

-		$this->liste = array();

-	}

+    /**

+     *	Constructor

+     */

+    public function __construct()

+    {

+          $this->liste = array();

+    }

@@ -41,9 +41,9 @@
-	/**

-	 * Clear property ->liste

-	 *

-	 * @return	void

-	 */

-	public function clear()

-	{

-		$this->liste = array();

-	}

+    /**

+     * Clear property ->liste

+     *

+     * @return	void

+     */

+    public function clear()

+    {

+        $this->liste = array();

+    }

@@ -51,21 +51,21 @@
-	/**

-	 * Add a menu entry into this->liste (at end)

-	 *

-	 * @param	string	$url        Url to follow on click (does not include DOL_URL_ROOT)

-	 * @param   string	$titre      Label of menu to add. The value must already be translated.

-	 * @param   integer	$level      Level of menu to add

-	 * @param   int		$enabled    Menu active or not (0=Not active, 1=Active, 2=Active but grey)

-	 * @param   string	$target		Target link

-	 * @param	string	$mainmenu	Main menu ('home', 'companies', 'products', ...)

-	 * @param	string	$leftmenu	Left menu ('setup', 'system', 'admintools', ...)

-	 * @param	int		$position	Position (not used yet)

-	 * @param	string	$id			Id

-	 * @param	string	$idsel		Id sel

-	 * @param	string	$classname	Class name

-	 * @param	string	$prefix		Prefix to title (image or picto)

-	 * @return	void

-	 */

-	public function add($url, $titre, $level = 0, $enabled = 1, $target = '', $mainmenu = '', $leftmenu = '', $position = 0, $id = '', $idsel = '', $classname = '', $prefix = '')

-	{

-		$this->liste[] = array('url'=>$url, 'titre'=>$titre, 'level'=>$level, 'enabled'=>$enabled, 'target'=>$target, 'mainmenu'=>$mainmenu, 'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix);

-	}

+    /**

+     * Add a menu entry into this->liste (at end)

+     *

+     * @param	string	$url        Url to follow on click (does not include DOL_URL_ROOT)

+     * @param   string	$titre      Label of menu to add. The value must already be translated.

+     * @param   integer	$level      Level of menu to add

+     * @param   int		$enabled    Menu active or not (0=Not active, 1=Active, 2=Active but grey)

+     * @param   string	$target		Target link

+     * @param	string	$mainmenu	Main menu ('home', 'companies', 'products', ...)

+     * @param	string	$leftmenu	Left menu ('setup', 'system', 'admintools', ...)

+     * @param	int		$position	Position (not used yet)

+     * @param	string	$id			Id

+     * @param	string	$idsel		Id sel

+     * @param	string	$classname	Class name

+     * @param	string	$prefix		Prefix to title (image or picto)

+     * @return	void

+     */

+    public function add($url, $titre, $level = 0, $enabled = 1, $target = '', $mainmenu = '', $leftmenu = '', $position = 0, $id = '', $idsel = '', $classname = '', $prefix = '')

+    {

+        $this->liste[] = array('url'=>$url, 'titre'=>$titre, 'level'=>$level, 'enabled'=>$enabled, 'target'=>$target, 'mainmenu'=>$mainmenu, 'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix);

+    }

@@ -73,25 +73,25 @@
-	/**

-	 * Insert a menu entry into this->liste (after $idafter)

-	 *

-	 * @param   int     $idafter    Array key after which inserting new entry

-	 * @param	string	$url        Url to follow on click

-	 * @param   string	$titre      Label of menu to add. The value must already be translated.

-	 * @param   integer	$level      Level of menu to add

-	 * @param   int		$enabled    Menu active or not

-	 * @param   string	$target		Target link

-	 * @param	string	$mainmenu	Main menu ('home', 'companies', 'products', ...)

-	 * @param	string	$leftmenu	Left menu ('setup', 'system', 'admintools', ...)

-	 * @param	int		$position	Position (not used yet)

-	 * @param	string	$id			Id

-	 * @param	string	$idsel		Id sel

-	 * @param	string	$classname	Class name

-	 * @param	string	$prefix		Prefix to title (image or picto)

-	 * @return	void

-	 */

-	public function insert($idafter, $url, $titre, $level = 0, $enabled = 1, $target = '', $mainmenu = '', $leftmenu = '', $position = 0, $id = '', $idsel = '', $classname = '', $prefix = '')

-	{

-		$array_start = array_slice($this->liste, 0, ($idafter + 1));

-		$array_new   = array(0=>array('url'=>$url, 'titre'=>$titre, 'level'=>$level, 'enabled'=>$enabled, 'target'=>$target, 'mainmenu'=>$mainmenu, 'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix));

-		$array_end   = array_slice($this->liste, ($idafter + 1));

-		$this->liste = array_merge($array_start, $array_new, $array_end);

-	}

+    /**

+     * Insert a menu entry into this->liste

+     *

+     * @param   int     $idafter    Array key after which inserting new entry

+     * @param	string	$url        Url to follow on click

+     * @param   string	$titre      Label of menu to add. The value must already be translated.

+     * @param   integer	$level      Level of menu to add

+     * @param   int		$enabled    Menu active or not

+     * @param   string	$target		Target link

+     * @param	string	$mainmenu	Main menu ('home', 'companies', 'products', ...)

+     * @param	string	$leftmenu	Left menu ('setup', 'system', 'admintools', ...)

+     * @param	int		$position	Position (not used yet)

+     * @param	string	$id			Id

+     * @param	string	$idsel		Id sel

+     * @param	string	$classname	Class name

+     * @param	string	$prefix		Prefix to title (image or picto)

+     * @return	void

+     */

+    public function insert($idafter, $url, $titre, $level = 0, $enabled = 1, $target = '', $mainmenu = '', $leftmenu = '', $position = 0, $id = '', $idsel = '', $classname = '', $prefix = '')

+    {

+        $array_start = array_slice($this->liste, 0, ($idafter + 1));

+        $array_new   = array(0=>array('url'=>$url, 'titre'=>$titre, 'level'=>$level, 'enabled'=>$enabled, 'target'=>$target, 'mainmenu'=>$mainmenu, 'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix));

+        $array_end   = array_slice($this->liste, ($idafter + 1));

+        $this->liste = array_merge($array_start, $array_new, $array_end);

+    }

@@ -99,13 +99,13 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 * Remove a menu entry from this->liste

-	 *

-	 * @return	void

-	 */

-	public function remove_last()

-	{

-		// phpcs:enable

-		if (count($this->liste) > 1) {

-			array_pop($this->liste);

-		}

-	}

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     * Remove a menu entry from this->liste

+     *

+     * @return	void

+     */

+    public function remove_last()

+    {

+        // phpcs:enable

+    	if (count($this->liste) > 1) {

+            array_pop($this->liste);

+        }

+    }

@@ -113,16 +113,14 @@
-	/**

-	 * Return number of visible entries (gray or not)

-	 *

-	 *  @return int     Number of visible (gray or not) menu entries

-	 */

-	public function getNbOfVisibleMenuEntries()

-	{

-		$nb = 0;

-		foreach ($this->liste as $val) {

-			//if (dol_eval($val['enabled'], 1, 1, '1')) $nb++;

-			if (!empty($val['enabled'])) {

-				$nb++; // $val['enabled'] is already evaluated to 0 or 1, no need for dol_eval()

-			}

-		}

-		return $nb;

-	}

+    /**

+     * Return number of visible entries (gray or not)

+     *

+     *  @return int     Number of visible (gray or not) menu entries

+     */

+    public function getNbOfVisibleMenuEntries()

+    {

+        $nb = 0;

+        foreach ($this->liste as $val)

+        {

+            if (!empty($val['enabled'])) $nb++;

+        }

+        return $nb;

+    }

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_menubase.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_menubase.class.php
@@ -4 +4 @@
- * Copyright (C) 2018-2023  Frédéric France     <frederic.france@netlogic.fr>

+ * Copyright (C) 2018-2019  Frédéric France     <frederic.france@netlogic.fr>

@@ -32,134 +32,120 @@
-	/**

-	 * @var DoliDB Database handler.

-	 */

-	public $db;

-

-	/**

-	 * @var string Error code (or message)

-	 */

-	public $error;

-

-	/**

-	 * @var string[] Error codes (or messages)

-	 */

-	public $errors = array();

-

-	/**

-	 * @var int ID

-	 */

-	public $id;

-

-	/**

-	 * @var int Entity

-	 */

-	public $entity;

-

-	/**

-	 * @var string Menu handler

-	 */

-	public $menu_handler;

-

-	/**

-	 * @var string Module name if record is added by a module

-	 */

-	public $module;

-

-	/**

-	 * @var string Menu top or left

-	 */

-	public $type;

-

-	/**

-	 * @var string Name family/module for top menu (home, companies, ...)

-	 */

-	public $mainmenu;

-

-	/**

-	 * @var int 0 or Id of mother menu line, or -1 if we use fk_mainmenu and fk_leftmenu

-	 */

-	public $fk_menu;

-

-	/**

-	 * @var string fk_mainmenu

-	 */

-	public $fk_mainmenu;

-

-	/**

-	 * @var string fk_leftmenu

-	 */

-	public $fk_leftmenu;

-

-	/**

-	 * @var int Sort order of entry

-	 */

-	public $position;

-

-	/**

-	 * @var string Relative (or absolute) url to go

-	 */

-	public $url;

-

-	/**

-	 * @var string Target of Url link

-	 */

-	public $target;

-

-	/**

-	 * @var string Key for menu translation

-	 * @deprecated

-	 * @see $title

-	 */

-	public $titre;

-

-	/**

-	 * @var string Key for menu translation

-	 */

-	public $title;

-

-	/**

-	 * @var string Prefix

-	 */

-	public $prefix;

-

-	/**

-	 * @var string Lang file to load for translation

-	 */

-	public $langs;

-

-	/**

-	 * @var string Not used

-	 * @deprecated

-	 */

-	public $level;

-

-	/**

-	 * @var string Name family/module for left menu (setup, info, ...)

-	 */

-	public $leftmenu;

-

-	/**

-	 * @var string Condition to show enabled or disabled

-	 */

-	public $perms;

-

-	/**

-	 * @var string Condition to show or hide

-	 */

-	public $enabled;

-

-	/**

-	 * @var int 0 if menu for all users, 1 for external only, 2 for internal only

-	 */

-	public $user;

-

-	/**

-	 * @var int timestamp

-	 */

-	public $tms;

-

-	/**

-	 * @var Menu menu

-	 */

-	public $newmenu;

-

-	/**

+    /**

+     * @var DoliDB Database handler.

+     */

+    public $db;

+

+    /**

+     * @var string Error code (or message)

+     */

+    public $error;

+

+    /**

+     * @var string[] Error codes (or messages)

+     */

+    public $errors = array();

+

+    /**

+     * @var int ID

+     */

+    public $id;

+

+    /**

+     * @var string Menu handler

+     */

+    public $menu_handler;

+

+    /**

+     * @var string Module name if record is added by a module

+     */

+    public $module;

+

+    /**

+     * @var string Menu top or left

+     */

+    public $type;

+

+    /**

+     * @var string Name family/module for top menu (home, companies, ...)

+     */

+    public $mainmenu;

+

+    /**

+     * @var int 0 or Id of mother menu line, or -1 if we use fk_mainmenu and fk_leftmenu

+     */

+    public $fk_menu;

+

+    /**

+     * @var string fk_mainmenu

+     */

+    public $fk_mainmenu;

+

+    /**

+     * @var string fk_leftmenu

+     */

+    public $fk_leftmenu;

+

+    /**

+     * @var int Sort order of entry

+     */

+    public $position;

+

+    /**

+     * @var string Relative (or absolute) url to go

+     */

+    public $url;

+

+    /**

+     * @var string Target of Url link

+     */

+    public $target;

+

+    /**

+     * @var string Key for menu translation

+     * @deprecated

+     * @see $title

+     */

+    public $titre;

+

+    /**

+     * @var string Key for menu translation

+     */

+    public $title;

+

+    /**

+     * @var string Lang file to load for translation

+     */

+    public $langs;

+

+    /**

+     * @var string Not used

+     * @deprecated

+     */

+    public $level;

+

+    /**

+     * @var string Name family/module for left menu (setup, info, ...)

+     */

+    public $leftmenu;

+

+    /**

+     * @var string Condition to show enabled or disabled

+     */

+    public $perms;

+

+    /**

+     * @var string Condition to show or hide

+     */

+    public $enabled;

+

+    /**

+     * @var int 0 if menu for all users, 1 for external only, 2 for internal only

+     */

+    public $user;

+

+    /**

+     * @var int timestamp

+     */

+    public $tms;

+

+

+    /**

@@ -169,615 +155,622 @@
-	 *  @param     	string		$menu_handler	Menu handler

-	 */

-	public function __construct($db, $menu_handler = '')

-	{

-		$this->db = $db;

-		$this->menu_handler = $menu_handler;

-	}

-

-

-	/**

-	 *  Create menu entry into database

-	 *

-	 *  @param      User	$user       User that create

-	 *  @return     int      			Return integer <0 if KO, Id of record if OK

-	 */

-	public function create($user = null)

-	{

-		global $conf, $langs;

-

-		// Clean parameters

-		if (!isset($this->enabled)) {

-			$this->enabled = '1';

-		}

-		$this->entity = (isset($this->entity) && (int) $this->entity >= 0 ? (int) $this->entity : $conf->entity);

-		$this->menu_handler = trim((string) $this->menu_handler);

-		$this->module = trim((string) $this->module);

-		$this->type = trim((string) $this->type);

-		$this->mainmenu = trim((string) $this->mainmenu);

-		$this->leftmenu = trim((string) $this->leftmenu);

-		$this->fk_menu = (int) $this->fk_menu; // If -1, fk_mainmenu and fk_leftmenu must be defined

-		$this->fk_mainmenu = trim((string) $this->fk_mainmenu);

-		$this->fk_leftmenu = trim((string) $this->fk_leftmenu);

-		$this->position = (int) $this->position;

-		$this->url = trim((string) $this->url);

-		$this->target = trim((string) $this->target);

-		$this->title = trim((string) $this->title);

-		$this->langs = trim((string) $this->langs);

-		$this->perms = trim((string) $this->perms);

-		$this->enabled = trim((string) $this->enabled);

-		$this->user = (int) $this->user;

-		if (empty($this->position)) {

-			$this->position = 0;

-		}

-		if (!$this->level) {

-			$this->level = 0;

-		}

-

-		// Check parameters

-		if (empty($this->menu_handler)) {

-			return -1;

-		}

-

-		// For PGSQL, we must first found the max rowid and use it as rowid in insert because postgresql

-		// may use an already used value because its internal cursor does not increase when we do

-		// an insert with a forced id.

-		if (in_array($this->db->type, array('pgsql'))) {

-			$sql = "SELECT MAX(rowid) as maxrowid FROM ".$this->db->prefix()."menu";

-			$resqlrowid = $this->db->query($sql);

-			if ($resqlrowid) {

-				$obj = $this->db->fetch_object($resqlrowid);

-				$maxrowid = $obj->maxrowid;

-

-				// Max rowid can be empty if there is no record yet

-				if (empty($maxrowid)) {

-					$maxrowid = 1;

-				}

-

-				$sql = "SELECT setval('".$this->db->prefix()."menu_rowid_seq', ".($maxrowid).")";

-				//print $sql; exit;

-				$resqlrowidset = $this->db->query($sql);

-				if (!$resqlrowidset) {

-					dol_print_error($this->db);

-				}

-			} else {

-				dol_print_error($this->db);

-			}

-		}

-

-		// Check that entry does not exists yet on key menu_handler-fk_menu-position-url-entity, to avoid errors with postgresql

-		$sql = "SELECT count(*)";

-		$sql .= " FROM ".$this->db->prefix()."menu";

-		$sql .= " WHERE menu_handler = '".$this->db->escape($this->menu_handler)."'";

-		$sql .= " AND fk_menu = ".((int) $this->fk_menu);

-		$sql .= " AND position = ".((int) $this->position);

-		$sql .= " AND url = '".$this->db->escape($this->url)."'";

-		$sql .= " AND entity IN (0, ".$conf->entity.")";

-

-		$result = $this->db->query($sql);

-		if ($result) {

-			$row = $this->db->fetch_row($result);

-

-			if ($row[0] == 0) {   // If not found

-				// Insert request

-				$sql = "INSERT INTO ".$this->db->prefix()."menu(";

-				$sql .= "menu_handler,";

-				$sql .= "entity,";

-				$sql .= "module,";

-				$sql .= "type,";

-				$sql .= "mainmenu,";

-				$sql .= "leftmenu,";

-				$sql .= "fk_menu,";

-				$sql .= "fk_mainmenu,";

-				$sql .= "fk_leftmenu,";

-				$sql .= "position,";

-				$sql .= "url,";

-				$sql .= "target,";

-				$sql .= "titre,";

-				$sql .= "prefix,";

-				$sql .= "langs,";

-				$sql .= "perms,";

-				$sql .= "enabled,";

-				$sql .= "usertype";

-				$sql .= ") VALUES (";

-				$sql .= " '".$this->db->escape($this->menu_handler)."',";

-				$sql .= " '".$this->db->escape($this->entity)."',";

-				$sql .= " '".$this->db->escape($this->module)."',";

-				$sql .= " '".$this->db->escape($this->type)."',";

-				$sql .= " ".($this->mainmenu ? "'".$this->db->escape($this->mainmenu)."'" : "''").","; // Can't be null

-				$sql .= " ".($this->leftmenu ? "'".$this->db->escape($this->leftmenu)."'" : "null").",";

-				$sql .= " ".((int) $this->fk_menu).",";

-				$sql .= " ".($this->fk_mainmenu ? "'".$this->db->escape($this->fk_mainmenu)."'" : "null").",";

-				$sql .= " ".($this->fk_leftmenu ? "'".$this->db->escape($this->fk_leftmenu)."'" : "null").",";

-				$sql .= " ".((int) $this->position).",";

-				$sql .= " '".$this->db->escape($this->url)."',";

-				$sql .= " '".$this->db->escape($this->target)."',";

-				$sql .= " '".$this->db->escape($this->title)."',";

-				$sql .= " '".$this->db->escape($this->prefix)."',";

-				$sql .= " '".$this->db->escape($this->langs)."',";

-				$sql .= " '".$this->db->escape($this->perms)."',";

-				$sql .= " '".$this->db->escape($this->enabled)."',";

-				$sql .= " '".$this->db->escape($this->user)."'";

-				$sql .= ")";

-

-				dol_syslog(get_class($this)."::create", LOG_DEBUG);

-				$resql = $this->db->query($sql);

-				if ($resql) {

-					$this->id = $this->db->last_insert_id($this->db->prefix()."menu");

-					dol_syslog(get_class($this)."::create record added has rowid=".((int) $this->id), LOG_DEBUG);

-

-					return $this->id;

-				} else {

-					$this->error = "Error ".$this->db->lasterror();

-					return -1;

-				}

-			} else {

-				dol_syslog(get_class($this)."::create menu entry already exists", LOG_WARNING);

-				$this->error = 'Error Menu entry ('.$this->menu_handler.','.$this->position.','.$this->url.') already exists';

-				return 0;

-			}

-		} else {

-			return -1;

-		}

-	}

-

-	/**

-	 *  Update menu entry into database.

-	 *

-	 *  @param	User	$user        	User that modify

-	 *  @param  int		$notrigger	    0=no, 1=yes (no update trigger)

-	 *  @return int 		        	Return integer <0 if KO, >0 if OK

-	 */

-	public function update($user = null, $notrigger = 0)

-	{

-		//global $conf, $langs;

-

-		// Clean parameters

-		$this->menu_handler = trim($this->menu_handler);

-		$this->module = trim($this->module);

-		$this->type = trim($this->type);

-		$this->mainmenu = trim($this->mainmenu);

-		$this->leftmenu = trim($this->leftmenu);

-		$this->fk_menu = (int) $this->fk_menu;

-		$this->fk_mainmenu = trim($this->fk_mainmenu);

-		$this->fk_leftmenu = trim($this->fk_leftmenu);

-		$this->position = (int) $this->position;

-		$this->url = trim($this->url);

-		$this->target = trim($this->target);

-		$this->title = trim($this->title);

-		$this->prefix = trim($this->prefix);

-		$this->langs = trim($this->langs);

-		$this->perms = trim($this->perms);

-		$this->enabled = trim($this->enabled);

-		$this->user = (int) $this->user;

-

-		// Check parameters

-		// Put here code to add control on parameters values

-

-		// Update request

-		$sql = "UPDATE ".$this->db->prefix()."menu SET";

-		$sql .= " menu_handler='".$this->db->escape($this->menu_handler)."',";

-		$sql .= " module='".$this->db->escape($this->module)."',";

-		$sql .= " type='".$this->db->escape($this->type)."',";

-		$sql .= " mainmenu='".$this->db->escape($this->mainmenu)."',";

-		$sql .= " leftmenu='".$this->db->escape($this->leftmenu)."',";

-		$sql .= " fk_menu=".((int) $this->fk_menu).",";

-		$sql .= " fk_mainmenu=".($this->fk_mainmenu ? "'".$this->db->escape($this->fk_mainmenu)."'" : "null").",";

-		$sql .= " fk_leftmenu=".($this->fk_leftmenu ? "'".$this->db->escape($this->fk_leftmenu)."'" : "null").",";

-		$sql .= " position=".($this->position > 0 ? ((int) $this->position) : 0).",";

-		$sql .= " url='".$this->db->escape($this->url)."',";

-		$sql .= " target='".$this->db->escape($this->target)."',";

-		$sql .= " titre='".$this->db->escape($this->title)."',";

-		$sql .= " prefix='".$this->db->escape($this->prefix)."',";

-		$sql .= " langs='".$this->db->escape($this->langs)."',";

-		$sql .= " perms='".$this->db->escape($this->perms)."',";

-		$sql .= " enabled='".$this->db->escape($this->enabled)."',";

-		$sql .= " usertype='".$this->db->escape($this->user)."'";

-		$sql .= " WHERE rowid=".((int) $this->id);

-

-		dol_syslog(get_class($this)."::update", LOG_DEBUG);

-		$resql = $this->db->query($sql);

-		if (!$resql) {

-			$this->error = "Error ".$this->db->lasterror();

-			return -1;

-		}

-

-		return 1;

-	}

-

-

-	/**

-	 *   Load object in memory from database

-	 *

-	 *   @param		int		$id         Id object

-	 *   @param		User    $user       User that load

-	 *   @return	int         		Return integer <0 if KO, >0 if OK

-	 */

-	public function fetch($id, $user = null)

-	{

-		//global $langs;

-

-		$sql = "SELECT";

-		$sql .= " t.rowid,";

-		$sql .= " t.menu_handler,";

-		$sql .= " t.entity,";

-		$sql .= " t.module,";

-		$sql .= " t.type,";

-		$sql .= " t.mainmenu,";

-		$sql .= " t.leftmenu,";

-		$sql .= " t.fk_menu,";

-		$sql .= " t.fk_mainmenu,";

-		$sql .= " t.fk_leftmenu,";

-		$sql .= " t.position,";

-		$sql .= " t.url,";

-		$sql .= " t.target,";

-		$sql .= " t.titre as title,";

-		$sql .= " t.prefix,";

-		$sql .= " t.langs,";

-		$sql .= " t.perms,";

-		$sql .= " t.enabled,";

-		$sql .= " t.usertype as user,";

-		$sql .= " t.tms";

-		$sql .= " FROM ".$this->db->prefix()."menu as t";

-		$sql .= " WHERE t.rowid = ".((int) $id);

-

-		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);

-		$resql = $this->db->query($sql);

-		if ($resql) {

-			if ($this->db->num_rows($resql)) {

-				$obj = $this->db->fetch_object($resql);

-

-				$this->id = $obj->rowid;

-

-				$this->menu_handler = $obj->menu_handler;

-				$this->entity = $obj->entity;

-				$this->module = $obj->module;

-				$this->type = $obj->type;

-				$this->mainmenu = $obj->mainmenu;

-				$this->leftmenu = $obj->leftmenu;

-				$this->fk_menu = $obj->fk_menu;

-				$this->fk_mainmenu = $obj->fk_mainmenu;

-				$this->fk_leftmenu = $obj->fk_leftmenu;

-				$this->position = $obj->position;

-				$this->url = $obj->url;

-				$this->target = $obj->target;

-				$this->title = $obj->title;

-				$this->prefix = $obj->prefix;

-				$this->langs = $obj->langs;

-				$this->perms = $obj->perms;

-				$this->enabled = str_replace("\"", "'", $obj->enabled);

-				$this->user = $obj->user;

-				$this->tms = $this->db->jdate($obj->tms);

-			}

-			$this->db->free($resql);

-

-			return 1;

-		} else {

-			$this->error = "Error ".$this->db->lasterror();

-			return -1;

-		}

-	}

-

-

-	/**

-	 *  Delete object in database

-	 *

-	 *	@param	User	$user       User that delete

-	 *	@return	int					Return integer <0 if KO, >0 if OK

-	 */

-	public function delete($user)

-	{

-		//global $conf, $langs;

-

-		$sql = "DELETE FROM ".$this->db->prefix()."menu";

-		$sql .= " WHERE rowid=".((int) $this->id);

-

-		dol_syslog(get_class($this)."::delete", LOG_DEBUG);

-		$resql = $this->db->query($sql);

-		if (!$resql) {

-			$this->error = "Error ".$this->db->lasterror();

-			return -1;

-		}

-

-		return 1;

-	}

-

-

-	/**

-	 *  Initialise an instance with random values.

-	 *  Used to build previews or test instances.

-	 *	id must be 0 if object instance is a specimen.

-	 *

-	 *  @return	void

-	 */

-	public function initAsSpecimen()

-	{

-		$this->id = 0;

-

-		$this->menu_handler = 'all';

-		$this->module = 'specimen';

-		$this->type = 'top';

-		$this->mainmenu = '';

-		$this->fk_menu = '0';

-		$this->position = '';

-		$this->url = 'http://dummy';

-		$this->target = '';

-		$this->title = 'Specimen menu';

-		$this->langs = '';

-		$this->leftmenu = '';

-		$this->perms = '';

-		$this->enabled = '';

-		$this->user = '';

-		$this->tms = '';

-	}

-

-

-	/**

-	 *	Load tabMenu array with top menu entries found into database.

-	 *

-	 * 	@param	string	$mymainmenu		Value for mainmenu to filter menu to load (always '')

-	 * 	@param	string	$myleftmenu		Value for leftmenu to filter menu to load (always '')

-	 * 	@param	int		$type_user		0=Menu for backoffice, 1=Menu for front office

-	 * 	@param	string	$menu_handler	Filter on name of menu_handler used (auguria, eldy...)

-	 * 	@param  array	$tabMenu       If array with menu entries already loaded, we put this array here (in most cases, it's empty)

-	 * 	@return	array					Return array with menu entries for top menu

-	 */

-	public function menuTopCharger($mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu)

-	{

-		global $langs, $user, $conf; // To export to dol_eval function

-		global $mainmenu, $leftmenu; // To export to dol_eval function

-

-		$mainmenu = $mymainmenu; // To export to dol_eval function

-		$leftmenu = $myleftmenu; // To export to dol_eval function

-

-		$newTabMenu = array();

-		foreach ($tabMenu as $val) {

-			if ($val['type'] == 'top') {

-				$newTabMenu[] = $val;

-			}

-		}

-

-		return $newTabMenu;

-	}

-

-	/**

-	 * 	Load entries found from database (and stored into $tabMenu) in $this->newmenu array.

-	 *  Warning: Entries in $tabMenu must have child after parent

-	 *

-	 * 	@param	Menu	$newmenu        Menu array to complete (in most cases, it's empty, may be already initialized with some menu manager like eldy)

-	 * 	@param	string	$mymainmenu		Value for mainmenu to filter menu to load (often $_SESSION["mainmenu"])

-	 * 	@param	string	$myleftmenu		Value for leftmenu to filter menu to load (always '')

-	 * 	@param	int		$type_user		0=Menu for backoffice, 1=Menu for front office

-	 * 	@param	string	$menu_handler	Filter on name of menu_handler used (auguria, eldy...)

-	 * 	@param  array	$tabMenu       Array with menu entries already loaded

-	 * 	@return Menu    		       	Menu array for particular mainmenu value or full tabArray

-	 */

-	public function menuLeftCharger($newmenu, $mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu)

-	{

-		global $langs, $user, $conf; // To export to dol_eval function

-		global $mainmenu, $leftmenu; // To export to dol_eval function

-

-		$mainmenu = $mymainmenu; // To export to dol_eval function

-		$leftmenu = $myleftmenu; // To export to dol_eval function

-

-		// Detect what is top mainmenu id

-		$menutopid = '';

-		foreach ($tabMenu as $key => $val) {

-			// Define menutopid of mainmenu

-			if (empty($menutopid) && $val['type'] == 'top' && $val['mainmenu'] == $mainmenu) {

-				$menutopid = $val['rowid'];

-				break;

-			}

-		}

-

-		// We initialize newmenu with first already found menu entries

-		$this->newmenu = $newmenu;

-

-		// Now complete $this->newmenu->list to add entries found into $tabMenu that are childs of mainmenu=$menutopid, using the fk_menu link that is int (old method)

-		$this->recur($tabMenu, $menutopid, 1);

-

-		// Now complete $this->newmenu->list when fk_menu value is -1 (left menu added by modules with no top menu)

-		foreach ($tabMenu as $key => $val) {

-			if ($val['fk_menu'] == -1 && $val['fk_mainmenu'] == $mainmenu) {    // We found a menu entry not linked to parent with good mainmenu

-				//print 'Try to add menu (current is mainmenu='.$mainmenu.' leftmenu='.$leftmenu.') for '.join(',',$val).' fk_mainmenu='.$val['fk_mainmenu'].' fk_leftmenu='.$val['fk_leftmenu'].'<br>';

-				//var_dump($this->newmenu->liste);exit;

-

-				if (empty($val['fk_leftmenu'])) {

-					$this->newmenu->add($val['url'], $val['titre'], 0, $val['perms'], $val['target'], $val['mainmenu'], $val['leftmenu'], $val['position'], '', '', '', $val['prefix']);

-					//var_dump($this->newmenu->liste);

-				} else {

-					// Search first menu with this couple (mainmenu,leftmenu)=(fk_mainmenu,fk_leftmenu)

-					$searchlastsub = 0;

-					$lastid = 0;

-					$nextid = 0;

-					$found = 0;

-					foreach ($this->newmenu->liste as $keyparent => $valparent) {

-						//var_dump($valparent);

-						if ($searchlastsub) {    // If we started to search for last submenu

-							if ($valparent['level'] >= $searchlastsub) {

-								$lastid = $keyparent;

-							}

-							if ($valparent['level'] < $searchlastsub) {

-								$nextid = $keyparent;

-								break;

-							}

-						}

-						if ($valparent['mainmenu'] == $val['fk_mainmenu'] && $valparent['leftmenu'] == $val['fk_leftmenu']) {

-							//print "We found parent: keyparent='.$keyparent.' - level=".$valparent['level'].' - '.join(',',$valparent).'<br>';

-							// Now we look to find last subelement of this parent (we add at end)

-							$searchlastsub = ($valparent['level'] + 1);

-							$lastid = $keyparent;

-							$found = 1;

-						}

-					}

-					//print 'We must insert menu entry between entry '.$lastid.' and '.$nextid.'<br>';

-					if ($found) {

-						$this->newmenu->insert($lastid, $val['url'], $val['titre'], $searchlastsub, $val['perms'], $val['target'], $val['mainmenu'], $val['leftmenu'], $val['position'], '', '', '', $val['prefix']);

-					} else {

-						dol_syslog("Error. Modules ".$val['module']." has defined a menu entry with a parent='fk_mainmenu=".$val['fk_leftmenu'].",fk_leftmenu=".$val['fk_leftmenu']."' and position=".$val['position'].'. The parent was not found. May be you forget it into your definition of menu, or may be the parent has a "position" that is after the child (fix field "position" of parent or child in this case).', LOG_WARNING);

-						//print "Parent menu not found !!<br>";

-					}

-				}

-			}

-		}

-

-		return $this->newmenu;

-	}

-

-

-	/**

-	 *  Load entries found in database into variable $tabMenu. Note that only "database menu entries" are loaded here, hardcoded will not be present into output.

-	 *

-	 *  @param	string	$mymainmenu     Value for mainmenu that defined mainmenu

-	 *  @param	string	$myleftmenu     Value for left that defined leftmenu

-	 *  @param  int		$type_user      Looks for menu entry for 0=Internal users, 1=External users

-	 *  @param  string	$menu_handler   Name of menu_handler used ('auguria', 'eldy'...)

-	 *  @param  array	$tabMenu        Array to store new entries found (in most cases, it's empty, but may be alreay filled)

-	 *  @return int     		        >0 if OK, <0 if KO

-	 */

-	public function menuLoad($mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu)

-	{

-		global $langs, $user, $conf; // To export to dol_eval function

-		global $mainmenu, $leftmenu; // To export to dol_eval function

-

-		$mainmenu = $mymainmenu; // To export to dol_eval function

-		$leftmenu = $myleftmenu; // To export to dol_eval function

-

-		$sql = "SELECT m.rowid, m.type, m.module, m.fk_menu, m.fk_mainmenu, m.fk_leftmenu, m.url, m.titre,";

-		$sql .= " m.prefix, m.langs, m.perms, m.enabled, m.target, m.mainmenu, m.leftmenu, m.position";

-		$sql .= " FROM ".$this->db->prefix()."menu as m";

-		$sql .= " WHERE m.entity IN (0,".$conf->entity.")";

-		$sql .= " AND m.menu_handler IN ('".$this->db->escape($menu_handler)."','all')";

-		if ($type_user == 0) {

-			$sql .= " AND m.usertype IN (0,2)";

-		}

-		if ($type_user == 1) {

-			$sql .= " AND m.usertype IN (1,2)";

-		}

-		$sql .= " ORDER BY m.type DESC, m.position, m.rowid";

-		//print $sql;

-

-		//dol_syslog(get_class($this)."::menuLoad mymainmenu=".$mymainmenu." myleftmenu=".$myleftmenu." type_user=".$type_user." menu_handler=".$menu_handler." tabMenu size=".count($tabMenu), LOG_DEBUG);

-		$resql = $this->db->query($sql);

-		if ($resql) {

-			$numa = $this->db->num_rows($resql);

-

-			$a = 0;

-			$b = 0;

-			while ($a < $numa) {

-				//$objm = $this->db->fetch_object($resql);

-				$menu = $this->db->fetch_array($resql);

-

-				// Define $right

-				$perms = true;

-				if (isset($menu['perms'])) {

-					$tmpcond = $menu['perms'];

-					if ($leftmenu == 'all') {

-						$tmpcond = preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/', '1==1', $tmpcond); // Force part of condition to true

-					}

-					$perms = verifCond($tmpcond);

-					//print "verifCond rowid=".$menu['rowid']." ".$tmpcond.":".$perms."<br>\n";

-				}

-

-				// Define $enabled

-				$enabled = true;

-				if (isset($menu['enabled'])) {

-					$tmpcond = $menu['enabled'];

-					if ($leftmenu == 'all') {

-						$tmpcond = preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/', '1==1', $tmpcond); // Force part of condition to true

-					}

-					$enabled = verifCond($tmpcond);

-					//var_dump($menu['type'].' - '.$menu['titre'].' - '.$menu['enabled'].' => '.$enabled);

-				}

-

-				// Define $title

-				if ($enabled) {

-					$title = $langs->trans($menu['titre']); // If $menu['titre'] start with $, a dol_eval is done.

-					//var_dump($title.'-'.$menu['titre']);

-					if ($title == $menu['titre']) {   // Translation not found

-						if (!empty($menu['langs'])) {    // If there is a dedicated translation file

-							//print 'Load file '.$menu['langs'].'<br>';

-							$langs->load($menu['langs']);

-						}

-

-						$substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);

-						$menu['titre'] = make_substitutions($menu['titre'], $substitarray);

-

-						if (preg_match("/\//", $menu['titre'])) { // To manage translation when title is string1/string2

-							$tab_titre = explode("/", $menu['titre']);

-							$title = $langs->trans($tab_titre[0])."/".$langs->trans($tab_titre[1]);

-						} elseif (preg_match('/\|\|/', $menu['titre'])) {

-							// To manage different translation (Title||AltTitle@ConditionForAltTitle)

-							$tab_title = explode("||", $menu['titre']);

-							$alt_title = explode("@", $tab_title[1]);

-							$title_enabled = verifCond($alt_title[1]);

-							$title = ($title_enabled ? $langs->trans($alt_title[0]) : $langs->trans($tab_title[0]));

-						} else {

-							$title = $langs->trans($menu['titre']);

-						}

-					}

-					//$tmp4=microtime(true);

-					//print '>>> 3 '.($tmp4 - $tmp3).'<br>';

-

-					// We complete tabMenu

-					$tabMenu[$b]['rowid']       = $menu['rowid'];

-					$tabMenu[$b]['module']      = $menu['module'];

-					$tabMenu[$b]['fk_menu']     = $menu['fk_menu'];

-					$tabMenu[$b]['url']         = $menu['url'];

-					if (!preg_match("/^(http:\/\/|https:\/\/)/i", $tabMenu[$b]['url'])) {

-						if (preg_match('/\?/', $tabMenu[$b]['url'])) {

-							$tabMenu[$b]['url'] .= '&amp;idmenu='.$menu['rowid'];

-						} else {

-							$tabMenu[$b]['url'] .= '?idmenu='.$menu['rowid'];

-						}

-					}

-					$tabMenu[$b]['titre']       = $title;

-					$tabMenu[$b]['prefix']      = $menu['prefix'];

-					$tabMenu[$b]['target']      = $menu['target'];

-					$tabMenu[$b]['mainmenu']    = $menu['mainmenu'];

-					$tabMenu[$b]['leftmenu']    = $menu['leftmenu'];

-					$tabMenu[$b]['perms']       = $perms;

-					$tabMenu[$b]['langs']       = $menu['langs']; // Note that this should not be used, lang file should be already loaded.

-					$tabMenu[$b]['enabled']     = $enabled;

-					$tabMenu[$b]['type']        = $menu['type'];

-					$tabMenu[$b]['fk_mainmenu'] = $menu['fk_mainmenu'];

-					$tabMenu[$b]['fk_leftmenu'] = $menu['fk_leftmenu'];

-					$tabMenu[$b]['position']    = (int) $menu['position'];

-

-					$b++;

-				}

-

-				$a++;

-			}

-			$this->db->free($resql);

-

-			// Currently $tabMenu is sorted on position.

-			// If a child have a position lower that its parent, we can make a loop to fix this here, but we prefer to show a warning

-			// into the leftMenuCharger later to avoid useless operations.

-

-			return 1;

-		} else {

-			dol_print_error($this->db);

-			return -1;

-		}

-	}

-

-	/**

-	 *  Complete this->newmenu with menu entry found in $tab

-	 *

-	 *  @param  array	$tab			Tab array with all menu entries

-	 *  @param  int		$pere			Id of parent

-	 *  @param  int		$level			Level

-	 *  @return	void

-	 */

-	private function recur($tab, $pere, $level)

-	{

-		// Loop on tab array

-		$num = count($tab);

-		for ($x = 0; $x < $num; $x++) {

-			//si un element a pour pere : $pere

-			if ((($tab[$x]['fk_menu'] >= 0 && $tab[$x]['fk_menu'] == $pere)) && $tab[$x]['enabled']) {

-				$this->newmenu->add($tab[$x]['url'], $tab[$x]['titre'], ($level - 1), $tab[$x]['perms'], $tab[$x]['target'], $tab[$x]['mainmenu'], $tab[$x]['leftmenu'], 0, '', '', '', $tab[$x]['prefix']);

-				$this->recur($tab, $tab[$x]['rowid'], ($level + 1));

-			}

-		}

-	}

+     *  @param     	string		$menu_handler	Menu handler

+     */

+    public function __construct($db, $menu_handler = '')

+    {

+        $this->db = $db;

+        $this->menu_handler = $menu_handler;

+        return 1;

+    }

+

+

+    /**

+     *  Create menu entry into database

+     *

+     *  @param      User	$user       User that create

+     *  @return     int      			<0 if KO, Id of record if OK

+     */

+    public function create($user = null)

+    {

+        global $conf, $langs;

+

+        // Clean parameters

+        $this->menu_handler = trim($this->menu_handler);

+        $this->module = trim($this->module);

+        $this->type = trim($this->type);

+        $this->mainmenu = trim($this->mainmenu);

+        $this->leftmenu = trim($this->leftmenu);

+        $this->fk_menu = (int) $this->fk_menu; // If -1, fk_mainmenu and fk_leftmenu must be defined

+        $this->fk_mainmenu = trim($this->fk_mainmenu);

+        $this->fk_leftmenu = trim($this->fk_leftmenu);

+        $this->position = (int) $this->position;

+        $this->url = trim($this->url);

+        $this->target = trim($this->target);

+        $this->titre = trim($this->titre);

+        $this->langs = trim($this->langs);

+        $this->perms = trim($this->perms);

+        $this->enabled = trim($this->enabled);

+        $this->user = (int) $this->user;

+        if (empty($this->position)) $this->position = 0;

+        if (!$this->level) $this->level = 0;

+

+        // Check parameters

+        if (empty($this->menu_handler)) return -1;

+

+        // For PGSQL, we must first found the max rowid and use it as rowid in insert because postgresql

+        // may use an already used value because its internal cursor does not increase when we do

+        // an insert with a forced id.

+        if (in_array($this->db->type, array('pgsql')))

+        {

+            $sql = "SELECT MAX(rowid) as maxrowid FROM ".MAIN_DB_PREFIX."menu";

+            $resqlrowid = $this->db->query($sql);

+            if ($resqlrowid) {

+                $obj = $this->db->fetch_object($resqlrowid);

+                $maxrowid = $obj->maxrowid;

+

+                // Max rowid can be empty if there is no record yet

+                if (empty($maxrowid)) $maxrowid = 1;

+

+                $sql = "SELECT setval('".MAIN_DB_PREFIX."menu_rowid_seq', ".($maxrowid).")";

+                //print $sql; exit;

+                $resqlrowidset = $this->db->query($sql);

+                if (!$resqlrowidset) dol_print_error($this->db);

+            }

+            else dol_print_error($this->db);

+        }

+

+        // Check that entry does not exists yet on key menu_handler-fk_menu-position-url-entity, to avoid errors with postgresql

+        $sql = "SELECT count(*)";

+        $sql .= " FROM ".MAIN_DB_PREFIX."menu";

+        $sql .= " WHERE menu_handler = '".$this->db->escape($this->menu_handler)."'";

+        $sql .= " AND fk_menu = ".((int) $this->fk_menu);

+        $sql .= " AND position = ".((int) $this->position);

+        $sql .= " AND url = '".$this->db->escape($this->url)."'";

+        $sql .= " AND entity = ".$conf->entity;

+

+        $result = $this->db->query($sql);

+        if ($result)

+        {

+        	$row = $this->db->fetch_row($result);

+

+        	if ($row[0] == 0)   // If not found

+        	{

+		        // Insert request

+		        $sql = "INSERT INTO ".MAIN_DB_PREFIX."menu(";

+		        $sql .= "menu_handler,";

+		        $sql .= "entity,";

+		        $sql .= "module,";

+		        $sql .= "type,";

+		        $sql .= "mainmenu,";

+		        $sql .= "leftmenu,";

+		        $sql .= "fk_menu,";

+		        $sql .= "fk_mainmenu,";

+		        $sql .= "fk_leftmenu,";

+		        $sql .= "position,";

+		        $sql .= "url,";

+		        $sql .= "target,";

+		        $sql .= "titre,";

+		        $sql .= "langs,";

+		        $sql .= "perms,";

+		        $sql .= "enabled,";

+		        $sql .= "usertype";

+		        $sql .= ") VALUES (";

+		        $sql .= " '".$this->db->escape($this->menu_handler)."',";

+		        $sql .= " '".$this->db->escape($conf->entity)."',";

+		        $sql .= " '".$this->db->escape($this->module)."',";

+		        $sql .= " '".$this->db->escape($this->type)."',";

+		        $sql .= " ".($this->mainmenu ? "'".$this->db->escape($this->mainmenu)."'" : "''").","; // Can't be null

+		        $sql .= " ".($this->leftmenu ? "'".$this->db->escape($this->leftmenu)."'" : "null").",";

+		        $sql .= " ".((int) $this->fk_menu).",";

+		        $sql .= " ".($this->fk_mainmenu ? "'".$this->db->escape($this->fk_mainmenu)."'" : "null").",";

+		        $sql .= " ".($this->fk_leftmenu ? "'".$this->db->escape($this->fk_leftmenu)."'" : "null").",";

+		        $sql .= " ".((int) $this->position).",";

+		        $sql .= " '".$this->db->escape($this->url)."',";

+		        $sql .= " '".$this->db->escape($this->target)."',";

+		        $sql .= " '".$this->db->escape($this->titre)."',";

+		        $sql .= " '".$this->db->escape($this->langs)."',";

+		        $sql .= " '".$this->db->escape($this->perms)."',";

+		        $sql .= " '".$this->db->escape($this->enabled)."',";

+		        $sql .= " '".$this->db->escape($this->user)."'";

+		        $sql .= ")";

+

+		        dol_syslog(get_class($this)."::create", LOG_DEBUG);

+		        $resql = $this->db->query($sql);

+		        if ($resql)

+		        {

+		            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."menu");

+		            dol_syslog(get_class($this)."::create record added has rowid=".$this->id, LOG_DEBUG);

+

+		            return $this->id;

+		        }

+		        else

+		        {

+		            $this->error = "Error ".$this->db->lasterror();

+		            return -1;

+		        }

+        	}

+        	else

+        	{

+        		dol_syslog(get_class($this)."::create menu entry already exists", LOG_WARNING);

+        		$this->error = 'Error Menu entry already exists';

+        		return 0;

+        	}

+        }

+        else

+        {

+        	return -1;

+        }

+    }

+

+    /**

+     *  Update menu entry into database.

+     *

+     *  @param	User	$user        	User that modify

+     *  @param  int		$notrigger	    0=no, 1=yes (no update trigger)

+     *  @return int 		        	<0 if KO, >0 if OK

+     */

+    public function update($user = null, $notrigger = 0)

+    {

+        //global $conf, $langs;

+

+        // Clean parameters

+        $this->rowid = trim($this->rowid);

+        $this->menu_handler = trim($this->menu_handler);

+        $this->module = trim($this->module);

+        $this->type = trim($this->type);

+        $this->mainmenu = trim($this->mainmenu);

+        $this->leftmenu = trim($this->leftmenu);

+        $this->fk_menu = (int) $this->fk_menu;

+        $this->fk_mainmenu = trim($this->fk_mainmenu);

+        $this->fk_leftmenu = trim($this->fk_leftmenu);

+        $this->position = (int) $this->position;

+        $this->url = trim($this->url);

+        $this->target = trim($this->target);

+        $this->titre = trim($this->titre);

+        $this->langs = trim($this->langs);

+        $this->perms = trim($this->perms);

+        $this->enabled = trim($this->enabled);

+        $this->user = (int) $this->user;

+

+        // Check parameters

+        // Put here code to add control on parameters values

+

+        // Update request

+        $sql = "UPDATE ".MAIN_DB_PREFIX."menu SET";

+        $sql .= " menu_handler='".$this->db->escape($this->menu_handler)."',";

+        $sql .= " module='".$this->db->escape($this->module)."',";

+        $sql .= " type='".$this->db->escape($this->type)."',";

+        $sql .= " mainmenu='".$this->db->escape($this->mainmenu)."',";

+        $sql .= " leftmenu='".$this->db->escape($this->leftmenu)."',";

+        $sql .= " fk_menu=".$this->fk_menu.",";

+        $sql .= " fk_mainmenu=".($this->fk_mainmenu ? "'".$this->db->escape($this->fk_mainmenu)."'" : "null").",";

+        $sql .= " fk_leftmenu=".($this->fk_leftmenu ? "'".$this->db->escape($this->fk_leftmenu)."'" : "null").",";

+        $sql .= " position=".($this->position > 0 ? $this->position : 0).",";

+        $sql .= " url='".$this->db->escape($this->url)."',";

+        $sql .= " target='".$this->db->escape($this->target)."',";

+        $sql .= " titre='".$this->db->escape($this->titre)."',";

+        $sql .= " langs='".$this->db->escape($this->langs)."',";

+        $sql .= " perms='".$this->db->escape($this->perms)."',";

+        $sql .= " enabled='".$this->db->escape($this->enabled)."',";

+        $sql .= " usertype='".$this->db->escape($this->user)."'";

+        $sql .= " WHERE rowid=".$this->id;

+

+        dol_syslog(get_class($this)."::update", LOG_DEBUG);

+        $resql = $this->db->query($sql);

+        if (!$resql)

+        {

+            $this->error = "Error ".$this->db->lasterror();

+            return -1;

+        }

+

+        return 1;

+    }

+

+

+    /**

+     *   Load object in memory from database

+     *

+     *   @param		int		$id         Id object

+     *   @param		User    $user       User that load

+     *   @return	int         		<0 if KO, >0 if OK

+     */

+    public function fetch($id, $user = null)

+    {

+        //global $langs;

+

+        $sql = "SELECT";

+        $sql .= " t.rowid,";

+        $sql .= " t.menu_handler,";

+        $sql .= " t.entity,";

+        $sql .= " t.module,";

+        $sql .= " t.type,";

+        $sql .= " t.mainmenu,";

+        $sql .= " t.leftmenu,";

+        $sql .= " t.fk_menu,";

+        $sql .= " t.fk_mainmenu,";

+        $sql .= " t.fk_leftmenu,";

+        $sql .= " t.position,";

+        $sql .= " t.url,";

+        $sql .= " t.target,";

+        $sql .= " t.titre,";

+        $sql .= " t.langs,";

+        $sql .= " t.perms,";

+        $sql .= " t.enabled,";

+        $sql .= " t.usertype as user,";

+        $sql .= " t.tms";

+        $sql .= " FROM ".MAIN_DB_PREFIX."menu as t";

+        $sql .= " WHERE t.rowid = ".$id;

+

+        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);

+        $resql = $this->db->query($sql);

+        if ($resql)

+        {

+            if ($this->db->num_rows($resql))

+            {

+                $obj = $this->db->fetch_object($resql);

+

+                $this->id = $obj->rowid;

+

+                $this->menu_handler = $obj->menu_handler;

+                $this->entity = $obj->entity;

+                $this->module = $obj->module;

+                $this->type = $obj->type;

+                $this->mainmenu = $obj->mainmenu;

+                $this->leftmenu = $obj->leftmenu;

+                $this->fk_menu = $obj->fk_menu;

+                $this->fk_mainmenu = $obj->fk_mainmenu;

+                $this->fk_leftmenu = $obj->fk_leftmenu;

+                $this->position = $obj->position;

+                $this->url = $obj->url;

+                $this->target = $obj->target;

+                $this->titre = $obj->titre;

+                $this->langs = $obj->langs;

+                $this->perms = $obj->perms;

+                $this->enabled = str_replace("\"", "'", $obj->enabled);

+                $this->user = $obj->user;

+                $this->tms = $this->db->jdate($obj->tms);

+            }

+            $this->db->free($resql);

+

+            return 1;

+        }

+        else

+        {

+            $this->error = "Error ".$this->db->lasterror();

+            return -1;

+        }

+    }

+

+

+    /**

+     *  Delete object in database

+     *

+     *	@param	User	$user       User that delete

+     *	@return	int					<0 if KO, >0 if OK

+     */

+    public function delete($user)

+    {

+        //global $conf, $langs;

+

+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."menu";

+        $sql .= " WHERE rowid=".$this->id;

+

+        dol_syslog(get_class($this)."::delete", LOG_DEBUG);

+        $resql = $this->db->query($sql);

+        if (!$resql)

+        {

+            $this->error = "Error ".$this->db->lasterror();

+            return -1;

+        }

+

+        return 1;

+    }

+

+

+    /**

+     *  Initialise an instance with random values.

+     *  Used to build previews or test instances.

+     *	id must be 0 if object instance is a specimen.

+     *

+     *  @return	void

+     */

+    public function initAsSpecimen()

+    {

+        $this->id = 0;

+

+        $this->menu_handler = 'all';

+        $this->module = 'specimen';

+        $this->type = 'top';

+        $this->mainmenu = '';

+        $this->fk_menu = '0';

+        $this->position = '';

+        $this->url = 'http://dummy';

+        $this->target = '';

+        $this->titre = 'Specimen menu'; // deprecated

+        $this->title = 'Specimen menu';

+        $this->langs = '';

+        $this->level = '';

+        $this->leftmenu = '';

+        $this->perms = '';

+        $this->enabled = '';

+        $this->user = '';

+        $this->tms = '';

+    }

+

+

+    /**

+     *	Load tabMenu array with top menu entries found into database.

+     *

+     * 	@param	string	$mymainmenu		Value for mainmenu to filter menu to load (always '')

+     * 	@param	string	$myleftmenu		Value for leftmenu to filter menu to load (always '')

+     * 	@param	int		$type_user		0=Menu for backoffice, 1=Menu for front office

+     * 	@param	string	$menu_handler	Filter on name of menu_handler used (auguria, eldy...)

+     * 	@param  array	$tabMenu       If array with menu entries already loaded, we put this array here (in most cases, it's empty)

+     * 	@return	array					Return array with menu entries for top menu

+     */

+    public function menuTopCharger($mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu)

+    {

+        global $langs, $user, $conf; // To export to dol_eval function

+        global $mainmenu, $leftmenu; // To export to dol_eval function

+

+        $mainmenu = $mymainmenu; // To export to dol_eval function

+        $leftmenu = $myleftmenu; // To export to dol_eval function

+

+        $newTabMenu = array();

+        foreach ($tabMenu as $val)

+        {

+            if ($val['type'] == 'top') $newTabMenu[] = $val;

+        }

+

+        return $newTabMenu;

+    }

+

+    /**

+     * 	Load entries found from database (and stored into $tabMenu) in $this->newmenu array.

+     *  Warning: Entries in $tabMenu must have child after parent

+     *

+     * 	@param	Menu	$newmenu        Menu array to complete (in most cases, it's empty, may be already initialized with some menu manager like eldy)

+     * 	@param	string	$mymainmenu		Value for mainmenu to filter menu to load (often $_SESSION["mainmenu"])

+     * 	@param	string	$myleftmenu		Value for leftmenu to filter menu to load (always '')

+     * 	@param	int		$type_user		0=Menu for backoffice, 1=Menu for front office

+     * 	@param	string	$menu_handler	Filter on name of menu_handler used (auguria, eldy...)

+     * 	@param  array	$tabMenu       Array with menu entries already loaded

+     * 	@return Menu    		       	Menu array for particular mainmenu value or full tabArray

+     */

+    public function menuLeftCharger($newmenu, $mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu)

+    {

+        global $langs, $user, $conf; // To export to dol_eval function

+        global $mainmenu, $leftmenu; // To export to dol_eval function

+

+        $mainmenu = $mymainmenu; // To export to dol_eval function

+        $leftmenu = $myleftmenu; // To export to dol_eval function

+

+        // Detect what is top mainmenu id

+        $menutopid = '';

+        foreach ($tabMenu as $key => $val)

+        {

+            // Define menutopid of mainmenu

+            if (empty($menutopid) && $val['type'] == 'top' && $val['mainmenu'] == $mainmenu)

+            {

+                $menutopid = $val['rowid'];

+                break;

+            }

+        }

+

+        // We initialize newmenu with first already found menu entries

+        $this->newmenu = $newmenu;

+

+        // Now complete $this->newmenu->list to add entries found into $tabMenu that are childs of mainmenu=$menutopid, using the fk_menu link that is int (old method)

+        $this->recur($tabMenu, $menutopid, 1);

+

+        // Now complete $this->newmenu->list when fk_menu value is -1 (left menu added by modules with no top menu)

+        foreach ($tabMenu as $key => $val)

+        {

+        	//var_dump($tabMenu);

+        	if ($val['fk_menu'] == -1 && $val['fk_mainmenu'] == $mainmenu)    // We found a menu entry not linked to parent with good mainmenu

+        	{

+        		//print 'Try to add menu (current is mainmenu='.$mainmenu.' leftmenu='.$leftmenu.') for '.join(',',$val).' fk_mainmenu='.$val['fk_mainmenu'].' fk_leftmenu='.$val['fk_leftmenu'].'<br>';

+        		//var_dump($this->newmenu->liste);exit;

+

+        		if (empty($val['fk_leftmenu']))

+        		{

+        			$this->newmenu->add($val['url'], $val['titre'], 0, $val['perms'], $val['target'], $val['mainmenu'], $val['leftmenu'], $val['position']);

+        			//var_dump($this->newmenu->liste);

+        		}

+        		else

+        		{

+        			// Search first menu with this couple (mainmenu,leftmenu)=(fk_mainmenu,fk_leftmenu)

+        			$searchlastsub = 0; $lastid = 0; $nextid = 0; $found = 0;

+        			foreach ($this->newmenu->liste as $keyparent => $valparent)

+        			{

+        				//var_dump($valparent);

+        				if ($searchlastsub)    // If we started to search for last submenu

+        				{

+        					if ($valparent['level'] >= $searchlastsub) $lastid = $keyparent;

+        					if ($valparent['level'] < $searchlastsub)

+        					{

+        						$nextid = $keyparent;

+        						break;

+        					}

+        				}

+        				if ($valparent['mainmenu'] == $val['fk_mainmenu'] && $valparent['leftmenu'] == $val['fk_leftmenu'])

+        				{

+        					//print "We found parent: keyparent='.$keyparent.' - level=".$valparent['level'].' - '.join(',',$valparent).'<br>';

+        					// Now we look to find last subelement of this parent (we add at end)

+        					$searchlastsub = ($valparent['level'] + 1);

+        					$lastid = $keyparent;

+        					$found = 1;

+        				}

+        			}

+        			//print 'We must insert menu entry between entry '.$lastid.' and '.$nextid.'<br>';

+        			if ($found) $this->newmenu->insert($lastid, $val['url'], $val['titre'], $searchlastsub, $val['perms'], $val['target'], $val['mainmenu'], $val['leftmenu'], $val['position']);

+        			else {

+        			    dol_syslog("Error. Modules ".$val['module']." has defined a menu entry with a parent='fk_mainmenu=".$val['fk_leftmenu'].",fk_leftmenu=".$val['fk_leftmenu']."' and position=".$val['position'].'. The parent was not found. May be you forget it into your definition of menu, or may be the parent has a "position" that is after the child (fix field "position" of parent or child in this case).', LOG_WARNING);

+        			    //print "Parent menu not found !!<br>";

+        			}

+        		}

+        	}

+        }

+

+        return $this->newmenu;

+    }

+

+

+    /**

+     *  Load entries found in database into variable $tabMenu. Note that only "database menu entries" are loaded here, hardcoded will not be present into output.

+     *

+     *  @param	string	$mymainmenu     Value for mainmenu that defined mainmenu

+     *  @param	string	$myleftmenu     Value for left that defined leftmenu

+     *  @param  int		$type_user      Looks for menu entry for 0=Internal users, 1=External users

+     *  @param  string	$menu_handler   Name of menu_handler used ('auguria', 'eldy'...)

+     *  @param  array	$tabMenu        Array to store new entries found (in most cases, it's empty, but may be alreay filled)

+     *  @return int     		        >0 if OK, <0 if KO

+     */

+    public function menuLoad($mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu)

+    {

+        global $langs, $user, $conf; // To export to dol_eval function

+        global $mainmenu, $leftmenu; // To export to dol_eval function

+

+        $mainmenu = $mymainmenu; // To export to dol_eval function

+        $leftmenu = $myleftmenu; // To export to dol_eval function

+

+        $sql = "SELECT m.rowid, m.type, m.module, m.fk_menu, m.fk_mainmenu, m.fk_leftmenu, m.url, m.titre, m.langs, m.perms, m.enabled, m.target, m.mainmenu, m.leftmenu, m.position";

+        $sql .= " FROM ".MAIN_DB_PREFIX."menu as m";

+        $sql .= " WHERE m.entity IN (0,".$conf->entity.")";

+        $sql .= " AND m.menu_handler IN ('".$menu_handler."','all')";

+        if ($type_user == 0) $sql .= " AND m.usertype IN (0,2)";

+        if ($type_user == 1) $sql .= " AND m.usertype IN (1,2)";

+        $sql .= " ORDER BY m.position, m.rowid";

+        //print $sql;

+

+        //dol_syslog(get_class($this)."::menuLoad mymainmenu=".$mymainmenu." myleftmenu=".$myleftmenu." type_user=".$type_user." menu_handler=".$menu_handler." tabMenu size=".count($tabMenu)."", LOG_DEBUG);

+        $resql = $this->db->query($sql);

+        if ($resql)

+        {

+            $numa = $this->db->num_rows($resql);

+

+            $a = 0;

+            $b = 0;

+            while ($a < $numa)

+            {

+                //$objm = $this->db->fetch_object($resql);

+                $menu = $this->db->fetch_array($resql);

+

+                // Define $right

+                $perms = true;

+                if (isset($menu['perms']))

+                {

+                	$tmpcond = $menu['perms'];

+                	if ($leftmenu == 'all') $tmpcond = preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/', '1==1', $tmpcond); // Force part of condition to true

+                	$perms = verifCond($tmpcond);

+                    //print "verifCond rowid=".$menu['rowid']." ".$tmpcond.":".$perms."<br>\n";

+                }

+

+                // Define $enabled

+                $enabled = true;

+                if (isset($menu['enabled']))

+                {

+                	$tmpcond = $menu['enabled'];

+                	if ($leftmenu == 'all') $tmpcond = preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/', '1==1', $tmpcond); // Force part of condition to true

+                    $enabled = verifCond($tmpcond);

+                }

+

+                // Define $title

+                if ($enabled)

+                {

+                	$title = $langs->trans($menu['titre']); // If $menu['titre'] start with $, a dol_eval is done.

+                	//var_dump($title.'-'.$menu['titre']);

+                    if ($title == $menu['titre'])   // Translation not found

+                    {

+                        if (!empty($menu['langs']))    // If there is a dedicated translation file

+                        {

+                        	//print 'Load file '.$menu['langs'].'<br>';

+                            $langs->load($menu['langs']);

+                        }

+

+                        $substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);

+                        $menu['titre'] = make_substitutions($menu['titre'], $substitarray);

+

+                        if (preg_match("/\//", $menu['titre'])) // To manage translation when title is string1/string2

+                        {

+                            $tab_titre = explode("/", $menu['titre']);

+                            $title = $langs->trans($tab_titre[0])."/".$langs->trans($tab_titre[1]);

+                        }

+                        elseif (preg_match('/\|\|/', $menu['titre']))

+                        {

+                            // To manage different translation (Title||AltTitle@ConditionForAltTitle)

+                        	$tab_title = explode("||", $menu['titre']);

+                        	$alt_title = explode("@", $tab_title[1]);

+                        	$title_enabled = verifCond($alt_title[1]);

+                        	$title = ($title_enabled ? $langs->trans($alt_title[0]) : $langs->trans($tab_title[0]));

+                        }

+                        else

+                        {

+                            $title = $langs->trans($menu['titre']);

+                        }

+                    }

+                    //$tmp4=microtime(true);

+                    //print '>>> 3 '.($tmp4 - $tmp3).'<br>';

+

+                    // We complete tabMenu

+                    $tabMenu[$b]['rowid']       = $menu['rowid'];

+                    $tabMenu[$b]['module']      = $menu['module'];

+                    $tabMenu[$b]['fk_menu']     = $menu['fk_menu'];

+                    $tabMenu[$b]['url']         = $menu['url'];

+                    if (!preg_match("/^(http:\/\/|https:\/\/)/i", $tabMenu[$b]['url']))

+                    {

+                        if (preg_match('/\?/', $tabMenu[$b]['url'])) $tabMenu[$b]['url'] .= '&amp;idmenu='.$menu['rowid'];

+                        else $tabMenu[$b]['url'] .= '?idmenu='.$menu['rowid'];

+                    }

+                    $tabMenu[$b]['titre']       = $title;

+                    $tabMenu[$b]['target']      = $menu['target'];

+                    $tabMenu[$b]['mainmenu']    = $menu['mainmenu'];

+                    $tabMenu[$b]['leftmenu']    = $menu['leftmenu'];

+                    $tabMenu[$b]['perms']       = $perms;

+                    $tabMenu[$b]['langs']       = $menu['langs'];	// Note that this should not be used, lang file should be already loaded.

+                    $tabMenu[$b]['enabled']     = $enabled;

+                    $tabMenu[$b]['type']        = $menu['type'];

+                    $tabMenu[$b]['fk_mainmenu'] = $menu['fk_mainmenu'];

+                    $tabMenu[$b]['fk_leftmenu'] = $menu['fk_leftmenu'];

+                    $tabMenu[$b]['position']    = (int) $menu['position'];

+

+                    $b++;

+                }

+

+                $a++;

+            }

+            $this->db->free($resql);

+

+            // Currently $tabMenu is sorted on position.

+            // If a child have a position lower that its parent, we can make a loop to fix this here, but we prefer to show a warning

+            // into the leftMenuCharger later to avoid useless operations.

+

+            return 1;

+        }

+        else

+        {

+            dol_print_error($this->db);

+            return -1;

+        }

+    }

+

+    /**

+     *  Complete this->newmenu with menu entry found in $tab

+     *

+     *  @param  array	$tab			Tab array with all menu entries

+     *  @param  int		$pere			Id of parent

+     *  @param  int		$level			Level

+     *  @return	void

+     */

+    private function recur($tab, $pere, $level)

+    {

+        // Loop on tab array

+        $num = count($tab);

+        for ($x = 0; $x < $num; $x++)

+        {

+            //si un element a pour pere : $pere

+            if ((($tab[$x]['fk_menu'] >= 0 && $tab[$x]['fk_menu'] == $pere)) && $tab[$x]['enabled'])

+            {

+                $this->newmenu->add($tab[$x]['url'], $tab[$x]['titre'], ($level - 1), $tab[$x]['perms'], $tab[$x]['target'], $tab[$x]['mainmenu'], $tab[$x]['leftmenu']);

+                $this->recur($tab, $tab[$x]['rowid'], ($level + 1));

+            }

+        }

+    }

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_notify.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_notify.class.php
@@ -6,3 +5,0 @@
- * Copyright (C) 2021 	   Thibault FOUCART		<support@ptibogxiv.net>

- * Copyright (C) 2022      Anthony Berton     	<anthony.berton@bb2a.fr>

- * Copyright (C) 2023      William Mead         <william.mead@manchenumerique.fr>

@@ -30,0 +28 @@
+

@@ -42,3 +40,3 @@
-	 * @var DoliDB Database handler.

-	 */

-	public $db;

+     * @var DoliDB Database handler.

+     */

+    public $db;

@@ -63,6 +61,9 @@
-	 * @var int Project ID

-	 */

-	public $fk_project;

-

-	// This codes actions are defined into table llx_notify_def

-	public static $arrayofnotifsupported = array(

+     * @var int Project ID

+     */

+    public $fk_project;

+

+	// Les codes actions sont definis dans la table llx_notify_def

+

+	// codes actions supported are

+	// @todo defined also into interface_50_modNotificiation_Notificiation.class.php

+	public $arrayofnotifsupported = array(

@@ -71 +71,0 @@
-		'ORDER_CREATE',

@@ -73 +72,0 @@
-		'ORDER_CLOSE',

@@ -76 +74,0 @@
-		'PROPAL_CLOSE_REFUSED',

@@ -78 +75,0 @@
-		'FICHINTER_CLOSE',

@@ -82 +78,0 @@
-		'ORDER_SUPPLIER_SUBMIT',

@@ -88,2 +84 @@
-		'HOLIDAY_APPROVE',

-		'ACTION_CREATE'

+		'HOLIDAY_APPROVE'

@@ -90,0 +86 @@
+

@@ -114 +110 @@
-		global $conf, $langs;

+		global $langs;

@@ -117 +112,0 @@
-		// Get full list of all notifications subscribed for $action, $socid and $object

@@ -120,26 +114,0 @@
-		if (getDolGlobalString('NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_USER')) {

-			foreach ($listofnotiftodo as $val) {

-				if ($val['type'] == 'touser') {

-					unset($listofnotiftodo[$val['email']]);

-					//$listofnotiftodo = array_merge($listofnotiftodo);

-				}

-			}

-		}

-		if (getDolGlobalString('NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_CONTACT')) {

-			foreach ($listofnotiftodo as $val) {

-				if ($val['type'] == 'tocontact') {

-					unset($listofnotiftodo[$val['email']]);

-					//$listofnotiftodo = array_merge($listofnotiftodo);

-				}

-			}

-		}

-		if (getDolGlobalString('NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_FIX')) {

-			foreach ($listofnotiftodo as $val) {

-				if ($val['type'] == 'tofixedemail') {

-					unset($listofnotiftodo[$val['email']]);

-					//$listofnotiftodo = array_merge($listofnotiftodo);

-				}

-			}

-		}

-

-		$texte = '';

@@ -147,14 +116,8 @@
-		if (is_array($listofnotiftodo)) {

-			$nb = count($listofnotiftodo);

-		}

-		if ($nb < 0) {

-			$texte = img_object($langs->trans("Notifications"), 'email', 'class="pictofixedwidth"').$langs->trans("ErrorFailedToGetListOfNotificationsToSend");

-		} elseif ($nb == 0) {

-			$texte = img_object($langs->trans("Notifications"), 'email', 'class="pictofixedwidth"').$langs->trans("NoNotificationsWillBeSent");

-		} elseif ($nb == 1) {

-			$texte = img_object($langs->trans("Notifications"), 'email', 'class="pictofixedwidth"').$langs->trans("ANotificationsWillBeSent");

-		} elseif ($nb >= 2) {

-			$texte = img_object($langs->trans("Notifications"), 'email', 'class="pictofixedwidth"').$langs->trans("SomeNotificationsWillBeSent", $nb);

-		}

-

-		if (is_array($listofnotiftodo)) {

+		if (is_array($listofnotiftodo)) $nb = count($listofnotiftodo);

+		if ($nb < 0)  $texte = img_object($langs->trans("Notifications"), 'email').' '.$langs->trans("ErrorFailedToGetListOfNotificationsToSend");

+		if ($nb == 0) $texte = img_object($langs->trans("Notifications"), 'email').' '.$langs->trans("NoNotificationsWillBeSent");

+   		if ($nb == 1) $texte = img_object($langs->trans("Notifications"), 'email').' '.$langs->trans("ANotificationsWillBeSent");

+   		if ($nb >= 2) $texte = img_object($langs->trans("Notifications"), 'email').' '.$langs->trans("SomeNotificationsWillBeSent", $nb);

+

+   		if (is_array($listofnotiftodo))

+   		{

@@ -162,11 +125,6 @@
-			foreach ($listofnotiftodo as $val) {

-				if ($i) {

-					$texte .= ', ';

-				} else {

-					$texte .= ' (';

-				}

-				if ($val['isemailvalid']) {

-					$texte .= $val['email'];

-				} else {

-					$texte .= $val['emaildesc'];

-				}

+			foreach ($listofnotiftodo as $key => $val)

+			{

+				if ($i) $texte .= ', ';

+				else $texte .= ' (';

+				if ($val['isemailvalid']) $texte .= $val['email'];

+				else $texte .= $val['emaildesc'];

@@ -175,4 +133,2 @@
-			if ($i) {

-				$texte .= ')';

-			}

-		}

+			if ($i) $texte .= ')';

+   		}

@@ -191 +147 @@
-	 * @return	array|int				Return integer <0 if KO, array of notifications to send if OK

+	 * @return	array|int				<0 if KO, array of notifications to send if OK

@@ -201,21 +157,11 @@
-		if (is_object($object)) {

-			$valueforthreshold = $object->total_ht;

-		}

-

-		$sqlnotifcode = '';

-		if ($notifcode) {

-			if (is_numeric($notifcode)) {

-				$sqlnotifcode = " AND n.fk_action = ".((int) $notifcode); // Old usage

-			} else {

-				$sqlnotifcode = " AND a.code = '".$this->db->escape($notifcode)."'"; // New usage

-			}

-		}

-

-		if (!$error) {

-			if ($socid >= 0 && in_array('thirdparty', $scope)) {

-				$sql = "SELECT a.code, c.email, c.rowid, c.statut as status";

-				$sql .= " FROM ".$this->db->prefix()."notify_def as n,";

-				$sql .= " ".$this->db->prefix()."socpeople as c,";

-

-				$sql .= " ".$this->db->prefix()."c_action_trigger as a,";

-				$sql .= " ".$this->db->prefix()."societe as s";

+		if (is_object($object)) $valueforthreshold = $object->total_ht;

+

+		if (!$error)

+		{

+			if ($socid >= 0 && in_array('thirdparty', $scope))

+			{

+				$sql = "SELECT a.code, c.email, c.rowid";

+				$sql .= " FROM ".MAIN_DB_PREFIX."notify_def as n,";

+				$sql .= " ".MAIN_DB_PREFIX."socpeople as c,";

+				$sql .= " ".MAIN_DB_PREFIX."c_action_trigger as a,";

+				$sql .= " ".MAIN_DB_PREFIX."societe as s";

@@ -225 +171,5 @@
-				$sql .= $sqlnotifcode;

+				if ($notifcode)

+				{

+					if (is_numeric($notifcode)) $sql .= " AND n.fk_action = ".$notifcode; // Old usage

+					else $sql .= " AND a.code = '".$notifcode."'"; // New usage

+				}

@@ -227,5 +177,3 @@
-				if ($socid > 0) {

-					$sql .= " AND s.rowid = ".((int) $socid);

-				}

-

-				dol_syslog(__METHOD__." ".$notifcode.", ".$socid, LOG_DEBUG);

+				if ($socid > 0) $sql .= " AND s.rowid = ".$socid;

+

+				dol_syslog(__METHOD__." ".$notifcode.", ".$socid."", LOG_DEBUG);

@@ -234 +182,2 @@
-				if ($resql) {

+				if ($resql)

+				{

@@ -237 +186,2 @@
-					while ($i < $num) {

+					while ($i < $num)

+					{

@@ -239,2 +189,2 @@
-						// we want to notify only if contact is enable

-						if ($obj && $obj->status ==  1) {

+						if ($obj)

+						{

@@ -243,3 +193 @@
-							if (empty($resarray[$newval2])) {

-								$resarray[$newval2] = array('type'=> 'tocontact', 'code'=>trim($obj->code), 'emaildesc'=>'Contact id '.$obj->rowid, 'email'=>$newval2, 'contactid'=>$obj->rowid, 'isemailvalid'=>$isvalid);

-							}

+							if (empty($resarray[$newval2])) $resarray[$newval2] = array('type'=> 'tocontact', 'code'=>trim($obj->code), 'emaildesc'=>'Contact id '.$obj->rowid, 'email'=>$newval2, 'contactid'=>$obj->rowid, 'isemailvalid'=>$isvalid);

@@ -249 +197,3 @@
-				} else {

+				}

+				else

+				{

@@ -256,2 +206,4 @@
-		if (!$error) {

-			if ($userid >= 0 && in_array('user', $scope)) {

+		if (!$error)

+		{

+			if ($userid >= 0 && in_array('user', $scope))

+			{

@@ -259,3 +211,3 @@
-				$sql .= " FROM ".$this->db->prefix()."notify_def as n,";

-				$sql .= " ".$this->db->prefix()."user as c,";

-				$sql .= " ".$this->db->prefix()."c_action_trigger as a";

+				$sql .= " FROM ".MAIN_DB_PREFIX."notify_def as n,";

+				$sql .= " ".MAIN_DB_PREFIX."user as c,";

+				$sql .= " ".MAIN_DB_PREFIX."c_action_trigger as a";

@@ -264 +216,5 @@
-				$sql .= $sqlnotifcode;

+				if ($notifcode)

+				{

+					if (is_numeric($notifcode)) $sql .= " AND n.fk_action = ".$notifcode; // Old usage

+					else $sql .= " AND a.code = '".$notifcode."'"; // New usage

+				}

@@ -266,5 +222,3 @@
-				if ($userid > 0) {

-					$sql .= " AND c.rowid = ".((int) $userid);

-				}

-

-				dol_syslog(__METHOD__." ".$notifcode.", ".$socid, LOG_DEBUG);

+				if ($userid > 0) $sql .= " AND c.rowid = ".$userid;

+

+				dol_syslog(__METHOD__." ".$notifcode.", ".$socid."", LOG_DEBUG);

@@ -273 +227,2 @@
-				if ($resql) {

+				if ($resql)

+				{

@@ -276 +231,2 @@
-					while ($i < $num) {

+					while ($i < $num)

+					{

@@ -278 +234,2 @@
-						if ($obj) {

+						if ($obj)

+						{

@@ -281,3 +238 @@
-							if (empty($resarray[$newval2])) {

-								$resarray[$newval2] = array('type'=> 'touser', 'code'=>trim($obj->code), 'emaildesc'=>'User id '.$obj->rowid, 'email'=>$newval2, 'userid'=>$obj->rowid, 'isemailvalid'=>$isvalid);

-							}

+							if (empty($resarray[$newval2])) $resarray[$newval2] = array('type'=> 'touser', 'code'=>trim($obj->code), 'emaildesc'=>'User id '.$obj->rowid, 'email'=>$newval2, 'userid'=>$obj->rowid, 'isemailvalid'=>$isvalid);

@@ -287 +242,3 @@
-				} else {

+				}

+				else

+				{

@@ -294,2 +251,4 @@
-		if (!$error) {

-			if (in_array('global', $scope)) {

+		if (!$error)

+		{

+			if (in_array('global', $scope))

+			{

@@ -297,9 +256,9 @@
-				foreach ($conf->global as $key => $val) {

-					if ($notifcode) {

-						if ($val == '' || !preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) {

-							continue;

-						}

-					} else {

-						if ($val == '' || !preg_match('/^NOTIFICATION_FIXEDEMAIL_.*_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) {

-							continue;

-						}

+				foreach ($conf->global as $key => $val)

+				{

+					if ($notifcode)

+					{

+						if ($val == '' || !preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;

+					}

+					else

+					{

+						if ($val == '' || !preg_match('/^NOTIFICATION_FIXEDEMAIL_.*_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;

@@ -309,3 +268 @@
-					if ($valueforthreshold < $threshold) {

-						continue;

-					}

+					if ($valueforthreshold < $threshold) continue;

@@ -314 +271,2 @@
-					foreach ($tmpemail as $key2 => $val2) {

+					foreach ($tmpemail as $key2 => $val2)

+					{

@@ -316,2 +274,4 @@
-						if ($newval2 == '__SUPERVISOREMAIL__') {

-							if ($user->fk_user > 0) {

+						if ($newval2 == '__SUPERVISOREMAIL__')

+						{

+							if ($user->fk_user > 0)

+							{

@@ -320,7 +280,2 @@
-								if ($tmpuser->email) {

-									$newval2 = trim($tmpuser->email);

-								} else {

-									$newval2 = '';

-								}

-							} else {

-								$newval2 = '';

+								if ($tmpuser->email) $newval2 = trim($tmpuser->email);

+								else $newval2 = '';

@@ -328,2 +283,4 @@
-						}

-						if ($newval2) {

+							else $newval2 = '';

+						}

+						if ($newval2)

+						{

@@ -331,3 +288 @@
-							if (empty($resarray[$newval2])) {

-								$resarray[$newval2] = array('type'=> 'tofixedemail', 'code'=>trim($key), 'emaildesc'=>trim($val2), 'email'=>$newval2, 'isemailvalid'=>$isvalid);

-							}

+							if (empty($resarray[$newval2])) $resarray[$newval2] = array('type'=> 'tofixedemail', 'code'=>trim($key), 'emaildesc'=>trim($val2), 'email'=>$newval2, 'isemailvalid'=>$isvalid);

@@ -340,3 +295 @@
-		if ($error) {

-			return -1;

-		}

+		if ($error) return -1;

@@ -357 +310 @@
-	 *	@return	int							Return integer <0 if KO, or number of changes if OK

+	 *	@return	int							<0 if KO, or number of changes if OK

@@ -366,2 +319,5 @@
-		// Complete the array Notify::$arrayofnotifsupported

-		if (!is_object($hookmanager)) {

+		if (!in_array($notifcode, $this->arrayofnotifsupported)) return 0;

+

+		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

+		if (!is_object($hookmanager))

+		{

@@ -373,16 +329 @@
-		$parameters = array('notifcode' => $notifcode);

-		$reshook = $hookmanager->executeHooks('notifsupported', $parameters, $object, $action);

-		if (empty($reshook)) {

-			if (!empty($hookmanager->resArray['arrayofnotifsupported'])) {

-				Notify::$arrayofnotifsupported = array_merge(Notify::$arrayofnotifsupported, $hookmanager->resArray['arrayofnotifsupported']);

-			}

-		}

-

-		// If the trigger code is not managed by the Notification module

-		if (!in_array($notifcode, Notify::$arrayofnotifsupported)) {

-			return 0;

-		}

-

-		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

-

-		dol_syslog(get_class($this)."::send notifcode=".$notifcode.", object id=".$object->id);

+		dol_syslog(get_class($this)."::send notifcode=".$notifcode.", object=".$object->id);

@@ -399,3 +340 @@
-		if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {

-			$application = $conf->global->MAIN_APPLICATION_TITLE;

-		}

+		if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $application = $conf->global->MAIN_APPLICATION_TITLE;

@@ -406 +345 @@
-		$error = 0;

+        $error = 0;

@@ -414 +353,2 @@
-		if (!empty($object->socid) && $object->socid > 0) {

+		if ($object->socid > 0)

+		{

@@ -416,5 +356,5 @@
-			$sql .= " a.rowid as adid, a.label, a.code, n.rowid, n.threshold, n.context, n.type";

-			$sql .= " FROM ".$this->db->prefix()."socpeople as c,";

-			$sql .= " ".$this->db->prefix()."c_action_trigger as a,";

-			$sql .= " ".$this->db->prefix()."notify_def as n,";

-			$sql .= " ".$this->db->prefix()."societe as s";

+			$sql .= " a.rowid as adid, a.label, a.code, n.rowid, n.type";

+			$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as c,";

+			$sql .= " ".MAIN_DB_PREFIX."c_action_trigger as a,";

+			$sql .= " ".MAIN_DB_PREFIX."notify_def as n,";

+			$sql .= " ".MAIN_DB_PREFIX."societe as s";

@@ -424,6 +364,3 @@
-			if (is_numeric($notifcode)) {

-				$sql .= " AND n.fk_action = ".((int) $notifcode); // Old usage

-			} else {

-				$sql .= " AND a.code = '".$this->db->escape($notifcode)."'"; // New usage

-			}

-			$sql .= " AND s.rowid = ".((int) $object->socid);

+			if (is_numeric($notifcode)) $sql .= " AND n.fk_action = ".$notifcode; // Old usage

+			else $sql .= " AND a.code = '".$notifcode."'"; // New usage

+			$sql .= " AND s.rowid = ".$object->socid;

@@ -436,4 +373,4 @@
-		$sql .= " a.rowid as adid, a.label, a.code, n.rowid, n.threshold, n.context, n.type";

-		$sql .= " FROM ".$this->db->prefix()."user as c,";

-		$sql .= " ".$this->db->prefix()."c_action_trigger as a,";

-		$sql .= " ".$this->db->prefix()."notify_def as n";

+		$sql .= " a.rowid as adid, a.label, a.code, n.rowid, n.type";

+		$sql .= " FROM ".MAIN_DB_PREFIX."user as c,";

+		$sql .= " ".MAIN_DB_PREFIX."c_action_trigger as a,";

+		$sql .= " ".MAIN_DB_PREFIX."notify_def as n";

@@ -442,11 +379,3 @@
-		if (is_numeric($notifcode)) {

-			$sql .= " AND n.fk_action = ".((int) $notifcode); // Old usage

-		} else {

-			$sql .= " AND a.code = '".$this->db->escape($notifcode)."'"; // New usage

-		}

-

-		// Check notification fixed

-		// TODO Move part found after, into a sql here

-

-

-		// Loop on all notifications enabled

+		if (is_numeric($notifcode)) $sql .= " AND n.fk_action = ".$notifcode; // Old usage

+		else $sql .= " AND a.code = '".$this->db->escape($notifcode)."'"; // New usage

+

@@ -454 +383,2 @@
-		if ($result) {

+		if ($result)

+		{

@@ -457,2 +387,6 @@
-			if (is_object($object->project) || $object->fetch_project() > 0) {

-				$projtitle = '('.$object->project->title.')';

+			if (!empty($object->fk_project))

+			{

+				require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';

+				$proj = new Project($this->db);

+				$proj->fetch($object->fk_project);

+				$projtitle = '('.$proj->title.')';

@@ -461 +395,2 @@
-			if ($num > 0) {

+			if ($num > 0)

+			{

@@ -463 +398,2 @@
-				while ($i < $num && !$error) {	// For each notification couple defined (third party/actioncode)

+				while ($i < $num && !$error)	// For each notification couple defined (third party/actioncode)

+				{

@@ -469,8 +405,5 @@
-					if ($obj->type_target == 'tocontactid') {

-						$trackid = 'ctc'.$obj->cid;

-					}

-					if ($obj->type_target == 'touserid') {

-						$trackid = 'use'.$obj->cid;

-					}

-

-					if (dol_strlen($obj->email)) {

+					if ($obj->type_target == 'tocontactid') $trackid = 'con'.$obj->id;

+					if ($obj->type_target == 'touserid') $trackid = 'use'.$obj->id;

+

+					if (dol_strlen($obj->email))

+					{

@@ -479 +412,2 @@
-						if ($obj->default_lang && $obj->default_lang != $langs->defaultlang) {

+						if ($obj->default_lang && $obj->default_lang != $langs->defaultlang)

+						{

@@ -485,3 +419 @@
-						$appli = $mysoc->name;

-

-						$subject = '['.$appli.'] '.$outputlangs->transnoentitiesnoconv("DolibarrNotification").($projtitle ? ' '.$projtitle : '');

+						$subject = '['.$mysoc->name.'] '.$outputlangs->transnoentitiesnoconv("DolibarrNotification").($projtitle ? ' '.$projtitle : '');

@@ -491,2 +423,2 @@
-								$link = '<a href="'.$urlwithroot.'/compta/facture/card.php?facid='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';

-								$dir_output = $conf->facture->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'invoice');

+								$link = '<a href="' . $urlwithroot . '/compta/facture/card.php?facid=' . $object->id . '">' . $newref . '</a>';

+								$dir_output = $conf->facture->dir_output;

@@ -497,2 +429,2 @@
-								$link = '<a href="'.$urlwithroot.'/compta/facture/card.php?facid='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';

-								$dir_output = $conf->facture->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'invoice');

+								$link ='<a href="' . $urlwithroot . '/compta/facture/card.php?facid='.$object->id . '">' . $newref . '</a>';

+								$dir_output = $conf->facture->dir_output;

@@ -503,2 +435,2 @@
-								$link = '<a href="'.$urlwithroot.'/commande/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';

-								$dir_output = $conf->commande->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'commande');

+								$link = '<a href="' . $urlwithroot . '/commande/card.php?id='.$object->id . '">' . $newref . '</a>';

+								$dir_output = $conf->commande->dir_output;

@@ -508,7 +439,0 @@
-							case 'ORDER_CLOSE':

-								$link = '<a href="'.$urlwithroot.'/commande/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';

-								$dir_output = $conf->commande->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'commande');

-								$object_type = 'order';

-								$labeltouse = $conf->global->ORDER_CLOSE_TEMPLATE;

-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextOrderClose", $link);

-								break;

@@ -516,2 +441,2 @@
-								$link = '<a href="'.$urlwithroot.'/comm/propal/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';

-								$dir_output = $conf->propal->multidir_output[$object->entity]."/".get_exdir(0, 0, 0, 1, $object, 'propal');

+								$link = '<a href="' . $urlwithroot . '/comm/propal/card.php?id='.$object->id . '">' . $newref . '</a>';

+								$dir_output = $conf->propal->multidir_output[$object->entity];

@@ -521,10 +445,0 @@
-							case 'PROPAL_CLOSE_REFUSED':

-								$link = '<a href="'.$urlwithroot.'/comm/propal/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';

-								$dir_output = $conf->propal->multidir_output[$object->entity]."/".get_exdir(0, 0, 0, 1, $object, 'propal');

-								$object_type = 'propal';

-								$labeltouse = $conf->global->PROPAL_CLOSE_REFUSED_TEMPLATE;

-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextProposalClosedRefused", $link);

-								if (!empty($object->context['closedfromonlinesignature'])) {

-									$mesg .= ' - From online page';

-								}

-								break;

@@ -532,2 +447,2 @@
-								$link = '<a href="'.$urlwithroot.'/comm/propal/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';

-								$dir_output = $conf->propal->multidir_output[$object->entity]."/".get_exdir(0, 0, 0, 1, $object, 'propal');

+								$link = '<a href="' . $urlwithroot . '/comm/propal/card.php?id='.$object->id . '">' . $newref . '</a>';

+								$dir_output = $conf->propal->multidir_output[$object->entity];

@@ -536,3 +450,0 @@
-								if (!empty($object->context['closedfromonlinesignature'])) {

-									$mesg .= ' - From online page';

-								}

@@ -541 +453 @@
-								$link = '<a href="'.$urlwithroot.'/fichinter/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';

+								$link = '<a href="'.$urlwithroot.'/fichinter/card.php?id='.$object->id.'">'.$newref.'</a>';

@@ -547 +459 @@
-								$link = '<a href="'.$urlwithroot.'/fichinter/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';

+								$link = '<a href="'.$urlwithroot.'/fichinter/card.php?id='.$object->id.'">'.$newref.'</a>';

@@ -552,6 +463,0 @@
-							case 'FICHINTER_CLOSE':

-								$link = '<a href="'.$urlwithroot.'/fichinter/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';

-								$dir_output = $conf->ficheinter->dir_output;

-								$object_type = 'ficheinter';

-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextInterventionClosed", $link);

-								break;

@@ -559,19 +465 @@
-								$link = '<a href="'.$urlwithroot.'/fourn/commande/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';

-								$dir_output = $conf->fournisseur->commande->multidir_output[$object->entity]."/".get_exdir(0, 0, 0, 1, $object);

-								$object_type = 'order_supplier';

-								$labeltouse = isset($conf->global->ORDER_SUPPLIER_VALIDATE_TEMPLATE) ? $conf->global->ORDER_SUPPLIER_VALIDATE_TEMPLATE : '';

-								$mesg = $outputlangs->transnoentitiesnoconv("Hello").",\n\n";

-								$mesg .= $outputlangs->transnoentitiesnoconv("EMailTextSupplierOrderValidatedBy", $link, $user->getFullName($outputlangs));

-								$mesg .= "\n\n".$outputlangs->transnoentitiesnoconv("Sincerely").".\n\n";

-								break;

-							case 'ORDER_SUPPLIER_APPROVE':

-								$link = '<a href="'.$urlwithroot.'/fourn/commande/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';

-								$dir_output = $conf->fournisseur->commande->multidir_output[$object->entity]."/".get_exdir(0, 0, 0, 1, $object);

-								$object_type = 'order_supplier';

-								$labeltouse = isset($conf->global->ORDER_SUPPLIER_APPROVE_TEMPLATE) ? $conf->global->ORDER_SUPPLIER_APPROVE_TEMPLATE : '';

-								$mesg = $outputlangs->transnoentitiesnoconv("Hello").",\n\n";

-								$mesg .= $outputlangs->transnoentitiesnoconv("EMailTextSupplierOrderApprovedBy", $link, $user->getFullName($outputlangs));

-								$mesg .= "\n\n".$outputlangs->transnoentitiesnoconv("Sincerely").".\n\n";

-								break;

-							case 'ORDER_SUPPLIER_SUBMIT':

-								$link = '<a href="'.$urlwithroot.'/fourn/commande/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';

+								$link = '<a href="'.$urlwithroot.'/fourn/commande/card.php?id='.$object->id.'">'.$newref.'</a>';

@@ -581 +469 @@
-								$mesg .= $outputlangs->transnoentitiesnoconv("EMailTextSupplierOrderSubmittedBy", $link, $user->getFullName($outputlangs));

+								$mesg .= $outputlangs->transnoentitiesnoconv("EMailTextOrderValidatedBy", $link, $user->getFullName($outputlangs));

@@ -583,0 +472,8 @@
+							case 'ORDER_SUPPLIER_APPROVE':

+								$link = '<a href="'.$urlwithroot.'/fourn/commande/card.php?id='.$object->id.'">'.$newref.'</a>';

+								$dir_output = $conf->fournisseur->commande->dir_output;

+								$object_type = 'order_supplier';

+								$mesg = $outputlangs->transnoentitiesnoconv("Hello").",\n\n";

+								$mesg .= $outputlangs->transnoentitiesnoconv("EMailTextOrderApprovedBy", $link, $user->getFullName($outputlangs));

+								$mesg .= "\n\n".$outputlangs->transnoentitiesnoconv("Sincerely").".\n\n";

+								break;

@@ -585,2 +481,2 @@
-								$link = '<a href="'.$urlwithroot.'/fourn/commande/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';

-								$dir_output = $conf->fournisseur->commande->multidir_output[$object->entity]."/".get_exdir(0, 0, 0, 1, $object);

+								$link = '<a href="' . $urlwithroot . '/fourn/commande/card.php?id='.$object->id . '">' . $newref . '</a>';

+								$dir_output = $conf->fournisseur->commande->dir_output;

@@ -588 +483,0 @@
-								$labeltouse = isset($conf->global->ORDER_SUPPLIER_REFUSE_TEMPLATE) ? $conf->global->ORDER_SUPPLIER_REFUSE_TEMPLATE : '';

@@ -590 +485 @@
-								$mesg .= $outputlangs->transnoentitiesnoconv("EMailTextSupplierOrderRefusedBy", $link, $user->getFullName($outputlangs));

+								$mesg .= $outputlangs->transnoentitiesnoconv("EMailTextOrderRefusedBy", $link, $user->getFullName($outputlangs));

@@ -594,3 +489,3 @@
-								$link = '<a href="'.$urlwithroot.'/expedition/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';

-								$dir_output = $conf->expedition->dir_output."/sending/".get_exdir(0, 0, 0, 1, $object, 'shipment');

-								$object_type = 'shipping';

+								$link = '<a href="'.$urlwithroot.'/expedition/card.php?id='.$object->id.'">'.$newref.'</a>';

+								$dir_output = $conf->expedition->dir_output.'/sending/';

+								$object_type = 'expedition';

@@ -600 +495 @@
-								$link = '<a href="'.$urlwithroot.'/expensereport/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';

+								$link = '<a href="'.$urlwithroot.'/expensereport/card.php?id='.$object->id.'">'.$newref.'</a>';

@@ -606 +501 @@
-								$link = '<a href="'.$urlwithroot.'/expensereport/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';

+								$link = '<a href="'.$urlwithroot.'/expensereport/card.php?id='.$object->id.'">'.$newref.'</a>';

@@ -612 +507 @@
-								$link = '<a href="'.$urlwithroot.'/holiday/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';

+								$link = '<a href="'.$urlwithroot.'/holiday/card.php?id='.$object->id.'">'.$newref.'</a>';

@@ -618 +513 @@
-								$link = '<a href="'.$urlwithroot.'/holiday/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';

+								$link = '<a href="'.$urlwithroot.'/holiday/card.php?id='.$object->id.'">'.$newref.'</a>';

@@ -623,35 +518 @@
-							case 'ACTION_CREATE':

-								$link = '<a href="'.$urlwithroot.'/comm/action/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';

-								$dir_output = $conf->agenda->dir_output;

-								$object_type = 'action';

-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextActionAdded", $link);

-								break;

-							default:

-								$object_type = $object->element;

-								$dir_output = $conf->$object_type->multidir_output[$object->entity ? $object->entity : $conf->entity]."/".get_exdir(0, 0, 0, 1, $object, $object_type);

-								$template = $notifcode.'_TEMPLATE';

-								$mesg = $outputlangs->transnoentitiesnoconv('Notify_'.$notifcode).' '.$newref.' '.$dir_output;

-							break;

-						}

-

-						include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';

-						$formmail = new FormMail($this->db);

-						$arraydefaultmessage = null;

-

-						$template = $notifcode.'_TEMPLATE';

-						$labeltouse = getDolGlobalString($template);

-						if (!empty($labeltouse)) {

-							$arraydefaultmessage = $formmail->getEMailTemplate($this->db, $object_type.'_send', $user, $outputlangs, 0, 1, $labeltouse);

-						}

-						if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {

-							$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);

-							complete_substitutions_array($substitutionarray, $outputlangs, $object);

-							$subject = make_substitutions($arraydefaultmessage->topic, $substitutionarray, $outputlangs);

-							$message = make_substitutions($arraydefaultmessage->content, $substitutionarray, $outputlangs);

-						} else {

-							$message = $outputlangs->transnoentities("YouReceiveMailBecauseOfNotification", $application, $mysoc->name)."\n";

-							$message .= $outputlangs->transnoentities("YouReceiveMailBecauseOfNotification2", $application, $mysoc->name)."\n";

-							$message .= "\n";

-							$message .= $mesg;

-						}

-

+						}

@@ -659,2 +520,3 @@
-						$pdf_path = $dir_output."/".$ref.".pdf";

-						if (!dol_is_file($pdf_path)||(is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0 && !$arraydefaultmessage->joinfiles)) {

+						$pdf_path = $dir_output."/".$ref."/".$ref.".pdf";

+						if (!dol_is_file($pdf_path))

+						{

@@ -663 +525,3 @@
-						} else {

+						}

+						else

+						{

@@ -665,28 +529,9 @@
-							$filename_list[] = $filepdf;

-							$mimetype_list[] = mime_content_type($filepdf);

-							$mimefilename_list[] = $ref.".pdf";

-						}

-

-						$labeltouse = !empty($labeltouse) ? $labeltouse : '';

-

-						// Replace keyword __SUPERVISOREMAIL__

-						if (preg_match('/__SUPERVISOREMAIL__/', $sendto)) {

-							$newval = '';

-							if ($user->fk_user > 0) {

-								$supervisoruser = new User($this->db);

-								$supervisoruser->fetch($user->fk_user);

-								if ($supervisoruser->email) {

-									$newval = trim(dolGetFirstLastname($supervisoruser->firstname, $supervisoruser->lastname).' <'.$supervisoruser->email.'>');

-								}

-							}

-							dol_syslog("Replace the __SUPERVISOREMAIL__ key into recipient email string with ".$newval);

-							$sendto = preg_replace('/__SUPERVISOREMAIL__/', $newval, $sendto);

-							$sendto = preg_replace('/,\s*,/', ',', $sendto); // in some case you can have $sendto like "email, __SUPERVISOREMAIL__ , otheremail" then you have "email,  , othermail" and it's not valid

-							$sendto = preg_replace('/^[\s,]+/', '', $sendto); // Clean start of string

-							$sendto = preg_replace('/[\s,]+$/', '', $sendto); // Clean end of string

-						}

-

-						$parameters = array('notifcode'=>$notifcode, 'sendto'=>$sendto, 'replyto'=>$replyto, 'file'=>$filename_list, 'mimefile'=>$mimetype_list, 'filename'=>$mimefilename_list, 'outputlangs'=>$outputlangs, 'labeltouse'=>$labeltouse);

-						if (!isset($action)) {

-							$action = '';

-						}

+						}

+

+						$message = $outputlangs->transnoentities("YouReceiveMailBecauseOfNotification", $application, $mysoc->name)."\n";

+						$message .= $outputlangs->transnoentities("YouReceiveMailBecauseOfNotification2", $application, $mysoc->name)."\n";

+						$message .= "\n";

+						$message .= $mesg;

+

+						$parameters = array('notifcode'=>$notifcode, 'sendto'=>$sendto, 'replyto'=>$replyto, 'file'=>$filename_list, 'mimefile'=>$mimetype_list, 'filename'=>$mimefilename_list);

+						if (!isset($action)) $action = '';

@@ -695,15 +540,7 @@
-						if (empty($reshook)) {

-							if (!empty($hookmanager->resArray['files'])) {

-								$filename_list = $hookmanager->resArray['files']['file'];

-								$mimetype_list = $hookmanager->resArray['files']['mimefile'];

-								$mimefilename_list = $hookmanager->resArray['files']['filename'];

-							}

-							if (!empty($hookmanager->resArray['subject'])) {

-								$subject .= $hookmanager->resArray['subject'];

-							}

-							if (!empty($hookmanager->resArray['message'])) {

-								$message .= $hookmanager->resArray['message'];

-							}

-						}

-

-						$mailfile = new CMailFile(

+						if (empty($reshook))

+						{

+							if (!empty($hookmanager->resArray['subject'])) $subject .= $hookmanager->resArray['subject'];

+							if (!empty($hookmanager->resArray['message'])) $message .= $hookmanager->resArray['message'];

+						}

+

+                        $mailfile = new CMailFile(

@@ -721,8 +558,9 @@
-							'',

-							'',

-							$trackid,

-							'',

-							'notification'

-						);

-

-						if ($mailfile->sendfile()) {

+                            '',

+                            '',

+                            $trackid,

+                            '',

+                            'notification'

+                        );

+

+						if ($mailfile->sendfile())

+						{

@@ -730,5 +568,2 @@
-								$sql = "INSERT INTO ".$this->db->prefix()."notify (daten, fk_action, fk_soc, fk_user, type, objet_type, type_target, objet_id, email)";

-								$sql .= " VALUES ('".$this->db->idate(dol_now())."', ".((int) $notifcodedefid).", ".($object->socid > 0 ? ((int) $object->socid) : 'null').", ".((int) $obj->cid).", '".$this->db->escape($obj->type)."', '".$this->db->escape($object_type)."', '".$this->db->escape($obj->type_target)."', ".((int) $object->id).", '".$this->db->escape($obj->email)."')";

-							} else {

-								$sql = "INSERT INTO ".$this->db->prefix()."notify (daten, fk_action, fk_soc, fk_contact, type, objet_type, type_target, objet_id, email)";

-								$sql .= " VALUES ('".$this->db->idate(dol_now())."', ".((int) $notifcodedefid).", ".($object->socid > 0 ? ((int) $object->socid) : 'null').", ".((int) $obj->cid).", '".$this->db->escape($obj->type)."', '".$this->db->escape($object_type)."', '".$this->db->escape($obj->type_target)."', ".((int) $object->id).", '".$this->db->escape($obj->email)."')";

+	 							$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_user, type, objet_type, type_target, objet_id, email)";

+								$sql .= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid ? $object->socid : 'null').", ".$obj->cid.", '".$obj->type."', '".$object_type."', '".$obj->type_target."', ".$object->id.", '".$this->db->escape($obj->email)."')";

@@ -736 +571,6 @@
-							if (!$this->db->query($sql)) {

+							else {

+								$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_contact, type, objet_type, type_target, objet_id, email)";

+								$sql .= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid ? $object->socid : 'null').", ".$obj->cid.", '".$obj->type."', '".$object_type."', '".$obj->type_target."', ".$object->id.", '".$this->db->escape($obj->email)."')";

+							}

+							if (!$this->db->query($sql))

+							{

@@ -739 +579,3 @@
-						} else {

+						}

+						else

+						{

@@ -743 +585,3 @@
-					} else {

+					}

+					else

+				    {

@@ -748,2 +591,0 @@
-			} else {

-				dol_syslog("No notification to thirdparty sent, nothing into notification setup for the thirdparty socid = ".(empty($object->socid) ? '' : $object->socid));

@@ -751,2 +593,8 @@
-		} else {

-			$error++;

+			else

+			{

+				dol_syslog("No notification to thirdparty sent, nothing into notification setup for the thirdparty socid = ".$object->socid);

+			}

+		}

+		else

+		{

+	   		$error++;

@@ -755 +603 @@
-			return -1;

+	   		return -1;

@@ -759,3 +607,4 @@
-		// TODO Move vars NOTIFICATION_FIXEDEMAIL into table llx_notify_def and inclulde the case into previous loop of sql result

-		if (!$error) {

-			foreach ($conf->global as $key => $val) {

+		if (!$error)

+		{

+			foreach ($conf->global as $key => $val)

+			{

@@ -763,5 +612 @@
-				if ($val == '' || !preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) {

-					continue;

-				}

-

-				$sendto = $val;

+				if ($val == '' || !preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;

@@ -770 +615,2 @@
-				if (!empty($object->total_ht) && $object->total_ht <= $threshold) {

+				if (!empty($object->total_ht) && $object->total_ht <= $threshold)

+				{

@@ -774,0 +621,3 @@
+				$param = 'NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_'.$reg[1];

+

+				$sendto = $conf->global->$param;

@@ -776,3 +625 @@
-				if ($notifcodedefid <= 0) {

-					dol_print_error($this->db, 'Failed to get id from code');

-				}

+				if ($notifcodedefid <= 0) dol_print_error($this->db, 'Failed to get id from code');

@@ -785,3 +632 @@
-				$appli = $mysoc->name;

-

-				$subject = '['.$appli.'] '.$langs->transnoentitiesnoconv("DolibarrNotification").($projtitle ? ' '.$projtitle : '');

+				$subject = '['.$mysoc->name.'] '.$langs->transnoentitiesnoconv("DolibarrNotification").($projtitle ? ' '.$projtitle : '');

@@ -791,2 +636,2 @@
-						$link = '<a href="'.$urlwithroot.'/compta/facture/card.php?facid='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';

-						$dir_output = $conf->facture->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'invoice');

+						$link = '<a href="'.$urlwithroot.'/compta/facture/card.php?facid='.$object->id.'">'.$newref.'</a>';

+						$dir_output = $conf->facture->dir_output;

@@ -797,2 +642,2 @@
-						$link = '<a href="'.$urlwithroot.'/compta/facture/card.php?facid='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';

-						$dir_output = $conf->facture->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'invoice');

+						$link = '<a href="'.$urlwithroot.'/compta/facture/card.php?facid='.$object->id.'">'.$newref.'</a>';

+						$dir_output = $conf->facture->dir_output;

@@ -803,2 +648,2 @@
-						$link = '<a href="'.$urlwithroot.'/commande/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';

-						$dir_output = $conf->commande->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'commande');

+						$link = '<a href="'.$urlwithroot.'/commande/card.php?id='.$object->id.'">'.$newref.'</a>';

+						$dir_output = $conf->commande->dir_output;

@@ -808,6 +652,0 @@
-					case 'ORDER_CLOSE':

-						$link = '<a href="'.$urlwithroot.'/commande/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';

-						$dir_output = $conf->commande->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'commande');

-						$object_type = 'order';

-						$mesg = $langs->transnoentitiesnoconv("EMailTextOrderClose", $link);

-						break;

@@ -815,2 +654,2 @@
-						$link = '<a href="'.$urlwithroot.'/comm/propal/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';

-						$dir_output = $conf->propal->multidir_output[$object->entity]."/".get_exdir(0, 0, 0, 1, $object, 'propal');

+						$link = '<a href="'.$urlwithroot.'/comm/propal/card.php?id='.$object->id.'">'.$newref.'</a>';

+						$dir_output = $conf->propal->multidir_output[$object->entity];

@@ -821,2 +660,2 @@
-						$link = '<a href="'.$urlwithroot.'/comm/propal/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';

-						$dir_output = $conf->propal->multidir_output[$object->entity]."/".get_exdir(0, 0, 0, 1, $object, 'propal');

+						$link = '<a href="'.$urlwithroot.'/comm/propal/card.php?id='.$object->id.'">'.$newref.'</a>';

+						$dir_output = $conf->propal->multidir_output[$object->entity];

@@ -827 +666 @@
-						$link = '<a href="'.$urlwithroot.'/fichinter/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';

+						$link = '<a href="'.$urlwithroot.'/fichinter/card.php?id='.$object->id.'">'.$newref.'</a>';

@@ -833 +672 @@
-						$link = '<a href="'.$urlwithroot.'/fichinter/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';

+						$link = '<a href="'.$urlwithroot.'/fichinter/card.php?id='.$object->id.'">'.$newref.'</a>';

@@ -838,6 +676,0 @@
-					case 'FICHINTER_CLOSE':

-						$link = '<a href="'.$urlwithroot.'/fichinter/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';

-						$dir_output = $conf->facture->dir_output;

-						$object_type = 'ficheinter';

-						$mesg = $langs->transnoentitiesnoconv("EMailTextInterventionClosed", $link);

-						break;

@@ -845,2 +678,2 @@
-						$link = '<a href="'.$urlwithroot.'/fourn/commande/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';

-						$dir_output = $conf->fournisseur->commande->multidir_output[$object->entity]."/".get_exdir(0, 0, 0, 1, $object);

+						$link = '<a href="'.$urlwithroot.'/fourn/commande/card.php?id='.$object->id.'">'.$newref.'</a>';

+						$dir_output = $conf->fournisseur->commande->dir_output;

@@ -849 +682 @@
-						$mesg .= $langs->transnoentitiesnoconv("EMailTextSupplierOrderValidatedBy", $link, $user->getFullName($langs));

+						$mesg .= $langs->transnoentitiesnoconv("EMailTextOrderValidatedBy", $link, $user->getFullName($langs));

@@ -853,2 +686,2 @@
-						$link = '<a href="'.$urlwithroot.'/fourn/commande/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';

-						$dir_output = $conf->fournisseur->commande->multidir_output[$object->entity]."/".get_exdir(0, 0, 0, 1, $object);

+						$link = '<a href="'.$urlwithroot.'/fourn/commande/card.php?id='.$object->id.'">'.$newref.'</a>';

+						$dir_output = $conf->fournisseur->commande->dir_output;

@@ -857 +690 @@
-						$mesg .= $langs->transnoentitiesnoconv("EMailTextSupplierOrderApprovedBy", $link, $user->getFullName($langs));

+						$mesg .= $langs->transnoentitiesnoconv("EMailTextOrderApprovedBy", $link, $user->getFullName($langs));

@@ -860,3 +693,3 @@
-					case 'ORDER_SUPPLIER_SUBMIT':

-						$link = '<a href="'.$urlwithroot.'/fourn/commande/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';

-						$dir_output = $conf->fournisseur->commande->multidir_output[$object->entity]."/".get_exdir(0, 0, 0, 1, $object);

+					case 'ORDER_SUPPLIER_APPROVE2':

+						$link = '<a href="'.$urlwithroot.'/fourn/commande/card.php?id='.$object->id.'">'.$newref.'</a>';

+						$dir_output = $conf->fournisseur->commande->dir_output;

@@ -865 +698 @@
-						$mesg .= $langs->transnoentitiesnoconv("EMailTextSupplierOrderSubmittedBy", $link, $user->getFullName($langs));

+						$mesg .= $langs->transnoentitiesnoconv("EMailTextOrderApprovedBy", $link, $user->getFullName($langs));

@@ -869 +702 @@
-						$link = '<a href="'.$urlwithroot.'/fourn/commande/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';

+						$link = '<a href="'.$urlwithroot.'/fourn/commande/card.php?id='.$object->id.'">'.$newref.'</a>';

@@ -873 +706 @@
-						$mesg .= $langs->transnoentitiesnoconv("EMailTextSupplierOrderRefusedBy", $link, $user->getFullName($langs));

+						$mesg .= $langs->transnoentitiesnoconv("EMailTextOrderRefusedBy", $link, $user->getFullName($langs));

@@ -877,2 +710,2 @@
-						$link = '<a href="'.$urlwithroot.'/expedition/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';

-						$dir_output = $conf->expedition->dir_output."/sending/".get_exdir(0, 0, 0, 1, $object, 'shipment');

+						$link = '<a href="'.$urlwithroot.'/expedition/card.php?id='.$object->id.'">'.$newref.'</a>';

+						$dir_output = $conf->expedition->dir_output.'/sending/';

@@ -883 +716 @@
-						$link = '<a href="'.$urlwithroot.'/expensereport/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';

+						$link = '<a href="'.$urlwithroot.'/expensereport/card.php?id='.$object->id.'">'.$newref.'</a>';

@@ -889 +722 @@
-						$link = '<a href="'.$urlwithroot.'/expensereport/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';

+						$link = '<a href="'.$urlwithroot.'/expensereport/card.php?id='.$object->id.'">'.$newref.'</a>';

@@ -895 +728 @@
-						$link = '<a href="'.$urlwithroot.'/holiday/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';

+						$link = '<a href="'.$urlwithroot.'/holiday/card.php?id='.$object->id.'">'.$newref.'</a>';

@@ -901 +734 @@
-						$link = '<a href="'.$urlwithroot.'/holiday/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';

+						$link = '<a href="'.$urlwithroot.'/holiday/card.php?id='.$object->id.'">'.$newref.'</a>';

@@ -906,11 +738,0 @@
-					case 'ACTION_CREATE':

-						$link = '<a href="'.$urlwithroot.'/comm/action/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';

-						$dir_output = $conf->agenda->dir_output;

-						$object_type = 'action';

-						$mesg = $langs->transnoentitiesnoconv("EMailTextActionAdded", $link);

-						break;

-					default:

-						$object_type = $object->element;

-						$dir_output = $conf->$object_type->multidir_output[$object->entity ? $object->entity : $conf->entity]."/".get_exdir(0, 0, 0, 1, $object, $object_type);

-						$mesg = $langs->transnoentitiesnoconv('Notify_'.$notifcode).' '.$newref;

-						break;

@@ -920 +742,2 @@
-				if (!dol_is_file($pdf_path)) {

+				if (!dol_is_file($pdf_path))

+				{

@@ -923 +746,3 @@
-				} else {

+				}

+				else

+				{

@@ -925,28 +750,7 @@
-					$filename_list[] = $pdf_path;

-					$mimetype_list[] = mime_content_type($filepdf);

-					$mimefilename_list[] = $ref.".pdf";

-				}

-

-				// if an e-mail template is configured for this notification code (for instance

-				// 'SHIPPING_VALIDATE_TEMPLATE'), we fetch this template by its label. Otherwise, a default message

-				// content will be sent.

-				$mailTemplateLabel = isset($conf->global->{$notifcode.'_TEMPLATE'}) ? $conf->global->{$notifcode.'_TEMPLATE'} : '';

-				$emailTemplate = null;

-				if (!empty($mailTemplateLabel)) {

-					include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';

-					$formmail = new FormMail($this->db);

-					$emailTemplate = $formmail->getEMailTemplate($this->db, $object_type.'_send', $user, $langs, 0, 1, $labeltouse);

-				}

-				if (!empty($mailTemplateLabel) && is_object($emailTemplate) && $emailTemplate->id > 0) {

-					$substitutionarray = getCommonSubstitutionArray($langs, 0, null, $object);

-					complete_substitutions_array($substitutionarray, $langs, $object);

-					$subject = make_substitutions($emailTemplate->topic, $substitutionarray, $langs);

-					$message = make_substitutions($emailTemplate->content, $substitutionarray, $langs);

-				} else {

-					$message = '';

-					$message .= $langs->transnoentities("YouReceiveMailBecauseOfNotification2", $application, $mysoc->name)."\n";

-					$message .= "\n";

-					$message .= $mesg;

-

-					$message = nl2br($message);

-				}

+				}

+

+				$message .= $langs->transnoentities("YouReceiveMailBecauseOfNotification2", $application, $mysoc->name)."\n";

+				$message .= "\n";

+				$message .= $mesg;

+

+				$message = nl2br($message);

@@ -955 +759,2 @@
-				if (preg_match('/__SUPERVISOREMAIL__/', $sendto)) {

+				if (preg_match('/__SUPERVISOREMAIL__/', $sendto))

+				{

@@ -957 +762,2 @@
-					if ($user->fk_user > 0) {

+					if ($user->fk_user > 0)

+					{

@@ -960,3 +766 @@
-						if ($supervisoruser->email) {

-							$newval = trim(dolGetFirstLastname($supervisoruser->firstname, $supervisoruser->lastname).' <'.$supervisoruser->email.'>');

-						}

+						if ($supervisoruser->email) $newval = trim(dolGetFirstLastname($supervisoruser->firstname, $supervisoruser->lastname).' <'.$supervisoruser->email.'>');

@@ -971,2 +775,3 @@
-				if ($sendto) {

-					$parameters = array('notifcode'=>$notifcode, 'sendto'=>$sendto, 'replyto'=>$replyto, 'file'=>$filename_list, 'mimefile'=>$mimetype_list, 'filename'=>$mimefilename_list, 'subject'=>&$subject, 'message'=>&$message);

+				if ($sendto)

+				{

+					$parameters = array('notifcode'=>$notifcode, 'sendto'=>$sendto, 'replyto'=>$replyto, 'file'=>$filename_list, 'mimefile'=>$mimetype_list, 'filename'=>$mimefilename_list);

@@ -974,14 +779,6 @@
-					if (empty($reshook)) {

-						if (!empty($hookmanager->resArray['files'])) {

-							$filename_list = $hookmanager->resArray['files']['file'];

-							$mimetype_list = $hookmanager->resArray['files']['mimefile'];

-							$mimefilename_list = $hookmanager->resArray['files']['filename'];

-						}

-						if (!empty($hookmanager->resArray['subject'])) {

-							$subject .= $hookmanager->resArray['subject'];

-						}

-						if (!empty($hookmanager->resArray['message'])) {

-							$message .= $hookmanager->resArray['message'];

-						}

-					}

-					$mailfile = new CMailFile(

+					if (empty($reshook))

+					{

+						if (!empty($hookmanager->resArray['subject'])) $subject .= $hookmanager->resArray['subject'];

+						if (!empty($hookmanager->resArray['message'])) $message .= $hookmanager->resArray['message'];

+					}

+                    $mailfile = new CMailFile(

@@ -999,5 +796,5 @@
-						'',

-						$trackid,

-						'',

-						'',

-						'notification'

+                        '',

+                        $trackid,

+                        '',

+                        '',

+                        'notification'

@@ -1006,4 +803,6 @@
-					if ($mailfile->sendfile()) {

-						$sql = "INSERT INTO ".$this->db->prefix()."notify (daten, fk_action, fk_soc, fk_contact, type, type_target, objet_type, objet_id, email)";

-						$sql .= " VALUES ('".$this->db->idate(dol_now())."', ".((int) $notifcodedefid).", ".($object->socid > 0 ? ((int) $object->socid) : 'null').", null, 'email', 'tofixedemail', '".$this->db->escape($object_type)."', ".((int) $object->id).", '".$this->db->escape($sendto)."')";

-						if (!$this->db->query($sql)) {

+					if ($mailfile->sendfile())

+					{

+						$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_contact, type, type_target, objet_type, objet_id, email)";

+						$sql .= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid ? $object->socid : 'null').", null, 'email', 'tofixedemail', '".$object_type."', ".$object->id.", '".$this->db->escape($conf->global->$param)."')";

+						if (!$this->db->query($sql))

+						{

@@ -1012 +811,3 @@
-					} else {

+					}

+					else

+					{

@@ -1020,5 +821,2 @@
-		if (!$error) {

-			return $num;

-		} else {

-			return -1 * $error;

-		}

+		if (!$error) return $num;

+		else return -1 * $error;

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_openid.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_openid.class.php
@@ -29,503 +29,536 @@
-	public $openid_url_identity;

-	public $URLs = array();

-	public $error = array();

-	public $fields = array(

-		'required' => array(),

-		'optional' => array(),

-	);

-

-	/**

-	 * Constructor

-	 */

-	public function __construct()

-	{

-		if (!function_exists('curl_exec')) {

-			die('Error: Class SimpleOpenID requires curl extension to work');

-		}

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 * SetOpenIDServer

-	 *

-	 * @param	string	$a		Server

-	 * @return	void

-	 */

-	public function SetOpenIDServer($a)

-	{

-		// phpcs:enable

-		$this->URLs['openid_server'] = $a;

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 * SetOpenIDServer

-	 *

-	 * @param	string	$a		Server

-	 * @return	void

-	 */

-	public function SetTrustRoot($a)

-	{

-		// phpcs:enable

-		$this->URLs['trust_root'] = $a;

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 * SetOpenIDServer

-	 *

-	 * @param	string	$a		Server

-	 * @return	void

-	 */

-	public function SetCancelURL($a)

-	{

-		// phpcs:enable

-		$this->URLs['cancel'] = $a;

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 * SetApprovedURL

-	 *

-	 * @param	string	$a		Server

-	 * @return	void

-	 */

-	public function SetApprovedURL($a)

-	{

-		// phpcs:enable

-		$this->URLs['approved'] = $a;

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 * SetRequiredFields

-	 *

-	 * @param	string|array	$a		Server

-	 * @return	void

-	 */

-	public function SetRequiredFields($a)

-	{

-		// phpcs:enable

-		if (is_array($a)) {

-			$this->fields['required'] = $a;

-		} else {

-			$this->fields['required'][] = $a;

-		}

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 * SetOptionalFields

-	 *

-	 * @param	string|array	$a		Server

-	 * @return	void

-	 */

-	public function SetOptionalFields($a)

-	{

-		// phpcs:enable

-		if (is_array($a)) {

-			$this->fields['optional'] = $a;

-		} else {

-			$this->fields['optional'][] = $a;

-		}

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 * SetIdentity

-	 *

-	 * @param	string  $a		Server

-	 * @return	void

-	 */

-	public function SetIdentity($a)

-	{

-		// phpcs:enable

-		// Set Identity URL

-		if ((stripos($a, 'http://') === false)

-		&& (stripos($a, 'https://') === false)) {

-			$a = 'http://'.$a;

-		}

-		/*

-		 $u = parse_url(trim($a));

-		 if (!isset($u['path'])){

-		 $u['path'] = '/';

-		 }else if(substr($u['path'],-1,1) == '/'){

-		 $u['path'] = substr($u['path'], 0, strlen($u['path'])-1);

-		 }

-		 if (isset($u['query'])){ // If there is a query string, then use identity as is

-		 $identity = $a;

-		 }else{

-		 $identity = $u['scheme'] . '://' . $u['host'] . $u['path'];

-		 }

-		*/

-		$this->openid_url_identity = $a;

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 * GetIdentity

-	 *

-	 * @return	string

-	 */

-	public function GetIdentity()

-	{

-		// phpcs:enable

-		// Get Identity

-		return $this->openid_url_identity;

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 * SetOpenIDServer

-	 *

-	 * @return	array

-	 */

-	public function GetError()

-	{

-		// phpcs:enable

-		$e = $this->error;

-		return array('code'=>$e[0], 'description'=>$e[1]);

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 * ErrorStore

-	 *

-	 * @param	string	$code		Code

-	 * @param	string	$desc		Description

-	 * @return	void

-	 */

-	public function ErrorStore($code, $desc = null)

-	{

-		// phpcs:enable

-		$errs['OPENID_NOSERVERSFOUND'] = 'Cannot find OpenID Server TAG on Identity page.';

-		if ($desc == null) {

-			$desc = $errs[$code];

-		}

-		$this->error = array($code, $desc);

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 * IsError

-	 *

-	 * @return	boolean

-	 */

-	public function IsError()

-	{

-		// phpcs:enable

-		if (count($this->error) > 0) {

-			return true;

-		} else {

-			return false;

-		}

-	}

-

-	/**

-	 * splitResponse

-	 *

-	 * @param	string	$response		Server

-	 * @return	array

-	 */

-	public function splitResponse($response)

-	{

-		$r = array();

-		$response = explode("\n", $response);

-		foreach ($response as $line) {

-			$line = trim($line);

-			if ($line != "") {

-				list($key, $value) = explode(":", $line, 2);

-				$r[trim($key)] = trim($value);

-			}

-		}

-		return $r;

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 * OpenID_Standarize

-	 *

-	 * @param	string	$openid_identity		Server

-	 * @return	string

-	 */

-	public function OpenID_Standarize($openid_identity = null)

-	{

-		// phpcs:enable

-		if ($openid_identity === null) {

-			$openid_identity = $this->openid_url_identity;

-		}

-

-		$u = parse_url(strtolower(trim($openid_identity)));

-

-		if (!isset($u['path']) || ($u['path'] == '/')) {

-			$u['path'] = '';

-		}

-		if (substr($u['path'], -1, 1) == '/') {

-			$u['path'] = substr($u['path'], 0, strlen($u['path']) - 1);

-		}

-		if (isset($u['query'])) { // If there is a query string, then use identity as is

-			return $u['host'].$u['path'].'?'.$u['query'];

-		} else {

-			return $u['host'].$u['path'];

-		}

-	}

-

-	/**

-	 * array2url

-	 *

-	 * @param 	array	$arr		An array

-	 * @return false|string		false if KO, string of url if OK

-	 */

-	public function array2url($arr)

-	{

-		// converts associated array to URL Query String

-		if (!is_array($arr)) {

-			return false;

-		}

-		$query = '';

-		foreach ($arr as $key => $value) {

-			$query .= $key."=".$value."&";

-		}

-		return $query;

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 * FSOCK_Request

-	 *

-	 * @param string 	$url		URL

-	 * @param string	$method		Method

-	 * @param string	$params		Params

-	 * @return boolean|void			True if success, False if error

-	 */

-	public function FSOCK_Request($url, $method = "GET", $params = "")

-	{

-		// phpcs:enable

-		$fp = fsockopen("ssl://www.myopenid.com", 443, $errno, $errstr, 3); // Connection timeout is 3 seconds

-		if (!$fp) {

-			$this->ErrorStore('OPENID_SOCKETERROR', $errstr);

-			return false;

-		} else {

-			$request = $method." /server HTTP/1.0\r\n";

-			$request .= "User-Agent: Dolibarr\r\n";

-			$request .= "Connection: close\r\n\r\n";

-			fwrite($fp, $request);

-			stream_set_timeout($fp, 4); // Connection response timeout is 4 seconds

-			$res = fread($fp, 2000);

-			$info = stream_get_meta_data($fp);

-			fclose($fp);

-

-			if ($info['timed_out']) {

-				$this->ErrorStore('OPENID_SOCKETTIMEOUT');

-			} else {

-				return $res;

-			}

-		}

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 * HTML2OpenIDServer

-	 *

-	 * @param string	$content	Content

-	 * @return array				Array of servers

-	 */

-	public function HTML2OpenIDServer($content)

-	{

-		// phpcs:enable

-		$get = array();

-

-		$matches1 = array();

-		$matches2 = array();

-

-		// Get details of their OpenID server and (optional) delegate

-		preg_match_all('/<link[^>]*rel=[\'"]openid.server[\'"][^>]*href=[\'"]([^\'"]+)[\'"][^>]*\/?>/i', $content, $matches1);

-		preg_match_all('/<link[^>]*href=\'"([^\'"]+)[\'"][^>]*rel=[\'"]openid.server[\'"][^>]*\/?>/i', $content, $matches2);

-		$servers = array_merge($matches1[1], $matches2[1]);

-

-		preg_match_all('/<link[^>]*rel=[\'"]openid.delegate[\'"][^>]*href=[\'"]([^\'"]+)[\'"][^>]*\/?>/i', $content, $matches1);

-

-		preg_match_all('/<link[^>]*href=[\'"]([^\'"]+)[\'"][^>]*rel=[\'"]openid.delegate[\'"][^>]*\/?>/i', $content, $matches2);

-

-		$delegates = array_merge($matches1[1], $matches2[1]);

-

-		$ret = array($servers, $delegates);

-		return $ret;

-	}

-

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 * Get openid server

-	 *

-	 * @param	string	$url	Url to found endpoint

-	 * @return 	string			Endpoint

-	 */

-	public function GetOpenIDServer($url = '')

-	{

-		// phpcs:enable

-		global $conf;

-

-		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';

-		if (empty($url)) {

-			$url = $conf->global->MAIN_AUTHENTICATION_OPENID_URL;

-		}

-

-		$response = getURLContent($url, 'GET', '', 1, array(), array('http', 'https'));

-

-		list($servers, $delegates) = $this->HTML2OpenIDServer($response);

-		if (count($servers) == 0) {

-			$this->ErrorStore('OPENID_NOSERVERSFOUND');

-			return false;

-		}

-		if (isset($delegates[0])

-		&& ($delegates[0] != "")) {

-			$this->SetIdentity($delegates[0]);

-		}

-		$this->SetOpenIDServer($servers[0]);

-		return $servers[0];

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 * GetRedirectURL

-	 *

-	 * @return	string

-	 */

-	public function GetRedirectURL()

-	{

-		// phpcs:enable

-		$params = array();

-		$params['openid.return_to'] = urlencode($this->URLs['approved']);

-		$params['openid.mode'] = 'checkid_setup';

-		$params['openid.identity'] = urlencode($this->openid_url_identity);

-		$params['openid.trust_root'] = urlencode($this->URLs['trust_root']);

-

-		if (isset($this->fields['required'])

-		&& (count($this->fields['required']) > 0)) {

-			$params['openid.sreg.required'] = implode(',', $this->fields['required']);

-		}

-		if (isset($this->fields['optional'])

-		&& (count($this->fields['optional']) > 0)) {

-			$params['openid.sreg.optional'] = implode(',', $this->fields['optional']);

-		}

-		return $this->URLs['openid_server']."?".$this->array2url($params);

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 * Redirect

-	 *

-	 * @return	void

-	 */

-	public function Redirect()

-	{

-		// phpcs:enable

-		$redirect_to = $this->GetRedirectURL();

-		if (headers_sent()) { // Use JavaScript to redirect if content has been previously sent (not recommended, but safe)

-			echo '<script nonce="'.getNonce().'" type="text/javascript">window.location=\'';

-			echo $redirect_to;

-			echo '\';</script>';

-		} else {	// Default Header Redirect

-			header('Location: '.$redirect_to);

-		}

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 * ValidateWithServer

-	 *

-	 * @return	boolean

-	 */

-	public function ValidateWithServer()

-	{

-		// phpcs:enable

-		$params = array(

-			'openid.assoc_handle' => urlencode($_GET['openid_assoc_handle']),

-			'openid.signed' => urlencode($_GET['openid_signed']),

-			'openid.sig' => urlencode($_GET['openid_sig'])

-		);

-		// Send only required parameters to confirm validity

-		$arr_signed = explode(",", str_replace('sreg.', 'sreg_', $_GET['openid_signed']));

-		$num = count($arr_signed);

-		for ($i = 0; $i < $num; $i++) {

-			$s = str_replace('sreg_', 'sreg.', $arr_signed[$i]);

-			$c = $_GET['openid_'.$arr_signed[$i]];

-			// if ($c != ""){

-			$params['openid.'.$s] = urlencode($c);

-			// }

-		}

-		$params['openid.mode'] = "check_authentication";

-

-		$openid_server = $this->GetOpenIDServer();

-		if ($openid_server == false) {

-			return false;

-		}

-

-		if (is_array($params)) {

-			$params = $this->array2url($params);

-		}

-

-		$result = getURLContent($openid_server, 'POST', $params);

-

-		$response = $result['content'];

-

-		$data = $this->splitResponse($response);

-		if ($data['is_valid'] == "true") {

-			return true;

-		} else {

-			return false;

-		}

-	}

-

-

-

-

-	/**

-	 * Get XRDS response and set possible servers.

-	 *

-	 * @param	string	$url	Url of endpoint to request

-	 * @return 	string			First endpoint OpenID server found. False if it failed to found.

-	 */

-	public function sendDiscoveryRequestToGetXRDS($url = '')

-	{

-		global $conf;

-

-		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';

-		if (empty($url)) {

-			$url = $conf->global->MAIN_AUTHENTICATION_OPENID_URL;

-		}

-

-		dol_syslog(get_class($this).'::sendDiscoveryRequestToGetXRDS get XRDS');

-

-		$addheaders = array('Accept: application/xrds+xml');

-		$response = getURLContent($url, 'GET', '', 1, $addheaders, array('http', 'https'), 0);

-		/* response should like this:

-		<?xml version="1.0" encoding="UTF-8"?>

-		<xrds:XRDS xmlns:xrds="xri://$xrds" xmlns="xri://$xrd*($v*2.0)">

-		<XRD>

-		<Service priority="0">

-		<Type>http://specs.openid.net/auth/2.0/server</Type>

-		<Type>http://openid.net/srv/ax/1.0</Type>

-		...

-		<URI>https://www.google.com/accounts/o8/ud</URI>

-		</Service>

-		</XRD>

-		</xrds:XRDS>

-		*/

-		$content = $response['content'];

-

-		$server = '';

-		if (preg_match('/'.preg_quote('<URI>', '/').'(.*)'.preg_quote('</URI>', '/').'/is', $content, $reg)) {

-			$server = $reg[1];

-		}

-

-		if (empty($server)) {

-			$this->ErrorStore('OPENID_NOSERVERSFOUND');

-			return false;

-		} else {

-			dol_syslog(get_class($this).'::sendDiscoveryRequestToGetXRDS found endpoint = '.$server);

-			$this->SetOpenIDServer($server);

-			return $server;

-		}

-	}

+    public $openid_url_identity;

+    public $URLs = array();

+    public $error = array();

+    public $fields = array(

+        'required' => array(),

+        'optional' => array(),

+    );

+

+    /**

+     * Constructor

+     */

+    public function __construct()

+    {

+        if (!function_exists('curl_exec'))

+        {

+            die('Error: Class SimpleOpenID requires curl extension to work');

+        }

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     * SetOpenIDServer

+     *

+     * @param	string	$a		Server

+     * @return	void

+     */

+    public function SetOpenIDServer($a)

+    {

+        // phpcs:enable

+        $this->URLs['openid_server'] = $a;

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     * SetOpenIDServer

+     *

+     * @param	string	$a		Server

+     * @return	void

+     */

+    public function SetTrustRoot($a)

+    {

+        // phpcs:enable

+        $this->URLs['trust_root'] = $a;

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     * SetOpenIDServer

+     *

+     * @param	string	$a		Server

+     * @return	void

+     */

+    public function SetCancelURL($a)

+    {

+        // phpcs:enable

+        $this->URLs['cancel'] = $a;

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     * SetApprovedURL

+     *

+     * @param	string	$a		Server

+     * @return	void

+     */

+    public function SetApprovedURL($a)

+    {

+        // phpcs:enable

+        $this->URLs['approved'] = $a;

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     * SetRequiredFields

+     *

+     * @param	string	$a		Server

+     * @return	void

+     */

+    public function SetRequiredFields($a)

+    {

+        // phpcs:enable

+        if (is_array($a)) {

+            $this->fields['required'] = $a;

+        } else {

+            $this->fields['required'][] = $a;

+        }

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     * SetOptionalFields

+     *

+     * @param	string	$a		Server

+     * @return	void

+     */

+    public function SetOptionalFields($a)

+    {

+        // phpcs:enable

+        if (is_array($a)) {

+            $this->fields['optional'] = $a;

+        } else {

+            $this->fields['optional'][] = $a;

+        }

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     * SetIdentity

+     *

+     * @param	string  $a		Server

+     * @return	void

+     */

+    public function SetIdentity($a)

+    {

+        // phpcs:enable

+        // Set Identity URL

+        if ((stripos($a, 'http://') === false)

+        && (stripos($a, 'https://') === false)) {

+            $a = 'http://'.$a;

+        }

+        /*

+         $u = parse_url(trim($a));

+         if (!isset($u['path'])){

+         $u['path'] = '/';

+         }else if(substr($u['path'],-1,1) == '/'){

+         $u['path'] = substr($u['path'], 0, strlen($u['path'])-1);

+         }

+         if (isset($u['query'])){ // If there is a query string, then use identity as is

+         $identity = $a;

+         }else{

+         $identity = $u['scheme'] . '://' . $u['host'] . $u['path'];

+         }

+        */

+        $this->openid_url_identity = $a;

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     * GetIdentity

+     *

+     * @return	string

+     */

+    public function GetIdentity()

+    {

+        // phpcs:enable

+        // Get Identity

+        return $this->openid_url_identity;

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     * SetOpenIDServer

+     *

+     * @return	void

+     */

+    public function GetError()

+    {

+        // phpcs:enable

+        $e = $this->error;

+        return array('code'=>$e[0], 'description'=>$e[1]);

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     * ErrorStore

+     *

+     * @param	string	$code		Code

+     * @param	string	$desc		Description

+     * @return	void

+     */

+    public function ErrorStore($code, $desc = null)

+    {

+        // phpcs:enable

+        $errs['OPENID_NOSERVERSFOUND'] = 'Cannot find OpenID Server TAG on Identity page.';

+        if ($desc == null) {

+            $desc = $errs[$code];

+        }

+        $this->error = array($code, $desc);

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     * IsError

+     *

+     * @return	boolean

+     */

+    public function IsError()

+    {

+        // phpcs:enable

+        if (count($this->error) > 0)

+        {

+            return true;

+        }

+        else

+        {

+            return false;

+        }

+    }

+

+    /**

+     * splitResponse

+     *

+     * @param	string	$response		Server

+     * @return	void

+     */

+    public function splitResponse($response)

+    {

+        $r = array();

+        $response = explode("\n", $response);

+        foreach ($response as $line) {

+            $line = trim($line);

+            if ($line != "") {

+                list($key, $value) = explode(":", $line, 2);

+                $r[trim($key)] = trim($value);

+            }

+        }

+        return $r;

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     * OpenID_Standarize

+     *

+     * @param	string	$openid_identity		Server

+     * @return	string

+     */

+    public function OpenID_Standarize($openid_identity = null)

+    {

+        // phpcs:enable

+        if ($openid_identity === null)

+        $openid_identity = $this->openid_url_identity;

+

+        $u = parse_url(strtolower(trim($openid_identity)));

+

+        if (!isset($u['path']) || ($u['path'] == '/')) {

+            $u['path'] = '';

+        }

+        if (substr($u['path'], -1, 1) == '/') {

+            $u['path'] = substr($u['path'], 0, strlen($u['path']) - 1);

+        }

+        if (isset($u['query'])) { // If there is a query string, then use identity as is

+            return $u['host'].$u['path'].'?'.$u['query'];

+        } else {

+            return $u['host'].$u['path'];

+        }

+    }

+

+    /**

+     * array2url

+     *

+     * @param 	array	$arr		An array

+     * @return false|string		false if KO, string of url if OK

+     */

+    public function array2url($arr)

+    {

+        // converts associated array to URL Query String

+        if (!is_array($arr)) {

+            return false;

+        }

+        $query = '';

+        foreach ($arr as $key => $value) {

+            $query .= $key."=".$value."&";

+        }

+        return $query;

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     * FSOCK_Request

+     *

+     * @param string 	$url		URL

+     * @param string	$method		Method

+     * @param string	$params		Params

+     * @return boolean|void			True if success, False if error

+     */

+    public function FSOCK_Request($url, $method = "GET", $params = "")

+    {

+        // phpcs:enable

+        $fp = fsockopen("ssl://www.myopenid.com", 443, $errno, $errstr, 3); // Connection timeout is 3 seconds

+        if (!$fp) {

+            $this->ErrorStore('OPENID_SOCKETERROR', $errstr);

+            return false;

+        } else {

+            $request = $method." /server HTTP/1.0\r\n";

+            $request .= "User-Agent: Dolibarr\r\n";

+            $request .= "Connection: close\r\n\r\n";

+            fwrite($fp, $request);

+            stream_set_timeout($fp, 4); // Connection response timeout is 4 seconds

+            $res = fread($fp, 2000);

+            $info = stream_get_meta_data($fp);

+            fclose($fp);

+

+            if ($info['timed_out']) {

+                $this->ErrorStore('OPENID_SOCKETTIMEOUT');

+            } else {

+                return $res;

+            }

+        }

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     * CURL_Request

+     *

+     * @param 	string	$url		URL

+     * @param 	string	$method		Method

+     * @param 	string	$params		Params

+     * @return string

+     */

+    public function CURL_Request($url, $method = "GET", $params = "")

+    {

+        // phpcs:enable

+        // Remember, SSL MUST BE SUPPORTED

+        if (is_array($params)) $params = $this->array2url($params);

+

+        $curl = curl_init($url.($method == "GET" && $params != "" ? "?".$params : ""));

+        @curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);

+        curl_setopt($curl, CURLOPT_HEADER, false);

+        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);

+        curl_setopt($curl, CURLOPT_HTTPGET, ($method == "GET"));

+        curl_setopt($curl, CURLOPT_POST, ($method == "POST"));

+        if ($method == "POST") curl_setopt($curl, CURLOPT_POSTFIELDS, $params);

+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);

+        $response = curl_exec($curl);

+

+        if (curl_errno($curl) == 0) {

+            $response;

+        } else {

+            $this->ErrorStore('OPENID_CURL', curl_error($curl));

+        }

+        return $response;

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     * HTML2OpenIDServer

+     *

+     * @param string	$content	Content

+     * @return array				Array of servers

+     */

+    public function HTML2OpenIDServer($content)

+    {

+        // phpcs:enable

+        $get = array();

+

+        // Get details of their OpenID server and (optional) delegate

+        preg_match_all('/<link[^>]*rel=[\'"]openid.server[\'"][^>]*href=[\'"]([^\'"]+)[\'"][^>]*\/?>/i', $content, $matches1);

+        preg_match_all('/<link[^>]*href=\'"([^\'"]+)[\'"][^>]*rel=[\'"]openid.server[\'"][^>]*\/?>/i', $content, $matches2);

+        $servers = array_merge($matches1[1], $matches2[1]);

+

+        preg_match_all('/<link[^>]*rel=[\'"]openid.delegate[\'"][^>]*href=[\'"]([^\'"]+)[\'"][^>]*\/?>/i', $content, $matches1);

+

+        preg_match_all('/<link[^>]*href=[\'"]([^\'"]+)[\'"][^>]*rel=[\'"]openid.delegate[\'"][^>]*\/?>/i', $content, $matches2);

+

+        $delegates = array_merge($matches1[1], $matches2[1]);

+

+        $ret = array($servers, $delegates);

+        return $ret;

+    }

+

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     * Get openid server

+     *

+     * @param	string	$url	Url to found endpoint

+     * @return 	string			Endpoint

+     */

+    public function GetOpenIDServer($url = '')

+    {

+        // phpcs:enable

+        global $conf;

+

+        include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';

+        if (empty($url)) $url = $conf->global->MAIN_AUTHENTICATION_OPENID_URL;

+

+        $response = getURLContent($url);

+

+        list($servers, $delegates) = $this->HTML2OpenIDServer($response);

+        if (count($servers) == 0) {

+            $this->ErrorStore('OPENID_NOSERVERSFOUND');

+            return false;

+        }

+        if (isset($delegates[0])

+        && ($delegates[0] != "")) {

+            $this->SetIdentity($delegates[0]);

+        }

+        $this->SetOpenIDServer($servers[0]);

+        return $servers[0];

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     * GetRedirectURL

+     *

+     * @return	string

+     */

+    public function GetRedirectURL()

+    {

+        // phpcs:enable

+        $params = array();

+        $params['openid.return_to'] = urlencode($this->URLs['approved']);

+        $params['openid.mode'] = 'checkid_setup';

+        $params['openid.identity'] = urlencode($this->openid_url_identity);

+        $params['openid.trust_root'] = urlencode($this->URLs['trust_root']);

+

+        if (isset($this->fields['required'])

+        && (count($this->fields['required']) > 0)) {

+            $params['openid.sreg.required'] = implode(',', $this->fields['required']);

+        }

+        if (isset($this->fields['optional'])

+        && (count($this->fields['optional']) > 0)) {

+            $params['openid.sreg.optional'] = implode(',', $this->fields['optional']);

+        }

+        return $this->URLs['openid_server']."?".$this->array2url($params);

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     * Redirect

+     *

+     * @return	void

+     */

+    public function Redirect()

+    {

+        // phpcs:enable

+        $redirect_to = $this->GetRedirectURL();

+        if (headers_sent())

+        { // Use JavaScript to redirect if content has been previously sent (not recommended, but safe)

+            echo '<script language="JavaScript" type="text/javascript">window.location=\'';

+            echo $redirect_to;

+            echo '\';</script>';

+        }

+        else

+        {	// Default Header Redirect

+            header('Location: '.$redirect_to);

+        }

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     * ValidateWithServer

+     *

+     * @return	boolean

+     */

+    public function ValidateWithServer()

+    {

+        // phpcs:enable

+        $params = array(

+            'openid.assoc_handle' => urlencode($_GET['openid_assoc_handle']),

+            'openid.signed' => urlencode($_GET['openid_signed']),

+            'openid.sig' => urlencode($_GET['openid_sig'])

+        );

+        // Send only required parameters to confirm validity

+        $arr_signed = explode(",", str_replace('sreg.', 'sreg_', $_GET['openid_signed']));

+        $num = count($arr_signed);

+        for ($i = 0; $i < $num; $i++)

+        {

+            $s = str_replace('sreg_', 'sreg.', $arr_signed[$i]);

+            $c = $_GET['openid_'.$arr_signed[$i]];

+            // if ($c != ""){

+            $params['openid.'.$s] = urlencode($c);

+            // }

+        }

+        $params['openid.mode'] = "check_authentication";

+

+        $openid_server = $this->GetOpenIDServer();

+        if ($openid_server == false)

+        {

+            return false;

+        }

+        $response = $this->CURL_Request($openid_server, 'POST', $params);

+        $data = $this->splitResponse($response);

+        if ($data['is_valid'] == "true")

+        {

+            return true;

+        }

+        else

+        {

+            return false;

+        }

+    }

+

+

+

+

+    /**

+     * Get XRDS response and set possible servers.

+     *

+     * @param	string	$url	Url of endpoint to request

+     * @return 	string			First endpoint OpenID server found. False if it failed to found.

+     */

+    public function sendDiscoveryRequestToGetXRDS($url = '')

+    {

+        global $conf;

+

+        include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';

+        if (empty($url)) $url = $conf->global->MAIN_AUTHENTICATION_OPENID_URL;

+

+        dol_syslog(get_class($this).'::sendDiscoveryRequestToGetXRDS get XRDS');

+

+        $addheaders = array('Accept: application/xrds+xml');

+        $response = getURLContent($url, 'GET', '', 1, $addheaders);

+        /* response should like this:

+        <?xml version="1.0" encoding="UTF-8"?>

+        <xrds:XRDS xmlns:xrds="xri://$xrds" xmlns="xri://$xrd*($v*2.0)">

+        <XRD>

+        <Service priority="0">

+        <Type>http://specs.openid.net/auth/2.0/server</Type>

+        <Type>http://openid.net/srv/ax/1.0</Type>

+        ...

+        <URI>https://www.google.com/accounts/o8/ud</URI>

+        </Service>

+        </XRD>

+        </xrds:XRDS>

+        */

+        $content = $response['content'];

+

+        $server = '';

+        if (preg_match('/'.preg_quote('<URI>', '/').'(.*)'.preg_quote('</URI>', '/').'/is', $content, $reg))

+        {

+            $server = $reg[1];

+        }

+

+        if (empty($server))

+        {

+            $this->ErrorStore('OPENID_NOSERVERSFOUND');

+            return false;

+        }

+        else

+        {

+            dol_syslog(get_class($this).'::sendDiscoveryRequestToGetXRDS found endpoint = '.$server);

+            $this->SetOpenIDServer($server);

+            return $server;

+        }

+    }

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_rssparser.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_rssparser.class.php
@@ -4,13 +4,13 @@
- * This program is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 3 of the License, or

- * (at your option) any later version.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program. If not, see <https://www.gnu.org/licenses/>.

- */

+* This program is free software; you can redistribute it and/or modify

+* it under the terms of the GNU General Public License as published by

+* the Free Software Foundation; either version 3 of the License, or

+* (at your option) any later version.

+*

+* This program is distributed in the hope that it will be useful,

+* but WITHOUT ANY WARRANTY; without even the implied warranty of

+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+* GNU General Public License for more details.

+*

+* You should have received a copy of the GNU General Public License

+* along with this program. If not, see <https://www.gnu.org/licenses/>.

+*/

@@ -38,2 +37,0 @@
-

-	public $feed_version;

@@ -54,13 +51,0 @@
-	private $current_namespace;

-	public $items = array();

-	public $current_item = array();

-	public $channel = array();

-	public $textinput = array();

-	public $image = array();

-

-	private $initem;

-	private $intextinput;

-	private $incontent;

-	private $inimage;

-	private $inchannel;

-

@@ -185 +170 @@
-	 * @return array

+	 * @return string

@@ -199,2 +184,2 @@
-	 * 	@param	string	$cachedir	Directory where to save cache file (For example $conf->externalrss->dir_temp)

-	 *	@return	int					Return integer <0 if KO, >0 if OK

+	 * 	@param	string	$cachedir	Directory where to save cache file

+	 *	@return	int					<0 if KO, >0 if OK

@@ -207 +191,0 @@
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';

@@ -213 +197,2 @@
-		if (!dol_is_url($urlRSS)) {

+		if (!dol_is_url($urlRSS))

+		{

@@ -219 +204 @@
-		$newpathofdestfile = $cachedir.'/'.dol_hash($this->_urlRSS, 3); // Force md5 hash (does not contain special chars)

+		$newpathofdestfile = $cachedir.'/'.dol_hash($this->_urlRSS, 3); // Force md5 hash (does not contains special chars)

@@ -227 +212,2 @@
-		if ($cachedelay > 0 && $cachedir) {

+		if ($cachedelay > 0 && $cachedir)

+		{

@@ -229 +215,2 @@
-			if ($filedate >= ($nowgmt - $cachedelay)) {

+			if ($filedate >= ($nowgmt - $cachedelay))

+			{

@@ -234 +221,3 @@
-			} else {

+			}

+			else

+			{

@@ -240 +229,2 @@
-		if ($foundintocache) {    // Cache file found and is not too old

+		if ($foundintocache)    // Cache file found and is not too old

+		{

@@ -242 +232,3 @@
-		} else {

+		}

+		else

+		{

@@ -244,15 +236,19 @@
-				$result = getURLContent($this->_urlRSS, 'GET', '', 1, array(), array('http', 'https'), 0);

-

-				if (!empty($result['content'])) {

-					$str = $result['content'];

-				} elseif (!empty($result['curl_error_msg'])) {

-					$this->error = 'Error retrieving URL '.$this->_urlRSS.' - '.$result['curl_error_msg'];

-					return -1;

-				}

-			} catch (Exception $e) {

-				$this->error = 'Error retrieving URL '.$this->_urlRSS.' - '.$e->getMessage();

-				return -2;

-			}

-		}

-

-		if ($str !== false) {

+				ini_set("user_agent", "Dolibarr ERP-CRM RSS reader");

+				ini_set("max_execution_time", $conf->global->MAIN_USE_RESPONSE_TIMEOUT);

+				ini_set("default_socket_timeout", $conf->global->MAIN_USE_RESPONSE_TIMEOUT);

+

+				$opts = array('http'=>array('method'=>"GET"));

+				if (!empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)) $opts['http']['timeout'] = $conf->global->MAIN_USE_CONNECT_TIMEOUT;

+				if (!empty($conf->global->MAIN_PROXY_USE))           $opts['http']['proxy'] = 'tcp://'.$conf->global->MAIN_PROXY_HOST.':'.$conf->global->MAIN_PROXY_PORT;

+				//var_dump($opts);exit;

+				$context = stream_context_create($opts);

+

+				$str = file_get_contents($this->_urlRSS, false, $context);

+			}

+			catch (Exception $e) {

+				print 'Error retrieving URL '.$this->_urlRSS.' - '.$e->getMessage();

+			}

+		}

+

+		if ($str !== false)

+		{

@@ -260 +256,2 @@
-			if (getDolGlobalString('EXTERNALRSS_USE_SIMPLEXML')) {

+			if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))

+			{

@@ -263,6 +259,0 @@
-				if (LIBXML_VERSION < 20900) {

-					// Avoid load of external entities (security problem).

-					// Required only if LIBXML_VERSION < 20900

-					libxml_disable_entity_loader(true);

-				}

-

@@ -270,2 +261,4 @@
-			} else {

-				if (!function_exists('xml_parser_create')) {

+			}

+			else

+			{

+				if (! function_exists('xml_parser_create')) {

@@ -276,19 +269,4 @@
-				try {

-					$xmlparser = xml_parser_create(null);

-

-					if (!is_resource($xmlparser) && !is_object($xmlparser)) {

-						$this->error = "ErrorFailedToCreateParser";

-						return -1;

-					}

-

-					xml_set_object($xmlparser, $this);

-					xml_set_element_handler($xmlparser, 'feed_start_element', 'feed_end_element');

-					xml_set_character_data_handler($xmlparser, 'feed_cdata');

-

-					$status = xml_parse($xmlparser, $str, false);

-

-					xml_parser_free($xmlparser);

-					$rss = $this;

-					//var_dump($status.' '.$rss->_format);exit;

-				} catch (Exception $e) {

-					$rss = null;

+				$xmlparser = xml_parser_create('');

+				if (!is_resource($xmlparser)) {

+					$this->error = "ErrorFailedToCreateParser";

+					return -1;

@@ -295,0 +274,8 @@
+

+				xml_set_object($xmlparser, $this);

+				xml_set_element_handler($xmlparser, 'feed_start_element', 'feed_end_element');

+				xml_set_character_data_handler($xmlparser, 'feed_cdata');

+				$status = xml_parse($xmlparser, $str);

+				xml_parser_free($xmlparser);

+				$rss = $this;

+				//var_dump($rss->_format);exit;

@@ -300 +286,2 @@
-		if ($rss) {

+		if ($rss)

+		{

@@ -302 +289,2 @@
-			if (empty($foundintocache) && $cachedir) {

+			if (empty($foundintocache) && $cachedir)

+			{

@@ -304,3 +292 @@
-				if (!dol_is_dir($cachedir)) {

-					dol_mkdir($cachedir);

-				}

+				if (!dol_is_dir($cachedir)) dol_mkdir($cachedir);

@@ -308 +294,2 @@
-				if ($fp) {

+				if ($fp)

+				{

@@ -311 +298,2 @@
-					dolChmod($newpathofdestfile);

+					if (!empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;

+					@chmod($newpathofdestfile, octdec($newmask));

@@ -314 +302,3 @@
-				} else {

+				}

+				else

+				{

@@ -321 +311,2 @@
-			if (empty($rss->_format)) {    // If format not detected automatically

+			if (empty($rss->_format))    // If format not detected automatically

+			{

@@ -323,2 +314,19 @@
-				if (empty($rss->channel)) {

-					$rss->_format = 'atom';

+				if (empty($rss->channel)) $rss->_format = 'atom';

+			}

+

+			$items = array();

+

+			// Save description entries

+			if ($rss->_format == 'rss')

+			{

+				//var_dump($rss);

+				if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))

+				{

+					if (!empty($rss->channel->language))      $this->_language = (string) $rss->channel->language;

+					if (!empty($rss->channel->generator))     $this->_generator = (string) $rss->channel->generator;

+					if (!empty($rss->channel->copyright))     $this->_copyright = (string) $rss->channel->copyright;

+					if (!empty($rss->channel->lastbuilddate)) $this->_lastbuilddate = (string) $rss->channel->lastbuilddate;

+					if (!empty($rss->channel->image->url[0])) $this->_imageurl = (string) $rss->channel->image->url[0];

+					if (!empty($rss->channel->link))		  $this->_link = (string) $rss->channel->link;

+					if (!empty($rss->channel->title))         $this->_title = (string) $rss->channel->title;

+					if (!empty($rss->channel->description))	  $this->_description = (string) $rss->channel->description;

@@ -326,6 +334,19 @@
-			}

-

-			$items = array();

-

-			// Save description entries

-			if ($rss->_format == 'rss') {

+				else

+				{

+					//var_dump($rss->channel);

+					if (!empty($rss->channel['language']))      $this->_language = (string) $rss->channel['language'];

+					if (!empty($rss->channel['generator']))     $this->_generator = (string) $rss->channel['generator'];

+					if (!empty($rss->channel['copyright']))     $this->_copyright = (string) $rss->channel['copyright'];

+					if (!empty($rss->channel['lastbuilddate'])) $this->_lastbuilddate = (string) $rss->channel['lastbuilddate'];

+					if (!empty($rss->image['url']))             $this->_imageurl = (string) $rss->image['url'];

+					if (!empty($rss->channel['link']))		    $this->_link = (string) $rss->channel['link'];

+					if (!empty($rss->channel['title']))         $this->_title = (string) $rss->channel['title'];

+					if (!empty($rss->channel['description']))   $this->_description = (string) $rss->channel['description'];

+				}

+

+				if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) $items = $rss->channel->item; // With simplexml

+				else $items = $rss->items; // With xmlparse

+				//var_dump($items);exit;

+			}

+			elseif ($rss->_format == 'atom')

+			{

@@ -333,51 +354,7 @@
-				if (getDolGlobalString('EXTERNALRSS_USE_SIMPLEXML')) {

-					if (!empty($rss->channel->language)) {

-						$this->_language = sanitizeVal((string) $rss->channel->language);

-					}

-					if (!empty($rss->channel->generator)) {

-						$this->_generator = sanitizeVal((string) $rss->channel->generator);

-					}

-					if (!empty($rss->channel->copyright)) {

-						$this->_copyright = sanitizeVal((string) $rss->channel->copyright);

-					}

-					if (!empty($rss->channel->lastbuilddate)) {

-						$this->_lastbuilddate = sanitizeVal((string) $rss->channel->lastbuilddate);

-					}

-					if (!empty($rss->channel->image->url[0])) {

-						$this->_imageurl = sanitizeVal((string) $rss->channel->image->url[0]);

-					}

-					if (!empty($rss->channel->link)) {

-						$this->_link = sanitizeVal((string) $rss->channel->link);

-					}

-					if (!empty($rss->channel->title)) {

-						$this->_title = sanitizeVal((string) $rss->channel->title);

-					}

-					if (!empty($rss->channel->description)) {

-						$this->_description = sanitizeVal((string) $rss->channel->description);

-					}

-				} else {

-					//var_dump($rss->channel);

-					if (!empty($rss->channel['language'])) {

-						$this->_language = sanitizeVal((string) $rss->channel['language']);

-					}

-					if (!empty($rss->channel['generator'])) {

-						$this->_generator = sanitizeVal((string) $rss->channel['generator']);

-					}

-					if (!empty($rss->channel['copyright'])) {

-						$this->_copyright = sanitizeVal((string) $rss->channel['copyright']);

-					}

-					if (!empty($rss->channel['lastbuilddate'])) {

-						$this->_lastbuilddate = sanitizeVal((string) $rss->channel['lastbuilddate']);

-					}

-					if (!empty($rss->image['url'])) {

-						$this->_imageurl = sanitizeVal((string) $rss->image['url']);

-					}

-					if (!empty($rss->channel['link'])) {

-						$this->_link = sanitizeVal((string) $rss->channel['link']);

-					}

-					if (!empty($rss->channel['title'])) {

-						$this->_title = sanitizeVal((string) $rss->channel['title']);

-					}

-					if (!empty($rss->channel['description'])) {

-						$this->_description = sanitizeVal((string) $rss->channel['description']);

-					}

+				if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))

+				{

+					if (!empty($rss->generator))     $this->_generator = (string) $rss->generator;

+					if (!empty($rss->lastbuilddate)) $this->_lastbuilddate = (string) $rss->modified;

+					if (!empty($rss->link->href))    $this->_link = (string) $rss->link->href;

+					if (!empty($rss->title))         $this->_title = (string) $rss->title;

+					if (!empty($rss->description))	 $this->_description = (string) $rss->description;

@@ -385,5 +362,12 @@
-

-				if (getDolGlobalString('EXTERNALRSS_USE_SIMPLEXML')) {

-					$items = $rss->channel->item; // With simplexml

-				} else {

-					$items = $rss->items; // With xmlparse

+				else

+				{

+					//if (!empty($rss->channel['rss_language']))	$this->_language = (string) $rss->channel['rss_language'];

+					if (!empty($rss->channel['generator']))			$this->_generator = (string) $rss->channel['generator'];

+					//if (!empty($rss->channel['rss_copyright']))	$this->_copyright = (string) $rss->channel['rss_copyright'];

+					if (!empty($rss->channel['modified']))			$this->_lastbuilddate = (string) $rss->channel['modified'];

+					//if (!empty($rss->image['rss_url']))			$this->_imageurl = (string) $rss->image['rss_url'];

+					if (!empty($rss->channel['link']))				$this->_link = (string) $rss->channel['link'];

+					if (!empty($rss->channel['title']))				$this->_title = (string) $rss->channel['title'];

+					//if (!empty($rss->channel['rss_description']))	$this->_description = (string) $rss->channel['rss_description'];

+

+					$this->_imageurl = $this->getAtomImageUrl($rss->channel);

@@ -390,0 +375,4 @@
+				if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) {

+					$tmprss = xml2php($rss); $items = $tmprss['entry'];

+				} // With simplexml

+				else $items = $rss->items; // With xmlparse

@@ -392,48 +379,0 @@
-			} elseif ($rss->_format == 'atom') {

-				//var_dump($rss);

-				if (getDolGlobalString('EXTERNALRSS_USE_SIMPLEXML')) {

-					if (!empty($rss->generator)) {

-						$this->_generator = sanitizeVal((string) $rss->generator);

-					}

-					if (!empty($rss->lastbuilddate)) {

-						$this->_lastbuilddate = sanitizeVal((string) $rss->modified);

-					}

-					if (!empty($rss->link->href)) {

-						$this->_link = sanitizeVal((string) $rss->link->href);

-					}

-					if (!empty($rss->title)) {

-						$this->_title = sanitizeVal((string) $rss->title);

-					}

-					if (!empty($rss->description)) {

-						$this->_description = sanitizeVal((string) $rss->description);

-					}

-				} else {

-					//if (!empty($rss->channel['rss_language']))	$this->_language = (string) $rss->channel['rss_language'];

-					if (!empty($rss->channel['generator'])) {

-						$this->_generator = sanitizeVal((string) $rss->channel['generator']);

-					}

-					//if (!empty($rss->channel['rss_copyright']))	$this->_copyright = (string) $rss->channel['rss_copyright'];

-					if (!empty($rss->channel['modified'])) {

-						$this->_lastbuilddate = sanitizeVal((string) $rss->channel['modified']);

-					}

-					//if (!empty($rss->image['rss_url']))			$this->_imageurl = (string) $rss->image['rss_url'];

-					if (!empty($rss->channel['link'])) {

-						$this->_link = sanitizeVal((string) $rss->channel['link']);

-					}

-					if (!empty($rss->channel['title'])) {

-						$this->_title = sanitizeVal((string) $rss->channel['title']);

-					}

-					//if (!empty($rss->channel['rss_description']))	$this->_description = (string) $rss->channel['rss_description'];

-

-					if (!empty($rss->channel)) {

-						$this->_imageurl = sanitizeVal($this->getAtomImageUrl($rss->channel));

-					}

-				}

-				if (getDolGlobalString('EXTERNALRSS_USE_SIMPLEXML')) {

-					$tmprss = xml2php($rss);

-					$items = $tmprss['entry'];

-				} else {

-					// With simplexml

-					$items = $rss->items; // With xmlparse

-				}

-				//var_dump($items);exit;

@@ -445,2 +385,4 @@
-			if (is_array($items)) {

-				foreach ($items as $item) {

+			if (is_array($items))

+			{

+				foreach ($items as $item)

+				{

@@ -448,6 +390,8 @@
-					if ($rss->_format == 'rss') {

-						if (getDolGlobalString('EXTERNALRSS_USE_SIMPLEXML')) {

-							$itemLink = sanitizeVal((string) $item->link);

-							$itemTitle = sanitizeVal((string) $item->title);

-							$itemDescription = sanitizeVal((string) $item->description);

-							$itemPubDate = sanitizeVal((string) $item->pubDate);

+					if ($rss->_format == 'rss')

+					{

+						if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))

+						{

+							$itemLink = (string) $item->link;

+							$itemTitle = (string) $item->title;

+							$itemDescription = (string) $item->description;

+							$itemPubDate = (string) $item->pubDate;

@@ -456,7 +400,9 @@
-						} else {

-							$itemLink = sanitizeVal((string) $item['link']);

-							$itemTitle = sanitizeVal((string) $item['title']);

-							$itemDescription = sanitizeVal((string) $item['description']);

-							$itemPubDate = sanitizeVal((string) $item['pubdate']);

-							$itemId = sanitizeVal((string) $item['guid']);

-							$itemAuthor = sanitizeVal((string) ($item['author'] ?? ''));

+						}

+						else

+						{

+							$itemLink = (string) $item['link'];

+							$itemTitle = (string) $item['title'];

+							$itemDescription = (string) $item['description'];

+							$itemPubDate = (string) $item['pubdate'];

+							$itemId = (string) $item['guid'];

+							$itemAuthor = (string) $item['author'];

@@ -467,2 +413,4 @@
-						if (!empty($item->category) && is_array($item->category)) {

-							foreach ($item->category as $cat) {

+						if (is_array($item->category))

+						{

+							foreach ($item->category as $cat)

+							{

@@ -472,15 +420,11 @@
-					} elseif ($rss->_format == 'atom') {

-						if (getDolGlobalString('EXTERNALRSS_USE_SIMPLEXML')) {

-							$itemLink = (isset($item['link']) ? sanitizeVal((string) $item['link']) : '');

-							$itemTitle = sanitizeVal((string) $item['title']);

-							$itemDescription = sanitizeVal($this->getAtomItemDescription($item));

-							$itemPubDate = sanitizeVal((string) $item['created']);

-							$itemId = sanitizeVal((string) $item['id']);

-							$itemAuthor = sanitizeVal((string) ($item['author'] ? $item['author'] : $item['author_name']));

-						} else {

-							$itemLink = (isset($item['link']) ? sanitizeVal((string) $item['link']) : '');

-							$itemTitle = sanitizeVal((string) $item['title']);

-							$itemDescription = sanitizeVal($this->getAtomItemDescription($item));

-							$itemPubDate = sanitizeVal((string) $item['created']);

-							$itemId = sanitizeVal((string) $item['id']);

-							$itemAuthor = sanitizeVal((string) ($item['author'] ? $item['author'] : $item['author_name']));

+					}

+					elseif ($rss->_format == 'atom')

+					{

+						if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))

+						{

+							$itemLink = (isset($item['link']) ? (string) $item['link'] : '');

+							$itemTitle = (string) $item['title'];

+							$itemDescription = $this->getAtomItemDescription($item);

+							$itemPubDate = (string) $item['created'];

+							$itemId = (string) $item['id'];

+							$itemAuthor = (string) ($item['author'] ? $item['author'] : $item['author_name']);

@@ -488,10 +432,9 @@
-						$itemCategory = array();

-					} else {

-						$itemCategory = array();

-						$itemLink = '';

-						$itemTitle = '';

-						$itemDescription = '';

-						$itemPubDate = '';

-						$itemId = '';

-						$itemAuthor = '';

-						print 'ErrorBadFeedFormat';

+						else

+						{

+							$itemLink = (isset($item['link']) ? (string) $item['link'] : '');

+							$itemTitle = (string) $item['title'];

+							$itemDescription = $this->getAtomItemDescription($item);

+							$itemPubDate = (string) $item['created'];

+							$itemId = (string) $item['id'];

+							$itemAuthor = (string) ($item['author'] ? $item['author'] : $item['author_name']);

+						}

@@ -498,0 +442 @@
+					else print 'ErrorBadFeedFormat';

@@ -508,2 +452 @@
-						'author'=>$itemAuthor

-					);

+						'author'=>$itemAuthor);

@@ -514,3 +457 @@
-					if ($i > $maxNb) {

-						break; // We get all records we want

-					}

+					if ($i > $maxNb)    break; // We get all records we want

@@ -521 +462,3 @@
-		} else {

+		}

+		else

+		{

@@ -538 +481 @@
-	public function feed_start_element($p, $element, $attrs)

+	public function feed_start_element($p, $element, &$attrs)

@@ -546 +489,2 @@
-		if (strpos($element, ':')) {

+		if (strpos($element, ':'))

+		{

@@ -549 +493,2 @@
-		if ($ns and $ns != 'rdf') {

+		if ($ns and $ns != 'rdf')

+		{

@@ -554 +499,2 @@
-		if (empty($this->_format)) {

+		if (empty($this->_format))

+		{

@@ -558 +504,2 @@
-			} elseif ($el == 'rss') {

+			}

+			elseif ($el == 'rss') {

@@ -561 +508,2 @@
-			} elseif ($el == 'feed') {

+			}

+			elseif ($el == 'feed') {

@@ -569 +517,2 @@
-		if ($el == 'channel') {

+		if ($el == 'channel')

+		{

@@ -571 +520,3 @@
-		} elseif ($el == 'item' || $el == 'entry') {

+		}

+		elseif ($el == 'item' or $el == 'entry')

+		{

@@ -576,3 +527,9 @@
-		} elseif ($this->_format == 'rss' && $this->current_namespace == '' && $el == 'textinput') {

-			// if we're in the default namespace of an RSS feed,

-			//  record textinput or image fields

+		}

+

+		// if we're in the default namespace of an RSS feed,

+		//  record textinput or image fields

+		elseif (

+		$this->_format == 'rss' and

+		$this->current_namespace == '' and

+		$el == 'textinput' )

+		{

@@ -580 +537,7 @@
-		} elseif ($this->_format == 'rss' && $this->current_namespace == '' && $el == 'image') {

+		}

+

+		elseif (

+		$this->_format == 'rss' and

+		$this->current_namespace == '' and

+		$el == 'image' )

+		{

@@ -582,2 +545,5 @@
-		} elseif ($this->_format == 'atom' && in_array($el, $this->_CONTENT_CONSTRUCTS)) {

-			// handle atom content constructs

+		}

+

+		// handle atom content constructs

+		elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS))

+		{

@@ -590,2 +556,5 @@
-		} elseif ($this->_format == 'atom' && $this->incontent) {

-			// if inside an Atom content construct (e.g. content or summary) field treat tags as text

+		}

+

+		// if inside an Atom content construct (e.g. content or summary) field treat tags as text

+		elseif ($this->_format == 'atom' and $this->incontent)

+		{

@@ -598,5 +567,10 @@
-		} elseif ($this->_format == 'atom' && $el == 'link') {

-			// Atom support many links per containging element.

-			// Magpie treats link elements of type rel='alternate'

-			// as being equivalent to RSS's simple link element.

-			if (isset($attrs['rel']) && $attrs['rel'] == 'alternate') {

+		}

+

+		// Atom support many links per containging element.

+		// Magpie treats link elements of type rel='alternate'

+		// as being equivalent to RSS's simple link element.

+		//

+		elseif ($this->_format == 'atom' and $el == 'link')

+		{

+			if (isset($attrs['rel']) && $attrs['rel'] == 'alternate')

+			{

@@ -604 +578,3 @@
-			} elseif (!isset($attrs['rel'])) {

+			}

+			elseif (!isset($attrs['rel']))

+			{

@@ -606 +582,3 @@
-			} else {

+			}

+			else

+			{

@@ -611,2 +589,3 @@
-		} else {

-			// set stack[0] to current element

+		}

+		// set stack[0] to current element

+		else {

@@ -629 +608,2 @@
-		if ($this->_format == 'atom' and $this->incontent) {

+		if ($this->_format == 'atom' and $this->incontent)

+		{

@@ -631 +611,3 @@
-		} else {

+		}

+		else

+		{

@@ -650 +632,2 @@
-		if ($el == 'item' or $el == 'entry') {

+		if ($el == 'item' or $el == 'entry')

+		{

@@ -654 +637,3 @@
-		} elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'textinput') {

+		}

+		elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'textinput')

+		{

@@ -656 +641,3 @@
-		} elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'image') {

+		}

+		elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'image')

+		{

@@ -658 +645,3 @@
-		} elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS)) {

+		}

+		elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS))

+		{

@@ -660 +649,3 @@
-		} elseif ($el == 'channel' or $el == 'feed') {

+		}

+		elseif ($el == 'channel' or $el == 'feed')

+		{

@@ -662 +653,2 @@
-		} elseif ($this->_format == 'atom' and $this->incontent) {

+		}

+		elseif ($this->_format == 'atom' and $this->incontent) {

@@ -665 +657,2 @@
-			if ($this->stack[0] == $el) {

+			if ($this->stack[0] == $el)

+			{

@@ -667 +660,2 @@
-			} else {

+			}

+			else {

@@ -672 +666,2 @@
-		} else {

+		}

+		else {

@@ -681 +676 @@
-	 * 	To concat 2 strings with no warning if an operand is not defined

+	 * 	To concat 2 string with no warning if an operand is not defined

@@ -693 +687,0 @@
-		return $str1;

@@ -706 +700 @@
-		if (!empty($this->initem)) {

+		if ($this->initem) {

@@ -708 +702,2 @@
-		} elseif (!empty($this->inchannel)) {

+		}

+		elseif ($this->inchannel) {

@@ -725,2 +720,3 @@
-		if (!empty($this->current_namespace)) {

-			if (!empty($this->initem)) {

+		if ($this->current_namespace)

+		{

+			if ($this->initem) {

@@ -728 +724,2 @@
-			} elseif (!empty($this->inchannel)) {

+			}

+			elseif ($this->inchannel) {

@@ -730 +727,2 @@
-			} elseif (!empty($this->intextinput)) {

+			}

+			elseif ($this->intextinput) {

@@ -732 +730,2 @@
-			} elseif (!empty($this->inimage)) {

+			}

+			elseif ($this->inimage) {

@@ -735,2 +734,3 @@
-		} else {

-			if (!empty($this->initem)) {

+		}

+		else {

+			if ($this->initem) {

@@ -738 +738,2 @@
-			} elseif (!empty($this->intextinput)) {

+			}

+			elseif ($this->intextinput) {

@@ -740 +741,2 @@
-			} elseif (!empty($this->inimage)) {

+			}

+			elseif ($this->inimage) {

@@ -742 +744,2 @@
-			} elseif (!empty($this->inchannel)) {

+			}

+			elseif ($this->inchannel) {

@@ -759 +762,2 @@
-		if (isset($item['summary'])) {

+		if (isset($item['summary']))

+		{

@@ -761 +765,3 @@
-		} elseif (isset($item['atom_content'])) {

+		}

+		elseif (isset($item['atom_content']))

+		{

@@ -771 +777,2 @@
-		if (strlen($result) > $maxlength) {

+		if (strlen($result) > $maxlength)

+		{

@@ -787 +794,2 @@
-		if (isset($feed['icon'])) {

+		if (isset($feed['icon']))

+		{

@@ -791 +799,2 @@
-		if (isset($feed['icon'])) {

+		if (isset($feed['icon']))

+		{

@@ -795 +804,2 @@
-		if (isset($feed['webfeeds:logo'])) {

+		if (isset($feed['webfeeds:logo']))

+		{

@@ -799 +809,2 @@
-		if (isset($feed['webfeeds:icon'])) {

+		if (isset($feed['webfeeds:icon']))

+		{

@@ -803 +814,2 @@
-		if (isset($feed['webfeeds:wordmark'])) {

+		if (isset($feed['webfeeds:wordmark']))

+		{

@@ -815,2 +827,2 @@
- * @param	SimpleXMLElement			$xml		Xml

- * @return	array|string

+ * @param	SimpleXMLElement	$xml		Xml

+ * @return	void

@@ -823 +835,2 @@
-	foreach ($xml->children() as $key => $value) {

+	foreach ($xml->children() as $key => $value)

+	{

@@ -827 +840,2 @@
-		foreach ($value->attributes() as $ak => $av) {

+		foreach ($value->attributes() as $ak=>$av)

+		{

@@ -832 +846,2 @@
-		if ($tab === false && in_array($key, array_keys($array))) {

+		if ($tab === false && in_array($key, array_keys($array)))

+		{

@@ -839 +854,3 @@
-		} elseif ($tab === true) {

+		}

+		elseif ($tab === true)

+		{

@@ -842 +859,3 @@
-		} else {

+		}

+		else

+		{

@@ -851 +870,2 @@
-	if ($fils == 0) {

+	if ($fils == 0)

+	{

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_smtps.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_smtps.class.php
@@ -48,388 +48,475 @@
-	/**

-	 * Host Name or IP of SMTP Server to use

-	 */

-	private $_smtpsHost = 'localhost';

-

-	/**

-	 * SMTP Server Port definition. 25 is default value

-	 * This can be defined via a INI file or via a setter method

-	 */

-	private $_smtpsPort = '25';

-

-	/**

-	 * Secure SMTP Server access ID

-	 * This can be defined via a INI file or via a setter method

-	 */

-	private $_smtpsID = null;

-

-	/**

-	 * Secure SMTP Server access Password

-	 * This can be defined via a INI file or via a setter method

-	 */

-	private $_smtpsPW = null;

-

-	/**

-	 * Token in case we use OAUTH2

-	 */

-	private $_smtpsToken = null;

-

-	/**

-	 * Who sent the Message

-	 * This can be defined via a INI file or via a setter method

-	 */

-	private $_msgFrom = null;

-

-	/**

-	 * Where are replies and errors to be sent to

-	 * This can be defined via a INI file or via a setter method

-	 */

-	private $_msgReplyTo = null;

-

-	/**

-	 * Who will the Message be sent to; TO, CC, BCC

-	 * Multi-diminsional array containg addresses the message will

-	 * be sent TO, CC or BCC

-	 */

-	private $_msgRecipients = null;

-

-	/**

-	 * Message Subject

-	 */

-	private $_msgSubject = null;

-

-	/**

-	 * Message Content

-	 *

-	 * @var	array	$_msgContent	Array of messages

-	 */

-	private $_msgContent = array();

-

-	/**

-	 * Custom X-Headers

-	 */

-	private $_msgXheader = null;

-

-	/**

-	 * Character set

-	 * Defaulted to 'iso-8859-1'

-	 */

-	private $_smtpsCharSet = 'iso-8859-1';

-

-	/**

-	 * Message Sensitivity

-	 * Defaults to ZERO - None

-	 */

-	private $_msgSensitivity = 0;

-

-	/**

-	 * Message Sensitivity

-	 */

-	private $_arySensitivity = array(false,

-								  'Personal',

-								  'Private',

-								  'Company Confidential');

-

-	/**

-	 * Message Sensitivity

-	 * Defaults to 3 - Normal

-	 */

-	private $_msgPriority = 3;

-

-	/**

-	 * Message Priority

-	 */

-	private $_aryPriority = array('Bulk',

-								'Highest',

-								'High',

-								'Normal',

-								'Low',

-								'Lowest');

-

-	/**

-	 * Content-Transfer-Encoding

-	 * Defaulted to 0 - 7bit

-	 */

-	private $_smtpsTransEncodeType = 0;

-

-	/**

-	 * Content-Transfer-Encoding

-	 */

-	private $_smtpsTransEncodeTypes = array('7bit', // Simple 7-bit ASCII

-										 '8bit', // 8-bit coding with line termination characters

-										 'base64', // 3 octets encoded into 4 sextets with offset

-										 'binary', // Arbitrary binary stream

-										 'mac-binhex40', // Macintosh binary to hex encoding

-										 'quoted-printable', // Mostly 7-bit, with 8-bit characters encoded as "=HH"

-										 'uuencode'); // UUENCODE encoding

-

-	/**

-	 * Content-Transfer-Encoding

-	 * Defaulted to '7bit'

-	 */

-	private $_smtpsTransEncode = '7bit';

-

-	/**

-	 * Boundary String for MIME seperation

-	 */

-	private $_smtpsBoundary = null;

-

-	/**

-	 * Related Boundary

-	 */

-	private $_smtpsRelatedBoundary = null;

-

-	/**

-	 * Alternative Boundary

-	 */

-	private $_smtpsAlternativeBoundary = null;

-

-	/**

-	 * Determines the method inwhich the message are to be sent.

-	 * - 'sockets' [0] - conect via network to SMTP server - default

-	 * - 'pipe     [1] - use UNIX path to EXE

-	 * - 'phpmail  [2] - use the PHP built-in mail function

-	 * NOTE: Only 'sockets' is implemented

-	 */

-	private $_transportType = 0;

-

-	/**

-	 * If '$_transportType' is set to '1', then this variable is used

-	 * to define the UNIX file system path to the sendmail execuable

-	 */

-	private $_mailPath = '/usr/lib/sendmail';

-

-	/**

-	 * Sets the SMTP server timeout in seconds.

-	 */

-	private $_smtpTimeout = 10;

-

-	/**

-	 * Determines whether to calculate message MD5 checksum.

-	 */

-	private $_smtpMD5 = false;

-

-	/**

-	 * Class error codes and messages

-	 */

-	private $_smtpsErrors = null;

-

-	/**

-	 * Defines log level

-	 *  0 - no logging

-	 *  1 - connectivity logging

-	 *  2 - message generation logging

-	 *  3 - detail logging

-	 */

-	private $_log_level = 0;

-

-	/**

-	 * Place Class in" debug" mode

-	 */

-	private $_debug = false;

-

-

-	// @CHANGE LDR

-	public $log = '';

-	public $lastretval = '';

-

-	/**

-	 * @var resource

-	 */

-	public $socket;

-

-	/**

-	 * @var int

-	 */

-	public $errno;

-

-	/**

-	 * @var string

-	 */

-	public $errstr;

-

-	private $_errorsTo = '';

-	private $_deliveryReceipt = 0;

-	private $_trackId = '';

-	private $_moreinheader = '';

-

-	/**

-	 * An array of options for stream_context_create()

-	 */

-	private $_options = array();

-

-	/**

-	 * Set delivery receipt

-	 *

-	 * @param	array		$_options		An array of options for stream_context_create()

-	 * @return	void

-	 */

-	public function setOptions($_options = array())

-	{

-		$this->_options = $_options;

-	}

-

-	/**

-	 * Set delivery receipt

-	 *

-	 * @param	int		$_val		Value

-	 * @return	void

-	 */

-	public function setDeliveryReceipt($_val = 0)

-	{

-		$this->_deliveryReceipt = $_val;

-	}

-

-	/**

-	 * get delivery receipt

-	 *

-	 * @return	int		Delivery receipt

-	 */

-	public function getDeliveryReceipt()

-	{

-		return $this->_deliveryReceipt;

-	}

-

-	/**

-	 * Set trackid

-	 *

-	 * @param	string		$_val		Value

-	 * @return	void

-	 */

-	public function setTrackId($_val = '')

-	{

-		$this->_trackId = $_val;

-	}

-

-	/**

-	 * Set moreInHeader

-	 *

-	 * @param	string		$_val		Value

-	 * @return	void

-	 */

-	public function setMoreInHeader($_val = '')

-	{

-		$this->_moreinheader = $_val;

-	}

-

-	/**

-	 * get trackid

-	 *

-	 * @return	string		Track id

-	 */

-	public function getTrackId()

-	{

-		return $this->_trackId;

-	}

-

-	/**

-	 * get moreInHeader

-	 *

-	 * @return	string		moreInHeader

-	 */

-	public function getMoreInHeader()

-	{

-		return $this->_moreinheader;

-	}

-

-	/**

-	 * Set errors to

-	 *

-	 * @param	string		$_strErrorsTo		Errors to

-	 * @return	void

-	 */

-	public function setErrorsTo($_strErrorsTo)

-	{

-		if ($_strErrorsTo) {

-			$this->_errorsTo = $this->_strip_email($_strErrorsTo);

-		}

-	}

-

-	/**

-	 * Get errors to

-	 *

-	 * @param	boolean		$_part		Variant

-	 * @return	string					Errors to

-	 */

-	public function getErrorsTo($_part = true)

-	{

-		$_retValue = '';

-

-		if ($_part === true) {

-			$_retValue = $this->_errorsTo;

-		} else {

-			$_retValue = $this->_errorsTo[$_part];

-		}

-

-		return $_retValue;

-	}

-

-	/**

-	 * Set debug

-	 *

-	 * @param	boolean		$_vDebug		Value for debug

-	 * @return 	void

-	 */

-	public function setDebug($_vDebug = false)

-	{

-		$this->_debug = $_vDebug;

-	}

-

-	/**

-	 * build RECIPIENT List, all addresses who will recieve this message

-	 *

-	 * @return void

-	 */

-	public function buildRCPTlist()

-	{

-		// Pull TO list

-		$_aryToList = $this->getTO();

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 * Attempt a connection to mail server

-	 *

-	 * @return mixed  $_retVal   Boolean indicating success or failure on connection

-	 */

-	private function _server_connect()

-	{

-		// phpcs:enable

-		// Default return value

-		$_retVal = true;

-

-		// We have to make sure the HOST given is valid

-		// This is done here because '@fsockopen' will not give me this

-		// information if it failes to connect because it can't find the HOST

-		$host = $this->getHost();

-		$usetls = preg_match('@tls://@i', $host);

-

-		$host = preg_replace('@tcp://@i', '', $host); // Remove prefix

-		$host = preg_replace('@ssl://@i', '', $host); // Remove prefix

-		$host = preg_replace('@tls://@i', '', $host); // Remove prefix

-

-		// @CHANGE LDR

-		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';

-

-		if ((!is_ip($host)) && ((gethostbyname($host)) == $host)) {

-			$this->_setErr(99, $host.' is either offline or is an invalid host name.');

-			$_retVal = false;

-		} else {

-			if (function_exists('stream_socket_client') && !empty($this->_options)) {

-				$socket_context = stream_context_create($this->_options); // An array of options for stream_context_create()

-				$this->socket = @stream_socket_client(

-					preg_replace('@tls://@i', '', $this->getHost()).// Host to 'hit', IP or domain

-					':'.$this->getPort(), // which Port number to use

-					$this->errno, // actual system level error

-					$this->errstr, // and any text that goes with the error

-					$this->_smtpTimeout, // timeout for reading/writing data over the socket

-					STREAM_CLIENT_CONNECT,

-					$socket_context                     // Options for connection

-				);

-			} else {

-				$this->socket = @fsockopen(

-					preg_replace('@tls://@i', '', $this->getHost()), // Host to 'hit', IP or domain

-					$this->getPort(), // which Port number to use

-					$this->errno, // actual system level error

-					$this->errstr, // and any text that goes with the error

-					$this->_smtpTimeout     // timeout for reading/writing data over the socket

-				);

+    /**

+     * Host Name or IP of SMTP Server to use

+     */

+    private $_smtpsHost = 'localhost';

+

+    /**

+     * SMTP Server Port definition. 25 is default value

+     * This can be defined via a INI file or via a setter method

+     */

+    private $_smtpsPort = '25';

+

+    /**

+     * Secure SMTP Server access ID

+     * This can be defined via a INI file or via a setter method

+     */

+    private $_smtpsID = null;

+

+    /**

+     * Secure SMTP Server access Password

+     * This can be defined via a INI file or via a setter method

+     */

+    private $_smtpsPW = null;

+

+    /**

+     * Who sent the Message

+     * This can be defined via a INI file or via a setter method

+     */

+    private $_msgFrom = null;

+

+    /**

+     * Where are replies and errors to be sent to

+     * This can be defined via a INI file or via a setter method

+     */

+    private $_msgReplyTo = null;

+

+    /**

+     * Who will the Message be sent to; TO, CC, BCC

+     * Multi-diminsional array containg addresses the message will

+     * be sent TO, CC or BCC

+     */

+    private $_msgRecipients = null;

+

+    /**

+     * Message Subject

+     */

+    private $_msgSubject = null;

+

+    /**

+     * Message Content

+     */

+    private $_msgContent = null;

+

+    /**

+     * Custom X-Headers

+     */

+    private $_msgXheader = null;

+

+    /**

+     * Character set

+     * Defaulted to 'iso-8859-1'

+     */

+    private $_smtpsCharSet = 'iso-8859-1';

+

+    /**

+     * Message Sensitivity

+     * Defaults to ZERO - None

+     */

+    private $_msgSensitivity = 0;

+

+    /**

+     * Message Sensitivity

+     */

+    private $_arySensitivity = array(false,

+                                  'Personal',

+                                  'Private',

+                                  'Company Confidential');

+

+    /**

+     * Message Sensitivity

+     * Defaults to 3 - Normal

+     */

+    private $_msgPriority = 3;

+

+    /**

+     * Message Priority

+     */

+    private $_aryPriority = array('Bulk',

+                                'Highest',

+                                'High',

+                                'Normal',

+                                'Low',

+                                'Lowest');

+

+    /**

+     * Content-Transfer-Encoding

+     * Defaulted to 0 - 7bit

+     */

+    private $_smtpsTransEncodeType = 0;

+

+    /**

+     * Content-Transfer-Encoding

+     */

+    private $_smtpsTransEncodeTypes = array('7bit', // Simple 7-bit ASCII

+                                         '8bit', // 8-bit coding with line termination characters

+                                         'base64', // 3 octets encoded into 4 sextets with offset

+                                         'binary', // Arbitrary binary stream

+                                         'mac-binhex40', // Macintosh binary to hex encoding

+                                         'quoted-printable', // Mostly 7-bit, with 8-bit characters encoded as "=HH"

+                                         'uuencode'); // UUENCODE encoding

+

+    /**

+     * Content-Transfer-Encoding

+     * Defaulted to '7bit'

+     */

+    private $_smtpsTransEncode = '7bit';

+

+    /**

+     * Boundary String for MIME seperation

+     */

+    private $_smtpsBoundary = null;

+

+    /**

+     * Related Boundary

+     */

+    private $_smtpsRelatedBoundary = null;

+

+    /**

+     * Alternative Boundary

+     */

+    private $_smtpsAlternativeBoundary = null;

+

+    /**

+     * Determines the method inwhich the message are to be sent.

+     * - 'sockets' [0] - conect via network to SMTP server - default

+     * - 'pipe     [1] - use UNIX path to EXE

+     * - 'phpmail  [2] - use the PHP built-in mail function

+     * NOTE: Only 'sockets' is implemented

+     */

+    private $_transportType = 0;

+

+    /**

+     * If '$_transportType' is set to '1', then this variable is used

+     * to define the UNIX file system path to the sendmail execuable

+     */

+    private $_mailPath = '/usr/lib/sendmail';

+

+    /**

+     * Sets the SMTP server timeout in seconds.

+     */

+    private $_smtpTimeout = 10;

+

+    /**

+     * Determines whether to calculate message MD5 checksum.

+     */

+    private $_smtpMD5 = false;

+

+    /**

+     * Class error codes and messages

+     */

+    private $_smtpsErrors = null;

+

+    /**

+     * Defines log level

+     *  0 - no logging

+     *  1 - connectivity logging

+     *  2 - message generation logging

+     *  3 - detail logging

+     */

+    private $_log_level = 0;

+

+    /**

+     * Place Class in" debug" mode

+     */

+    private $_debug = false;

+

+

+    // @CHANGE LDR

+    public $log = '';

+    private $_errorsTo = '';

+    private $_deliveryReceipt = 0;

+    private $_trackId = '';

+    private $_moreInHeader = '';

+

+

+    /**

+     * Set delivery receipt

+     *

+     * @param	int		$_val		Value

+     * @return	void

+     */

+    public function setDeliveryReceipt($_val = 0)

+    {

+        $this->_deliveryReceipt = $_val;

+    }

+

+    /**

+     * get delivery receipt

+     *

+     * @return	int		Delivery receipt

+     */

+    public function getDeliveryReceipt()

+    {

+        return $this->_deliveryReceipt;

+    }

+

+    /**

+     * Set trackid

+     *

+     * @param	string		$_val		Value

+     * @return	void

+     */

+    public function setTrackId($_val = '')

+    {

+        $this->_trackId = $_val;

+    }

+

+    /**

+     * Set moreInHeader

+     *

+     * @param	string		$_val		Value

+     * @return	void

+     */

+    public function setMoreInHeader($_val = '')

+    {

+        $this->_moreinheader = $_val;

+    }

+

+    /**

+     * get trackid

+     *

+     * @return	string		Track id

+     */

+    public function getTrackId()

+    {

+        return $this->_trackId;

+    }

+

+    /**

+     * get moreInHeader

+     *

+     * @return	string		moreInHeader

+     */

+    public function getMoreInHeader()

+    {

+        return $this->_moreinheader;

+    }

+

+    /**

+     * Set errors to

+     *

+     * @param	string		$_strErrorsTo		Errors to

+     * @return	void

+     */

+    public function setErrorsTo($_strErrorsTo)

+    {

+        if ($_strErrorsTo)

+        $this->_errorsTo = $this->_strip_email($_strErrorsTo);

+    }

+

+    /**

+     * Get errors to

+     *

+     * @param	boolean		$_part		Variant

+     * @return	string					Errors to

+     */

+    public function getErrorsTo($_part = true)

+    {

+        $_retValue = '';

+

+        if ($_part === true)

+        $_retValue = $this->_errorsTo;

+        else

+        $_retValue = $this->_errorsTo[$_part];

+

+        return $_retValue;

+    }

+

+    /**

+     * Set debug

+     *

+     * @param	boolean		$_vDebug		Value for debug

+     * @return 	void

+     */

+    public function setDebug($_vDebug = false)

+    {

+        $this->_debug = $_vDebug;

+    }

+

+    /**

+     * build RECIPIENT List, all addresses who will recieve this message

+     *

+     * @return void

+     */

+    public function buildRCPTlist()

+    {

+        // Pull TO list

+        $_aryToList = $this->getTO();

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     * Attempt a connection to mail server

+     *

+     * @return mixed  $_retVal   Boolean indicating success or failure on connection

+     */

+    private function _server_connect()

+    {

+        // phpcs:enable

+        // Default return value

+        $_retVal = true;

+

+        // We have to make sure the HOST given is valid

+        // This is done here because '@fsockopen' will not give me this

+        // information if it failes to connect because it can't find the HOST

+        $host = $this->getHost();

+        $usetls = preg_match('@tls://@i', $host);

+

+        $host = preg_replace('@tcp://@i', '', $host); // Remove prefix

+        $host = preg_replace('@ssl://@i', '', $host); // Remove prefix

+        $host = preg_replace('@tls://@i', '', $host); // Remove prefix

+

+        // @CHANGE LDR

+        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';

+

+        if ((!is_ip($host)) && ((gethostbyname($host)) == $host))

+        {

+            $this->_setErr(99, $host.' is either offline or is an invalid host name.');

+            $_retVal = false;

+        }

+        else

+        {

+            //See if we can connect to the SMTP server

+            if ($this->socket = @fsockopen(

+                preg_replace('@tls://@i', '', $this->getHost()), // Host to 'hit', IP or domain

+                $this->getPort(), // which Port number to use

+                $this->errno, // actual system level error

+                $this->errstr, // and any text that goes with the error

+                $this->_smtpTimeout     // timeout for reading/writing data over the socket

+            )) {

+                // Fix from PHP SMTP class by 'Chris Ryan'

+                // Sometimes the SMTP server takes a little longer to respond

+                // so we will give it a longer timeout for the first read

+                // Windows still does not have support for this timeout function

+                if (function_exists('stream_set_timeout')) stream_set_timeout($this->socket, $this->_smtpTimeout, 0);

+

+                // Check response from Server

+                if ($_retVal = $this->server_parse($this->socket, "220"))

+                $_retVal = $this->socket;

+            }

+            // This connection attempt failed.

+            else

+            {

+                // @CHANGE LDR

+                if (empty($this->errstr)) $this->errstr = 'Failed to connect with fsockopen host='.$this->getHost().' port='.$this->getPort();

+                $this->_setErr($this->errno, $this->errstr);

+                $_retVal = false;

+            }

+        }

+

+        return $_retVal;

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     * Attempt mail server authentication for a secure connection

+     *

+     * @return boolean|null  $_retVal   Boolean indicating success or failure of authentication

+     */

+    private function _server_authenticate()

+    {

+        // phpcs:enable

+        global $conf;

+

+        // Send the RFC2554 specified EHLO.

+        // This improvment as provided by 'SirSir' to

+        // accomodate both SMTP AND ESMTP capable servers

+        $host = $this->getHost();

+        $usetls = preg_match('@tls://@i', $host);

+

+        $host = preg_replace('@tcp://@i', '', $host); // Remove prefix

+        $host = preg_replace('@ssl://@i', '', $host); // Remove prefix

+        $host = preg_replace('@tls://@i', '', $host); // Remove prefix

+

+		if ($usetls && ! empty($conf->global->MAIN_SMTPS_ADD_TLS_TO_HOST_FOR_HELO)) $host = 'tls://'.$host;

+

+        $hosth = $host;

+

+        if (!empty($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO))

+        {

+            // If the from to is 'aaa <bbb@ccc.com>', we will keep 'ccc.com'

+            $hosth = $this->getFrom('addr');

+            $hosth = preg_replace('/^.*</', '', $hosth);

+            $hosth = preg_replace('/>.*$/', '', $hosth);

+            $hosth = preg_replace('/.*@/', '', $hosth);

+        }

+

+        if ($_retVal = $this->socket_send_str('EHLO '.$hosth, '250'))

+        {

+            if ($usetls)

+            {

+                /*

+                The following dialog illustrates how a client and server can start a TLS STARTTLS session

+                S: <waits for connection on TCP port 25>

+                C: <opens connection>

+                S: 220 mail.imc.org SMTP service ready

+                C: EHLO mail.ietf.org

+                S: 250-mail.imc.org offers a warm hug of welcome

+                S: 250 STARTTLS

+                C: STARTTLS

+                S: 220 Go ahead

+                C: <starts TLS negotiation>

+                C & S: <negotiate a TLS session>

+                C & S: <check result of negotiation>

+                // Second pass EHLO

+                C: EHLO client-domain.com

+                S: 250-server-domain.com

+                S: 250 AUTH LOGIN

+                C: <continues by sending an SMTP command

+                */

+                if (!$_retVal = $this->socket_send_str('STARTTLS', 220))

+                {

+                    $this->_setErr(131, 'STARTTLS connection is not supported.');

+                    return $_retVal;

+                }

+

+                // Before 5.6.7:

+                // STREAM_CRYPTO_METHOD_SSLv23_CLIENT = STREAM_CRYPTO_METHOD_SSLv2_CLIENT|STREAM_CRYPTO_METHOD_SSLv3_CLIENT

+                // STREAM_CRYPTO_METHOD_TLS_CLIENT = STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT

+                // PHP >= 5.6.7:

+                // STREAM_CRYPTO_METHOD_SSLv23_CLIENT = STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT

+                // STREAM_CRYPTO_METHOD_TLS_CLIENT = STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT

+

+                $crypto_method = STREAM_CRYPTO_METHOD_TLS_CLIENT;

+                if (defined('STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT')) {

+                    $crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT;

+                    $crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT;

+                }

+

+                if (!stream_socket_enable_crypto($this->socket, true, $crypto_method))

+                {

+                    $this->_setErr(132, 'STARTTLS connection failed.');

+                    return $_retVal;

+                }

+                // Most server servers expect a 2nd pass of EHLO after TLS is established to get another time

+                // the answer with list of supported AUTH methods. They may differs between non STARTTLS and with STARTTLS.

+                if (!$_retVal = $this->socket_send_str('EHLO '.$hosth, '250'))

+                {

+                    $this->_setErr(126, '"'.$hosth.'" does not support authenticated connections.');

+                    return $_retVal;

+                }

+            }

+

+			// Default authentication method is LOGIN

+			if (empty($conf->global->MAIL_SMTP_AUTH_TYPE)) $conf->global->MAIL_SMTP_AUTH_TYPE = 'LOGIN';

+

+            // Send Authentication to Server

+            // Check for errors along the way

+            switch ($conf->global->MAIL_SMTP_AUTH_TYPE) {

+                case 'PLAIN':

+                    $this->socket_send_str('AUTH PLAIN', '334');

+                    // The error here just means the ID/password combo doesn't work.

+                    $_retVal = $this->socket_send_str(base64_encode("\0".$this->_smtpsID."\0".$this->_smtpsPW), '235');

+                    break;

+                case 'LOGIN':	// most common case

+                default:

+                    $this->socket_send_str('AUTH LOGIN', '334');

+                    // User name will not return any error, server will take anything we give it.

+                    $this->socket_send_str(base64_encode($this->_smtpsID), '334');

+                    // The error here just means the ID/password combo doesn't work.

+                    // There is not a method to determine which is the problem, ID or password

+                    $_retVal = $this->socket_send_str(base64_encode($this->_smtpsPW), '235');

+                    break;

+            }

+            if (!$_retVal) {

+                $this->_setErr(130, 'Invalid Authentication Credentials.');

@@ -437,1491 +524,1266 @@
-

-			//See if we can connect to the SMTP server

-			if (is_resource($this->socket)) {

-				// Fix from PHP SMTP class by 'Chris Ryan'

-				// Sometimes the SMTP server takes a little longer to respond

-				// so we will give it a longer timeout for the first read

-				// Windows still does not have support for this timeout function

-				if (function_exists('stream_set_timeout')) {

-					stream_set_timeout($this->socket, $this->_smtpTimeout, 0);

-				}

-

-				// Check response from Server

-				if ($_retVal = $this->server_parse($this->socket, "220")) {

-					$_retVal = $this->socket;

-				}

-			} else {

-				// This connection attempt failed.

-				// @CHANGE LDR

-				if (empty($this->errstr)) {

-					$this->errstr = 'Failed to connect with fsockopen host='.$this->getHost().' port='.$this->getPort();

-				}

-				$this->_setErr($this->errno, $this->errstr);

-				$_retVal = false;

-			}

-		}

-

-		return $_retVal;

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 * Attempt mail server authentication for a secure connection

-	 *

-	 * @return boolean|null  $_retVal   Boolean indicating success or failure of authentication

-	 */

-	private function _server_authenticate()

-	{

-		// phpcs:enable

-		global $conf;

-

-		require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';

-		// Send the RFC2554 specified EHLO.

-		// This improvment as provided by 'SirSir' to

-		// accomodate both SMTP AND ESMTP capable servers

-		$host = $this->getHost();

-		$usetls = preg_match('@tls://@i', $host);

-

-		$host = preg_replace('@tcp://@i', '', $host); // Remove prefix

-		$host = preg_replace('@ssl://@i', '', $host); // Remove prefix

-		$host = preg_replace('@tls://@i', '', $host); // Remove prefix

-

-		if ($usetls && getDolGlobalString('MAIN_SMTPS_ADD_TLS_TO_HOST_FOR_HELO')) {

-			$host = 'tls://'.$host;

-		}

-

-		$hosth = $host;	// so for example 'localhost' or 'smtp-relay.gmail.com'

-

-		if (getDolGlobalString('MAIL_SMTP_USE_FROM_FOR_HELO')) {

-			if (!is_numeric($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO)) {

-				// If value of MAIL_SMTP_USE_FROM_FOR_HELO is a string, we use it as domain name

-				$hosth = $conf->global->MAIL_SMTP_USE_FROM_FOR_HELO;

-			} elseif (getDolGlobalInt('MAIL_SMTP_USE_FROM_FOR_HELO') == 1) {

-				// If value of MAIL_SMTP_USE_FROM_FOR_HELO is 1, we use the domain in the from.

-				// So if the from to is 'aaa <bbb@ccc.com>', we will keep 'ccc.com'

-				$hosth = $this->getFrom('addr');

-				$hosth = preg_replace('/^.*</', '', $hosth);

-				$hosth = preg_replace('/>.*$/', '', $hosth);

-				$hosth = preg_replace('/.*@/', '', $hosth);

-			} elseif (getDolGlobalInt('MAIL_SMTP_USE_FROM_FOR_HELO') == 2) {

-				// If value of MAIL_SMTP_USE_FROM_FOR_HELO is 2, we use the domain in the $dolibarr_main_url_root.

-				global $dolibarr_main_url_root;

-				$hosth = getDomainFromURL($dolibarr_main_url_root, 1);

-			}

-		}

-

-		if ($_retVal = $this->socket_send_str('EHLO '.$hosth, '250')) {

-			if ($usetls) {

-				/*

-				The following dialog illustrates how a client and server can start a TLS STARTTLS session:

-				S: <waits for connection on TCP port 25>

-				C: <opens connection>

-				S: 220 mail.imc.org SMTP service ready

-				C: EHLO mail.ietf.org

-				S: 250-mail.imc.org offers a warm hug of welcome

-				S: 250 STARTTLS

-				C: STARTTLS

-				S: 220 Go ahead

-				C: <starts TLS negotiation>

-				C & S: <negotiate a TLS session>

-				C & S: <check result of negotiation>

-				// Second pass EHLO

-				C: EHLO client-domain.com

-				S: 250-server-domain.com

-				S: 250 AUTH LOGIN

-				C: <continues by sending an SMTP command

-

-				Another example here:

-				S: 220 smtp.server.com Simple Mail Transfer Service Ready

-				C: EHLO client.example.com

-				S: 250-smtp.server.com Hello client.example.com

-				S: 250-SIZE 1000000

-				S: 250-AUTH LOGIN PLAIN CRAM-MD5

-				S: 250-STARTTLS

-				S: 250 HELP

-				C: STARTTLS

-				S: 220 TLS go ahead

-				C: EHLO client.example.com *

-				S: 250-smtp.server.com Hello client.example.com

-				S: 250-SIZE 1000000

-				S: 250-AUTH LOGIN PLAIN CRAM-MD5

-				S: 250 HELP

-				C: AUTH LOGIN

-				S: 334 VXNlcm5hbWU6

-				C: adlxdkej

-				S: 334 UGFzc3dvcmQ6

-				C: lkujsefxlj

-				S: 235 2.7.0 Authentication successful

-				C: MAIL FROM:<mail@samlogic.com>

-				S: 250 OK

-				C: RCPT TO:<john@mail.com>

-				S: 250 OK

-				C: DATA

-				S: 354 Send message, end with a "." on a line by itself

-				C: <The message data (body text, subject, e-mail header, attachments etc) is sent>

-				S .

-				S: 250 OK, message accepted for delivery: queued as 12345

-				C: QUIT

-				S: 221 Bye

-				*/

-				if (!$_retVal = $this->socket_send_str('STARTTLS', 220)) {

-					$this->_setErr(131, 'STARTTLS connection is not supported.');

-					return $_retVal;

-				}

-

-				// Before 5.6.7:

-				// STREAM_CRYPTO_METHOD_SSLv23_CLIENT = STREAM_CRYPTO_METHOD_SSLv2_CLIENT|STREAM_CRYPTO_METHOD_SSLv3_CLIENT

-				// STREAM_CRYPTO_METHOD_TLS_CLIENT = STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT

-				// PHP >= 5.6.7:

-				// STREAM_CRYPTO_METHOD_SSLv23_CLIENT = STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT

-				// STREAM_CRYPTO_METHOD_TLS_CLIENT = STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT

-

-				$crypto_method = STREAM_CRYPTO_METHOD_TLS_CLIENT;

-				if (defined('STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT')) {

-					$crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT;

-					$crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT;

-				}

-

-				if (!stream_socket_enable_crypto($this->socket, true, $crypto_method)) {

-					$this->_setErr(132, 'STARTTLS connection failed.');

-					return $_retVal;

-				}

-				// Most servers expect a 2nd pass of EHLO after TLS is established to get another time

-				// the answer with list of supported AUTH methods. They may differs between non STARTTLS and with STARTTLS.

-				if (! $_retVal = $this->socket_send_str('EHLO '.$hosth, '250')) {

-					$this->_setErr(126, '"'.$hosth.'" does not support authenticated connections or temporary error. Error after 2nd sending EHLO '.$hosth.' : '.$this->lastretval);

-					return $_retVal;

-				}

-			}

-

-			// Default authentication method is LOGIN

-			if (!getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE')) {

-				$conf->global->MAIN_MAIL_SMTPS_AUTH_TYPE = 'LOGIN';

-			}

-

-			// Send Authentication to Server

-			// Check for errors along the way

-			switch ($conf->global->MAIN_MAIL_SMTPS_AUTH_TYPE) {

-				case 'NONE':

-					// Do not send the 'AUTH type' message. For test purpose, if you don't need authentication, it is better to not enter login/pass into setup.

-					$_retVal = true;

-					break;

-				case 'PLAIN':

-					$this->socket_send_str('AUTH PLAIN', '334');

-					// The error here just means the ID/password combo doesn't work.

-					$_retVal = $this->socket_send_str(base64_encode("\0".$this->_smtpsID."\0".$this->_smtpsPW), '235');

-					break;

-				case 'XOAUTH2':

-					// "user=$email\1auth=Bearer $token\1\1"

-					$user = $this->_smtpsID;

-					$token = $this->_smtpsToken;

-					$initRes = "user=".$user."\001auth=Bearer ".$token."\001\001";

-					$_retVal = $this->socket_send_str('AUTH XOAUTH2 '.base64_encode($initRes), '235');

-					if (!$_retVal) {

-						$this->_setErr(130, 'Error when asking for AUTH XOAUTH2');

-					}

-					break;

-				case 'LOGIN':	// most common case

-				default:

-					$_retVal = $this->socket_send_str('AUTH LOGIN', '334');

-					if (!$_retVal) {

-						$this->_setErr(130, 'Error when asking for AUTH LOGIN');

-					} else {

-						// User name will not return any error, server will take anything we give it.

-						$this->socket_send_str(base64_encode($this->_smtpsID), '334');

-						// The error here just means the ID/password combo doesn't work.

-						// There is no method to determine which is the problem, ID or password

-						$_retVal = $this->socket_send_str(base64_encode($this->_smtpsPW), '235');

-					}

-					break;

-			}

-			if (!$_retVal) {

-				$this->_setErr(130, 'Invalid Authentication Credentials.');

-			}

-		} else {

-			$this->_setErr(126, '"'.$host.'" does not support authenticated connections or temporary error. Error after sending EHLO '.$hosth.' : '.$this->lastretval);

-		}

-

-		return $_retVal;

-	}

-

-	/**

-	 * Now send the message

-	 *

-	 * @return boolean|null   Result

-	 */

-	public function sendMsg()

-	{

-		global $conf;

-

-		require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';

-

-		// Default return value

-		$_retVal = false;

-

-		// Connect to Server

-		if ($this->socket = $this->_server_connect()) {

-			// If a User ID *and* a password is given, assume Authentication is desired

-			if (!empty($this->_smtpsID) && (!empty($this->_smtpsPW) || !empty($this->_smtpsToken))) {

-				// Send the RFC2554 specified EHLO.

-				$_retVal = $this->_server_authenticate();

-			} else {

-				// This is a "normal" SMTP Server "handshack"

-				// Send the RFC821 specified HELO.

-				$host = $this->getHost();

-				$usetls = preg_match('@tls://@i', $host);

-

-				$host = preg_replace('@tcp://@i', '', $host); // Remove prefix

-				$host = preg_replace('@ssl://@i', '', $host); // Remove prefix

-				$host = preg_replace('@tls://@i', '', $host); // Remove prefix

-

-				if ($usetls && getDolGlobalString('MAIN_SMTPS_ADD_TLS_TO_HOST_FOR_HELO')) {

-					$host = 'tls://'.$host;

-				}

-

-				$hosth = $host;

-

-				if (getDolGlobalString('MAIL_SMTP_USE_FROM_FOR_HELO')) {

-					if (!is_numeric($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO)) {

-						// If value of MAIL_SMTP_USE_FROM_FOR_HELO is a string, we use it as domain name

-						$hosth = $conf->global->MAIL_SMTP_USE_FROM_FOR_HELO;

-					} elseif (getDolGlobalInt('MAIL_SMTP_USE_FROM_FOR_HELO') == 1) {

-						// If value of MAIL_SMTP_USE_FROM_FOR_HELO is 1, we use the domain in the from.

-						// So if the from to is 'aaa <bbb@ccc.com>', we will keep 'ccc.com'

-						$hosth = $this->getFrom('addr');

-						$hosth = preg_replace('/^.*</', '', $hosth);

-						$hosth = preg_replace('/>.*$/', '', $hosth);

-						$hosth = preg_replace('/.*@/', '', $hosth);

-					} elseif (getDolGlobalInt('MAIL_SMTP_USE_FROM_FOR_HELO') == 2) {

-						// If value of MAIL_SMTP_USE_FROM_FOR_HELO is 2, we use the domain in the $dolibarr_main_url_root.

-						global $dolibarr_main_url_root;

-						$hosth = getDomainFromURL($dolibarr_main_url_root, 1);

-					}

-				}

-

-				// Send the HELO message to the SMTP server

-				$_retVal = $this->socket_send_str('HELO '.$hosth, '250');

-			}

-

-			// Well, did we get the server answer with correct code ?

-			if ($_retVal) {

-				// From this point onward most server response codes should be 250

-				// Specify who the mail is from....

-				// This has to be the raw email address, strip the "name" off

-				$resultmailfrom = $this->socket_send_str('MAIL FROM: '.$this->getFrom('addr'), '250');

-				if (!$resultmailfrom) {

-					fclose($this->socket);

-					return false;

-				}

-

-				// 'RCPT TO:' must be given a single address, so this has to loop

-				// through the list of addresses, regardless of TO, CC or BCC

-				// and send it out "single file"

-				foreach ($this->get_RCPT_list() as $_address) {

-					/* Note:

-					 * BCC email addresses must be listed in the RCPT TO command list,

-					 * but the BCC header should not be printed under the DATA command.

-					 * http://stackoverflow.com/questions/2750211/sending-bcc-emails-using-a-smtp-server

-					 */

-

-					/*

-					 * TODO

-					 * After each 'RCPT TO:' is sent, we need to make sure it was kosher,

-					 * if not, the whole message will fail

-					 * If any email address fails, we will need to RESET the connection,

-					 * mark the last address as "bad" and start the address loop over again.

-					 * If any address fails, the entire message fails.

-					 */

-					$this->socket_send_str('RCPT TO: <'.$_address.'>', '250');

-				}

-

-				// Tell the server we are ready to start sending data

-				// with any custom headers...

-				// This is the last response code we look for until the end of the message.

-				$this->socket_send_str('DATA', '354');

-

-				// Now we are ready for the message...

-				// Ok, all the ingredients are mixed in let's cook this puppy...

-				$this->socket_send_str($this->getHeader().$this->getBodyContent()."\r\n".'.', '250');

-

-				// Now tell the server we are done and close the socket...

-				fputs($this->socket, 'QUIT');

-			} else {

-				// We got error code into $this->lastretval

-			}

-

-			fclose($this->socket);

-		}

-

-		return $_retVal;

-	}

-

-	// =============================================================

-	// ** Setter & Getter methods

-

-	// ** Basic System configuration

-

-	/**

-	 * setConfig() is used to populate select class properties from either

-	 * a user defined INI file or the systems 'php.ini' file

-	 *

-	 * If a user defined INI is to be used, the files complete path is passed

-	 * as the method single parameter. The INI can define any class and/or

-	 * user properties. Only properties defined within this file will be setter

-	 * and/or orverwritten

-	 *

-	 * If the systems 'php.ini' file is to be used, the method is called without

-	 * parameters. In this case, only HOST, PORT and FROM properties will be set

-	 * as they are the only properties that are defined within the 'php.ini'.

-	 *

-	 * If secure SMTP is to be used, the user ID and Password can be defined with

-	 * the user INI file, but the properties are not defined with the systems

-	 * 'php.ini'file, they must be defined via their setter methods

-	 *

-	 * This method can be called twice, if desired. Once without a parameter to

-	 * load the properties as defined within the systems 'php.ini' file, and a

-	 * second time, with a path to a user INI file for other properties to be

-	 * defined.

-	 *

-	 * @param mixed $_strConfigPath path to config file or VOID

-	 * @return boolean

-	 */

-	public function setConfig($_strConfigPath = null)

-	{

-		/**

-		 * Returns constructed SELECT Object string or boolean upon failure

-		 * Default value is set at true

-		 */

-		$_retVal = true;

-

-		// if we have a path...

-		if (!empty($_strConfigPath)) {

-			// If the path is not valid, this will NOT generate an error,

-			// it will simply return false.

-			if (!@include $_strConfigPath) {

-				$this->_setErr(110, '"'.$_strConfigPath.'" is not a valid path.');

-				$_retVal = false;

-			}

-		} else {

-			// Read the Systems php.ini file

-			// Set these properties ONLY if they are set in the php.ini file.

-			// Otherwise the default values will be used.

-			if ($_host = ini_get('SMTPs')) {

-				$this->setHost($_host);

-			}

-

-			if ($_port = ini_get('smtp_port')) {

-				$this->setPort($_port);

-			}

-

-			if ($_from = ini_get('sendmail_from')) {

-				$this->setFrom($_from);

-			}

-		}

-

-		// Send back what we have

-		return $_retVal;

-	}

-

-	/**

-	 * Determines the method inwhich the messages are to be sent.

-	 * - 'sockets' [0] - conect via network to SMTP server

-	 * - 'pipe     [1] - use UNIX path to EXE

-	 * - 'phpmail  [2] - use the PHP built-in mail function

-	 *

-	 * @param int $_type  Interger value representing Mail Transport Type

-	 * @return void

-	 */

-	public function setTransportType($_type = 0)

-	{

-		if ((is_numeric($_type)) && (($_type >= 0) && ($_type <= 3))) {

-			$this->_transportType = $_type;

-		}

-	}

-

-	/**

-	 * Return the method inwhich the message is to be sent.

-	 * - 'sockets' [0] - conect via network to SMTP server

-	 * - 'pipe     [1] - use UNIX path to EXE

-	 * - 'phpmail  [2] - use the PHP built-in mail function

-	 *

-	 * @return int $_strHost Host Name or IP of the Mail Server to use

-	 */

-	public function getTransportType()

-	{

-		return $this->_transportType;

-	}

-

-	/**

-	 * Path to the sendmail execuable

-	 *

-	 * @param string $_path Path to the sendmail execuable

-	 * @return boolean

-	 *

-	 */

-	public function setMailPath($_path)

-	{

-		// This feature is not yet implemented

-		return true;

-

-		//if ( $_path ) $this->_mailPath = $_path;

-	}

-

-	/**

-	 * Defines the Host Name or IP of the Mail Server to use.

-	 * This is defaulted to 'localhost'

-	 * This is  used only with 'socket' based mail transmission

-	 *

-	 * @param 	string 	$_strHost 		Host Name or IP of the Mail Server to use

-	 * @return 	void

-	 */

-	public function setHost($_strHost)

-	{

-		if ($_strHost) {

-			$this->_smtpsHost = $_strHost;

-		}

-	}

-

-	/**

-	 * Retrieves the Host Name or IP of the Mail Server to use

-	 * This is  used only with 'socket' based mail transmission

-	 *

-	 * @return 	string 	$_strHost 		Host Name or IP of the Mail Server to use

-	 */

-	public function getHost()

-	{

-		return $this->_smtpsHost;

-	}

-

-	/**

-	 * Defines the Port Number of the Mail Server to use

-	 * This is defaulted to '25'

-	 * This is  used only with 'socket' based mail transmission

-	 *

-	 * @param 	int 	$_intPort 		Port Number of the Mail Server to use

-	 * @return 	void

-	 */

-	public function setPort($_intPort)

-	{

-		if ((is_numeric($_intPort)) &&

-		(($_intPort >= 1) && ($_intPort <= 65536))) {

-			$this->_smtpsPort = $_intPort;

-		}

-	}

-

-	/**

-	 * Retrieves the Port Number of the Mail Server to use

-	 * This is  used only with 'socket' based mail transmission

-	 *

-	 * @return 	string 		Port Number of the Mail Server to use

-	 */

-	public function getPort()

-	{

-		return $this->_smtpsPort;

-	}

-

-	/**

-	 * User Name for authentication on Mail Server

-	 *

-	 * @param 	string 	$_strID 	User Name for authentication on Mail Server

-	 * @return 	void

-	 */

-	public function setID($_strID)

-	{

-		$this->_smtpsID = $_strID;

-	}

-

-	/**

-	 * Retrieves the User Name for authentication on Mail Server

-	 *

-	 * @return string 	User Name for authentication on Mail Server

-	 */

-	public function getID()

-	{

-		return $this->_smtpsID;

-	}

-

-	/**

-	 * User Password for authentication on Mail Server

-	 *

-	 * @param 	string 	$_strPW 	User Password for authentication on Mail Server

-	 * @return 	void

-	 */

-	public function setPW($_strPW)

-	{

-		$this->_smtpsPW = $_strPW;

-	}

-

-	/**

-	 * Retrieves the User Password for authentication on Mail Server

-	 *

-	 * @return 	string 		User Password for authentication on Mail Server

-	 */

-	public function getPW()

-	{

-		return $this->_smtpsPW;

-	}

-

-	/**

-	 * User token for OAUTH2

-	 *

-	 * @param 	string 	$_strToken 	User token

-	 * @return 	void

-	 */

-	public function setToken($_strToken)

-	{

-		$this->_smtpsToken = $_strToken;

-	}

-

-	/**

-	 * Retrieves the User token for OAUTH2

-	 *

-	 * @return 	string 		User token for OAUTH2

-	 */

-	public function getToken()

-	{

-		return $this->_smtpsToken;

-	}

-

-	/**

-	 * Character set used for current message

-	 * Character set is defaulted to 'iso-8859-1';

-	 *

-	 * @param string $_strCharSet Character set used for current message

-	 * @return void

-	 */

-	public function setCharSet($_strCharSet)

-	{

-		if ($_strCharSet) {

-			$this->_smtpsCharSet = $_strCharSet;

-		}

-	}

-

-	/**

-	 * Retrieves the Character set used for current message

-	 *

-	 * @return string $_smtpsCharSet Character set used for current message

-	 */

-	public function getCharSet()

-	{

-		return $this->_smtpsCharSet;

-	}

-

-	/**

-	 * Content-Transfer-Encoding, Defaulted to '7bit'

-	 * This can be changed for 2byte characers sets

-	 * Known Encode Types

-	 *  - 7bit               Simple 7-bit ASCII

-	 *  - 8bit               8-bit coding with line termination characters

-	 *  - base64             3 octets encoded into 4 sextets with offset

-	 *  - binary             Arbitrary binary stream

-	 *  - mac-binhex40       Macintosh binary to hex encoding

-	 *  - quoted-printable   Mostly 7-bit, with 8-bit characters encoded as "=HH"

-	 *  - uuencode           UUENCODE encoding

-	 *

-	 * @param string $_strTransEncode Content-Transfer-Encoding

-	 * @return void

-	 */

-	public function setTransEncode($_strTransEncode)

-	{

-		if (array_search($_strTransEncode, $this->_smtpsTransEncodeTypes)) {

-			$this->_smtpsTransEncode = $_strTransEncode;

-		}

-	}

-

-	/**

-	 * Retrieves the Content-Transfer-Encoding

-	 *

-	 * @return string $_smtpsTransEncode Content-Transfer-Encoding

-	 */

-	public function getTransEncode()

-	{

-		return $this->_smtpsTransEncode;

-	}

-

-	/**

-	 * Content-Transfer-Encoding, Defaulted to '0' [ZERO]

-	 * This can be changed for 2byte characers sets

-	 * Known Encode Types

-	 *  - [0] 7bit               Simple 7-bit ASCII

-	 *  - [1] 8bit               8-bit coding with line termination characters

-	 *  - [2] base64             3 octets encoded into 4 sextets with offset

-	 *  - [3] binary             Arbitrary binary stream

-	 *  - [4] mac-binhex40       Macintosh binary to hex encoding

-	 *  - [5] quoted-printable   Mostly 7-bit, with 8-bit characters encoded as "=HH"

-	 *  - [6] uuencode           UUENCODE encoding

-	 *

-	 * @param string $_strTransEncodeType Content-Transfer-Encoding

-	 * @return void

-	 *

-	 */

-	public function setTransEncodeType($_strTransEncodeType)

-	{

-		if (array_search($_strTransEncodeType, $this->_smtpsTransEncodeTypes)) {

-			$this->_smtpsTransEncodeType = $_strTransEncodeType;

-		}

-	}

-

-	/**

-	 * Retrieves the Content-Transfer-Encoding

-	 *

-	 * @return 	string 		Content-Transfer-Encoding

-	 */

-	public function getTransEncodeType()

-	{

-		return $this->_smtpsTransEncodeTypes[$this->_smtpsTransEncodeType];

-	}

-

-

-	// ** Message Construction

-

-	/**

-	 * FROM Address from which mail will be sent

-	 *

-	 * @param 	string 	$_strFrom 	Address from which mail will be sent

-	 * @return 	void

-	 */

-	public function setFrom($_strFrom)

-	{

-		if ($_strFrom) {

-			$this->_msgFrom = $this->_strip_email($_strFrom);

-		}

-	}

-

-	/**

-	 * Retrieves the Address from which mail will be sent

-	 *

-	 * @param  	boolean $_part		To "strip" 'Real name' from address

-	 * @return 	string 				Address from which mail will be sent

-	 */

-	public function getFrom($_part = true)

-	{

-		$_retValue = '';

-

-		if ($_part === true) {

-			$_retValue = $this->_msgFrom;

-		} else {

-			$_retValue = $this->_msgFrom[$_part];

-		}

-

-		return $_retValue;

-	}

-

-	/**

-	 * Reply-To Address from which mail will be the reply-to

-	 *

-	 * @param 	string 	$_strReplyTo 	Address from which mail will be the reply-to

-	 * @return 	void

-	 */

-	public function setReplyTo($_strReplyTo)

-	{

-		if ($_strReplyTo) {

-			$this->_msgReplyTo = $this->_strip_email($_strReplyTo);

-		}

-	}

-

-	/**

-	 * Retrieves the Address from which mail will be the reply-to

-	 *

-	 * @param  	boolean $_part		To "strip" 'Real name' from address

-	 * @return 	string 				Address from which mail will be the reply-to

-	 */

-	public function getReplyTo($_part = true)

-	{

-		$_retValue = '';

-

-		if ($_part === true) {

-			$_retValue = $this->_msgReplyTo;

-		} else {

-			$_retValue = $this->_msgReplyTo[$_part];

-		}

-

-		return $_retValue;

-	}

-

-	/**

-	 * Inserts given addresses into structured format.

-	 * This method takes a list of given addresses, via an array or a COMMA delimted string, and inserts them into a highly

-	 * structured array. This array is designed to remove duplicate addresses and to sort them by Domain.

-	 *

-	 * @param 	string 	$_type 			TO, CC, or BCC lists to add addrresses into

-	 * @param 	mixed 	$_addrList 		Array or COMMA delimited string of addresses

-	 * @return void

-	 *

-	 */

-	private function _buildAddrList($_type, $_addrList)

-	{

-		// Pull existing list

-		$aryHost = $this->_msgRecipients;

-

-		// Only run this if we have something

-		if (!empty($_addrList)) {

-			// $_addrList can be a STRING or an array

-			if (is_string($_addrList)) {

-				// This could be a COMMA delimited string

-				if (strstr($_addrList, ',')) {

-					// "explode "list" into an array

-					$_addrList = explode(',', $_addrList);

-				} else {

-					// Stick it in an array

-					$_addrList = array($_addrList);

-				}

-			}

-

-			// take the array of addresses and split them further

-			foreach ($_addrList as $_strAddr) {

-				// Strip off the end '>'

-				$_strAddr = str_replace('>', '', $_strAddr);

-

-				// Seperate "Real Name" from eMail address

-				$_tmpaddr = null;

-				$_tmpaddr = explode('<', $_strAddr);

-

-				// We have a "Real Name" and eMail address

-				if (count($_tmpaddr) == 2) {

-					$_tmpHost = explode('@', $_tmpaddr[1]);

-					$_tmpaddr[0] = trim($_tmpaddr[0], ' ">');

-					$aryHost[$_tmpHost[1]][$_type][$_tmpHost[0]] = $_tmpaddr[0];

-				} else {

-					// We only have an eMail address

-					// Strip off the beggining '<'

-					$_strAddr = str_replace('<', '', $_strAddr);

-

-					$_tmpHost = explode('@', $_strAddr);

-					$_tmpHost[0] = trim($_tmpHost[0]);

-					$_tmpHost[1] = trim($_tmpHost[1]);

-

-					$aryHost[$_tmpHost[1]][$_type][$_tmpHost[0]] = '';

-				}

-			}

-		}

-		// replace list

-		$this->_msgRecipients = $aryHost;

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 * Returns an array of the various parts of an email address

-	 * This assumes a well formed address:

-	 * - "Real name" <username@domain.tld>

-	 * - "Real Name" is optional

-	 * - if "Real Name" does not exist, the angle brackets are optional

-	 * This will split an email address into 4 or 5 parts.

-	 * - $_aryEmail[org]  = orignal string

-	 * - $_aryEmail[real] = "real name" - if there is one

-	 * - $_aryEmail[addr] = address part "username@domain.tld"

-	 * - $_aryEmail[host] = "domain.tld"

-	 * - $_aryEmail[user] = "userName"

-	 *

-	 *	@param		string		$_strAddr		Email address

-	 * 	@return 	array	 					An array of the various parts of an email address

-	 */

-	private function _strip_email($_strAddr)

-	{

-		// phpcs:enable

-		// Keep the orginal

-		$_aryEmail['org'] = $_strAddr;

-

-		// Set entire string to Lower Case

-		$_strAddr = strtolower($_strAddr);

-

-		// Drop "stuff' off the end

-		$_strAddr = trim($_strAddr, ' ">');

-

-		// Seperate "Real Name" from eMail address, if we have one

-		$_tmpAry = explode('<', $_strAddr);

-

-		// Do we have a "Real name"

-		if (count($_tmpAry) == 2) {

-			// We may not really have a "Real Name"

-			if ($_tmpAry[0]) {

-				$_aryEmail['real'] = trim($_tmpAry[0], ' ">');

-			}

-

-			$_aryEmail['addr'] = $_tmpAry[1];

-		} else {

-			$_aryEmail['addr'] = $_tmpAry[0];

-		}

-

-		// Pull User Name and Host.tld apart

-		$_tmpHost = explode('@', $_aryEmail['addr']);

-		$_aryEmail['user'] = $_tmpHost[0];

-		$_aryEmail['host'] = $_tmpHost[1];

-

-		// Put the brackets back around the address

-		$_aryEmail['addr'] = '<'.$_aryEmail['addr'].'>';

-

-		return $_aryEmail;

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 * Returns an array of bares addresses for use with 'RCPT TO:'

-	 * This is a "build as you go" method. Each time this method is called

-	 * the underlaying array is destroyed and reconstructed.

-	 *

-	 * @return 		array		Returns an array of bares addresses

-	 */

-	public function get_RCPT_list()

-	{

-		// phpcs:enable

-		/**

-		 * An array of bares addresses for use with 'RCPT TO:'

-		 */

-		$_RCPT_list = array();

-

-		// walk down Recipients array and pull just email addresses

-		foreach ($this->_msgRecipients as $_host => $_list) {

-			foreach ($_list as $_subList) {

-				foreach ($_subList as $_name => $_addr) {

-					// build RCPT list

-					$_RCPT_list[] = $_name.'@'.$_host;

-				}

-			}

-		}

-

-		return $_RCPT_list;

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 * Returns an array of addresses for a specific type; TO, CC or BCC

-	 *

-	 * @param 		string 	       $_which 	    Which collection of addresses to return ('to', 'cc', 'bcc')

-	 * @return 		string|false 				Array of emaill address

-	 */

-	public function get_email_list($_which = null)

-	{

-		// phpcs:enable

-		// We need to know which address segment to pull

-		if ($_which) {

-			// Make sure we have addresses to process

-			if ($this->_msgRecipients) {

-				$_RCPT_list = array();

-				// walk down Recipients array and pull just email addresses

-				foreach ($this->_msgRecipients as $_host => $_list) {

-					if (!empty($this->_msgRecipients[$_host][$_which])) {

-						foreach ($this->_msgRecipients[$_host][$_which] as $_addr => $_realName) {

-							if ($_realName) {	// @CHANGE LDR

-								$_realName = '"'.$_realName.'"';

-								$_RCPT_list[] = $_realName.' <'.$_addr.'@'.$_host.'>';

-							} else {

-								$_RCPT_list[] = $_addr.'@'.$_host;

-							}

-						}

-					}

-				}

-

-				return implode(', ', $_RCPT_list);

-			} else {

-				$this->_setErr(101, 'No eMail Address for message to be sent to.');

-				return false;

-			}

-		} else {

-			$this->_setErr(102, 'eMail type not defined.');

-			return false;

-		}

-	}

-

-	/**

-	 * TO Address[es] inwhich to send mail to

-	 *

-	 * @param 	string 	$_addrTo 	TO Address[es] inwhich to send mail to

-	 * @return 	void

-	 */

-	public function setTO($_addrTo)

-	{

-		if ($_addrTo) {

-			$this->_buildAddrList('to', $_addrTo);

-		}

-	}

-

-	/**

-	 * Retrieves the TO Address[es] inwhich to send mail to

-	 *

-	 * @return 	string 	TO Address[es] inwhich to send mail to

-	 */

-	public function getTo()

-	{

-		return $this->get_email_list('to');

-	}

-

-	/**

-	 * CC Address[es] inwhich to send mail to

-	 *

-	 * @param 	string	$_strCC		CC Address[es] inwhich to send mail to

-	 * @return 	void

-	 */

-	public function setCC($_strCC)

-	{

-		if ($_strCC) {

-			$this->_buildAddrList('cc', $_strCC);

-		}

-	}

-

-	/**

-	 * Retrieves the CC Address[es] inwhich to send mail to

-	 *

-	 * @return 	string 		CC Address[es] inwhich to send mail to

-	 */

-	public function getCC()

-	{

-		return $this->get_email_list('cc');

-	}

-

-	/**

-	 * BCC Address[es] inwhich to send mail to

-	 *

-	 * @param 	string		$_strBCC	Recipients BCC Address[es] inwhich to send mail to

-	 * @return 	void

-	 */

-	public function setBCC($_strBCC)

-	{

-		if ($_strBCC) {

-			$this->_buildAddrList('bcc', $_strBCC);

-		}

-	}

-

-	/**

-	 * Retrieves the BCC Address[es] inwhich to send mail to

-	 *

-	 * @return 	string		BCC Address[es] inwhich to send mail to

-	 */

-	public function getBCC()

-	{

-		return $this->get_email_list('bcc');

-	}

-

-	/**

-	 * Message Subject

-	 *

-	 * @param 	string 	$_strSubject	Message Subject

-	 * @return 	void

-	 */

-	public function setSubject($_strSubject = '')

-	{

-		if ($_strSubject) {

-			$this->_msgSubject = $_strSubject;

-		}

-	}

-

-	/**

-	 * Retrieves the Message Subject

-	 *

-	 * @return 	string 		Message Subject

-	 */

-	public function getSubject()

-	{

-		return $this->_msgSubject;

-	}

-

-	/**

-	 * Constructes and returns message header

-	 *

-	 * @return string Complete message header

-	 */

-	public function getHeader()

-	{

-		global $conf;

-

-		$_header = 'From: '.$this->getFrom('org')."\r\n"

-		. 'To: '.$this->getTO()."\r\n";

-

-		if ($this->getCC()) {

-			$_header .= 'Cc: '.$this->getCC()."\r\n";

-		}

-

-		/* Note:

-		 * BCC email addresses must be listed in the RCPT TO command list,

-		 * but the BCC header should not be printed under the DATA command.

-		 * So it is included into the function sendMsg() but not here.

-		 * http://stackoverflow.com/questions/2750211/sending-bcc-emails-using-a-smtp-server

-		 */

-		/*

-		if ( $this->getBCC() )

-		$_header .= 'Bcc: ' . $this->getBCC()  . "\r\n";

-		*/

-

-		$host = dol_getprefix('email');

-

-		//NOTE: Message-ID should probably contain the username of the user who sent the msg

-		$_header .= 'Subject: '.$this->getSubject()."\r\n";

-		$_header .= 'Date: '.date("r")."\r\n";

-

-		$trackid = $this->getTrackId();

-		if ($trackid) {

-			$_header .= 'Message-ID: <'.time().'.SMTPs-dolibarr-'.$trackid.'@'.$host.">\r\n";

-			$_header .= 'X-Dolibarr-TRACKID: '.$trackid.'@'.$host."\r\n";

-			// References and In-Reply-To: will be set by caller

-			//$_header .= 'References: <'.time().'.SMTPs-dolibarr-'.$trackid.'@'.$host.">\r\n";

-		} else {

-			$_header .= 'Message-ID: <'.time().'.SMTPs@'.$host.">\r\n";

-		}

-		if (!empty($_SERVER['REMOTE_ADDR'])) {

-			$_header .= "X-RemoteAddr: ".$_SERVER['REMOTE_ADDR']."\r\n";

-		}

-		if ($this->getMoreInHeader()) {

-			$_header .= $this->getMoreInHeader(); // Value must include the "\r\n";

-		}

-

-		if ($this->getSensitivity()) {

-			$_header .= 'Sensitivity: '.$this->getSensitivity()."\r\n";

-		}

-

-		if ($this->_msgPriority != 3) {

-			$_header .= $this->getPriority();

-		}

-

-

-		// @CHANGE LDR

-		if ($this->getDeliveryReceipt()) {

-			$_header .= 'Disposition-Notification-To: '.$this->getFrom('addr')."\r\n";

-		}

-		if ($this->getErrorsTo()) {

-			$_header .= 'Errors-To: '.$this->getErrorsTo('addr')."\r\n";

-		}

-		if ($this->getReplyTo()) {

-			$_header .= "Reply-To: ".$this->getReplyTo('addr')."\r\n";

-		}

-

-		$_header .= 'X-Mailer: Dolibarr version '.DOL_VERSION.' (using SMTPs Mailer)'."\r\n";

-		$_header .= 'X-Dolibarr-Option: '.($conf->global->MAIN_MAIL_USE_MULTI_PART ? 'MAIN_MAIL_USE_MULTI_PART' : 'No MAIN_MAIL_USE_MULTI_PART')."\r\n";

-		$_header .= 'Mime-Version: 1.0'."\r\n";

-

-		// TODO Add also $this->references and In-Reply-To

-

-		return $_header;

-	}

-

-	/**

-	 * Message Content

-	 *

-	 * @param 	string 	$strContent		Message Content

-	 * @param	string	$strType		Type

-	 * @return 	void

-	 */

-	public function setBodyContent($strContent, $strType = 'plain')

-	{

-		//if ( $strContent )

-		//{

-		if ($strType == 'html') {

-			$strMimeType = 'text/html';

-		} else {

-			$strMimeType = 'text/plain';

-		}

-

-		// Make RFC821 Compliant, replace bare linefeeds

-		$strContent = preg_replace("/(?<!\r)\n/si", "\r\n", $strContent);

-

-		$strContentAltText = '';

-		if ($strType == 'html') {

-			// Similar code to forge a text from html is also in CMailFile.class.php

-			$strContentAltText = preg_replace('/<head><title>.*<\/style><\/head>/', '', $strContent);

-			$strContentAltText = preg_replace("/<br\s*[^>]*>/", " ", $strContentAltText);

-			$strContentAltText = html_entity_decode(strip_tags($strContentAltText));

-			$strContentAltText = trim(wordwrap($strContentAltText, 75, "\r\n"));

-		}

-

-		// Make RFC2045 Compliant

-		//$strContent = rtrim(chunk_split($strContent));    // Function chunck_split seems ko if not used on a base64 content

-		$strContent = rtrim(wordwrap($strContent, 75, "\r\n")); // TODO Using this method creates unexpected line break on text/plain content.

-

-		$this->_msgContent[$strType] = array();

-

-		$this->_msgContent[$strType]['mimeType'] = $strMimeType;

-		$this->_msgContent[$strType]['data']     = $strContent;

-		$this->_msgContent[$strType]['dataText'] = $strContentAltText;

-

-		if ($this->getMD5flag()) {

-			$this->_msgContent[$strType]['md5'] = dol_hash($strContent, 3);

-		}

-		//}

-	}

-

-	/**

-	 * Retrieves the Message Content

-	 *

-	 * @return 	string			Message Content

-	 */

-	public function getBodyContent()

-	{

-		global $conf;

-

-		// Generate a new Boundary string

-		$this->_setBoundary();

-

-		// What type[s] of content do we have

-		$_types = array_keys($this->_msgContent);

-

-		// How many content types do we have

-		$keyCount = count($_types);

-

-		// If we have ZERO, we have a problem

-		if ($keyCount === 0) {

-			die("Sorry, no content");

-		} elseif ($keyCount === 1 && !getDolGlobalString('MAIN_MAIL_USE_MULTI_PART')) {

-			// If we have ONE, we can use the simple format

-			$_msgData = $this->_msgContent;

-			$_msgData = $_msgData[$_types[0]];

-

-			$content = 'Content-Type: '.$_msgData['mimeType'].'; charset="'.$this->getCharSet().'"'."\r\n"

-			. 'Content-Transfer-Encoding: '.$this->getTransEncodeType()."\r\n"

-			. 'Content-Disposition: inline'."\r\n"

-			. 'Content-Description: Message'."\r\n";

-

-			if ($this->getMD5flag()) {

-				$content .= 'Content-MD5: '.$_msgData['md5']."\r\n";

-			}

-

-			$content .= "\r\n"

-			.  $_msgData['data']."\r\n";

-		} elseif ($keyCount >= 1 || getDolGlobalString('MAIN_MAIL_USE_MULTI_PART')) {

-			// If we have more than ONE, we use the multi-part format

-			// Since this is an actual multi-part message

-			// We need to define a content message Boundary

-			// NOTE: This was 'multipart/alternative', but Windows based mail servers have issues with this.

-

-			//$content = 'Content-Type: multipart/related; boundary="' . $this->_getBoundary() . '"'   . "\r\n";

-			$content = 'Content-Type: multipart/mixed; boundary="'.$this->_getBoundary('mixed').'"'."\r\n";

-

-			//                     . "\r\n"

-			//                     . 'This is a multi-part message in MIME format.' . "\r\n";

-			$content .= "Content-Transfer-Encoding: 8bit\r\n";

-			$content .= "\r\n";

-

-			$content .= "--".$this->_getBoundary('mixed')."\r\n";

-

-			if (key_exists('image', $this->_msgContent)) {     // If inline image found

-				$content .= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"'."\r\n";

-				$content .= "\r\n";

-				$content .= "--".$this->_getBoundary('alternative')."\r\n";

-			}

-

-

-			// $this->_msgContent must be sorted with key 'text' or 'html' first then 'image' then 'attachment'

-

-

-			// Loop through message content array

-			foreach ($this->_msgContent as $type => $_content) {

-				if ($type == 'attachment') {

-					// loop through all attachments

-					foreach ($_content as $_file => $_data) {

-						$content .= "--".$this->_getBoundary('mixed')."\r\n"

-						. 'Content-Disposition: attachment; filename="'.$_data['fileName'].'"'."\r\n"

-						. 'Content-Type: '.$_data['mimeType'].'; name="'.$_data['fileName'].'"'."\r\n"

-						. 'Content-Transfer-Encoding: base64'."\r\n"

-						. 'Content-Description: '.$_data['fileName']."\r\n";

-						if (!empty($_data['cid'])) {

-							$content .= "X-Attachment-Id: ".$_data['cid']."\r\n";

-							$content .= "Content-ID: <".$_data['cid'].">\r\n";

-						}

-						if ($this->getMD5flag()) {

-							$content .= 'Content-MD5: '.$_data['md5']."\r\n";

-						}

-

-						$content .= "\r\n".$_data['data']."\r\n\r\n";

-					}

-				} elseif ($type == 'image') {

-					// @CHANGE LDR

-					// loop through all images

-					foreach ($_content as $_image => $_data) {

-						$content .= "--".$this->_getBoundary('related')."\r\n"; // always related for an inline image

-

-						$content .= 'Content-Type: '.$_data['mimeType'].'; name="'.$_data['imageName'].'"'."\r\n"

-						. 'Content-Transfer-Encoding: base64'."\r\n"

-						. 'Content-Disposition: inline; filename="'.$_data['imageName'].'"'."\r\n"

-						. 'Content-ID: <'.$_data['cid'].'> '."\r\n";

-

-						if ($this->getMD5flag()) {

-							$content .= 'Content-MD5: '.$_data['md5']."\r\n";

-						}

-

-						$content .= "\r\n"

-						. $_data['data']."\r\n";

-					}

-

-					// always end related and end alternative after inline images

-					$content .= "--".$this->_getBoundary('related')."--\r\n";

-					$content .= "\r\n--".$this->_getBoundary('alternative')."--\r\n";

-					$content .= "\r\n";

-				} else {

-					if (key_exists('image', $this->_msgContent)) {

-						$content .= "Content-Type: text/plain; charset=".$this->getCharSet()."\r\n";

-						$content .= "\r\n".($_content['dataText'] ? $_content['dataText'] : strip_tags($_content['data']))."\r\n"; // Add plain text message

-						$content .= "--".$this->_getBoundary('alternative')."\r\n";

-						$content .= 'Content-Type: multipart/related; boundary="'.$this->_getBoundary('related').'"'."\r\n";

-						$content .= "\r\n";

-						$content .= "--".$this->_getBoundary('related')."\r\n";

-					}

-

-					if (!key_exists('image', $this->_msgContent) && $_content['dataText'] && getDolGlobalString('MAIN_MAIL_USE_MULTI_PART')) {

-						// Add plain text message part before html part

-						$content .= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"'."\r\n";

-						$content .= "\r\n";

-						$content .= "--".$this->_getBoundary('alternative')."\r\n";

-

-						$content .= "Content-Type: text/plain; charset=".$this->getCharSet()."\r\n";

-						$content .= "\r\n".$_content['dataText']."\r\n";

-						$content .= "--".$this->_getBoundary('alternative')."\r\n";

-					}

-

-					$content .= 'Content-Type: '.$_content['mimeType'].'; charset='.$this->getCharSet();

-

-					$content .= "\r\n";

-

-					if ($this->getMD5flag()) {

-						$content .= 'Content-MD5: '.$_content['md5']."\r\n";

-					}

-

-					$content .= "\r\n".$_content['data']."\r\n";

-

-					if (!key_exists('image', $this->_msgContent) && $_content['dataText'] && getDolGlobalString('MAIN_MAIL_USE_MULTI_PART')) {

-						// Add plain text message part after html part

-						$content .= "--".$this->_getBoundary('alternative')."--\r\n";

-					}

-

-					$content .= "\r\n";

-				}

-			}

-

-			$content .= "--".$this->_getBoundary('mixed').'--'."\r\n";

-		}

-

-		return $content;

-	}

-

-	/**

-	 * File attachments are added to the content array as sub-arrays,

-	 * allowing for multiple attachments for each outbound email

-	 *

-	 * @param string $strContent  File data to attach to message

-	 * @param string $strFileName File Name to give to attachment

-	 * @param string $strMimeType File Mime Type of attachment

-	 * @param string $strCid      File Cid of attachment (if defined, to be shown inline)

-	 * @return void

-	 */

-	public function setAttachment($strContent, $strFileName = 'unknown', $strMimeType = 'unknown', $strCid = '')

-	{

-		if ($strContent) {

-			$strContent = rtrim(chunk_split(base64_encode($strContent), 76, "\r\n")); // 76 max is defined into http://tools.ietf.org/html/rfc2047

-

-			$this->_msgContent['attachment'][$strFileName]['mimeType'] = $strMimeType;

-			$this->_msgContent['attachment'][$strFileName]['fileName'] = $strFileName;

-			$this->_msgContent['attachment'][$strFileName]['data']     = $strContent;

-			$this->_msgContent['attachment'][$strFileName]['cid']      = $strCid;		// If defined, it means this attachment must be shown inline

-

-			if ($this->getMD5flag()) {

-				$this->_msgContent['attachment'][$strFileName]['md5'] = dol_hash($strContent, 3);

-			}

-		}

-	}

-

-

-	// @CHANGE LDR

-

-	/**

-	 * Image attachments are added to the content array as sub-arrays,

-	 * allowing for multiple images for each outbound email

-	 *

-	 * @param 	string $strContent  	Image data to attach to message

-	 * @param 	string $strImageName 	Image Name to give to attachment

-	 * @param 	string $strMimeType 	Image Mime Type of attachment

-	 * @param 	string $strImageCid		CID

-	 * @return 	void

-	 */

-	public function setImageInline($strContent, $strImageName = 'unknown', $strMimeType = 'unknown', $strImageCid = 'unknown')

-	{

-		if ($strContent) {

-			$this->_msgContent['image'][$strImageName]['mimeType'] = $strMimeType;

-			$this->_msgContent['image'][$strImageName]['imageName'] = $strImageName;

-			$this->_msgContent['image'][$strImageName]['cid']      = $strImageCid;

-			$this->_msgContent['image'][$strImageName]['data']     = $strContent;

-

-			if ($this->getMD5flag()) {

-				$this->_msgContent['image'][$strImageName]['md5'] = dol_hash($strContent, 3);

-			}

-		}

-	}

-	// END @CHANGE LDR

-

-

-	/**

-	 * Message Content Sensitivity

-	 * Message Sensitivity values:

-	 *   - [0] None - default

-	 *   - [1] Personal

-	 *   - [2] Private

-	 *   - [3] Company Confidential

-	 *

-	 * @param 	integer	$_value		Message Sensitivity

-	 * @return 	void

-	 */

-	public function setSensitivity($_value = 0)

-	{

-		if ((is_numeric($_value)) &&

-		(($_value >= 0) && ($_value <= 3))) {

-			$this->_msgSensitivity = $_value;

-		}

-	}

-

-	/**

-	 * Returns Message Content Sensitivity string

-	 * Message Sensitivity values:

-	 *   - [0] None - default

-	 *   - [1] Personal

-	 *   - [2] Private

-	 *   - [3] Company Confidential

-	 *

-	 * @return 	string|boolean

-	 */

-	public function getSensitivity()

-	{

-		return $this->_arySensitivity[$this->_msgSensitivity];

-	}

-

-	/**

-	 * Message Content Priority

-	 * Message Priority values:

-	 *  - [0] 'Bulk'

-	 *  - [1] 'Highest'

-	 *  - [2] 'High'

-	 *  - [3] 'Normal' - default

-	 *  - [4] 'Low'

-	 *  - [5] 'Lowest'

-	 *

-	 * @param 	integer 	$_value 	Message Priority

-	 * @return 	void

-	 */

-	public function setPriority($_value = 3)

-	{

-		if ((is_numeric($_value)) &&

-		(($_value >= 0) && ($_value <= 5))) {

-			$this->_msgPriority = $_value;

-		}

-	}

-

-	/**

-	 * Message Content Priority

-	 * Message Priority values:

-	 *  - [0] 'Bulk'

-	 *  - [1] 'Highest'

-	 *  - [2] 'High'

-	 *  - [3] 'Normal' - default

-	 *  - [4] 'Low'

-	 *  - [5] 'Lowest'

-	 *

-	 * @return string

-	 */

-	public function getPriority()

-	{

-		return 'Importance: '.$this->_aryPriority[$this->_msgPriority]."\r\n"

-		. 'Priority: '.$this->_aryPriority[$this->_msgPriority]."\r\n"

-		. 'X-Priority: '.$this->_msgPriority.' ('.$this->_aryPriority[$this->_msgPriority].')'."\r\n";

-	}

-

-	/**

-	 * Set flag which determines whether to calculate message MD5 checksum.

-	 *

-	 * @param 	string 	$_flag		Message Priority

-	 * @return 	void

-	 */

-	public function setMD5flag($_flag = false)

-	{

-		$this->_smtpMD5 = $_flag;

-	}

-

-	/**

-	 * Gets flag which determines whether to calculate message MD5 checksum.

-	 *

-	 * @return 	boolean 				Message Priority

-	 */

-	public function getMD5flag()

-	{

-		return $this->_smtpMD5;

-	}

-

-	/**

-	 * Message X-Header Content

-	 * This is a simple "insert". Whatever is given will be placed

-	 * "as is" into the Xheader array.

-	 *

-	 * @param string $strXdata Message X-Header Content

-	 * @return void

-	 */

-	public function setXheader($strXdata)

-	{

-		if ($strXdata) {

-			$this->_msgXheader[] = $strXdata;

-		}

-	}

-

-	/**

-	 * Retrieves the Message X-Header Content

-	 *

-	 * @return array	$_msgContent 	Message X-Header Content

-	 */

-	public function getXheader()

-	{

-		return $this->_msgXheader;

-	}

-

-	/**

-	 * Generates Random string for MIME message Boundary

-	 *

-	 * @return void

-	 */

-	private function _setBoundary()

-	{

-		$this->_smtpsBoundary = "multipart_x.".time().".x_boundary";

-		$this->_smtpsRelatedBoundary = 'mul_'.dol_hash(uniqid("dolibarr2"), 3);

-		$this->_smtpsAlternativeBoundary = 'mul_'.dol_hash(uniqid("dolibarr3"), 3);

-	}

-

-	/**

-	 * Retrieves the MIME message Boundary

-	 *

-	 * @param  string $type				Type of boundary

-	 * @return string $_smtpsBoundary 	MIME message Boundary

-	 */

-	private function _getBoundary($type = 'mixed')

-	{

-		if ($type == 'mixed') {

-			return $this->_smtpsBoundary;

-		} elseif ($type == 'related') {

-			return $this->_smtpsRelatedBoundary;

-		} elseif ($type == 'alternative') {

-			return $this->_smtpsAlternativeBoundary;

-		}

-		return '';

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 * This function has been modified as provided by SirSir to allow multiline responses when

-	 * using SMTP Extensions

-	 *

-	 * @param	resource    $socket			Socket handler

-	 * @param	string		$response		Expected response ('250', ...). Example of response we can get:

-	 * 										"421 4.7.0 Try again later, closing connection. (EHLO) nb21-20020a1709071c9500b0093d0d964affsm869534ejc.73 - gsmtp"

-	 * 										"550 5.7.1  https://support.google.com/a/answer/6140680#invalidcred j21sm814390wre.3"

-	 * @return	boolean						True or false

-	 */

-	public function server_parse($socket, $response)

-	{

-		// phpcs:enable

-		/**

-		 * Returns constructed SELECT Object string or boolean upon failure

-		 * Default value is set at true

-		 */

-		$_retVal = true;

-

-		$server_response = '';

-

-		// avoid infinite loop

-		$limit = 0;

-

-		while (substr($server_response, 3, 1) != ' ' && $limit < 100) {

-			if (!($server_response = fgets($socket, 256))) {

-				$this->_setErr(121, "Couldn't get mail server response codes");

-				$_retVal = false;

-				break;

-			}

+        }

+        else

+        {

+            $this->_setErr(126, '"'.$host.'" does not support authenticated connections.');

+        }

+

+        return $_retVal;

+    }

+

+    /**

+     * Now send the message

+     *

+     * @return boolean|null   Result

+     */

+    public function sendMsg()

+    {

+        global $conf;

+

+        /**

+         * Default return value

+         */

+        $_retVal = false;

+

+        // Connect to Server

+        if ($this->socket = $this->_server_connect())

+        {

+            // If a User ID *and* a password is given, assume Authentication is desired

+            if (!empty($this->_smtpsID) && !empty($this->_smtpsPW))

+            {

+                // Send the RFC2554 specified EHLO.

+                $_retVal = $this->_server_authenticate();

+            }

+

+            // This is a "normal" SMTP Server "handshack"

+            else

+            {

+                // Send the RFC821 specified HELO.

+                $host = $this->getHost();

+                $usetls = preg_match('@tls://@i', $host);

+

+                $host = preg_replace('@tcp://@i', '', $host); // Remove prefix

+                $host = preg_replace('@ssl://@i', '', $host); // Remove prefix

+                $host = preg_replace('@tls://@i', '', $host); // Remove prefix

+

+                if ($usetls && ! empty($conf->global->MAIN_SMTPS_ADD_TLS_TO_HOST_FOR_HELO)) $host = 'tls://'.$host;

+

+                $hosth = $host;

+

+                if (!empty($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO))

+                {

+                    // If the from to is 'aaa <bbb@ccc.com>', we will keep 'ccc.com'

+                    $hosth = $this->getFrom('addr');

+                    $hosth = preg_replace('/^.*</', '', $hosth);

+                    $hosth = preg_replace('/>.*$/', '', $hosth);

+                    $hosth = preg_replace('/.*@/', '', $hosth);

+                }

+

+                $_retVal = $this->socket_send_str('HELO '.$hosth, '250');

+            }

+

+            // Well, did we get to the server?

+            if ($_retVal)

+            {

+                // From this point onward most server response codes should be 250

+                // Specify who the mail is from....

+                // This has to be the raw email address, strip the "name" off

+                $resultmailfrom = $this->socket_send_str('MAIL FROM: '.$this->getFrom('addr'), '250');

+			    if (!$resultmailfrom) {

+			        fclose($this->socket);

+			        return false;

+			    }

+

+                // 'RCPT TO:' must be given a single address, so this has to loop

+                // through the list of addresses, regardless of TO, CC or BCC

+                // and send it out "single file"

+                foreach ($this->get_RCPT_list() as $_address)

+                {

+                    /* Note:

+                     * BCC email addresses must be listed in the RCPT TO command list,

+                     * but the BCC header should not be printed under the DATA command.

+                     * http://stackoverflow.com/questions/2750211/sending-bcc-emails-using-a-smtp-server

+                     */

+

+                    /*

+                     * TODO

+                     * After each 'RCPT TO:' is sent, we need to make sure it was kosher,

+                     * if not, the whole message will fail

+                     * If any email address fails, we will need to RESET the connection,

+                     * mark the last address as "bad" and start the address loop over again.

+                     * If any address fails, the entire message fails.

+                     */

+                    $this->socket_send_str('RCPT TO: <'.$_address.'>', '250');

+                }

+

+                // Tell the server we are ready to start sending data

+                // with any custom headers...

+                // This is the last response code we look for until the end of the message.

+                $this->socket_send_str('DATA', '354');

+

+                // Now we are ready for the message...

+                // Ok, all the ingredients are mixed in let's cook this puppy...

+                $this->socket_send_str($this->getHeader().$this->getBodyContent()."\r\n".'.', '250');

+

+                // Now tell the server we are done and close the socket...

+                fputs($this->socket, 'QUIT');

+                fclose($this->socket);

+            }

+        }

+

+        return $_retVal;

+    }

+

+    // =============================================================

+    // ** Setter & Getter methods

+

+    // ** Basic System configuration

+

+    /**

+     * setConfig() is used to populate select class properties from either

+     * a user defined INI file or the systems 'php.ini' file

+     *

+     * If a user defined INI is to be used, the files complete path is passed

+     * as the method single parameter. The INI can define any class and/or

+     * user properties. Only properties defined within this file will be setter

+     * and/or orverwritten

+     *

+     * If the systems 'php.ini' file is to be used, the method is called without

+     * parameters. In this case, only HOST, PORT and FROM properties will be set

+     * as they are the only properties that are defined within the 'php.ini'.

+     *

+     * If secure SMTP is to be used, the user ID and Password can be defined with

+     * the user INI file, but the properties are not defined with the systems

+     * 'php.ini'file, they must be defined via their setter methods

+     *

+     * This method can be called twice, if desired. Once without a parameter to

+     * load the properties as defined within the systems 'php.ini' file, and a

+     * second time, with a path to a user INI file for other properties to be

+     * defined.

+     *

+     * @param mixed $_strConfigPath path to config file or VOID

+     * @return boolean

+     */

+    public function setConfig($_strConfigPath = null)

+    {

+        /**

+         * Returns constructed SELECT Object string or boolean upon failure

+         * Default value is set at true

+         */

+        $_retVal = true;

+

+        // if we have a path...

+        if (!empty($_strConfigPath))

+        {

+            // If the path is not valid, this will NOT generate an error,

+            // it will simply return false.

+            if (!@include $_strConfigPath)

+            {

+                $this->_setErr(110, '"'.$_strConfigPath.'" is not a valid path.');

+                $_retVal = false;

+            }

+        }

+

+        // Read the Systems php.ini file

+        else

+        {

+            // Set these properties ONLY if they are set in the php.ini file.

+            // Otherwise the default values will be used.

+            if ($_host = ini_get('SMTPs'))

+            $this->setHost($_host);

+

+            if ($_port = ini_get('smtp_port'))

+            $this->setPort($_port);

+

+            if ($_from = ini_get('sendmail_from'))

+            $this->setFrom($_from);

+        }

+

+        // Send back what we have

+        return $_retVal;

+    }

+

+    /**

+     * Determines the method inwhich the messages are to be sent.

+     * - 'sockets' [0] - conect via network to SMTP server

+     * - 'pipe     [1] - use UNIX path to EXE

+     * - 'phpmail  [2] - use the PHP built-in mail function

+     *

+     * @param int $_type  Interger value representing Mail Transport Type

+     * @return void

+     */

+    public function setTransportType($_type = 0)

+    {

+        if ((is_numeric($_type)) && (($_type >= 0) && ($_type <= 3))) {

+            $this->_transportType = $_type;

+        }

+    }

+

+    /**

+     * Return the method inwhich the message is to be sent.

+     * - 'sockets' [0] - conect via network to SMTP server

+     * - 'pipe     [1] - use UNIX path to EXE

+     * - 'phpmail  [2] - use the PHP built-in mail function

+     *

+     * @return int $_strHost Host Name or IP of the Mail Server to use

+     */

+    public function getTransportType()

+    {

+        return $this->_transportType;

+    }

+

+    /**

+     * Path to the sendmail execuable

+     *

+     * @param string $_path Path to the sendmail execuable

+     * @return boolean

+     *

+     */

+    public function setMailPath($_path)

+    {

+        // This feature is not yet implemented

+        return true;

+

+        //if ( $_path ) $this->_mailPath = $_path;

+    }

+

+    /**

+     * Defines the Host Name or IP of the Mail Server to use.

+     * This is defaulted to 'localhost'

+     * This is  used only with 'socket' based mail transmission

+     *

+     * @param 	string 	$_strHost 		Host Name or IP of the Mail Server to use

+     * @return 	void

+     */

+    public function setHost($_strHost)

+    {

+        if ($_strHost)

+        $this->_smtpsHost = $_strHost;

+    }

+

+    /**

+     * Retrieves the Host Name or IP of the Mail Server to use

+     * This is  used only with 'socket' based mail transmission

+     *

+     * @return 	string 	$_strHost 		Host Name or IP of the Mail Server to use

+     */

+    public function getHost()

+    {

+        return $this->_smtpsHost;

+    }

+

+    /**

+     * Defines the Port Number of the Mail Server to use

+     * This is defaulted to '25'

+     * This is  used only with 'socket' based mail transmission

+     *

+     * @param 	int 	$_intPort 		Port Number of the Mail Server to use

+     * @return 	void

+     */

+    public function setPort($_intPort)

+    {

+        if ((is_numeric($_intPort)) &&

+        (($_intPort >= 1) && ($_intPort <= 65536)))

+        $this->_smtpsPort = $_intPort;

+    }

+

+    /**

+     * Retrieves the Port Number of the Mail Server to use

+     * This is  used only with 'socket' based mail transmission

+     *

+     * @return 	string 		Port Number of the Mail Server to use

+     */

+    public function getPort()

+    {

+        return $this->_smtpsPort;

+    }

+

+    /**

+     * User Name for authentication on Mail Server

+     *

+     * @param 	string 	$_strID 	User Name for authentication on Mail Server

+     * @return 	void

+     */

+    public function setID($_strID)

+    {

+        $this->_smtpsID = $_strID;

+    }

+

+    /**

+     * Retrieves the User Name for authentication on Mail Server

+     *

+     * @return string 	User Name for authentication on Mail Server

+     */

+    public function getID()

+    {

+        return $this->_smtpsID;

+    }

+

+    /**

+     * User Password for authentication on Mail Server

+     *

+     * @param 	string 	$_strPW 	User Password for authentication on Mail Server

+     * @return 	void

+     */

+    public function setPW($_strPW)

+    {

+        $this->_smtpsPW = $_strPW;

+    }

+

+    /**

+     * Retrieves the User Password for authentication on Mail Server

+     *

+     * @return 	string 		User Password for authentication on Mail Server

+     */

+    public function getPW()

+    {

+        return $this->_smtpsPW;

+    }

+

+    /**

+     * Character set used for current message

+     * Character set is defaulted to 'iso-8859-1';

+     *

+     * @param string $_strCharSet Character set used for current message

+     * @return void

+     */

+    public function setCharSet($_strCharSet)

+    {

+        if ($_strCharSet)

+        $this->_smtpsCharSet = $_strCharSet;

+    }

+

+    /**

+     * Retrieves the Character set used for current message

+     *

+     * @return string $_smtpsCharSet Character set used for current message

+     */

+    public function getCharSet()

+    {

+        return $this->_smtpsCharSet;

+    }

+

+    /**

+     * Content-Transfer-Encoding, Defaulted to '7bit'

+     * This can be changed for 2byte characers sets

+     * Known Encode Types

+     *  - 7bit               Simple 7-bit ASCII

+     *  - 8bit               8-bit coding with line termination characters

+     *  - base64             3 octets encoded into 4 sextets with offset

+     *  - binary             Arbitrary binary stream

+     *  - mac-binhex40       Macintosh binary to hex encoding

+     *  - quoted-printable   Mostly 7-bit, with 8-bit characters encoded as "=HH"

+     *  - uuencode           UUENCODE encoding

+     *

+     * @param string $_strTransEncode Content-Transfer-Encoding

+     * @return void

+     */

+    public function setTransEncode($_strTransEncode)

+    {

+        if (array_search($_strTransEncode, $this->_smtpsTransEncodeTypes))

+        $this->_smtpsTransEncode = $_strTransEncode;

+    }

+

+    /**

+     * Retrieves the Content-Transfer-Encoding

+     *

+     * @return string $_smtpsTransEncode Content-Transfer-Encoding

+     */

+    public function getTransEncode()

+    {

+        return $this->_smtpsTransEncode;

+    }

+

+    /**

+     * Content-Transfer-Encoding, Defaulted to '0' [ZERO]

+     * This can be changed for 2byte characers sets

+     * Known Encode Types

+     *  - [0] 7bit               Simple 7-bit ASCII

+     *  - [1] 8bit               8-bit coding with line termination characters

+     *  - [2] base64             3 octets encoded into 4 sextets with offset

+     *  - [3] binary             Arbitrary binary stream

+     *  - [4] mac-binhex40       Macintosh binary to hex encoding

+     *  - [5] quoted-printable   Mostly 7-bit, with 8-bit characters encoded as "=HH"

+     *  - [6] uuencode           UUENCODE encoding

+     *

+     * @param string $_strTransEncodeType Content-Transfer-Encoding

+     * @return void

+     *

+     */

+    public function setTransEncodeType($_strTransEncodeType)

+    {

+        if (array_search($_strTransEncodeType, $this->_smtpsTransEncodeTypes))

+        $this->_smtpsTransEncodeType = $_strTransEncodeType;

+    }

+

+    /**

+     * Retrieves the Content-Transfer-Encoding

+     *

+     * @return 	string 		Content-Transfer-Encoding

+     */

+    public function getTransEncodeType()

+    {

+        return $this->_smtpsTransEncodeTypes[$this->_smtpsTransEncodeType];

+    }

+

+

+    // ** Message Construction

+

+    /**

+     * FROM Address from which mail will be sent

+     *

+     * @param 	string 	$_strFrom 	Address from which mail will be sent

+     * @return 	void

+     */

+    public function setFrom($_strFrom)

+    {

+        if ($_strFrom)

+        $this->_msgFrom = $this->_strip_email($_strFrom);

+    }

+

+    /**

+     * Retrieves the Address from which mail will be sent

+     *

+     * @param  	boolean $_part		To "strip" 'Real name' from address

+     * @return 	string 				Address from which mail will be sent

+     */

+    public function getFrom($_part = true)

+    {

+        $_retValue = '';

+

+        if ($_part === true)

+        $_retValue = $this->_msgFrom;

+        else

+        $_retValue = $this->_msgFrom[$_part];

+

+        return $_retValue;

+    }

+

+    /**

+     * Reply-To Address from which mail will be the reply-to

+     *

+     * @param 	string 	$_strReplyTo 	Address from which mail will be the reply-to

+     * @return 	void

+     */

+    public function setReplyTo($_strReplyTo)

+    {

+        if ($_strReplyTo)

+            $this->_msgReplyTo = $this->_strip_email($_strReplyTo);

+    }

+

+    /**

+     * Retrieves the Address from which mail will be the reply-to

+     *

+     * @param  	boolean $_part		To "strip" 'Real name' from address

+     * @return 	string 				Address from which mail will be the reply-to

+     */

+    public function getReplyTo($_part = true)

+    {

+        $_retValue = '';

+

+        if ($_part === true)

+            $_retValue = $this->_msgReplyTo;

+        else

+            $_retValue = $this->_msgReplyTo[$_part];

+

+        return $_retValue;

+    }

+

+    /**

+     * Inserts given addresses into structured format.

+     * This method takes a list of given addresses, via an array

+     * or a COMMA delimted string, and inserts them into a highly

+     * structured array. This array is designed to remove duplicate

+     * addresses and to sort them by Domain.

+     *

+     * @param 	string 	$_type 			TO, CC, or BCC lists to add addrresses into

+     * @param 	mixed 	$_addrList 		Array or COMMA delimited string of addresses

+     * @return void

+     *

+     */

+    private function _buildAddrList($_type, $_addrList)

+    {

+        // Pull existing list

+        $aryHost = $this->_msgRecipients;

+

+        // Only run this if we have something

+        if (!empty($_addrList))

+        {

+            // $_addrList can be a STRING or an array

+            if (is_string($_addrList))

+            {

+                // This could be a COMMA delimited string

+                if (strstr($_addrList, ','))

+                // "explode "list" into an array

+                $_addrList = explode(',', $_addrList);

+

+                // Stick it in an array

+                else

+                $_addrList = array($_addrList);

+            }

+

+            // take the array of addresses and split them further

+            foreach ($_addrList as $_strAddr)

+            {

+                // Strip off the end '>'

+                $_strAddr = str_replace('>', '', $_strAddr);

+

+                // Seperate "Real Name" from eMail address

+                $_tmpaddr = null;

+                $_tmpaddr = explode('<', $_strAddr);

+

+                // We have a "Real Name" and eMail address

+                if (count($_tmpaddr) == 2)

+                {

+                    $_tmpHost = explode('@', $_tmpaddr[1]);

+                    $_tmpaddr[0] = trim($_tmpaddr[0], ' ">');

+                    $aryHost[$_tmpHost[1]][$_type][$_tmpHost[0]] = $_tmpaddr[0];

+                }

+                // We only have an eMail address

+                else

+                {

+                    // Strip off the beggining '<'

+                    $_strAddr = str_replace('<', '', $_strAddr);

+

+                    $_tmpHost = explode('@', $_strAddr);

+                    $_tmpHost[0] = trim($_tmpHost[0]);

+                    $_tmpHost[1] = trim($_tmpHost[1]);

+

+                    $aryHost[$_tmpHost[1]][$_type][$_tmpHost[0]] = '';

+                }

+            }

+        }

+        // replace list

+        $this->_msgRecipients = $aryHost;

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     * Returns an array of the various parts of an email address

+     * This assumes a well formed address:

+     * - "Real name" <username@domain.tld>

+     * - "Real Name" is optional

+     * - if "Real Name" does not exist, the angle brackets are optional

+     * This will split an email address into 4 or 5 parts.

+     * - $_aryEmail[org]  = orignal string

+     * - $_aryEmail[real] = "real name" - if there is one

+     * - $_aryEmail[addr] = address part "username@domain.tld"

+     * - $_aryEmail[host] = "domain.tld"

+     * - $_aryEmail[user] = "userName"

+     *

+     *	@param		string		$_strAddr		Email address

+     * 	@return 	array	 					An array of the various parts of an email address

+     */

+    private function _strip_email($_strAddr)

+    {

+        // phpcs:enable

+        // Keep the orginal

+        $_aryEmail['org'] = $_strAddr;

+

+        // Set entire string to Lower Case

+        $_strAddr = strtolower($_strAddr);

+

+        // Drop "stuff' off the end

+        $_strAddr = trim($_strAddr, ' ">');

+

+        // Seperate "Real Name" from eMail address, if we have one

+        $_tmpAry = explode('<', $_strAddr);

+

+        // Do we have a "Real name"

+        if (count($_tmpAry) == 2)

+        {

+            // We may not really have a "Real Name"

+            if ($_tmpAry[0])

+            $_aryEmail['real'] = trim($_tmpAry[0], ' ">');

+

+            $_aryEmail['addr'] = $_tmpAry[1];

+        }

+        else

+        $_aryEmail['addr'] = $_tmpAry[0];

+

+        // Pull User Name and Host.tld apart

+        list($_aryEmail['user'], $_aryEmail['host']) = explode('@', $_aryEmail['addr']);

+

+        // Put the brackets back around the address

+        $_aryEmail['addr'] = '<'.$_aryEmail['addr'].'>';

+

+        return $_aryEmail;

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     * Returns an array of bares addresses for use with 'RCPT TO:'

+     * This is a "build as you go" method. Each time this method is called

+     * the underlaying array is destroyed and reconstructed.

+     *

+     * @return 		array		Returns an array of bares addresses

+     */

+    public function get_RCPT_list()

+    {

+        // phpcs:enable

+        /**

+         * An array of bares addresses for use with 'RCPT TO:'

+         */

+        $_RCPT_list = array();

+

+        // walk down Recipients array and pull just email addresses

+        foreach ($this->_msgRecipients as $_host => $_list)

+        {

+            foreach ($_list as $_subList)

+            {

+                foreach ($_subList as $_name => $_addr)

+                {

+                    // build RCPT list

+                    $_RCPT_list[] = $_name.'@'.$_host;

+                }

+            }

+        }

+

+        return $_RCPT_list;

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     * Returns an array of addresses for a specific type; TO, CC or BCC

+     *

+     * @param 		string 	       $_which 	    Which collection of addresses to return ('to', 'cc', 'bcc')

+     * @return 		string|false 				Array of emaill address

+     */

+    public function get_email_list($_which = null)

+    {

+        // phpcs:enable

+        // We need to know which address segment to pull

+        if ($_which)

+        {

+            // Make sure we have addresses to process

+            if ($this->_msgRecipients)

+            {

+                $_RCPT_list = array();

+                // walk down Recipients array and pull just email addresses

+                foreach ($this->_msgRecipients as $_host => $_list)

+                {

+                    if ($this->_msgRecipients[$_host][$_which])

+                    {

+                        foreach ($this->_msgRecipients[$_host][$_which] as $_addr => $_realName)

+                        {

+                            if ($_realName)	// @CHANGE LDR

+                            {

+                                $_realName = '"'.$_realName.'"';

+                                $_RCPT_list[] = $_realName.' <'.$_addr.'@'.$_host.'>';

+                            }

+                            else

+                            {

+                                $_RCPT_list[] = $_addr.'@'.$_host;

+                            }

+                        }

+                    }

+                }

+

+                return implode(', ', $_RCPT_list);

+            }

+            else

+            {

+                $this->_setErr(101, 'No eMail Address for message to be sent to.');

+                return false;

+            }

+        }

+        else

+        {

+            $this->_setErr(102, 'eMail type not defined.');

+            return false;

+        }

+    }

+

+    /**

+     * TO Address[es] inwhich to send mail to

+     *

+     * @param 	string 	$_addrTo 	TO Address[es] inwhich to send mail to

+     * @return 	void

+     */

+    public function setTO($_addrTo)

+    {

+        if ($_addrTo)

+        $this->_buildAddrList('to', $_addrTo);

+    }

+

+    /**

+     * Retrieves the TO Address[es] inwhich to send mail to

+     *

+     * @return 	string 	TO Address[es] inwhich to send mail to

+     */

+    public function getTo()

+    {

+        return $this->get_email_list('to');

+    }

+

+    /**

+     * CC Address[es] inwhich to send mail to

+     *

+     * @param 	string	$_strCC		CC Address[es] inwhich to send mail to

+     * @return 	void

+     */

+    public function setCC($_strCC)

+    {

+        if ($_strCC)

+        $this->_buildAddrList('cc', $_strCC);

+    }

+

+    /**

+     * Retrieves the CC Address[es] inwhich to send mail to

+     *

+     * @return 	string 		CC Address[es] inwhich to send mail to

+     */

+    public function getCC()

+    {

+        return $this->get_email_list('cc');

+    }

+

+    /**

+     * BCC Address[es] inwhich to send mail to

+     *

+     * @param 	string		$_strBCC	Recipients BCC Address[es] inwhich to send mail to

+     * @return 	void

+     */

+    public function setBCC($_strBCC)

+    {

+        if ($_strBCC)

+        $this->_buildAddrList('bcc', $_strBCC);

+    }

+

+    /**

+     * Retrieves the BCC Address[es] inwhich to send mail to

+     *

+     * @return 	string		BCC Address[es] inwhich to send mail to

+     */

+    public function getBCC()

+    {

+        return $this->get_email_list('bcc');

+    }

+

+    /**

+     * Message Subject

+     *

+     * @param 	string 	$_strSubject	Message Subject

+     * @return 	void

+     */

+    public function setSubject($_strSubject = '')

+    {

+        if ($_strSubject)

+        $this->_msgSubject = $_strSubject;

+    }

+

+    /**

+     * Retrieves the Message Subject

+     *

+     * @return 	string 		Message Subject

+     */

+    public function getSubject()

+    {

+        return $this->_msgSubject;

+    }

+

+    /**

+     * Constructes and returns message header

+     *

+     * @return string Complete message header

+     */

+    public function getHeader()

+    {

+        global $conf;

+

+        $_header = 'From: '.$this->getFrom('org')."\r\n"

+        . 'To: '.$this->getTO()."\r\n";

+

+        if ($this->getCC())

+        $_header .= 'Cc: '.$this->getCC()."\r\n";

+

+        /* Note:

+         * BCC email addresses must be listed in the RCPT TO command list,

+         * but the BCC header should not be printed under the DATA command.

+         * So it is included into the function sendMsg() but not here.

+         * http://stackoverflow.com/questions/2750211/sending-bcc-emails-using-a-smtp-server

+         */

+        /*

+        if ( $this->getBCC() )

+        $_header .= 'Bcc: ' . $this->getBCC()  . "\r\n";

+        */

+

+        $host = dol_getprefix('email');

+

+        //NOTE: Message-ID should probably contain the username of the user who sent the msg

+        $_header .= 'Subject: '.$this->getSubject()."\r\n";

+        $_header .= 'Date: '.date("r")."\r\n";

+

+        $trackid = $this->getTrackId();

+        if ($trackid)

+        {

+            // References is kept in response and Message-ID is returned into In-Reply-To:

+            $_header .= 'Message-ID: <'.time().'.SMTPs-dolibarr-'.$trackid.'@'.$host.">\r\n";

+            $_header .= 'References: <'.time().'.SMTPs-dolibarr-'.$trackid.'@'.$host.">\r\n";

+            $_header .= 'X-Dolibarr-TRACKID: '.$trackid.'@'.$host."\r\n";

+        }

+        else

+        {

+            $_header .= 'Message-ID: <'.time().'.SMTPs@'.$host.">\r\n";

+        }

+        if (!empty($_SERVER['REMOTE_ADDR'])) $_header .= "X-RemoteAddr: ".$_SERVER['REMOTE_ADDR']."\r\n";

+        if ($this->getMoreInHeader())

+            $_header .= $this->getMoreInHeader(); // Value must include the "\r\n";

+

+        //$_header .=

+        //                 'Read-Receipt-To: '   . $this->getFrom( 'org' ) . "\r\n"

+        //                 'Return-Receipt-To: ' . $this->getFrom( 'org' ) . "\r\n";

+

+        if ($this->getSensitivity())

+        $_header .= 'Sensitivity: '.$this->getSensitivity()."\r\n";

+

+        if ($this->_msgPriority != 3)

+        $_header .= $this->getPriority();

+

+

+        // @CHANGE LDR

+        if ($this->getDeliveryReceipt())

+            $_header .= 'Disposition-Notification-To: '.$this->getFrom('addr')."\r\n";

+        if ($this->getErrorsTo())

+            $_header .= 'Errors-To: '.$this->getErrorsTo('addr')."\r\n";

+        if ($this->getReplyTo())

+            $_header .= "Reply-To: ".$this->getReplyTo('addr')."\r\n";

+

+        $_header .= 'X-Mailer: Dolibarr version '.DOL_VERSION.' (using SMTPs Mailer)'."\r\n";

+        $_header .= 'X-Dolibarr-Option: '.($conf->global->MAIN_MAIL_USE_MULTI_PART ? 'MAIN_MAIL_USE_MULTI_PART' : 'No MAIN_MAIL_USE_MULTI_PART')."\r\n";

+        $_header .= 'Mime-Version: 1.0'."\r\n";

+

+

+        return $_header;

+    }

+

+    /**

+     * Message Content

+     *

+     * @param 	string 	$strContent		Message Content

+     * @param	string	$strType		Type

+     * @return 	void

+     */

+    public function setBodyContent($strContent, $strType = 'plain')

+    {

+        //if ( $strContent )

+        //{

+        if ($strType == 'html')

+        $strMimeType = 'text/html';

+        else

+        $strMimeType = 'text/plain';

+

+        // Make RFC821 Compliant, replace bare linefeeds

+        $strContent = preg_replace("/(?<!\r)\n/si", "\r\n", $strContent);

+

+        $strContentAltText = '';

+        if ($strType == 'html')

+        {

+        	// Similar code to forge a text from html is also in CMailFile.class.php

+        	$strContentAltText = preg_replace('/<head><title>.*<\/style><\/head>/', '', $strContent);

+        	$strContentAltText = preg_replace("/<br\s*[^>]*>/", " ", $strContentAltText);

+        	$strContentAltText = html_entity_decode(strip_tags($strContentAltText));

+            $strContentAltText = trim(wordwrap($strContentAltText, 75, "\r\n"));

+        }

+

+        // Make RFC2045 Compliant

+        //$strContent = rtrim(chunk_split($strContent));    // Function chunck_split seems ko if not used on a base64 content

+        $strContent = rtrim(wordwrap($strContent, 75, "\r\n")); // TODO Using this method creates unexpected line break on text/plain content.

+

+        $this->_msgContent[$strType] = array();

+

+        $this->_msgContent[$strType]['mimeType'] = $strMimeType;

+        $this->_msgContent[$strType]['data']     = $strContent;

+        $this->_msgContent[$strType]['dataText'] = $strContentAltText;

+

+        if ($this->getMD5flag())

+        $this->_msgContent[$strType]['md5']      = dol_hash($strContent, 3);

+        //}

+    }

+

+    /**

+     * Retrieves the Message Content

+     *

+     * @return 	string			Message Content

+     */

+    public function getBodyContent()

+    {

+        global $conf;

+

+        // Generate a new Boundary string

+        $this->_setBoundary();

+

+        // What type[s] of content do we have

+        $_types = array_keys($this->_msgContent);

+

+        // How many content types do we have

+        $keyCount = count($_types);

+

+        // If we have ZERO, we have a problem

+        if ($keyCount === 0)

+        die("Sorry, no content");

+

+        // If we have ONE, we can use the simple format

+        elseif ($keyCount === 1 && empty($conf->global->MAIN_MAIL_USE_MULTI_PART))

+        {

+            $_msgData = $this->_msgContent;

+            $_msgData = $_msgData[$_types[0]];

+

+            $content = 'Content-Type: '.$_msgData['mimeType'].'; charset="'.$this->getCharSet().'"'."\r\n"

+            . 'Content-Transfer-Encoding: '.$this->getTransEncodeType()."\r\n"

+            . 'Content-Disposition: inline'."\r\n"

+            . 'Content-Description: Message'."\r\n";

+

+            if ($this->getMD5flag())

+            $content .= 'Content-MD5: '.$_msgData['md5']."\r\n";

+

+            $content .= "\r\n"

+            .  $_msgData['data']."\r\n";

+        }

+

+        // If we have more than ONE, we use the multi-part format

+        elseif ($keyCount >= 1 || !empty($conf->global->MAIN_MAIL_USE_MULTI_PART))

+        {

+            // Since this is an actual multi-part message

+            // We need to define a content message Boundary

+            // NOTE: This was 'multipart/alternative', but Windows based mail servers have issues with this.

+

+            //$content = 'Content-Type: multipart/related; boundary="' . $this->_getBoundary() . '"'   . "\r\n";

+            $content = 'Content-Type: multipart/mixed; boundary="'.$this->_getBoundary('mixed').'"'."\r\n";

+

+            //                     . "\r\n"

+            //                     . 'This is a multi-part message in MIME format.' . "\r\n";

+            $content .= "Content-Transfer-Encoding: 8bit\r\n";

+            $content .= "\r\n";

+

+            $content .= "--".$this->_getBoundary('mixed')."\r\n";

+

+            if (key_exists('image', $this->_msgContent))     // If inline image found

+            {

+                $content .= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"'."\r\n";

+                $content .= "\r\n";

+                $content .= "--".$this->_getBoundary('alternative')."\r\n";

+            }

+

+

+            // $this->_msgContent must be sorted with key 'text' or 'html' first then 'image' then 'attachment'

+

+

+            // Loop through message content array

+            foreach ($this->_msgContent as $type => $_content)

+            {

+                if ($type == 'attachment')

+                {

+                    // loop through all attachments

+                    foreach ($_content as $_file => $_data)

+                    {

+                        $content .= "--".$this->_getBoundary('mixed')."\r\n"

+                        .  'Content-Disposition: attachment; filename="'.$_data['fileName'].'"'."\r\n"

+                        .  'Content-Type: '.$_data['mimeType'].'; name="'.$_data['fileName'].'"'."\r\n"

+                        .  'Content-Transfer-Encoding: base64'."\r\n"

+                        .  'Content-Description: '.$_data['fileName']."\r\n";

+

+                        if ($this->getMD5flag())

+                        $content .= 'Content-MD5: '.$_data['md5']."\r\n";

+

+                        $content .= "\r\n".$_data['data']."\r\n\r\n";

+                    }

+                }

+                // @CHANGE LDR

+                elseif ($type == 'image')

+                {

+                    // loop through all images

+                    foreach ($_content as $_image => $_data)

+                    {

+                        $content .= "--".$this->_getBoundary('related')."\r\n"; // always related for an inline image

+

+                        $content .= 'Content-Type: '.$_data['mimeType'].'; name="'.$_data['imageName'].'"'."\r\n"

+                        .  'Content-Transfer-Encoding: base64'."\r\n"

+                        .  'Content-Disposition: inline; filename="'.$_data['imageName'].'"'."\r\n"

+                        .  'Content-ID: <'.$_data['cid'].'> '."\r\n";

+

+                        if ($this->getMD5flag())

+                        $content .= 'Content-MD5: '.$_data['md5']."\r\n";

+

+                        $content .= "\r\n"

+                        . $_data['data']."\r\n";

+                    }

+

+                    // always end related and end alternative after inline images

+                    $content .= "--".$this->_getBoundary('related')."--\r\n";

+                    $content .= "\r\n--".$this->_getBoundary('alternative')."--\r\n";

+                    $content .= "\r\n";

+                }

+                else

+                {

+                    if (key_exists('image', $this->_msgContent))

+                    {

+                        $content .= "Content-Type: text/plain; charset=".$this->getCharSet()."\r\n";

+                        $content .= "\r\n".($_content['dataText'] ? $_content['dataText'] : strip_tags($_content['data']))."\r\n"; // Add plain text message

+                        $content .= "--".$this->_getBoundary('alternative')."\r\n";

+                        $content .= 'Content-Type: multipart/related; boundary="'.$this->_getBoundary('related').'"'."\r\n";

+                        $content .= "\r\n";

+                        $content .= "--".$this->_getBoundary('related')."\r\n";

+                    }

+

+                    if (!key_exists('image', $this->_msgContent) && $_content['dataText'] && !empty($conf->global->MAIN_MAIL_USE_MULTI_PART))  // Add plain text message part before html part

+                    {

+                        $content .= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"'."\r\n";

+                        $content .= "\r\n";

+                           $content .= "--".$this->_getBoundary('alternative')."\r\n";

+

+                           $content .= "Content-Type: text/plain; charset=".$this->getCharSet()."\r\n";

+                           $content .= "\r\n".$_content['dataText']."\r\n";

+                           $content .= "--".$this->_getBoundary('alternative')."\r\n";

+                    }

+

+                    $content .= 'Content-Type: '.$_content['mimeType'].'; charset='.$this->getCharSet();

+

+                    $content .= "\r\n";

+

+                    if ($this->getMD5flag()) {

+                    	$content .= 'Content-MD5: '.$_content['md5']."\r\n";

+                    }

+

+                    $content .= "\r\n".$_content['data']."\r\n";

+

+                    if (!key_exists('image', $this->_msgContent) && $_content['dataText'] && !empty($conf->global->MAIN_MAIL_USE_MULTI_PART))  // Add plain text message part after html part

+                    {

+                        $content .= "--".$this->_getBoundary('alternative')."--\r\n";

+                    }

+

+                    $content .= "\r\n";

+                }

+            }

+

+            $content .= "--".$this->_getBoundary('mixed').'--'."\r\n";

+        }

+

+        return $content;

+    }

+

+    /**

+     * File attachments are added to the content array as sub-arrays,

+     * allowing for multiple attachments for each outbound email

+     *

+     * @param string $strContent  File data to attach to message

+     * @param string $strFileName File Name to give to attachment

+     * @param string $strMimeType File Mime Type of attachment

+     * @return void

+     */

+    public function setAttachment($strContent, $strFileName = 'unknown', $strMimeType = 'unknown')

+    {

+        if ($strContent)

+        {

+            $strContent = rtrim(chunk_split(base64_encode($strContent), 76, "\r\n")); // 76 max is defined into http://tools.ietf.org/html/rfc2047

+

+            $this->_msgContent['attachment'][$strFileName]['mimeType'] = $strMimeType;

+            $this->_msgContent['attachment'][$strFileName]['fileName'] = $strFileName;

+            $this->_msgContent['attachment'][$strFileName]['data']     = $strContent;

+

+            if ($this->getMD5flag())

+            $this->_msgContent['attachment'][$strFileName]['md5']      = dol_hash($strContent, 3);

+        }

+    }

+

+

+    // @CHANGE LDR

+

+    /**

+     * Image attachments are added to the content array as sub-arrays,

+     * allowing for multiple images for each outbound email

+     *

+     * @param 	string $strContent  	Image data to attach to message

+     * @param 	string $strImageName 	Image Name to give to attachment

+     * @param 	string $strMimeType 	Image Mime Type of attachment

+     * @param 	string $strImageCid		CID

+     * @return 	void

+     */

+    public function setImageInline($strContent, $strImageName = 'unknown', $strMimeType = 'unknown', $strImageCid = 'unknown')

+    {

+        if ($strContent)

+        {

+            $this->_msgContent['image'][$strImageName]['mimeType'] = $strMimeType;

+            $this->_msgContent['image'][$strImageName]['imageName'] = $strImageName;

+            $this->_msgContent['image'][$strImageName]['cid']      = $strImageCid;

+            $this->_msgContent['image'][$strImageName]['data']     = $strContent;

+

+            if ($this->getMD5flag())

+            $this->_msgContent['image'][$strImageName]['md5']      = dol_hash($strContent, 3);

+        }

+    }

+    // END @CHANGE LDR

+

+

+    /**

+     * Message Content Sensitivity

+     * Message Sensitivity values:

+     *   - [0] None - default

+     *   - [1] Personal

+     *   - [2] Private

+     *   - [3] Company Confidential

+     *

+     * @param 	integer	$_value		Message Sensitivity

+     * @return 	void

+     */

+    public function setSensitivity($_value = 0)

+    {

+        if ((is_numeric($_value)) &&

+        (($_value >= 0) && ($_value <= 3)))

+        $this->_msgSensitivity = $_value;

+    }

+

+    /**

+     * Returns Message Content Sensitivity string

+     * Message Sensitivity values:

+     *   - [0] None - default

+     *   - [1] Personal

+     *   - [2] Private

+     *   - [3] Company Confidential

+     *

+     * @return 	void

+     */

+    public function getSensitivity()

+    {

+        return $this->_arySensitivity[$this->_msgSensitivity];

+    }

+

+    /**

+     * Message Content Priority

+     * Message Priority values:

+     *  - [0] 'Bulk'

+     *  - [1] 'Highest'

+     *  - [2] 'High'

+     *  - [3] 'Normal' - default

+     *  - [4] 'Low'

+     *  - [5] 'Lowest'

+     *

+     * @param 	integer 	$_value 	Message Priority

+     * @return 	void

+     */

+    public function setPriority($_value = 3)

+    {

+        if ((is_numeric($_value)) &&

+        (($_value >= 0) && ($_value <= 5)))

+        $this->_msgPriority = $_value;

+    }

+

+    /**

+     * Message Content Priority

+     * Message Priority values:

+     *  - [0] 'Bulk'

+     *  - [1] 'Highest'

+     *  - [2] 'High'

+     *  - [3] 'Normal' - default

+     *  - [4] 'Low'

+     *  - [5] 'Lowest'

+     *

+     * @return string

+     */

+    public function getPriority()

+    {

+        return 'Importance: '.$this->_aryPriority[$this->_msgPriority]."\r\n"

+        . 'Priority: '.$this->_aryPriority[$this->_msgPriority]."\r\n"

+        . 'X-Priority: '.$this->_msgPriority.' ('.$this->_aryPriority[$this->_msgPriority].')'."\r\n";

+    }

+

+    /**

+     * Set flag which determines whether to calculate message MD5 checksum.

+     *

+     * @param 	string 	$_flag		Message Priority

+     * @return 	void

+     */

+    public function setMD5flag($_flag = false)

+    {

+        $this->_smtpMD5 = $_flag;

+    }

+

+    /**

+     * Gets flag which determines whether to calculate message MD5 checksum.

+     *

+     * @return 	boolean 				Message Priority

+     */

+    public function getMD5flag()

+    {

+        return $this->_smtpMD5;

+    }

+

+    /**

+     * Message X-Header Content

+     * This is a simple "insert". Whatever is given will be placed

+     * "as is" into the Xheader array.

+     *

+     * @param string $strXdata Message X-Header Content

+     * @return void

+     */

+    public function setXheader($strXdata)

+    {

+        if ($strXdata)

+        $this->_msgXheader[] = $strXdata;

+    }

+

+    /**

+     * Retrieves the Message X-Header Content

+     *

+     * @return string[] $_msgContent Message X-Header Content

+     */

+    public function getXheader()

+    {

+        return $this->_msgXheader;

+    }

+

+    /**

+     * Generates Random string for MIME message Boundary

+     *

+     * @return void

+     */

+    private function _setBoundary()

+    {

+        $this->_smtpsBoundary = "multipart_x.".time().".x_boundary";

+        $this->_smtpsRelatedBoundary = 'mul_'.dol_hash(uniqid("dolibarr2"), 3);

+        $this->_smtpsAlternativeBoundary = 'mul_'.dol_hash(uniqid("dolibarr3"), 3);

+    }

+

+    /**

+     * Retrieves the MIME message Boundary

+     *

+     * @param  string $type				Type of boundary

+     * @return string $_smtpsBoundary 	MIME message Boundary

+     */

+    private function _getBoundary($type = 'mixed')

+    {

+        if ($type == 'mixed') return $this->_smtpsBoundary;

+        elseif ($type == 'related') return $this->_smtpsRelatedBoundary;

+        elseif ($type == 'alternative') return $this->_smtpsAlternativeBoundary;

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     * This function has been modified as provided by SirSir to allow multiline responses when

+     * using SMTP Extensions

+     *

+     * @param	resource    $socket			Socket handler

+     * @param	string		$response		Response. Example: "550 5.7.1  https://support.google.com/a/answer/6140680#invalidcred j21sm814390wre.3"

+     * @return	boolean						True or false

+     */

+    public function server_parse($socket, $response)

+    {

+        // phpcs:enable

+        /**

+         * Returns constructed SELECT Object string or boolean upon failure

+         * Default value is set at true

+         */

+        $_retVal = true;

+

+        $server_response = '';

+

+        // avoid infinite loop

+        $limit = 0;

+

+        while (substr($server_response, 3, 1) != ' ' && $limit < 100)

+        {

+            if (!($server_response = fgets($socket, 256)))

+            {

+                $this->_setErr(121, "Couldn't get mail server response codes");

+                $_retVal = false;

+                break;

+            }

@@ -1929,75 +1791,69 @@
-			$limit++;

-		}

-

-		$this->lastretval = substr($server_response, 0, 3);

-

-		if (!(substr($server_response, 0, 3) == $response)) {

-			$this->_setErr(120, "Ran into problems sending Mail.\r\nResponse: ".$server_response);

-			$_retVal = false;

-		}

-

-		return $_retVal;

-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

-	/**

-	 * Send str

-	 *

-	 * @param	string		$_strSend		String to send

-	 * @param 	string		$_returnCode	Expected return code

-	 * @param 	string		$CRLF			CRLF

-	 * @return 	boolean|null				True or false

-	 */

-	public function socket_send_str($_strSend, $_returnCode = null, $CRLF = "\r\n")

-	{

-		// phpcs:enable

-		if ($this->_debug) {

-			$this->log .= $_strSend; // @CHANGE LDR for log

-		}

-		fputs($this->socket, $_strSend.$CRLF);

-		if ($this->_debug) {

-			$this->log .= ' ('.$_returnCode.')'.$CRLF;

-		}

-

-		if ($_returnCode) {

-			return $this->server_parse($this->socket, $_returnCode);

-		}

-

-		return null;

-	}

-

-	// =============================================================

-	// ** Error handling methods

-

-	/**

-	 * Defines errors codes and messages for Class

-	 *

-	 * @param  int    $_errNum  Error Code Number

-	 * @param  string $_errMsg  Error Message

-	 * @return void

-	 */

-	private function _setErr($_errNum, $_errMsg)

-	{

-		$this->_smtpsErrors[] = array(

-			'num' => $_errNum,

-			'msg' => $_errMsg,

-		);

-	}

-

-	/**

-	 * Returns applicative errors codes and messages for Class (not the SMTP error code)

-	 *

-	 * @return string $_errMsg  Error Message

-	 */

-	public function getErrors()

-	{

-		$_errMsg = array();

-

-		if (is_array($this->_smtpsErrors)) {

-			foreach ($this->_smtpsErrors as $_err => $_info) {

-				$_errMsg[] = 'Error ['.$_info['num'].']: '.$_info['msg'];

-			}

-		}

-

-		return implode("\n", $_errMsg);

-	}

+            $limit++;

+        }

+

+        if (!(substr($server_response, 0, 3) == $response))

+        {

+            $this->_setErr(120, "Ran into problems sending Mail.\r\nResponse: $server_response");

+            $_retVal = false;

+        }

+

+        return $_retVal;

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    /**

+     * Send str

+     *

+     * @param	string		$_strSend		String to send

+     * @param 	string		$_returnCode	Return code

+     * @param 	string		$CRLF			CRLF

+     * @return 	boolean|null						True or false

+     */

+    public function socket_send_str($_strSend, $_returnCode = null, $CRLF = "\r\n")

+    {

+        // phpcs:enable

+        if ($this->_debug) $this->log .= $_strSend; // @CHANGE LDR for log

+        fputs($this->socket, $_strSend.$CRLF);

+        if ($this->_debug) $this->log .= ' ('.$_returnCode.')'.$CRLF;

+

+        if ($_returnCode)

+        return $this->server_parse($this->socket, $_returnCode);

+    }

+

+    // =============================================================

+    // ** Error handling methods

+

+    /**

+     * Defines errors codes and messages for Class

+     *

+     * @param  int    $_errNum  Error Code Number

+     * @param  string $_errMsg  Error Message

+     * @return void

+     */

+    private function _setErr($_errNum, $_errMsg)

+    {

+        $this->_smtpsErrors[] = array(

+            'num' => $_errNum,

+            'msg' => $_errMsg,

+        );

+    }

+

+    /**

+     * Returns errors codes and messages for Class

+     *

+     * @return string $_errMsg  Error Message

+     */

+    public function getErrors()

+    {

+        $_errMsg = array();

+

+        if (is_array($this->_smtpsErrors))

+        {

+            foreach ($this->_smtpsErrors as $_err => $_info)

+            {

+                $_errMsg[] = 'Error ['.$_info['num'].']: '.$_info['msg'];

+            }

+        }

+

+        return implode("\n", $_errMsg);

+    }

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_stats.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_stats.class.php
@@ -32,51 +32,3 @@
-	protected $db;

-	protected $lastfetchdate = array(); // Dates of cache file read by methods

-	public $cachefilesuffix = ''; // Suffix to add to name of cache file (to avoid file name conflicts)

-

-	/**

-	 * @var string	To store the FROM part of the main table of the SQL request

-	 */

-	public $from;

-

-	/**

-	 * @var string	To store the WHERE part of the main table of the SQL request

-	 */

-	public $where;

-	/**

-	 * @var string	To store the FROM part of the line table of the SQL request

-	 */

-	public $from_line;

-	/**

-	 * @var string	To store the field of the date

-	 */

-	public $field_date;

-	/**

-	 * @var string	To store the field for total HT

-	 */

-	public $field;

-	/**

-	 * @var string	To store the FROM part of the line table of the SQL request

-	 */

-	public $field_line;

-

-	/**

-	 * @var string	error message

-	 */

-	public $error;

-

-	/**

-	 * @var int year

-	 */

-	public $year;

-

-	/**

-	 * @var int month

-	 */

-	public $month;

-

-	/**

-	 *  @param	int		$year 			number

-	 * 	@param	int 	$format 		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month

-	 * 	@return int						value

-	 */

-	abstract protected function getNbByMonth($year, $format = 0);

+    protected $db;

+    protected $lastfetchdate = array(); // Dates of cache file read by methods

+    public $cachefilesuffix = ''; // Suffix to add to name of cache file (to avoid file name conflicts)

@@ -90 +42 @@
-	 * @param	int		$format			0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month

+     * @param	int		$format			0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month

@@ -92 +44,2 @@
-	 * @return 	array					Array of values

+     * @return 	array					Array of values

+

@@ -98,3 +51 @@
-		if ($startyear > $endyear) {

-			return array();

-		}

+	    if ($startyear > $endyear) return -1;

@@ -105,4 +56,5 @@
-		if (!empty($cachedelay)) {

-			include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

-			include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';

-		}

+		if (!empty($cachedelay))

+	    {

+	    	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

+	    	include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';

+	    }

@@ -116 +68,2 @@
-		if ($cachedelay > 0) {

+		if ($cachedelay > 0)

+		{

@@ -118 +71,2 @@
-			if ($filedate >= ($nowgmt - $cachedelay)) {

+			if ($filedate >= ($nowgmt - $cachedelay))

+			{

@@ -122 +76,3 @@
-			} else {

+			}

+			else

+			{

@@ -127 +83,2 @@
-		if ($foundintocache) {    // Cache file found and is not too old

+		if ($foundintocache)    // Cache file found and is not too old

+		{

@@ -130 +87,3 @@
-		} else {

+		}

+		else

+		{

@@ -133,4 +92,3 @@
-			if ($sm != 0) {

-				$year = $year - 1;

-			}

-			while ($year <= $endyear) {

+			if ($sm != 0) $year = $year - 1;

+			while ($year <= $endyear)

+			{

@@ -143 +101,2 @@
-			for ($i = 0; $i < 12; $i++) {

+			for ($i = 0; $i < 12; $i++)

+			{

@@ -146,3 +105,3 @@
-				while ($year <= $endyear) {

-					// floor(($i + $sm) / 12)) is 0 if we are after the month start $sm and same year, become 1 when we reach january of next year

-					$data[$i][] = $datay[$year - (1 - floor(($i + $sm) / 12)) + ($sm == 0 ? 1 : 0)][($i + $sm) % 12][1];

+				while ($year <= $endyear)

+				{

+					$data[$i][] = $datay[$year - (1 - ((int) ($i + $sm) / 12)) + ($sm == 0 ? 1 : 0)][($i + $sm) % 12][1];

@@ -155 +114,2 @@
-		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1)) {

+		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))

+		{

@@ -157,3 +117 @@
-			if (!dol_is_dir($conf->user->dir_temp)) {

-				dol_mkdir($conf->user->dir_temp);

-			}

+			if (!dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);

@@ -161,7 +119,4 @@
-			if ($fp) {

-				fwrite($fp, json_encode($data));

-				fclose($fp);

-			} else {

-				dol_syslog("Failed to save cache file ".$newpathofdestfile);

-			}

-			dolChmod($newpathofdestfile);

+			fwrite($fp, json_encode($data));

+			fclose($fp);

+			if (!empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;

+			@chmod($newpathofdestfile, octdec($newmask));

@@ -175,7 +129,0 @@
-

-	/**

-	 * @param	int		$year			year number

-	 * @param	int 	$format			0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month

-	 * @return 	int						value

-	 */

-	abstract protected function getAmountByMonth($year, $format = 0);

@@ -192 +140 @@
-	 * @param	int		$format			0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month

+     * @param	int		$format			0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month

@@ -200,34 +148,40 @@
-		if ($startyear > $endyear) {

-			return array();

-		}

-

-		$datay = array();

-

-		// Search into cache

-		if (!empty($cachedelay)) {

-			include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

-			include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';

-		}

-

-		$newpathofdestfile = $conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix) ? '' : $this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';

-		$newmask = '0644';

-

-		$nowgmt = dol_now();

-

-		$foundintocache = 0;

-		if ($cachedelay > 0) {

-			$filedate = dol_filemtime($newpathofdestfile);

-			if ($filedate >= ($nowgmt - $cachedelay)) {

-				$foundintocache = 1;

-

-				$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;

-			} else {

-				dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");

-			}

-		}

-

-		// Load file into $data

-		if ($foundintocache) {    // Cache file found and is not too old

-			dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");

-			$data = json_decode(file_get_contents($newpathofdestfile), true);

-		} else {

+        if ($startyear > $endyear) return -1;

+

+        $datay = array();

+

+        // Search into cache

+        if (!empty($cachedelay))

+        {

+        	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

+        	include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';

+        }

+

+        $newpathofdestfile = $conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix) ? '' : $this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';

+        $newmask = '0644';

+

+        $nowgmt = dol_now();

+

+        $foundintocache = 0;

+        if ($cachedelay > 0)

+        {

+        	$filedate = dol_filemtime($newpathofdestfile);

+        	if ($filedate >= ($nowgmt - $cachedelay))

+        	{

+        		$foundintocache = 1;

+

+        		$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;

+        	}

+        	else

+        	{

+        		dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");

+        	}

+        }

+

+        // Load file into $data

+        if ($foundintocache)    // Cache file found and is not too old

+        {

+        	dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");

+        	$data = json_decode(file_get_contents($newpathofdestfile), true);

+        }

+        else

+		{

@@ -236,4 +190,3 @@
-			if ($sm != 0) {

-				$year = $year - 1;

-			}

-			while ($year <= $endyear) {

+			if ($sm != 0) $year = $year - 1;

+			while ($year <= $endyear)

+			{

@@ -246 +199,2 @@
-			for ($i = 0; $i < 12; $i++) {

+			for ($i = 0; $i < 12; $i++)

+			{

@@ -249,3 +203,3 @@
-				while ($year <= $endyear) {

-					// floor(($i + $sm) / 12)) is 0 if we are after the month start $sm and same year, become 1 when we reach january of next year

-					$data[$i][] = $datay[$year - (1 - floor(($i + $sm) / 12)) + ($sm == 0 ? 1 : 0)][($i + $sm) % 12][1]; // set yval for x=i

+				while ($year <= $endyear)

+				{

+					$data[$i][] = $datay[$year - (1 - ((int) ($i + $sm) / 12)) + ($sm == 0 ? 1 : 0)][($i + $sm) % 12][1]; // set yval for x=i

@@ -258 +212,2 @@
-		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1)) {

+		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))

+		{

@@ -260,3 +215 @@
-			if (!dol_is_dir($conf->user->dir_temp)) {

-				dol_mkdir($conf->user->dir_temp);

-			}

+			if (!dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);

@@ -264 +217,2 @@
-			if ($fp) {

+			if ($fp)

+			{

@@ -267,4 +221,4 @@
-				dolChmod($newpathofdestfile);

-			} else {

-				dol_syslog("Failed to write cache file", LOG_ERR);

-			}

+				if (!empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;

+				@chmod($newpathofdestfile, octdec($newmask));

+			}

+			else dol_syslog("Failed to write cache file", LOG_ERR);

@@ -276,6 +229,0 @@
-

-	/**

-	 * @param	int     $year           year number

-	 * @return 	array					array of values

-	 */

-	abstract protected function getAverageByMonth($year);

@@ -290,7 +238,5 @@
-	public function getAverageByMonthWithPrevYear($endyear, $startyear)

-	{

-		if ($startyear > $endyear) {

-			return array();

-		}

-

-		$datay = array();

+    public function getAverageByMonthWithPrevYear($endyear, $startyear)

+    {

+        if ($startyear > $endyear) return -1;

+

+        $datay = array();

@@ -299 +245,2 @@
-		while ($year <= $endyear) {

+		while ($year <= $endyear)

+		{

@@ -306 +253,2 @@
-		for ($i = 0; $i < 12; $i++) {

+		for ($i = 0; $i < 12; $i++)

+		{

@@ -309 +257,2 @@
-			while ($year <= $endyear) {

+			while ($year <= $endyear)

+			{

@@ -323 +272 @@
-	 * @param  	int     $limit      	Limit

+     * @param  	int     $limit      	Limit

@@ -326,36 +275,42 @@
-	public function getAllByProductEntry($year, $cachedelay = 0, $limit = 10)

-	{

-		global $conf, $user, $langs;

-

-		$data = array();

-

-		// Search into cache

-		if (!empty($cachedelay)) {

-			include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

-			include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';

-		}

-

-		$newpathofdestfile = $conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix) ? '' : $this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';

-		$newmask = '0644';

-

-		$nowgmt = dol_now();

-

-		$foundintocache = 0;

-		if ($cachedelay > 0) {

-			$filedate = dol_filemtime($newpathofdestfile);

-			if ($filedate >= ($nowgmt - $cachedelay)) {

-				$foundintocache = 1;

-

-				$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;

-			} else {

-				dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");

-			}

-		}

-

-		// Load file into $data

-		if ($foundintocache) {    // Cache file found and is not too old

-			dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");

-			$data = json_decode(file_get_contents($newpathofdestfile), true);

-		} else {

-			// This method is defined in parent object only, not into abstract, so we disable phpstan warning

-			/** @phpstan-ignore-next-line */

+    public function getAllByProductEntry($year, $cachedelay = 0, $limit = 10)

+    {

+        global $conf, $user, $langs;

+

+        $data = array();

+

+        // Search into cache

+        if (!empty($cachedelay))

+        {

+        	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

+        	include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';

+        }

+

+        $newpathofdestfile = $conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix) ? '' : $this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';

+        $newmask = '0644';

+

+        $nowgmt = dol_now();

+

+        $foundintocache = 0;

+        if ($cachedelay > 0)

+        {

+        	$filedate = dol_filemtime($newpathofdestfile);

+        	if ($filedate >= ($nowgmt - $cachedelay))

+        	{

+        		$foundintocache = 1;

+

+        		$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;

+        	}

+        	else

+        	{

+        		dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");

+        	}

+        }

+

+        // Load file into $data

+        if ($foundintocache)    // Cache file found and is not too old

+        {

+        	dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");

+        	$data = json_decode(file_get_contents($newpathofdestfile), true);

+        }

+        else

+		{

@@ -362,0 +318 @@
+			//					$data[$i][]=$datay[$year][$i][1];	// set yval for x=i

@@ -366 +322,2 @@
-		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1)) {

+		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))

+		{

@@ -368,3 +325 @@
-			if (!dol_is_dir($conf->user->dir_temp)) {

-				dol_mkdir($conf->user->dir_temp);

-			}

+			if (!dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);

@@ -372 +327,2 @@
-			if ($fp) {

+			if ($fp)

+			{

@@ -375 +331,2 @@
-				dolChmod($newpathofdestfile);

+				if (!empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;

+				@chmod($newpathofdestfile, octdec($newmask));

@@ -387,2 +344,2 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore

-	/**

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore

+    /**

@@ -394,3 +351,3 @@
-	protected function _getNbByYear($sql)

-	{

-		// phpcs:enable

+    protected function _getNbByYear($sql)

+    {

+        // phpcs:enable

@@ -399 +356 @@
-		dol_syslog(get_class($this).'::'.__FUNCTION__, LOG_DEBUG);

+		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);

@@ -401 +358,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -404 +362,2 @@
-			while ($i < $num) {

+			while ($i < $num)

+			{

@@ -410 +369,2 @@
-		} else {

+		}

+		else {

@@ -416 +376 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore

@@ -425 +385 @@
-		// phpcs:enable

+        // phpcs:enable

@@ -428 +388 @@
-		dol_syslog(get_class($this).'::'.__FUNCTION__, LOG_DEBUG);

+		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);

@@ -430 +390,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -433 +394,2 @@
-			while ($i < $num) {

+			while ($i < $num)

+			{

@@ -437,3 +399,5 @@
-				if ($i > 0 && $row->nb > 0) {

-					$result[$i - 1]['nb_diff'] = ($result[$i - 1]['nb'] - $row->nb) / $row->nb * 100;

-				}

+				if ($i > 0 && $row->nb > 0) $result[$i - 1]['nb_diff'] = ($result[$i - 1]['nb'] - $row->nb) / $row->nb * 100;

+				$result[$i]['total'] = $row->total;

+				if ($i > 0 && $row->total > 0) $result[$i - 1]['total_diff'] = ($result[$i - 1]['total'] - $row->total) / $row->total * 100;

+				$result[$i]['avg'] = $row->avg;

+				if ($i > 0 && $row->avg > 0) $result[$i - 1]['avg_diff'] = ($result[$i - 1]['avg'] - $row->avg) / $row->avg * 100;

@@ -441,19 +405,4 @@
-				if (property_exists($row, 'total')) {

-					$result[$i]['total'] = $row->total;

-					if ($i > 0 && $row->total > 0) {

-						$result[$i - 1]['total_diff'] = ($result[$i - 1]['total'] - $row->total) / $row->total * 100;

-					}

-				}

-				// For some $sql only

-				if (property_exists($row, 'total')) {

-					$result[$i]['avg'] = $row->avg;

-					if ($i > 0 && $row->avg > 0) {

-						$result[$i - 1]['avg_diff'] = ($result[$i - 1]['avg'] - $row->avg) / $row->avg * 100;

-					}

-				}

-				// For some $sql only

-				if (property_exists($row, 'weighted')) {

-					$result[$i]['weighted'] = $row->weighted;

-					if ($i > 0 && $row->weighted > 0) {

-						$result[$i - 1]['avg_weighted'] = ($result[$i - 1]['weighted'] - $row->weighted) / $row->weighted * 100;

-					}

+				if (isset($row->weighted))

+				{

+				    $result[$i]['weighted'] = $row->weighted;

+				    if ($i > 0 && $row->weighted > 0) $result[$i - 1]['avg_weighted'] = ($result[$i - 1]['weighted'] - $row->weighted) / $row->weighted * 100;

@@ -464 +413,2 @@
-		} else {

+		}

+		else {

@@ -470 +420 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore

@@ -475,8 +425,8 @@
-	 *     @param   int		$year       Year

-	 *     @param   string	$sql        SQL

-	 *     @param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month

-	 *     @return	array				Array of nb each month

-	 */

-	protected function _getNbByMonth($year, $sql, $format = 0)

-	{

-		// phpcs:enable

+     *     @param   int		$year       Year

+     *     @param   string	$sql        SQL

+     *     @param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month

+     *     @return	array				Array of nb each month

+     */

+    protected function _getNbByMonth($year, $sql, $format = 0)

+    {

+        // phpcs:enable

@@ -488 +438 @@
-		dol_syslog(get_class($this).'::'.__FUNCTION__, LOG_DEBUG);

+		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);

@@ -490 +440,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -492,3 +443,3 @@
-			$i = 0;

-			$j = 0;

-			while ($i < $num) {

+			$i = 0; $j = 0;

+			while ($i < $num)

+			{

@@ -501 +452,3 @@
-		} else {

+		}

+		else

+		{

@@ -505 +458,2 @@
-		for ($i = 1; $i < 13; $i++) {

+		for ($i = 1; $i < 13; $i++)

+		{

@@ -511 +465,2 @@
-		for ($i = 1; $i < 13; $i++) {

+		for ($i = 1; $i < 13; $i++)

+		{

@@ -513,7 +468,3 @@
-			if ($format == 0) {

-				$month = $langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));

-			} elseif ($format == 1) {

-				$month = $i;

-			} elseif ($format == 2) {

-				$month = $langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));

-			}

+			if ($format == 0) $month = $langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));

+			elseif ($format == 1) $month = $i;

+			elseif ($format == 2) $month = $langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));

@@ -528 +479,2 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore

@@ -530 +482 @@
-	 *     Return the amount per month for a given year

+     *     Return the amount per month for a given year

@@ -534 +486 @@
-	 *     @param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month

+     *     @param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month

@@ -537,3 +489,3 @@
-	protected function _getAmountByMonth($year, $sql, $format = 0)

-	{

-		// phpcs:enable

+    protected function _getAmountByMonth($year, $sql, $format = 0)

+    {

+        // phpcs:enable

@@ -545 +497 @@
-		dol_syslog(get_class($this).'::'.__FUNCTION__, LOG_DEBUG);

+		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);

@@ -548 +500,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -551,12 +504,13 @@
-			while ($i < $num) {

-				$row = $this->db->fetch_row($resql);

-				$j = $row[0] * 1;

-				$result[$j] = $row[1];

-				$i++;

-			}

-			$this->db->free($resql);

-		} else {

-			dol_print_error($this->db);

-		}

-

-		for ($i = 1; $i < 13; $i++) {

+			while ($i < $num)

+		  	{

+		  		$row = $this->db->fetch_row($resql);

+		  		$j = $row[0] * 1;

+		  		$result[$j] = $row[1];

+		  		$i++;

+		  	}

+		  	$this->db->free($resql);

+		}

+        else dol_print_error($this->db);

+

+		for ($i = 1; $i < 13; $i++)

+		{

@@ -568 +522,2 @@
-		for ($i = 1; $i < 13; $i++) {

+		for ($i = 1; $i < 13; $i++)

+		{

@@ -570,7 +525,3 @@
-			if ($format == 0) {

-				$month = $langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));

-			} elseif ($format == 1) {

-				$month = $i;

-			} elseif ($format == 2) {

-				$month = $langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));

-			}

+			if ($format == 0) $month = $langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));

+			elseif ($format == 1) $month = $i;

+			elseif ($format == 2) $month = $langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));

@@ -583,15 +534,15 @@
-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore

-	/**

-	 *  Renvoie le montant moyen par mois pour une annee donnee

-	 *  Return the amount average par month for a given year

-	 *

-	 *  @param  int     $year       Year

-	 *  @param  string  $sql        SQL

-	 *  @param  int     $format     0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month

-	 *  @return array

-	 */

-	protected function _getAverageByMonth($year, $sql, $format = 0)

-	{

-		// phpcs:enable

+    }

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore

+    /**

+     *  Renvoie le montant moyen par mois pour une annee donnee

+     *  Return the amount average par month for a given year

+     *

+     *  @param  int     $year       Year

+     *  @param  string  $sql        SQL

+     *  @param  int     $format     0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month

+     *  @return array

+     */

+    protected function _getAverageByMonth($year, $sql, $format = 0)

+    {

+        // phpcs:enable

@@ -603 +554 @@
-		dol_syslog(get_class($this).'::'.__FUNCTION__, LOG_DEBUG);

+		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);

@@ -605 +556,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -607,14 +559,14 @@
-			$i = 0;

-			$j = 0;

-			while ($i < $num) {

-				$row = $this->db->fetch_row($resql);

-				$j = $row[0] * 1;

-				$result[$j] = $row[1];

-				$i++;

-			}

-			$this->db->free($resql);

-		} else {

-			dol_print_error($this->db);

-		}

-

-		for ($i = 1; $i < 13; $i++) {

+			$i = 0; $j = 0;

+			while ($i < $num)

+			{

+		  		$row = $this->db->fetch_row($resql);

+		  		$j = $row[0] * 1;

+		  		$result[$j] = $row[1];

+		  		$i++;

+		  	}

+		  	$this->db->free($resql);

+		}

+        else dol_print_error($this->db);

+

+		for ($i = 1; $i < 13; $i++)

+		{

@@ -626 +578,2 @@
-		for ($i = 1; $i < 13; $i++) {

+		for ($i = 1; $i < 13; $i++)

+		{

@@ -628,7 +581,3 @@
-			if ($format == 0) {

-				$month = $langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));

-			} elseif ($format == 1) {

-				$month = $i;

-			} elseif ($format == 2) {

-				$month = $langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));

-			}

+			if ($format == 0) $month = $langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));

+			elseif ($format == 1) $month = $i;

+			elseif ($format == 2) $month = $langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));

@@ -641,14 +590,14 @@
-	}

-

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore

-	/**

-	 *  Return number or total of product refs

-	 *

-	 *  @param  string  $sql        SQL

-	 *  @param  int     $limit      Limit

-	 *  @return array

-	 */

-	protected function _getAllByProduct($sql, $limit = 10)

-	{

-		// phpcs:enable

+    }

+

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore

+    /**

+     *  Return number or total of product refs

+     *

+     *  @param  string  $sql        SQL

+     *  @param  int     $limit      Limit

+     *  @return array

+     */

+    protected function _getAllByProduct($sql, $limit = 10)

+    {

+        // phpcs:enable

@@ -659 +608 @@
-		dol_syslog(get_class($this).'::'.__FUNCTION__, LOG_DEBUG);

+		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);

@@ -661 +610,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -663,18 +613,12 @@
-			$i = 0;

-			$other = 0;

-			while ($i < $num) {

-				$row = $this->db->fetch_row($resql);

-				if ($i < $limit || $num == $limit) {

-					$result[$i] = array($row[0], $row[1]); // Ref of product, nb

-				} else {

-					$other += $row[1];

-				}

-				$i++;

-			}

-			if ($num > $limit) {

-				$result[$i] = array($langs->transnoentitiesnoconv("Other"), $other);

-			}

-			$this->db->free($resql);

-		} else {

-			dol_print_error($this->db);

-		}

+			$i = 0; $other = 0;

+			while ($i < $num)

+			{

+                $row = $this->db->fetch_row($resql);

+		  		if ($i < $limit || $num == $limit) $result[$i] = array($row[0], $row[1]); // Ref of product, nb

+		  		else $other += $row[1];

+		  		$i++;

+            }

+		  	if ($num > $limit) $result[$i] = array($langs->transnoentitiesnoconv("Other"), $other);

+		  	$this->db->free($resql);

+		}

+        else dol_print_error($this->db);

@@ -683,28 +627 @@
-	}

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore

-	/**

-	 *  Returns the summed amounts per year for a given number of past years ending now

-	 *  @param  string  $sql    SQL

-	 *  @return array

-	 */

-	protected function _getAmountByYear($sql)

-	{

-		$result = array();

-		$resql = $this->db->query($sql);

-		if ($resql) {

-			$num = $this->db->num_rows($resql);

-			$i = 0;

-			while ($i < $num) {

-				$row = $this->db->fetch_row($resql);

-				$j = (int) $row[0];

-				$result[] = [

-					0 => (int) $row[0],

-					1 => (int) $row[1],

-				];

-				$i++;

-			}

-			$this->db->free($resql);

-		}

-		return $result;

-	}

+    }

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_translate.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_translate.class.php
@@ -43,4 +43 @@
-	private $cache_currencies_all_loaded = false;

-	public $origlang;

-	public $error;

-	public $errors = array();

+    private $cache_currencies_all_loaded = false;

@@ -57,8 +54,3 @@
-		if (!empty($conf->file->character_set_client)) {

-			$this->charset_output = $conf->file->character_set_client; // If charset output is forced

-		}

-		if ($dir) {

-			$this->dir = array($dir);

-		} else {

-			$this->dir = $conf->file->dol_document_root;

-		}

+		if (!empty($conf->file->character_set_client)) $this->charset_output = $conf->file->character_set_client; // If charset output is forced

+		if ($dir) $this->dir = array($dir);

+		else $this->dir = $conf->file->dol_document_root;

@@ -81 +73,2 @@
-		if (getDolGlobalString('MAIN_FORCELANGDIR')) {

+		if (!empty($conf->global->MAIN_FORCELANGDIR))

+		{

@@ -84,5 +77,6 @@
-			foreach ($conf->file->dol_document_root as $dir) {

-				$newdir = $dir . getDolGlobalString('MAIN_FORCELANGDIR'); // For example $conf->global->MAIN_FORCELANGDIR is '/mymodule' meaning we search files into '/mymodule/langs/xx_XX'

-				if (!in_array($newdir, $this->dir)) {

-					$more['module_' . $i] = $newdir;

-					$i++; // We add the forced dir into the array $more. Just after, we add entries into $more to list of lang dir $this->dir.

+			foreach ($conf->file->dol_document_root as $dir)

+			{

+				$newdir = $dir.$conf->global->MAIN_FORCELANGDIR; // For example $conf->global->MAIN_FORCELANGDIR is '/mymodule' meaning we search files into '/mymodule/langs/xx_XX'

+				if (!in_array($newdir, $this->dir))

+				{

+				    $more['module_'.$i] = $newdir; $i++; // We add the forced dir into the array $more. Just after, we add entries into $more to list of lang dir $this->dir.

@@ -96 +90,2 @@
-		if (empty($srclang) || $srclang == 'auto') {

+		if (empty($srclang) || $srclang == 'auto')

+		{

@@ -103,3 +98,2 @@
-		} else {

-			$codetouse = $srclang;

-		}

+		}

+		else $codetouse = $srclang;

@@ -110 +104,2 @@
-		if (!empty($langpart[1])) {	// If it's for a codetouse that is a long code xx_YY

+		if (!empty($langpart[1]))	// If it's for a codetouse that is a long code xx_YY

+		{

@@ -112 +107 @@
-			$longforshort = array('ar' => 'ar_SA');

+			$longforshort = array('ar'=>'ar_SA');

@@ -114,10 +109,5 @@
-			if (isset($longforshort[strtolower($langpart[0])]) && !in_array($codetouse, $longforshortexcep)) {

-				$srclang = $longforshort[strtolower($langpart[0])];

-			} elseif (!is_numeric($langpart[1])) {		// Second part YY may be a numeric with some Chrome browser

-				$srclang = strtolower($langpart[0]) . "_" . strtoupper($langpart[1]);

-				$longforlong = array('no_nb' => 'nb_NO');

-				if (isset($longforlong[strtolower($srclang)])) {

-					$srclang = $longforlong[strtolower($srclang)];

-				}

-			} else {

-				$srclang = strtolower($langpart[0]) . "_" . strtoupper($langpart[0]);

+			if (isset($longforshort[strtolower($langpart[0])]) && !in_array($codetouse, $longforshortexcep)) $srclang = $longforshort[strtolower($langpart[0])];

+			elseif (!is_numeric($langpart[1])) {		// Second part YY may be a numeric with some Chrome browser

+				$srclang = strtolower($langpart[0])."_".strtoupper($langpart[1]);

+				$longforlong = array('no_nb'=>'nb_NO');

+				if (isset($longforlong[strtolower($srclang)])) $srclang = $longforlong[strtolower($srclang)];

@@ -125,15 +115,8 @@
-		} else {						// If it's for a codetouse that is a short code xx

-			// Array to convert short lang code into long code.

-			$longforshort = array(

-				'am' => 'am_ET', 'ar' => 'ar_SA', 'bn' => 'bn_DB', 'el' => 'el_GR', 'ca' => 'ca_ES', 'cs' => 'cs_CZ', 'en' => 'en_US', 'fa' => 'fa_IR',

-				'gl' => 'gl_ES', 'he' => 'he_IL', 'hi' => 'hi_IN', 'ja' => 'ja_JP',

-				'ka' => 'ka_GE', 'km' => 'km_KH', 'kn' => 'kn_IN', 'ko' => 'ko_KR', 'lo' => 'lo_LA', 'nb' => 'nb_NO', 'no' => 'nb_NO', 'ne' => 'ne_NP',

-				'sl' => 'sl_SI', 'sq' => 'sq_AL', 'sr' => 'sr_RS', 'sv' => 'sv_SE', 'uk' => 'uk_UA', 'vi' => 'vi_VN', 'zh' => 'zh_CN'

-			);

-			if (isset($longforshort[strtolower($langpart[0])])) {

-				$srclang = $longforshort[strtolower($langpart[0])];

-			} elseif (!empty($langpart[0])) {

-				$srclang = strtolower($langpart[0]) . "_" . strtoupper($langpart[0]);

-			} else {

-				$srclang = 'en_US';

-			}

+			else $srclang = strtolower($langpart[0])."_".strtoupper($langpart[0]);

+		}

+		else {						// If it's for a codetouse that is a short code xx

+    	    // Array to convert short lang code into long code.

+	        $longforshort = array('ar'=>'ar_SA', 'el'=>'el_GR', 'ca'=>'ca_ES', 'en'=>'en_US', 'nb'=>'nb_NO', 'no'=>'nb_NO');

+			if (isset($longforshort[strtolower($langpart[0])])) $srclang = $longforshort[strtolower($langpart[0])];

+			elseif (!empty($langpart[0])) $srclang = strtolower($langpart[0])."_".strtoupper($langpart[0]);

+			else $srclang = 'en_US';

@@ -157,5 +140,2 @@
-		if (empty($mode)) {

-			return $this->defaultlang;

-		} else {

-			return substr($this->defaultlang, 0, 2);

-		}

+	    if (empty($mode)) return $this->defaultlang;

+	    else return substr($this->defaultlang, 0, 2);

@@ -167 +147 @@
-	 *

+     *

@@ -169 +149 @@
-	 *	@return	int							Return integer <0 if KO, 0 if already loaded or loading not required, >0 if OK

+	 *	@return	int							<0 if KO, 0 if already loaded or loading not required, >0 if OK

@@ -173,10 +153,4 @@
-		$loaded = 0;

-		foreach ($domains as $domain) {

-			$result = $this->load($domain);

-			if ($result > 0) {

-				$loaded = $result;

-			} elseif ($result < 0) {

-				return $result;

-			}

-		}

-		return $loaded;

+	    foreach ($domains as $domain)

+	    {

+	        $this->load($domain);

+	    }

@@ -189,15 +163,14 @@
-	 *  tab_loaded is completed with $domain key.

-	 *  rule "we keep first entry found with we keep last entry found" so it is probably not what you want to do.

-	 *

-	 *  Value for hash are: 1:Loaded from disk, 2:Not found, 3:Loaded from cache

-	 *

-	 *  @param	string	$domain      				File name to load (.lang file). Must be "file" or "file@module" for module language files:

-	 *												If $domain is "file@module" instead of "file" then we look for module lang file

-	 *												in htdocs/custom/modules/mymodule/langs/code_CODE/file.lang

-	 *												then in htdocs/module/langs/code_CODE/file.lang instead of htdocs/langs/code_CODE/file.lang

-	 *  @param	integer	$alt         				0 (try xx_ZZ then 1), 1 (try xx_XX then 2), 2 (try en_US)

-	 * 	@param	int		$stopafterdirection			Stop when the DIRECTION tag is found (optimize speed)

-	 * 	@param	int		$forcelangdir				To force a different lang directory

-	 *  @param  int     $loadfromfileonly   		1=Do not load overwritten translation from file or old conf.

-	 *  @param  int     $forceloadifalreadynotfound	Force attempt to reload lang file if it was previously not found

-	 *	@return	int									Return integer <0 if KO, 0 if already loaded or loading not required, >0 if OK

+     *  tab_loaded is completed with $domain key.

+     *  rule "we keep first entry found with we keep last entry found" so it is probably not what you want to do.

+     *

+     *  Value for hash are: 1:Loaded from disk, 2:Not found, 3:Loaded from cache

+     *

+	 *  @param	string	$domain      		File name to load (.lang file). Must be "file" or "file@module" for module language files:

+ 	 *										If $domain is "file@module" instead of "file" then we look for module lang file

+	 *										in htdocs/custom/modules/mymodule/langs/code_CODE/file.lang

+	 *										then in htdocs/module/langs/code_CODE/file.lang instead of htdocs/langs/code_CODE/file.lang

+	 *  @param	integer	$alt         		0 (try xx_ZZ then 1), 1 (try xx_XX then 2), 2 (try en_US)

+	 * 	@param	int		$stopafterdirection	Stop when the DIRECTION tag is found (optimize speed)

+	 * 	@param	int		$forcelangdir		To force a different lang directory

+	 *  @param  int     $loadfromfileonly   1=Do not load overwritten translation from file or old conf.

+	 *	@return	int							<0 if KO, 0 if already loaded or loading not required, >0 if OK

@@ -206 +179 @@
-	public function load($domain, $alt = 0, $stopafterdirection = 0, $forcelangdir = '', $loadfromfileonly = 0, $forceloadifalreadynotfound = 0)

+	public function load($domain, $alt = 0, $stopafterdirection = 0, $forcelangdir = '', $loadfromfileonly = 0)

@@ -213,7 +186,6 @@
-		if (empty($domain)) {

-			dol_print_error('', get_class($this) . "::Load ErrorWrongParameters");

-			return -1;

-		}

-		if ($this->defaultlang === 'none_NONE') {

-			return 0; // Special language code to not translate keys

-		}

+		if (empty($domain))

+		{

+		    dol_print_error('', get_class($this)."::Load ErrorWrongParameters");

+		    return -1;

+		}

+		if ($this->defaultlang == 'none_NONE') return 0; // Special language code to not translate keys

@@ -223,3 +195 @@
-		if (empty($loadfromfileonly) && count($this->tab_translate) == 0) {

-			$this->loadFromDatabase($db); // No translation was never loaded yet, so we load database.

-		}

+		if (empty($loadfromfileonly) && count($this->tab_translate) == 0) $this->loadFromDatabase($db); // No translation was never loaded yet, so we load database.

@@ -233 +203,2 @@
-		if (preg_match('/^([^@]+)@([^@]+)$/i', $domain, $regs)) {

+		if (preg_match('/^([^@]+)@([^@]+)$/i', $domain, $regs))

+		{

@@ -238,5 +209,3 @@
-		// Check cache

-		if (

-			!empty($this->_tab_loaded[$newdomain])

-			&& ($this->_tab_loaded[$newdomain] != 2 || empty($forceloadifalreadynotfound))

-		) { // File already loaded and found and not forced for this domain

+        // Check cache

+		if (!empty($this->_tab_loaded[$newdomain]))	// File already loaded for this domain

+		{

@@ -247 +216 @@
-		$fileread = 0;

+        $fileread = 0;

@@ -252,9 +221,6 @@
-		if ($alt < 1 && isset($langarray[1]) && (strtolower($langarray[0]) == strtolower($langarray[1]) || in_array(strtolower($langofdir), array('el_gr')))) {

-			$alt = 1;

-		}

-		if ($alt < 2 && strtolower($langofdir) == 'en_us') {

-			$alt = 2;

-		}

-

-		if (empty($langofdir)) {	// This may occurs when load is called without setting the language and without providing a value for forcelangdir

-			dol_syslog("Error: " . get_class($this) . "::load was called for domain=" . $domain . " but language was not set yet with langs->setDefaultLang(). Nothing will be loaded.", LOG_WARNING);

+		if ($alt < 1 && isset($langarray[1]) && (strtolower($langarray[0]) == strtolower($langarray[1]) || in_array(strtolower($langofdir), array('el_gr')))) $alt = 1;

+		if ($alt < 2 && strtolower($langofdir) == 'en_us') $alt = 2;

+

+		if (empty($langofdir))	// This may occurs when load is called without setting the language and without providing a value for forcelangdir

+		{

+			dol_syslog("Error: ".get_class($this)."::load was called for domain=".$domain." but language was not set yet with langs->setDefaultLang(). Nothing will be loaded.", LOG_WARNING);

@@ -264 +230,2 @@
-		foreach ($this->dir as $searchdir) {

+		foreach ($this->dir as $searchdir)

+		{

@@ -266 +233 @@
-			$file_lang = $searchdir . ($modulename ? '/' . $modulename : '') . "/langs/" . $langofdir . "/" . $newdomain . ".lang";

+			$file_lang = $searchdir.($modulename ? '/'.$modulename : '')."/langs/".$langofdir."/".$newdomain.".lang";

@@ -269,2 +236 @@
-			//$filelangexists = is_file($file_lang_osencoded);

-			$filelangexists = @is_file($file_lang_osencoded);	// avoid [php:warn]

+			$filelangexists = is_file($file_lang_osencoded);

@@ -275 +241,2 @@
-			if ($filelangexists) {

+			if ($filelangexists)

+			{

@@ -277 +244 @@
-				$found = false;

+			    $found = false;

@@ -282,4 +249,7 @@
-				if (isModEnabled('memcached') && getDolGlobalString('MEMCACHED_SERVER')) {

-					$usecachekey = $newdomain . '_' . $langofdir . '_' . md5($file_lang); // Should not contains special chars

-				} elseif (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02)) {

-					// Using cache with shmop. Speed gain: 40ms - Memory overusage: 200ko (Size of session cache file)

+				if (!empty($conf->memcached->enabled) && !empty($conf->global->MEMCACHED_SERVER))

+				{

+					$usecachekey = $newdomain.'_'.$langofdir.'_'.md5($file_lang); // Should not contains special chars

+				}

+				// Using cache with shmop. Speed gain: 40ms - Memory overusage: 200ko (Size of session cache file)

+				elseif (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02))

+				{

@@ -289,5 +259,6 @@
-				if ($usecachekey) {

-					//dol_syslog('Translate::Load we will cache result into usecachekey '.$usecachekey);

-					//global $aaa; $aaa+=1;

-					//print $aaa." ".$usecachekey."\n";

-					require_once DOL_DOCUMENT_ROOT . '/core/lib/memory.lib.php';

+				if ($usecachekey)

+				{

+			        //dol_syslog('Translate::Load we will cache result into usecachekey '.$usecachekey);

+                    //global $aaa; $aaa+=1;

+                    //print $aaa." ".$usecachekey."\n";

+				    require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';

@@ -295,2 +266,3 @@
-					if (is_array($tmparray) && count($tmparray)) {

-						$this->tab_translate += $tmparray; // Faster than array_merge($tmparray,$this->tab_translate). Note: If a value already exists into tab_translate, value into tmparaay is not added.

+					if (is_array($tmparray) && count($tmparray))

+					{

+				        $this->tab_translate += $tmparray; // Faster than array_merge($tmparray,$this->tab_translate). Note: If a value already exists into tab_translate, value into tmparaay is not added.

@@ -299,3 +271 @@
-						if ($alt == 2) {

-							$fileread = 1;

-						}

+						if ($alt == 2) $fileread = 1;

@@ -306,5 +276,5 @@
-				if (!$found) {

-					if ($fp = @fopen($file_lang, "rt")) {

-						if ($usecachekey) {

-							$tabtranslatedomain = array(); // To save lang content in cache

-						}

+				if (!$found)

+				{

+					if ($fp = @fopen($file_lang, "rt"))

+					{

+						if ($usecachekey) $tabtranslatedomain = array(); // To save lang content in cache

@@ -317,2 +287,4 @@
-						while ($line = fscanf($fp, "%[^= ]%*[ =]%[^\n\r]")) {

-							if (isset($line[1])) {

+						while ($line = fscanf($fp, "%[^= ]%*[ =]%[^\n\r]"))

+						{

+							if (isset($line[1]))

+							{

@@ -322 +294,2 @@
-								if (empty($this->tab_translate[$key])) { // If translation was already found, we must not continue, even if MAIN_FORCELANGDIR is set (MAIN_FORCELANGDIR is to replace lang dir, not to overwrite entries)

+								if (empty($this->tab_translate[$key]))

+								{ // If translation was already found, we must not continue, even if MAIN_FORCELANGDIR is set (MAIN_FORCELANGDIR is to replace lang dir, not to overwrite entries)

@@ -332,3 +305,6 @@
-									} elseif ($key[0] == '#') {

-										continue;

-									} else {

+									}

+									elseif ($key[0] == '#')

+									{

+									    continue;

+									}

+									else {

@@ -349 +325,2 @@
-						if ($usecachekey && count($tabtranslatedomain)) {

+						if ($usecachekey && count($tabtranslatedomain))

+						{

@@ -351,3 +328,4 @@
-							if ($ressetcache < 0) {

-								$error = 'Failed to set cache for usecachekey=' . $usecachekey . ' result=' . $ressetcache;

-								dol_syslog($error, LOG_ERR);

+							if ($ressetcache < 0)

+							{

+							    $error = 'Failed to set cache for usecachekey='.$usecachekey.' result='.$ressetcache;

+							    dol_syslog($error, LOG_ERR);

@@ -357,3 +335 @@
-						if (!getDolGlobalString('MAIN_FORCELANGDIR')) {

-							break; // Break loop on each root dir. If a module has forced dir, we do not stop loop.

-						}

+						if (empty($conf->global->MAIN_FORCELANGDIR)) break; // Break loop on each root dir. If a module has forced dir, we do not stop loop.

@@ -366 +342,2 @@
-		if ($alt == 0) {

+		if ($alt == 0)

+		{

@@ -369,7 +346,3 @@
-			$langofdir = strtolower($langarray[0]) . '_' . strtoupper($langarray[0]);

-			if ($langofdir == 'el_EL') {

-				$langofdir = 'el_GR'; // main parent for el_CY is not 'el_EL' but 'el_GR'

-			}

-			if ($langofdir == 'ar_AR') {

-				$langofdir = 'ar_SA'; // main parent for ar_EG is not 'ar_AR' but 'ar_SA'

-			}

+			$langofdir = strtolower($langarray[0]).'_'.strtoupper($langarray[0]);

+			if ($langofdir == 'el_EL') $langofdir = 'el_GR'; // main parent for el_CY is not 'el_EL' but 'el_GR'

+			if ($langofdir == 'ar_AR') $langofdir = 'ar_SA'; // main parent for ar_EG is not 'ar_AR' but 'ar_SA'

@@ -380 +353,2 @@
-		if ($alt == 1) {

+		if ($alt == 1)

+		{

@@ -388,8 +362,5 @@
-		if ($alt == 2) {

-			if ($fileread) {

-				$this->_tab_loaded[$newdomain] = 1; // Set domain file as found so loaded

-			}

-

-			if (empty($this->_tab_loaded[$newdomain])) {

-				$this->_tab_loaded[$newdomain] = 2; // Set this file as not found

-			}

+		if ($alt == 2)

+		{

+			if ($fileread) $this->_tab_loaded[$newdomain] = 1; // Set domain file as found so loaded

+

+			if (empty($this->_tab_loaded[$newdomain])) $this->_tab_loaded[$newdomain] = 2; // Set this file as not found

@@ -400,21 +371,18 @@
-		if (empty($loadfromfileonly)) {

-			$overwritekey = 'MAIN_OVERWRITE_TRANS_' . $this->defaultlang;

-			if (!empty($conf->global->$overwritekey)) {    // Overwrite translation with key1:newstring1,key2:newstring2

-				// Overwrite translation with param MAIN_OVERWRITE_TRANS_xx_XX

-				$tmparray = explode(',', getDolGlobalString($overwritekey));

-				foreach ($tmparray as $tmp) {

-					$tmparray2 = explode(':', $tmp);

-					if (!empty($tmparray2[1])) {

-						$this->tab_translate[$tmparray2[0]] = $tmparray2[1];

-					}

-				}

-			}

-		}

-

-		// Check to be sure that SeparatorDecimal differs from SeparatorThousand

-		if (

-			!empty($this->tab_translate["SeparatorDecimal"]) && !empty($this->tab_translate["SeparatorThousand"])

-			&& $this->tab_translate["SeparatorDecimal"] == $this->tab_translate["SeparatorThousand"]

-		) {

-			$this->tab_translate["SeparatorThousand"] = '';

-		}

+		if (empty($loadfromfileonly))

+		{

+    		$overwritekey = 'MAIN_OVERWRITE_TRANS_'.$this->defaultlang;

+            if (!empty($conf->global->$overwritekey))    // Overwrite translation with key1:newstring1,key2:newstring2

+            {

+        		// Overwrite translation with param MAIN_OVERWRITE_TRANS_xx_XX

+                $tmparray = explode(',', $conf->global->$overwritekey);

+                foreach ($tmparray as $tmp)

+                {

+                    $tmparray2 = explode(':', $tmp);

+                    if (!empty($tmparray2[1])) $this->tab_translate[$tmparray2[0]] = $tmparray2[1];

+                }

+            }

+		}

+

+        // Check to be sure that SeparatorDecimal differs from SeparatorThousand

+		if (!empty($this->tab_translate["SeparatorDecimal"]) && !empty($this->tab_translate["SeparatorThousand"])

+		&& $this->tab_translate["SeparatorDecimal"] == $this->tab_translate["SeparatorThousand"]) $this->tab_translate["SeparatorThousand"] = '';

@@ -429,7 +397,7 @@
-	 *  tab_loaded is completed with $domain key.

-	 *  rule "we keep first entry found with we keep last entry found" so it is probably not what you want to do.

-	 *

-	 *  Value for hash are: 1:Loaded from disk, 2:Not found, 3:Loaded from cache

-	 *

-	 *  @param  DoliDB    $db             Database handler

-	 *	@return	int							Return integer <0 if KO, 0 if already loaded or loading not required, >0 if OK

+     *  tab_loaded is completed with $domain key.

+     *  rule "we keep first entry found with we keep last entry found" so it is probably not what you want to do.

+     *

+     *  Value for hash are: 1:Loaded from disk, 2:Not found, 3:Loaded from cache

+     *

+     *  @param  Database    $db             Database handler

+	 *	@return	int							<0 if KO, 0 if already loaded or loading not required, >0 if OK

@@ -444,3 +412 @@
-		if (empty($db)) {

-			return 0; // Database handler can't be used

-		}

+		if (empty($db)) return 0; // Database handler can't be used

@@ -453 +419,2 @@
-		if (!empty($this->_tab_loaded[$newdomain])) {	// File already loaded for this domain 'database'

+		if (!empty($this->_tab_loaded[$newdomain]))	// File already loaded for this domain 'database'

+		{

@@ -460 +427 @@
-		$fileread = 0;

+        $fileread = 0;

@@ -463,2 +430,3 @@
-		if (empty($langofdir)) {	// This may occurs when load is called without setting the language and without providing a value for forcelangdir

-			dol_syslog("Error: " . get_class($this) . "::loadFromDatabase was called but language was not set yet with langs->setDefaultLang(). Nothing will be loaded.", LOG_WARNING);

+		if (empty($langofdir))	// This may occurs when load is called without setting the language and without providing a value for forcelangdir

+		{

+			dol_syslog("Error: ".get_class($this)."::loadFromDatabase was called but language was not set yet with langs->setDefaultLang(). Nothing will be loaded.", LOG_WARNING);

@@ -474,4 +442,7 @@
-		if (isModEnabled('memcached') && getDolGlobalString('MEMCACHED_SERVER')) {

-			$usecachekey = $newdomain . '_' . $langofdir; // Should not contains special chars

-		} elseif (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02)) {

-			// Using cache with shmop. Speed gain: 40ms - Memory overusage: 200ko (Size of session cache file)

+		if (!empty($conf->memcached->enabled) && !empty($conf->global->MEMCACHED_SERVER))

+		{

+			$usecachekey = $newdomain.'_'.$langofdir; // Should not contains special chars

+		}

+		// Using cache with shmop. Speed gain: 40ms - Memory overusage: 200ko (Size of session cache file)

+		elseif (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02))

+		{

@@ -481,5 +452,6 @@
-		if ($usecachekey) {

-			//dol_syslog('Translate::Load we will cache result into usecachekey '.$usecachekey);

-			//global $aaa; $aaa+=1;

-			//print $aaa." ".$usecachekey."\n";

-			require_once DOL_DOCUMENT_ROOT . '/core/lib/memory.lib.php';

+		if ($usecachekey)

+		{

+	        //dol_syslog('Translate::Load we will cache result into usecachekey '.$usecachekey);

+            //global $aaa; $aaa+=1;

+            //print $aaa." ".$usecachekey."\n";

+		    require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';

@@ -487,2 +459,3 @@
-			if (is_array($tmparray) && count($tmparray)) {

-				$this->tab_translate += $tmparray; // Faster than array_merge($tmparray,$this->tab_translate). Note: If a value already exists into tab_translate, value into tmparaay is not added.

+			if (is_array($tmparray) && count($tmparray))

+			{

+				$this->tab_translate += $tmparray; // Faster than array_merge($tmparray,$this->tab_translate). Note: If a valuer already exists into tab_translate, value into tmparaay is not added.

@@ -496,21 +469,22 @@
-		if (!$found && getDolGlobalString('MAIN_ENABLE_OVERWRITE_TRANSLATION')) {

-			// Overwrite translation with database read

-			$sql = "SELECT transkey, transvalue FROM ".$db->prefix()."overwrite_trans where (lang='".$db->escape($this->defaultlang)."' OR lang IS NULL)";

-			$sql .= " AND entity IN (0, ".getEntity('overwrite_trans').")";

-			$sql .= $db->order("lang", "DESC");

-

-			$resql = $db->query($sql);

-

-			if ($resql) {

-				$num = $db->num_rows($resql);

-				if ($num) {

-					if ($usecachekey) {

-						$tabtranslatedomain = array(); // To save lang content in cache

-					}

-

-					$i = 0;

-					while ($i < $num) {	// Ex: Need 225ms for all fgets on all lang file for Third party page. Same speed than file_get_contents

-						$obj = $db->fetch_object($resql);

-

-						$key = $obj->transkey;

-						$value = $obj->transvalue;

+		if (!$found && !empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION))

+		{

+    		// Overwrite translation with database read

+            $sql = "SELECT transkey, transvalue FROM ".MAIN_DB_PREFIX."overwrite_trans where lang='".$db->escape($this->defaultlang)."' OR lang IS NULL";

+            $sql .= " AND entity IN (0, ".getEntity('overwrite_trans').")";

+            $sql .= $db->order("lang", "DESC");

+		    $resql = $db->query($sql);

+

+		    if ($resql)

+		    {

+    		    $num = $db->num_rows($resql);

+    		    if ($num)

+    		    {

+    				if ($usecachekey) $tabtranslatedomain = array(); // To save lang content in cache

+

+    				$i = 0;

+    				while ($i < $num)	// Ex: Need 225ms for all fgets on all lang file for Third party page. Same speed than file_get_contents

+    				{

+    				    $obj = $db->fetch_object($resql);

+

+    				    $key = $obj->transkey;

+    					$value = $obj->transvalue;

@@ -519 +493,2 @@
-						if (empty($this->tab_translate[$key])) {    // If translation was already found, we must not continue, even if MAIN_FORCELANGDIR is set (MAIN_FORCELANGDIR is to replace lang dir, not to overwrite entries)

+						if (empty($this->tab_translate[$key]))    // If translation was already found, we must not continue, even if MAIN_FORCELANGDIR is set (MAIN_FORCELANGDIR is to replace lang dir, not to overwrite entries)

+						{

@@ -523,3 +498 @@
-							if ($usecachekey) {

-								$tabtranslatedomain[$key] = $value; // To save lang content in cache

-							}

+							if ($usecachekey) $tabtranslatedomain[$key] = $value; // To save lang content in cache

@@ -528,27 +501,27 @@
-						$i++;

-					}

-

-					$fileread = 1;

-

-					// TODO Move cache write out of loop on dirs

-					// To save lang content for usecachekey into cache

-					if ($usecachekey && count($tabtranslatedomain)) {

-						$ressetcache = dol_setcache($usecachekey, $tabtranslatedomain);

-						if ($ressetcache < 0) {

-							$error = 'Failed to set cache for usecachekey=' . $usecachekey . ' result=' . $ressetcache;

-							dol_syslog($error, LOG_ERR);

-						}

-					}

-				}

-			} else {

-				dol_print_error($db);

-			}

-		}

-

-		if ($fileread) {

-			$this->_tab_loaded[$newdomain] = 1; // Set domain file as loaded

-		}

-

-		if (empty($this->_tab_loaded[$newdomain])) {

-			$this->_tab_loaded[$newdomain] = 2; // Mark this case as not found (no lines found for language)

-		}

+    					$i++;

+    				}

+

+    				$fileread = 1;

+

+    				// TODO Move cache write out of loop on dirs

+    				// To save lang content for usecachekey into cache

+    				if ($usecachekey && count($tabtranslatedomain))

+    				{

+    					$ressetcache = dol_setcache($usecachekey, $tabtranslatedomain);

+    					if ($ressetcache < 0)

+    					{

+    					    $error = 'Failed to set cache for usecachekey='.$usecachekey.' result='.$ressetcache;

+    					    dol_syslog($error, LOG_ERR);

+    					}

+    				}

+    			}

+		    }

+		    else

+		    {

+		        dol_print_error($db);

+		    }

+		}

+

+		if ($fileread) $this->_tab_loaded[$newdomain] = 1; // Set domain file as loaded

+

+		if (empty($this->_tab_loaded[$newdomain])) $this->_tab_loaded[$newdomain] = 2; // Marque ce cas comme non trouve (no lines found for language)

@@ -559,10 +532 @@
-	/**

-	 * Get information with result of loading data for domain

-	 *

-	 * @param	string		$domain		Domain to check

-	 * @return 	int						0, 1, 2...

-	 */

-	public function isLoaded($domain)

-	{

-		return $this->_tab_loaded[$domain];

-	}

+

@@ -574,3 +538,3 @@
-	 * The string return is not formated (translated with transnoentitiesnoconv).

-	 * NOTE: To avoid infinite loop (getLabelFromKey->transnoentities->getTradFromKey->getLabelFromKey), if you modify this function,

-	 * check that getLabelFromKey is never called with the same value than $key.

+	 * The string return is not formated (translated with transnoentitiesnoconv)

+	 * NOTE: To avoid infinite loop (getLabelFromKey->transnoentities->getTradFromKey), if you modify this function,

+	 * check that getLabelFromKey is not called with same value than input.

@@ -581,8 +545,5 @@
-	private function getTradFromKey($key)

-	{

-		global $db;

-

-		if (!is_string($key)) {

-			//xdebug_print_function_stack('ErrorBadValueForParamNotAString');

-			return 'ErrorBadValueForParamNotAString'; // Avoid multiple errors with code not using function correctly.

-		}

+    private function getTradFromKey($key)

+    {

+		global $conf, $db;

+

+		if (!is_string($key)) return 'ErrorBadValueForParamNotAString'; // Avoid multiple errors with code not using function correctly.

@@ -591,4 +552,6 @@
-		$reg = array();

-		if (preg_match('/^Civility([0-9A-Z]+)$/i', $key, $reg)) {

-			$newstr = $this->getLabelFromKey($db, $reg[1], 'c_civility', 'code', 'label');

-		} elseif (preg_match('/^Currency([A-Z][A-Z][A-Z])$/i', $key, $reg)) {

+	    if (preg_match('/^Civility([0-9A-Z]+)$/i', $key, $reg))

+        {

+            $newstr = $this->getLabelFromKey($db, $reg[1], 'c_civility', 'code', 'label');

+        }

+		elseif (preg_match('/^Currency([A-Z][A-Z][A-Z])$/i', $key, $reg))

+		{

@@ -596 +559,3 @@
-		} elseif (preg_match('/^SendingMethod([0-9A-Z]+)$/i', $key, $reg)) {

+		}

+		elseif (preg_match('/^SendingMethod([0-9A-Z]+)$/i', $key, $reg))

+		{

@@ -598,17 +563,23 @@
-		} elseif (preg_match('/^PaymentType(?:Short)?([0-9A-Z]+)$/i', $key, $reg)) {

-			$newstr = $this->getLabelFromKey($db, $reg[1], 'c_paiement', 'code', 'libelle', '', 1);

-		} elseif (preg_match('/^OppStatus([0-9A-Z]+)$/i', $key, $reg)) {

-			$newstr = $this->getLabelFromKey($db, $reg[1], 'c_lead_status', 'code', 'label');

-		} elseif (preg_match('/^OrderSource([0-9A-Z]+)$/i', $key, $reg)) {

-			// TODO OrderSourceX must be replaced with content of table llx_c_input_reason or llx_c_input_method

-			//$newstr=$this->getLabelFromKey($db,$reg[1],'llx_c_input_reason','code','label');

-		}

-

-		/* Disabled. There is too many cases where translation of $newstr is not defined is normal (like when output with setEventMessage an already translated string)

-		if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2)

-		{

-			dol_syslog(__METHOD__." MAIN_FEATURES_LEVEL=DEVELOP: missing translation for key '".$newstr."' in ".$_SERVER["PHP_SELF"], LOG_DEBUG);

-		}*/

-

-		return $newstr;

-	}

+		}

+        elseif (preg_match('/^PaymentTypeShort([0-9A-Z]+)$/i', $key, $reg))

+        {

+            $newstr = $this->getLabelFromKey($db, $reg[1], 'c_paiement', 'code', 'libelle', '', 1);

+        }

+        elseif (preg_match('/^OppStatus([0-9A-Z]+)$/i', $key, $reg))

+        {

+            $newstr = $this->getLabelFromKey($db, $reg[1], 'c_lead_status', 'code', 'label');

+        }

+        elseif (preg_match('/^OrderSource([0-9A-Z]+)$/i', $key, $reg))

+        {

+        	// TODO OrderSourceX must be replaced with content of table llx_c_input_reason or llx_c_input_method

+            //$newstr=$this->getLabelFromKey($db,$reg[1],'c_ordersource','code','label');

+        }

+

+        /* Disabled. There is too many cases where translation of $newstr is not defined is normal (like when output with setEventMessage an already translated string)

+        if (! empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 2)

+        {

+        	dol_syslog(__METHOD__." MAIN_FEATURES_LEVEL=DEVELOP: missing translation for key '".$newstr."' in ".$_SERVER["PHP_SELF"], LOG_DEBUG);

+        }*/

+

+        return $newstr;

+    }

@@ -619,2 +590,3 @@
-	 *  If there is no match for this text, we look in alternative file and if still not found, it is returned as it is.

-	 *  The parameters of this method should not contain HTML tags. If there is, they will be htmlencoded to have no effect.

+	 *              If there is no match for this text, we look in alternative file and if still not found,

+	 * 				it is returned as it is

+	 *              The parameters of this method can contain HTML tags

@@ -627 +599 @@
-	 *	@param	int		$maxsize	Max length of text. Warning: Will not work if paramX has HTML content. deprecated.

+	 *	@param	int		$maxsize	Max length of text

@@ -630,50 +602,35 @@
-	public function trans($key, $param1 = '', $param2 = '', $param3 = '', $param4 = '', $maxsize = 0)

-	{

-		global $conf;

-

-		if (!empty($this->tab_translate[$key])) {	// Translation is available

-			$str = $this->tab_translate[$key];

-

-			// Make some string replacement after translation

-			$replacekey = 'MAIN_REPLACE_TRANS_' . $this->defaultlang;

-			if (!empty($conf->global->$replacekey)) {    // Replacement translation variable with string1:newstring1;string2:newstring2

-				$tmparray = explode(';', getDolGlobalString($replacekey));

-				foreach ($tmparray as $tmp) {

-					$tmparray2 = explode(':', $tmp);

-					$str = preg_replace('/' . preg_quote($tmparray2[0]) . '/', $tmparray2[1], $str);

-				}

-			}

-

-			// We replace some HTML tags by __xx__ to avoid having them encoded by htmlentities because

-			// we want to keep '"' '<b>' '</b>' '<strong' '</strong>' '<a ' '</a>' '<br>' '< ' '<span' '</span>' that are reliable HTML tags inside translation strings.

-			$str = str_replace(

-				array('"', '<b>', '</b>', '<u>', '</u>', '<i', '</i>', '<center>', '</center>', '<strong>', '</strong>', '<a ', '</a>', '<br>', '<span', '</span>', '< ', '>'), // We accept '< ' but not '<'. We can accept however '>'

-				array('__quot__', '__tagb__', '__tagbend__', '__tagu__', '__taguend__', '__tagi__', '__tagiend__', '__tagcenter__', '__tagcenterend__', '__tagb__', '__tagbend__', '__taga__', '__tagaend__', '__tagbr__', '__tagspan__', '__tagspanend__', '__ltspace__', '__gt__'),

-				$str

-			);

-

-			if (strpos($key, 'Format') !== 0) {

-				try {

-					$str = sprintf($str, $param1, $param2, $param3, $param4); // Replace %s and %d except for FormatXXX strings.

-				} catch (Exception $e) {

-					// No exception managed

-				}

-			}

-

-			// Encode string into HTML

-			$str = htmlentities($str, ENT_COMPAT, $this->charset_output); // Do not convert simple quotes in translation (strings in html are embraced by "). Use dol_escape_htmltag around text in HTML content

-

-			// Restore reliable HTML tags into original translation string

-			$str = str_replace(

-				array('__quot__', '__tagb__', '__tagbend__', '__tagu__', '__taguend__', '__tagi__', '__tagiend__', '__tagcenter__', '__tagcenterend__', '__taga__', '__tagaend__', '__tagbr__', '__tagspan__', '__tagspanend__', '__ltspace__', '__gt__'),

-				array('"', '<b>', '</b>', '<u>', '</u>', '<i', '</i>', '<center>', '</center>', '<a ', '</a>', '<br>', '<span', '</span>', '< ', '>'),

-				$str

-			);

-

-			// Remove dangerous sequence we should never have. Not needed into a translated response.

-			// %27 is entity code for ' and is replaced by browser automatically when translation is inside a javascript code called by a click like on a href link.

-			$str = str_replace(array('%27', '&#39'), '', $str);

-

-			if ($maxsize) {

-				$str = dol_trunc($str, $maxsize);

-			}

+    public function trans($key, $param1 = '', $param2 = '', $param3 = '', $param4 = '', $maxsize = 0)

+    {

+        global $conf;

+

+	    if (!empty($this->tab_translate[$key]))	// Translation is available

+		{

+            $str = $this->tab_translate[$key];

+

+    		// Make some string replacement after translation

+            $replacekey = 'MAIN_REPLACE_TRANS_'.$this->defaultlang;

+            if (!empty($conf->global->$replacekey))    // Replacement translation variable with string1:newstring1;string2:newstring2

+            {

+                $tmparray = explode(';', $conf->global->$replacekey);

+                foreach ($tmparray as $tmp)

+                {

+                    $tmparray2 = explode(':', $tmp);

+                    $str = preg_replace('/'.preg_quote($tmparray2[0]).'/', $tmparray2[1], $str);

+                }

+            }

+

+            if (strpos($key, 'Format') !== 0)

+            {

+            	$str = sprintf($str, $param1, $param2, $param3, $param4); // Replace %s and %d except for FormatXXX strings.

+            }

+

+			if ($maxsize) $str = dol_trunc($str, $maxsize);

+

+			// We replace some HTML tags by __xx__ to avoid having them encoded by htmlentities

+            $str = str_replace(array('<', '>', '"',), array('__lt__', '__gt__', '__quot__'), $str);

+

+			// Crypt string into HTML

+			$str = htmlentities($str, ENT_COMPAT, $this->charset_output); // Do not convert simple quotes in translation (strings in html are enmbraced by "). Use dol_escape_htmltag around text in HTML content

+

+			// Restore HTML tags

+            $str = str_replace(array('__lt__', '__gt__', '__quot__'), array('<', '>', '"',), $str);

@@ -682,2 +639,4 @@
-		} else { // Translation is not available

-			//if ($key[0] == '$') { return dol_eval($key, 1, 1, '1'); }

+		}

+		else								// Translation is not available

+		{

+		    //if ($key[0] == '$') { return dol_eval($key,1); }

@@ -686 +645 @@
-	}

+    }

@@ -728,27 +687,27 @@
-		if (!empty($this->tab_translate[$key])) {	// Translation is available

-			$str = $this->tab_translate[$key];

-

-			// Make some string replacement after translation

-			$replacekey = 'MAIN_REPLACE_TRANS_' . $this->defaultlang;

-			if (!empty($conf->global->$replacekey)) {    // Replacement translation variable with string1:newstring1;string2:newstring2

-				$tmparray = explode(';', getDolGlobalString($replacekey));

-				foreach ($tmparray as $tmp) {

-					$tmparray2 = explode(':', $tmp);

-					$str = preg_replace('/' . preg_quote($tmparray2[0]) . '/', $tmparray2[1], $str);

-				}

-			}

-

-			if (!preg_match('/^Format/', $key)) {

-				//print $str;

-				$str = sprintf($str, $param1, $param2, $param3, $param4, $param5); // Replace %s and %d except for FormatXXX strings.

-			}

-

-			// Remove dangerous sequence we should never have. Not needed into a translated response.

-			// %27 is entity code for ' and is replaced by browser automatically when translation is inside a javascript code called by a click like on a href link.

-			$str = str_replace(array('%27', '&#39'), '', $str);

-

-			return $str;

-		} else {

-			/*if ($key[0] == '$') {

-				return dol_eval($key, 1, 1, '1');

-			}*/

+		if (!empty($this->tab_translate[$key]))	// Translation is available

+		{

+		    $str = $this->tab_translate[$key];

+

+    		// Make some string replacement after translation

+            $replacekey = 'MAIN_REPLACE_TRANS_'.$this->defaultlang;

+            if (!empty($conf->global->$replacekey))    // Replacement translation variable with string1:newstring1;string2:newstring2

+            {

+                $tmparray = explode(';', $conf->global->$replacekey);

+                foreach ($tmparray as $tmp)

+                {

+                    $tmparray2 = explode(':', $tmp);

+                    $str = preg_replace('/'.preg_quote($tmparray2[0]).'/', $tmparray2[1], $str);

+                }

+            }

+

+            if (!preg_match('/^Format/', $key))

+            {

+            	//print $str;

+           		$str = sprintf($str, $param1, $param2, $param3, $param4, $param5); // Replace %s and %d except for FormatXXX strings.

+            }

+

+            return $str;

+		}

+		else

+		{

+		    if ($key[0] == '$') { return dol_eval($key, 1); }

@@ -766 +724,0 @@
-	 *  @see transcountrynoentities(), picto_from_langcode()

@@ -770,5 +728,2 @@
-		if (!empty($this->tab_translate["$str$countrycode"])) {

-			return $this->trans("$str$countrycode");

-		} else {

-			return $this->trans($str);

-		}

+		if ($this->tab_translate["$str$countrycode"]) return $this->trans("$str$countrycode");

+		else return $this->trans($str);

@@ -784 +738,0 @@
-	 *  @see transcountry(), picto_from_langcode()

@@ -788,5 +742,2 @@
-		if (!empty($this->tab_translate["$str$countrycode"])) {

-			return $this->transnoentities("$str$countrycode");

-		} else {

-			return $this->transnoentities($str);

-		}

+		if ($this->tab_translate["$str$countrycode"]) return $this->transnoentities("$str$countrycode");

+		else return $this->transnoentities($str);

@@ -805,7 +756,2 @@
-		if ($pagecodefrom == 'ISO-8859-1' && $this->charset_output == 'UTF-8') {

-			$str = mb_convert_encoding($str, 'UTF-8', 'ISO-8859-1');

-		}

-		if ($pagecodefrom == 'UTF-8' && $this->charset_output == 'ISO-8859-1') {

-			$str = mb_convert_encoding(str_replace('€', chr(128), $str), 'ISO-8859-1');

-			// TODO Replace with iconv("UTF-8", "ISO-8859-1", str_replace('€', chr(128), $str)); ?

-		}

+		if ($pagecodefrom == 'ISO-8859-1' && $this->charset_output == 'UTF-8')  $str = utf8_encode($str);

+		if ($pagecodefrom == 'UTF-8' && $this->charset_output == 'ISO-8859-1')	$str = utf8_decode(str_replace('€', chr(128), $str));

@@ -816 +762 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -827,2 +773,2 @@
-	{

-		// phpcs:enable

+    {

+        // phpcs:enable

@@ -834 +780 @@
-		$handle = opendir($langdir . "/langs");

+		$handle = opendir($langdir."/langs");

@@ -836 +782,2 @@
-		while ($dir = trim(readdir($handle))) {

+		while ($dir = trim(readdir($handle)))

+		{

@@ -838 +785,2 @@
-			if (preg_match('/^([a-z]+)_([A-Z]+)/i', $dir, $regs)) {

+			if (preg_match('/^([a-z]+)_([A-Z]+)/i', $dir, $regs))

+			{

@@ -842,27 +790,24 @@
-						'en' => 'en_US',

-						'am' => 'am_ET',

-						'ar' => 'ar_SA',

-						'bn' => 'bn_DB',

-						'bs' => 'bs_BA',

-						'ca' => 'ca_ES',

-						'cs' => 'cs_CZ',

-						'da' => 'da_DK',

-						'et' => 'et_EE',

-						'el' => 'el_GR',

-						'eu' => 'eu_ES',

-						'fa' => 'fa_IR',

-						'he' => 'he_IL',

-						'ka' => 'ka_GE',

-						'km' => 'km_KH',

-						'kn' => 'kn_IN',

-						'ko' => 'ko_KR',

-						'ja' => 'ja_JP',

-						'lo' => 'lo_LA',

-						'nb' => 'nb_NO',

-						'sq' => 'sq_AL',

-						'sr' => 'sr_RS',

-						'sv' => 'sv_SE',

-						'sl' => 'sl_SI',

-						'uk' => 'uk_UA',

-						'vi' => 'vi_VN',

-						'zh' => 'zh_CN'

+						'en'=>'en_US',

+						'sq'=>'sq_AL',

+						'ar'=>'ar_SA',

+						'eu'=>'eu_ES',

+						'bn'=>'bn_DB',

+						'bs'=>'bs_BA',

+						'ca'=>'ca_ES',

+						'zh'=>'zh_TW',

+						'cs'=>'cs_CZ',

+						'da'=>'da_DK',

+						'et'=>'et_EE',

+						'ka'=>'ka_GE',

+						'el'=>'el_GR',

+						'he'=>'he_IL',

+						'kn'=>'kn_IN',

+						'km'=>'km_KH',

+						'ko'=>'ko_KR',

+						'lo'=>'lo_LA',

+						'nb'=>'nb_NO',

+						'fa'=>'fa_IR',

+						'sr'=>'sr_RS',

+						'sl'=>'sl_SI',

+						'uk'=>'uk_UA',

+						'vi'=>'vi_VN'

@@ -870,3 +815 @@
-					if (strtolower($regs[1]) != strtolower($regs[2]) && !in_array($dir, $arrayofspecialmainlanguages)) {

-						continue;

-					}

+					if (strtolower($regs[1]) != strtolower($regs[2]) && !in_array($dir, $arrayofspecialmainlanguages)) continue;

@@ -875,2 +818,5 @@
-				if (getDolGlobalString('MAIN_LANGUAGES_ALLOWED') && !in_array($dir, explode(',', getDolGlobalString('MAIN_LANGUAGES_ALLOWED')))) {

-					continue;

+				if (!empty($conf->global->MAIN_LANGUAGES_ALLOWED) && !in_array($dir, explode(',', $conf->global->MAIN_LANGUAGES_ALLOWED))) continue;

+

+				if ($usecode == 2)

+				{

+				    $langs_available[$dir] = $dir;

@@ -879,2 +825,3 @@
-				if ($usecode == 2) {

-					$langs_available[$dir] = $dir;

+				if ($usecode == 1 || !empty($conf->global->MAIN_SHOW_LANGUAGE_CODE))

+				{

+				    $langs_available[$dir] = $dir.': '.dol_trunc($this->trans('Language_'.$dir), $maxlength);

@@ -882,5 +829,3 @@
-

-				if ($usecode == 1 || getDolGlobalString('MAIN_SHOW_LANGUAGE_CODE')) {

-					$langs_available[$dir] = $dir . ': ' . dol_trunc($this->trans('Language_' . $dir), $maxlength);

-				} else {

-					$langs_available[$dir] = $this->trans('Language_' . $dir);

+				else

+				{

+					$langs_available[$dir] = $this->trans('Language_'.$dir);

@@ -894,4 +839,4 @@
-	}

-

-

-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    }

+

+

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -905,3 +850,3 @@
-	public function file_exists($filename, $searchalt = 0)

-	{

-		// phpcs:enable

+    public function file_exists($filename, $searchalt = 0)

+    {

+        // phpcs:enable

@@ -909,3 +854,10 @@
-		foreach ($this->dir as $searchdir) {

-			if (is_readable(dol_osencode($searchdir . "/langs/" . $this->defaultlang . "/" . $filename))) {

-				return true;

+		foreach ($this->dir as $searchdir)

+		{

+			if (is_readable(dol_osencode($searchdir."/langs/".$this->defaultlang."/".$filename))) return true;

+

+			if ($searchalt)

+			{

+				// Test si fichier dans repertoire de la langue alternative

+				if ($this->defaultlang != "en_US") $filenamealt = $searchdir."/langs/en_US/".$filename;

+				//else $filenamealt = $searchdir."/langs/fr_FR/".$filename;

+				if (is_readable(dol_osencode($filenamealt))) return true;

@@ -913,10 +865,38 @@
-

-			if ($searchalt) {

-				// Test si fichier dans repertoire de la langue alternative

-				if ($this->defaultlang != "en_US") {

-					$filenamealt = $searchdir . "/langs/en_US/" . $filename;

-				}

-				//else $filenamealt = $searchdir."/langs/fr_FR/".$filename;

-				if (is_readable(dol_osencode($filenamealt))) {

-					return true;

-				}

+		}

+

+		return false;

+    }

+

+

+	/**

+	 *      Return full text translated to language label for a key. Store key-label in a cache.

+     *      This function need module "numberwords" to be installed. If not it will return

+     *      same number (this module is not provided by default as it use non GPL source code).

+	 *

+	 *		@param	int		$number		Number to encode in full text

+     *      @param  string	$isamount	''=it's just a number, '1'=It's an amount (default currency), 'currencycode'=It's an amount (foreign currency)

+	 *      @return string				Label translated in UTF8 (but without entities)

+	 * 									10 if setDefaultLang was en_US => ten

+	 * 									123 if setDefaultLang was fr_FR => cent vingt trois

+	 */

+    public function getLabelFromNumber($number, $isamount = '')

+    {

+		global $conf;

+

+		$newnumber = $number;

+

+		$dirsubstitutions = array_merge(array(), $conf->modules_parts['substitutions']);

+		foreach ($dirsubstitutions as $reldir)

+		{

+		    $dir = dol_buildpath($reldir, 0);

+		    $newdir = dol_osencode($dir);

+

+		    // Check if directory exists

+		    if (!is_dir($newdir)) continue; // We must not use dol_is_dir here, function may not be loaded

+

+			$fonc = 'numberwords';

+			if (file_exists($newdir.'/functions_'.$fonc.'.lib.php'))

+			{

+				include_once $newdir.'/functions_'.$fonc.'.lib.php';

+				$newnumber = numberwords_getLabelFromNumber($this, $number, $isamount);

+				break;

@@ -926,41 +905,0 @@
-		return false;

-	}

-

-

-	/**

-	 *      Return full text translated to language label for a key. Store key-label in a cache.

-	 *      This function need module "numberwords" to be installed. If not it will return

-	 *      same number (this module is not provided by default as it use non GPL source code).

-	 *

-	 *		@param	int|string	$number		Number to encode in full text

-	 *      @param  string		$isamount	''=it's just a number, '1'=It's an amount (default currency), 'currencycode'=It's an amount (foreign currency)

-	 *      @return string					Label translated in UTF8 (but without entities)

-	 * 										10 if setDefaultLang was en_US => ten

-	 * 										123 if setDefaultLang was fr_FR => cent vingt trois

-	 */

-	public function getLabelFromNumber($number, $isamount = '')

-	{

-		global $conf;

-

-		$newnumber = $number;

-

-		$dirsubstitutions = array_merge(array(), $conf->modules_parts['substitutions']);

-		foreach ($dirsubstitutions as $reldir) {

-			$dir = dol_buildpath($reldir, 0);

-			$newdir = dol_osencode($dir);

-

-			// Check if directory exists

-			if (!is_dir($newdir)) {

-				continue; // We must not use dol_is_dir here, function may not be loaded

-			}

-

-			$fonc = 'numberwords';

-			if (file_exists($newdir . '/functions_' . $fonc . '.lib.php')) {

-				include_once $newdir . '/functions_' . $fonc . '.lib.php';

-				if (function_exists('numberwords_getLabelFromNumber')) {

-					$newnumber = numberwords_getLabelFromNumber($this, $number, $isamount);

-					break;

-				}

-			}

-		}

-

@@ -968 +907 @@
-	}

+    }

@@ -978,3 +917,3 @@
-	 * 		@param	string	$tablename		Table name without prefix. This value must always be a hardcoded string and not a value coming from user input.

-	 * 		@param	string	$fieldkey		Field for key. This value must always be a hardcoded string and not a value coming from user input.

-	 * 		@param	string	$fieldlabel		Field for label. This value must always be a hardcoded string and not a value coming from user input.

+	 * 		@param	string	$tablename		Table name without prefix

+	 * 		@param	string	$fieldkey		Field for key

+	 * 		@param	string	$fieldlabel		Field for label

@@ -986,2 +925,2 @@
-	public function getLabelFromKey($db, $key, $tablename, $fieldkey, $fieldlabel, $keyforselect = '', $filteronentity = 0)

-	{

+    public function getLabelFromKey($db, $key, $tablename, $fieldkey, $fieldlabel, $keyforselect = '', $filteronentity = 0)

+    {

@@ -989,12 +928,5 @@
-		if ($key == '') {

-			return '';

-		}

-		// Test should be useless because the 3 variables are never set from user input but we keep it in case of.

-		if (preg_match('/[^0-9A-Z_]/i', $tablename) || preg_match('/[^0-9A-Z_]/i', $fieldkey) || preg_match('/[^0-9A-Z_]/i', $fieldlabel)) {

-			$this->error = 'Bad value for parameter tablename, fieldkey or fieldlabel';

-			return -1;

-		}

-

-		//print 'param: '.$key.'-'.$keydatabase.'-'.$this->trans($key); exit;

-

-		// Check if a translation is available (Note: this can call getTradFromKey that can call getLabelFromKey)

+		if ($key == '') return '';

+

+        //print 'param: '.$key.'-'.$keydatabase.'-'.$this->trans($key); exit;

+

+		// Check if a translation is available (this can call getTradFromKey)

@@ -1002 +934,2 @@
-		if ($tmp != $key && $tmp != 'ErrorBadValueForParamNotAString') {

+		if ($tmp != $key && $tmp != 'ErrorBadValueForParamNotAString')

+		{

@@ -1007 +940,2 @@
-		if (isset($this->cache_labels[$tablename][$key])) {	// Can be defined to 0 or ''

+		if (isset($this->cache_labels[$tablename][$key]))	// Can be defined to 0 or ''

+		{

@@ -1011,8 +945,5 @@
-		// Not found in loaded language file nor in cache. So we will take the label into database.

-		$sql = "SELECT " . $fieldlabel . " as label";

-		$sql .= " FROM " . $db->prefix() . $tablename;

-		$sql .= " WHERE " . $fieldkey . " = '" . $db->escape($keyforselect ? $keyforselect : $key) . "'";

-		if ($filteronentity) {

-			$sql .= " AND entity IN (" . getEntity($tablename) . ')';

-		}

-		dol_syslog(get_class($this) . '::getLabelFromKey', LOG_DEBUG);

+		$sql = "SELECT ".$fieldlabel." as label";

+		$sql .= " FROM ".MAIN_DB_PREFIX.$tablename;

+		$sql .= " WHERE ".$fieldkey." = '".$db->escape($keyforselect ? $keyforselect : $key)."'";

+		if ($filteronentity) $sql .= " AND entity IN (".getEntity($tablename).')';

+		dol_syslog(get_class($this).'::getLabelFromKey', LOG_DEBUG);

@@ -1020 +951,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -1022,5 +954,2 @@
-			if ($obj) {

-				$this->cache_labels[$tablename][$key] = $obj->label;

-			} else {

-				$this->cache_labels[$tablename][$key] = $key;

-			}

+			if ($obj) $this->cache_labels[$tablename][$key] = $obj->label;

+			else $this->cache_labels[$tablename][$key] = $key;

@@ -1030 +959,3 @@
-		} else {

+		}

+		else

+		{

@@ -1034 +965 @@
-	}

+    }

@@ -1046 +977 @@
-	public function getCurrencyAmount($currency_code, $amount)

+    public function getCurrencyAmount($currency_code, $amount)

@@ -1050,5 +981,2 @@
-		if (in_array($currency_code, array('USD'))) {

-			return $symbol . $amount;

-		} else {

-			return $amount . $symbol;

-		}

+		if (in_array($currency_code, array('USD'))) return $symbol.$amount;

+		else return $amount.$symbol;

@@ -1065,2 +993,2 @@
-	public function getCurrencySymbol($currency_code, $forceloadall = 0)

-	{

+    public function getCurrencySymbol($currency_code, $forceloadall = 0)

+    {

@@ -1069 +997,2 @@
-		if (function_exists("mb_convert_encoding")) {

+		if (function_exists("mb_convert_encoding"))

+		{

@@ -1072,3 +1001,5 @@
-			if (isset($this->cache_currencies[$currency_code]) && !empty($this->cache_currencies[$currency_code]['unicode']) && is_array($this->cache_currencies[$currency_code]['unicode'])) {

-				foreach ($this->cache_currencies[$currency_code]['unicode'] as $unicode) {

-					$currency_sign .= mb_convert_encoding("&#" . $unicode . ";", "UTF-8", 'HTML-ENTITIES');

+			if (isset($this->cache_currencies[$currency_code]) && !empty($this->cache_currencies[$currency_code]['unicode']) && is_array($this->cache_currencies[$currency_code]['unicode']))

+			{

+				foreach ($this->cache_currencies[$currency_code]['unicode'] as $unicode)

+				{

+					$currency_sign .= mb_convert_encoding("&#{$unicode};", "UTF-8", 'HTML-ENTITIES');

@@ -1080 +1011 @@
-	}

+    }

@@ -1092,6 +1023,2 @@
-		if ($this->cache_currencies_all_loaded) {

-			return 0; // Cache already loaded for all

-		}

-		if (!empty($currency_code) && isset($this->cache_currencies[$currency_code])) {

-			return 0; // Cache already loaded for the currency

-		}

+		if ($this->cache_currencies_all_loaded) return 0; // Cache already loaded for all

+		if (!empty($currency_code) && isset($this->cache_currencies[$currency_code])) return 0; // Cache already loaded for the currency

@@ -1100 +1027 @@
-		$sql .= " FROM " . $db->prefix() . "c_currencies";

+		$sql .= " FROM ".MAIN_DB_PREFIX."c_currencies";

@@ -1102,3 +1029 @@
-		if (!empty($currency_code)) {

-			$sql .= " AND code_iso = '" . $db->escape($currency_code) . "'";

-		}

+		if (!empty($currency_code)) $sql .= " AND code_iso = '".$db->escape($currency_code)."'";

@@ -1107 +1032 @@
-		dol_syslog(get_class($this) . '::loadCacheCurrencies', LOG_DEBUG);

+		dol_syslog(get_class($this).'::loadCacheCurrencies', LOG_DEBUG);

@@ -1109 +1034,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -1112,5 +1038 @@
-			if (!empty($currency_code)) {

-				foreach ($this->cache_currencies as $key => $val) {

-					$label[$key] = $val['label']; // Label in already loaded cache

-				}

-			}

+			if (!empty($currency_code)) foreach ($this->cache_currencies as $key => $val) $label[$key] = $val['label']; // Label in already loaded cache

@@ -1120 +1042,2 @@
-			while ($i < $num) {

+			while ($i < $num)

+			{

@@ -1122,6 +1045,5 @@
-				if ($obj) {

-					// If a translation exists, we use it lese we use the default label

-					$this->cache_currencies[$obj->code_iso]['label'] = ($obj->code_iso && $this->trans("Currency" . $obj->code_iso) != "Currency" . $obj->code_iso ? $this->trans("Currency" . $obj->code_iso) : ($obj->label != '-' ? $obj->label : ''));

-					$this->cache_currencies[$obj->code_iso]['unicode'] = (array) json_decode((empty($obj->unicode) ? '' : $obj->unicode), true);

-					$label[$obj->code_iso] = $this->cache_currencies[$obj->code_iso]['label'];

-				}

+

+				// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut

+				$this->cache_currencies[$obj->code_iso]['label'] = ($obj->code_iso && $this->trans("Currency".$obj->code_iso) != "Currency".$obj->code_iso ? $this->trans("Currency".$obj->code_iso) : ($obj->label != '-' ? $obj->label : ''));

+				$this->cache_currencies[$obj->code_iso]['unicode'] = (array) json_decode($obj->unicode, true);

+				$label[$obj->code_iso] = $this->cache_currencies[$obj->code_iso]['label'];

@@ -1130,3 +1052 @@
-			if (empty($currency_code)) {

-				$this->cache_currencies_all_loaded = true;

-			}

+			if (empty($currency_code)) $this->cache_currencies_all_loaded = true;

@@ -1139 +1059,3 @@
-		} else {

+		}

+		else

+		{

@@ -1145 +1067 @@
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

@@ -1152,12 +1074,12 @@
-	public function get_translations_for_substitutions()

-	{

-		// phpcs:enable

-		$substitutionarray = array();

-

-		foreach ($this->tab_translate as $code => $label) {

-			$substitutionarray['lang_' . $code] = $label;

-			$substitutionarray['__(' . $code . ')__'] = $label;

-		}

-

-		return $substitutionarray;

-	}

+    public function get_translations_for_substitutions()

+    {

+        // phpcs:enable

+        $substitutionarray = array();

+

+        foreach ($this->tab_translate as $code => $label) {

+            $substitutionarray['lang_'.$code] = $label;

+            $substitutionarray['__('.$code.')__'] = $label;

+        }

+

+        return $substitutionarray;

+    }

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_utils.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_utils.class.php
@@ -2,3 +2 @@
-/* Copyright (C) 2016	Laurent Destailleur <eldy@users.sourceforge.net>

- * Copyright (C) 2021	Regis Houssin		<regis.houssin@inodbox.com>

- * Copyright (C) 2022	Anthony Berton		<anthony.berton@bb2a.fr>

+/* Copyright (C) 2016 Destailleur Laurent <eldy@users.sourceforge.net>

@@ -33,9 +31,6 @@
-	 * @var DoliDB Database handler.

-	 */

-	public $db;

-

-	public $error;

-	public $errors;

-

-	public $output; // Used by Cron method to return message

-	public $result; // Used by Cron method to return data

+     * @var DoliDB Database handler.

+     */

+    public $db;

+

+    public $output; // Used by Cron method to return message

+    public $result; // Used by Cron method to return data

@@ -58,2 +53,2 @@
-	 *  @param	string      $choices	   Choice of purge mode ('tempfiles', 'tempfilesold' to purge temp older than $nbsecondsold seconds, 'logfiles', or mix of this). Note that 'allfiles' is also possible but very dangerous.

-	 *  @param  int         $nbsecondsold  Nb of seconds old to accept deletion of a directory if $choice is 'tempfilesold', or deletion of file if $choice is 'allfiles'

+	 *  @param	string      $choice		   Choice of purge mode ('tempfiles', '' or 'tempfilesold' to purge temp older than $nbsecondsold seconds, 'allfiles', 'logfile')

+	 *  @param  int         $nbsecondsold  Nb of seconds old to accept deletion of a directory if $choice is 'tempfilesold'

@@ -62 +57 @@
-	public function purgeFiles($choices = 'tempfilesold+logfiles', $nbsecondsold = 86400)

+	public function purgeFiles($choice = 'tempfilesold', $nbsecondsold = 86400)

@@ -64,2 +59 @@
-		global $conf, $langs, $user;

-		global $dolibarr_main_data_root;

+		global $conf, $langs, $dolibarr_main_data_root;

@@ -71,14 +65,52 @@
-		if (empty($choices)) {

-			$choices = 'tempfilesold+logfiles';

-		}

-		if ($choices == 'allfiles' && $nbsecondsold > 0) {

-			$choices = 'allfilesold';

-		}

-

-		dol_syslog("Utils::purgeFiles choice=".$choices, LOG_DEBUG);

-

-		// For dangerous action, we check the user is admin

-		if (in_array($choices, array('allfiles', 'allfilesold'))) {

-			if (empty($user->admin)) {

-				$this->output = 'Error: to erase data files, user running the batch (currently '.$user->login.') must be an admin user';

-				return 1;

+		$filesarray = array();

+		if (empty($choice)) $choice = 'tempfilesold';

+

+		dol_syslog("Utils::purgeFiles choice=".$choice, LOG_DEBUG);

+

+		if ($choice == 'tempfiles' || $choice == 'tempfilesold')

+		{

+			// Delete temporary files

+			if ($dolibarr_main_data_root)

+			{

+			    $filesarray = dol_dir_list($dolibarr_main_data_root, "directories", 1, '^temp$', '', 'name', SORT_ASC, 2, 0, '', 1); // Do not follow symlinks

+

+			    if ($choice == 'tempfilesold')

+				{

+					$now = dol_now();

+					foreach ($filesarray as $key => $val)

+					{

+					    if ($val['date'] > ($now - ($nbsecondsold))) unset($filesarray[$key]); // Discard temp dir not older than $nbsecondsold

+					}

+				}

+			}

+		}

+

+		if ($choice == 'allfiles')

+		{

+			// Delete all files (except install.lock, do not follow symbolic links)

+			if ($dolibarr_main_data_root)

+			{

+				$filesarray = dol_dir_list($dolibarr_main_data_root, "all", 0, '', 'install\.lock$', 'name', SORT_ASC, 0, 0, '', 1);

+			}

+		}

+

+		if ($choice == 'logfile')

+		{

+			// Define files log

+			if ($dolibarr_main_data_root)

+			{

+				$filesarray = dol_dir_list($dolibarr_main_data_root, "files", 0, '.*\.log[\.0-9]*(\.gz)?$', 'install\.lock$', 'name', SORT_ASC, 0, 0, '', 1);

+			}

+

+			$filelog = '';

+			if (!empty($conf->syslog->enabled))

+			{

+				$filelog = $conf->global->SYSLOG_FILE;

+				$filelog = preg_replace('/DOL_DATA_ROOT/i', DOL_DATA_ROOT, $filelog);

+

+				$alreadyincluded = false;

+				foreach ($filesarray as $tmpcursor)

+				{

+					if ($tmpcursor['fullname'] == $filelog) { $alreadyincluded = true; }

+				}

+				if (!$alreadyincluded) $filesarray[] = array('fullname'=>$filelog, 'type'=>'file');

@@ -91,17 +123,24 @@
-		$filelog = '';

-

-		$choicesarray = preg_split('/[\+,]/', $choices);

-		foreach ($choicesarray as $choice) {

-			$now = dol_now();

-			$filesarray = array();

-

-			if ($choice == 'tempfiles' || $choice == 'tempfilesold') {

-				// Delete temporary files

-				if ($dolibarr_main_data_root) {

-					$filesarray = dol_dir_list($dolibarr_main_data_root, "directories", 1, '^temp$', '', 'name', SORT_ASC, 2, 0, '', 1); // Do not follow symlinks

-

-					if ($choice == 'tempfilesold') {

-						foreach ($filesarray as $key => $val) {

-							if ($val['date'] > ($now - ($nbsecondsold))) {

-								unset($filesarray[$key]); // Discard temp dir not older than $nbsecondsold

-							}

+		if (count($filesarray))

+		{

+		    foreach ($filesarray as $key => $value)

+			{

+				//print "x ".$filesarray[$key]['fullname']."-".$filesarray[$key]['type']."<br>\n";

+			    if ($filesarray[$key]['type'] == 'dir')

+				{

+					$startcount = 0;

+					$tmpcountdeleted = 0;

+

+					$result = dol_delete_dir_recursive($filesarray[$key]['fullname'], $startcount, 1, 0, $tmpcountdeleted);

+					$count += $result;

+					$countdeleted += $tmpcountdeleted;

+				}

+				elseif ($filesarray[$key]['type'] == 'file')

+				{

+					// If (file that is not logfile) or (if mode is logfile)

+					if ($filesarray[$key]['fullname'] != $filelog || $choice == 'logfile')

+					{

+						$result = dol_delete_file($filesarray[$key]['fullname'], 1, 1);

+						if ($result)

+						{

+							$count++;

+							$countdeleted++;

@@ -109,32 +148,3 @@
-					}

-				}

-			}

-

-			if ($choice == 'allfiles') {

-				// Delete all files (except .lock and .unlock files, do not follow symbolic links)

-				if ($dolibarr_main_data_root) {

-					$filesarray = dol_dir_list($dolibarr_main_data_root, "all", 0, '', '(\.lock|\.unlock)$', 'name', SORT_ASC, 0, 0, '', 1);	// No need to use recursive, we will delete directory

-				}

-			}

-

-			if ($choice == 'allfilesold') {

-				// Delete all files (except .lock and .unlock files, do not follow symbolic links)

-				if ($dolibarr_main_data_root) {

-					$filesarray = dol_dir_list($dolibarr_main_data_root, "files", 1, '', '(\.lock|\.unlock)$', 'name', SORT_ASC, 0, 0, '', 1, $nbsecondsold);	// No need to use recursive, we will delete directory

-				}

-			}

-

-			if ($choice == 'logfile' || $choice == 'logfiles') {

-				// Define files log

-				if ($dolibarr_main_data_root) {

-					$filesarray = dol_dir_list($dolibarr_main_data_root, "files", 0, '.*\.log[\.0-9]*(\.gz)?$', '(\.lock|\.unlock)$', 'name', SORT_ASC, 0, 0, '', 1);

-				}

-

-				if (isModEnabled('syslog')) {

-					$filelog = $conf->global->SYSLOG_FILE;

-					$filelog = preg_replace('/DOL_DATA_ROOT/i', DOL_DATA_ROOT, $filelog);

-

-					$alreadyincluded = false;

-					foreach ($filesarray as $tmpcursor) {

-						if ($tmpcursor['fullname'] == $filelog) {

-							$alreadyincluded = true;

+						else

+						{

+							$counterror++;

@@ -143,46 +153,14 @@
-					if (!$alreadyincluded) {

-						$filesarray[] = array('fullname'=>$filelog, 'type'=>'file');

-					}

-				}

-			}

-

-			if (is_array($filesarray) && count($filesarray)) {

-				foreach ($filesarray as $key => $value) {

-					//print "x ".$filesarray[$key]['fullname']."-".$filesarray[$key]['type']."<br>\n";

-					if ($filesarray[$key]['type'] == 'dir') {

-						$startcount = 0;

-						$tmpcountdeleted = 0;

-

-						$result = dol_delete_dir_recursive($filesarray[$key]['fullname'], $startcount, 1, 0, $tmpcountdeleted);

-

-						if (!in_array($filesarray[$key]['fullname'], array($conf->api->dir_temp, $conf->user->dir_temp))) {		// The 2 directories $conf->api->dir_temp and $conf->user->dir_temp are recreated at end, so we do not count them

-							$count += $result;

-							$countdeleted += $tmpcountdeleted;

-						}

-					} elseif ($filesarray[$key]['type'] == 'file') {

-						if ($choice != 'allfilesold' || $filesarray[$key]['date'] < ($now - $nbsecondsold)) {

-							// If (file that is not logfile) or (if mode is logfile)

-							if ($filesarray[$key]['fullname'] != $filelog || $choice == 'logfile' || $choice == 'logfiles') {

-								$result = dol_delete_file($filesarray[$key]['fullname'], 1, 1);

-								if ($result) {

-									$count++;

-									$countdeleted++;

-								} else {

-									$counterror++;

-								}

-							}

-						}

-					}

-				}

-

-				// Update cachenbofdoc

-				if (isModEnabled('ecm') && $choice == 'allfiles') {

-					require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';

-					$ecmdirstatic = new EcmDirectory($this->db);

-					$result = $ecmdirstatic->refreshcachenboffile(1);

-				}

-			}

-		}

-

-		if ($count > 0) {

-			$langs->load("admin");

+				}

+			}

+

+			// Update cachenbofdoc

+			if (!empty($conf->ecm->enabled) && $choice == 'allfiles')

+			{

+				require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';

+				$ecmdirstatic = new EcmDirectory($this->db);

+				$result = $ecmdirstatic->refreshcachenboffile(1);

+			}

+		}

+

+		if ($count > 0)

+		{

@@ -190,6 +168,3 @@
-			if ($count > $countdeleted) {

-				$this->output .= '<br>'.$langs->trans("PurgeNDirectoriesFailed", ($count - $countdeleted));

-			}

-		} else {

-			$this->output = $langs->trans("PurgeNothingToDelete").(in_array('tempfilesold', $choicesarray) ? ' (older than 24h for temp files)' : '');

-		}

+			if ($count > $countdeleted) $this->output .= '<br>'.$langs->trans("PurgeNDirectoriesFailed", ($count - $countdeleted));

+		}

+		else $this->output = $langs->trans("PurgeNothingToDelete").($choice == 'tempfilesold' ? ' (older than 24h)' : '');

@@ -198,2 +173,3 @@
-		if (isModEnabled('api')) {

-			dol_mkdir($conf->api->dir_temp);

+		if (!empty($conf->api->enabled))

+		{

+		    dol_mkdir($conf->api->dir_temp);

@@ -217,2 +193 @@
-	 *  @param	int		    $execmethod		   0=Use default method (that is 1 by default), 1=Use the PHP 'exec' - need size of dump in memory, but low memory method is used if GETPOST('lowmemorydump') is set, 2=Use the 'popen' method (low memory method)

-	 *  @param	int			$lowmemorydump	   1=Use the low memory method. If $lowmemorydump is set, it means we want to make the compression using an external pipe instead retreiving the content of the dump in PHP memory array $output_arr and then print it into the PHP pipe open with xopen().

+	 *  @param	int		    $execmethod		   0=Use default method (that is 1 by default), 1=Use the PHP 'exec', 2=Use the 'popen' method

@@ -221 +196 @@
-	public function dumpDatabase($compression = 'none', $type = 'auto', $usedefault = 1, $file = 'auto', $keeplastnfiles = 0, $execmethod = 0, $lowmemorydump = 0)

+	public function dumpDatabase($compression = 'none', $type = 'auto', $usedefault = 1, $file = 'auto', $keeplastnfiles = 0, $execmethod = 0)

@@ -225 +199,0 @@
-		global $dolibarr_main_db_character_set;

@@ -232,3 +205,0 @@
-		// Clean data

-		$file = dol_sanitizeFileName($file);

-

@@ -236 +207,2 @@
-		if (!in_array($compression, array('none', 'gz', 'bz', 'zip', 'zstd'))) {

+		if (!in_array($compression, array('none', 'gz', 'bz', 'zip')))

+		{

@@ -243,4 +215,3 @@
-		if ($type == 'auto') {

-			$type = $this->db->type;

-		}

-		if (!in_array($type, array('postgresql', 'pgsql', 'mysql', 'mysqli', 'mysqlnobin'))) {

+		if ($type == 'auto') $type = $db->type;

+		if (!in_array($type, array('postgresql', 'pgsql', 'mysql', 'mysqli', 'mysqlnobin')))

+		{

@@ -253 +224,2 @@
-		if ($file == 'auto') {

+		if ($file == 'auto')

+		{

@@ -256,4 +228 @@
-			if (in_array($type, array('mysql', 'mysqli'))) {

-				$prefix = 'mysqldump';

-				$ext = 'sql';

-			}

+			if (in_array($type, array('mysql', 'mysqli'))) { $prefix = 'mysqldump'; $ext = 'sql'; }

@@ -261,5 +230,2 @@
-			if (in_array($type, array('pgsql'))) {

-				$prefix = 'pg_dump';

-				$ext = 'sql';

-			}

-			$file = $prefix.'_'.$dolibarr_main_db_name.'_'.dol_sanitizeFileName(DOL_VERSION).'_'.dol_print_date(dol_now('gmt'), "dayhourlogsmall", 'tzuser').'.'.$ext;

+			if (in_array($type, array('pgsql'))) { $prefix = 'pg_dump'; $ext = 'sql'; }

+			$file = $prefix.'_'.$dolibarr_main_db_name.'_'.dol_sanitizeFileName(DOL_VERSION).'_'.strftime("%Y%m%d%H%M").'.'.$ext;

@@ -273,10 +239,4 @@
-		if ($type == 'mysql' || $type == 'mysqli') {

-			if (!getDolGlobalString('SYSTEMTOOLS_MYSQLDUMP')) {

-				$cmddump = $db->getPathOfDump();

-			} else {

-				$cmddump = $conf->global->SYSTEMTOOLS_MYSQLDUMP;

-			}

-			if (empty($cmddump)) {

-				$this->error = "Failed to detect command to use for mysqldump. Try a manual backup before to set path of command.";

-				return -1;

-			}

+		if ($type == 'mysql' || $type == 'mysqli')

+		{

+			$cmddump = $conf->global->SYSTEMTOOLS_MYSQLDUMP;

+

@@ -287,7 +247,2 @@
-			if ($compression == 'gz') {

-				$outputfile .= '.gz';

-			} elseif ($compression == 'bz') {

-				$outputfile .= '.bz2';

-			} elseif ($compression == 'zstd') {

-				$outputfile .= '.zst';

-			}

+			if ($compression == 'gz') $outputfile .= '.gz';

+			if ($compression == 'bz') $outputfile .= '.bz2';

@@ -300,3 +255 @@
-			if (preg_match("/\s/", $command)) {

-				$command = escapeshellarg($command); // If there is spaces, we add quotes on command to be sure $command is only a program and not a program+parameters

-			}

+			if (preg_match("/\s/", $command)) $command = escapeshellarg($command); // If there is spaces, we add quotes on command to be sure $command is only a program and not a program+parameters

@@ -307,28 +260,13 @@
-			if (!empty($dolibarr_main_db_port)) {

-				$param .= " -P ".$dolibarr_main_db_port." --protocol=tcp";

-			}

-			if (GETPOST("use_transaction", "alpha")) {

-				$param .= " --single-transaction";

-			}

-			if (GETPOST("disable_fk", "alpha") || $usedefault) {

-				$param .= " -K";

-			}

-			if (GETPOST("sql_compat", "alpha") && GETPOST("sql_compat", "alpha") != 'NONE') {

-				$param .= " --compatible=".escapeshellarg(GETPOST("sql_compat", "alpha"));

-			}

-			if (GETPOST("drop_database", "alpha")) {

-				$param .= " --add-drop-database";

-			}

-			if (GETPOST("use_mysql_quick_param", "alpha")) {

-				$param .= " --quick";

-			}

-			if (GETPOST("use_force", "alpha")) {

-				$param .= " -f";

-			}

-			if (GETPOST("sql_structure", "alpha") || $usedefault) {

-				if (GETPOST("drop", "alpha") || $usedefault) {

-					$param .= " --add-drop-table=TRUE";

-				} else {

-					$param .= " --add-drop-table=FALSE";

-				}

-			} else {

+			if (!empty($dolibarr_main_db_port)) $param .= " -P ".$dolibarr_main_db_port;

+			if (!GETPOST("use_transaction", "alpha"))    $param .= " -l --single-transaction";

+			if (GETPOST("disable_fk", "alpha") || $usedefault) $param .= " -K";

+			if (GETPOST("sql_compat", "alpha") && GETPOST("sql_compat", "alpha") != 'NONE') $param .= " --compatible=".escapeshellarg(GETPOST("sql_compat", "alpha"));

+			if (GETPOST("drop_database", "alpha"))        $param .= " --add-drop-database";

+			if (GETPOST("use_mysql_quick_param", "alpha"))$param .= " --quick";

+			if (GETPOST("sql_structure", "alpha") || $usedefault)

+			{

+				if (GETPOST("drop", "alpha") || $usedefault)	$param .= " --add-drop-table=TRUE";

+				else 				       	         		    $param .= " --add-drop-table=FALSE";

+			}

+			else

+			{

@@ -337,4 +275,3 @@
-			if (GETPOST("disable-add-locks", "alpha")) {

-				$param .= " --add-locks=FALSE";

-			}

-			if (GETPOST("sql_data", "alpha") || $usedefault) {

+			if (GETPOST("disable-add-locks", "alpha")) $param .= " --add-locks=FALSE";

+			if (GETPOST("sql_data", "alpha") || $usedefault)

+			{

@@ -342,18 +279,9 @@
-				if (GETPOST("showcolumns", "alpha") || $usedefault) {

-					$param .= " -c";

-				}

-				if (GETPOST("extended_ins", "alpha") || $usedefault) {

-					$param .= " -e";

-				} else {

-					$param .= " --skip-extended-insert";

-				}

-				if (GETPOST("delayed", "alpha")) {

-					$param .= " --delayed-insert";

-				}

-				if (GETPOST("sql_ignore", "alpha")) {

-					$param .= " --insert-ignore";

-				}

-				if (GETPOST("hexforbinary", "alpha") || $usedefault) {

-					$param .= " --hex-blob";

-				}

-			} else {

+				if (GETPOST("showcolumns", "alpha") || $usedefault)	 $param .= " -c";

+				if (GETPOST("extended_ins", "alpha") || $usedefault) $param .= " -e";

+				else $param .= " --skip-extended-insert";

+				if (GETPOST("delayed", "alpha"))	 	 $param .= " --delayed-insert";

+				if (GETPOST("sql_ignore", "alpha"))	 $param .= " --insert-ignore";

+				if (GETPOST("hexforbinary", "alpha") || $usedefault) $param .= " --hex-blob";

+			}

+			else

+			{

@@ -362,6 +290 @@
-			if ($dolibarr_main_db_character_set == 'utf8mb4') {

-				// We save output into utf8mb4 charset

-				$param .= " --default-character-set=utf8mb4 --no-tablespaces";

-			} else {

-				$param .= " --default-character-set=utf8 --no-tablespaces"; // We always save output into utf8 charset

-			}

+			$param .= " --default-character-set=utf8"; // We always save output into utf8 charset

@@ -370 +293,2 @@
-			if (!empty($dolibarr_main_db_pass)) {

+			if (!empty($dolibarr_main_db_pass))

+			{

@@ -372 +296 @@
-				$paramclear .= ' -p"'.str_replace(array('"', '`', '$'), array('\"', '\`', '\$'), $dolibarr_main_db_pass).'"';

+				$paramclear .= ' -p"'.str_replace(array('"', '`'), array('\"', '\`'), $dolibarr_main_db_pass).'"';

@@ -380,32 +304,3 @@
-			if (!$lowmemorydump) {

-				if ($compression == 'none') {

-					$handle = fopen($outputfile, 'w');

-				} elseif ($compression == 'gz') {

-					$handle = gzopen($outputfile, 'w');

-				} elseif ($compression == 'bz') {

-					$handle = bzopen($outputfile, 'w');

-				} elseif ($compression == 'zstd') {

-					$handle = fopen($outputfile, 'w');

-				}

-			} else {

-				if ($compression == 'none') {

-					$fullcommandclear .= ' | grep -v "Warning: Using a password on the command line interface can be insecure." > "'.dol_sanitizePathName($outputfile).'"';

-					$fullcommandcrypted .= ' | grep -v "Warning: Using a password on the command line interface can be insecure." > "'.dol_sanitizePathName($outputfile).'"';

-					$handle = 1;

-				} elseif ($compression == 'gz') {

-					$fullcommandclear .= ' | grep -v "Warning: Using a password on the command line interface can be insecure." | gzip > "'.dol_sanitizePathName($outputfile).'"';

-					$fullcommandcrypted .= ' | grep -v "Warning: Using a password on the command line interface can be insecure." | gzip > "'.dol_sanitizePathName($outputfile).'"';

-					$paramcrypted .= ' | grep -v "Warning: Using a password on the command line interface can be insecure." | gzip';

-					$handle = 1;

-				} elseif ($compression == 'bz') {

-					$fullcommandclear .= ' | grep -v "Warning: Using a password on the command line interface can be insecure." | bzip2 > "'.dol_sanitizePathName($outputfile).'"';

-					$fullcommandcrypted .= ' | grep -v "Warning: Using a password on the command line interface can be insecure." | bzip2 > "'.dol_sanitizePathName($outputfile).'"';

-					$paramcrypted .= ' | grep -v "Warning: Using a password on the command line interface can be insecure." | bzip2';

-					$handle = 1;

-				} elseif ($compression == 'zstd') {

-					$fullcommandclear .= ' | grep -v "Warning: Using a password on the command line interface can be insecure." | zstd > "'.dol_sanitizePathName($outputfile).'"';

-					$fullcommandcrypted .= ' | grep -v "Warning: Using a password on the command line interface can be insecure." | zstd > "'.dol_sanitizePathName($outputfile).'"';

-					$paramcrypted .= ' | grep -v "Warning: Using a password on the command line interface can be insecure." | zstd';

-					$handle = 1;

-				}

-			}

+			if ($compression == 'none') $handle = fopen($outputfile, 'w');

+			if ($compression == 'gz')   $handle = gzopen($outputfile, 'w');

+			if ($compression == 'bz')   $handle = bzopen($outputfile, 'w');

@@ -414,22 +309,11 @@
-			if ($handle) {

-				if (getDolGlobalString('MAIN_EXEC_USE_POPEN')) {

-					$execmethod = $conf->global->MAIN_EXEC_USE_POPEN;

-				}

-				if (empty($execmethod)) {

-					$execmethod = 1;

-				}

-

-				dol_syslog("Utils::dumpDatabase execmethod=".$execmethod." command:".$fullcommandcrypted, LOG_INFO);

-

-

-				/* If value has been forced with a php_admin_value, this has no effect. Example of value: '512M' */

-				$MemoryLimit = getDolGlobalString('MAIN_MEMORY_LIMIT_DUMP');

-				if (!empty($MemoryLimit)) {

-					@ini_set('memory_limit', $MemoryLimit);

-				}

-

-

-				if ($execmethod == 1) {

-					$output_arr = array();

-					$retval = null;

-

+			if ($handle)

+			{

+				if (!empty($conf->global->MAIN_EXEC_USE_POPEN)) $execmethod = $conf->global->MAIN_EXEC_USE_POPEN;

+				if (empty($execmethod)) $execmethod = 1;

+

+				dol_syslog("Utils::dumpDatabase execmethod=".$execmethod." command:".$fullcommandcrypted, LOG_DEBUG);

+

+				// TODO Replace with executeCLI function

+				if ($execmethod == 1)

+				{

+					$output_arr = array(); $retval = null;

@@ -437,7 +321,3 @@
-					// TODO Replace this exec with Utils->executeCLI() function.

-					// We must check that the case for $lowmemorydump works too...

-					//$utils = new Utils($db);

-					//$outputfile = $conf->admin->dir_temp.'/dump.tmp';

-					//$utils->executeCLI($fullcommandclear, $outputfile, 0);

-

-					if ($retval != 0) {

+

+					if ($retval != 0)

+					{

@@ -448 +328,3 @@
-					} else {

+					}

+					else

+					{

@@ -450,2 +332,4 @@
-						if (!empty($output_arr)) {

-							foreach ($output_arr as $key => $read) {

+						if (!empty($output_arr))

+						{

+							foreach ($output_arr as $key => $read)

+							{

@@ -453,15 +337,4 @@
-								if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) {

-									continue;

-								}

-								// Now check into the result file, that the file end with "-- Dump completed"

-								// This is possible only if $output_arr is the clear dump file, so not possible with $lowmemorydump set because file is already compressed.

-								if (!$lowmemorydump) {

-									fwrite($handle, $read.($execmethod == 2 ? '' : "\n"));

-									if (preg_match('/'.preg_quote('-- Dump completed', '/').'/i', $read)) {

-										$ok = 1;

-									} elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES', '/').'/i', $read)) {

-										$ok = 1;

-									}

-								} else {

-									// If we have a result here in lowmemorydump mode, something is strange

-								}

+								if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) continue;

+								fwrite($handle, $read.($execmethod == 2 ? '' : "\n"));

+								if (preg_match('/'.preg_quote('-- Dump completed').'/i', $read)) $ok = 1;

+								elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i', $read)) $ok = 1;

@@ -469,2 +341,0 @@
-						} elseif ($lowmemorydump) {

-							$ok = 1;

@@ -474,2 +345,2 @@
-

-				if ($execmethod == 2) {	// With this method, there is no way to get the return code, only output

+				if ($execmethod == 2)	// With this method, there is no way to get the return code, only output

+				{

@@ -478,33 +349,23 @@
-					if ($handlein) {

-						while (!feof($handlein)) {

-							$i++; // output line number

-							$read = fgets($handlein);

-							// Exclude warning line we don't want

-							if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) {

-								continue;

-							}

-							fwrite($handle, $read);

-							if (preg_match('/'.preg_quote('-- Dump completed').'/i', $read)) {

-								$ok = 1;

-							} elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i', $read)) {

-								$ok = 1;

-							}

-						}

-						pclose($handlein);

-					}

-				}

-

-				if (!$lowmemorydump) {

-					if ($compression == 'none') {

-						fclose($handle);

-					} elseif ($compression == 'gz') {

-						gzclose($handle);

-					} elseif ($compression == 'bz') {

-						bzclose($handle);

-					} elseif ($compression == 'zstd') {

-						fclose($handle);

-					}

-				}

-

-				dolChmod($outputfile);

-			} else {

+					while (!feof($handlein))

+					{

+						$i++; // output line number

+						$read = fgets($handlein);

+						// Exclude warning line we don't want

+						if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) continue;

+						fwrite($handle, $read);

+						if (preg_match('/'.preg_quote('-- Dump completed').'/i', $read)) $ok = 1;

+						elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i', $read)) $ok = 1;

+					}

+					pclose($handlein);

+				}

+

+

+				if ($compression == 'none') fclose($handle);

+				if ($compression == 'gz')   gzclose($handle);

+				if ($compression == 'bz')   bzclose($handle);

+

+				if (!empty($conf->global->MAIN_UMASK))

+					@chmod($outputfile, octdec($conf->global->MAIN_UMASK));

+			}

+			else

+			{

@@ -517,10 +378,5 @@
-			if ($compression == 'none') {

-				$handle = fopen($outputfile, 'r');

-			} elseif ($compression == 'gz') {

-				$handle = gzopen($outputfile, 'r');

-			} elseif ($compression == 'bz') {

-				$handle = bzopen($outputfile, 'r');

-			} elseif ($compression == 'zstd') {

-				$handle = fopen($outputfile, 'r');

-			}

-			if ($handle) {

+			if ($compression == 'none') $handle = fopen($outputfile, 'r');

+			if ($compression == 'gz')   $handle = gzopen($outputfile, 'r');

+			if ($compression == 'bz')   $handle = bzopen($outputfile, 'r');

+			if ($handle)

+			{

@@ -532,9 +388,3 @@
-				if ($compression == 'none') {

-					fclose($handle);

-				} elseif ($compression == 'gz') {

-					gzclose($handle);

-				} elseif ($compression == 'bz') {

-					bzclose($handle);

-				} elseif ($compression == 'zstd') {

-					fclose($handle);

-				}

+				if ($compression == 'none') fclose($handle);

+				if ($compression == 'gz')   gzclose($handle);

+				if ($compression == 'bz')   bzclose($handle);

@@ -543 +393,3 @@
-				} else {

+				}

+				else

+				{

@@ -549 +401,2 @@
-					if (!$errormsg) {

+					if (!$errormsg)

+					{

@@ -564 +417,2 @@
-		if ($type == 'mysqlnobin') {

+		if ($type == 'mysqlnobin')

+		{

@@ -569,6 +423,2 @@
-			if ($compression == 'gz') {

-				$outputfile .= '.gz';

-			}

-			if ($compression == 'bz') {

-				$outputfile .= '.bz2';

-			}

+			if ($compression == 'gz') $outputfile .= '.gz';

+			if ($compression == 'bz') $outputfile .= '.bz2';

@@ -578 +428,2 @@
-			if ($compression == 'gz' or $compression == 'bz') {

+			if ($compression == 'gz' or $compression == 'bz')

+			{

@@ -582 +433,3 @@
-			} else {

+			}

+			else

+			{

@@ -591 +444,2 @@
-		if ($type == 'postgresql' || $type == 'pgsql') {

+		if ($type == 'postgresql' || $type == 'pgsql')

+		{

@@ -597,6 +451,2 @@
-			if ($compression == 'gz') {

-				$outputfile .= '.gz';

-			}

-			if ($compression == 'bz') {

-				$outputfile .= '.bz2';

-			}

+			if ($compression == 'gz') $outputfile .= '.gz';

+			if ($compression == 'bz') $outputfile .= '.bz2';

@@ -609,3 +459 @@
-			if (preg_match("/\s/", $command)) {

-				$command = escapeshellarg($command); // If there is spaces, we add quotes on command to be sure $command is only a program and not a program+parameters

-			}

+			if (preg_match("/\s/", $command)) $command = escapeshellarg($command); // If there is spaces, we add quotes on command to be sure $command is only a program and not a program+parameters

@@ -618,24 +466,12 @@
-			if (!empty($dolibarr_main_db_port)) {

-				$param .= " -p ".$dolibarr_main_db_port;

-			}

-			if (GETPOST("sql_compat") && GETPOST("sql_compat") == 'ANSI') {

-				$param .= "  --disable-dollar-quoting";

-			}

-			if (GETPOST("drop_database")) {

-				$param .= " -c -C";

-			}

-			if (GETPOST("sql_structure")) {

-				if (GETPOST("drop")) {

-					$param .= " --add-drop-table";

-				}

-				if (!GETPOST("sql_data")) {

-					$param .= " -s";

-				}

-			}

-			if (GETPOST("sql_data")) {

-				if (!GETPOST("sql_structure")) {

-					$param .= " -a";

-				}

-				if (GETPOST("showcolumns")) {

-					$param .= " -c";

-				}

+			if (!empty($dolibarr_main_db_port)) $param .= " -p ".$dolibarr_main_db_port;

+			if (GETPOST("sql_compat") && GETPOST("sql_compat") == 'ANSI') $param .= "  --disable-dollar-quoting";

+			if (GETPOST("drop_database"))        $param .= " -c -C";

+			if (GETPOST("sql_structure"))

+			{

+				if (GETPOST("drop"))			 $param .= " --add-drop-table";

+				if (!GETPOST("sql_data"))       $param .= " -s";

+			}

+			if (GETPOST("sql_data"))

+			{

+				if (!GETPOST("sql_structure"))	 $param .= " -a";

+				if (GETPOST("showcolumns"))	     $param .= " -c";

@@ -645,3 +481 @@
-			if ($compression == 'gz') {

-				$param .= ' -Z 9';

-			}

+			if ($compression == 'gz')   $param .= ' -Z 9';

@@ -651 +485 @@
-			/*if (!empty($dolibarr_main_db_pass))

+			/*if (! empty($dolibarr_main_db_pass))

@@ -664 +498,2 @@
-		if (!$errormsg && $keeplastnfiles > 0) {

+		if (!$errormsg && $keeplastnfiles > 0)

+		{

@@ -667,8 +502,5 @@
-			if (is_array($tmpfiles)) {

-				foreach ($tmpfiles as $key => $val) {

-					$i++;

-					if ($i <= $keeplastnfiles) {

-						continue;

-					}

-					dol_delete_file($val['fullname'], 0, 0, 0, null, false, 0);

-				}

+			foreach ($tmpfiles as $key => $val)

+			{

+				$i++;

+				if ($i <= $keeplastnfiles) continue;

+				dol_delete_file($val['fullname'], 0, 0, 0, null, false, 0);

@@ -686,9 +518,4 @@
-	 * @param 	string	$command			Command line to execute.

-	 * 										Warning: The command line is sanitize by escapeshellcmd(), except if $noescapecommand set, so can't contains any redirection char '>'. Use param $redirectionfile if you need it.

-	 * @param 	string	$outputfile			A path for an output file (used only when method is 2). For example: $conf->admin->dir_temp.'/out.tmp';

-	 * @param	int		$execmethod			0=Use default method (that is 1 by default), 1=Use the PHP 'exec', 2=Use the 'popen' method

-	 * @param	string	$redirectionfile	If defined, a redirection of output to this file is added.

-	 * @param	int		$noescapecommand	1=Do not escape command. Warning: Using this parameter needs you alreay have sanitized the $command parameter. If not, it will lead to security vulnerability.

-	 * 										This parameter is provided for backward compatibility with external modules. Always use 0 in core.

-	 * @param	string	$redirectionfileerr	If defined, a redirection of error is added to this file instead of to channel 1.

-	 * @return	array						array('result'=>...,'output'=>...,'error'=>...). result = 0 means OK.

+	 * @param 	string	$command		Command line to execute.

+	 * @param 	string	$outputfile		Output file (used only when method is 2). For exemple $conf->admin->dir_temp.'/out.tmp';

+	 * @param	int		$execmethod		0=Use default method (that is 1 by default), 1=Use the PHP 'exec', 2=Use the 'popen' method

+	 * @return	array					array('result'=>...,'output'=>...,'error'=>...). result = 0 means OK.

@@ -696 +523 @@
-	public function executeCLI($command, $outputfile, $execmethod = 0, $redirectionfile = null, $noescapecommand = 0, $redirectionfileerr = null)

+	public function executeCLI($command, $outputfile, $execmethod = 0)

@@ -704,21 +531,5 @@
-		if (empty($noescapecommand)) {

-			$command = escapeshellcmd($command);

-		}

-

-		if ($redirectionfile) {

-			$command .= " > ".dol_sanitizePathName($redirectionfile);

-		}

-

-		if ($redirectionfileerr && ($redirectionfileerr != $redirectionfile)) {

-			// If we ask a redirect of stderr on a given file not already used for stdout

-			$command .= " 2> ".dol_sanitizePathName($redirectionfileerr);

-		} else {

-			$command .= " 2>&1";

-		}

-

-		if (getDolGlobalString('MAIN_EXEC_USE_POPEN')) {

-			$execmethod = $conf->global->MAIN_EXEC_USE_POPEN;

-		}

-		if (empty($execmethod)) {

-			$execmethod = 1;

-		}

+		$command = escapeshellcmd($command);

+		$command .= " 2>&1";

+

+		if (!empty($conf->global->MAIN_EXEC_USE_POPEN)) $execmethod = $conf->global->MAIN_EXEC_USE_POPEN;

+		if (empty($execmethod)) $execmethod = 1;

@@ -726 +537,2 @@
-		dol_syslog("Utils::executeCLI execmethod=".$execmethod." command=".$command, LOG_DEBUG);

+

+		dol_syslog("Utils::executeCLI execmethod=".$execmethod." system:".$command, LOG_DEBUG);

@@ -729 +541,2 @@
-		if ($execmethod == 1) {

+		if ($execmethod == 1)

+		{

@@ -733 +546,2 @@
-			if ($retval != 0) {

+			if ($retval != 0)

+			{

@@ -739 +553,2 @@
-		if ($execmethod == 2) {	// With this method, there is no way to get the return code, only output

+		if ($execmethod == 2)	// With this method, there is no way to get the return code, only output

+		{

@@ -741 +556,2 @@
-			if ($handle) {

+			if ($handle)

+			{

@@ -744 +560,2 @@
-				while (!feof($handlein)) {

+				while (!feof($handlein))

+				{

@@ -752 +569 @@
-			dolChmod($outputfile);

+			if (!empty($conf->global->MAIN_UMASK)) @chmod($outputfile, octdec($conf->global->MAIN_UMASK));

@@ -756,2 +573,4 @@
-		if (is_array($output_arr) && count($output_arr) > 0) {

-			foreach ($output_arr as $val) {

+		if (is_array($output_arr) && count($output_arr) > 0)

+		{

+			foreach ($output_arr as $val)

+			{

@@ -771 +590 @@
-	 * @return	int					Return integer <0 if KO, >0 if OK

+	 * @return	int					<0 if KO, >0 if OK

@@ -792 +611,2 @@
-		if (class_exists($class)) {

+		if (class_exists($class))

+		{

@@ -795 +615,3 @@
-			} catch (Exception $e) {

+			}

+			catch (Exception $e)

+			{

@@ -799 +621,3 @@
-		} else {

+		}

+		else

+		{

@@ -807 +631,2 @@
-		if (count($arrayversion)) {

+		if (count($arrayversion))

+		{

@@ -816,8 +641,6 @@
-			if ($dirofmoduledoc) {

-				if (!dol_is_dir($dirofmoduledoc)) {

-					dol_mkdir($dirofmoduledoc);

-				}

-				if (!dol_is_dir($dirofmoduletmp)) {

-					dol_mkdir($dirofmoduletmp);

-				}

-				if (!is_writable($dirofmoduletmp)) {

+			if ($dirofmoduledoc)

+			{

+				if (!dol_is_dir($dirofmoduledoc)) dol_mkdir($dirofmoduledoc);

+				if (!dol_is_dir($dirofmoduletmp)) dol_mkdir($dirofmoduletmp);

+				if (!is_writable($dirofmoduletmp))

+				{

@@ -828,3 +651,4 @@
-				if (!getDolGlobalString('MODULEBUILDER_ASCIIDOCTOR') && !getDolGlobalString('MODULEBUILDER_ASCIIDOCTORPDF')) {

-					$this->error = 'Setup of module ModuleBuilder not complete';

-					return -1;

+				if (empty($conf->global->MODULEBUILDER_ASCIIDOCTOR) && empty($conf->global->MODULEBUILDER_ASCIIDOCTORPDF))

+				{

+				    $this->error = 'Setup of module ModuleBuilder not complete';

+				    return -1;

@@ -849 +673,2 @@
-				if ($fhandle) {

+				if ($fhandle)

+				{

@@ -853,10 +678,5 @@
-					foreach ($specs as $spec) {

-						if (preg_match('/notindoc/', $spec['relativename'])) {

-							continue; // Discard file

-						}

-						if (preg_match('/example/', $spec['relativename'])) {

-							continue; // Discard file

-						}

-						if (preg_match('/disabled/', $spec['relativename'])) {

-							continue; // Discard file

-						}

+					foreach ($specs as $spec)

+					{

+						if (preg_match('/notindoc/', $spec['relativename'])) continue; // Discard file

+						if (preg_match('/example/', $spec['relativename'])) continue; // Discard file

+						if (preg_match('/disabled/', $spec['relativename'])) continue; // Discard file

@@ -866,2 +686,6 @@
-						if (preg_match('/\.md$/i', $spec['name'])) {

-							$format = 'markdown';

+						if (preg_match('/\.md$/i', $spec['name'])) $format = 'markdown';

+

+						$filecursor = @file_get_contents($spec['fullname']);

+						if ($filecursor)

+						{

+							fwrite($fhandle, ($i ? "\n<<<\n\n" : "").$filecursor."\n");

@@ -869,5 +693,2 @@
-

-						$filecursor = @file_get_contents($spec['fullname']);

-						if ($filecursor) {

-							fwrite($fhandle, ($i ? "\n<<<\n\n" : "").$filecursor."\n");

-						} else {

+						else

+						{

@@ -890,17 +711,17 @@
-						'mymodule'=>strtolower($module),

-						'MyModule'=>$module,

-						'MYMODULE'=>strtoupper($module),

-						'My module'=>$module,

-						'my module'=>$module,

-						'Mon module'=>$module,

-						'mon module'=>$module,

-						'htdocs/modulebuilder/template'=>strtolower($module),

-						'__MYCOMPANY_NAME__'=>$mysoc->name,

-						'__KEYWORDS__'=>$module,

-						'__USER_FULLNAME__'=>$user->getFullName($langs),

-						'__USER_EMAIL__'=>$user->email,

-						'__YYYY-MM-DD__'=>dol_print_date($now, 'dayrfc'),

-						'---Put here your own copyright and developer email---'=>dol_print_date($now, 'dayrfc').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : ''),

-						'__DATA_SPECIFICATION__'=>'Not yet available',

-						'__README__'=>dolMd2Asciidoc($contentreadme),

-						'__CHANGELOG__'=>dolMd2Asciidoc($contentchangelog),

+					    'mymodule'=>strtolower($module),

+					    'MyModule'=>$module,

+					    'MYMODULE'=>strtoupper($module),

+					    'My module'=>$module,

+					    'my module'=>$module,

+					    'Mon module'=>$module,

+					    'mon module'=>$module,

+					    'htdocs/modulebuilder/template'=>strtolower($module),

+					    '__MYCOMPANY_NAME__'=>$mysoc->name,

+					    '__KEYWORDS__'=>$module,

+					    '__USER_FULLNAME__'=>$user->getFullName($langs),

+					    '__USER_EMAIL__'=>$user->email,

+					    '__YYYY-MM-DD__'=>dol_print_date($now, 'dayrfc'),

+					    '---Put here your own copyright and developer email---'=>dol_print_date($now, 'dayrfc').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : ''),

+					    '__DATA_SPECIFICATION__'=>'Not yet available',

+					    '__README__'=>dolMd2Asciidoc($contentreadme),

+					    '__CHANGELOG__'=>dolMd2Asciidoc($contentchangelog),

@@ -913,8 +734,8 @@
-				$currentdir = getcwd();

-				chdir($dirofmodule);

-

-				require_once DOL_DOCUMENT_ROOT.'/core/class/utils.class.php';

-				$utils = new Utils($this->db);

-

-				// Build HTML doc

-				$command = getDolGlobalString('MODULEBUILDER_ASCIIDOCTOR') . ' '.$destfile.' -n -o '.$dirofmoduledoc.'/'.$FILENAMEDOC;

+                $currentdir = getcwd();

+                chdir($dirofmodule);

+

+                require_once DOL_DOCUMENT_ROOT.'/core/class/utils.class.php';

+                $utils = new Utils($this->db);

+

+                // Build HTML doc

+				$command = $conf->global->MODULEBUILDER_ASCIIDOCTOR.' '.$destfile.' -n -o '.$dirofmoduledoc.'/'.$FILENAMEDOC;

@@ -924 +745,2 @@
-				if ($resarray['result'] != '0') {

+				if ($resarray['result'] != '0')

+				{

@@ -926 +747,0 @@
-					$this->errors[] = $this->error;

@@ -929,4 +749,0 @@
-				if ($result < 0 && empty($this->errors)) {

-					$this->error = $langs->trans("ErrorFailToGenerateFile", $FILENAMEDOC);

-					$this->errors[] = $this->error;

-				}

@@ -935 +752 @@
-				$command = getDolGlobalString('MODULEBUILDER_ASCIIDOCTORPDF') . ' '.$destfile.' -n -o '.$dirofmoduledoc.'/'.$FILENAMEDOCPDF;

+				$command = $conf->global->MODULEBUILDER_ASCIIDOCTORPDF.' '.$destfile.' -n -o '.$dirofmoduledoc.'/'.$FILENAMEDOCPDF;

@@ -938,3 +755,3 @@
-				if ($resarray['result'] != '0') {

-					$this->error = $resarray['error'].' '.$resarray['output'];

-					$this->errors[] = $this->error;

+				if ($resarray['result'] != '0')

+				{

+				    $this->error = $resarray['error'].' '.$resarray['output'];

@@ -943,4 +759,0 @@
-				if ($result < 0 && empty($this->errors)) {

-					$this->error = $langs->trans("ErrorFailToGenerateFile", $FILENAMEDOCPDF);

-					$this->errors[] = $this->error;

-				}

@@ -949 +762,3 @@
-			} else {

+			}

+			else

+			{

@@ -953 +768,2 @@
-			if ($result > 0) {

+			if ($result > 0)

+			{

@@ -955 +771,3 @@
-			} else {

+			}

+			else

+			{

@@ -957,2 +775,6 @@
-			}

-		} else {

+				$langs->load("errors");

+				$this->error = $langs->trans("ErrorFailToGenerateFile", $outputfiledoc);

+			}

+		}

+		else

+		{

@@ -974,2 +796,2 @@
-	public function compressSyslogs()

-	{

+    public function compressSyslogs()

+    {

@@ -989,3 +811,3 @@
-		$nbSaves = intval(getDolGlobalString('SYSLOG_FILE_SAVES', 10));

-

-		if (!getDolGlobalString('SYSLOG_FILE')) {

+		$nbSaves = empty($conf->global->SYSLOG_FILE_SAVES) ? 10 : intval($conf->global->SYSLOG_FILE_SAVES);

+

+		if (empty($conf->global->SYSLOG_FILE)) {

@@ -1007 +829,2 @@
-			if (dol_is_file($logpath.'/'.$logname) && dol_filesize($logpath.'/'.$logname) > 0) {	// If log file exists and is not empty

+			if (dol_is_file($logpath.'/'.$logname) && dol_filesize($logpath.'/'.$logname) > 0)	// If log file exists and is not empty

+			{

@@ -1062 +885 @@
-					dolChmod($logpath.'/'.$logname.'.1.gz');

+					@chmod($logpath.'/'.$logname.'.1.gz', octdec(empty($conf->global->MAIN_UMASK) ? '0664' : $conf->global->MAIN_UMASK));

@@ -1072 +895 @@
-				dolChmod($logpath.'/'.$logname);

+				@chmod($logpath.'/'.$logname, octdec(empty($conf->global->MAIN_UMASK) ? '0664' : $conf->global->MAIN_UMASK));

@@ -1078 +901 @@
-	}

+    }

@@ -1088 +911 @@
-	 *	@return	int						Return integer <0 if KO, >0 if OK

+	 *	@return	int						<0 if KO, >0 if OK

@@ -1106 +929,2 @@
-		if ($tables == '*') {

+		if ($tables == '*')

+		{

@@ -1109 +933,2 @@
-			while ($row = $db->fetch_row($result)) {

+			while ($row = $db->fetch_row($result))

+			{

@@ -1112 +937,3 @@
-		} else {

+		}

+		else

+		{

@@ -1118 +945,2 @@
-		if (fwrite($handle, '') === false) {

+		if (fwrite($handle, '') === false)

+		{

@@ -1146,3 +974 @@
-		if (GETPOST("nobin_disable_fk")) {

-			$sqlhead .= "SET FOREIGN_KEY_CHECKS=0;\n";

-		}

+		if (GETPOST("nobin_disable_fk")) $sqlhead .= "SET FOREIGN_KEY_CHECKS=0;\n";

@@ -1150,3 +976 @@
-		if (GETPOST("nobin_use_transaction")) {

-			$sqlhead .= "SET AUTOCOMMIT=0;\nSTART TRANSACTION;\n";

-		}

+		if (GETPOST("nobin_use_transaction")) $sqlhead .= "SET AUTOCOMMIT=0;\nSTART TRANSACTION;\n";

@@ -1157,3 +981 @@
-		if (GETPOST("nobin_sql_ignore")) {

-			$ignore = 'IGNORE ';

-		}

+		if (GETPOST("nobin_sql_ignore")) $ignore = 'IGNORE ';

@@ -1161,3 +983 @@
-		if (GETPOST("nobin_delayed")) {

-			$delayed = 'DELAYED ';

-		}

+		if (GETPOST("nobin_delayed")) $delayed = 'DELAYED ';

@@ -1166 +986,2 @@
-		foreach ($tables as $table) {

+		foreach ($tables as $table)

+		{

@@ -1170,3 +991 @@
-			if (GETPOST("nobin_drop")) {

-				fwrite($handle, "DROP TABLE IF EXISTS `".$table."`;\n"); // Dropping table if exists prior to re create it

-			}

+			if (GETPOST("nobin_drop")) fwrite($handle, "DROP TABLE IF EXISTS `".$table."`;\n"); // Dropping table if exists prior to re create it

@@ -1177 +996,2 @@
-			if (empty($row2[1])) {

+			if (empty($row2[1]))

+			{

@@ -1179 +999,3 @@
-			} else {

+			}

+			else

+			{

@@ -1185,10 +1007,5 @@
-				if (!GETPOST("nobin_nolocks")) {

-					fwrite($handle, "LOCK TABLES `".$table."` WRITE;\n"); // Lock the table before inserting data (when the data will be imported back)

-				}

-				if (GETPOST("nobin_disable_fk")) {

-					fwrite($handle, "ALTER TABLE `".$table."` DISABLE KEYS;\n");

-				} else {

-					fwrite($handle, "/*!40000 ALTER TABLE `".$table."` DISABLE KEYS */;\n");

-				}

-

-				$sql = "SELECT * FROM ".$table; // Here SELECT * is allowed because we don't have definition of columns to take

+				if (!GETPOST("nobin_nolocks")) fwrite($handle, "LOCK TABLES `".$table."` WRITE;\n"); // Lock the table before inserting data (when the data will be imported back)

+				if (GETPOST("nobin_disable_fk")) fwrite($handle, "ALTER TABLE `".$table."` DISABLE KEYS;\n");

+				else fwrite($handle, "/*!40000 ALTER TABLE `".$table."` DISABLE KEYS */;\n");

+

+				$sql = 'SELECT * FROM '.$table; // Here SELECT * is allowed because we don't have definition of columns to take

@@ -1196 +1013,2 @@
-				while ($row = $db->fetch_row($result)) {

+				while ($row = $db->fetch_row($result))

+				{

@@ -1198 +1016 @@
-					fwrite($handle, "INSERT ".$delayed.$ignore."INTO ".$table." VALUES (");

+					fwrite($handle, 'INSERT '.$delayed.$ignore.'INTO `'.$table.'` VALUES (');

@@ -1219,6 +1037,2 @@
-				if (GETPOST("nobin_disable_fk")) {

-					fwrite($handle, "ALTER TABLE `".$table."` ENABLE KEYS;\n"); // Enabling back the keys/index checking

-				}

-				if (!GETPOST("nobin_nolocks")) {

-					fwrite($handle, "UNLOCK TABLES;\n"); // Unlocking the table

-				}

+				if (GETPOST("nobin_disable_fk")) fwrite($handle, "ALTER TABLE `".$table."` ENABLE KEYS;\n"); // Enabling back the keys/index checking

+				if (!GETPOST("nobin_nolocks")) fwrite($handle, "UNLOCK TABLES;\n"); // Unlocking the table

@@ -1250,6 +1064,2 @@
-		if (GETPOST("nobin_use_transaction")) {

-			$sqlfooter .= "COMMIT;\n";

-		}

-		if (GETPOST("nobin_disable_fk")) {

-			$sqlfooter .= "SET FOREIGN_KEY_CHECKS=1;\n";

-		}

+		if (GETPOST("nobin_use_transaction")) $sqlfooter .= "COMMIT;\n";

+		if (GETPOST("nobin_disable_fk")) $sqlfooter .= "SET FOREIGN_KEY_CHECKS=1;\n";

@@ -1263,185 +1072,0 @@
-

-	/**

-	 *  Make a send last backup of database or fil in param

-	 *  CAN BE A CRON TASK

-	 *

-	 *	@param 	string	$sendto              Recipients emails

-	 *	@param 	string  $from                Sender email

-	 *	@param 	string	$subject             Topic/Subject of mail

-	 *	@param 	string	$message             Message

-	 *	@param 	string	$filename		     List of files to attach (full path of filename on file system)

-	 * 	@param 	string	$filter			     Filter file send

-	 * 	@param 	string	$sizelimit			 Limit size to send file

-	 *  @return	int						     0 if OK, < 0 if KO (this function is used also by cron so only 0 is OK)

-	 */

-	public function sendBackup($sendto = '', $from = '', $subject = '', $message = '', $filename = '', $filter = '', $sizelimit = 100000000)

-	{

-		global $conf, $langs;

-		global $dolibarr_main_url_root;

-

-		$filepath = '';

-		$output = '';

-		$error = 0;

-

-		if (!empty($from)) {

-			$from = dol_escape_htmltag($from);

-		} elseif (getDolGlobalString('MAIN_INFO_SOCIETE_MAIL')) {

-			$from = dol_escape_htmltag(getDolGlobalString('MAIN_INFO_SOCIETE_MAIL'));

-		} else {

-			$error++;

-		}

-

-		if (!empty($sendto)) {

-			$sendto = dol_escape_htmltag($sendto);

-		} elseif (getDolGlobalString('MAIN_INFO_SOCIETE_MAIL')) {

-			$from = dol_escape_htmltag(getDolGlobalString('MAIN_INFO_SOCIETE_MAIL'));

-		} else {

-			$error++;

-		}

-

-		if (!empty($subject)) {

-			$subject = dol_escape_htmltag($subject);

-		} else {

-			$subject = dol_escape_htmltag($langs->trans('MakeSendLocalDatabaseDumpShort'));

-		}

-

-		if (empty($message)) {

-			$message = dol_escape_htmltag($langs->trans('MakeSendLocalDatabaseDumpShort'));

-		}

-

-		$tmpfiles = array();

-		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

-		if ($filename) {

-			if (dol_is_file($conf->admin->dir_output.'/backup/'.$filename)) {

-				$tmpfiles = dol_most_recent_file($conf->admin->dir_output.'/backup', $filename);

-			}

-		} else {

-			$tmpfiles = dol_most_recent_file($conf->admin->dir_output.'/backup', $filter);

-		}

-		if ($tmpfiles && is_array($tmpfiles)) {

-			foreach ($tmpfiles as $key => $val) {

-				if ($key  == 'fullname') {

-					$filepath = array($val);

-					$filesize = dol_filesize($val);

-				}

-				if ($key  == 'type') {

-					$mimetype = array($val);

-				}

-				if ($key  == 'relativename') {

-					$filename = array($val);

-				}

-			}

-		}

-

-		if ($filepath) {

-			if ($filesize > $sizelimit) {

-				$message .= '<br>'.$langs->trans("BackupIsTooLargeSend");

-				$documenturl =  $dolibarr_main_url_root.'/document.php?modulepart=systemtools&atachement=1&file=backup/'.urlencode($filename[0]);

-				$message .= '<br><a href='.$documenturl.'>Lien de téléchargement</a>';

-				$filepath = '';

-				$mimetype = '';

-				$filename = '';

-			}

-		} else {

-			$output = 'No backup file found';

-			$error++;

-		}

-

-		if (!$error) {

-			include_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';

-			$mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, '', '', 0, -1);

-			if ($mailfile->error) {

-				$error++;

-				$output = $mailfile->error;

-			}

-		}

-

-		if (!$error) {

-			$result = $mailfile->sendfile();

-			if ($result <= 0) {

-				$error++;

-				$output = $mailfile->error;

-			}

-		}

-

-		dol_syslog(__METHOD__, LOG_DEBUG);

-

-		$this->error = $error;

-		$this->output = $output;

-

-		if ($result == true) {

-			return 0;

-		} else {

-			return $result;

-		}

-	}

-

-	/**

-	 *  Clean unfinished cronjob in processing when pid is no longer present in the system

-	 *  CAN BE A CRON TASK

-	 *

-	 * @return    int                               0 if OK, < 0 if KO (this function is used also by cron so only 0 is OK)

-	 * @throws Exception

-	 */

-	public function cleanUnfinishedCronjob()

-	{

-		global $db, $user;

-		dol_syslog("Utils::cleanUnfinishedCronjob Starting cleaning");

-

-		// Import Cronjob class if not present

-		dol_include_once('/cron/class/cronjob.class.php');

-

-		// Get this job object

-		$this_job = new Cronjob($db);

-		$this_job->fetch(-1, 'Utils', 'cleanUnfinishedCronjob');

-		if (empty($this_job->id) || !empty($this_job->error)) {

-			dol_syslog("Utils::cleanUnfinishedCronjob Unable to fetch himself: ".$this_job->error, LOG_ERR);

-			return -1;

-		}

-

-		// Set this job processing to 0 to avoid being locked by his processing state

-		$this_job->processing = 0;

-		if ($this_job->update($user) < 0) {

-			dol_syslog("Utils::cleanUnfinishedCronjob Unable to update himself: ".implode(', ', $this_job->errors), LOG_ERR);

-			return -1;

-		}

-

-		$cron_job = new Cronjob($db);

-		$cron_job->fetchAll('DESC', 't.rowid', 100, 0, 1, '', 1);	// Fetch jobs that are currently running

-

-		// Iterate over all jobs in processing (this can't be this job since his state is set to 0 before)

-		foreach ($cron_job->lines as $job_line) {

-			// Avoid job with no PID

-			if (empty($job_line->pid)) {

-				dol_syslog("Utils::cleanUnfinishedCronjob Cronjob ".$job_line->id." don't have a PID", LOG_DEBUG);

-				continue;

-			}

-

-			$job = new Cronjob($db);

-			$job->fetch($job_line->id);

-			if (empty($job->id) || !empty($job->error)) {

-				dol_syslog("Utils::cleanUnfinishedCronjob Cronjob ".$job_line->id." can't be fetch: ".$job->error, LOG_ERR);

-				continue;

-			}

-

-			// Calling posix_kill with the 0 kill signal will return true if the process is running, false otherwise.

-			if (! posix_kill($job->pid, 0)) {

-				// Clean processing and pid values

-				$job->processing = 0;

-				$job->pid = null;

-

-				// Set last result as an error and add the reason on the last output

-				$job->lastresult = -1;

-				$job->lastoutput = 'Job killed by job cleanUnfinishedCronjob';

-

-				if ($job->update($user) < 0) {

-					dol_syslog("Utils::cleanUnfinishedCronjob Cronjob ".$job_line->id." can't be updated: ".implode(', ', $job->errors), LOG_ERR);

-					continue;

-				}

-				dol_syslog("Utils::cleanUnfinishedCronjob Cronjob ".$job_line->id." cleaned");

-			}

-		}

-

-		dol_syslog("Utils::cleanUnfinishedCronjob Cleaning completed");

-		return 0;

-	}

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_vcard.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_vcard.class.php
@@ -34 +34 @@
-	return str_replace(";", "\;", (dol_quoted_printable_encode($string)));

+    return str_replace(";", "\;", (dol_quoted_printable_encode(utf8_decode($string))));

@@ -48,34 +48,32 @@
-	$hex = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F');

-	$lines = preg_split("/(\?:\r\n|\r|\n)/", $input);

-	$eol = "\r\n";

-	$linebreak = "=0D=0A";

-	$escape = "=";

-	$output = "";

-

-	$num = count($lines);

-	for ($j = 0; $j < $num; $j++) {

-		$line = $lines[$j];

-		$linlen = strlen($line);

-		$newline = "";

-		for ($i = 0; $i < $linlen; $i++) {

-			$c = substr($line, $i, 1);

-			$dec = ord($c);

-			if (($dec == 32) && ($i == ($linlen - 1))) { // convert space at eol only

-				$c = "=20";

-			} elseif (($dec == 61) || ($dec < 32) || ($dec > 126)) { // always encode "\t", which is *not* required

-				$h2 = floor($dec / 16);

-				$h1 = floor($dec % 16);

-				$c = $escape.$hex["$h2"].$hex["$h1"];

-			}

-			if ((strlen($newline) + strlen($c)) >= $line_max) { // CRLF is not counted

-				$output .= $newline.$escape.$eol; // soft line break; " =\r\n" is okay

-				$newline = "    ";

-			}

-			$newline .= $c;

-		} // end of for

-		$output .= $newline;

-		if ($j < count($lines) - 1) {

-			$output .= $linebreak;

-		}

-	}

-	return trim($output);

+    $hex = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F');

+    $lines = preg_split("/(\?:\r\n|\r|\n)/", $input);

+    $eol = "\r\n";

+    $linebreak = "=0D=0A";

+    $escape = "=";

+    $output = "";

+

+    $num = count($lines);

+    for ($j = 0; $j < $num; $j++)

+    {

+        $line = $lines[$j];

+        $linlen = strlen($line);

+        $newline = "";

+        for ($i = 0; $i < $linlen; $i++) {

+            $c = substr($line, $i, 1);

+            $dec = ord($c);

+            if (($dec == 32) && ($i == ($linlen - 1))) { // convert space at eol only

+                $c = "=20";

+            } elseif (($dec == 61) || ($dec < 32) || ($dec > 126)) { // always encode "\t", which is *not* required

+                $h2 = floor($dec / 16); $h1 = floor($dec % 16);

+                $c = $escape.$hex["$h2"].$hex["$h1"];

+            }

+            if ((strlen($newline) + strlen($c)) >= $line_max) { // CRLF is not counted

+                $output .= $newline.$escape.$eol; // soft line break; " =\r\n" is okay

+                $newline = "    ";

+            }

+            $newline .= $c;

+        } // end of for

+        $output .= $newline;

+        if ($j < count($lines) - 1) $output .= $linebreak;

+    }

+    return trim($output);

@@ -90,459 +88,248 @@
-	/**

-	 * @var array array of properties

-	 */

-	public $properties;

-

-	/**

-	 * @var string filename

-	 */

-	public $filename;

-

-	/**

-	 * @var string encoding

-	 */

-	public $encoding = "ENCODING=QUOTED-PRINTABLE";

-

-

-	/**

-	 *  mise en forme du numero de telephone

-	 *

-	 *  @param	int		$number		numero de telephone

-	 *  @param	string	$type		Type ('cell')

-	 *  @return	void

-	 */

-	public function setPhoneNumber($number, $type = "")

-	{

-		// type may be PREF | WORK | HOME | VOICE | FAX | MSG | CELL | PAGER | BBS | CAR | MODEM | ISDN | VIDEO or any senseful combination, e.g. "PREF;WORK;VOICE"

-		$key = "TEL";

-		if ($type != "") {

-			$key .= ";".$type;

-		}

-		$key .= ";VALUE=uri";

-		//$key .= ";".$this->encoding;

-		$this->properties[$key] = 'tel:'.$number;

-	}

-

-	/**

-	 *	mise en forme de la photo

-	 *  warning NON TESTE !

-	 *

-	 *  @param  string  $type			Type 'image/jpeg' or 'JPEG'

-	 *  @param  string  $photo			Photo

-	 *  @return	void

-	 */

-	public function setPhoto($type, $photo)

-	{

-		// $type = "GIF" | "JPEG"

-		//$this->properties["PHOTO;MEDIATYPE=$type;ENCODING=BASE64"] = base64_encode($photo);

-		$this->properties["PHOTO;MEDIATYPE=$type"] = $photo;		// must be url of photo

-		//$this->properties["PHOTO;TYPE=$type;ENCODING=BASE64"] = base64_encode($photo);   // must be content of image

-	}

-

-	/**

-	 *	mise en forme du nom formate

-	 *

-	 *	@param	string	$name			Name

-	 *	@return	void

-	 */

-	public function setFormattedName($name)

-	{

-		$this->properties["FN;".$this->encoding] = encode($name);

-	}

-

-	/**

-	 *	mise en forme du nom complet

-	 *

-	 *	@param	string	$family			Family name

-	 *	@param	string	$first			First name

-	 *	@param	string	$additional		Additional (e.g. second name, nick name)

-	 *	@param	string	$prefix			Title prefix (e.g. "Mr.", "Ms.", "Prof.")

-	 *	@param	string	$suffix			Suffix (e.g. "sen." for senior, "jun." for junior)

-	 *	@return	void

-	 */

-	public function setName($family = "", $first = "", $additional = "", $prefix = "", $suffix = "")

-	{

-		//$this->properties["N;".$this->encoding] = encode($family).";".encode($first).";".encode($additional).";".encode($prefix).";".encode($suffix);

-		$this->properties["N"] = encode($family).";".encode($first).";".encode($additional).";".encode($prefix).";".encode($suffix);

-		$this->filename = "$first%20$family.vcf";

-		if (empty($this->properties["FN"])) {

-			$this->setFormattedName(trim("$prefix $first $additional $family $suffix"));

-		}

-	}

-

-	/**

-	 *	mise en forme de l'anniversaire

-	 *

-	 *	@param	integer	  $date		Date

-	 *	@return	void

-	 */

-	public function setBirthday($date)

-	{

-		// $date format is YYYY-MM-DD - RFC 2425 and RFC 2426 for vcard v3

-		// $date format is YYYYMMDD or ISO8601 for vcard v4

-		$this->properties["BDAY"] = dol_print_date($date, 'dayxcard');

-	}

-

-	/**

-	 *	Address

-	 *

-	 *	@param	string	$postoffice		Postoffice

-	 *	@param	string	$extended		Extended

-	 *	@param	string	$street			Street

-	 *	@param	string	$city			City

-	 *	@param	string	$region			Region

-	 *	@param	string	$zip			Zip

-	 *	@param	string	$country		Country

-	 *	@param	string	$type			Type

-	 *  @param	string	$label			Label

-	 *	@return	void

-	 */

-	public function setAddress($postoffice = "", $extended = "", $street = "", $city = "", $region = "", $zip = "", $country = "", $type = "", $label = "")

-	{

-		// $type may be DOM | INTL | POSTAL | PARCEL | HOME | WORK or any combination of these: e.g. "WORK;PARCEL;POSTAL"

-		$key = "ADR";

-		if ($type != "") {

-			$key .= ";".$type;

-		}

-		if ($label != "") {

-			$key .= ';LABEL="'.encode($label).'"';

-		}

-		$key .= ";".$this->encoding;

-		$this->properties[$key] = encode($postoffice).";".encode($extended).";".encode($street).";".encode($city).";".encode($region).";".encode($zip).";".encode($country);

-

-		//if ($this->properties["LABEL;".$type.";".$this->encoding] == '') {

-			//$this->setLabel($postoffice, $extended, $street, $city, $region, $zip, $country, $type);

-		//}

-	}

-

-	/**

-	 *  Address (old standard)

-	 *

-	 *  @param	string	$postoffice		Postoffice

-	 *  @param	string	$extended		Extended

-	 *  @param	string	$street			Street

-	 *  @param	string	$city			City

-	 *  @param	string	$region			Region

-	 *  @param	string	$zip			Zip

-	 *  @param	string	$country		Country

-	 *  @param	string	$type			Type

-	 *  @return	void

-	 *  @deprecated

-	 */

-	public function setLabel($postoffice = "", $extended = "", $street = "", $city = "", $region = "", $zip = "", $country = "", $type = "HOME")

-	{

-		$label = "";

-		if ($postoffice != "") {

-			$label .= "$postoffice\r\n";

-		}

-		if ($extended != "") {

-			$label .= "$extended\r\n";

-		}

-		if ($street != "") {

-			$label .= "$street\r\n";

-		}

-		if ($zip != "") {

-			$label .= "$zip ";

-		}

-		if ($city != "") {

-			$label .= "$city\r\n";

-		}

-		if ($region != "") {

-			$label .= "$region\r\n";

-		}

-		if ($country != "") {

-			$country .= "$country\r\n";

-		}

-

-		$this->properties["LABEL;$type;".$this->encoding] = encode($label);

-	}

-

-	/**

-	 *	Add a e-mail address to this vCard

-	 *

-	 *	@param	string	$address		E-mail address

-	 *	@param	string	$type			(optional) The type of the e-mail (typical "PREF" or "INTERNET")

-	 *	@return	void

-	 */

-	public function setEmail($address, $type = "")

-	{

-		$key = "EMAIL";

-		if ($type == "PREF") {

-			$key .= ";PREF=1";

-		} elseif (!empty($type)) {

-			$key .= ";TYPE=".dol_strtolower($type);

-		}

-		$this->properties[$key] = $address;

-	}

-

-	/**

-	 *	mise en forme de la note

-	 *

-	 *	@param	string	$note		Note

-	 *	@return	void

-	 */

-	public function setNote($note)

-	{

-		$this->properties["NOTE;".$this->encoding] = encode($note);

-	}

-

-	/**

-	 * 	mise en forme de la fonction

-	 *

-	 *	@param	string	$title		Title

-	 *	@return	void

-	 */

-	public function setTitle($title)

-	{

-		$this->properties["TITLE;".$this->encoding] = encode($title);

-	}

-

-

-	/**

-	 *  mise en forme de la societe

-	 *

-	 *  @param	string	$org		Org

-	 *  @return	void

-	 */

-	public function setOrg($org)

-	{

-		$this->properties["ORG;".$this->encoding] = encode($org);

-	}

-

-

-	/**

-	 * 	mise en forme du logiciel generateur

-	 *

-	 *  @param	string	$prodid		Prodid

-	 *	@return	void

-	 */

-	public function setProdId($prodid)

-	{

-		$this->properties["PRODID"] = encode($prodid);

-	}

-

-

-	/**

-	 * 	mise en forme du logiciel generateur

-	 *

-	 *  @param	string	$uid	Uid

-	 *	@return	void

-	 */

-	public function setUID($uid)

-	{

-		$this->properties["UID"] = encode($uid);

-	}

-

-

-	/**

-	 *  mise en forme de l'url

-	 *

-	 *	@param	string	$url		URL

-	 *  @param	string	$type		Type

-	 *	@return	void

-	 */

-	public function setURL($url, $type = "")

-	{

-		// $type may be WORK | HOME

-		$key = "URL";

-		if ($type != "") {

-			$key .= ";$type";

-		}

-		$this->properties[$key] = $url;

-	}

-

-	/**

-	 *  permet d'obtenir une vcard

-	 *

-	 *  @return	string

-	 */

-	public function getVCard()

-	{

-		$text = "BEGIN:VCARD\r\n";

-		$text .= "VERSION:4.0\r\n";		// With V4, all encoding are UTF-8

-		//$text.= "VERSION:2.1\r\n";

-		foreach ($this->properties as $key => $value) {

-			$newkey = preg_replace('/-.*$/', '', $key);	// remove suffix -twitter, -facebook, ...

-			$text .= $newkey.":".$value."\r\n";

-		}

-		$text .= "REV:".date("Ymd")."T".date("His")."Z\r\n";

-		//$text .= "MAILER: Dolibarr\r\n";

-		$text .= "END:VCARD\r\n";

-		return $text;

-	}

-

-	/**

-	 *  permet d'obtenir le nom de fichier

-	 *

-	 *  @return	string		Filename

-	 */

-	public function getFileName()

-	{

-		return $this->filename;

-	}

-

-	/**

-	 * Return a VCARD string

-	 * See RFC https://datatracker.ietf.org/doc/html/rfc6350

-	 *

-	 * @param	Object			$object		Object (User or Contact)

-	 * @param	Societe|null	$company	Company. May be null

-	 * @param	Translate		$langs		Lang object

-	 * @param	string			$urlphoto	Full public URL of photo

-	 * @return	string						String

-	 */

-	public function buildVCardString($object, $company, $langs, $urlphoto = '')

-	{

-		global $dolibarr_main_instance_unique_id;

-

-		$this->setProdId('Dolibarr '.DOL_VERSION);

-

-		$this->setUid('DOLIBARR-USERID-'.dol_trunc(md5('vcard'.$dolibarr_main_instance_unique_id), 8, 'right', 'UTF-8', 1).'-'.$object->id);

-		$this->setName($object->lastname, $object->firstname, "", $object->civility_code, "");

-		$this->setFormattedName($object->getFullName($langs, 1));

-

-		if ($urlphoto) {

-			$mimetype = dol_mimetype($urlphoto);

-			if ($mimetype) {

-				$this->setPhoto($mimetype, $urlphoto);

-			}

-		}

-

-		if ($object->office_phone) {

-			$this->setPhoneNumber($object->office_phone, "TYPE=WORK,VOICE");

-		}

-		/* disabled

-		if ($object->personal_mobile) {

-			$this->setPhoneNumber($object->personal_mobile, "TYPE=CELL,VOICE");

-		}*/

-		if ($object->user_mobile) {

-			$this->setPhoneNumber($object->user_mobile, "TYPE=CELL,VOICE");

-		}

-		if ($object->office_fax) {

-			$this->setPhoneNumber($object->office_fax, "TYPE=WORK,FAX");

-		}

-

-		if (!empty($object->socialnetworks)) {

-			foreach ($object->socialnetworks as $key => $val) {

-				if (empty($val)) {	// Disacard social network if empty

-					continue;

-				}

-				$urlsn = '';

-				if ($key == 'linkedin') {

-					if (!preg_match('/^http/', $val)) {

-						$urlsn = 'https://www.'.$key.'.com/company/'.urlencode($val);

-					} else {

-						$urlsn = $val;

-					}

-				} elseif ($key == 'youtube') {

-					if (!preg_match('/^http/', $val)) {

-						$urlsn = 'https://www.'.$key.'.com/user/'.urlencode($val);

-					} else {

-						$urlsn = $val;

-					}

-				} else {

-					if (!preg_match('/^http/', $val)) {

-						$urlsn = 'https://www.'.$key.'.com/'.urlencode($val);

-					} else {

-						$urlsn = $val;

-					}

-				}

-				if ($urlsn) {

-					$this->properties["SOCIALPROFILE;TYPE=WORK-".$key] = $key.':'.$urlsn;

-				}

-			}

-		}

-

-		$country = $object->country_code ? $object->country : '';

-

-		// User address

-		if (!($object->element != 'user') || getDolUserInt('USER_PUBLIC_SHOW_ADDRESS', 0, $object)) {

-			if ($object->address || $object->town || $object->state || $object->zip || $object->country) {

-				$this->setAddress("", "", $object->address, $object->town, $object->state, $object->zip, $country, "");

-				//$this->setLabel("", "", $object->address, $object->town, $object->state, $object->zip, $country, "TYPE=HOME");

-			}

-		}

-

-		if ($object->email) {

-			$this->setEmail($object->email, "TYPE=WORK");

-		}

-		/* disabled

-		if ($object->personal_email) {

-			$this->setEmail($object->personal_email, "TYPE=HOME");

-		} */

-		if ($object->note_public) {

-			$this->setNote($object->note_public);

-		}

-		if ($object->job) {

-			$this->setTitle($object->job);

-		}

-

-		// For user, $object->url is not defined

-		// For contact, $object->url is not defined

-		if (!empty($object->url)) {

-			$this->setURL($object->url, "");

-		}

-

-		if (is_object($company)) {

-			// Si user linked to a thirdparty and not a physical people

-			if ($company->typent_code != 'TE_PRIVATE') {

-				$this->setOrg($company->name);

-			}

-

-			$this->setURL($company->url, "");

-

-			if ($company->phone && $company->phone != $object->office_phone) {

-				$this->setPhoneNumber($company->phone, "TYPE=WORK,VOICE");

-			}

-			if ($company->fax && $company->fax != $object->office_fax) {

-				$this->setPhoneNumber($company->fax, "TYPE=WORK,FAX");

-			}

-			if ($company->address || $company->town || $company->state || $company->zip || $company->country) {

-				$this->setAddress("", "", $company->address, $company->town, $company->state, $company->zip, $company->country, "TYPE=WORK");

-			}

-

-			if ($company->email && $company->email != $object->email) {

-				$this->setEmail($company->email, "TYPE=WORK");

-			}

-

-			/*

-			if (!empty($company->socialnetworks)) {

-				foreach ($company->socialnetworks as $key => $val) {

-					$urlsn = '';

-					if ($key == 'linkedin') {

-						if (!preg_match('/^http/', $val)) {

-							$urlsn = 'https://www.'.$key.'.com/company/'.urlencode($val);

-						} else {

-							$urlsn = $val;

-						}

-					} elseif ($key == 'youtube') {

-						if (!preg_match('/^http/', $val)) {

-							$urlsn = 'https://www.'.$key.'.com/user/'.urlencode($val);

-						} else {

-							$urlsn = $val;

-						}

-					} else {

-						if (!preg_match('/^http/', $val)) {

-							$urlsn = 'https://www.'.$key.'.com/'.urlencode($val);

-						} else {

-							$urlsn = $val;

-						}

-					}

-					if ($urlsn) {

-						$this->properties["socialProfile;type=".$key] = $urlsn;

-					}

-				}

-			}

-			*/

-		}

-

-		// Birthday

-		if (!($object->element != 'user') || getDolUserInt('USER_PUBLIC_SHOW_BIRTH', 0, $object)) {

-			if ($object->birth) {

-				$this->setBirthday($object->birth);

-			}

-		}

-

-		// Return VCard string

-		return $this->getVCard();

-	}

-

+    public $properties;

+    public $filename;

+

+    //var $encoding="UTF-8";

+    public $encoding = "ISO-8859-1;ENCODING=QUOTED-PRINTABLE";

+

+

+    /**

+     *  mise en forme du numero de telephone

+     *

+     *  @param	int		$number		numero de telephone

+     *  @param	string	$type		Type

+     *  @return	void

+     */

+    public function setPhoneNumber($number, $type = "")

+    {

+        // type may be PREF | WORK | HOME | VOICE | FAX | MSG | CELL | PAGER | BBS | CAR | MODEM | ISDN | VIDEO or any senseful combination, e.g. "PREF;WORK;VOICE"

+        $key = "TEL";

+        if ($type != "") $key .= ";".$type;

+        $key .= ";CHARSET=".$this->encoding;

+        $this->properties[$key] = encode($number);

+    }

+

+    /**

+     *	mise en forme de la photo

+     *  warning NON TESTE !

+     *

+     *  @param  string  $type			Type

+     *  @param  string  $photo			Photo

+     *  @return	void

+     */

+    public function setPhoto($type, $photo)

+    {

+        // $type = "GIF" | "JPEG"

+        $this->properties["PHOTO;TYPE=$type;ENCODING=BASE64"] = base64_encode($photo);

+    }

+

+    /**

+     *	mise en forme du nom formate

+     *

+     *	@param	string	$name			Name

+     *	@return	void

+     */

+    public function setFormattedName($name)

+    {

+        $this->properties["FN;CHARSET=".$this->encoding] = encode($name);

+    }

+

+    /**

+     *	mise en forme du nom complet

+     *

+     *	@param	string	$family			Family name

+     *	@param	string	$first			First name

+     *	@param	string	$additional		Additional (e.g. second name, nick name)

+     *	@param	string	$prefix			Prefix (e.g. "Mr.", "Ms.", "Prof.")

+     *	@param	string	$suffix			Suffix (e.g. "sen." for senior, "jun." for junior)

+     *	@return	void

+     */

+    public function setName($family = "", $first = "", $additional = "", $prefix = "", $suffix = "")

+    {

+        $this->properties["N;CHARSET=".$this->encoding] = encode($family).";".encode($first).";".encode($additional).";".encode($prefix).";".encode($suffix);

+        $this->filename = "$first%20$family.vcf";

+        if (empty($this->properties["FN"])) $this->setFormattedName(trim("$prefix $first $additional $family $suffix"));

+    }

+

+    /**

+     *	mise en forme de l'anniversaire

+     *

+     *	@param	integer	  $date		Date

+     *	@return	void

+     */

+    public function setBirthday($date)

+    {

+        // $date format is YYYY-MM-DD - RFC 2425 and RFC 2426

+        $this->properties["BDAY"] = dol_print_date($date, 'dayrfc');

+    }

+

+    /**

+     *	mise en forme de l'adresse

+     *

+     *	@param	string	$postoffice		Postoffice

+     *	@param	string	$extended		Extended

+     *	@param	string	$street			Street

+     *	@param	string	$city			City

+     *	@param	string	$region			Region

+     *	@param	string	$zip			Zip

+     *	@param	string	$country		Country

+     *	@param	string	$type			Type

+     *	@return	void

+     */

+    public function setAddress($postoffice = "", $extended = "", $street = "", $city = "", $region = "", $zip = "", $country = "", $type = "HOME;POSTAL")

+    {

+        // $type may be DOM | INTL | POSTAL | PARCEL | HOME | WORK or any combination of these: e.g. "WORK;PARCEL;POSTAL"

+        $key = "ADR";

+        if ($type != "") $key .= ";$type";

+        $key .= ";CHARSET=".$this->encoding;

+        $this->properties[$key] = ";".encode($extended).";".encode($street).";".encode($city).";".encode($region).";".encode($zip).";".encode($country);

+

+        if ($this->properties["LABEL;$type;CHARSET=".$this->encoding] == "")

+        {

+            //$this->setLabel($postoffice, $extended, $street, $city, $region, $zip, $country, $type);

+        }

+    }

+

+    /**

+     *  mise en forme du label

+     *

+     *  @param	string	$postoffice		Postoffice

+     *  @param	string	$extended		Extended

+     *  @param	string	$street			Street

+     *  @param	string	$city			City

+     *  @param	string	$region			Region

+     *  @param	string	$zip			Zip

+     *  @param	string	$country		Country

+     *  @param	string	$type			Type

+     *  @return	void

+     */

+    public function setLabel($postoffice = "", $extended = "", $street = "", $city = "", $region = "", $zip = "", $country = "", $type = "HOME;POSTAL")

+    {

+        $label = "";

+        if ($postoffice != "") $label .= "$postoffice\r\n";

+        if ($extended != "") $label .= "$extended\r\n";

+        if ($street != "") $label .= "$street\r\n";

+        if ($zip != "") $label .= "$zip ";

+        if ($city != "") $label .= "$city\r\n";

+        if ($region != "") $label .= "$region\r\n";

+        if ($country != "") $country .= "$country\r\n";

+

+        $this->properties["LABEL;$type;CHARSET=".$this->encoding] = encode($label);

+    }

+

+    /**

+     *	Add a e-mail address to this vCard

+     *

+     *	@param	string	$address		E-mail address

+     *	@param	string	$type			(optional) The type of the e-mail (typical "PREF;INTERNET" or "INTERNET")

+     *	@return	void

+     */

+    public function setEmail($address, $type = "TYPE=INTERNET;PREF")

+    {

+        $key = "EMAIL";

+        if ($type != "") $key .= ";".$type;

+        $this->properties[$key] = $address;

+    }

+

+    /**

+     *	mise en forme de la note

+     *

+     *	@param	string	$note		Note

+     *	@return	void

+     */

+    public function setNote($note)

+    {

+        $this->properties["NOTE;CHARSET=".$this->encoding] = encode($note);

+    }

+

+    /**

+     * 	mise en forme de la fonction

+     *

+     *	@param	string	$title		Title

+     *	@return	void

+     */

+    public function setTitle($title)

+    {

+        $this->properties["TITLE;CHARSET=".$this->encoding] = encode($title);

+    }

+

+

+    /**

+     *  mise en forme de la societe

+     *

+     *  @param	string	$org		Org

+     *  @return	void

+     */

+    public function setOrg($org)

+    {

+        $this->properties["ORG;CHARSET=".$this->encoding] = encode($org);

+    }

+

+

+    /**

+     * 	mise en forme du logiciel generateur

+     *

+     *  @param	string	$prodid		Prodid

+     *	@return	void

+     */

+    public function setProdId($prodid)

+    {

+        $this->properties["PRODID;CHARSET=".$this->encoding] = encode($prodid);

+    }

+

+

+    /**

+     * 	mise en forme du logiciel generateur

+     *

+     *  @param	string	$uid	Uid

+     *	@return	void

+     */

+    public function setUID($uid)

+    {

+        $this->properties["UID;CHARSET=".$this->encoding] = encode($uid);

+    }

+

+

+    /**

+     *  mise en forme de l'url

+     *

+     *	@param	string	$url		URL

+     *  @param	string	$type		Type

+     *	@return	void

+     */

+    public function setURL($url, $type = "")

+    {

+        // $type may be WORK | HOME

+        $key = "URL";

+        if ($type != "") $key .= ";$type";

+        $this->properties[$key] = $url;

+    }

+

+    /**

+     *  permet d'obtenir une vcard

+     *

+     *  @return	string

+     */

+    public function getVCard()

+    {

+        $text = "BEGIN:VCARD\r\n";

+        $text .= "VERSION:3.0\r\n";

+        //$text.= "VERSION:2.1\r\n";

+        foreach ($this->properties as $key => $value)

+        {

+            $text .= "$key:$value\r\n";

+        }

+        $text .= "REV:".date("Y-m-d")."T".date("H:i:s")."Z\r\n";

+        $text .= "MAILER: Dolibarr\r\n";

+        $text .= "END:VCARD\r\n";

+        return $text;

+    }

+

+    /**

+     *  permet d'obtenir le nom de fichier

+     *

+     *  @return	string		Filename

+     */

+    public function getFileName()

+    {

+        return $this->filename;

+    }

@@ -552,25 +339,25 @@
-	BEGIN:VCARD

-	VERSION:2.1

-

-	N;LANGUAGE=de:surename;forename;secondname;Sir;jun.

-	FN:Sir surename secondname forename jun.

-	ORG:Companyname

-	TITLE:position

-	TEL;WORK;VOICE:work-phone-number

-	TEL;HOME;VOICE:private-phone-number

-	TEL;CELL;VOICE:mobile-phone-number

-	TEL;WORK;FAX:fax-phone-number

-	ADR;WORK;PREF:;;street and number;town;region;012345;Deutschland

-	LABEL;WORK;PREF;ENCODING=QUOTED-PRINTABLE:street and number=0D=0A=

-	=0D=0A=

-	012345  town  region

-	X-MS-OL-DEFAULT-POSTAL-ADDRESS:2

-	URL;WORK:www.mywebpage.de

-	EMAIL;PREF;INTERNET:test1@test1.de

-	EMAIL;INTERNET:test2@test2.de

-	EMAIL;INTERNET:test3@test3.de

-	X-MS-IMADDRESS:test@jabber.org

-	REV:20200424T104242Z

-

-	END:VCARD

-	*/

+    BEGIN:VCARD

+    VERSION:2.1

+

+    N;LANGUAGE=de:surename;forename;secondname;Sir;jun.

+    FN:Sir surename secondname forename jun.

+    ORG:Companyname

+    TITLE:position

+    TEL;WORK;VOICE:work-phone-number

+    TEL;HOME;VOICE:private-phone-number

+    TEL;CELL;VOICE:mobile-phone-number

+    TEL;WORK;FAX:fax-phone-number

+    ADR;WORK;PREF:;;street and number;town;region;012345;Deutschland

+    LABEL;WORK;PREF;ENCODING=QUOTED-PRINTABLE:street and number=0D=0A=

+    =0D=0A=

+    012345  town  region

+    X-MS-OL-DEFAULT-POSTAL-ADDRESS:2

+    URL;WORK:www.mywebpage.de

+    EMAIL;PREF;INTERNET:test1@test1.de

+    EMAIL;INTERNET:test2@test2.de

+    EMAIL;INTERNET:test3@test3.de

+    X-MS-IMADDRESS:test@jabber.org

+    REV:20200424T104242Z

+

+    END:VCARD

+    */

--- /tmp/dsg/dolibarr/htdocs/core/class/github_19.0.3_workboardresponse.class.php
+++ /tmp/dsg/dolibarr/htdocs/core/class/client_workboardresponse.class.php
@@ -1,0 +2 @@
+

@@ -26,5 +26,0 @@
-	/**

-	 * Unique key of the workboard

-	 * @var string

-	 */

-	public $id;