Dolibarr / dolibarr

htdocs/emailcollector/class/emailcollector.class.php

Spacing +69 added lines, -69 removed lines

@@ -24,25 +24,25 @@ 
  */
 
 // Put here all includes required by your class file
-include_once DOL_DOCUMENT_ROOT .'/emailcollector/lib/emailcollector.lib.php';
-
-require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
-require_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php';
-require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
-
-require_once DOL_DOCUMENT_ROOT .'/comm/propal/class/propal.class.php';                   // Customer Proposal
-require_once DOL_DOCUMENT_ROOT .'/commande/class/commande.class.php';                    // Sale Order
-require_once DOL_DOCUMENT_ROOT .'/compta/facture/class/facture.class.php';               // Customer Invoice
-require_once DOL_DOCUMENT_ROOT .'/contact/class/contact.class.php';                      // Contact / Address
-require_once DOL_DOCUMENT_ROOT .'/expedition/class/expedition.class.php';                // Shipping / Delivery
-require_once DOL_DOCUMENT_ROOT .'/fourn/class/fournisseur.commande.class.php';           // Purchase Order
-require_once DOL_DOCUMENT_ROOT .'/fourn/class/fournisseur.facture.class.php';            // Purchase Invoice
-require_once DOL_DOCUMENT_ROOT .'/projet/class/project.class.php';                       // Project
-require_once DOL_DOCUMENT_ROOT .'/reception/class/reception.class.php';                  // Reception
-require_once DOL_DOCUMENT_ROOT .'/recruitment/class/recruitmentcandidature.class.php';   // Recruiting
-require_once DOL_DOCUMENT_ROOT .'/societe/class/societe.class.php';                      // Third-Party
-require_once DOL_DOCUMENT_ROOT .'/supplier_proposal/class/supplier_proposal.class.php';  // Supplier Proposal
-require_once DOL_DOCUMENT_ROOT .'/ticket/class/ticket.class.php';                        // Ticket
+include_once DOL_DOCUMENT_ROOT.'/emailcollector/lib/emailcollector.lib.php';
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+
+require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; // Customer Proposal
+require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; // Sale Order
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; // Customer Invoice
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; // Contact / Address
+require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php'; // Shipping / Delivery
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'; // Purchase Order
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; // Purchase Invoice
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; // Project
+require_once DOL_DOCUMENT_ROOT.'/reception/class/reception.class.php'; // Reception
+require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentcandidature.class.php'; // Recruiting
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; // Third-Party
+require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php'; // Supplier Proposal
+require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php'; // Ticket
 //require_once DOL_DOCUMENT_ROOT .'/expensereport/class/expensereport.class.php';        // Expense Report
 //require_once DOL_DOCUMENT_ROOT .'/holiday/class/holiday.class.php';                    // Holidays (leave request)
 
@@ -827,7 +827,7 @@ 
 		} elseif (empty($this->imap_encryption) || ($this->imap_encryption == 'ssl' && getDolGlobalString('IMAP_FORCE_NOSSL'))) {
 			$flags .= '';
 		} else {
-			$flags .= '/' . $this->imap_encryption;
+			$flags .= '/'.$this->imap_encryption;
 		}
 
 		$flags .= '/novalidate-cert';
@@ -857,9 +857,9 @@ 
 	{
 		if (function_exists('mb_convert_encoding')) {
 			// change spaces by entropy because mb_convert fail with spaces
-			$str = preg_replace("/ /", "xxxSPACExxx", $str);		// the replacement string must be valid in utf7 so _ can't be used
+			$str = preg_replace("/ /", "xxxSPACExxx", $str); // the replacement string must be valid in utf7 so _ can't be used
 			$str = preg_replace("/_/", "xxxUNDERSCORExxx", $str); // encode underscore to avoid encoding issues with mb_convert
-			$str = preg_replace("/\[Gmail\]/", "xxxGMAILxxx", $str);	// the replacement string must be valid in utf7 so _ can't be used
+			$str = preg_replace("/\[Gmail\]/", "xxxGMAILxxx", $str); // the replacement string must be valid in utf7 so _ can't be used
 			// if mb_convert work
 			if ($str = mb_convert_encoding($str, "UTF-7")) {
 				// change characters
@@ -1483,7 +1483,7 @@ 
 				}
 				if ($fromdate > 0) {
 					// $search .= ($search ? ' ' : '').'SINCE '.date('j-M-Y', $fromdate - 1); // SENTSINCE not supported. Date must be X-Abc-9999 (X on 1 digit if < 10)
-					array_push($criteria, array("SINCE" => date('j-M-Y', $fromdate - 1)));	// -1 is to add a security to no forgot some email
+					array_push($criteria, array("SINCE" => date('j-M-Y', $fromdate - 1))); // -1 is to add a security to no forgot some email
 				}
 				//$search.=($search?' ':'').'SINCE 8-Apr-2022';
 			}
@@ -1510,7 +1510,7 @@ 
 				}
 
 				if ($rule['type'] == 'from') {
-					$tmprulevaluearray = explode('*', $rule['rulevalue']);	// Search on abc*def means searching on 'abc' and on 'def'
+					$tmprulevaluearray = explode('*', $rule['rulevalue']); // Search on abc*def means searching on 'abc' and on 'def'
 					if (count($tmprulevaluearray) >= 2) {
 						foreach ($tmprulevaluearray as $tmprulevalue) {
 							$search .= ($search ? ' ' : '').$not.'FROM "'.str_replace('"', '', $tmprulevalue).'"';
@@ -1520,7 +1520,7 @@ 
 					}
 				}
 				if ($rule['type'] == 'to') {
-					$tmprulevaluearray = explode('*', $rule['rulevalue']);	// Search on abc*def means searching on 'abc' and on 'def'
+					$tmprulevaluearray = explode('*', $rule['rulevalue']); // Search on abc*def means searching on 'abc' and on 'def'
 					if (count($tmprulevaluearray) >= 2) {
 						foreach ($tmprulevaluearray as $tmprulevalue) {
 							$search .= ($search ? ' ' : '').$not.'TO "'.str_replace('"', '', $tmprulevalue).'"';
@@ -1648,7 +1648,7 @@ 
 					$tmpsourcedir = $this->getEncodedUtf7($sourcedir);
 				}
 
-				$f = $client->getFolders(false, $tmpsourcedir);	// Note the search of directory do a search on sourcedir*
+				$f = $client->getFolders(false, $tmpsourcedir); // Note the search of directory do a search on sourcedir*
 				if ($f) {
 					$folder = $f[0];
 					if ($folder instanceof Webklex\PHPIMAP\Folder) {
@@ -1685,7 +1685,7 @@ 
 					$Query->leaveUnread();
 				}
 				$arrayofemail = $Query->limit($this->maxemailpercollect)->setFetchOrder("asc")->get();
-				dol_syslog("EmailCollector::doCollectOneCollector nb arrayofemail ".(is_array($arrayofemail) ? count($arrayofemail) : 'Not array'));	// @phpstan-ignore-line
+				dol_syslog("EmailCollector::doCollectOneCollector nb arrayofemail ".(is_array($arrayofemail) ? count($arrayofemail) : 'Not array')); // @phpstan-ignore-line
 			} catch (Exception $e) {
 				$this->error = $e->getMessage();
 				$this->errors[] = $this->error;
@@ -1707,7 +1707,7 @@ 
 			}
 		}
 
-		$arrayofemailtodelete = array();	// Track email to delete to make the deletion at end.
+		$arrayofemailtodelete = array(); // Track email to delete to make the deletion at end.
 
 		// Loop on each email found
 		if (!$error && !empty($arrayofemail) && count($arrayofemail) > 0 && $connection !== false) {
@@ -1739,7 +1739,7 @@ 
 				// GET header and overview datas
 				if (getDolGlobalString('MAIN_IMAP_USE_PHPIMAP')) {
 					'@phan-var-force Webklex\PHPIMAP\Message $imapemail';
-					$header = $imapemail->getHeader()->raw;  // @phan-suppress-current-line PhanPluginUnknownObjectMethodCall  // @phan-suppress-current-line PhanPluginUnknownObjectMethodCall
+					$header = $imapemail->getHeader()->raw; // @phan-suppress-current-line PhanPluginUnknownObjectMethodCall  // @phan-suppress-current-line PhanPluginUnknownObjectMethodCall
 					$overview = $imapemail->getAttributes();
 				} else {
 					$header = imap_fetchheader($connection, $imapemail, FT_UID);
@@ -1934,7 +1934,7 @@ 
 
 
 				if (getDolGlobalString('MAIN_IMAP_USE_PHPIMAP')) {
-					$dateformated = dol_print_date($overview['date'], 'dayrfc', 'gmt');		// May generate a warning "dol_print_date($overview['date'], 'dayrfc', 'gmt')" in log
+					$dateformated = dol_print_date($overview['date'], 'dayrfc', 'gmt'); // May generate a warning "dol_print_date($overview['date'], 'dayrfc', 'gmt')" in log
 					dol_syslog("msgid=".$overview['message_id']." date=".$dateformated." from=".$overview['from']." to=".$overview['to']." subject=".$overview['subject']);
 
 					// Removed emojis
@@ -1967,7 +1967,7 @@ 
 						$attachments = [];
 					}
 				} else {
-					$this->getmsg($connection, $imapemail);	// This set global var $charset, $htmlmsg, $plainmsg, $attachments
+					$this->getmsg($connection, $imapemail); // This set global var $charset, $htmlmsg, $plainmsg, $attachments
 				}
 				'@phan-var-force Webklex\PHPIMAP\Attachment[] $attachments';
 				/** @var Webklex\PHPIMAP\Attachment[] $attachments */
@@ -2042,10 +2042,10 @@ 
 					$sendtocc = empty($overview['cc']) ? '' : $overview['cc'];
 					$sendtobcc = empty($overview['bcc']) ? '' : $overview['bcc'];
 
-					$tmpdate = $overview['date']->toDate();  // @phan-suppress-current-line PhanPluginUnknownObjectMethodCall
-					$tmptimezone = $tmpdate->getTimezone()->getName();  // @phan-suppress-current-line PhanPluginUnknownObjectMethodCall
+					$tmpdate = $overview['date']->toDate(); // @phan-suppress-current-line PhanPluginUnknownObjectMethodCall
+					$tmptimezone = $tmpdate->getTimezone()->getName(); // @phan-suppress-current-line PhanPluginUnknownObjectMethodCall
 
-					$dateemail = dol_stringtotime((string) $overview['date'], 'gmt');    // if $overview['timezone'] is "+00:00"
+					$dateemail = dol_stringtotime((string) $overview['date'], 'gmt'); // if $overview['timezone'] is "+00:00"
 					if (preg_match('/^([+\-])(\d\d):(\d\d)/', $tmptimezone, $reg)) {
 						if ($reg[1] == '+' && ($reg[2] != '00' || $reg[3] != '00')) {
 							$dateemail -= (3600 * (int) $reg[2]);
@@ -2059,7 +2059,7 @@ 
 					$subject = $overview['subject'];
 				} else {
 					$fromstring = $overview[0]->from;
-					$replytostring = (!empty($overview['in_reply-to']) ? $overview['in_reply-to'] : (!empty($headers['Reply-To']) ? $headers['Reply-To'] : "")) ;
+					$replytostring = (!empty($overview['in_reply-to']) ? $overview['in_reply-to'] : (!empty($headers['Reply-To']) ? $headers['Reply-To'] : ""));
 
 					$sender = !empty($overview[0]->sender) ? $overview[0]->sender : '';
 					$to = $overview[0]->to;
@@ -2129,17 +2129,17 @@ 
 				foreach ($arrayofreferences as $reference) {
 					//print "Process mail ".$iforemailloop." email_msgid ".$msgid.", date ".dol_print_date($dateemail, 'dayhour', 'gmt').", subject ".$subject.", reference ".dol_escape_htmltag($reference)."<br>\n";
 					if (!empty($trackidfoundintorecipienttype)) {
-						$resultsearchtrackid = -1;		// trackid found
+						$resultsearchtrackid = -1; // trackid found
 						$reg[1] = $trackidfoundintorecipienttype;
 						$reg[2] = $trackidfoundintorecipientid;
 					} elseif (!empty($trackidfoundintomsgidtype)) {
-						$resultsearchtrackid = -1;		// trackid found
+						$resultsearchtrackid = -1; // trackid found
 						$reg[1] = $trackidfoundintomsgidtype;
 						$reg[2] = $trackidfoundintomsgidid;
 					} else {
-						$resultsearchtrackid = preg_match('/dolibarr-([a-z]+)([0-9]+)@'.preg_quote($host, '/').'/', $reference, $reg);	// trackid found or not
+						$resultsearchtrackid = preg_match('/dolibarr-([a-z]+)([0-9]+)@'.preg_quote($host, '/').'/', $reference, $reg); // trackid found or not
 						if (empty($resultsearchtrackid) && getDolGlobalString('EMAIL_ALTERNATIVE_HOST_SIGNATURE')) {
-							$resultsearchtrackid = preg_match('/dolibarr-([a-z]+)([0-9]+)@'.preg_quote(getDolGlobalString('EMAIL_ALTERNATIVE_HOST_SIGNATURE'), '/').'/', $reference, $reg);	// trackid found
+							$resultsearchtrackid = preg_match('/dolibarr-([a-z]+)([0-9]+)@'.preg_quote(getDolGlobalString('EMAIL_ALTERNATIVE_HOST_SIGNATURE'), '/').'/', $reference, $reg); // trackid found
 						}
 					}
 
@@ -2307,7 +2307,7 @@ 
 								}
 								if ($changeonticket_references) {
 									$operationslog .= '<br>We complete ticket ID='.$ticketid.' with property origin_references='.$objectemail->origin_references;
-									$objectemail->update($user, 1);		// We complete the references field with all references mentioned into this email. This field is for technical tracking purpose, not a user field, so no need to execute triggers
+									$objectemail->update($user, 1); // We complete the references field with all references mentioned into this email. This field is for technical tracking purpose, not a user field, so no need to execute triggers
 								}
 							}
 						}
@@ -2437,7 +2437,7 @@ 
 
 						// Make Operation
 						dol_syslog("Execute action ".$operation['type']." actionparam=".$operation['actionparam'].' thirdpartystatic->id='.$thirdpartystatic->id.' contactstatic->id='.$contactstatic->id.' projectstatic->id='.$projectstatic->id);
-						dol_syslog("Execute action fk_element_id=".$fk_element_id." fk_element_type=".$fk_element_type);	// If a Dolibarr tracker id is found, we should now the id of object
+						dol_syslog("Execute action fk_element_id=".$fk_element_id." fk_element_type=".$fk_element_type); // If a Dolibarr tracker id is found, we should now the id of object
 
 						// Try to guess if this is an email in or out.
 						$actioncode = 'EMAIL_IN';
@@ -2495,7 +2495,7 @@ 
 									$operationslog .= '<br>Ticket not found using trackid='.$trackid.' or msgid='.$msgid;
 									$ticketalreadyexists = 0;
 								} else {
-									$operationslog .= '<br>Ticket already found using trackid='.$trackid.' or msgid='.$msgid.", we replace operation 'ticket' with 'recordevent' to add a new message";	// We change the operation type to do
+									$operationslog .= '<br>Ticket already found using trackid='.$trackid.' or msgid='.$msgid.", we replace operation 'ticket' with 'recordevent' to add a new message"; // We change the operation type to do
 									$ticketalreadyexists = 1;
 									$operation['type'] = 'recordevent';
 								}
@@ -2738,11 +2738,11 @@ 
 									$result = $contactstatic->fetch(0, null, '', $from);
 									if ($result < 0) {
 										$errorforactions++;
-										$this->error = 'Error when getting contact with email ' . $from;
+										$this->error = 'Error when getting contact with email '.$from;
 										$this->errors[] = $this->error;
 										break;
 									} elseif ($result == 0) {
-										dol_syslog("Contact with email " . $from . " was not found. We try to create it.");
+										dol_syslog("Contact with email ".$from." was not found. We try to create it.");
 										$contactstatic = new Contact($this->db);
 
 										// Create contact
@@ -2757,28 +2757,28 @@ 
 										} else {
 											// Search country by name or code
 											if (!empty($contactstatic->country)) {
-												require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
+												require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 												$result = getCountry('', '3', $this->db, null, 1, $contactstatic->country);
 												if ($result == 'NotDefined') {
 													$errorforactions++;
-													$this->error = "Error country not found by this name '" . $contactstatic->country . "'";
+													$this->error = "Error country not found by this name '".$contactstatic->country."'";
 												} elseif (!($result > 0)) {
 													$errorforactions++;
-													$this->error = "Error when search country by this name '" . $contactstatic->country . "'";
+													$this->error = "Error when search country by this name '".$contactstatic->country."'";
 													$this->errors[] = $this->db->lasterror();
 												} else {
 													$contactstatic->country_id = $result;
 													$operationslog .= '<br>We set property country_id='.dol_escape_htmltag($result);
 												}
 											} elseif (!empty($contactstatic->country_code)) {
-												require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
+												require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 												$result = getCountry($contactstatic->country_code, '3', $this->db);
 												if ($result == 'NotDefined') {
 													$errorforactions++;
-													$this->error = "Error country not found by this code '" . $contactstatic->country_code . "'";
+													$this->error = "Error country not found by this code '".$contactstatic->country_code."'";
 												} elseif (!($result > 0)) {
 													$errorforactions++;
-													$this->error = "Error when search country by this code '" . $contactstatic->country_code . "'";
+													$this->error = "Error when search country by this code '".$contactstatic->country_code."'";
 													$this->errors[] = $this->db->lasterror();
 												} else {
 													$contactstatic->country_id = $result;
@@ -2789,28 +2789,28 @@ 
 											if (!$errorforactions) {
 												// Search state by name or code (for country if defined)
 												if (!empty($contactstatic->state)) {
-													require_once DOL_DOCUMENT_ROOT . '/core/lib/functions.lib.php';
+													require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
 													$result = dol_getIdFromCode($this->db, $contactstatic->state, 'c_departements', 'nom', 'rowid');
 													if (empty($result)) {
 														$errorforactions++;
-														$this->error = "Error state not found by this name '" . $contactstatic->state . "'";
+														$this->error = "Error state not found by this name '".$contactstatic->state."'";
 													} elseif (!($result > 0)) {
 														$errorforactions++;
-														$this->error = "Error when search state by this name '" . $contactstatic->state . "'";
+														$this->error = "Error when search state by this name '".$contactstatic->state."'";
 														$this->errors[] = $this->db->lasterror();
 													} else {
 														$contactstatic->state_id = $result;
 														$operationslog .= '<br>We set property state_id='.dol_escape_htmltag($result);
 													}
 												} elseif (!empty($contactstatic->state_code)) {
-													require_once DOL_DOCUMENT_ROOT . '/core/lib/functions.lib.php';
+													require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
 													$result = dol_getIdFromCode($this->db, $contactstatic->state_code, 'c_departements', 'code_departement', 'rowid');
 													if (empty($result)) {
 														$errorforactions++;
-														$this->error = "Error state not found by this code '" . $contactstatic->state_code . "'";
+														$this->error = "Error state not found by this code '".$contactstatic->state_code."'";
 													} elseif (!($result > 0)) {
 														$errorforactions++;
-														$this->error = "Error when search state by this code '" . $contactstatic->state_code . "'";
+														$this->error = "Error when search state by this code '".$contactstatic->state_code."'";
 														$this->errors[] = $this->db->lasterror();
 													} else {
 														$contactstatic->state_id = $result;
@@ -2875,8 +2875,8 @@ 
 								$actioncomm->label       = $langs->trans("ActionAC_".$actioncode).' - '.$langs->trans("MailFrom").' '.$from;
 								$actioncomm->note_private = $descriptionfull;
 								$actioncomm->fk_project  = $projectstatic->id;
-								$actioncomm->datep       = $dateemail;	// date of email
-								$actioncomm->datef       = $dateemail;	// date of email
+								$actioncomm->datep       = $dateemail; // date of email
+								$actioncomm->datef       = $dateemail; // date of email
 								$actioncomm->percentage  = -1; // Not applicable
 								$actioncomm->socid       = $thirdpartystatic->id;
 								$actioncomm->contact_id = $contactstatic->id;
@@ -3077,7 +3077,7 @@ 
 								}
 								$hookmanager->initHooks(array('emailcolector'));
 								$parameters = array('arrayobject' => $arrayobject);
-								$reshook = $hookmanager->executeHooks('addmoduletoeamailcollectorjoinpiece', $parameters);    // Note that $action and $object may have been modified by some hooks
+								$reshook = $hookmanager->executeHooks('addmoduletoeamailcollectorjoinpiece', $parameters); // Note that $action and $object may have been modified by some hooks
 								if ($reshook > 0) {
 									$arrayobject = $hookmanager->resArray;
 								}
@@ -3086,10 +3086,10 @@ 
 
 								foreach ($arrayobject as $key => $objectdesc) {
 									$sql = 'SELECT DISTINCT t.rowid ';
-									$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->db->sanitize($objectdesc['table']) . ' AS t';
+									$sql .= ' FROM '.MAIN_DB_PREFIX.$this->db->sanitize($objectdesc['table']).' AS t';
 									$sql .= ' WHERE ';
 									foreach ($objectdesc['fields'] as $field) {
-										$sql .= "('" .$this->db->escape($subject) . "'  LIKE CONCAT('%',  t." . $this->db->sanitize($field) . ", '%') AND t." . $this->db->sanitize($field) . " <> '') OR ";
+										$sql .= "('".$this->db->escape($subject)."'  LIKE CONCAT('%',  t.".$this->db->sanitize($field).", '%') AND t.".$this->db->sanitize($field)." <> '') OR ";
 									}
 									$sql = substr($sql, 0, -4);
 
@@ -3110,8 +3110,8 @@ 
 									foreach ($ids as $val) {
 										$res = $objectmanaged->fetch($val);
 										if ($res) {
-											$path = ($objectmanaged->entity > 1 ? "/" . $objectmanaged->entity : '');
-											$dirs[] = DOL_DATA_ROOT . $path . "/" . $elementpath . '/' . dol_sanitizeFileName($objectmanaged->ref) . '/';
+											$path = ($objectmanaged->entity > 1 ? "/".$objectmanaged->entity : '');
+											$dirs[] = DOL_DATA_ROOT.$path."/".$elementpath.'/'.dol_sanitizeFileName($objectmanaged->ref).'/';
 										} else {
 											$this->errors[] = 'object not found';
 										}
@@ -3120,7 +3120,7 @@ 
 								foreach ($dirs as $target) {
 									$prefix = $this->actions[$this->id]['actionparam'];
 									foreach ($data as $filename => $content) {
-										$resr = saveAttachment($target, $prefix . '_' . $filename, $content);
+										$resr = saveAttachment($target, $prefix.'_'.$filename, $content);
 										if ($resr == -1) {
 											$this->errors[] = 'Doc not saved';
 										}
@@ -3167,7 +3167,7 @@ 
 								$percent_opp_status = dol_getIdFromCode($this->db, 'PROSP', 'c_lead_status', 'code', 'percent');
 
 								$projecttocreate->title = $subject;
-								$projecttocreate->date_start = $dateemail;	// date of email
+								$projecttocreate->date_start = $dateemail; // date of email
 								$projecttocreate->date_end = 0;
 								$projecttocreate->opp_status = $id_opp_status;
 								$projecttocreate->opp_percent = $percent_opp_status;
@@ -3467,7 +3467,7 @@ 
 								$candidaturetocreate->note_private = $descriptionfull;
 								$candidaturetocreate->entity = $conf->entity;
 								$candidaturetocreate->email_msgid = $msgid;
-								$candidaturetocreate->email_date = $dateemail;		// date of email
+								$candidaturetocreate->email_date = $dateemail; // date of email
 								$candidaturetocreate->status = $candidaturetocreate::STATUS_DRAFT;
 								//$candidaturetocreate->fk_contact = $contactstatic->id;
 
@@ -3877,8 +3877,8 @@ 
 				 * append increment number to the original filename
 				 */
 				while (file_exists($destdir.$file_name.".".$extension)) {
-					$file_name = $file_name_original . ' (' . $num . ')';
-					$file_name_complete = $file_name . "." . $extension;
+					$file_name = $file_name_original.' ('.$num.')';
+					$file_name_complete = $file_name.".".$extension;
 					$destination = $destdir.$file_name_complete;
 					$num++;
 				}
@@ -3992,7 +3992,7 @@ 
 	 */
 	private function saveAttachment($destdir, $filename, $content)
 	{
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/images.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 
 		$tmparraysize = getDefaultImageSizes();
 		$maxwidthsmall = $tmparraysize['maxwidthsmall'];

htdocs/contact/class/contact.class.php

Spacing +30 added lines, -30 removed lines

@@ -213,11 +213,11 @@ 
 	/**
 	 * @var int Thirdparty ID
 	 */
-	public $socid;		// both socid and fk_soc are used
+	public $socid; // both socid and fk_soc are used
 	/**
 	 * @var int
 	 */
-	public $fk_soc;		// both socid and fk_soc are used
+	public $fk_soc; // both socid and fk_soc are used
 
 	/**
 	 * @var string Thirdparty name
@@ -803,11 +803,11 @@ 
 		global $conf;
 		$dn = '';
 		if ($mode == 0) {
-			$dn = getDolGlobalString('LDAP_KEY_CONTACTS') . "=".$info[getDolGlobalString('LDAP_KEY_CONTACTS')]."," . getDolGlobalString('LDAP_CONTACT_DN');
+			$dn = getDolGlobalString('LDAP_KEY_CONTACTS')."=".$info[getDolGlobalString('LDAP_KEY_CONTACTS')].",".getDolGlobalString('LDAP_CONTACT_DN');
 		} elseif ($mode == 1) {
 			$dn = getDolGlobalString('LDAP_CONTACT_DN');
 		} elseif ($mode == 2) {
-			$dn = getDolGlobalString('LDAP_KEY_CONTACTS') . "=".$info[getDolGlobalString('LDAP_KEY_CONTACTS')];
+			$dn = getDolGlobalString('LDAP_KEY_CONTACTS')."=".$info[getDolGlobalString('LDAP_KEY_CONTACTS')];
 		}
 		return $dn;
 	}
@@ -956,12 +956,12 @@ 
 			// Update birthday alert
 			if (!empty($this->birthday_alert)) {
 				//check existing
-				$sql_check = "SELECT rowid FROM " . MAIN_DB_PREFIX . "user_alert WHERE type = 1 AND fk_contact = " . ((int) $id) . " AND fk_user = " . ((int) $user->id);
+				$sql_check = "SELECT rowid FROM ".MAIN_DB_PREFIX."user_alert WHERE type = 1 AND fk_contact = ".((int) $id)." AND fk_user = ".((int) $user->id);
 				$result_check = $this->db->query($sql_check);
 				if (!$result_check || ($this->db->num_rows($result_check) < 1)) {
 					//insert
-					$sql = "INSERT INTO " . MAIN_DB_PREFIX . "user_alert(type, fk_contact, fk_user) ";
-					$sql .= "VALUES (1," . ((int) $id) . "," . ((int) $user->id) . ")";
+					$sql = "INSERT INTO ".MAIN_DB_PREFIX."user_alert(type, fk_contact, fk_user) ";
+					$sql .= "VALUES (1,".((int) $id).",".((int) $user->id).")";
 					$result = $this->db->query($sql);
 					if (!$result) {
 						$error++;
@@ -971,8 +971,8 @@ 
 					$result = true;
 				}
 			} else {
-				$sql = "DELETE FROM " . MAIN_DB_PREFIX . "user_alert ";
-				$sql .= "WHERE type=1 AND fk_contact=" . ((int) $id) . " AND fk_user=" . ((int) $user->id);
+				$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_alert ";
+				$sql .= "WHERE type=1 AND fk_contact=".((int) $id)." AND fk_user=".((int) $user->id);
 				$result = $this->db->query($sql);
 				if (!$result) {
 					$error++;
@@ -1082,29 +1082,29 @@ 
 				$this->civility_code = $obj->civility_code;
 				$this->civility = $obj->civility_code ? ($langs->trans("Civility".$obj->civility_code) != "Civility".$obj->civility_code ? $langs->trans("Civility".$obj->civility_code) : $obj->civility_code) : '';
 
-				$this->name_alias	= $obj->name_alias;
+				$this->name_alias = $obj->name_alias;
 				$this->lastname		= $obj->lastname;
 				$this->firstname	= $obj->firstname;
-				$this->address		= $obj->address;
-				$this->zip			= $obj->zip;
-				$this->town			= $obj->town;
+				$this->address = $obj->address;
+				$this->zip = $obj->zip;
+				$this->town = $obj->town;
 
 				$this->date_creation = $this->db->jdate($obj->date_creation);
 				$this->date_modification = $this->db->jdate($obj->date_modification);
 				$this->user_creation_id = $obj->fk_user_creat;
 				$this->user_modification_id = $obj->fk_user_modif;
 
-				$this->state_id		= $obj->state_id;
+				$this->state_id = $obj->state_id;
 				$this->state_code	= $obj->state_code;
-				$this->state		= $obj->state;
+				$this->state = $obj->state;
 
 				$this->country_id	= $obj->country_id;
-				$this->country_code	= $obj->country_id ? $obj->country_code : '';
-				$this->country		= $obj->country_id ? ($langs->trans('Country'.$obj->country_code) != 'Country'.$obj->country_code ? $langs->transnoentities('Country'.$obj->country_code) : $obj->country) : '';
+				$this->country_code = $obj->country_id ? $obj->country_code : '';
+				$this->country = $obj->country_id ? ($langs->trans('Country'.$obj->country_code) != 'Country'.$obj->country_code ? $langs->transnoentities('Country'.$obj->country_code) : $obj->country) : '';
 
-				$this->fk_soc		= $obj->fk_soc;		// Both fk_soc and socid are used
-				$this->socid		= $obj->fk_soc;		// Both fk_soc and socid are used
-				$this->socname		= $obj->socname;
+				$this->fk_soc = $obj->fk_soc; // Both fk_soc and socid are used
+				$this->socid		= $obj->fk_soc; // Both fk_soc and socid are used
+				$this->socname = $obj->socname;
 				$this->poste		= $obj->poste;
 				$this->status		= $obj->status;
 				$this->statut		= $obj->status; // deprecated
@@ -1123,19 +1123,19 @@ 
 				$this->phone_mobile = trim($obj->phone_mobile);
 
 				$this->email			= $obj->email;
-				$this->socialnetworks	= ($obj->socialnetworks ? (array) json_decode($obj->socialnetworks, true) : array());
+				$this->socialnetworks = ($obj->socialnetworks ? (array) json_decode($obj->socialnetworks, true) : array());
 				$this->photo			= $obj->photo;
 				$this->priv				= $obj->priv;
 				$this->mail				= $obj->email;
 
-				$this->birthday		= $this->db->jdate($obj->birthday);
-				$this->note			= $obj->note_private; // deprecated
+				$this->birthday = $this->db->jdate($obj->birthday);
+				$this->note = $obj->note_private; // deprecated
 				$this->note_private	= $obj->note_private;
-				$this->note_public	= $obj->note_public;
+				$this->note_public = $obj->note_public;
 				$this->default_lang	= $obj->default_lang;
-				$this->user_id		= $obj->user_id;
+				$this->user_id = $obj->user_id;
 				$this->user_login	= $obj->user_login;
-				$this->canvas		= $obj->canvas;
+				$this->canvas = $obj->canvas;
 
 				$this->import_key = $obj->import_key;
 
@@ -1503,7 +1503,7 @@ 
 			$datas['photo'] = $photo;
 		}
 
-		$datas['picto'] = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Contact").'</u> ' . $this->getLibStatut(4);
+		$datas['picto'] = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Contact").'</u> '.$this->getLibStatut(4);
 		$datas['name'] = '<br><b>'.$langs->trans("Name").':</b> '.$this->getFullName($langs);
 		// if ($this->civility_id) $datas['civility'] = '<br><b>' . $langs->trans("Civility") . ':</b> '.$this->civility_id;		// TODO Translate civilty_id code
 		if (!empty($this->poste)) {
@@ -1564,7 +1564,7 @@ 
 			$label = implode($this->getTooltipContentArray($params));
 		}
 
-		$baseurl = DOL_URL_ROOT . '/contact/card.php';
+		$baseurl = DOL_URL_ROOT.'/contact/card.php';
 		$query = ['id' => $this->id];
 		if ($option !== 'nolink') {
 			// Add param to save lastsearch_values or not
@@ -1961,7 +1961,7 @@ 
 		$error = 0;
 
 		if (!isset($this->roles)) {
-			return 0;	// Avoid to loose roles when property not set
+			return 0; // Avoid to loose roles when property not set
 		}
 
 		$this->db->begin();
@@ -2274,7 +2274,7 @@ 
 		}
 		$return .= '</span>';
 		$return .= '<div class="info-box-content">';
-		$return .= '<div class="info-box-ref inline-block tdoverflowmax150 valignmiddle">' . $this->getNomUrl(0) . '</div>';
+		$return .= '<div class="info-box-ref inline-block tdoverflowmax150 valignmiddle">'.$this->getNomUrl(0).'</div>';
 		if ($selected >= 0) {
 			$return .= '<input id="cb'.$this->id.'" class="flat checkforselect fright" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
 		}

htdocs/commande/note.php

Spacing +2 added lines, -2 removed lines

@@ -62,7 +62,7 @@ 
 
 $result = restrictedArea($user, 'commande', $id, '');
 
-$usercancreate  =  $user->hasRight("commande", "creer");
+$usercancreate  = $user->hasRight("commande", "creer");
 
 $permissionnote = $user->hasRight('commande', 'creer'); // Used by the include of actions_setnotes.inc.php
 
@@ -106,7 +106,7 @@ 
 
 	// Order card
 
-	$linkback = '<a href="'.dolBuildUrl(DOL_URL_ROOT . '/commande/list.php', ['restore_lastsearch_values' => 1, 'socid' => (!empty($socid) ? $socid : '')]).'">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.dolBuildUrl(DOL_URL_ROOT.'/commande/list.php', ['restore_lastsearch_values' => 1, 'socid' => (!empty($socid) ? $socid : '')]).'">'.$langs->trans("BackToList").'</a>';
 
 
 	$morehtmlref = '<div class="refidno">';

htdocs/commande/card.php

Spacing +282 added lines, -282 removed lines

@@ -40,30 +40,30 @@ 
 
 // Load Dolibarr environment
 require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
-require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formorder.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formmargin.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/modules/commande/modules_commande.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/order.lib.php';
-
-require_once DOL_DOCUMENT_ROOT . '/comm/action/class/actioncomm.class.php';
-require_once DOL_DOCUMENT_ROOT . '/commande/class/commande.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formorder.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmargin.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php';
+
+require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 
 if (isModEnabled("propal")) {
-	require_once DOL_DOCUMENT_ROOT . '/comm/propal/class/propal.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 }
 
 if (isModEnabled('project')) {
-	require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
-	require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
 if (isModEnabled('variants')) {
-	require_once DOL_DOCUMENT_ROOT . '/variants/class/ProductCombination.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
 }
 
 
@@ -91,18 +91,18 @@ 
 
 
 $id        = (GETPOSTINT('id') ? GETPOSTINT('id') : GETPOSTINT('orderid'));
-$ref       =  GETPOST('ref', 'alpha');
-$socid     =  GETPOSTINT('socid');
-$action    =  GETPOST('action', 'aZ09');
-$cancel    =  GETPOST('cancel', 'alpha');
-$confirm   =  GETPOST('confirm', 'alpha');
+$ref       = GETPOST('ref', 'alpha');
+$socid     = GETPOSTINT('socid');
+$action    = GETPOST('action', 'aZ09');
+$cancel    = GETPOST('cancel', 'alpha');
+$confirm   = GETPOST('confirm', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
-$lineid    =  GETPOSTINT('lineid');
-$contactid =  GETPOSTINT('contactid');
-$projectid =  GETPOSTINT('projectid');
-$origin    =  GETPOST('origin', 'alpha');
-$originid  = (GETPOSTINT('originid') ? GETPOSTINT('originid') : GETPOSTINT('origin_id'));    // For backward compatibility
+$lineid    = GETPOSTINT('lineid');
+$contactid = GETPOSTINT('contactid');
+$projectid = GETPOSTINT('projectid');
+$origin    = GETPOST('origin', 'alpha');
+$originid  = (GETPOSTINT('originid') ? GETPOSTINT('originid') : GETPOSTINT('origin_id')); // For backward compatibility
 $rank      = (GETPOSTINT('rank') > 0) ? GETPOSTINT('rank') : -1;
 
 // Type Contact default
@@ -147,26 +147,26 @@ 
 $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Load object
-include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php';     // Must be 'include', not 'include_once'
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'
 
 // Permissions / Rights
-$usercanread    =  $user->hasRight("commande", "lire");
-$usercancreate  =  $user->hasRight("commande", "creer");
-$usercandelete  =  $user->hasRight("commande", "supprimer");
+$usercanread    = $user->hasRight("commande", "lire");
+$usercancreate  = $user->hasRight("commande", "creer");
+$usercandelete  = $user->hasRight("commande", "supprimer");
 
 // Advanced permissions
-$usercanclose       =  ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($usercancreate)) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('commande', 'order_advance', 'close')));
-$usercanvalidate    =  ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $usercancreate) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('commande', 'order_advance', 'validate')));
-$usercancancel      =  ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $usercancreate) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('commande', 'order_advance', 'annuler')));
-$usercansend        =   (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || $user->hasRight('commande', 'order_advance', 'send'));
-$usercangeneretedoc =   (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || $user->hasRight('commande', 'order_advance', 'generetedoc'));
+$usercanclose       = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($usercancreate)) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('commande', 'order_advance', 'close')));
+$usercanvalidate    = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $usercancreate) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('commande', 'order_advance', 'validate')));
+$usercancancel      = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $usercancreate) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('commande', 'order_advance', 'annuler')));
+$usercansend        = (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || $user->hasRight('commande', 'order_advance', 'send'));
+$usercangeneretedoc = (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || $user->hasRight('commande', 'order_advance', 'generetedoc'));
 
 $usermustrespectpricemin    = ((getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !$user->hasRight('produit', 'ignore_price_min_advance')) || !getDolGlobalString('MAIN_USE_ADVANCED_PERMS'));
 $usercancreatepurchaseorder = ($user->hasRight('fournisseur', 'commande', 'creer') || $user->hasRight('supplier_order', 'creer'));
 
-$permissionnote    = $usercancreate;     //  Used by the include of actions_setnotes.inc.php
-$permissiondellink = $usercancreate;     //  Used by the include of actions_dellink.inc.php
-$permissiontoadd   = $usercancreate;     //  Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissionnote    = $usercancreate; //  Used by the include of actions_setnotes.inc.php
+$permissiondellink = $usercancreate; //  Used by the include of actions_dellink.inc.php
+$permissiontoadd   = $usercancreate; //  Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 $permissiontoeditextra = $usercancreate;
 if (GETPOST('attribute', 'aZ09') && isset($extrafields->attributes[$object->table_element]['perms'][GETPOST('attribute', 'aZ09')])) {
 	// For action 'update_extras', is there a specific permission set for the attribute to update
@@ -192,14 +192,14 @@ 
 }
 
 if (empty($reshook)) {
-	$backurlforlist = DOL_URL_ROOT . '/commande/list.php';
+	$backurlforlist = DOL_URL_ROOT.'/commande/list.php';
 
 	if (empty($backtopage) || ($cancel && empty($id))) {
 		if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
 			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
 				$backtopage = $backurlforlist;
 			} else {
-				$backtopage = DOL_URL_ROOT . '/commande/card.php?id=' . ((!empty($id) && $id > 0) ? $id : '__ID__');
+				$backtopage = DOL_URL_ROOT.'/commande/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
 			}
 		}
 	}
@@ -208,20 +208,20 @@ 
 
 	if ($cancel) {
 		if (!empty($backtopageforcancel)) {
-			header("Location: " . $backtopageforcancel);
+			header("Location: ".$backtopageforcancel);
 			exit;
 		} elseif (!empty($backtopage)) {
-			header("Location: " . $backtopage);
+			header("Location: ".$backtopage);
 			exit;
 		}
 		$action = '';
 	}
 
-	include DOL_DOCUMENT_ROOT . '/core/actions_setnotes.inc.php';    // Must be 'include', not 'include_once'
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once'
 
-	include DOL_DOCUMENT_ROOT . '/core/actions_dellink.inc.php';     // Must be 'include', not 'include_once'
+	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be 'include', not 'include_once'
 
-	include DOL_DOCUMENT_ROOT . '/core/actions_lineupdown.inc.php';  // Must be 'include', not 'include_once'
+	include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be 'include', not 'include_once'
 
 	// Action clone object
 	if ($action == 'confirm_clone' && $confirm == 'yes' && $usercancreate) {
@@ -250,7 +250,7 @@ 
 						setEventMessages('', $warningMsgLineList, 'warnings');
 					}
 
-					header("Location: " . $_SERVER['PHP_SELF'] . '?id=' . $result);
+					header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
 					exit;
 				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
@@ -309,7 +309,7 @@ 
 				$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 
-			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -337,7 +337,7 @@ 
 				$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 
-			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -433,14 +433,14 @@ 
 					$object_id = $object->create($user);
 
 					if ($object_id > 0) {
-						dol_include_once('/' . $element . '/class/' . $subelement . '.class.php');
+						dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
 
 						$classname = ucfirst($subelement);
 						$srcobject = new $classname($db);
 						'@phan-var-force Commande|Propal|Contrat $srcobject';
 						/** @var Commande|Propal|Contrat $srcobject */
 
-						dol_syslog("Try to find source object origin=" . $object->origin . " originid=" . $object->origin_id . " to add lines");
+						dol_syslog("Try to find source object origin=".$object->origin." originid=".$object->origin_id." to add lines");
 						$result = $srcobject->fetch($object->origin_id);
 						if ($result > 0) {
 							$lines = $srcobject->lines;
@@ -491,7 +491,7 @@ 
 
 								$tva_tx = $lines[$i]->tva_tx;
 								if (!empty($lines[$i]->vat_src_code) && !preg_match('/\(/', $tva_tx)) {
-									$tva_tx .= ' (' . $lines[$i]->vat_src_code . ')';
+									$tva_tx .= ' ('.$lines[$i]->vat_src_code.')';
 								}
 
 								$result = $object->addline(
@@ -619,7 +619,7 @@ 
 			// End of object creation, we show it
 			if ($object_id > 0 && !$error) {
 				$db->commit();
-				header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object_id);
+				header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object_id);
 				exit();
 			} else {
 				$db->rollback();
@@ -795,7 +795,7 @@ 
 			}
 			$tvatx = $line->tva_tx;
 			if (!empty($line->vat_src_code)) {
-				$tvatx .= ' (' . $line->vat_src_code . ')';
+				$tvatx .= ' ('.$line->vat_src_code.')';
 			}
 			$result = $object->updateline($line->id, $line->desc, $line->subprice, $line->qty, (float) $remise_percent, $tvatx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->date_start, $line->date_end, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->fk_unit, $line->multicurrency_subprice);
 		}
@@ -825,7 +825,7 @@ 
 				if ($prod->price_min > $line->subprice) {
 					$price_subprice = price($line->subprice, 0, $outlangs, 1, -1, -1, 'auto');
 					$price_price_min = price($prod->price_min, 0, $outlangs, 1, -1, -1, 'auto');
-					setEventMessages($prod->ref . ' - ' . $prod->label . ' (' . $price_subprice . ' < ' . $price_price_min . ' ' . strtolower($langs->trans("MinPrice")) . ')' . "\n", null, 'warnings');
+					setEventMessages($prod->ref.' - '.$prod->label.' ('.$price_subprice.' < '.$price_price_min.' '.strtolower($langs->trans("MinPrice")).')'."\n", null, 'warnings');
 				} else {
 					setEventMessages($prod->error, $prod->errors, 'errors');
 				}
@@ -900,7 +900,7 @@ 
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-		header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $id);
+		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
 		exit();
 	} elseif ($action == 'confirm_addsubtotalline' && $usercancreate) {
 		// Handling adding a new subtotal line for subtotals module
@@ -952,7 +952,7 @@ 
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-		header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $id);
+		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
 		exit();
 	} elseif ($action == 'addline' && !GETPOST('submitforalllines', 'alpha') && $usercancreate) {		// Add a new line
 		$langs->load('errors');
@@ -969,7 +969,7 @@ 
 		$pu_ht = '';
 		$pu_ttc = '';
 		$pu_ht_devise = '';
-		$pu_ttc_devise  = '';
+		$pu_ttc_devise = '';
 
 		if (GETPOST('price_ht') !== '') {
 			$price_ht = price2num(GETPOST('price_ht'), 'MU', 2);
@@ -998,9 +998,9 @@ 
 
 		$tva_tx = GETPOST('tva_tx', 'alpha');
 
-		$qty = price2num(GETPOST('qty' . $predef, 'alpha'), 'MS', 2);
+		$qty = price2num(GETPOST('qty'.$predef, 'alpha'), 'MS', 2);
 
-		$remise_percent = (GETPOSTISSET('remise_percent' . $predef) ? price2num(GETPOST('remise_percent' . $predef, 'alpha'), '', 2) : 0);
+		$remise_percent = (GETPOSTISSET('remise_percent'.$predef) ? price2num(GETPOST('remise_percent'.$predef, 'alpha'), '', 2) : 0);
 		if (empty($remise_percent)) {
 			$remise_percent = 0;
 		}
@@ -1012,7 +1012,7 @@ 
 		if (is_array($extralabelsline)) {
 			// Get extra fields
 			foreach ($extralabelsline as $key => $value) {
-				unset($_POST["options_" . $key]);
+				unset($_POST["options_".$key]);
 			}
 		}
 
@@ -1057,8 +1057,8 @@ 
 
 		if (!$error && ($qty >= 0) && (!empty($line_desc) || (!empty($idprod) && $idprod > 0))) {
 			// Clean parameters
-			$date_start = dol_mktime(GETPOSTINT('date_start' . $predef . 'hour'), GETPOSTINT('date_start' . $predef . 'min'), GETPOSTINT('date_start' . $predef . 'sec'), GETPOSTINT('date_start' . $predef . 'month'), GETPOSTINT('date_start' . $predef . 'day'), GETPOSTINT('date_start' . $predef . 'year'));
-			$date_end = dol_mktime(GETPOSTINT('date_end' . $predef . 'hour'), GETPOSTINT('date_end' . $predef . 'min'), GETPOSTINT('date_end' . $predef . 'sec'), GETPOSTINT('date_end' . $predef . 'month'), GETPOSTINT('date_end' . $predef . 'day'), GETPOSTINT('date_end' . $predef . 'year'));
+			$date_start = dol_mktime(GETPOSTINT('date_start'.$predef.'hour'), GETPOSTINT('date_start'.$predef.'min'), GETPOSTINT('date_start'.$predef.'sec'), GETPOSTINT('date_start'.$predef.'month'), GETPOSTINT('date_start'.$predef.'day'), GETPOSTINT('date_start'.$predef.'year'));
+			$date_end = dol_mktime(GETPOSTINT('date_end'.$predef.'hour'), GETPOSTINT('date_end'.$predef.'min'), GETPOSTINT('date_end'.$predef.'sec'), GETPOSTINT('date_end'.$predef.'month'), GETPOSTINT('date_end'.$predef.'day'), GETPOSTINT('date_end'.$predef.'year'));
 			$price_base_type = (GETPOST('price_base_type', 'alpha') ? GETPOST('price_base_type', 'alpha') : 'HT');
 
 			$price_min = $price_min_ttc = 0;
@@ -1088,7 +1088,7 @@ 
 
 				if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) {
 					// If price per customer
-					require_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
+					require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
 
 					$prodcustprice = new ProductCustomerPrice($db);
 
@@ -1110,7 +1110,7 @@ 
 									$price_base_type = $custprice_line->price_base_type;
 									$tva_tx = $custprice_line->tva_tx;
 									if ($custprice_line->default_vat_code && !preg_match('/\(.*\)/', (string) $tva_tx)) {
-										$tva_tx .= ' (' . $custprice_line->default_vat_code . ')';
+										$tva_tx .= ' ('.$custprice_line->default_vat_code.')';
 									}
 									$tva_npr = $custprice_line->recuperableonly;
 									if (empty($tva_tx)) {
@@ -1157,7 +1157,7 @@ 
 					}
 				} elseif (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 					// If price per customer
-					require_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
+					require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
 
 					$prodcustprice = new ProductCustomerPrice($db);
 
@@ -1176,7 +1176,7 @@ 
 									$price_base_type = $custprice_line->price_base_type;
 									$tva_tx = $custprice_line->tva_tx;
 									if ($custprice_line->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) {
-										$tva_tx .= ' (' . $custprice_line->default_vat_code . ')';
+										$tva_tx .= ' ('.$custprice_line->default_vat_code.')';
 									}
 									$tva_npr = $custprice_line->recuperableonly;
 									if (empty($tva_tx)) {
@@ -1300,23 +1300,23 @@ 
 							$outputlangs->load('products');
 						}
 						if (!empty($prod->customcode)) {
-							$tmptxt .= $outputlangs->transnoentitiesnoconv("CustomsCode") . ': ' . $prod->customcode;
+							$tmptxt .= $outputlangs->transnoentitiesnoconv("CustomsCode").': '.$prod->customcode;
 						}
 						if (!empty($prod->customcode) && !empty($prod->country_code)) {
 							$tmptxt .= ' - ';
 						}
 						if (!empty($prod->country_code)) {
-							$tmptxt .= $outputlangs->transnoentitiesnoconv("CountryOrigin") . ': ' . getCountry($prod->country_code, '', $db, $outputlangs, 0);
+							$tmptxt .= $outputlangs->transnoentitiesnoconv("CountryOrigin").': '.getCountry($prod->country_code, '', $db, $outputlangs, 0);
 						}
 					} else {
 						if (!empty($prod->customcode)) {
-							$tmptxt .= $langs->transnoentitiesnoconv("CustomsCode") . ': ' . $prod->customcode;
+							$tmptxt .= $langs->transnoentitiesnoconv("CustomsCode").': '.$prod->customcode;
 						}
 						if (!empty($prod->customcode) && !empty($prod->country_code)) {
 							$tmptxt .= ' - ';
 						}
 						if (!empty($prod->country_code)) {
-							$tmptxt .= $langs->transnoentitiesnoconv("CountryOrigin") . ': ' . getCountry($prod->country_code, '', $db, $langs, 0);
+							$tmptxt .= $langs->transnoentitiesnoconv("CountryOrigin").': '.getCountry($prod->country_code, '', $db, $langs, 0);
 						}
 					}
 					$tmptxt .= ')';
@@ -1355,8 +1355,8 @@ 
 			$localtax2_tx = get_localtax($tva_tx, 2, $object->thirdparty);
 
 			// Margin
-			$fournprice = (int) (GETPOST('fournprice' . $predef) ? GETPOSTINT('fournprice' . $predef) : 0);	// This can be id of supplier price, or 'pmpprice' or 'costprice', or 'inputprice', we force to keep ID only
-			$buyingprice = price2num(GETPOST('buying_price' . $predef) != '' ? GETPOST('buying_price' . $predef) : ''); // If buying_price is '0', we must keep this value
+			$fournprice = (int) (GETPOST('fournprice'.$predef) ? GETPOSTINT('fournprice'.$predef) : 0); // This can be id of supplier price, or 'pmpprice' or 'costprice', or 'inputprice', we force to keep ID only
+			$buyingprice = price2num(GETPOST('buying_price'.$predef) != '' ? GETPOST('buying_price'.$predef) : ''); // If buying_price is '0', we must keep this value
 
 			// Prepare a price equivalent for minimum price check
 			$pu_equivalent = $pu_ht;
@@ -1600,7 +1600,7 @@ 
 		 */
 
 		// Add buying price
-		$fournprice = (int) (GETPOST('fournprice') ? GETPOST('fournprice') : '');				// This can be id of supplier price, or 'pmpprice' or 'costprice', or 'inputprice', we force to keep ID only
+		$fournprice = (int) (GETPOST('fournprice') ? GETPOST('fournprice') : ''); // This can be id of supplier price, or 'pmpprice' or 'costprice', or 'inputprice', we force to keep ID only
 		$buyingprice = price2num(GETPOST('buying_price') != '' ? GETPOST('buying_price') : ''); // If buying_price is '0', we must keep this value
 
 		// Extrafields Lines
@@ -1609,7 +1609,7 @@ 
 		// Unset extrafield POST Data
 		if (is_array($extralabelsline)) {
 			foreach ($extralabelsline as $key => $value) {
-				unset($_POST["options_" . $key]);
+				unset($_POST["options_".$key]);
 			}
 		}
 
@@ -1752,7 +1752,7 @@ 
 			}
 		}
 	} elseif ($action == 'updateline' && $usercancreate && GETPOST('cancel', 'alpha')) {
-		header('Location: ' . $_SERVER['PHP_SELF'] . '?id=' . $object->id); //  To re-display card in edit mode
+		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); //  To re-display card in edit mode
 		exit();
 	} elseif ($action == 'confirm_validate' && $confirm == 'yes' && $usercanvalidate) {
 		$idwarehouse = GETPOSTINT('idwarehouse');
@@ -1789,7 +1789,7 @@ 
 					GETPOST('generate_deposit', 'alpha') == 'on' && !empty($deposit_percent_from_payment_terms)
 					&& isModEnabled('invoice') && $user->hasRight('facture', 'creer')
 				) {
-					require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
+					require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
 					$date = dol_mktime(0, 0, 0, GETPOSTINT('datefmonth'), GETPOSTINT('datefday'), GETPOSTINT('datefyear'));
 					$forceFields = array();
@@ -1802,7 +1802,7 @@ 
 
 					if ($deposit) {
 						setEventMessage('DepositGenerated');
-						$locationTarget = DOL_URL_ROOT . '/compta/facture/card.php?id=' . $deposit->id;
+						$locationTarget = DOL_URL_ROOT.'/compta/facture/card.php?id='.$deposit->id;
 					} else {
 						$error++;
 						setEventMessages($object->error, $object->errors, 'errors');
@@ -1810,7 +1810,7 @@ 
 				}
 
 				// Define output language
-				if (! $error) {
+				if (!$error) {
 					$db->commit();
 
 					if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
@@ -1838,7 +1838,7 @@ 
 					}
 
 					if ($locationTarget) {
-						header('Location: ' . $locationTarget);
+						header('Location: '.$locationTarget);
 						exit;
 					}
 				} else {
@@ -1929,7 +1929,7 @@ 
 	}
 
 	if ($action == 'update_extras' && $permissiontoeditextra) {
-		$object->oldcopy = dol_clone($object, 2);  // @phan-suppress-current-line PhanTypeMismatchProperty
+		$object->oldcopy = dol_clone($object, 2); // @phan-suppress-current-line PhanTypeMismatchProperty
 
 		$attribute_name = GETPOST('attribute', 'aZ09');
 
@@ -1961,13 +1961,13 @@ 
 
 		if (!empty($importLines) && is_array($importLines) && !empty($fromElement) && ctype_alpha($fromElement) && !empty($fromElementid)) {
 			if ($fromElement == 'commande') {
-				dol_include_once('/' . $fromElement . '/class/' . $fromElement . '.class.php');
+				dol_include_once('/'.$fromElement.'/class/'.$fromElement.'.class.php');
 				$lineClassName = 'OrderLine';
 			} elseif ($fromElement == 'propal') {
-				dol_include_once('/comm/' . $fromElement . '/class/' . $fromElement . '.class.php');
+				dol_include_once('/comm/'.$fromElement.'/class/'.$fromElement.'.class.php');
 				$lineClassName = 'PropaleLigne';
 			} elseif ($fromElement == 'facture') {
-				dol_include_once('/compta/' . $fromElement . '/class/' . $fromElement . '.class.php');
+				dol_include_once('/compta/'.$fromElement.'/class/'.$fromElement.'.class.php');
 				$lineClassName = 'FactureLigne';
 			}
 			$nextRang = count($object->lines) + 1;
@@ -2027,19 +2027,19 @@ 
 	}
 
 	// Actions when printing a doc from card
-	include DOL_DOCUMENT_ROOT . '/core/actions_printing.inc.php';
+	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
 	// Actions to build doc
 	$upload_dir = !empty($conf->commande->multidir_output[$object->entity ?? $conf->entity]) ? $conf->commande->multidir_output[$object->entity ?? $conf->entity] : $conf->commande->dir_output;
 	$permissiontoadd = $usercancreate;
-	include DOL_DOCUMENT_ROOT . '/core/actions_builddoc.inc.php';
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 	// Actions to send emails
 	$triggersendname = 'ORDER_SENTBYMAIL';
 	$paramname = 'id';
 	$autocopy = 'MAIN_MAIL_AUTOCOPY_ORDER_TO'; // used to know the automatic BCC to add
-	$trackid = 'ord' . $object->id;
-	include DOL_DOCUMENT_ROOT . '/core/actions_sendmails.inc.php';
+	$trackid = 'ord'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
 
 	if (!$error && getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB') && $usercancreate) {
@@ -2051,7 +2051,7 @@ 
 			}
 
 			if ($result >= 0) {
-				header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $object->id);
+				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit();
 			} else {
 				if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
@@ -2073,7 +2073,7 @@ 
 			$result = $object->delete_contact($lineid);
 
 			if ($result >= 0) {
-				header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $object->id);
+				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit();
 			} else {
 				dol_print_error($db);
@@ -2087,7 +2087,7 @@ 
  *	View
  */
 
-$title = $object->ref . " - " . $langs->trans('Card');
+$title = $object->ref." - ".$langs->trans('Card');
 if ($action == 'create') {
 	$title = $langs->trans("NewOrder");
 }
@@ -2160,11 +2160,11 @@ 
 				$element = $subelement = 'contrat';
 			}
 
-			dol_include_once('/' . $element . '/class/' . $subelement . '.class.php');
+			dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
 
 			$classname = ucfirst($subelement);
 			$objectsrc = new $classname($db);
-			'@phan-var-force Commande|Propal|Contrat $objectsrc';  // Can possibly be other class but CommonObject is too general
+			'@phan-var-force Commande|Propal|Contrat $objectsrc'; // Can possibly be other class but CommonObject is too general
 			$objectsrc->fetch($originid);
 			if (empty($objectsrc->lines) && method_exists($objectsrc, 'fetch_lines')) {
 				$objectsrc->fetch_lines();
@@ -2258,16 +2258,16 @@ 
 		}
 	}
 
-	print '<form name="crea_commande" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
-	print '<input type="hidden" name="token" value="' . newToken() . '">';
+	print '<form name="crea_commande" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
-	print '<input type="hidden" name="changecompany" value="0">';	// will be set to 1 by javascript so we know post is done after a company change
-	print '<input type="hidden" name="remise_percent" value="' . $soc->remise_percent . '">';
-	print '<input type="hidden" name="origin" value="' . $origin . '">';
-	print '<input type="hidden" name="originid" value="' . $originid . '">';
-	print '<input type="hidden" name="backtopage" value="' . $backtopage . '">';
+	print '<input type="hidden" name="changecompany" value="0">'; // will be set to 1 by javascript so we know post is done after a company change
+	print '<input type="hidden" name="remise_percent" value="'.$soc->remise_percent.'">';
+	print '<input type="hidden" name="origin" value="'.$origin.'">';
+	print '<input type="hidden" name="originid" value="'.$originid.'">';
+	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	if (!empty($currency_tx)) {
-		print '<input type="hidden" name="originmulticurrency_tx" value="' . $currency_tx . '">';
+		print '<input type="hidden" name="originmulticurrency_tx" value="'.$currency_tx.'">';
 	}
 
 	print dol_get_fiche_head([]);
@@ -2280,29 +2280,29 @@ 
 		print '<table class="border centpercent">';
 
 		// Reference
-		print '<tr><td class="titlefieldcreate fieldrequired">' . $langs->trans('Ref') . '</td><td>' . $langs->trans("Draft") . '</td></tr>';
+		print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans('Ref').'</td><td>'.$langs->trans("Draft").'</td></tr>';
 
 		// Reference client
-		print '<tr><td>' . $langs->trans('RefCustomer') . '</td><td>';
+		print '<tr><td>'.$langs->trans('RefCustomer').'</td><td>';
 		if (getDolGlobalString('MAIN_USE_PROPAL_REFCLIENT_FOR_ORDER') && !empty($origin) && !empty($originid)) {
-			print '<input type="text" name="ref_client" value="' . $ref_client . '"></td>';
+			print '<input type="text" name="ref_client" value="'.$ref_client.'"></td>';
 		} else {
-			print '<input type="text" name="ref_client" value="' . GETPOST('ref_client') . '"></td>';
+			print '<input type="text" name="ref_client" value="'.GETPOST('ref_client').'"></td>';
 		}
 		print '</tr>';
 
 		// Thirdparty
 		print '<tr>';
-		print '<td class="fieldrequired">' . $langs->trans('Customer') . '</td>';
+		print '<td class="fieldrequired">'.$langs->trans('Customer').'</td>';
 		if ($socid > 0) {
 			print '<td>';
 			print $soc->getNomUrl(1, 'customer');
-			print '<input type="hidden" name="socid" value="' . $soc->id . '">';
+			print '<input type="hidden" name="socid" value="'.$soc->id.'">';
 			print '</td>';
 		} else {
 			print '<td class="valuefieldcreate">';
 			$filter = '((s.client:IN:1,2,3) AND (s.status:=:1))';
-			print img_picto('', 'company', 'class="pictofixedwidth"') . $form->select_company('', 'socid', $filter, 'SelectThirdParty', 1, 0, array(), 0, 'minwidth175 maxwidth500 widthcentpercentminusxx');
+			print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company('', 'socid', $filter, 'SelectThirdParty', 1, 0, array(), 0, 'minwidth175 maxwidth500 widthcentpercentminusxx');
 			// reload page to retrieve customer information
 			if (!getDolGlobalString('RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED')) {
 				print '<script>
@@ -2318,17 +2318,17 @@ 
 				});
 				</script>';
 			}
-			print ' <a href="' . DOL_URL_ROOT . '/societe/card.php?action=create&customer=3&fournisseur=0&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?action=create') . '"><span class="fa fa-plus-circle valignmiddle paddingleft" title="' . $langs->trans("AddThirdParty") . '"></span></a>';
+			print ' <a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&customer=3&fournisseur=0&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddThirdParty").'"></span></a>';
 			print '</td>';
 		}
-		print '</tr>' . "\n";
+		print '</tr>'."\n";
 
 		// Contact of order
 		if ($socid > 0) {
 			// Contacts (ask contact only if thirdparty already defined).
 			// print "<tr><td>".$langs->trans("DefaultContact").'</td><td>';
 			print "<tr><td>";
-			print $form->textwithpicto($langs->trans("DefaultContact"), $langs->trans("TypeContact_commande_external_" . $type_contact_code));
+			print $form->textwithpicto($langs->trans("DefaultContact"), $langs->trans("TypeContact_commande_external_".$type_contact_code));
 			print '</td><td>';
 			print img_picto('', 'contact', 'class="pictofixedwidth"');
 			//print $form->selectcontacts($soc->id, $contactid, 'contactid', 1, empty($srccontactslist) ? "" : $srccontactslist, '', 1, 'maxwidth300 widthcentpercentminusx');
@@ -2336,26 +2336,26 @@ 
 			print '</td></tr>';
 
 			// Ligne info remises tiers
-			print '<tr><td>' . $langs->trans('Discounts') . '</td><td>';
+			print '<tr><td>'.$langs->trans('Discounts').'</td><td>';
 
 			$absolute_discount = $soc->getAvailableDiscounts();
 
 			$thirdparty = $soc;
 			$discount_type = 0;
-			$backtopage = $_SERVER["PHP_SELF"] . '?socid=' . $thirdparty->id . '&action=' . $action . '&origin=' . urlencode((string) (GETPOST('origin'))) . '&originid=' . urlencode((string) (GETPOSTINT('originid')));
-			include DOL_DOCUMENT_ROOT . '/core/tpl/object_discounts.tpl.php';
+			$backtopage = $_SERVER["PHP_SELF"].'?socid='.$thirdparty->id.'&action='.$action.'&origin='.urlencode((string) (GETPOST('origin'))).'&originid='.urlencode((string) (GETPOSTINT('originid')));
+			include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';
 
 			print '</td></tr>';
 		}
 
 		// Date
-		print '<tr><td class="fieldrequired">' . $langs->trans('Date') . '</td><td>';
+		print '<tr><td class="fieldrequired">'.$langs->trans('Date').'</td><td>';
 		print img_picto('', 'action', 'class="pictofixedwidth"');
 		print $form->selectDate('', 're', 0, 0, 0, "crea_commande", 1, 1); // Always autofill date with current date
 		print '</td></tr>';
 
 		// Date delivery planned
-		print '<tr><td>' . $langs->trans("DateDeliveryPlanned") . '</td>';
+		print '<tr><td>'.$langs->trans("DateDeliveryPlanned").'</td>';
 		print '<td colspan="3">';
 		$date_delivery = ($date_delivery ? $date_delivery : $object->delivery_date);
 		print img_picto('', 'action', 'class="pictofixedwidth"');
@@ -2364,33 +2364,33 @@ 
 		print '</tr>';
 
 		// Delivery delay
-		print '<tr class="fielddeliverydelay"><td>' . $langs->trans('AvailabilityPeriod') . '</td><td>';
+		print '<tr class="fielddeliverydelay"><td>'.$langs->trans('AvailabilityPeriod').'</td><td>';
 		print img_picto('', 'clock', 'class="pictofixedwidth"');
 		$form->selectAvailabilityDelay((GETPOSTISSET('availability_id') ? GETPOST('availability_id') : $availability_id), 'availability_id', '', 1, 'maxwidth200 widthcentpercentminusx');
 		print '</td></tr>';
 
 		// Terms of payment
-		print '<tr><td class="nowrap">' . $langs->trans('PaymentConditionsShort') . '</td><td>';
+		print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td>';
 		print img_picto('', 'payment', 'class="pictofixedwidth"');
 		print $form->getSelectConditionsPaiements((int) $cond_reglement_id, 'cond_reglement_id', 1, 1, 0, 'maxwidth200 widthcentpercentminusx', (float) $deposit_percent);
 		print '</td></tr>';
 
 		// Payment mode
-		print '<tr><td>' . $langs->trans('PaymentMode') . '</td><td>';
+		print '<tr><td>'.$langs->trans('PaymentMode').'</td><td>';
 		print img_picto('', 'bank', 'class="pictofixedwidth"');
 		print $form->select_types_paiements((string) $mode_reglement_id, 'mode_reglement_id', 'CRDT', 0, 1, 0, 0, 1, 'maxwidth200 widthcentpercentminusx', 1);
 		print '</td></tr>';
 
 		// Bank Account
 		if (getDolGlobalString('BANK_ASK_PAYMENT_BANK_DURING_ORDER') && isModEnabled("bank")) {
-			print '<tr><td>' . $langs->trans('BankAccount') . '</td><td>';
-			print img_picto('', 'bank_account', 'class="pictofixedwidth"') . $form->select_comptes((int) $fk_account, 'fk_account', 0, '', 1, '', 0, 'maxwidth200 widthcentpercentminusx', 1);
+			print '<tr><td>'.$langs->trans('BankAccount').'</td><td>';
+			print img_picto('', 'bank_account', 'class="pictofixedwidth"').$form->select_comptes((int) $fk_account, 'fk_account', 0, '', 1, '', 0, 'maxwidth200 widthcentpercentminusx', 1);
 			print '</td></tr>';
 		}
 
 		// Shipping Method
 		if (isModEnabled('shipping')) {
-			print '<tr><td>' . $langs->trans('SendingMethod') . '</td><td>';
+			print '<tr><td>'.$langs->trans('SendingMethod').'</td><td>';
 			print img_picto('', 'object_dolly', 'class="pictofixedwidth"');
 			$form->selectShippingMethod(((GETPOSTISSET('shipping_method_id') && GETPOSTINT('shipping_method_id') != 0) ? GETPOST('shipping_method_id') : $shipping_method_id), 'shipping_method_id', '', 1, '', 0, 'maxwidth200 widthcentpercentminusx');
 			print '</td></tr>';
@@ -2398,15 +2398,15 @@ 
 
 		// Warehouse
 		if (isModEnabled('stock') && getDolGlobalString('WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER')) {
-			require_once DOL_DOCUMENT_ROOT . '/product/class/html.formproduct.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 			$formproduct = new FormProduct($db);
-			print '<tr><td>' . $langs->trans('Warehouse') . '</td><td>';
-			print img_picto('', 'stock', 'class="pictofixedwidth"') . $formproduct->selectWarehouses((GETPOSTISSET('warehouse_id') ? GETPOST('warehouse_id') : $warehouse_id), 'warehouse_id', '', 1, 0, 0, '', 0, 0, array(), 'maxwidth500 widthcentpercentminusxx');
+			print '<tr><td>'.$langs->trans('Warehouse').'</td><td>';
+			print img_picto('', 'stock', 'class="pictofixedwidth"').$formproduct->selectWarehouses((GETPOSTISSET('warehouse_id') ? GETPOST('warehouse_id') : $warehouse_id), 'warehouse_id', '', 1, 0, 0, '', 0, 0, array(), 'maxwidth500 widthcentpercentminusxx');
 			print '</td></tr>';
 		}
 
 		// Source / Channel - What trigger creation
-		print '<tr><td>' . $langs->trans('Source') . '</td><td>';
+		print '<tr><td>'.$langs->trans('Source').'</td><td>';
 		print img_picto('', 'question', 'class="pictofixedwidth"');
 		$form->selectInputReason((GETPOSTISSET('demand_reason_id') ? GETPOST('demand_reason_id') : $demand_reason_id), 'demand_reason_id', '', 1, 'maxwidth200 widthcentpercentminusx');
 		print '</td></tr>';
@@ -2417,9 +2417,9 @@ 
 		if (isModEnabled('project')) {
 			$langs->load("projects");
 			print '<tr>';
-			print '<td>' . $langs->trans("Project") . '</td><td>';
-			print img_picto('', 'project', 'class="pictofixedwidth"') . $formproject->select_projects(($soc->id > 0 ? $soc->id : -1), (GETPOSTISSET('projectid') ? GETPOST('projectid') : $projectid), 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500 widthcentpercentminusxx');
-			print ' <a href="' . DOL_URL_ROOT . '/projet/card.php?socid=' . $soc->id . '&action=create&status=1&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?action=create&socid=' . $soc->id) . '"><span class="fa fa-plus-circle valignmiddle" title="' . $langs->trans("AddProject") . '"></span></a>';
+			print '<td>'.$langs->trans("Project").'</td><td>';
+			print img_picto('', 'project', 'class="pictofixedwidth"').$formproject->select_projects(($soc->id > 0 ? $soc->id : -1), (GETPOSTISSET('projectid') ? GETPOST('projectid') : $projectid), 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500 widthcentpercentminusxx');
+			print ' <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'"><span class="fa fa-plus-circle valignmiddle" title="'.$langs->trans("AddProject").'"></span></a>';
 			print '</td>';
 			print '</tr>';
 		}
@@ -2427,7 +2427,7 @@ 
 		// Incoterms
 		if (isModEnabled('incoterm')) {
 			print '<tr>';
-			print '<td><label for="incoterm_id">' . $form->textwithpicto($langs->trans("IncotermLabel"), !empty($objectsrc->fk_incoterms) ? (string) $objectsrc->fk_incoterms : (string) $soc->fk_incoterms, 1) . '</label></td>';
+			print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), !empty($objectsrc->fk_incoterms) ? (string) $objectsrc->fk_incoterms : (string) $soc->fk_incoterms, 1).'</label></td>';
 			print '<td class="maxwidthonsmartphone">';
 			$incoterm_id = GETPOST('incoterm_id');
 			$location_incoterms = GETPOST('location_incoterms');
@@ -2443,7 +2443,7 @@ 
 		// Other attributes
 		$parameters = array();
 		if (!empty($origin) && !empty($originid) && is_object($objectsrc)) {
-			$parameters['objectsrc'] =  $objectsrc;
+			$parameters['objectsrc'] = $objectsrc;
 		}
 		$parameters['socid'] = $socid;
 
@@ -2464,9 +2464,9 @@ 
 		}
 
 		// Template to use by default
-		print '<tr><td>' . $langs->trans('DefaultModel') . '</td>';
+		print '<tr><td>'.$langs->trans('DefaultModel').'</td>';
 		print '<td>';
-		include_once DOL_DOCUMENT_ROOT . '/core/modules/commande/modules_commande.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';
 		$liste = ModelePDFCommandes::liste_modeles($db);
 		$preselected = getDolGlobalString('COMMANDE_ADDON_PDF');
 		print img_picto('', 'pdf', 'class="pictofixedwidth"');
@@ -2476,22 +2476,22 @@ 
 		// Multicurrency
 		if (isModEnabled("multicurrency")) {
 			print '<tr>';
-			print '<td>' . $form->editfieldkey("Currency", 'multicurrency_code', '', $object, 0) . '</td>';
+			print '<td>'.$form->editfieldkey("Currency", 'multicurrency_code', '', $object, 0).'</td>';
 			print '<td class="maxwidthonsmartphone">';
-			print img_picto('', 'currency', 'class="pictofixedwidth"') . $form->selectMultiCurrency(((GETPOSTISSET('multicurrency_code') && !GETPOST('changecompany')) ? GETPOST('multicurrency_code') : $currency_code), 'multicurrency_code', 0, '', false, 'maxwidth200 widthcentpercentminusx');
+			print img_picto('', 'currency', 'class="pictofixedwidth"').$form->selectMultiCurrency(((GETPOSTISSET('multicurrency_code') && !GETPOST('changecompany')) ? GETPOST('multicurrency_code') : $currency_code), 'multicurrency_code', 0, '', false, 'maxwidth200 widthcentpercentminusx');
 			print '</td></tr>';
 		}
 
 		// Categories
 		if (isModEnabled('category')) {
-			print '<tr><td>' . $langs->trans("Categories") . '</td><td colspan="3">';
+			print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
 			print $form->selectCategories(Categorie::TYPE_ORDER, 'categories', $object);
 			print "</td></tr>";
 		}
 
 		// Note public
 		print '<tr>';
-		print '<td class="tdtop">' . $langs->trans('NotePublic') . '</td>';
+		print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
 		print '<td>';
 
 		$doleditor = new DolEditor('note_public', (string) $note_public, '', 80, 'dolibarr_notes', 'In', false, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PUBLIC') ? 0 : 1, ROWS_3, '90%');
@@ -2502,7 +2502,7 @@ 
 		// Note private
 		if (empty($user->socid)) {
 			print '<tr>';
-			print '<td class="tdtop">' . $langs->trans('NotePrivate') . '</td>';
+			print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
 			print '<td>';
 
 			$doleditor = new DolEditor('note_private', (string) $note_private, '', 80, 'dolibarr_notes', 'In', false, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PRIVATE') ? 0 : 1, ROWS_3, '90%');
@@ -2520,12 +2520,12 @@ 
 				$objectsrc->update_price(1);
 			}
 
-			print "\n<!-- " . $classname . " info -->\n";
-			print '<input type="hidden" name="amount"   value="' . $objectsrc->total_ht . '">' . "\n";
-			print '<input type="hidden" name="total"    value="' . $objectsrc->total_ttc . '">' . "\n";
-			print '<input type="hidden" name="tva"      value="' . $objectsrc->total_tva . '">' . "\n";
-			print '<input type="hidden" name="origin"   value="' . $objectsrc->element . '">';
-			print '<input type="hidden" name="originid" value="' . $objectsrc->id . '">';
+			print "\n<!-- ".$classname." info -->\n";
+			print '<input type="hidden" name="amount"   value="'.$objectsrc->total_ht.'">'."\n";
+			print '<input type="hidden" name="total"    value="'.$objectsrc->total_ttc.'">'."\n";
+			print '<input type="hidden" name="tva"      value="'.$objectsrc->total_tva.'">'."\n";
+			print '<input type="hidden" name="origin"   value="'.$objectsrc->element.'">';
+			print '<input type="hidden" name="originid" value="'.$objectsrc->id.'">';
 
 			switch ($classname) {
 				case 'Propal':
@@ -2544,25 +2544,25 @@ 
 					$newclassname = $classname;
 			}
 
-			print '<tr><td>' . $langs->trans($newclassname) . '</td><td>' . $objectsrc->getNomUrl(1) . '</td></tr>';
+			print '<tr><td>'.$langs->trans($newclassname).'</td><td>'.$objectsrc->getNomUrl(1).'</td></tr>';
 
 			// Amount
-			print '<tr><td>' . $langs->trans('AmountHT') . '</td><td>' . price($objectsrc->total_ht) . '</td></tr>';
-			print '<tr><td>' . $langs->trans('AmountVAT') . '</td><td>' . price($objectsrc->total_tva) . "</td></tr>";
+			print '<tr><td>'.$langs->trans('AmountHT').'</td><td>'.price($objectsrc->total_ht).'</td></tr>';
+			print '<tr><td>'.$langs->trans('AmountVAT').'</td><td>'.price($objectsrc->total_tva)."</td></tr>";
 			if ($mysoc->localtax1_assuj == "1" || $objectsrc->total_localtax1 != 0) { 		// Localtax1 RE
-				print '<tr><td>' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td><td>' . price($objectsrc->total_localtax1) . "</td></tr>";
+				print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td><td>'.price($objectsrc->total_localtax1)."</td></tr>";
 			}
 
 			if ($mysoc->localtax2_assuj == "1" || $objectsrc->total_localtax2 != 0) { 		// Localtax2 IRPF
-				print '<tr><td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td><td>' . price($objectsrc->total_localtax2) . "</td></tr>";
+				print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td><td>'.price($objectsrc->total_localtax2)."</td></tr>";
 			}
 
-			print '<tr><td>' . $langs->trans('AmountTTC') . '</td><td>' . price($objectsrc->total_ttc) . "</td></tr>";
+			print '<tr><td>'.$langs->trans('AmountTTC').'</td><td>'.price($objectsrc->total_ttc)."</td></tr>";
 
 			if (isModEnabled("multicurrency")) {
-				print '<tr><td>' . $langs->trans('MulticurrencyAmountHT') . '</td><td>' . price($objectsrc->multicurrency_total_ht) . '</td></tr>';
-				print '<tr><td>' . $langs->trans('MulticurrencyAmountVAT') . '</td><td>' . price($objectsrc->multicurrency_total_tva) . "</td></tr>";
-				print '<tr><td>' . $langs->trans('MulticurrencyAmountTTC') . '</td><td>' . price($objectsrc->multicurrency_total_ttc) . "</td></tr>";
+				print '<tr><td>'.$langs->trans('MulticurrencyAmountHT').'</td><td>'.price($objectsrc->multicurrency_total_ht).'</td></tr>';
+				print '<tr><td>'.$langs->trans('MulticurrencyAmountVAT').'</td><td>'.price($objectsrc->multicurrency_total_tva)."</td></tr>";
+				print '<tr><td>'.$langs->trans('MulticurrencyAmountTTC').'</td><td>'.price($objectsrc->multicurrency_total_ttc)."</td></tr>";
 			}
 		}
 
@@ -2613,7 +2613,7 @@ 
 
 		// Confirmation to delete
 		if ($action == 'delete') {
-			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteOrder'), $langs->trans('ConfirmDeleteOrder'), 'confirm_delete', '', 0, 1);
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteOrder'), $langs->trans('ConfirmDeleteOrder'), 'confirm_delete', '', 0, 1);
 		}
 
 		// Confirmation of validation
@@ -2632,7 +2632,7 @@ 
 
 			$text = $langs->trans('ConfirmValidateOrder', $numref);
 			if (isModEnabled('notification')) {
-				require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
+				require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
 				$notify = new Notify($db);
 				$text .= '<br>';
 				$text .= $notify->confirmMessage('ORDER_VALIDATE', $object->socid, $object);
@@ -2648,7 +2648,7 @@ 
 			$formquestion = array();
 			if (isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_VALIDATE_ORDER') && $qualified_for_stock_change) {
 				$langs->load("stocks");
-				require_once DOL_DOCUMENT_ROOT . '/product/class/html.formproduct.class.php';
+				require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 				$formproduct = new FormProduct($db);
 				$forcecombo = 0;
 				if ($conf->browser->name == 'ie') {
@@ -2666,7 +2666,7 @@ 
 			$nbMandated = 0;
 			foreach ($object->lines as $line) {
 				$res = $line->fetch_product();
-				if ($res  > 0) {
+				if ($res > 0) {
 					if ($line->product->isService() && $line->product->isMandatoryPeriod() && (empty($line->date_start) || empty($line->date_end))) {
 						$nbMandated++;
 						break;
@@ -2678,7 +2678,7 @@ 
 					setEventMessages($langs->trans("mandatoryPeriodNeedTobeSetMsgValidate"), null, 'errors');
 					$error++;
 				} else {
-					$text .= '<div><span class="clearboth nowraponall warning">' . img_warning() . $langs->trans("mandatoryPeriodNeedTobeSetMsgValidate") . '</span></div>';
+					$text .= '<div><span class="clearboth nowraponall warning">'.img_warning().$langs->trans("mandatoryPeriodNeedTobeSetMsgValidate").'</span></div>';
 				}
 			}
 
@@ -2690,7 +2690,7 @@ 
 				$deposit_percent_from_payment_terms = (float) getDictionaryValue('c_payment_term', 'deposit_percent', $object->cond_reglement_id);
 
 				if (!empty($deposit_percent_from_payment_terms) && isModEnabled('invoice') && $user->hasRight('facture', 'creer')) {
-					require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
+					require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
 					$object->fetchObjectLinked();
 
@@ -2793,7 +2793,7 @@ 
 			}
 
 			if (!$error) {
-				$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('ValidateOrder'), $text, 'confirm_validate', $formquestion, 0, 1, 240);
+				$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateOrder'), $text, 'confirm_validate', $formquestion, 0, 1, 240);
 			}
 		}
 
@@ -2810,7 +2810,7 @@ 
 			$formquestion = array();
 			if (isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_VALIDATE_ORDER') && $qualified_for_stock_change) {
 				$langs->load("stocks");
-				require_once DOL_DOCUMENT_ROOT . '/product/class/html.formproduct.class.php';
+				require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 				$formproduct = new FormProduct($db);
 				$forcecombo = 0;
 				if ($conf->browser->name == 'ie') {
@@ -2829,12 +2829,12 @@ 
 				];
 			}
 
-			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('UnvalidateOrder'), $text, 'confirm_modif', $formquestion, "yes", 1, 220);
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('UnvalidateOrder'), $text, 'confirm_modif', $formquestion, "yes", 1, 220);
 		}
 
 		// Confirmation of closing
 		if ($action == 'shipped') {
-			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('CloseOrder'), $langs->trans('ConfirmCloseOrder'), 'confirm_shipped', '', 0, 1);
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('CloseOrder'), $langs->trans('ConfirmCloseOrder'), 'confirm_shipped', '', 0, 1);
 		}
 
 		// Confirmation of cancellation
@@ -2850,7 +2850,7 @@ 
 			$formquestion = array();
 			if (isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_VALIDATE_ORDER') && $qualified_for_stock_change) {
 				$langs->load("stocks");
-				require_once DOL_DOCUMENT_ROOT . '/product/class/html.formproduct.class.php';
+				require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 				$formproduct = new FormProduct($db);
 				$forcecombo = 0;
 				if ($conf->browser->name == 'ie') {
@@ -2864,12 +2864,12 @@ 
 				);
 			}
 
-			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans("Cancel"), $text, 'confirm_cancel', $formquestion, 0, 1);
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans("Cancel"), $text, 'confirm_cancel', $formquestion, 0, 1);
 		}
 
 		// Confirmation to delete line
 		if ($action == 'ask_deleteline') {
-			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id . '&lineid=' . $lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline', '', 0, 1);
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline', '', 0, 1);
 		}
 
 		// Confirmation de la suppression d'une ligne subtotal
@@ -2882,7 +2882,7 @@ 
 				$title = "DeleteTitleLine";
 				$question = "ConfirmDeleteTitleLine";
 			}
-			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id . '&lineid=' . $lineid, $langs->trans($title), $langs->trans($question), 'confirm_delete_subtotalline', $formconfirm, 'no', 1);
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans($title), $langs->trans($question), 'confirm_delete_subtotalline', $formconfirm, 'no', 1);
 		}
 
 		// Clone confirmation
@@ -2892,7 +2892,7 @@ 
 			$formquestion = array(
 				array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOSTINT('socid'), 'socid', $filter, '', 0, 0, array(), 0, 'maxwidth300'))
 			);
-			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneOrder', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneOrder', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
 		}
 
 		// Subtotal line form
@@ -2900,12 +2900,12 @@ 
 			$langs->load('subtotals');
 			$type = 'title';
 			$depth_array = $object->getPossibleLevels($langs);
-			include DOL_DOCUMENT_ROOT . '/core/tpl/subtotal_create.tpl.php';
+			include DOL_DOCUMENT_ROOT.'/core/tpl/subtotal_create.tpl.php';
 		} elseif ($action == 'add_subtotal_line') {
 			$langs->load('subtotals');
 			$type = 'subtotal';
 			$titles = $object->getPossibleTitles();
-			include DOL_DOCUMENT_ROOT . '/core/tpl/subtotal_create.tpl.php';
+			include DOL_DOCUMENT_ROOT.'/core/tpl/subtotal_create.tpl.php';
 		}
 
 		// Call Hook formConfirm
@@ -2924,16 +2924,16 @@ 
 
 		// Order card
 
-		$linkback = '<a href="' . DOL_URL_ROOT . '/commande/list.php?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/commande/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 		$morehtmlref = '<div class="refidno">';
 		// Ref customer
 		$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, (int) $usercancreate, 'string', '', 0, 1);
-		$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, (int) $usercancreate, 'string' . (isset($conf->global->THIRDPARTY_REF_INPUT_SIZE) ? ':' . getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') : ''), '', null, null, '', 1);
+		$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, (int) $usercancreate, 'string'.(isset($conf->global->THIRDPARTY_REF_INPUT_SIZE) ? ':'.getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') : ''), '', null, null, '', 1);
 		// Thirdparty
-		$morehtmlref .= '<br>' . $soc->getNomUrl(1, 'customer');
+		$morehtmlref .= '<br>'.$soc->getNomUrl(1, 'customer');
 		if (!getDolGlobalString('MAIN_DISABLE_OTHER_LINK') && $object->thirdparty->id > 0) {
-			$morehtmlref .= ' (<a href="' . DOL_URL_ROOT . '/commande/list.php?socid=' . $object->thirdparty->id . '&search_societe=' . urlencode($object->thirdparty->name) . '">' . $langs->trans("OtherOrders") . '</a>)';
+			$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/commande/list.php?socid='.$object->thirdparty->id.'&search_societe='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherOrders").'</a>)';
 		}
 		// Project
 		if (isModEnabled('project')) {
@@ -2942,16 +2942,16 @@ 
 			if ($usercancreate) {
 				$morehtmlref .= img_picto($langs->trans("Project"), 'project', 'class="pictofixedwidth"');
 				if ($action != 'classify') {
-					$morehtmlref .= '<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token=' . newToken() . '&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> ';
+					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 				}
-				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, (string) $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, (string) $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 			} else {
 				if (!empty($object->fk_project)) {
 					$proj = new Project($db);
 					$proj->fetch($object->fk_project);
 					$morehtmlref .= $proj->getNomUrl(1);
 					if ($proj->title) {
-						$morehtmlref .= '<span class="opacitymedium"> - ' . dol_escape_htmltag($proj->title) . '</span>';
+						$morehtmlref .= '<span class="opacitymedium"> - '.dol_escape_htmltag($proj->title).'</span>';
 					}
 				}
 			}
@@ -2979,20 +2979,20 @@ 
 				print $form->textwithpicto($langs->trans('PointOfSale'), $langs->trans('POSInfo'));
 				print '</td>';
 				if ($action != 'editposinfo' && $usercancreate) {
-					print '<td class="right"><a class="editfielda" href="' . $_SERVER["PHP_SELF"] . '?action=editposinfo&token=' . newToken() . '&id=' . $object->id . '">' . img_edit($langs->trans('SetPOSInfo'), 1) . '</a></td>';
+					print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editposinfo&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetPOSInfo'), 1).'</a></td>';
 				}
 				print '</tr></table>';
 				print '</td><td class="valuefield fieldname_type">';
-				print '<form method="POST" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" name="formposinfo">';
+				print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" name="formposinfo">';
 				print '<input type="hidden" name="action" value="setposinfo">';
-				print '<input type="hidden" name="token" value="' . newToken() . '">';
+				print '<input type="hidden" name="token" value="'.newToken().'">';
 				if ($action == 'editposinfo') {
-					print '<input type="text" class="maxwidth150" name="posmodule" placeholder="' . $langs->trans("POSModule") . '" value="' . $object->module_source . '"> ';
-					print '<input type="text" class="maxwidth100" name="posterminal" placeholder="' . $langs->trans("Terminal") . '" value="' . $object->pos_source . '">';
-					print '<input type="submit" class="button" name="submitposinfo" value="' . $langs->trans("Submit") . '">';
+					print '<input type="text" class="maxwidth150" name="posmodule" placeholder="'.$langs->trans("POSModule").'" value="'.$object->module_source.'"> ';
+					print '<input type="text" class="maxwidth100" name="posterminal" placeholder="'.$langs->trans("Terminal").'" value="'.$object->pos_source.'">';
+					print '<input type="submit" class="button" name="submitposinfo" value="'.$langs->trans("Submit").'">';
 				} else {
 					if ($object->module_source) {
-						print '<span class="opacitymediumbycolor paddingleft">' . dolPrintHTML(ucfirst($object->module_source) . ' - ' . $langs->transnoentitiesnoconv("Terminal") . ' ' . $object->pos_source) . '</span>';
+						print '<span class="opacitymediumbycolor paddingleft">'.dolPrintHTML(ucfirst($object->module_source).' - '.$langs->transnoentitiesnoconv("Terminal").' '.$object->pos_source).'</span>';
 					}
 				}
 				print '</form>';
@@ -3005,7 +3005,7 @@ 
 				print $langs->trans('OutstandingBill');
 				print '</td><td class="valuefield">';
 				$arrayoutstandingbills = $soc->getOutstandingBills();
-				print price($arrayoutstandingbills['opened']) . ' / ';
+				print price($arrayoutstandingbills['opened']).' / ';
 				print price($soc->outstanding_limit, 0, '', 1, -1, -1, $conf->currency);
 				print '</td>';
 				print '</tr>';
@@ -3020,11 +3020,11 @@ 
 				$filtercreditnote = "fk_facture_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS RECEIVED)%')";
 			}
 
-			$addrelativediscount = '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("EditRelativeDiscounts") . '</a>';
-			$addabsolutediscount = '<a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("EditGlobalDiscounts") . '</a>';
-			$addcreditnote = '<a href="' . DOL_URL_ROOT . '/compta/facture/card.php?action=create&socid=' . $soc->id . '&type=2&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("AddCreditNote") . '</a>';
+			$addrelativediscount = '<a href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$soc->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"]).'?facid='.$object->id.'">'.$langs->trans("EditRelativeDiscounts").'</a>';
+			$addabsolutediscount = '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$soc->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"]).'?facid='.$object->id.'">'.$langs->trans("EditGlobalDiscounts").'</a>';
+			$addcreditnote = '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&socid='.$soc->id.'&type=2&backtopage='.urlencode($_SERVER["PHP_SELF"]).'?facid='.$object->id.'">'.$langs->trans("AddCreditNote").'</a>';
 
-			print '<tr><td class="titlefield">' . $langs->trans('Discounts') . '</td><td class="valuefield">';
+			print '<tr><td class="titlefield">'.$langs->trans('Discounts').'</td><td class="valuefield">';
 
 			$absolute_discount = $soc->getAvailableDiscounts(null, $filterabsolutediscount);
 			$absolute_creditnote = $soc->getAvailableDiscounts(null, $filtercreditnote);
@@ -3033,8 +3033,8 @@ 
 
 			$thirdparty = $soc;
 			$discount_type = 0;
-			$backtopage = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
-			include DOL_DOCUMENT_ROOT . '/core/tpl/object_discounts.tpl.php';
+			$backtopage = $_SERVER["PHP_SELF"].'?id='.$object->id;
+			include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';
 
 			print '</td></tr>';
 
@@ -3044,17 +3044,17 @@ 
 			print $form->editfieldkey("Date", 'date', '', $object, (int) $editenable);
 			print '</td><td class="valuefield">';
 			if ($action == 'editdate') {
-				print '<form name="setdate" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="post">';
-				print '<input type="hidden" name="token" value="' . newToken() . '">';
+				print '<form name="setdate" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
+				print '<input type="hidden" name="token" value="'.newToken().'">';
 				print '<input type="hidden" name="action" value="setdate">';
-				print '<input type="hidden" name="backtopage" value="' . $backtopage . '">';
+				print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 				print $form->selectDate($object->date, 'order_', 0, 0, 0, "setdate");
-				print '<input type="submit" class="button button-edit" value="' . $langs->trans('Modify') . '">';
+				print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
 				print '</form>';
 			} else {
 				print $object->date ? dol_print_date($object->date, 'day') : '&nbsp;';
 				if ($object->hasDelay() && empty($object->delivery_date)) {	// If there is a delivery date planned, warning should be on this date
-					print ' ' . img_picto($langs->trans("Late") . ' : ' . $object->showDelay(), "warning");
+					print ' '.img_picto($langs->trans("Late").' : '.$object->showDelay(), "warning");
 				}
 			}
 			print '</td>';
@@ -3066,17 +3066,17 @@ 
 			print $form->editfieldkey("DateDeliveryPlanned", 'date_livraison', '', $object, (int) $editenable);
 			print '</td><td class="valuefield">';
 			if ($action == 'editdate_livraison') {
-				print '<form name="setdate_livraison" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="post">';
-				print '<input type="hidden" name="token" value="' . newToken() . '">';
+				print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
+				print '<input type="hidden" name="token" value="'.newToken().'">';
 				print '<input type="hidden" name="action" value="setdate_livraison">';
-				print '<input type="hidden" name="backtopage" value="' . $backtopage . '">';
+				print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 				print $form->selectDate($object->delivery_date ? $object->delivery_date : -1, 'liv_', 1, 1, 0, "setdate_livraison", 1, 0);
-				print '<input type="submit" class="button button-edit" value="' . $langs->trans('Modify') . '">';
+				print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
 				print '</form>';
 			} else {
 				print $object->delivery_date ? dol_print_date($object->delivery_date, 'dayhour') : '&nbsp;';
 				if ($object->hasDelay() && !empty($object->delivery_date)) {
-					print ' ' . img_picto($langs->trans("Late") . ' : ' . $object->showDelay(), "warning");
+					print ' '.img_picto($langs->trans("Late").' : '.$object->showDelay(), "warning");
 				}
 			}
 			print '</td>';
@@ -3088,9 +3088,9 @@ 
 			print $form->editfieldkey("AvailabilityPeriod", 'availability', '', $object, (int) $editenable);
 			print '</td><td class="valuefield">';
 			if ($action == 'editavailability') {
-				$form->form_availability($_SERVER['PHP_SELF'] . '?id=' . $object->id, (string) $object->availability_id, 'availability_id', 1);
+				$form->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id, (string) $object->availability_id, 'availability_id', 1);
 			} else {
-				$form->form_availability($_SERVER['PHP_SELF'] . '?id=' . $object->id, (string) $object->availability_id, 'none', 1);
+				$form->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id, (string) $object->availability_id, 'none', 1);
 			}
 			print '</td></tr>';
 
@@ -3101,9 +3101,9 @@ 
 				print $form->editfieldkey("SendingMethod", 'shippingmethod', '', $object, (int) $editenable);
 				print '</td><td class="valuefield">';
 				if ($action == 'editshippingmethod') {
-					$form->formSelectShippingMethod($_SERVER['PHP_SELF'] . '?id=' . $object->id, (string) $object->shipping_method_id, 'shipping_method_id', 1);
+					$form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?id='.$object->id, (string) $object->shipping_method_id, 'shipping_method_id', 1);
 				} else {
-					$form->formSelectShippingMethod($_SERVER['PHP_SELF'] . '?id=' . $object->id, (string) $object->shipping_method_id, 'none');
+					$form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?id='.$object->id, (string) $object->shipping_method_id, 'none');
 				}
 				print '</td>';
 				print '</tr>';
@@ -3112,16 +3112,16 @@ 
 			// Warehouse
 			if (isModEnabled('stock') && getDolGlobalString('WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER')) {
 				$langs->load('stocks');
-				require_once DOL_DOCUMENT_ROOT . '/product/class/html.formproduct.class.php';
+				require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 				$formproduct = new FormProduct($db);
 				print '<tr><td>';
 				$editenable = $usercancreate;
 				print $form->editfieldkey("Warehouse", 'warehouse', '', $object, (int) $editenable);
 				print '</td><td class="valuefield">';
 				if ($action == 'editwarehouse') {
-					$formproduct->formSelectWarehouses($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->warehouse_id, 'warehouse_id', 1);
+					$formproduct->formSelectWarehouses($_SERVER['PHP_SELF'].'?id='.$object->id, $object->warehouse_id, 'warehouse_id', 1);
 				} else {
-					$formproduct->formSelectWarehouses($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->warehouse_id, 'none');
+					$formproduct->formSelectWarehouses($_SERVER['PHP_SELF'].'?id='.$object->id, $object->warehouse_id, 'none');
 				}
 				print '</td>';
 				print '</tr>';
@@ -3133,9 +3133,9 @@ 
 			print $form->editfieldkey("Source", 'demandreason', '', $object, (int) $editenable);
 			print '</td><td class="valuefield">';
 			if ($action == 'editdemandreason') {
-				$form->formInputReason($_SERVER['PHP_SELF'] . '?id=' . $object->id, (string) $object->demand_reason_id, 'demand_reason_id', 1);
+				$form->formInputReason($_SERVER['PHP_SELF'].'?id='.$object->id, (string) $object->demand_reason_id, 'demand_reason_id', 1);
 			} else {
-				$form->formInputReason($_SERVER['PHP_SELF'] . '?id=' . $object->id, (string) $object->demand_reason_id, 'none');
+				$form->formInputReason($_SERVER['PHP_SELF'].'?id='.$object->id, (string) $object->demand_reason_id, 'none');
 			}
 			print '</td></tr>';
 
@@ -3145,9 +3145,9 @@ 
 			print $form->editfieldkey("PaymentConditionsShort", 'conditions', '', $object, (int) $editenable);
 			print '</td><td class="valuefield">';
 			if ($action == 'editconditions') {
-				$form->form_conditions_reglement($_SERVER['PHP_SELF'] . '?id=' . $object->id, (string) $object->cond_reglement_id, 'cond_reglement_id', 1, '', 1, $object->deposit_percent);
+				$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, (string) $object->cond_reglement_id, 'cond_reglement_id', 1, '', 1, $object->deposit_percent);
 			} else {
-				$form->form_conditions_reglement($_SERVER['PHP_SELF'] . '?id=' . $object->id, (string) $object->cond_reglement_id, 'none', 1, '', 1, $object->deposit_percent);
+				$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, (string) $object->cond_reglement_id, 'none', 1, '', 1, $object->deposit_percent);
 			}
 			print '</td>';
 
@@ -3159,9 +3159,9 @@ 
 			print $form->editfieldkey("PaymentMode", 'mode', '', $object, (int) $editenable);
 			print '</td><td class="valuefield">';
 			if ($action == 'editmode') {
-				$form->form_modes_reglement($_SERVER['PHP_SELF'] . '?id=' . $object->id, (string) $object->mode_reglement_id, 'mode_reglement_id', 'CRDT', 1, 1);
+				$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, (string) $object->mode_reglement_id, 'mode_reglement_id', 'CRDT', 1, 1);
 			} else {
-				$form->form_modes_reglement($_SERVER['PHP_SELF'] . '?id=' . $object->id, (string) $object->mode_reglement_id, 'none');
+				$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, (string) $object->mode_reglement_id, 'none');
 			}
 			print '</td></tr>';
 
@@ -3183,13 +3183,13 @@ 
 			$totalWeight = $tmparray['weight'];
 			$totalVolume = $tmparray['volume'];
 			if ($totalWeight) {
-				print '<tr><td>' . $langs->trans("CalculatedWeight") . '</td>';
+				print '<tr><td>'.$langs->trans("CalculatedWeight").'</td>';
 				print '<td class="valuefield">';
 				print showDimensionInBestUnit($totalWeight, 0, "weight", $langs, getDolGlobalInt('MAIN_WEIGHT_DEFAULT_ROUND', -1), isset($conf->global->MAIN_WEIGHT_DEFAULT_UNIT) ? $conf->global->MAIN_WEIGHT_DEFAULT_UNIT : 'no');
 				print '</td></tr>';
 			}
 			if ($totalVolume) {
-				print '<tr><td>' . $langs->trans("CalculatedVolume") . '</td>';
+				print '<tr><td>'.$langs->trans("CalculatedVolume").'</td>';
 				print '<td class="valuefield">';
 				print showDimensionInBestUnit($totalVolume, 0, "volume", $langs, getDolGlobalInt('MAIN_VOLUME_DEFAULT_ROUND', -1), isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT) ? $conf->global->MAIN_VOLUME_DEFAULT_UNIT : 'no');
 				print '</td></tr>';
@@ -3207,7 +3207,7 @@ 
 				if ($action != 'editincoterm') {
 					print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
 				} else {
-					print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'] . '?id=' . $object->id);
+					print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
 				}
 				print '</td></tr>';
 			}
@@ -3219,9 +3219,9 @@ 
 				print $form->editfieldkey("BankAccount", 'bankaccount', '', $object, (int) $editenable);
 				print '</td><td class="valuefield">';
 				if ($action == 'editbankaccount') {
-					$form->formSelectAccount($_SERVER['PHP_SELF'] . '?id=' . $object->id, (string) $object->fk_account, 'fk_account', 1);
+					$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, (string) $object->fk_account, 'fk_account', 1);
 				} else {
-					$form->formSelectAccount($_SERVER['PHP_SELF'] . '?id=' . $object->id, (string) $object->fk_account, 'none');
+					$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, (string) $object->fk_account, 'none');
 				}
 				print '</td>';
 				print '</tr>';
@@ -3234,7 +3234,7 @@ 
 				print $langs->trans("Categories");
 				print '<td><td class="right">';
 				if ($usercancreate) {
-					print '<a class="editfielda" href="' . DOL_URL_ROOT . '/commande/card.php?id=' . $object->id . '&action=edittags&token=' . newToken() . '">' . img_edit() . '</a>';
+					print '<a class="editfielda" href="'.DOL_URL_ROOT.'/commande/card.php?id='.$object->id.'&action=edittags&token='.newToken().'">'.img_edit().'</a>';
 				} else {
 					print '&nbsp;';
 				}
@@ -3242,11 +3242,11 @@ 
 				print '</td>';
 				print '<td>';
 				if ($action == 'edittags') {
-					print '<form method="POST" action="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '">';
+					print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
 					print '<input type="hidden" name="action" value="settags">';
-					print '<input type="hidden" name="token" value="' . newToken() . '">';
+					print '<input type="hidden" name="token" value="'.newToken().'">';
 					print $form->selectCategories(Categorie::TYPE_ORDER, 'categories', $object);
-					print '<input type="submit" class="button valignmiddle smallpaddingimp" value="' . $langs->trans("Modify") . '">';
+					print '<input type="submit" class="button valignmiddle smallpaddingimp" value="'.$langs->trans("Modify").'">';
 					print '</form>';
 				} else {
 					print $form->showCategories($object->id, Categorie::TYPE_ORDER, 1);
@@ -3255,7 +3255,7 @@ 
 			}
 
 			// Other attributes
-			include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 			print '</table>';
 
@@ -3265,40 +3265,40 @@ 
 
 			print '<table class="border tableforfield centpercent">';
 
-			include DOL_DOCUMENT_ROOT . '/core/tpl/object_currency_amount.tpl.php';
+			include DOL_DOCUMENT_ROOT.'/core/tpl/object_currency_amount.tpl.php';
 
 			$alert = '';
 			if (getDolGlobalString('ORDER_MANAGE_MIN_AMOUNT') && $object->total_ht < $object->thirdparty->order_min_amount) {
-				$alert = ' ' . img_warning($langs->trans('OrderMinAmount') . ': ' . price($object->thirdparty->order_min_amount));
+				$alert = ' '.img_warning($langs->trans('OrderMinAmount').': '.price($object->thirdparty->order_min_amount));
 			}
 
 			print '<tr>';
-			print '<td class="titlefieldmiddle">' . $langs->trans('AmountHT') . '</td>';
-			print '<td class="nowrap amountcard right">' . price($object->total_ht, 0, $langs, 0, -1, -1, $conf->currency) . '</td>';
+			print '<td class="titlefieldmiddle">'.$langs->trans('AmountHT').'</td>';
+			print '<td class="nowrap amountcard right">'.price($object->total_ht, 0, $langs, 0, -1, -1, $conf->currency).'</td>';
 			if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
 				// Multicurrency Amount HT
-				print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_ht, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+				print '<td class="nowrap amountcard right">'.price($object->multicurrency_total_ht, 0, $langs, 0, -1, -1, $object->multicurrency_code).'</td>';
 			}
 			print '</tr>';
 
 			print '<tr>';
-			print '<td class="titlefieldmiddle">' . $langs->trans('AmountVAT') . '</td>';
-			print '<td class="nowrap amountcard right">' . price($object->total_tva, 0, $langs, 0, -1, -1, $conf->currency) . '</td>';
+			print '<td class="titlefieldmiddle">'.$langs->trans('AmountVAT').'</td>';
+			print '<td class="nowrap amountcard right">'.price($object->total_tva, 0, $langs, 0, -1, -1, $conf->currency).'</td>';
 			if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
 				// Multicurrency Amount VAT
-				print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_tva, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+				print '<td class="nowrap amountcard right">'.price($object->multicurrency_total_tva, 0, $langs, 0, -1, -1, $object->multicurrency_code).'</td>';
 			}
 			print '</tr>';
 
 			// Amount Local Taxes
 			if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) {
 				print '<tr>';
-				print '<td class="titlefieldmiddle">' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td>';
-				print '<td class="nowrap amountcard right">' . price($object->total_localtax1, 0, $langs, 0, -1, -1, $conf->currency) . '</td>';
+				print '<td class="titlefieldmiddle">'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td>';
+				print '<td class="nowrap amountcard right">'.price($object->total_localtax1, 0, $langs, 0, -1, -1, $conf->currency).'</td>';
 				if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
 					$object->multicurrency_total_localtax1 = price2num($object->total_localtax1 * $object->multicurrency_tx, 'MT');
 
-					print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_localtax1, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+					print '<td class="nowrap amountcard right">'.price($object->multicurrency_total_localtax1, 0, $langs, 0, -1, -1, $object->multicurrency_code).'</td>';
 				}
 				print '</tr>';
 			}
@@ -3306,24 +3306,24 @@ 
 			// Amount Local Taxes
 			if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) {
 				print '<tr>';
-				print '<td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td>';
-				print '<td class="nowrap amountcard right">' . price($object->total_localtax2, 0, $langs, 0, -1, -1, $conf->currency) . '</td>';
+				print '<td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td>';
+				print '<td class="nowrap amountcard right">'.price($object->total_localtax2, 0, $langs, 0, -1, -1, $conf->currency).'</td>';
 				if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
 					$object->multicurrency_total_localtax2 = price2num($object->total_localtax2 * $object->multicurrency_tx, 'MT');
 
-					print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_localtax2, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+					print '<td class="nowrap amountcard right">'.price($object->multicurrency_total_localtax2, 0, $langs, 0, -1, -1, $object->multicurrency_code).'</td>';
 				}
 				print '</tr>';
 			}
 
 			print '<tr>';
-			print '<td>' . $langs->trans('AmountTTC') . '</td>';
-			print '<td class="valuefield nowrap right amountcard">' . price($object->total_ttc, 1, '', 1, -1, -1, $conf->currency) . '</td>';
+			print '<td>'.$langs->trans('AmountTTC').'</td>';
+			print '<td class="valuefield nowrap right amountcard">'.price($object->total_ttc, 1, '', 1, -1, -1, $conf->currency).'</td>';
 			if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
 				// Multicurrency Amount TTC
-				print '<td class="valuefield nowrap right amountcard">' . price($object->multicurrency_total_ttc, 1, '', 1, -1, -1, $object->multicurrency_code) . '</td>';
+				print '<td class="valuefield nowrap right amountcard">'.price($object->multicurrency_total_ttc, 1, '', 1, -1, -1, $object->multicurrency_code).'</td>';
 			}
-			print '</tr>' . "\n";
+			print '</tr>'."\n";
 
 			print '</table>';
 
@@ -3344,13 +3344,13 @@ 
 			if (getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB')) {
 				$blocname = 'contacts';
 				$title = $langs->trans('ContactsAddresses');
-				include DOL_DOCUMENT_ROOT . '/core/tpl/bloc_showhide.tpl.php';
+				include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
 			}
 
 			if (getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {
 				$blocname = 'notes';
 				$title = $langs->trans('Notes');
-				include DOL_DOCUMENT_ROOT . '/core/tpl/bloc_showhide.tpl.php';
+				include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
 			}
 
 			/*
@@ -3365,20 +3365,20 @@ 
 			global $inputalsopricewithtax;
 			$inputalsopricewithtax = 1;
 
-			print '<form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="POST">
-			<input type="hidden" name="token" value="' . newToken() . '">
-			<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline') . '">
+			print '<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST">
+			<input type="hidden" name="token" value="' . newToken().'">
+			<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
 			<input type="hidden" name="mode" value="">
 			<input type="hidden" name="page_y" value="">
-			<input type="hidden" name="id" value="' . $object->id . '">
-			<input type="hidden" name="backtopage" value="' . $backtopage . '">
+			<input type="hidden" name="id" value="' . $object->id.'">
+			<input type="hidden" name="backtopage" value="' . $backtopage.'">
 				';
 
 			if (!empty($conf->use_javascript_ajax) && $object->status == Commande::STATUS_DRAFT) {
 				if (isModEnabled('subtotals')) {
-					include DOL_DOCUMENT_ROOT . '/core/tpl/subtotal_ajaxrow.tpl.php';
+					include DOL_DOCUMENT_ROOT.'/core/tpl/subtotal_ajaxrow.tpl.php';
 				} else {
-					include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
+					include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
 				}
 			}
 
@@ -3433,22 +3433,22 @@ 
 
 				// Reopen a closed order
 				if (($object->status == Commande::STATUS_CLOSED || $object->status == Commande::STATUS_CANCELED) && $usercancreate && (!$object->billed || !getDolGlobalInt('ORDER_DONT_REOPEN_BILLED'))) {
-					print dolGetButtonAction('', $langs->trans('ReOpen'), 'default', $_SERVER["PHP_SELF"] . '?action=reopen&amp;token=' . newToken() . '&amp;id=' . $object->id, '');
+					print dolGetButtonAction('', $langs->trans('ReOpen'), 'default', $_SERVER["PHP_SELF"].'?action=reopen&amp;token='.newToken().'&amp;id='.$object->id, '');
 				}
 
 				// Send
 				if (empty($user->socid)) {
 					if ($object->status > Commande::STATUS_DRAFT || getDolGlobalString('COMMANDE_SENDBYEMAIL_FOR_ALL_STATUS')) {
 						if ($usercansend) {
-							print dolGetButtonAction('', $langs->trans('SendMail'), 'email', $_SERVER["PHP_SELF"] . '?action=presend&token=' . newToken() . '&id=' . $object->id . '&mode=init#formmailbeforetitle', '');
+							print dolGetButtonAction('', $langs->trans('SendMail'), 'email', $_SERVER["PHP_SELF"].'?action=presend&token='.newToken().'&id='.$object->id.'&mode=init#formmailbeforetitle', '');
 						} else {
-							print dolGetButtonAction('', $langs->trans('SendMail'), 'email', $_SERVER['PHP_SELF'] . '#', '', false);
+							print dolGetButtonAction('', $langs->trans('SendMail'), 'email', $_SERVER['PHP_SELF'].'#', '', false);
 						}
 					}
 				}
 
 				// Subtotal
-				if ($object->status == Commande::STATUS_DRAFT && isModEnabled('subtotals') && getDolGlobalString('SUBTOTAL_TITLE_' . strtoupper($object->element))) {
+				if ($object->status == Commande::STATUS_DRAFT && isModEnabled('subtotals') && getDolGlobalString('SUBTOTAL_TITLE_'.strtoupper($object->element))) {
 					$langs->load('subtotals');
 
 					$url_button = array();
@@ -3458,7 +3458,7 @@ 
 						'enabled' => (isModEnabled('order') && $object->status == Commande::STATUS_DRAFT),
 						'perm' => (bool) $usercancreate,
 						'label' => $langs->trans('AddTitleLine'),
-						'url' => '/commande/card.php?id=' . $object->id . '&action=add_title_line&token=' . newToken()
+						'url' => '/commande/card.php?id='.$object->id.'&action=add_title_line&token='.newToken()
 					);
 
 					$url_button[] = array(
@@ -3466,7 +3466,7 @@ 
 						'enabled' => (isModEnabled('order') && $object->status == Commande::STATUS_DRAFT),
 						'perm' => (bool) $usercancreate,
 						'label' => $langs->trans('AddSubtotalLine'),
-						'url' => '/commande/card.php?id=' . $object->id . '&action=add_subtotal_line&token=' . newToken()
+						'url' => '/commande/card.php?id='.$object->id.'&action=add_subtotal_line&token='.newToken()
 					);
 					print dolGetButtonAction('', $langs->trans('Subtotal'), 'default', $url_button, '', true);
 				}
@@ -3474,15 +3474,15 @@ 
 				// Valid
 				if ($object->status == Commande::STATUS_DRAFT && ($object->total_ttc >= 0 || getDolGlobalString('ORDER_ENABLE_NEGATIVE')) && $usercanvalidate) {
 					if ($numlines > 0) {
-						print dolGetButtonAction('', $langs->trans('Validate'), 'default', $_SERVER["PHP_SELF"] . '?action=validate&amp;token=' . newToken() . '&amp;id=' . $object->id, (string) $object->id, 1);
+						print dolGetButtonAction('', $langs->trans('Validate'), 'default', $_SERVER["PHP_SELF"].'?action=validate&amp;token='.newToken().'&amp;id='.$object->id, (string) $object->id, 1);
 					} else {
 						$langs->load("errors");
-						print dolGetButtonAction($langs->trans("ErrorObjectMustHaveLinesToBeValidated", $object->ref), $langs->trans('Validate'), 'default', $_SERVER["PHP_SELF"] . '?action=validate&amp;token=' . newToken() . '&amp;id=' . $object->id, (string) $object->id, -1);
+						print dolGetButtonAction($langs->trans("ErrorObjectMustHaveLinesToBeValidated", $object->ref), $langs->trans('Validate'), 'default', $_SERVER["PHP_SELF"].'?action=validate&amp;token='.newToken().'&amp;id='.$object->id, (string) $object->id, -1);
 					}
 				}
 				// Edit
 				if (($object->status == Commande::STATUS_VALIDATED || ($object->status == Commande::STATUS_SHIPMENTONPROCESS && getDolGlobalString('EDIT_ORDER_SHIPMENT_ON_PROCESS'))) && $usercancreate) {
-					print dolGetButtonAction('', $langs->trans('Modify'), 'default', $_SERVER["PHP_SELF"] . '?action=modif&amp;token=' . newToken() . '&amp;id=' . $object->id, '');
+					print dolGetButtonAction('', $langs->trans('Modify'), 'default', $_SERVER["PHP_SELF"].'?action=modif&amp;token='.newToken().'&amp;id='.$object->id, '');
 				}
 
 				$arrayforbutaction = array();
@@ -3494,7 +3494,7 @@ 
 						'enabled' => (isModEnabled("supplier_order") && $object->status > Commande::STATUS_DRAFT),
 						'perm' => $usercancreatepurchaseorder,
 						'label' => 'AddPurchaseOrder',
-						'url' => '/fourn/commande/card.php?action=create&amp;origin=' . urlencode($object->element) . '&amp;originid=' . ((int) $object->id)
+						'url' => '/fourn/commande/card.php?action=create&amp;origin='.urlencode($object->element).'&amp;originid='.((int) $object->id)
 					);
 				}
 
@@ -3511,7 +3511,7 @@ 
 						'enabled' => (isModEnabled("intervention") && $object->status > Commande::STATUS_DRAFT && $object->status < Commande::STATUS_CLOSED && $object->getNbOfServicesLines() > 0),
 						'perm' => ($user->hasRight('ficheinter', 'creer') == 1),
 						'label' => 'AddIntervention',
-						'url' => '/fichinter/card.php?action=create&origin=' . urlencode($object->element) . '&originid=' . ((int) $object->id) . '&socid=' . ((int) $object->socid),
+						'url' => '/fichinter/card.php?action=create&origin='.urlencode($object->element).'&originid='.((int) $object->id).'&socid='.((int) $object->socid),
 					);
 				}
 
@@ -3521,7 +3521,7 @@ 
 					'enabled' => (isModEnabled("contract") && ($object->status == Commande::STATUS_VALIDATED || $object->status == Commande::STATUS_SHIPMENTONPROCESS || $object->status == Commande::STATUS_CLOSED)),
 					'perm' => ($user->hasRight('contrat', 'creer') == 1),
 					'label' => 'AddContract',
-					'url' => '/contrat/card.php?action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid,
+					'url' => '/contrat/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid,
 				);
 				/*if (isModEnabled('contrat') && ($object->status == Commande::STATUS_VALIDATED || $object->status == Commande::STATUS_SHIPMENTONPROCESS || $object->status == Commande::STATUS_CLOSED)) {
 					$langs->load("contracts");
@@ -3545,7 +3545,7 @@ 
 								'enabled' => (isModEnabled("shipping") && ($object->status > Commande::STATUS_DRAFT && $object->status < Commande::STATUS_CLOSED && ($object->getNbOfProductsLines() > 0 || getDolGlobalString('STOCK_SUPPORTS_SERVICES')))),
 								'perm' => $user->hasRight('expedition', 'creer'),
 								'label' => 'CreateShipment',
-								'url' => '/expedition/shipment.php?id=' . $object->id
+								'url' => '/expedition/shipment.php?id='.$object->id
 							);
 						} else {
 							//c$langs->load("errors");
@@ -3555,7 +3555,7 @@ 
 								'enabled' => (isModEnabled("shipping") && ($object->status > Commande::STATUS_DRAFT && $object->status < Commande::STATUS_CLOSED && ($object->getNbOfProductsLines() > 0 || getDolGlobalString('STOCK_SUPPORTS_SERVICES')))),
 								'perm' => 0,
 								'label' => 'CreateShipment',
-								'url' => '/expedition/shipment.php?id=' . $object->id
+								'url' => '/expedition/shipment.php?id='.$object->id
 							);
 						}
 					}
@@ -3567,7 +3567,7 @@ 
 					'enabled' => (isModEnabled('invoice') && $object->status > Commande::STATUS_DRAFT && !$object->billed && $object->total_ttc >= 0),
 					'perm' => ($user->hasRight('facture', 'creer') && !getDolGlobalInt('WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER')),
 					'label' => 'CreateBill',
-					'url' => '/compta/facture/card.php?action=create&amp;token=' . newToken() . '&amp;origin=' . urlencode($object->element) . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid
+					'url' => '/compta/facture/card.php?action=create&amp;token='.newToken().'&amp;origin='.urlencode($object->element).'&amp;originid='.$object->id.'&amp;socid='.$object->socid
 				);
 				/*
 				 if (isModEnabled('facture') && $object->status > Commande::STATUS_DRAFT && !$object->billed && $object->total_ttc >= 0) {
@@ -3588,38 +3588,38 @@ 
 
 				// Set to shipped
 				if (($object->status == Commande::STATUS_VALIDATED || $object->status == Commande::STATUS_SHIPMENTONPROCESS) && $usercanclose) {
-					print dolGetButtonAction('', $langs->trans('ClassifyShipped'), 'default', $_SERVER["PHP_SELF"] . '?action=shipped&amp;token=' . newToken() . '&amp;id=' . $object->id, '');
+					print dolGetButtonAction('', $langs->trans('ClassifyShipped'), 'default', $_SERVER["PHP_SELF"].'?action=shipped&amp;token='.newToken().'&amp;id='.$object->id, '');
 				}
 
 				// Set billed or unbilled
 				// Note: Even if module invoice is not enabled, we should be able to use button "Classified billed"
 				if ($object->status > Commande::STATUS_DRAFT && !$object->billed && $object->total_ttc >= 0) {
 					if ($usercancreate && $object->status >= Commande::STATUS_VALIDATED && !getDolGlobalString('ORDER_DISABLE_CLASSIFY_BILLED_FROM_ORDER') && !getDolGlobalString('WORKFLOW_BILL_ON_SHIPMENT')) {
-						print dolGetButtonAction('', $langs->trans('ClassifyBilled'), 'default', $_SERVER["PHP_SELF"] . '?action=classifybilled&amp;token=' . newToken() . '&amp;id=' . $object->id, '');
+						print dolGetButtonAction('', $langs->trans('ClassifyBilled'), 'default', $_SERVER["PHP_SELF"].'?action=classifybilled&amp;token='.newToken().'&amp;id='.$object->id, '');
 					}
 				}
 				if ($object->status > Commande::STATUS_DRAFT && $object->billed) {
 					if ($usercancreate && $object->status >= Commande::STATUS_VALIDATED && !getDolGlobalString('ORDER_DISABLE_CLASSIFY_BILLED_FROM_ORDER') && !getDolGlobalString('WORKFLOW_BILL_ON_SHIPMENT')) {
-						print dolGetButtonAction('', $langs->trans('ClassifyUnBilled'), 'delete', $_SERVER["PHP_SELF"] . '?action=classifyunbilled&amp;token=' . newToken() . '&amp;id=' . $object->id, '');
+						print dolGetButtonAction('', $langs->trans('ClassifyUnBilled'), 'delete', $_SERVER["PHP_SELF"].'?action=classifyunbilled&amp;token='.newToken().'&amp;id='.$object->id, '');
 					}
 				}
 
 				// Clone
 				if ($usercancreate) {
-					print dolGetButtonAction('', $langs->trans('ToClone'), 'default', $_SERVER["PHP_SELF"] . '?action=clone&token=' . newToken() . '&id=' . $object->id . '&socid=' . $object->socid, '');
+					print dolGetButtonAction('', $langs->trans('ToClone'), 'default', $_SERVER["PHP_SELF"].'?action=clone&token='.newToken().'&id='.$object->id.'&socid='.$object->socid, '');
 				}
 
 				// Cancel order
 				if ($object->status == Commande::STATUS_VALIDATED && !empty($usercancancel)) {
-					print '<a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=cancel&token=' . newToken() . '">' . $langs->trans("CancelOrder") . '</a>';
+					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=cancel&token='.newToken().'">'.$langs->trans("CancelOrder").'</a>';
 				}
 
 				// Delete order
 				if ($usercandelete) {
 					if ($numshipping == 0) {
-						print dolGetButtonAction('', $langs->trans('Delete'), 'delete', $_SERVER["PHP_SELF"] . '?action=delete&token=' . newToken() . '&id=' . $object->id, '');
+						print dolGetButtonAction('', $langs->trans('Delete'), 'delete', $_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$object->id, '');
 					} else {
-						print dolGetButtonAction($langs->trans('ShippingExist'), $langs->trans('Delete'), 'default', $_SERVER['PHP_SELF'] . '#', '', false);
+						print dolGetButtonAction($langs->trans('ShippingExist'), $langs->trans('Delete'), 'default', $_SERVER['PHP_SELF'].'#', '', false);
 					}
 				}
 			}
@@ -3636,8 +3636,8 @@ 
 			print '<a name="builddoc"></a>'; // ancre
 			// Documents
 			$objref = dol_sanitizeFileName($object->ref);
-			$relativepath = $objref . '/' . $objref . '.pdf';
-			$filedir = $conf->commande->multidir_output[$object->entity ?? $conf->entity] . '/' . $objref;
+			$relativepath = $objref.'/'.$objref.'.pdf';
+			$filedir = $conf->commande->multidir_output[$object->entity ?? $conf->entity].'/'.$objref;
 			$urlsource = dolBuildUrl($_SERVER["PHP_SELF"], ["id" => $object->id]);
 			$genallowed = $usercanread;
 			$delallowed = $usercancreate;
@@ -3661,7 +3661,7 @@ 
 
 			// Show online payment link
 			// The list can be complete by the hook 'doValidatePayment' executed inside getValidOnlinePaymentMethods()
-			include_once DOL_DOCUMENT_ROOT . '/core/lib/payments.lib.php';
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 			$validpaymentmethod = getValidOnlinePaymentMethods('');
 			$useonlinepayment = count($validpaymentmethod);
 
@@ -3670,8 +3670,8 @@ 
 			}
 			if ($object->status != Commande::STATUS_DRAFT && $useonlinepayment) {
 				print '<br><!-- Link to pay -->';
-				require_once DOL_DOCUMENT_ROOT . '/core/lib/payments.lib.php';
-				print showOnlinePaymentUrl('order', $object->ref) . '<br>';
+				require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+				print showOnlinePaymentUrl('order', $object->ref).'<br>';
 			}
 
 			print '</div><div class="fichehalfright">';
@@ -3679,11 +3679,11 @@ 
 			$MAXEVENT = 10;
 
 			//button to go to messaging from the events box
-			$morehtmlcenter = dolGetButtonTitle($langs->trans('FullConversation'), '', 'fa fa-comments imgforviewmode', dolBuildUrl(DOL_URL_ROOT . '/commande/messaging.php', ['id' => $object->id]));
-			$morehtmlcenter .= dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', dolBuildUrl(DOL_URL_ROOT . '/commande/agenda.php', ['id' => $object->id]));
+			$morehtmlcenter = dolGetButtonTitle($langs->trans('FullConversation'), '', 'fa fa-comments imgforviewmode', dolBuildUrl(DOL_URL_ROOT.'/commande/messaging.php', ['id' => $object->id]));
+			$morehtmlcenter .= dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', dolBuildUrl(DOL_URL_ROOT.'/commande/agenda.php', ['id' => $object->id]));
 
 			// List of actions on element
-			include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
+			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 			$formactions = new FormActions($db);
 			$somethingshown = $formactions->showactions($object, 'order', $socid, 1, '', $MAXEVENT, '', $morehtmlcenter); // Show all action for thirdparty
 
@@ -3694,9 +3694,9 @@ 
 		$modelmail = 'order_send';
 		$defaulttopic = 'SendOrderRef';
 		$diroutput = getMultidirOutput($object);
-		$trackid = 'ord' . $object->id;
+		$trackid = 'ord'.$object->id;
 
-		include DOL_DOCUMENT_ROOT . '/core/tpl/card_presend.tpl.php';
+		include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
 	}
 }
 

htdocs/commande/class/commande.class.php

Spacing +26 added lines, -26 removed lines

@@ -396,7 +396,7 @@ 
 	/**
 	 * Shipment on process
 	 */
-	const STATUS_SHIPMENTONPROCESS = 2;		// We set this status when a shipment is validated
+	const STATUS_SHIPMENTONPROCESS = 2; // We set this status when a shipment is validated
 
 	/**
 	 * For backward compatibility. Use key STATUS_SHIPMENTONPROCESS instead.
@@ -412,12 +412,12 @@ 
 	/*
 	 * No signature
 	 */
-	const STATUS_NO_SIGNATURE    = 0;
+	const STATUS_NO_SIGNATURE = 0;
 
 	/*
 	 * Signed by sender
 	 */
-	const STATUS_SIGNED_SENDER   = 1;
+	const STATUS_SIGNED_SENDER = 1;
 
 	/*
 	 * Signed by receiver
@@ -427,7 +427,7 @@ 
 	/*
 	 * Signed by all
 	 */
-	const STATUS_SIGNED_ALL      = 9; // To handle future kind of signature (ex: tripartite contract)
+	const STATUS_SIGNED_ALL = 9; // To handle future kind of signature (ex: tripartite contract)
 
 
 	/**
@@ -460,7 +460,7 @@ 
 		if (getDolGlobalString('COMMANDE_ADDON')) {
 			$mybool = false;
 
-			$file = getDolGlobalString('COMMANDE_ADDON') . ".php";
+			$file = getDolGlobalString('COMMANDE_ADDON').".php";
 			$classname = getDolGlobalString('COMMANDE_ADDON');
 
 			// Include file with class
@@ -650,7 +650,7 @@ 
 		// Set new ref and current status
 		if (!$error) {
 			$this->ref = $num;
-			$this->statut = self::STATUS_VALIDATED;	// deprecated
+			$this->statut = self::STATUS_VALIDATED; // deprecated
 			$this->status = self::STATUS_VALIDATED;
 		}
 
@@ -734,7 +734,7 @@ 
 			}
 
 			if (!$error) {
-				$this->statut = self::STATUS_DRAFT;	// deprecated
+				$this->statut = self::STATUS_DRAFT; // deprecated
 				$this->status = self::STATUS_DRAFT;
 				$this->db->commit();
 				return 1;
@@ -791,7 +791,7 @@ 
 		}
 
 		if (!$error) {
-			$this->statut = self::STATUS_VALIDATED;	// deprecated
+			$this->statut = self::STATUS_VALIDATED; // deprecated
 			$this->status = self::STATUS_VALIDATED;
 			$this->billed = 0;
 
@@ -847,7 +847,7 @@ 
 				}
 
 				if (!$error) {
-					$this->statut = self::STATUS_CLOSED;	// deprecated
+					$this->statut = self::STATUS_CLOSED; // deprecated
 					$this->status = self::STATUS_CLOSED;
 
 					$this->db->commit();
@@ -938,7 +938,7 @@ 
 			}
 
 			if (!$error) {
-				$this->statut = self::STATUS_CANCELED;	// deprecated
+				$this->statut = self::STATUS_CANCELED; // deprecated
 				$this->status = self::STATUS_CANCELED;
 				$this->db->commit();
 				return 1;
@@ -1061,7 +1061,7 @@ 
 		$sql .= ", '".$this->db->escape($this->location_incoterms)."'";
 		$sql .= ", ".(int) $this->entity;
 		$sql .= ", ".($this->module_source ? "'".$this->db->escape($this->module_source)."'" : "null");
-		$sql .= ", ".((!is_null($this->pos_source) && $this->pos_source != '') ? "'".$this->db->escape($this->pos_source)."'" : "null");	// Can be null, '', '0', '1'
+		$sql .= ", ".((!is_null($this->pos_source) && $this->pos_source != '') ? "'".$this->db->escape($this->pos_source)."'" : "null"); // Can be null, '', '0', '1'
 		$sql .= ", ".(int) $this->fk_multicurrency;
 		$sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
 		$sql .= ", ".(float) $this->multicurrency_tx;
@@ -1306,7 +1306,7 @@ 
 			if ($objsoc->fetch($socid) > 0) {
 				$this->socid = $objsoc->id;
 				$this->cond_reglement_id	= (!empty($objsoc->cond_reglement_id) ? $objsoc->cond_reglement_id : 0);
-				$this->deposit_percent		= (!empty($objsoc->deposit_percent) ? $objsoc->deposit_percent : 0);
+				$this->deposit_percent = (!empty($objsoc->deposit_percent) ? $objsoc->deposit_percent : 0);
 				$this->mode_reglement_id	= (!empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0);
 				$this->fk_project = 0;
 				$this->fk_delivery_address = 0;
@@ -1317,7 +1317,7 @@ 
 
 		$this->id = 0;
 		$this->ref = '';
-		$this->statut = self::STATUS_DRAFT;	// deprecated
+		$this->statut = self::STATUS_DRAFT; // deprecated
 		$this->status = self::STATUS_DRAFT;
 
 		// Clear fields
@@ -1398,8 +1398,8 @@ 
 	{
 		global $conf, $hookmanager;
 
-		require_once DOL_DOCUMENT_ROOT . '/multicurrency/class/multicurrency.class.php';
-		require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 		$error = 0;
 
@@ -1431,7 +1431,7 @@ 
 			$line->fk_parent_line    = $object->lines[$i]->fk_parent_line;
 			$line->fk_unit = $object->lines[$i]->fk_unit;
 
-			$line->date_start 		= $object->lines[$i]->date_start;
+			$line->date_start = $object->lines[$i]->date_start;
 			$line->date_end    		= $object->lines[$i]->date_end;
 
 			$line->fk_fournprice	= $object->lines[$i]->fk_fournprice;
@@ -1804,7 +1804,7 @@ 
 			$this->line->date_end = $date_end;
 
 			$this->line->fk_fournprice = $fk_fournprice;
-			$this->line->pa_ht = $pa_ht;	// Can be '' when not defined or 0 if defined to 0 or a price value
+			$this->line->pa_ht = $pa_ht; // Can be '' when not defined or 0 if defined to 0 or a price value
 
 			// Multicurrency
 			$this->line->fk_multicurrency = $this->fk_multicurrency;
@@ -2039,7 +2039,7 @@ 
 				$this->fk_project = $obj->fk_project;
 				$this->project = null; // Clear if another value was already set by fetch_projet
 
-				$this->statut = $obj->status;	// deprecated
+				$this->statut = $obj->status; // deprecated
 				$this->status = $obj->status;
 
 				$this->user_author_id = $obj->fk_user_author;
@@ -2294,7 +2294,7 @@ 
 				$line->weight_units     = $objp->weight_units;
 				$line->volume           = $objp->volume;
 				$line->volume_units     = $objp->volume_units;
-				$line->packaging 		= $objp->packaging;
+				$line->packaging = $objp->packaging;
 
 				$line->date_start       = $this->db->jdate($objp->date_start);
 				$line->date_end         = $this->db->jdate($objp->date_end);
@@ -3639,15 +3639,15 @@ 
 		//$sql.= " AND c.fk_statut IN (1,2,3) AND c.facture = 0";
 		if ($mode == 'toship') {
 			// An order to ship is an open order (validated or in progress)
-			$sql .= " AND c.fk_statut IN (" . self::STATUS_VALIDATED . "," . self::STATUS_SHIPMENTONPROCESS . ")";
+			$sql .= " AND c.fk_statut IN (".self::STATUS_VALIDATED.",".self::STATUS_SHIPMENTONPROCESS.")";
 		}
 		if ($mode == 'tobill') {
 			// An order to bill is an order not already billed
-			$sql .= " AND c.fk_statut IN (" . self::STATUS_VALIDATED . "," . self::STATUS_SHIPMENTONPROCESS . ", " . self::STATUS_CLOSED . ") AND c.facture = 0";
+			$sql .= " AND c.fk_statut IN (".self::STATUS_VALIDATED.",".self::STATUS_SHIPMENTONPROCESS.", ".self::STATUS_CLOSED.") AND c.facture = 0";
 		}
 		if ($mode == 'shippedtobill') {
 			// An order shipped and to bill is a delivered order not already billed
-			$sql .= " AND c.fk_statut IN (" . self::STATUS_CLOSED . ") AND c.facture = 0";
+			$sql .= " AND c.fk_statut IN (".self::STATUS_CLOSED.") AND c.facture = 0";
 		}
 		if ($user->socid) {
 			$sql .= " AND c.fk_soc = ".((int) $user->socid);
@@ -3890,9 +3890,9 @@ 
 		$result = '';
 
 		if (isModEnabled("shipping") && ($option == '1' || $option == '2')) {
-			$baseurl = DOL_URL_ROOT . '/expedition/shipment.php';
+			$baseurl = DOL_URL_ROOT.'/expedition/shipment.php';
 		} else {
-			$baseurl = DOL_URL_ROOT . '/commande/card.php';
+			$baseurl = DOL_URL_ROOT.'/commande/card.php';
 		}
 		$query = ['id' => $this->id];
 		if (!$user->hasRight('commande', 'lire')) {
@@ -3978,7 +3978,7 @@ 
 		}
 
 		global $action;
-		$hookmanager->initHooks(array($this->element . 'dao'));
+		$hookmanager->initHooks(array($this->element.'dao'));
 		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
@@ -4086,7 +4086,7 @@ 
 		$this->status = $this::STATUS_DRAFT;
 
 		// Lines
-		$nbp = min(1000, GETPOSTINT('nblines') ? GETPOSTINT('nblines') : 5);	// We can force the nb of lines to test from command line (but not more than 1000)
+		$nbp = min(1000, GETPOSTINT('nblines') ? GETPOSTINT('nblines') : 5); // We can force the nb of lines to test from command line (but not more than 1000)
 		$xnbp = 0;
 
 		while ($xnbp < $nbp) {

htdocs/admin/mails_templates.php

Spacing +3 added lines, -3 removed lines

@@ -1160,7 +1160,7 @@ 
 				print '<tr class="oddeven nohover" id="tr-aaa-'.$rowid.'">';
 				print '<td colspan="'.$colspan.'" class="" style="padding-left: 20px; padding-right: 20px;">';
 
-				$fieldsforcontent = array('topic', 'email_from','joinfiles', 'content');
+				$fieldsforcontent = array('topic', 'email_from', 'joinfiles', 'content');
 				if (getDolGlobalString('MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES')) {
 					$fieldsforcontent[] = 'content_lines';
 				}
@@ -1239,7 +1239,7 @@ 
 					continue; // It means this is a type of template not into elementList (may be because enabled condition of this type is false because module is not enabled)
 				}
 				// Test on 'enabled'
-				if (! (int) dol_eval($obj->enabled, 1, 1, '1')) {
+				if (!(int) dol_eval($obj->enabled, 1, 1, '1')) {
 					$i++;
 					continue; // Email template not qualified
 				}
@@ -1537,7 +1537,7 @@ 
 					print $form->selectyesno($value, (isset($obj->$value) ? $obj->$value : ''), 1, false, 0, 1);
 				}
 			} else {
-				print '<input type="text" '.$size.'class="flat'.($class ? ' '.$class : '').'" value="'.(isset($obj->$value) ? $obj->$value : '').'" name="'. $value .'"'.($context == 'preview' ? ' disabled' : '').' spellcheck="false">';
+				print '<input type="text" '.$size.'class="flat'.($class ? ' '.$class : '').'" value="'.(isset($obj->$value) ? $obj->$value : '').'" name="'.$value.'"'.($context == 'preview' ? ' disabled' : '').' spellcheck="false">';
 			}
 			print '</td>';
 			$nboffieldsprinted++;

htdocs/user/class/user.class.php

Spacing +48 added lines, -48 removed lines

@@ -586,8 +586,8 @@ 
 			$sql .= " WHERE u.rowid = ".((int) $id);
 		} else {
 			if ($entity < 0) {
-				if ((! isModEnabled('multicompany') || ! getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')) && (! empty($user->entity))) {
-					$sql .= " WHERE u.entity IN (0, " . ((int) $conf->entity) . ")";
+				if ((!isModEnabled('multicompany') || !getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')) && (!empty($user->entity))) {
+					$sql .= " WHERE u.entity IN (0, ".((int) $conf->entity).")";
 				} else {
 					$sql .= " WHERE u.entity IS NOT NULL"; // multicompany is on in transverse mode or user making fetch is on entity 0, so user is allowed to fetch anywhere into database
 				}
@@ -599,7 +599,7 @@ 
 					if ($entity != '' && $entity == 0) {    // If $entity = 0
 						$sql .= " WHERE u.entity = 0";
 					} else {                                // if $entity is -1 or > 0
-						$sql .= " WHERE u.entity IN (0, " . ((int) ($entity > 0 ? $entity : $conf->entity)) . ")";
+						$sql .= " WHERE u.entity IN (0, ".((int) ($entity > 0 ? $entity : $conf->entity)).")";
 					}
 				}
 			}
@@ -693,7 +693,7 @@ 
 				$this->note_public = $obj->note_public;
 				$this->note_private = $obj->note_private;
 
-				$this->statut = $obj->status;			// deprecated
+				$this->statut = $obj->status; // deprecated
 				$this->status = $obj->status;
 
 				$this->photo = $obj->photo;
@@ -831,7 +831,7 @@ 
 			require_once DOL_DOCUMENT_ROOT.'/core/class/defaultvalues.class.php';
 
 			$defaultValues = new DefaultValues($this->db);
-			$result = $defaultValues->fetchAll('', '', 0, 0, '(t.user_id:in:0,'.$this->id.') AND (entity:in:'.(isset($this->entity) ? $this->entity : $conf->entity).','.$conf->entity.')');	// User 0 (all) + me (if defined)
+			$result = $defaultValues->fetchAll('', '', 0, 0, '(t.user_id:in:0,'.$this->id.') AND (entity:in:'.(isset($this->entity) ? $this->entity : $conf->entity).','.$conf->entity.')'); // User 0 (all) + me (if defined)
 			//$result = $defaultValues->fetchAll('', '', 0, 0, array('t.user_id'=>array(0, $this->id), 'entity'=>array((isset($this->entity) ? $this->entity : $conf->entity), $conf->entity)));	// User 0 (all) + me (if defined)
 
 			if (!is_array($result) && $result < 0) {
@@ -948,16 +948,16 @@ 
 		// Special case for external user
 		if (!empty($this->socid)) {
 			if ($module == 'societe' && ($permlevel1 == 'creer' || $permlevel1 == 'write')) {
-				return 0;	// An external user never has the permission ->societe->write to see all thirdparties (always restricted to himself)
+				return 0; // An external user never has the permission ->societe->write to see all thirdparties (always restricted to himself)
 			}
 			if ($module == 'societe' && $permlevel1 == 'client' && $permlevel2 == 'voir') {
-				return 0;	// An external user never has the permission ->societe->client->voir to see all thirdparties (always restricted to himself)
+				return 0; // An external user never has the permission ->societe->client->voir to see all thirdparties (always restricted to himself)
 			}
 			if ($module == 'societe' && $permlevel1 == 'export') {
-				return 0;	// An external user never has the permission ->societe->export to see all thirdparties (always restricted to himself)
+				return 0; // An external user never has the permission ->societe->export to see all thirdparties (always restricted to himself)
 			}
 			if ($module == 'societe' && ($permlevel1 == 'supprimer' || $permlevel1 == 'delete')) {
-				return 0;	// An external user never has the permission ->societe->delete to see all thirdparties (always restricted to himself)
+				return 0; // An external user never has the permission ->societe->delete to see all thirdparties (always restricted to himself)
 			}
 		}
 
@@ -1105,7 +1105,7 @@ 
 			$sql .= " FROM ".$this->db->prefix()."rights_def";
 			$sql .= " WHERE entity = ".((int) $entity);
 			if (!empty($whereforadd) && $whereforadd != 'allmodules') {
-				$sql .= " AND (".$whereforadd.")";	// Note: parenthesis are important because whereforadd can contains OR. Also note that $whereforadd is already sanitized
+				$sql .= " AND (".$whereforadd.")"; // Note: parenthesis are important because whereforadd can contains OR. Also note that $whereforadd is already sanitized
 			}
 
 			$sqldelete = "DELETE FROM ".$this->db->prefix()."user_rights";
@@ -1241,7 +1241,7 @@ 
 			$sql .= " FROM ".$this->db->prefix()."rights_def";
 			$sql .= " WHERE entity IN (".$this->db->sanitize($entity, 0, 0, 0, 0).")";
 			if (!empty($wherefordel) && $wherefordel != 'allmodules') {
-				$sql .= " AND (".$wherefordel.")";	// Note: parenthesis are important because wherefordel can contains OR. Also note that $wherefordel is already sanitized
+				$sql .= " AND (".$wherefordel.")"; // Note: parenthesis are important because wherefordel can contains OR. Also note that $wherefordel is already sanitized
 			}
 
 			// avoid admin to remove his own important rights
@@ -1420,12 +1420,12 @@ 
 					$sql .= " AND r.entity = ".((int) $conf->entity);
 				}
 			} else {
-				$sql .= " AND gr.entity = ".((int) $conf->entity);	// Only groups created in current entity
+				$sql .= " AND gr.entity = ".((int) $conf->entity); // Only groups created in current entity
 				// The entity on the table gu=usergroup_user should be useless and should never be used because it is already into gr and r.
 				// but when using MULTICOMPANY_TRANSVERSE_MODE, we may have inserted record that make rubbish result here due to the duplicate record of
 				// other entities, so we are forced to add a filter on gu here
 				$sql .= " AND gu.entity IN (0,".$conf->entity.")";
-				$sql .= " AND r.entity = ".((int) $conf->entity);	// Only permission of modules enabled in current entity
+				$sql .= " AND r.entity = ".((int) $conf->entity); // Only permission of modules enabled in current entity
 			}
 			// End of strange business rule
 			$sql .= " AND gr.fk_usergroup = gu.fk_usergroup";
@@ -1977,7 +1977,7 @@ 
 		$this->civility_code = $member->civility_code;
 		$this->lastname     = $member->lastname;
 		$this->firstname    = $member->firstname;
-		$this->gender		= $member->gender;
+		$this->gender = $member->gender;
 		$this->email        = $member->email;
 		$this->fk_member    = $member->id;
 		$this->address      = $member->address;
@@ -2123,43 +2123,43 @@ 
 		$this->national_registration_number = trim((string) $this->national_registration_number);
 		$this->employee						= ($this->employee > 0 ? $this->employee : 0);
 		$this->login						= trim((string) $this->login);
-		$this->gender						= trim((string) $this->gender);
+		$this->gender = trim((string) $this->gender);
 
 		$this->pass							= trim((string) $this->pass);
-		$this->api_key						= trim((string) $this->api_key);
-		$this->datestartvalidity			= empty($this->datestartvalidity) ? '' : $this->datestartvalidity;
-		$this->dateendvalidity				= empty($this->dateendvalidity) ? '' : $this->dateendvalidity;
+		$this->api_key = trim((string) $this->api_key);
+		$this->datestartvalidity = empty($this->datestartvalidity) ? '' : $this->datestartvalidity;
+		$this->dateendvalidity = empty($this->dateendvalidity) ? '' : $this->dateendvalidity;
 
-		$this->address						= trim((string) $this->address);
-		$this->zip							= trim((string) $this->zip);
-		$this->town							= trim((string) $this->town);
+		$this->address = trim((string) $this->address);
+		$this->zip = trim((string) $this->zip);
+		$this->town = trim((string) $this->town);
 
-		$this->state_id						= ($this->state_id > 0 ? $this->state_id : 0);
+		$this->state_id = ($this->state_id > 0 ? $this->state_id : 0);
 		$this->country_id					= ($this->country_id > 0 ? $this->country_id : 0);
-		$this->office_phone					= trim((string) $this->office_phone);
+		$this->office_phone = trim((string) $this->office_phone);
 		$this->office_fax					= trim((string) $this->office_fax);
-		$this->user_mobile					= trim((string) $this->user_mobile);
-		$this->personal_mobile				= trim((string) $this->personal_mobile);
-		$this->email						= trim((string) $this->email);
-		$this->personal_email				= trim((string) $this->personal_email);
-
-		$this->job							= trim((string) $this->job);
-		$this->signature					= trim((string) $this->signature);
-		$this->note_public					= trim((string) $this->note_public);
-		$this->note_private					= trim((string) $this->note_private);
-		$this->openid						= trim((string) $this->openid);
-		$this->admin						= ($this->admin > 0 ? $this->admin : 0);
+		$this->user_mobile = trim((string) $this->user_mobile);
+		$this->personal_mobile = trim((string) $this->personal_mobile);
+		$this->email = trim((string) $this->email);
+		$this->personal_email = trim((string) $this->personal_email);
+
+		$this->job = trim((string) $this->job);
+		$this->signature = trim((string) $this->signature);
+		$this->note_public = trim((string) $this->note_public);
+		$this->note_private = trim((string) $this->note_private);
+		$this->openid = trim((string) $this->openid);
+		$this->admin = ($this->admin > 0 ? $this->admin : 0);
 		$this->user_modification_id = $user->id;
 
 		$this->accountancy_code_user_general = trim((string) $this->accountancy_code_user_general);
 		$this->accountancy_code				= trim((string) $this->accountancy_code);
-		$this->color						= trim((string) $this->color);
-		$this->dateemployment				= empty($this->dateemployment) ? '' : $this->dateemployment;
+		$this->color = trim((string) $this->color);
+		$this->dateemployment = empty($this->dateemployment) ? '' : $this->dateemployment;
 		$this->dateemploymentend			= empty($this->dateemploymentend) ? '' : $this->dateemploymentend;
 
-		$this->birth						= empty($this->birth) ? '' : $this->birth;
-		$this->fk_warehouse					= (int) $this->fk_warehouse;
-		$this->fk_establishment				= (int) $this->fk_establishment;
+		$this->birth = empty($this->birth) ? '' : $this->birth;
+		$this->fk_warehouse = (int) $this->fk_warehouse;
+		$this->fk_establishment = (int) $this->fk_establishment;
 
 		$this->setUpperOrLowerCase();
 
@@ -2925,7 +2925,7 @@ 
 		$sql .= " WHERE fk_user  = ".((int) $this->id);
 		$sql .= " AND fk_usergroup = ".((int) $group);
 		if (empty($entity)) {
-			$sql .= " AND entity IN (0, 1)";	// group may be in entity 0 (so $entity=0) and link with user into entity 1.
+			$sql .= " AND entity IN (0, 1)"; // group may be in entity 0 (so $entity=0) and link with user into entity 1.
 		} else {
 			$sql .= " AND entity = ".((int) $entity);
 		}
@@ -3161,9 +3161,9 @@ 
 			$label = '';
 		}
 
-		$baseurl = DOL_URL_ROOT . '/user/card.php';
+		$baseurl = DOL_URL_ROOT.'/user/card.php';
 		if ($option == 'leave') {
-			$baseurl = DOL_URL_ROOT . '/holiday/list.php';
+			$baseurl = DOL_URL_ROOT.'/holiday/list.php';
 		}
 		$query = ['id' => $this->id];
 		if ($option != 'nolink') {
@@ -3187,7 +3187,7 @@ 
 				$linkclose .= ' alt="'.dolPrintHTMLForAttribute($label).'"';
 			}
 			$linkclose .= ($label ? ' title="'.dolPrintHTMLForAttribute($label).'"' : ' title="tocomplete"');
-			$linkclose .= $dataparams . ' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
+			$linkclose .= $dataparams.' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
 		} else {
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 		}
@@ -3426,11 +3426,11 @@ 
 		global $conf;
 		$dn = '';
 		if ($mode == 0) {
-			$dn = getDolGlobalString('LDAP_KEY_USERS') . "=".$info[getDolGlobalString('LDAP_KEY_USERS')]."," . getDolGlobalString('LDAP_USER_DN');
+			$dn = getDolGlobalString('LDAP_KEY_USERS')."=".$info[getDolGlobalString('LDAP_KEY_USERS')].",".getDolGlobalString('LDAP_USER_DN');
 		} elseif ($mode == 1) {
 			$dn = getDolGlobalString('LDAP_USER_DN');
 		} elseif ($mode == 2) {
-			$dn = getDolGlobalString('LDAP_KEY_USERS') . "=".$info[getDolGlobalString('LDAP_KEY_USERS')];
+			$dn = getDolGlobalString('LDAP_KEY_USERS')."=".$info[getDolGlobalString('LDAP_KEY_USERS')];
 		}
 		return $dn;
 	}
@@ -3897,7 +3897,7 @@ 
 			$sql .= " WHERE u.entity IN (".getEntity('user').")";
 		}
 		if ($filter) {
-			$sql .= " AND ".$filter;	// already sanitized
+			$sql .= " AND ".$filter; // already sanitized
 		}
 
 		dol_syslog(get_class($this)."::get_full_tree get user list", LOG_DEBUG);
@@ -4229,8 +4229,8 @@ 
 					$sql .= " WHERE t.entity IS NOT NULL"; // Show all users
 				} else {
 					$sql .= " WHERE t.entity = 0 OR EXISTS (";
-					$sql .= " SELECT ug.rowid FROM " . $this->db->prefix() . "usergroup_user as ug";
-					$sql .= " WHERE ug.fk_user = t.rowid AND ug.entity IN (" . getEntity('usergroup') . "))";
+					$sql .= " SELECT ug.rowid FROM ".$this->db->prefix()."usergroup_user as ug";
+					$sql .= " WHERE ug.fk_user = t.rowid AND ug.entity IN (".getEntity('usergroup')."))";
 				}
 			} else {
 				$sql .= " WHERE t.entity IN (".getEntity('user').")";

htdocs/contrat/card.php

Spacing +20 added lines, -20 removed lines

@@ -104,8 +104,8 @@ 
 $object = new Contrat($db);
 $extrafields = new ExtraFields($db);
 $ret = 0;
-$pu_ht = null;  // Init for static analysis
-$pu_ttc = null;  // Init for static analysis
+$pu_ht = null; // Init for static analysis
+$pu_ttc = null; // Init for static analysis
 
 // Load object
 if ($id > 0 || !empty($ref) && $action != 'add') {
@@ -127,10 +127,10 @@ 
 $permissionnote = $user->hasRight('contrat', 'creer'); // Used by the include of actions_setnotes.inc.php
 $permissiondellink = $user->hasRight('contrat', 'creer'); // Used by the include of actions_dellink.inc.php
 $permissiontodelete = ($user->hasRight('contrat', 'creer') && $object->status == $object::STATUS_DRAFT) || $user->hasRight('contrat', 'supprimer');
-$permissiontoadd   = $user->hasRight('contrat', 'creer');     //  Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontoadd   = $user->hasRight('contrat', 'creer'); //  Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 $permissiontoedit = $permissiontoadd;
 $permissiontoactivate = $user->hasRight('contrat', 'activer');
-$permissiontodisable = $user->hasRight('contrat', 'desactiver');	// TODO use same than $permissiontoactivate
+$permissiontodisable = $user->hasRight('contrat', 'desactiver'); // TODO use same than $permissiontoactivate
 $permissiontoeditextra = $permissiontoadd;
 if (GETPOST('attribute', 'aZ09') && isset($extrafields->attributes[$object->table_element]['perms'][GETPOST('attribute', 'aZ09')])) {
 	// For action 'update_extras', is there a specific permission set for the attribute to update
@@ -157,14 +157,14 @@ 
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
 if (empty($reshook)) {
-	$backurlforlist = dolBuildUrl(DOL_URL_ROOT . '/contrat/list.php');
+	$backurlforlist = dolBuildUrl(DOL_URL_ROOT.'/contrat/list.php');
 
 	if (empty($backtopage) || ($cancel && empty($id))) {
 		if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
 			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
 				$backtopage = $backurlforlist;
 			} else {
-				$backtopage = dolBuildUrl(DOL_URL_ROOT . '/contrat/card.php', ['id'=> ((!empty($id) && $id > 0) ? $id : '__ID__')]);
+				$backtopage = dolBuildUrl(DOL_URL_ROOT.'/contrat/card.php', ['id'=> ((!empty($id) && $id > 0) ? $id : '__ID__')]);
 			}
 		}
 	}
@@ -184,7 +184,7 @@ 
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be 'include', not 'include_once'
 
-	include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';  // Must be 'include', not 'include_once'
+	include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be 'include', not 'include_once'
 
 	if ($action == 'confirm_active' && $confirm == 'yes' && $permissiontoactivate) {
 		$date_start = '';
@@ -207,7 +207,7 @@ 
 	} elseif ($action == 'confirm_sign' && $confirm == 'yes' && $user->hasRight('contract', 'creer')) {
 		$result = $object->setSignedStatus($user, GETPOSTINT('signed_status'), 0, 'CONTRACT_MODIFY');
 		if ($result >= 0) {
-			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -215,7 +215,7 @@ 
 	} elseif ($action == 'confirm_unsign' && $confirm == 'yes' && $user->hasRight('contract', 'creer')) {
 		$result = $object->setSignedStatus($user, Contrat::$SIGNED_STATUSES['STATUS_NO_SIGNATURE'], 0, 'CONTRACT_MODIFY');
 		if ($result >= 0) {
-			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -346,7 +346,7 @@ 
 
 					$classname = ucfirst($subelement);
 					$srcobject = new $classname($db);
-					'@phan-var-force Commande|Propal|Facture $srcobject';  // Can be other class, but CommonObject is too Generic
+					'@phan-var-force Commande|Propal|Facture $srcobject'; // Can be other class, but CommonObject is too Generic
 
 					dol_syslog("Try to find source object origin=".$object->origin." originid=".$object->origin_id." to add lines");
 					$result = $srcobject->fetch($object->origin_id);
@@ -771,7 +771,7 @@ 
 			}
 			$objectline->fetch_optionals();
 
-			$objectline->oldcopy = dol_clone($objectline, 2);  // @phan-suppress-current-line PhanTypeMismatchProperty
+			$objectline->oldcopy = dol_clone($objectline, 2); // @phan-suppress-current-line PhanTypeMismatchProperty
 		} else {
 			$objectline = null;
 		}
@@ -921,7 +921,7 @@ 
 	} elseif ($action == 'confirm_activate' && $confirm == 'yes' && $permissiontoactivate) {
 		$date_start = dol_mktime(12, 0, 0, GETPOSTINT('d_startmonth'), GETPOSTINT('d_startday'), GETPOSTINT('d_startyear'));
 		$date_end   = dol_mktime(12, 0, 0, GETPOSTINT('d_endmonth'), GETPOSTINT('d_endday'), GETPOSTINT('d_endyear'));
-		$comment      = GETPOST('comment', 'alpha');
+		$comment = GETPOST('comment', 'alpha');
 		$result = $object->activateAll($user, $date_start, 0, $comment, $date_end);
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -1262,7 +1262,7 @@ 
 		print '<td>';
 		print img_picto('', 'company', 'class="pictofixedwidth"');
 		print $form->select_company('', 'socid', '', 'SelectThirdParty', 1, 0, array(), 0, 'minwidth300 widthcentpercentminusxx maxwidth500');
-		print ' <a href="'.dolBuildUrl(DOL_URL_ROOT . '/societe/card.php', ['action' => 'create', 'customer' => 3, 'backtopage' => dolBuildUrl($_SERVER["PHP_SELF"], ['action' => 'create'])]).'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddThirdParty").'"></span></a>';
+		print ' <a href="'.dolBuildUrl(DOL_URL_ROOT.'/societe/card.php', ['action' => 'create', 'customer' => 3, 'backtopage' => dolBuildUrl($_SERVER["PHP_SELF"], ['action' => 'create'])]).'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddThirdParty").'"></span></a>';
 		print '</td>';
 	}
 	print '</tr>'."\n";
@@ -1310,7 +1310,7 @@ 
 		print '<tr><td>'.$langs->trans("Project").'</td><td>';
 		print img_picto('', 'project', 'class="pictofixedwidth"');
 		$formproject->select_projects(($soc->id > 0 ? $soc->id : -1), $projectid, "projectid", 0, 0, 1, 1);
-		print ' &nbsp; <a href="' . dolBuildUrl(DOL_URL_ROOT . '/projet/card.php', ['socid' => $soc->id, 'action' => 'create', 'status' => 1, 'backtopage' => dolBuildUrl($_SERVER["PHP_SELF"], ['action' => 'create', 'socid' => $soc->id])]) . '"><span class="fa fa-plus-circle valignmiddle" title="'.$langs->trans("AddProject").'"></span></a>';
+		print ' &nbsp; <a href="'.dolBuildUrl(DOL_URL_ROOT.'/projet/card.php', ['socid' => $soc->id, 'action' => 'create', 'status' => 1, 'backtopage' => dolBuildUrl($_SERVER["PHP_SELF"], ['action' => 'create', 'socid' => $soc->id])]).'"><span class="fa fa-plus-circle valignmiddle" title="'.$langs->trans("AddProject").'"></span></a>';
 		print "</td></tr>";
 	}
 
@@ -1483,7 +1483,7 @@ 
 		$morehtmlref .= '<div class="refidno">';
 		// Ref customer
 		$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->hasRight('contrat', 'creer'), 'string', '', 0, 1);
-		$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->hasRight('contrat', 'creer'), 'string'.(isset($conf->global->THIRDPARTY_REF_INPUT_SIZE) ? ':' . getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') : ''), '', null, null, '', 1, 'getFormatedCustomerRef');
+		$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->hasRight('contrat', 'creer'), 'string'.(isset($conf->global->THIRDPARTY_REF_INPUT_SIZE) ? ':'.getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') : ''), '', null, null, '', 1, 'getFormatedCustomerRef');
 		// Ref supplier
 		$morehtmlref .= '<br>';
 		$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->hasRight('contrat', 'creer'), 'string', '', 0, 1);
@@ -1576,7 +1576,7 @@ 
 		}
 
 
-		$arrayothercontracts = $object->getListOfContracts('others');	// array or -1 if technical error
+		$arrayothercontracts = $object->getListOfContracts('others'); // array or -1 if technical error
 
 		/*
 		 * Lines of contracts
@@ -1708,7 +1708,7 @@ 
 							$description = $objp->description;
 
 							if (getDolGlobalInt('MAIN_ENABLE_AJAX_TOOLTIP')) {
-								print (!empty($line->fk_parent_line) ? img_picto('', 'rightarrow') : '') . $text;
+								print (!empty($line->fk_parent_line) ? img_picto('', 'rightarrow') : '').$text;
 								if (!getDolGlobalInt('PRODUIT_DESC_IN_FORM')) {
 									print $form->textwithpicto('', $description);
 								}
@@ -1844,7 +1844,7 @@ 
 								print $objp->label ? ' - '.dol_trunc($objp->label, 32) : '';
 								print '<input type="hidden" name="idprod" value="'.$currentLineProductId.'">';
 							} else {
-								$senderissupplier = 0;	// @TODO Option to allow purchased products ?
+								$senderissupplier = 0; // @TODO Option to allow purchased products ?
 								if (empty($senderissupplier)) {
 									if (getDolGlobalString('CONTRACT_SUPPORT_PRODUCTS')) {
 										$filtertype = '';
@@ -2354,9 +2354,9 @@ 
 				// Sign
 				if (getDolGlobalString('CONTRACT_SHOW_SIGNATURE_STATUS_WITH_SERVICE_STATUS') && $object->status > Contrat::STATUS_DRAFT) {
 					if ($object->signed_status != Contrat::$SIGNED_STATUSES['STATUS_SIGNED_ALL']) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=sign&token=' . newToken() . '">' . $langs->trans("ContractSign") . '</a></div>';
+						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=sign&token='.newToken().'">'.$langs->trans("ContractSign").'</a></div>';
 					} else {
-						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=unsign&token=' . newToken() . '">' . $langs->trans("ContractUnsign") . '</a></div>';
+						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=unsign&token='.newToken().'">'.$langs->trans("ContractUnsign").'</a></div>';
 					}
 				}
 

htdocs/contrat/class/contrat.class.php

Spacing +23 added lines, -23 removed lines

@@ -317,7 +317,7 @@ 
 		if (getDolGlobalString('CONTRACT_ADDON')) {
 			$mybool = false;
 
-			$file = getDolGlobalString('CONTRACT_ADDON') . ".php";
+			$file = getDolGlobalString('CONTRACT_ADDON').".php";
 			$classname = getDolGlobalString('CONTRACT_ADDON');
 
 			// Include file with class
@@ -428,7 +428,7 @@ 
 			if ($contratline->statut != ContratLigne::STATUS_OPEN) {
 				$contratline->context = $this->context;
 
-				$result = $contratline->active_line($user, $date_start, !empty($date_end) ? $date_end : -1, $comment);	// This call trigger LINECONTRACT_ACTIVATE
+				$result = $contratline->active_line($user, $date_start, !empty($date_end) ? $date_end : -1, $comment); // This call trigger LINECONTRACT_ACTIVATE
 				if ($result < 0) {
 					$error++;
 					$this->error = $contratline->error;
@@ -481,7 +481,7 @@ 
 			// Close lines not already closed
 			if ($contratline->statut != ContratLigne::STATUS_CLOSED) {
 				$contratline->date_end_real = $now;
-				$contratline->date_cloture = $now;	// For backward compatibility
+				$contratline->date_cloture = $now; // For backward compatibility
 				$contratline->user_closing_id = $user->id;
 				$contratline->statut = ContratLigne::STATUS_CLOSED;
 
@@ -627,7 +627,7 @@ 
 			if (!$error) {
 				$this->ref = $num;
 				$this->status = self::STATUS_VALIDATED;
-				$this->statut = self::STATUS_VALIDATED;	// deprecated
+				$this->statut = self::STATUS_VALIDATED; // deprecated
 				$this->date_validation = $now;
 			}
 		} else {
@@ -903,10 +903,10 @@ 
 				$line->localtax2_tx		= $objp->localtax2_tx;
 				$line->localtax1_type	= $objp->localtax1_type;
 				$line->localtax2_type	= $objp->localtax2_type;
-				$line->subprice			= $objp->subprice;
+				$line->subprice = $objp->subprice;
 				$line->statut           = $objp->status; // For backward compatibility
 				$line->status           = $objp->status;
-				$line->remise_percent	= $objp->remise_percent;
+				$line->remise_percent = $objp->remise_percent;
 				$line->total_ht			= $objp->total_ht;
 				$line->total_tva		= $objp->total_tva;
 				$line->total_localtax1	= $objp->total_localtax1;
@@ -1418,7 +1418,7 @@ 
 		}
 
 		if (!$error) {
-			$result = $this->insertExtraFields();	// This delete and reinsert extrafields
+			$result = $this->insertExtraFields(); // This delete and reinsert extrafields
 			if ($result < 0) {
 				$error++;
 			}
@@ -2034,7 +2034,7 @@ 
 				}
 				$datas['customer'] = '<br><b>'.$langs->trans('Customer').':</b> '.$this->thirdparty->getNomUrl(1, '', 0, 1);
 			}
-			$datas['refcustomer'] = '<br><b>'.$langs->trans('RefCustomer').':</b> '. $this->ref_customer;
+			$datas['refcustomer'] = '<br><b>'.$langs->trans('RefCustomer').':</b> '.$this->ref_customer;
 			if (!$nofetch) {
 				$langs->load('project');
 				if (is_null($this->project) || (is_object($this->project) && $this->project->isEmpty())) {
@@ -2073,7 +2073,7 @@ 
 
 		$result = '';
 
-		$baseurl = DOL_URL_ROOT . '/contrat/card.php';
+		$baseurl = DOL_URL_ROOT.'/contrat/card.php';
 		$query = ['id' => $this->id];
 
 		//if ($option !== 'nolink')
@@ -2464,7 +2464,7 @@ 
 		$this->note_public = 'This is a comment (public)';
 		$this->fk_project = 0;
 		// Lines
-		$nbp = min(1000, GETPOSTINT('nblines') ? GETPOSTINT('nblines') : 5);	// We can force the nb of lines to test from command line (but not more than 1000)
+		$nbp = min(1000, GETPOSTINT('nblines') ? GETPOSTINT('nblines') : 5); // We can force the nb of lines to test from command line (but not more than 1000)
 		$xnbp = 0;
 		while ($xnbp < $nbp) {
 			$line = new ContratLigne($this->db);
@@ -2510,7 +2510,7 @@ 
 		global $user;
 
 		$ticket = new Ticket($this->db);
-		$nbTicket =  $ticket->fetchAll($user, 'ASC', 't.datec', 0, 0, 0, array('t.fk_contract' => $this->id));
+		$nbTicket = $ticket->fetchAll($user, 'ASC', 't.datec', 0, 0, 0, array('t.fk_contract' => $this->id));
 
 		return ($nbTicket < 0 ? $nbTicket : $ticket->lines);
 	}
@@ -2532,7 +2532,7 @@ 
 		global $conf, $langs;
 
 		if (!dol_strlen($modele)) {
-			$modele = '';	// No doc template/generation by default
+			$modele = ''; // No doc template/generation by default
 
 			if (!empty($this->model_pdf)) {
 				$modele = $this->model_pdf;
@@ -2630,14 +2630,14 @@ 
 			}
 		}
 
-		if (!getDolGlobalString('CONTRACT_ADDON') || !is_readable(DOL_DOCUMENT_ROOT."/core/modules/contract/" . getDolGlobalString('CONTRACT_ADDON').".php")) {
+		if (!getDolGlobalString('CONTRACT_ADDON') || !is_readable(DOL_DOCUMENT_ROOT."/core/modules/contract/".getDolGlobalString('CONTRACT_ADDON').".php")) {
 			$this->error = 'ErrorSetupNotComplete';
 			dol_syslog($this->error);
 			return -1;
 		}
 
 		// Set ref
-		require_once DOL_DOCUMENT_ROOT."/core/modules/contract/" . getDolGlobalString('CONTRACT_ADDON').'.php';
+		require_once DOL_DOCUMENT_ROOT."/core/modules/contract/".getDolGlobalString('CONTRACT_ADDON').'.php';
 		$obj = getDolGlobalString('CONTRACT_ADDON');
 		$modContract = new $obj();
 		'@phan-var-force ModelNumRefContracts $modContract';
@@ -2760,7 +2760,7 @@ 
 
 					// Load contract
 					$object = new Contrat($this->db);
-					$object->fetch($obj->rowid);		// fetch also lines
+					$object->fetch($obj->rowid); // fetch also lines
 					//$object->fetch_thirdparty();
 
 					if ($object->id <= 0) {
@@ -2807,7 +2807,7 @@ 
 					if ($expirationdate && $expirationdate < $enddatetoscan) {
 						dol_syslog("Define the newdate of end of services from expirationdate=".$expirationdate);
 						$newdate = $expirationdate;
-						$protecti = 0;	// $protecti is to avoid infinite loop
+						$protecti = 0; // $protecti is to avoid infinite loop
 						while ($newdate < $enddatetoscan && $protecti < 1000) {
 							$newdate = dol_time_plus_duree($newdate, (int) $duration_value, $duration_unit);
 							$protecti++;
@@ -2835,21 +2835,21 @@ 
 
 								// Create an event
 								$actioncomm = new ActionComm($this->db);
-								$actioncomm->type_code    = 'AC_OTH_AUTO';		// Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
+								$actioncomm->type_code    = 'AC_OTH_AUTO'; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
 								$actioncomm->code         = 'AC_'.$actioncode;
 								$actioncomm->label        = $label;
 								$actioncomm->datep        = $now;
 								$actioncomm->datef        = $now;
-								$actioncomm->percentage   = -1;   // Not applicable
+								$actioncomm->percentage   = -1; // Not applicable
 								$actioncomm->socid        = $object->socid;
-								$actioncomm->authorid     = $user->id;   // User saving action
-								$actioncomm->userownerid  = $user->id;	// Owner of action
+								$actioncomm->authorid     = $user->id; // User saving action
+								$actioncomm->userownerid  = $user->id; // Owner of action
 								$actioncomm->fk_element   = $object->id;
 								$actioncomm->elementid    = $object->id;
 								$actioncomm->elementtype  = 'contract';
 								$actioncomm->note_private = $comment;
 
-								$ret = $actioncomm->create($user);       // User creating action
+								$ret = $actioncomm->create($user); // User creating action
 							} else {
 								$contracterror[$object->id] = $object->ref;
 
@@ -2858,7 +2858,7 @@ 
 								$this->error = $this->db->lasterror();
 							}
 
-							if (! $errorforlocaltransaction) {
+							if (!$errorforlocaltransaction) {
 								$this->db->commit();
 							} else {
 								$this->db->rollback();
@@ -2916,7 +2916,7 @@ 
 		$return .= img_picto('', $this->picto);
 		$return .= '</span>';
 		$return .= '<div class="info-box-content">';
-		$return .= '<span class="info-box-ref inline-block tdoverflowmax150 valignmiddle">' . $this->getNomUrl() . '</span>';
+		$return .= '<span class="info-box-ref inline-block tdoverflowmax150 valignmiddle">'.$this->getNomUrl().'</span>';
 		if ($selected >= 0) {
 			$return .= '<input id="cb'.$this->id.'" class="flat checkforselect fright" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
 		}