Dolibarr / dolibarr

htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php

Spacing +2 added lines, -2 removed lines

@@ -258,7 +258,7 @@ 
 					if (!empty($conf->mycompany->multidir_output[$object->entity ?? $conf->entity])) {
 						$logodir = $conf->mycompany->multidir_output[$object->entity ?? $conf->entity];
 					}
-					$pagecount = $pdf->setSourceFile($logodir .'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
+					$pagecount = $pdf->setSourceFile($logodir.'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
 					$tplidx = $pdf->importPage(1);
 				}
 
@@ -578,7 +578,7 @@ 
 				// Pagefoot
 				$this->_pagefoot($pdf, $object, $outputlangs);
 				if (method_exists($pdf, 'AliasNbPages')) {
-					$pdf->AliasNbPages();  // @phan-suppress-current-line PhanUndeclaredMethod
+					$pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod
 				}
 
 				$pdf->Close();

htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php

Spacing +4 added lines, -4 removed lines

@@ -33,7 +33,7 @@ 
  *  \brief      File of class to generate document from standard template
  */
 
-require_once DOL_DOCUMENT_ROOT . '/core/modules/asset/modules_asset.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/asset/modules_asset.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -132,7 +132,7 @@ 
 		$this->situationinvoice = false;
 
 		if ($mysoc === null) {
-			dol_syslog(get_class($this).'::__construct() Global $mysoc should not be null.'. getCallerInfoString(), LOG_ERR);
+			dol_syslog(get_class($this).'::__construct() Global $mysoc should not be null.'.getCallerInfoString(), LOG_ERR);
 			return;
 		}
 		// Get source company
@@ -242,7 +242,7 @@ 
 					if (!empty($conf->mycompany->multidir_output[$object->entity ?? $conf->entity])) {
 						$logodir = $conf->mycompany->multidir_output[$object->entity ?? $conf->entity];
 					}
-					$pagecount = $pdf->setSourceFile($logodir .'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
+					$pagecount = $pdf->setSourceFile($logodir.'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
 					$tplidx = $pdf->importPage(1);
 				}
 
@@ -683,7 +683,7 @@ 
 				// Pagefoot
 				$this->_pagefoot($pdf, $object, $outputlangs);
 				if (method_exists($pdf, 'AliasNbPages')) {
-					$pdf->AliasNbPages();  // @phan-suppress-current-line PhanUndeclaredMethod
+					$pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod
 				}
 
 				$pdf->Close();

htdocs/core/modules/contract/doc/pdf_strato.modules.php

Spacing +6 added lines, -6 removed lines

@@ -124,7 +124,7 @@ 
 		$this->posxdesc = $this->marge_gauche + 1;
 
 		if ($mysoc === null) {
-			dol_syslog(get_class($this).'::__construct() Global $mysoc should not be null.'. getCallerInfoString(), LOG_ERR);
+			dol_syslog(get_class($this).'::__construct() Global $mysoc should not be null.'.getCallerInfoString(), LOG_ERR);
 			return;
 		}
 
@@ -192,7 +192,7 @@ 
 			}
 
 			if ($dir === null) {
-				dol_syslog(get_class($this).'::'.__METHOD__."Target directory should not be null.". getCallerInfoString(), LOG_ERR);
+				dol_syslog(get_class($this).'::'.__METHOD__."Target directory should not be null.".getCallerInfoString(), LOG_ERR);
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", "Null dir");
 				return 0;
 			}
@@ -241,7 +241,7 @@ 
 					if (!empty($conf->mycompany->multidir_output[$object->entity ?? $conf->entity])) {
 						$logodir = $conf->mycompany->multidir_output[$object->entity ?? $conf->entity];
 					}
-					$pagecount = $pdf->setSourceFile($logodir.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
+					$pagecount = $pdf->setSourceFile($logodir.'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
 					$tplidx = $pdf->importPage(1);
 				}
 
@@ -367,10 +367,10 @@ 
 						$desc = dol_htmlentitiesbr($objectligne->desc, 1); // Desc (not empty for free lines)
 						$txt = '';
 						if (!getDolGlobalString('CONTRACT_HIDE_QTY_ON_PDF')) {
-							$txt .= $outputlangs->transnoentities("Quantity") . ' : <strong>' . $objectligne->qty . '</strong>';
+							$txt .= $outputlangs->transnoentities("Quantity").' : <strong>'.$objectligne->qty.'</strong>';
 						}
 						if (!getDolGlobalString('CONTRACT_HIDE_PRICE_ON_PDF')) {
-							$txt .= ' - ' . $outputlangs->transnoentities("UnitPrice") . ' : <strong>' . price($objectligne->subprice) . '</strong>';
+							$txt .= ' - '.$outputlangs->transnoentities("UnitPrice").' : <strong>'.price($objectligne->subprice).'</strong>';
 						}
 						if (!getDolGlobalString('CONTRACT_HIDE_PLANNED_DATE_ON_PDF')) {
 							$txt .= '<br>';
@@ -487,7 +487,7 @@ 
 
 				$this->_pagefoot($pdf, $object, $outputlangs);
 				if (method_exists($pdf, 'AliasNbPages')) {
-					$pdf->AliasNbPages();  // @phan-suppress-current-line PhanUndeclaredMethod
+					$pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod
 				}
 
 				$pdf->Close();

htdocs/core/lib/company.lib.php

Spacing +359 added lines, -359 removed lines

@@ -48,7 +48,7 @@ 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/societe/card.php?socid=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/societe/card.php?socid='.$object->id;
 	$head[$h][1] = $langs->trans("ThirdParty");
 	$head[$h][2] = 'card';
 	$h++;
@@ -58,21 +58,21 @@ 
 		//$nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
 		$nbContact = 0;
 		// Enable caching of thirdrparty count Contacts
-		require_once DOL_DOCUMENT_ROOT . '/core/lib/memory.lib.php';
-		$cachekey = 'count_contacts_thirdparty_' . $object->id;
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
+		$cachekey = 'count_contacts_thirdparty_'.$object->id;
 		$dataretrieved = dol_getcache($cachekey);
 
 		if (!is_null($dataretrieved)) {
 			$nbContact = $dataretrieved;
 		} else {
 			$sql = "SELECT COUNT(p.rowid) as nb";
-			$sql .= " FROM " . MAIN_DB_PREFIX . "socpeople as p";
+			$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as p";
 			// Add table from hooks
 			$parameters = array('contacttab' => true);
 			$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
 			$sql .= $hookmanager->resPrint;
-			$sql .= " WHERE p.fk_soc = " . ((int) $object->id);
-			$sql .= " AND p.entity IN (" . getEntity($object->element) . ")";
+			$sql .= " WHERE p.fk_soc = ".((int) $object->id);
+			$sql .= " AND p.entity IN (".getEntity($object->element).")";
 			// Add where from hooks
 			$parameters = array('contacttab' => true);
 			$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
@@ -83,31 +83,31 @@ 
 				$nbContact = $obj->nb;
 			}
 
-			dol_setcache($cachekey, $nbContact, 120);	// If setting cache fails, this is not a problem, so we do not test result.
+			dol_setcache($cachekey, $nbContact, 120); // If setting cache fails, this is not a problem, so we do not test result.
 		}
 
-		$head[$h][0] = DOL_URL_ROOT . '/societe/contact.php?socid=' . $object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/societe/contact.php?socid='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
 		if ($nbContact > 0) {
-			$head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbContact . '</span>';
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
 		}
 		$head[$h][2] = 'contact';
 		$h++;
 	}
 	if (getDolGlobalString('MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES')) {
 		// Some features may be unstable with this option, like permissions rules, import contact, ...
-		$head[$h][0] = DOL_URL_ROOT . '/societe/societecontact.php?socid=' . $object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/societe/societecontact.php?socid='.$object->id;
 		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
 		$head[$h][1] = $langs->trans("ContactsAddressesExt");
 		if ($nbContact > 0) {
-			$head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbContact . '</span>';
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
 		}
 		$head[$h][2] = 'contactext';
 		$h++;
 	}
 
 	if ($object->client == 1 || $object->client == 2 || $object->client == 3) {
-		$head[$h][0] = DOL_URL_ROOT . '/comm/card.php?socid=' . $object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/comm/card.php?socid='.$object->id;
 		$head[$h][1] = '';
 		if (!getDolGlobalString('SOCIETE_DISABLE_PROSPECTS') && ($object->client == 2 || $object->client == 3)) {
 			$head[$h][1] .= $langs->trans("Prospect");
@@ -124,7 +124,7 @@ 
 		if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) {
 			$langs->load("products");
 			// price
-			$head[$h][0] = DOL_URL_ROOT . '/societe/price.php?socid=' . $object->id;
+			$head[$h][0] = DOL_URL_ROOT.'/societe/price.php?socid='.$object->id;
 			$head[$h][1] = $langs->trans("CustomerPrices");
 			$head[$h][2] = 'price';
 			$h++;
@@ -135,7 +135,7 @@ 
 		$supplier_module_enabled = 1;
 	}
 	if ($supplier_module_enabled == 1 && $object->fournisseur && $user->hasRight('fournisseur', 'lire')) {
-		$head[$h][0] = DOL_URL_ROOT . '/fourn/card.php?socid=' . $object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/fourn/card.php?socid='.$object->id;
 		$head[$h][1] = $langs->trans("Supplier");
 		$head[$h][2] = 'supplier';
 		$h++;
@@ -154,7 +154,7 @@ 
 			$mode = 'customer';
 		}
 
-		$head[$h][0] = DOL_URL_ROOT . '/accountancy/bookkeeping/listbyaccount.php?socid=' . $object->id . '&mode=' . $mode . '&type=sub&search_accountancy_code_start=' . $subledger_start_account . '&search_accountancy_code_end=' . $subledger_end_account;
+		$head[$h][0] = DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?socid='.$object->id.'&mode='.$mode.'&type=sub&search_accountancy_code_start='.$subledger_start_account.'&search_accountancy_code_end='.$subledger_end_account;
 		$head[$h][1] = $langs->trans("Accounting");
 		$head[$h][2] = 'accounting';
 		$h++;
@@ -163,17 +163,17 @@ 
 	if (isModEnabled('project') && ($user->hasRight('projet', 'lire'))) {
 		$nbProject = 0;
 		// Enable caching of thirdrparty count projects
-		require_once DOL_DOCUMENT_ROOT . '/core/lib/memory.lib.php';
-		$cachekey = 'count_projects_thirdparty_' . $object->id;
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
+		$cachekey = 'count_projects_thirdparty_'.$object->id;
 		$dataretrieved = dol_getcache($cachekey);
 
 		if (!is_null($dataretrieved)) {
 			$nbProject = $dataretrieved;
 		} else {
 			$sql = "SELECT COUNT(n.rowid) as nb";
-			$sql .= " FROM " . MAIN_DB_PREFIX . "projet as n";
-			$sql .= " WHERE fk_soc = " . ((int) $object->id);
-			$sql .= " AND entity IN (" . getEntity('project') . ")";
+			$sql .= " FROM ".MAIN_DB_PREFIX."projet as n";
+			$sql .= " WHERE fk_soc = ".((int) $object->id);
+			$sql .= " AND entity IN (".getEntity('project').")";
 			$resql = $db->query($sql);
 			if ($resql) {
 				$obj = $db->fetch_object($resql);
@@ -181,12 +181,12 @@ 
 			} else {
 				dol_print_error($db);
 			}
-			dol_setcache($cachekey, $nbProject, 120);	// If setting cache fails, this is not a problem, so we do not test result.
+			dol_setcache($cachekey, $nbProject, 120); // If setting cache fails, this is not a problem, so we do not test result.
 		}
-		$head[$h][0] = DOL_URL_ROOT . '/societe/project.php?socid=' . $object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/societe/project.php?socid='.$object->id;
 		$head[$h][1] = $langs->trans("Projects");
 		if ($nbProject > 0) {
-			$head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbProject . '</span>';
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbProject.'</span>';
 		}
 		$head[$h][2] = 'project';
 		$h++;
@@ -194,7 +194,7 @@ 
 
 	// Tab to link resources
 	if (isModEnabled('resource') && getDolGlobalString('RESOURCE_ON_THIRDPARTIES')) {
-		$head[$h][0] = DOL_URL_ROOT . '/resource/element_resource.php?element=societe&element_id=' . $object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=societe&element_id='.$object->id;
 		$head[$h][1] = $langs->trans("Resources");
 		$head[$h][2] = 'resources';
 		$h++;
@@ -204,7 +204,7 @@ 
 	if ((isModEnabled('order') || isModEnabled('propal') || isModEnabled('invoice') || isModEnabled('intervention') || isModEnabled("supplier_proposal") || isModEnabled("supplier_order") || isModEnabled("supplier_invoice"))
 		&& !getDolGlobalString('THIRDPARTIES_DISABLE_RELATED_OBJECT_TAB')
 	) {
-		$head[$h][0] = DOL_URL_ROOT . '/societe/consumption.php?socid=' . $object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/societe/consumption.php?socid='.$object->id;
 		$head[$h][1] = $langs->trans("Referers");
 		$head[$h][2] = 'consumption';
 		$h++;
@@ -224,7 +224,7 @@ 
 				$servicestatus = 1;
 			}
 
-			include_once DOL_DOCUMENT_ROOT . '/societe/class/societeaccount.class.php';
+			include_once DOL_DOCUMENT_ROOT.'/societe/class/societeaccount.class.php';
 			$societeaccount = new SocieteAccount($db);
 			$stripecu = $societeaccount->getCustomerAccount($object->id, 'stripe', $servicestatus); // Get thirdparty cu_...
 			if ($stripecu) {
@@ -233,12 +233,12 @@ 
 		}
 
 		$sql = "SELECT COUNT(n.rowid) as nb";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "societe_rib as n";
-		$sql .= " WHERE n.fk_soc = " . ((int) $object->id);
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe_rib as n";
+		$sql .= " WHERE n.fk_soc = ".((int) $object->id);
 		if (!isModEnabled('stripe')) {
 			$sql .= " AND n.stripe_card_ref IS NULL";
 		} else {
-			$sql .= " AND (n.stripe_card_ref IS NULL OR (n.stripe_card_ref IS NOT NULL AND n.status = " . ((int) $servicestatus) . "))";
+			$sql .= " AND (n.stripe_card_ref IS NULL OR (n.stripe_card_ref IS NOT NULL AND n.status = ".((int) $servicestatus)."))";
 		}
 
 		$resql = $db->query($sql);
@@ -251,12 +251,12 @@ 
 
 		//if (isModEnabled('stripe') && $nbBankAccount > 0) $nbBankAccount = '...';	// No way to know exact number
 
-		$head[$h][0] = DOL_URL_ROOT . '/societe/paymentmodes.php?socid=' . urlencode((string) ($object->id));
+		$head[$h][0] = DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.urlencode((string) ($object->id));
 		$head[$h][1] = $title;
 		if ($foundonexternalonlinesystem) {
 			$head[$h][1] .= '<span class="badge marginleftonlyshort">...</span>';
 		} elseif ($nbBankAccount > 0) {
-			$head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbBankAccount . '</span>';
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbBankAccount.'</span>';
 		}
 		$head[$h][2] = 'rib';
 		$h++;
@@ -271,15 +271,15 @@ 
 			$site_filter_list[] = 'dolibarr_portal';
 		}
 
-		$head[$h][0] = DOL_URL_ROOT . '/societe/website.php?id=' . urlencode((string) ($object->id));
+		$head[$h][0] = DOL_URL_ROOT.'/societe/website.php?id='.urlencode((string) ($object->id));
 		$head[$h][1] = $langs->trans("WebSiteAccounts");
 		$nbNote = 0;
 		$sql = "SELECT COUNT(n.rowid) as nb";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "societe_account as n";
-		$sql .= " WHERE fk_soc = " . ((int) $object->id);
-		$sql .= " AND entity IN (" . getEntity('thirdpartyaccount') . ")";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe_account as n";
+		$sql .= " WHERE fk_soc = ".((int) $object->id);
+		$sql .= " AND entity IN (".getEntity('thirdpartyaccount').")";
 		if (!empty($site_filter_list)) {
-			$sql .= " AND n.site IN (" . $db->sanitize("'" . implode("','", $site_filter_list) . "'", 1) . ")";
+			$sql .= " AND n.site IN (".$db->sanitize("'".implode("','", $site_filter_list)."'", 1).")";
 		}
 		$resql = $db->query($sql);
 		if ($resql) {
@@ -289,7 +289,7 @@ 
 			dol_print_error($db);
 		}
 		if ($nbNote > 0) {
-			$head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbNote . '</span>';
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
 		}
 		$head[$h][2] = 'website';
 		$h++;
@@ -299,13 +299,13 @@ 
 		if ($user->hasRight('partnership', 'read')) {
 			$langs->load("partnership");
 			$nbPartnership = is_array($object->partnerships) ? count($object->partnerships) : 0;
-			$head[$h][0] = DOL_URL_ROOT . '/partnership/partnership_list.php?socid=' . $object->id;
+			$head[$h][0] = DOL_URL_ROOT.'/partnership/partnership_list.php?socid='.$object->id;
 			$head[$h][1] = $langs->trans("Partnerships");
 			$nbNote = 0;
 			$sql = "SELECT COUNT(n.rowid) as nb";
-			$sql .= " FROM " . MAIN_DB_PREFIX . "partnership as n";
-			$sql .= " WHERE fk_soc = " . ((int) $object->id);
-			$sql .= " AND entity IN (" . getEntity('partnership') . ")";
+			$sql .= " FROM ".MAIN_DB_PREFIX."partnership as n";
+			$sql .= " WHERE fk_soc = ".((int) $object->id);
+			$sql .= " AND entity IN (".getEntity('partnership').")";
 			$resql = $db->query($sql);
 			if ($resql) {
 				$obj = $db->fetch_object($resql);
@@ -314,11 +314,11 @@ 
 				dol_print_error($db);
 			}
 			if ($nbNote > 0) {
-				$head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbNote . '</span>';
+				$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
 			}
 			$head[$h][2] = 'partnerships';
 			if ($nbPartnership > 0) {
-				$head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbPartnership . '</span>';
+				$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbPartnership.'</span>';
 			}
 			$h++;
 		}
@@ -329,16 +329,16 @@ 
 		//$langs->load('ticket');
 		$nbTicket = 0;
 		// Enable caching of thirdparty count notifications
-		require_once DOL_DOCUMENT_ROOT . '/core/lib/memory.lib.php';
-		$cachekey = 'count_ticket_thirdparty_' . $object->id;
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
+		$cachekey = 'count_ticket_thirdparty_'.$object->id;
 		$nbticketretreived = dol_getcache($cachekey);
 		if (!is_null($nbticketretreived)) {
 			$nbTicket = $nbticketretreived;
 		} else {
 			// List of notifications enabled for contacts of the third party
 			$sql = "SELECT COUNT(t.rowid) as nb";
-			$sql .= " FROM " . MAIN_DB_PREFIX . "ticket as t";
-			$sql .= " WHERE t.fk_soc = " . ((int) $object->id);
+			$sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
+			$sql .= " WHERE t.fk_soc = ".((int) $object->id);
 			$resql = $db->query($sql);
 			if ($resql) {
 				$obj = $db->fetch_object($resql);
@@ -346,13 +346,13 @@ 
 			} else {
 				dol_print_error($db);
 			}
-			dol_setcache($cachekey, $nbTicket, 120);		// If setting cache fails, this is not a problem, so we do not test result.
+			dol_setcache($cachekey, $nbTicket, 120); // If setting cache fails, this is not a problem, so we do not test result.
 		}
 
-		$head[$h][0] = DOL_URL_ROOT . '/ticket/list.php?socid=' . urlencode((string) ($object->id));
+		$head[$h][0] = DOL_URL_ROOT.'/ticket/list.php?socid='.urlencode((string) ($object->id));
 		$head[$h][1] = $langs->trans("Tickets");
 		if ($nbTicket > 0) {
-			$head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbTicket . '</span>';
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbTicket.'</span>';
 		}
 		$head[$h][2] = 'ticket';
 		$h++;
@@ -371,20 +371,20 @@ 
 			$langs->load('mails');
 			$nbNotif = 0;
 			// Enable caching of thirdparty count notifications
-			require_once DOL_DOCUMENT_ROOT . '/core/lib/memory.lib.php';
-			$cachekey = 'count_notifications_thirdparty_' . $object->id;
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
+			$cachekey = 'count_notifications_thirdparty_'.$object->id;
 			$dataretrieved = dol_getcache($cachekey);
 			if (!is_null($dataretrieved)) {
 				$nbNotif = $dataretrieved;
 			} else {
 				// List of notifications enabled for contacts of the third party
 				$sql = "SELECT COUNT(n.rowid) as nb";
-				$sql .= " FROM " . MAIN_DB_PREFIX . "c_action_trigger as a,";
-				$sql .= " " . MAIN_DB_PREFIX . "notify_def as n,";
-				$sql .= " " . MAIN_DB_PREFIX . "socpeople as c";
+				$sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
+				$sql .= " ".MAIN_DB_PREFIX."notify_def as n,";
+				$sql .= " ".MAIN_DB_PREFIX."socpeople as c";
 				$sql .= " WHERE a.rowid = n.fk_action";
 				$sql .= " AND c.rowid = n.fk_contact";
-				$sql .= " AND c.fk_soc = " . ((int) $object->id);
+				$sql .= " AND c.fk_soc = ".((int) $object->id);
 				$resql = $db->query($sql);
 				if ($resql) {
 					$obj = $db->fetch_object($resql);
@@ -392,13 +392,13 @@ 
 				} else {
 					dol_print_error($db);
 				}
-				dol_setcache($cachekey, $nbNotif, 120);		// If setting cache fails, this is not a problem, so we do not test result.
+				dol_setcache($cachekey, $nbNotif, 120); // If setting cache fails, this is not a problem, so we do not test result.
 			}
 
-			$head[$h][0] = DOL_URL_ROOT . '/societe/notify/card.php?socid=' . urlencode((string) ($object->id));
+			$head[$h][0] = DOL_URL_ROOT.'/societe/notify/card.php?socid='.urlencode((string) ($object->id));
 			$head[$h][1] = $langs->trans("Notifications");
 			if ($nbNotif > 0) {
-				$head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbNotif . '</span>';
+				$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNotif.'</span>';
 			}
 			$head[$h][2] = 'notify';
 			$h++;
@@ -412,10 +412,10 @@ 
 		if (!empty($object->note_public)) {
 			$nbNote++;
 		}
-		$head[$h][0] = DOL_URL_ROOT . '/societe/note.php?id=' . urlencode((string) ($object->id));
+		$head[$h][0] = DOL_URL_ROOT.'/societe/note.php?id='.urlencode((string) ($object->id));
 		$head[$h][1] = $langs->trans("Notes");
 		if ($nbNote > 0) {
-			$head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbNote . '</span>';
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
 		}
 		$head[$h][2] = 'note';
 		$h++;
@@ -423,59 +423,59 @@ 
 		// Attached files and Links
 		$totalAttached = 0;
 		// Enable caching of thirdrparty count attached files and links
-		require_once DOL_DOCUMENT_ROOT . '/core/lib/memory.lib.php';
-		$cachekey = 'count_attached_thirdparty_' . $object->id;
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
+		$cachekey = 'count_attached_thirdparty_'.$object->id;
 		$dataretrieved = dol_getcache($cachekey);
 		if (!is_null($dataretrieved)) {
 			$totalAttached = $dataretrieved;
 		} else {
-			require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-			require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
-			$upload_dir = $conf->societe->multidir_output[$object->entity ?? $conf->entity] . "/" . $object->id;
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+			$upload_dir = $conf->societe->multidir_output[$object->entity ?? $conf->entity]."/".$object->id;
 			$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
 			$nbLinks = Link::count($db, $object->element, $object->id);
 			$totalAttached = $nbFiles + $nbLinks;
-			dol_setcache($cachekey, $totalAttached, 120);		// If setting cache fails, this is not a problem, so we do not test result.
+			dol_setcache($cachekey, $totalAttached, 120); // If setting cache fails, this is not a problem, so we do not test result.
 		}
 
-		$head[$h][0] = DOL_URL_ROOT . '/societe/document.php?socid=' . $object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/societe/document.php?socid='.$object->id;
 		$head[$h][1] = $langs->trans("Documents");
 		if (($totalAttached) > 0) {
-			$head[$h][1] .= '<span class="badge marginleftonlyshort">' . ($totalAttached) . '</span>';
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($totalAttached).'</span>';
 		}
 		$head[$h][2] = 'document';
 		$h++;
 	}
 
-	$head[$h][0] = DOL_URL_ROOT . '/societe/messaging.php?socid=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/societe/messaging.php?socid='.$object->id;
 	$head[$h][1] = $langs->trans("Events");
 	if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
 		$nbEvent = 0;
 		// Enable caching of thirdparty count actioncomm
-		require_once DOL_DOCUMENT_ROOT . '/core/lib/memory.lib.php';
-		$cachekey = 'count_events_thirdparty_' . $object->id;
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
+		$cachekey = 'count_events_thirdparty_'.$object->id;
 		$dataretrieved = dol_getcache($cachekey);
 		if (!is_null($dataretrieved)) {
 			$nbEvent = $dataretrieved;
 		} else {
 			$sql = "SELECT COUNT(id) as nb";
-			$sql .= " FROM " . MAIN_DB_PREFIX . "actioncomm";
-			$sql .= " WHERE fk_soc = " . ((int) $object->id);
-			$sql .= " AND entity IN (" . getEntity('agenda') . ")";
+			$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm";
+			$sql .= " WHERE fk_soc = ".((int) $object->id);
+			$sql .= " AND entity IN (".getEntity('agenda').")";
 			$resql = $db->query($sql);
 			if ($resql) {
 				$obj = $db->fetch_object($resql);
 				$nbEvent = $obj->nb;
 			} else {
-				dol_syslog('Failed to count actioncomm ' . $db->lasterror(), LOG_ERR);
+				dol_syslog('Failed to count actioncomm '.$db->lasterror(), LOG_ERR);
 			}
-			dol_setcache($cachekey, $nbEvent, 120);		// If setting cache fails, this is not a problem, so we do not test result.
+			dol_setcache($cachekey, $nbEvent, 120); // If setting cache fails, this is not a problem, so we do not test result.
 		}
 
 		$head[$h][1] .= '/';
 		$head[$h][1] .= $langs->trans("Agenda");
 		if ($nbEvent > 0) {
-			$head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbEvent . '</span>';
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbEvent.'</span>';
 		}
 	}
 	$head[$h][2] = 'agenda';
@@ -505,12 +505,12 @@ 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/societe/card.php?socid=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/societe/card.php?socid='.$object->id;
 	$head[$h][1] = $langs->trans("ThirdParty");
 	$head[$h][2] = 'company';
 	$h++;
 
-	$head[$h][0] = 'commerciaux.php?socid=' . $object->id;
+	$head[$h][0] = 'commerciaux.php?socid='.$object->id;
 	$head[$h][1] = $langs->trans("SalesRepresentative");
 	$head[$h][2] = 'salesrepresentative';
 	$h++;
@@ -536,7 +536,7 @@ 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/societe/admin/societe.php';
+	$head[$h][0] = DOL_URL_ROOT.'/societe/admin/societe.php';
 	$head[$h][1] = $langs->trans("Miscellaneous");
 	$head[$h][2] = 'general';
 	$h++;
@@ -547,20 +547,20 @@ 
 	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'company_admin');
 
-	$head[$h][0] = DOL_URL_ROOT . '/societe/admin/societe_extrafields.php';
+	$head[$h][0] = DOL_URL_ROOT.'/societe/admin/societe_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFieldsThirdParties");
 	$nbExtrafields = $extrafields->attributes['societe']['count'];
 	if ($nbExtrafields > 0) {
-		$head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbExtrafields . '</span>';
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';
 	}
 	$head[$h][2] = 'attributes';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT . '/societe/admin/contact_extrafields.php';
+	$head[$h][0] = DOL_URL_ROOT.'/societe/admin/contact_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFieldsContacts");
 	$nbExtrafields = $extrafields->attributes['socpeople']['count'];
 	if ($nbExtrafields > 0) {
-		$head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbExtrafields . '</span>';
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';
 	}
 	$head[$h][2] = 'attributes_contacts';
 	$h++;
@@ -608,13 +608,13 @@ 
 		$outputlangs = $langs;
 	}
 
-	$sql = "SELECT rowid, code, label FROM " . MAIN_DB_PREFIX . "c_country";
+	$sql = "SELECT rowid, code, label FROM ".MAIN_DB_PREFIX."c_country";
 	if (is_numeric($searchkey)) {
-		$sql .= " WHERE rowid = " . ((int) $searchkey);
+		$sql .= " WHERE rowid = ".((int) $searchkey);
 	} elseif (!empty($searchkey)) {
-		$sql .= " WHERE code = '" . $db->escape($searchkey) . "'";
+		$sql .= " WHERE code = '".$db->escape($searchkey)."'";
 	} else {
-		$sql .= " WHERE label = '" . $db->escape($searchlabel) . "'";
+		$sql .= " WHERE label = '".$db->escape($searchlabel)."'";
 	}
 
 	$resql = $dbtouse->query($sql);
@@ -625,9 +625,9 @@ 
 			if (is_object($outputlangs)) {
 				$outputlangs->load("dict");
 				if ($entconv) {
-					$label = ($obj->code && ($outputlangs->trans("Country" . $obj->code) != "Country" . $obj->code)) ? $outputlangs->trans("Country" . $obj->code) : $label;
+					$label = ($obj->code && ($outputlangs->trans("Country".$obj->code) != "Country".$obj->code)) ? $outputlangs->trans("Country".$obj->code) : $label;
 				} else {
-					$label = ($obj->code && ($outputlangs->transnoentitiesnoconv("Country" . $obj->code) != "Country" . $obj->code)) ? $outputlangs->transnoentitiesnoconv("Country" . $obj->code) : $label;
+					$label = ($obj->code && ($outputlangs->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code)) ? $outputlangs->transnoentitiesnoconv("Country".$obj->code) : $label;
 				}
 			}
 			if ($withcode == '1') {
@@ -676,8 +676,8 @@ 
 	}
 
 	$sql = "SELECT d.rowid as id, d.code_departement as code, d.nom as name, d.active, c.label as country, c.code as country_code, r.code_region as region_code, r.nom as region_name FROM";
-	$sql .= " " . MAIN_DB_PREFIX . "c_departements as d, " . MAIN_DB_PREFIX . "c_regions as r," . MAIN_DB_PREFIX . "c_country as c";
-	$sql .= " WHERE d.fk_region=r.code_region and r.fk_pays=c.rowid and d.rowid=" . ((int) $id);
+	$sql .= " ".MAIN_DB_PREFIX."c_departements as d, ".MAIN_DB_PREFIX."c_regions as r,".MAIN_DB_PREFIX."c_country as c";
+	$sql .= " WHERE d.fk_region=r.code_region and r.fk_pays=c.rowid and d.rowid=".((int) $id);
 	$sql .= " AND d.active = 1 AND r.active = 1 AND c.active = 1";
 	$sql .= " ORDER BY c.code, d.code_departement";
 
@@ -690,21 +690,21 @@ 
 			if (is_object($outputlangs)) {
 				$outputlangs->load("dict");
 				if ($entconv) {
-					$label = ($obj->code && ($outputlangs->trans("State" . $obj->code) != "State" . $obj->code)) ? $outputlangs->trans("State" . $obj->code) : $label;
+					$label = ($obj->code && ($outputlangs->trans("State".$obj->code) != "State".$obj->code)) ? $outputlangs->trans("State".$obj->code) : $label;
 				} else {
-					$label = ($obj->code && ($outputlangs->transnoentitiesnoconv("State" . $obj->code) != "State" . $obj->code)) ? $outputlangs->transnoentitiesnoconv("State" . $obj->code) : $label;
+					$label = ($obj->code && ($outputlangs->transnoentitiesnoconv("State".$obj->code) != "State".$obj->code)) ? $outputlangs->transnoentitiesnoconv("State".$obj->code) : $label;
 				}
 			}
 
 			if ($withcode == 1) {
 				if ($withregion == 1) {
-					return $label = $obj->region_name . ' - ' . $obj->code . ' - ' . ($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
+					return $label = $obj->region_name.' - '.$obj->code.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
 				} else {
-					return $label = $obj->code . ' - ' . ($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
+					return $label = $obj->code.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
 				}
 			} elseif ($withcode == 2) {
 				if ($withregion == 1) {
-					return $label = $obj->region_name . ' - ' . ($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
+					return $label = $obj->region_name.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
 				} else {
 					return $label = ($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
 				}
@@ -716,7 +716,7 @@ 
 				}
 			} else {
 				if ($withregion == 1) {
-					return $label = $obj->region_name . ' - ' . $label;
+					return $label = $obj->region_name.' - '.$label;
 				} else {
 					return $label;
 				}
@@ -750,13 +750,13 @@ 
 	$outputlangs->load("dict");
 
 	// If there is a translation, we can send immediately the label
-	if ($outputlangs->trans("Currency" . $code_iso) != "Currency" . $code_iso) {
-		return ($withcode ? $code_iso . ' - ' : '') . $outputlangs->trans("Currency" . $code_iso);
+	if ($outputlangs->trans("Currency".$code_iso) != "Currency".$code_iso) {
+		return ($withcode ? $code_iso.' - ' : '').$outputlangs->trans("Currency".$code_iso);
 	}
 
 	// If no translation, we read table to get label by default
-	$sql = "SELECT label FROM " . MAIN_DB_PREFIX . "c_currencies";
-	$sql .= " WHERE code_iso='" . $db->escape($code_iso) . "'";
+	$sql = "SELECT label FROM ".MAIN_DB_PREFIX."c_currencies";
+	$sql .= " WHERE code_iso='".$db->escape($code_iso)."'";
 
 	$resql = $db->query($sql);
 	if ($resql) {
@@ -792,12 +792,12 @@ 
 		return '';
 	}
 
-	if (!empty($conf->cache["legalform_" . $langs->defaultlang . '_' . $code])) {
-		return $conf->cache["legalform_" . $langs->defaultlang . '_' . $code];
+	if (!empty($conf->cache["legalform_".$langs->defaultlang.'_'.$code])) {
+		return $conf->cache["legalform_".$langs->defaultlang.'_'.$code];
 	}
 
-	$sql = "SELECT libelle as label FROM " . MAIN_DB_PREFIX . "c_forme_juridique";
-	$sql .= " WHERE code = '" . $db->escape($code) . "'";
+	$sql = "SELECT libelle as label FROM ".MAIN_DB_PREFIX."c_forme_juridique";
+	$sql .= " WHERE code = '".$db->escape($code)."'";
 
 	dol_syslog("Company.lib::getFormeJuridiqueLabel", LOG_DEBUG);
 
@@ -809,14 +809,14 @@ 
 
 			$label = ($obj->label != '-' ? $obj->label : '');
 
-			$conf->cache["legalform_" . $langs->defaultlang . '_' . $code] = $label;
+			$conf->cache["legalform_".$langs->defaultlang.'_'.$code] = $label;
 
 			return $langs->trans($label);
 		} else {
 			return $langs->trans("NotDefined");
 		}
 	} else {
-		return 'Error ' . $db->lasterror();
+		return 'Error '.$db->lasterror();
 	}
 }
 
@@ -838,7 +838,7 @@ 
 		// Use of cache to reduce number of database requests
 		$country_code_in_EEC = $conf->cache['country_code_in_EEC'];
 	} else {
-		$sql = "SELECT cc.code FROM " . MAIN_DB_PREFIX . "c_country as cc";
+		$sql = "SELECT cc.code FROM ".MAIN_DB_PREFIX."c_country as cc";
 		$sql .= " WHERE cc.eec = 1";
 
 		$resql = $db->query($sql);
@@ -870,7 +870,7 @@ 
 		return false;
 	}
 
-	$country_code_in_EEC = getCountriesInEEC();		// This make a database call but there is a cache done into $conf->cache['country_code_in_EEC']
+	$country_code_in_EEC = getCountriesInEEC(); // This make a database call but there is a cache done into $conf->cache['country_code_in_EEC']
 
 	//print "dd".$object->country_code;
 	return in_array($object->country_code, $country_code_in_EEC);
@@ -893,7 +893,7 @@ 
 		// Use of cache to reduce number of database requests
 		$country_code_in_SEPA = $conf->cache['country_code_in_SEPA'];
 	} else {
-		$sql = "SELECT cc.code FROM " . MAIN_DB_PREFIX . "c_country as cc";
+		$sql = "SELECT cc.code FROM ".MAIN_DB_PREFIX."c_country as cc";
 		$sql .= " WHERE cc.sepa = 1";
 
 		$resql = $db->query($sql);
@@ -925,7 +925,7 @@ 
 		return false;
 	}
 
-	$country_code_in_SEPA = getCountriesInSEPA();		// This make a database call but there is a cache done into $conf->cache['country_code_in_SEPA']
+	$country_code_in_SEPA = getCountriesInSEPA(); // This make a database call but there is a cache done into $conf->cache['country_code_in_SEPA']
 
 	//print "dd".$object->country_code;
 	return in_array($object->country_code, $country_code_in_SEPA);
@@ -955,21 +955,21 @@ 
 
 		$newcardbutton = '';
 		if (isModEnabled('project') && $user->hasRight('projet', 'creer') && empty($nocreatelink)) {
-			$newcardbutton .= dolGetButtonTitle($langs->trans('AddProject'), '', 'fa fa-plus-circle', DOL_URL_ROOT . '/projet/card.php?socid=' . $object->id . '&action=create&backtopage=' . urlencode($backtopage));
+			$newcardbutton .= dolGetButtonTitle($langs->trans('AddProject'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/projet/card.php?socid='.$object->id.'&action=create&backtopage='.urlencode($backtopage));
 		}
 
 		print "\n";
-		print load_fiche_titre($langs->trans("ProjectsDedicatedToThisThirdParty"), $newcardbutton . $morehtmlright, '');
+		print load_fiche_titre($langs->trans("ProjectsDedicatedToThisThirdParty"), $newcardbutton.$morehtmlright, '');
 
-		print '<div class="div-table-responsive">' . "\n";
+		print '<div class="div-table-responsive">'."\n";
 		print '<table class="noborder centpercent">';
 
 		$sql  = "SELECT p.rowid as id, p.entity, p.title, p.ref, p.public, p.dateo as do, p.datee as de, p.fk_statut as status, p.fk_opp_status, p.opp_amount, p.opp_percent, p.tms as date_modification, p.budget_amount";
 		$sql .= ", cls.code as opp_status_code";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "projet as p";
-		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_lead_status as cls on p.fk_opp_status = cls.rowid";
-		$sql .= " WHERE p.fk_soc = " . ((int) $object->id);
-		$sql .= " AND p.entity IN (" . getEntity('project') . ")";
+		$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_lead_status as cls on p.fk_opp_status = cls.rowid";
+		$sql .= " WHERE p.fk_soc = ".((int) $object->id);
+		$sql .= " AND p.entity IN (".getEntity('project').")";
 		$sql .= " ORDER BY p.dateo DESC";
 
 		$result = $db->query($sql);
@@ -983,14 +983,14 @@ 
 				print $selectedfields;
 				print '</td>';
 			}
-			print '<td>' . $langs->trans("Ref") . '</td>';
-			print '<td>' . $langs->trans("Name") . '</td>';
-			print '<td class="center">' . $langs->trans("DateStart") . '</td>';
-			print '<td class="center">' . $langs->trans("DateEnd") . '</td>';
-			print '<td class="right">' . $langs->trans("OpportunityAmountShort") . '</td>';
-			print '<td class="center">' . $langs->trans("OpportunityStatusShort") . '</td>';
-			print '<td class="right">' . $langs->trans("OpportunityProbabilityShort") . '</td>';
-			print '<td class="right">' . $langs->trans("Status") . '</td>';
+			print '<td>'.$langs->trans("Ref").'</td>';
+			print '<td>'.$langs->trans("Name").'</td>';
+			print '<td class="center">'.$langs->trans("DateStart").'</td>';
+			print '<td class="center">'.$langs->trans("DateEnd").'</td>';
+			print '<td class="right">'.$langs->trans("OpportunityAmountShort").'</td>';
+			print '<td class="center">'.$langs->trans("OpportunityStatusShort").'</td>';
+			print '<td class="right">'.$langs->trans("OpportunityProbabilityShort").'</td>';
+			print '<td class="right">'.$langs->trans("Status").'</td>';
 			if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 				print '<td class="center">';
 				$selectedfields = (is_array($arrayofmassactions) && count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
@@ -1000,7 +1000,7 @@ 
 			print '</tr>';
 
 			if ($num > 0) {
-				require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+				require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 				$projecttmp = new Project($db);
 
@@ -1023,41 +1023,41 @@ 
 								if (in_array($obj->id, $arrayofselected)) {
 									$selected = 1;
 								}
-								print '<input id="cb' . $obj->id . '" class="flat checkforselect" type="checkbox" name="toselect[]" value="' . $obj->id . '"' . ($selected ? ' checked="checked"' : '') . '>';
+								print '<input id="cb'.$obj->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->id.'"'.($selected ? ' checked="checked"' : '').'>';
 							}
 							print '</td>';
 						}
 						// Ref
 						print '<td class="nowraponall">';
-						print $projecttmp->getNomUrl(1, '', 0, '', '-', 0, 1, '', 'project:' . $_SERVER["PHP_SELF"] . '?socid=__SOCID__');
+						print $projecttmp->getNomUrl(1, '', 0, '', '-', 0, 1, '', 'project:'.$_SERVER["PHP_SELF"].'?socid=__SOCID__');
 						print '</td>';
 
 						// Label
-						print '<td class="tdoverflowmax200" title="' . dol_escape_htmltag($obj->title) . '">' . dol_escape_htmltag($obj->title) . '</td>';
+						print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($obj->title).'">'.dol_escape_htmltag($obj->title).'</td>';
 						// Date start
-						print '<td class="center">' . dol_print_date($db->jdate($obj->do), "day") . '</td>';
+						print '<td class="center">'.dol_print_date($db->jdate($obj->do), "day").'</td>';
 						// Date end
-						print '<td class="center">' . dol_print_date($db->jdate($obj->de), "day") . '</td>';
+						print '<td class="center">'.dol_print_date($db->jdate($obj->de), "day").'</td>';
 						// Opp amount
 						print '<td class="right">';
 						if ($obj->opp_status_code) {
-							print '<span class="amount">' . price($obj->opp_amount, 1, '', 1, -1, -1, '') . '</span>';
+							print '<span class="amount">'.price($obj->opp_amount, 1, '', 1, -1, -1, '').'</span>';
 						}
 						print '</td>';
 						// Opp status
 						print '<td class="center">';
 						if ($obj->opp_status_code) {
-							print $langs->trans("OppStatus" . $obj->opp_status_code);
+							print $langs->trans("OppStatus".$obj->opp_status_code);
 						}
 						print '</td>';
 						// Opp percent
 						print '<td class="right">';
 						if ($obj->opp_percent) {
-							print price($obj->opp_percent, 1, '', 1, 0) . '%';
+							print price($obj->opp_percent, 1, '', 1, 0).'%';
 						}
 						print '</td>';
 						// Status
-						print '<td class="right">' . $projecttmp->getLibStatut(5) . '</td>';
+						print '<td class="right">'.$projecttmp->getLibStatut(5).'</td>';
 
 						// Action column
 						if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
@@ -1067,7 +1067,7 @@ 
 								if (in_array($obj->id, $arrayofselected)) {
 									$selected = 1;
 								}
-								print '<input id="cb' . $obj->id . '" class="flat checkforselect" type="checkbox" name="toselect[]" value="' . $obj->id . '"' . ($selected ? ' checked="checked"' : '') . '>';
+								print '<input id="cb'.$obj->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->id.'"'.($selected ? ' checked="checked"' : '').'>';
 							}
 							print '</td>';
 						}
@@ -1076,7 +1076,7 @@ 
 					$i++;
 				}
 			} else {
-				print '<tr class="oddeven"><td colspan="9"><span class="opacitymedium">' . $langs->trans("None") . '</span></td></tr>';
+				print '<tr class="oddeven"><td colspan="9"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 			}
 			$db->free($result);
 		} else {
@@ -1089,18 +1089,18 @@ 
 			print load_fiche_titre($langs->trans("ProjectsLinkedToThisThirdParty"), '', '');
 
 
-			print '<div class="div-table-responsive">' . "\n";
+			print '<div class="div-table-responsive">'."\n";
 			print '<table class="noborder centpercent">';
 
 			$sql  = "SELECT p.rowid as id, p.entity, p.title, p.ref, p.public, p.dateo as do, p.datee as de, p.fk_statut as status, p.fk_opp_status, p.opp_amount, p.opp_percent, p.tms as date_update, p.budget_amount";
 			$sql .= ", cls.code as opp_status_code";
-			$sql .= " FROM " . MAIN_DB_PREFIX . "projet as p";
-			$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_lead_status as cls on p.fk_opp_status = cls.rowid";
-			$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "element_contact as ec on p.rowid = ec.element_id";
-			$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "socpeople as sc on ec.fk_socpeople = sc.rowid";
-			$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_type_contact as tc on ec.fk_c_type_contact = tc.rowid";
-			$sql .= " WHERE sc.fk_soc = " . ((int) $object->id);
-			$sql .= " AND p.entity IN (" . getEntity('project') . ")";
+			$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_lead_status as cls on p.fk_opp_status = cls.rowid";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_contact as ec on p.rowid = ec.element_id";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sc on ec.fk_socpeople = sc.rowid";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_contact as tc on ec.fk_c_type_contact = tc.rowid";
+			$sql .= " WHERE sc.fk_soc = ".((int) $object->id);
+			$sql .= " AND p.entity IN (".getEntity('project').")";
 			$sql .= " AND tc.element = 'project' AND tc.source = 'external'";
 			$sql .= " ORDER BY p.dateo DESC";
 
@@ -1109,18 +1109,18 @@ 
 				$num = $db->num_rows($result);
 
 				print '<tr class="liste_titre">';
-				print '<td>' . $langs->trans("Ref") . '</td>';
-				print '<td>' . $langs->trans("Name") . '</td>';
-				print '<td class="center">' . $langs->trans("DateStart") . '</td>';
-				print '<td class="center">' . $langs->trans("DateEnd") . '</td>';
-				print '<td class="right">' . $langs->trans("OpportunityAmountShort") . '</td>';
-				print '<td class="center">' . $langs->trans("OpportunityStatusShort") . '</td>';
-				print '<td class="right">' . $langs->trans("OpportunityProbabilityShort") . '</td>';
-				print '<td class="right">' . $langs->trans("Status") . '</td>';
+				print '<td>'.$langs->trans("Ref").'</td>';
+				print '<td>'.$langs->trans("Name").'</td>';
+				print '<td class="center">'.$langs->trans("DateStart").'</td>';
+				print '<td class="center">'.$langs->trans("DateEnd").'</td>';
+				print '<td class="right">'.$langs->trans("OpportunityAmountShort").'</td>';
+				print '<td class="center">'.$langs->trans("OpportunityStatusShort").'</td>';
+				print '<td class="right">'.$langs->trans("OpportunityProbabilityShort").'</td>';
+				print '<td class="right">'.$langs->trans("Status").'</td>';
 				print '</tr>';
 
 				if ($num > 0) {
-					require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+					require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 					$projecttmp = new Project($db);
 
@@ -1138,42 +1138,42 @@ 
 
 							// Ref
 							print '<td class="nowraponall">';
-							print $projecttmp->getNomUrl(1, '', 0, '', '-', 0, 1, '', 'project:' . $_SERVER["PHP_SELF"] . '?socid=__SOCID__');
+							print $projecttmp->getNomUrl(1, '', 0, '', '-', 0, 1, '', 'project:'.$_SERVER["PHP_SELF"].'?socid=__SOCID__');
 							print '</td>';
 
 							// Label
-							print '<td class="tdoverflowmax200" title="' . dol_escape_htmltag($obj->title) . '">' . dol_escape_htmltag($obj->title) . '</td>';
+							print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($obj->title).'">'.dol_escape_htmltag($obj->title).'</td>';
 							// Date start
-							print '<td class="center">' . dol_print_date($db->jdate($obj->do), "day") . '</td>';
+							print '<td class="center">'.dol_print_date($db->jdate($obj->do), "day").'</td>';
 							// Date end
-							print '<td class="center">' . dol_print_date($db->jdate($obj->de), "day") . '</td>';
+							print '<td class="center">'.dol_print_date($db->jdate($obj->de), "day").'</td>';
 							// Opp amount
 							print '<td class="right">';
 							if ($obj->opp_status_code) {
-								print '<span class="amount">' . price($obj->opp_amount, 1, '', 1, -1, -1, '') . '</span>';
+								print '<span class="amount">'.price($obj->opp_amount, 1, '', 1, -1, -1, '').'</span>';
 							}
 							print '</td>';
 							// Opp status
 							print '<td class="center">';
 							if ($obj->opp_status_code) {
-								print $langs->trans("OppStatus" . $obj->opp_status_code);
+								print $langs->trans("OppStatus".$obj->opp_status_code);
 							}
 							print '</td>';
 							// Opp percent
 							print '<td class="right">';
 							if ($obj->opp_percent) {
-								print price($obj->opp_percent, 1, '', 1, 0) . '%';
+								print price($obj->opp_percent, 1, '', 1, 0).'%';
 							}
 							print '</td>';
 							// Status
-							print '<td class="right">' . $projecttmp->getLibStatut(5) . '</td>';
+							print '<td class="right">'.$projecttmp->getLibStatut(5).'</td>';
 
 							print '</tr>';
 						}
 						$i++;
 					}
 				} else {
-					print '<tr class="oddeven"><td colspan="8"><span class="opacitymedium">' . $langs->trans("None") . '</span></td></tr>';
+					print '<tr class="oddeven"><td colspan="8"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 				}
 				$db->free($result);
 			} else {
@@ -1211,7 +1211,7 @@ 
 	global $user, $conf, $extrafields, $hookmanager;
 	global $contextpage;
 
-	require_once DOL_DOCUMENT_ROOT . '/core/class/html.formcompany.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 	$formcompany = new FormCompany($db);
 	$form = new Form($db);
 
@@ -1296,7 +1296,7 @@ 
 		't.rowid' => array('label' => "TechnicalID", 'checked' => (getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') ? '1' : '0'), 'enabled' => (getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') ? '1' : '0'), 'position' => 1),
 		't.name' => array('label' => "Name", 'checked' => '1', 'position' => 10),
 		't.poste' => array('label' => "PostOrFunction", 'checked' => '1', 'position' => 20),
-		't.address' => array('label' => (empty($conf->dol_optimize_smallscreen) ? $langs->trans("Address") . ' / ' . $langs->trans("Phone") . ' / ' . $langs->trans("Email") : $langs->trans("Address")), 'checked' => '1', 'position' => 30),
+		't.address' => array('label' => (empty($conf->dol_optimize_smallscreen) ? $langs->trans("Address").' / '.$langs->trans("Phone").' / '.$langs->trans("Email") : $langs->trans("Address")), 'checked' => '1', 'position' => 30),
 		't.note_private' => array('label' => 'NotePrivate', 'checked' => '0', 'position' => 35),
 		'sc.role' => array('label' => "ContactByDefaultFor", 'checked' => '1', 'position' => 40),
 		't.birthday' => array('label' => "Birthday", 'checked' => '0', 'position' => 45),
@@ -1307,12 +1307,12 @@ 
 	$extrafieldsobjectkey = $contactstatic->table_element;
 	$extrafieldsobjectprefix = 'ef.';
 	$extrafieldspositionoffset = 1000;
-	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_array_fields.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
 	// Initialize array of search criteria
 	$search = array();
 	foreach ($arrayfields as $key => $val) {
-		$queryName = 'search_' . substr($key, 2);
+		$queryName = 'search_'.substr($key, 2);
 		if (GETPOST($queryName, 'alpha')) {
 			$search[substr($key, 2)] = GETPOST($queryName, 'alpha');
 		}
@@ -1347,7 +1347,7 @@ 
 	if (empty($reshook)) {
 		if ($user->hasRight('societe', 'contact', 'creer')) {
 			$addcontact = (getDolGlobalString('SOCIETE_ADDRESSES_MANAGEMENT') ? $langs->trans("AddContact") : $langs->trans("AddContactAddress"));
-			$newcardbutton .= dolGetButtonTitle($addcontact, '', 'fa fa-plus-circle', DOL_URL_ROOT . '/contact/card.php?socid=' . $object->id . '&action=create&backtopage=' . urlencode($backtopage));
+			$newcardbutton .= dolGetButtonTitle($addcontact, '', 'fa fa-plus-circle', DOL_URL_ROOT.'/contact/card.php?socid='.$object->id.'&action=create&backtopage='.urlencode($backtopage));
 		}
 	} else {
 		$newcardbutton = $hookmanager->resPrint;
@@ -1358,75 +1358,75 @@ 
 	$title = (getDolGlobalString('SOCIETE_ADDRESSES_MANAGEMENT') ? $langs->trans("ContactsForCompany") : $langs->trans("ContactsAddressesForCompany"));
 	print load_fiche_titre($title, $newcardbutton, 'contact');
 
-	print '<form method="POST" id="searchFormList" action="' . $_SERVER["PHP_SELF"] . '" name="formfilter">';
-	print '<input type="hidden" name="token" value="' . newToken() . '">';
+	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-	print '<input type="hidden" name="socid" value="' . $object->id . '">';
-	print '<input type="hidden" name="sortorder" value="' . $sortorder . '">';
-	print '<input type="hidden" name="sortfield" value="' . $sortfield . '">';
-	print '<input type="hidden" name="page" value="' . $page . '">';
+	print '<input type="hidden" name="socid" value="'.$object->id.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
 
 	$arrayofmassactions = array();
 	$mode = 'view';
 
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-	$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN'));  // This also change content of $arrayfields with user setup
+	$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup
 	$selectedfields = ($mode != 'kanban' ? $htmlofselectarray : '');
 	$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 	print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
-	print "\n" . '<table class="tagtable liste noborder">' . "\n";
+	print "\n".'<table class="tagtable liste noborder">'."\n";
 
-	$param = "socid=" . urlencode((string) ($object->id));
+	$param = "socid=".urlencode((string) ($object->id));
 	if ($search_rowid != '') {
-		$param .= '&search_rowid=' . urlencode((string) ($search_rowid));
+		$param .= '&search_rowid='.urlencode((string) ($search_rowid));
 	}
 	if ($search_status != '') {
-		$param .= '&search_status=' . urlencode((string) ($search_status));
+		$param .= '&search_status='.urlencode((string) ($search_status));
 	}
 	if (count($search_roles) > 0) {
 		$param .= implode('&search_roles[]=', $search_roles);
 	}
 	if ($search_name != '') {
-		$param .= '&search_name=' . urlencode($search_name);
+		$param .= '&search_name='.urlencode($search_name);
 	}
 	if ($search_poste != '') {
-		$param .= '&search_poste=' . urlencode($search_poste);
+		$param .= '&search_poste='.urlencode($search_poste);
 	}
 	if ($search_address != '') {
-		$param .= '&search_address=' . urlencode($search_address);
+		$param .= '&search_address='.urlencode($search_address);
 	}
 	if ($search_note_private != '') {
-		$param .= '&search_note_private=' . urlencode($search_note_private);
+		$param .= '&search_note_private='.urlencode($search_note_private);
 	}
 	if ($search_birthday_dtstart != '') {
-		$param .= '&search_birthday_dtstart=' . urlencode((string) $search_birthday_dtstart);
+		$param .= '&search_birthday_dtstart='.urlencode((string) $search_birthday_dtstart);
 	}
 	if ($search_birthday_dtend != '') {
-		$param .= '&search_birthday_dtend=' . urlencode((string) $search_birthday_dtend);
+		$param .= '&search_birthday_dtend='.urlencode((string) $search_birthday_dtend);
 	}
 	if ($optioncss != '') {
-		$param .= '&optioncss=' . urlencode($optioncss);
+		$param .= '&optioncss='.urlencode($optioncss);
 	}
 
 	// Add $param from extra fields
 	$extrafieldsobjectkey = $contactstatic->table_element;
-	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_search_param.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
 	$sql = "SELECT t.rowid, t.entity, t.lastname, t.firstname, t.fk_pays as country_id, t.civility, t.poste,";
 	$sql .= " t.phone as phone_pro, t.phone_mobile, t.phone_perso, t.fax, t.email, t.socialnetworks, t.statut, t.photo, t.fk_soc,";
 	$sql .= " t.civility as civility_id, t.address, t.zip, t.town, t.birthday,";
 	$sql .= " t.note_private";
-	$sql .= " FROM " . MAIN_DB_PREFIX . "socpeople as t";
-	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "socpeople_extrafields as ef on (t.rowid = ef.fk_object)";
-	$sql .= " WHERE t.fk_soc = " . ((int) $object->id);
-	$sql .= " AND t.entity IN (" . getEntity('socpeople') . ")";
-	$sql .= " AND ((t.fk_user_creat = " . ((int) $user->id) . " AND t.priv = 1) OR t.priv = 0)";
+	$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as t";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople_extrafields as ef on (t.rowid = ef.fk_object)";
+	$sql .= " WHERE t.fk_soc = ".((int) $object->id);
+	$sql .= " AND t.entity IN (".getEntity('socpeople').")";
+	$sql .= " AND ((t.fk_user_creat = ".((int) $user->id)." AND t.priv = 1) OR t.priv = 0)";
 	if ($search_rowid) {
 		$sql .= natural_search('t.rowid', $search_rowid);
 	}
 	if ($search_status != '' && $search_status != '-1') {
-		$sql .= " AND t.statut = " . ((int) $search_status);
+		$sql .= " AND t.statut = ".((int) $search_status);
 	}
 	if ($search_name) {
 		$sql .= natural_search(array('t.lastname', 't.firstname'), $search_name);
@@ -1441,17 +1441,17 @@ 
 		$sql .= natural_search('t.note_private', $search_note_private);
 	}
 	if ($search_birthday_dtstart != '') {
-		$sql .= " AND t.birthday >= '" . $db->idate($search_birthday_dtstart) . "'";
+		$sql .= " AND t.birthday >= '".$db->idate($search_birthday_dtstart)."'";
 	}
 	if ($search_birthday_dtend != '') {
-		$sql .= " AND t.birthday <= '" . $db->idate($search_birthday_dtend) . "'";
+		$sql .= " AND t.birthday <= '".$db->idate($search_birthday_dtend)."'";
 	}
 	if (count($search_roles) > 0) {
-		$sql .= " AND t.rowid IN (SELECT sc.fk_socpeople FROM " . MAIN_DB_PREFIX . "societe_contacts as sc WHERE sc.fk_c_type_contact IN (" . $db->sanitize(implode(',', $search_roles)) . "))";
+		$sql .= " AND t.rowid IN (SELECT sc.fk_socpeople FROM ".MAIN_DB_PREFIX."societe_contacts as sc WHERE sc.fk_c_type_contact IN (".$db->sanitize(implode(',', $search_roles))."))";
 	}
 	// Add where from extra fields
 	$extrafieldsobjectkey = $contactstatic->table_element;
-	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_search_sql.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 	// Add where from hooks
 	$parameters = array('socid' => $object->id);
 	$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
@@ -1482,16 +1482,16 @@ 
 	foreach ($contactstatic->fields as $key => $val) {
 		$align = '';
 		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
-			$align .= ($align ? ' ' : '') . 'center';
+			$align .= ($align ? ' ' : '').'center';
 		}
 		if (in_array($val['type'], array('timestamp'))) {
-			$align .= ($align ? ' ' : '') . 'nowrap';
+			$align .= ($align ? ' ' : '').'nowrap';
 		}
 		if ($key == 'status' || $key == 'statut') {
-			$align .= ($align ? ' ' : '') . 'center';
+			$align .= ($align ? ' ' : '').'center';
 		}
-		if (!empty($arrayfields['t.' . $key]['checked']) || !empty($arrayfields['sc.' . $key]['checked'])) {
-			print '<td class="liste_titre' . ($align ? ' ' . $align : '') . '">';
+		if (!empty($arrayfields['t.'.$key]['checked']) || !empty($arrayfields['sc.'.$key]['checked'])) {
+			print '<td class="liste_titre'.($align ? ' '.$align : '').'">';
 			if (in_array($key, array('statut'))) {
 				print $form->selectarray('search_status', array('-1' => '', '0' => $contactstatic->LibStatut(0, 1), '1' => $contactstatic->LibStatut(1, 1)), $search_status, 0, 0, 0, '', 0, 0, 0, '', 'onrightofpage');
 			} elseif (in_array($key, array('role'))) {
@@ -1504,7 +1504,7 @@ 
 				print $form->selectDate($search_birthday_dtend ? $search_birthday_dtend : '', "search_birthday_dtend", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 				print '</div>';
 			} else {
-				print '<input type="text" class="flat maxwidth75" name="search_' . $key . '" value="' . (!empty($search[$key]) ? dol_escape_htmltag($search[$key]) : '') . '">';
+				print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.(!empty($search[$key]) ? dol_escape_htmltag($search[$key]) : '').'">';
 			}
 			print '</td>';
 		}
@@ -1514,7 +1514,7 @@ 
 	}
 	// Extra fields
 	$extrafieldsobjectkey = $contactstatic->table_element;
-	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_search_input.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 	// Fields from hook
 	$parameters = array('arrayfields' => $arrayfields);
@@ -1526,7 +1526,7 @@ 
 		print $form->showFilterButtons();
 		print '</td>';
 	}
-	print '</tr>' . "\n";
+	print '</tr>'."\n";
 
 
 	// Fields title label
@@ -1534,44 +1534,44 @@ 
 	print '<tr class="liste_titre">';
 	// Action column
 	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-		print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'maxwidthsearch center ') . "\n";
+		print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'maxwidthsearch center ')."\n";
 	}
 	foreach ($contactstatic->fields as $key => $val) {
 		$align = '';
 		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
-			$align .= ($align ? ' ' : '') . 'center';
+			$align .= ($align ? ' ' : '').'center';
 		}
 		if (in_array($val['type'], array('timestamp'))) {
-			$align .= ($align ? ' ' : '') . 'nowrap';
+			$align .= ($align ? ' ' : '').'nowrap';
 		}
 		if ($key == 'status' || $key == 'statut') {
-			$align .= ($align ? ' ' : '') . 'center';
+			$align .= ($align ? ' ' : '').'center';
 		}
-		if (!empty($arrayfields['t.' . $key]['checked'])) {
-			print getTitleFieldOfList($val['label'], 0, $_SERVER['PHP_SELF'], 't.' . $key, '', $param, ($align ? 'class="' . $align . '"' : ''), $sortfield, $sortorder, $align . ' ') . "\n";
+		if (!empty($arrayfields['t.'.$key]['checked'])) {
+			print getTitleFieldOfList($val['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align ? 'class="'.$align.'"' : ''), $sortfield, $sortorder, $align.' ')."\n";
 		}
 		if ($key == 'role') {
-			$align .= ($align ? ' ' : '') . 'left';
+			$align .= ($align ? ' ' : '').'left';
 		}
-		if (!empty($arrayfields['sc.' . $key]['checked'])) {
-			print getTitleFieldOfList($arrayfields['sc.' . $key]['label'], 0, $_SERVER['PHP_SELF'], '', '', $param, ($align ? 'class="' . $align . '"' : ''), $sortfield, $sortorder, $align . ' ') . "\n";
+		if (!empty($arrayfields['sc.'.$key]['checked'])) {
+			print getTitleFieldOfList($arrayfields['sc.'.$key]['label'], 0, $_SERVER['PHP_SELF'], '', '', $param, ($align ? 'class="'.$align.'"' : ''), $sortfield, $sortorder, $align.' ')."\n";
 		}
 	}
 	if ($showuserlogin) {
-		print '<th class="wrapcolumntitle liste_titre">' . $langs->trans("DolibarrLogin") . '</th>';
+		print '<th class="wrapcolumntitle liste_titre">'.$langs->trans("DolibarrLogin").'</th>';
 	}
 	// Extra fields
 	$extrafieldsobjectkey = $contactstatic->table_element;
-	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_search_title.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 	// Hook fields
 	$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder);
 	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Action column
 	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-		print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'maxwidthsearch center ') . "\n";
+		print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'maxwidthsearch center ')."\n";
 	}
-	print '</tr>' . "\n";
+	print '</tr>'."\n";
 
 	$i = -1;
 
@@ -1627,21 +1627,21 @@ 
 
 				// Add to agenda
 				if (isModEnabled('agenda') && $user->hasRight('agenda', 'myactions', 'create')) {
-					print '<a href="' . DOL_URL_ROOT . '/comm/action/card.php?action=create&actioncode=&contactid=' . $obj->rowid . '&socid=' . $object->id . '&backtopage=' . urlencode($backtopage) . '">';
+					print '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&actioncode=&contactid='.$obj->rowid.'&socid='.$object->id.'&backtopage='.urlencode($backtopage).'">';
 					print img_object($langs->trans("Event"), "action");
 					print '</a> &nbsp; ';
 				}
 
 				// Edit
 				if ($user->hasRight('societe', 'contact', 'creer')) {
-					print '<a class="editfielda paddingleft" href="' . DOL_URL_ROOT . '/contact/card.php?action=edit&token=' . newToken() . '&id=' . $obj->rowid . '&backtopage=' . urlencode($backtopage) . '">';
+					print '<a class="editfielda paddingleft" href="'.DOL_URL_ROOT.'/contact/card.php?action=edit&token='.newToken().'&id='.$obj->rowid.'&backtopage='.urlencode($backtopage).'">';
 					print img_edit();
 					print '</a>';
 				}
 
 				// Delete
 				if ($user->hasRight('societe', 'contact', 'delete')) {
-					print '<a class="marginleftonly right" href="' . DOL_URL_ROOT . '/societe/contact.php?action=delete&token=' . newToken() . '&id=' . $obj->rowid . '&socid=' . $object->id . '&backtopage=' . urlencode($backtopage) . '">';
+					print '<a class="marginleftonly right" href="'.DOL_URL_ROOT.'/societe/contact.php?action=delete&token='.newToken().'&id='.$obj->rowid.'&socid='.$object->id.'&backtopage='.urlencode($backtopage).'">';
 					print img_delete();
 					print '</a>';
 				}
@@ -1660,13 +1660,13 @@ 
 			if (!empty($arrayfields['t.name']['checked'])) {
 				print '<td class="tdoverflowmax150">';
 				print $form->showphoto('contact', $contactstatic, 0, 0, 0, 'photorefnoborder valignmiddle marginrightonly', 'small', 1, 0, 'user');
-				print $contactstatic->getNomUrl(0, '', 0, '&backtopage=' . urlencode($backtopage));
+				print $contactstatic->getNomUrl(0, '', 0, '&backtopage='.urlencode($backtopage));
 				print '</td>';
 			}
 
 			// Job position
 			if (!empty($arrayfields['t.poste']['checked'])) {
-				print '<td class="tdoverflowmax100" title="' . dol_escape_htmltag($obj->poste) . '">';
+				print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($obj->poste).'">';
 				if ($obj->poste) {
 					print dol_escape_htmltag($obj->poste);
 				}
@@ -1676,7 +1676,7 @@ 
 			// Address - Phone - Email
 			if (!empty($arrayfields['t.address']['checked'])) {
 				$addresstoshow = $contactstatic->getBannerAddress('contact', $object);
-				print '<td class="tdoverflowmax150" title="' . dolPrintHTMLForAttribute($addresstoshow) . '">';
+				print '<td class="tdoverflowmax150" title="'.dolPrintHTMLForAttribute($addresstoshow).'">';
 				print $addresstoshow;
 				print '</td>';
 			}
@@ -1704,7 +1704,7 @@ 
 
 			// Status
 			if (!empty($arrayfields['t.statut']['checked'])) {
-				print '<td class="center">' . $contactstatic->getLibStatut(5) . '</td>';
+				print '<td class="center">'.$contactstatic->getLibStatut(5).'</td>';
 			}
 
 			if ($showuserlogin) {
@@ -1720,7 +1720,7 @@ 
 
 			// Extra fields
 			$extrafieldsobjectkey = $contactstatic->table_element;
-			include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_print_fields.tpl.php';
+			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 
 			// Actions
 			if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
@@ -1728,21 +1728,21 @@ 
 
 				// Add to agenda
 				if (isModEnabled('agenda') && $user->hasRight('agenda', 'myactions', 'create')) {
-					print '<a href="' . DOL_URL_ROOT . '/comm/action/card.php?action=create&actioncode=&contactid=' . $obj->rowid . '&socid=' . $object->id . '&backtopage=' . urlencode($backtopage) . '">';
+					print '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&actioncode=&contactid='.$obj->rowid.'&socid='.$object->id.'&backtopage='.urlencode($backtopage).'">';
 					print img_object($langs->trans("Event"), "action");
 					print '</a> &nbsp; ';
 				}
 
 				// Edit
 				if ($user->hasRight('societe', 'contact', 'creer')) {
-					print '<a class="editfielda paddingleft" href="' . DOL_URL_ROOT . '/contact/card.php?action=edit&token=' . newToken() . '&id=' . $obj->rowid . '&backtopage=' . urlencode($backtopage) . '">';
+					print '<a class="editfielda paddingleft" href="'.DOL_URL_ROOT.'/contact/card.php?action=edit&token='.newToken().'&id='.$obj->rowid.'&backtopage='.urlencode($backtopage).'">';
 					print img_edit();
 					print '</a>';
 				}
 
 				// Delete
 				if ($user->hasRight('societe', 'contact', 'delete')) {
-					print '<a class="marginleftonly right" href="' . DOL_URL_ROOT . '/societe/contact.php?action=delete&token=' . newToken() . '&id=' . $obj->rowid . '&socid=' . $object->id . '&backtopage=' . urlencode($backtopage) . '">';
+					print '<a class="marginleftonly right" href="'.DOL_URL_ROOT.'/societe/contact.php?action=delete&token='.newToken().'&id='.$obj->rowid.'&socid='.$object->id.'&backtopage='.urlencode($backtopage).'">';
 					print img_delete();
 					print '</a>';
 				}
@@ -1761,7 +1761,7 @@ 
 					$colspan++;
 				}
 			}
-			print '<tr><td colspan="' . $colspan . '"><span class="opacitymedium">' . $langs->trans("NoRecordFound") . '</span></td></tr>';
+			print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
 		}
 	} else {
 		$colspan = 1 + ($showuserlogin ? 1 : 0);
@@ -1770,12 +1770,12 @@ 
 				$colspan++;
 			}
 		}
-		print '<tr><td colspan="' . $colspan . '"><span class="opacitymedium">' . $langs->trans("None") . '</span></td></tr>';
+		print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 	}
 	print "\n</table>\n";
 	print '</div>';
 
-	print '</form>' . "\n";
+	print '</form>'."\n";
 
 	return $i;
 }
@@ -1850,7 +1850,7 @@ 
 		$tms_start = '';
 		$tms_end = '';
 	}
-	require_once DOL_DOCUMENT_ROOT . '/comm/action/class/actioncomm.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
 	// Check parameters
 	if (!is_object($filterobj) && !is_object($objcon)) {
@@ -1916,16 +1916,16 @@ 
 
 		// Fields from hook
 		$parameters = array('sql' => &$sql, 'filterobj' => $filterobj, 'objcon' => $objcon);
-		$reshook = $hookmanager->executeHooks('showActionsDoneListSelect', $parameters);    // Note that $action and $object may have been modified by hook
+		$reshook = $hookmanager->executeHooks('showActionsDoneListSelect', $parameters); // Note that $action and $object may have been modified by hook
 		if (!empty($hookmanager->resPrint)) {
 			$sql .= $hookmanager->resPrint;
 		}
 
-		$sql .= " FROM " . MAIN_DB_PREFIX . "actioncomm as a";
+		$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
 		// Link to the owner of action
-		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "user as u on u.rowid = a.fk_user_action";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on u.rowid = a.fk_user_action";
 		// Link to action types
-		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_actioncomm as c ON a.fk_action = c.id";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_actioncomm as c ON a.fk_action = c.id";
 
 		// Set $force_filter_contact:
 		// - true for a filter on a user or a contact, so a link on table llx_actioncomm_resources or llx_actioncomm.fk_user_action
@@ -1940,101 +1940,101 @@ 
 
 		// Fields from hook
 		$parameters = array('sql' => &$sql, 'filterobj' => $filterobj, 'objcon' => $objcon);
-		$reshook = $hookmanager->executeHooks('showActionsDoneListFrom', $parameters);    // Note that $action and $object may have been modified by hook
+		$reshook = $hookmanager->executeHooks('showActionsDoneListFrom', $parameters); // Note that $action and $object may have been modified by hook
 		if (!empty($hookmanager->resPrint)) {
 			$sql .= $hookmanager->resPrint;
 		}
 		if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur'))) {
-			$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "socpeople as sp ON a.fk_contact = sp.rowid";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";
 		} elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') {
-			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "element_resources as er";
+			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."element_resources as er";
 			$sql .= " ON er.resource_type = 'dolresource'";
 			$sql .= " AND er.element_type = 'action'";
 			$sql .= " AND er.element_id = a.id";
-			$sql .= " AND er.resource_id = " . ((int) $filterobj->id);
+			$sql .= " AND er.resource_id = ".((int) $filterobj->id);
 		} elseif (is_object($filterobj) && get_class($filterobj) == 'Project') {
 			/* Nothing */
 		} elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') {
-			$sql .= ", " . MAIN_DB_PREFIX . "adherent as m";
+			$sql .= ", ".MAIN_DB_PREFIX."adherent as m";
 		} elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') {
-			$sql .= ", " . MAIN_DB_PREFIX . "commande_fournisseur as o";
+			$sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as o";
 		} elseif (is_object($filterobj) && get_class($filterobj) == 'Product') {
-			$sql .= ", " . MAIN_DB_PREFIX . "product as o";
+			$sql .= ", ".MAIN_DB_PREFIX."product as o";
 		} elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') {
-			$sql .= ", " . MAIN_DB_PREFIX . "ticket as o";
+			$sql .= ", ".MAIN_DB_PREFIX."ticket as o";
 		} elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') {
-			$sql .= ", " . MAIN_DB_PREFIX . "bom_bom as o";
+			$sql .= ", ".MAIN_DB_PREFIX."bom_bom as o";
 		} elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') {
-			$sql .= ", " . MAIN_DB_PREFIX . "contrat as o";
+			$sql .= ", ".MAIN_DB_PREFIX."contrat as o";
 		} elseif (is_object($filterobj) && get_class($filterobj) == 'Expedition') {
-			$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "expedition as s ON a.fk_element = s.rowid AND a.elementtype = 'shipping'"; // Jointure sur la table des expéditions avec condition ON
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."expedition as s ON a.fk_element = s.rowid AND a.elementtype = 'shipping'"; // Jointure sur la table des expéditions avec condition ON
 		} elseif (is_object($filterobj) && get_class($filterobj) == 'Propal') {
-			$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "propal as o ON a.fk_element = o.rowid AND a.elementtype = 'propal'";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."propal as o ON a.fk_element = o.rowid AND a.elementtype = 'propal'";
 		} elseif (
 			is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid'])
 			&& ((!empty($filterobj->fields['ref']) && is_array($filterobj->fields['ref'])) || (!empty($filterobj->fields['label']) && is_array($filterobj->fields['label'])) || (!empty($filterobj->fields['titre']) && is_array($filterobj->fields['titre'])))  // @phan-suppress-current-line PhanTypeInvalidDimOffset
 			&& $filterobj->table_element && $filterobj->element
 		) {
-			$sql .= ", " . MAIN_DB_PREFIX . $filterobj->table_element . " as o";
+			$sql .= ", ".MAIN_DB_PREFIX.$filterobj->table_element." as o";
 		}
 
-		$sql .= " WHERE a.entity IN (" . getEntity('agenda') . ")";
+		$sql .= " WHERE a.entity IN (".getEntity('agenda').")";
 		if (!$force_filter_contact) {
 			if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur')) && $filterobj->id) {
-				$sql .= " AND a.fk_soc = " . ((int) $filterobj->id);
+				$sql .= " AND a.fk_soc = ".((int) $filterobj->id);
 			} elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') {
 				/* Nothing */
 			} elseif (is_object($filterobj) && get_class($filterobj) == 'Project' && $filterobj->id) {
-				$sql .= " AND a.fk_project = " . ((int) $filterobj->id);
+				$sql .= " AND a.fk_project = ".((int) $filterobj->id);
 			} elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') {
 				$sql .= " AND a.fk_element = m.rowid AND a.elementtype = 'member'";
 				if ($filterobj->id) {
-					$sql .= " AND a.fk_element = " . ((int) $filterobj->id);
+					$sql .= " AND a.fk_element = ".((int) $filterobj->id);
 				}
 			} elseif (is_object($filterobj) && get_class($filterobj) == 'Commande') {
 				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'order'";
 				if ($filterobj->id) {
-					$sql .= " AND a.fk_element = " . ((int) $filterobj->id);
+					$sql .= " AND a.fk_element = ".((int) $filterobj->id);
 				}
 			} elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') {
 				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'order_supplier'";
 				if ($filterobj->id) {
-					$sql .= " AND a.fk_element = " . ((int) $filterobj->id);
+					$sql .= " AND a.fk_element = ".((int) $filterobj->id);
 				}
 			} elseif (is_object($filterobj) && get_class($filterobj) == 'Facture') {
 				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'invoice'";
 				if ($filterobj->id) {
-					$sql .= " AND a.fk_element = " . ((int) $filterobj->id);
+					$sql .= " AND a.fk_element = ".((int) $filterobj->id);
 				}
 			} elseif (is_object($filterobj) && get_class($filterobj) == 'FactureFournisseur') {
 				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'invoice_supplier'";
 				if ($filterobj->id) {
-					$sql .= " AND a.fk_element = " . ((int) $filterobj->id);
+					$sql .= " AND a.fk_element = ".((int) $filterobj->id);
 				}
 			} elseif (is_object($filterobj) && get_class($filterobj) == 'Product') {
 				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'product'";
 				if ($filterobj->id) {
-					$sql .= " AND a.fk_element = " . ((int) $filterobj->id);
+					$sql .= " AND a.fk_element = ".((int) $filterobj->id);
 				}
 			} elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') {
 				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'ticket'";
 				if ($filterobj->id) {
-					$sql .= " AND a.fk_element = " . ((int) $filterobj->id);
+					$sql .= " AND a.fk_element = ".((int) $filterobj->id);
 				}
 			} elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') {
 				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'bom'";
 				if ($filterobj->id) {
-					$sql .= " AND a.fk_element = " . ((int) $filterobj->id);
+					$sql .= " AND a.fk_element = ".((int) $filterobj->id);
 				}
 			} elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') {
 				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'contract'";
 				if ($filterobj->id) {
-					$sql .= " AND a.fk_element = " . ((int) $filterobj->id);
+					$sql .= " AND a.fk_element = ".((int) $filterobj->id);
 				}
 			} elseif (is_object($filterobj) && get_class($filterobj) == 'Expedition') {
 				$sql .= " AND a.fk_element = s.rowid AND a.elementtype = 'shipping'"; //expedition filter
 				if ($filterobj->id) {
-					$sql .= " AND a.fk_element = " . ((int) $filterobj->id);
+					$sql .= " AND a.fk_element = ".((int) $filterobj->id);
 				}
 			} elseif (
 				is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid'])
@@ -2042,32 +2042,32 @@ 
 				&& $filterobj->table_element && $filterobj->element
 			) {
 				// Generic case (if there is a $filterobj and a field rowid and (ref or label) exists.
-				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = '" . $db->escape($filterobj->element) . ($module ? "@" . $module : "") . "'";
+				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = '".$db->escape($filterobj->element).($module ? "@".$module : "")."'";
 				if ($filterobj->id) {
-					$sql .= " AND a.fk_element = " . ((int) $filterobj->id);
+					$sql .= " AND a.fk_element = ".((int) $filterobj->id);
 				}
 			} elseif (is_object($filterobj)) {
 				return 'Bad value for $filterobj';
 			}
 		} else {
 			if (is_object($filterobj) && $filterobj->id > 0 && get_class($filterobj) == 'User') {
-				$sql .= " AND (u.rowid = " . ((int) $filterobj->id) . ' OR ';
-				$sql .= " EXISTS (SELECT r.rowid FROM " . MAIN_DB_PREFIX . "actioncomm_resources as r WHERE a.id = r.fk_actioncomm";
-				$sql .= " AND r.element_type = '" . $db->escape($filterobj->table_element) . "' AND r.fk_element = " . ((int) $filterobj->id) . ')';
+				$sql .= " AND (u.rowid = ".((int) $filterobj->id).' OR ';
+				$sql .= " EXISTS (SELECT r.rowid FROM ".MAIN_DB_PREFIX."actioncomm_resources as r WHERE a.id = r.fk_actioncomm";
+				$sql .= " AND r.element_type = '".$db->escape($filterobj->table_element)."' AND r.fk_element = ".((int) $filterobj->id).')';
 				$sql .= ")";
 			}
 			if (is_object($objcon) && $objcon->id > 0) {
-				$sql .= " AND EXISTS (SELECT r.rowid FROM " . MAIN_DB_PREFIX . "actioncomm_resources as r WHERE a.id = r.fk_actioncomm";
-				$sql .= " AND r.element_type = '" . $db->escape($objcon->table_element) . "' AND r.fk_element = " . ((int) $objcon->id) . ')';
+				$sql .= " AND EXISTS (SELECT r.rowid FROM ".MAIN_DB_PREFIX."actioncomm_resources as r WHERE a.id = r.fk_actioncomm";
+				$sql .= " AND r.element_type = '".$db->escape($objcon->table_element)."' AND r.fk_element = ".((int) $objcon->id).')';
 			}
 		}
 
 		if (!empty($tms_start) && !empty($tms_end)) {
-			$sql .= " AND ((a.datep BETWEEN '" . $db->idate($tms_start) . "' AND '" . $db->idate($tms_end) . "') OR (a.datep2 BETWEEN '" . $db->idate($tms_start) . "' AND '" . $db->idate($tms_end) . "'))";
+			$sql .= " AND ((a.datep BETWEEN '".$db->idate($tms_start)."' AND '".$db->idate($tms_end)."') OR (a.datep2 BETWEEN '".$db->idate($tms_start)."' AND '".$db->idate($tms_end)."'))";
 		} elseif (empty($tms_start) && !empty($tms_end)) {
-			$sql .= " AND ((a.datep <= '" . $db->idate($tms_end) . "') OR (a.datep2 <= '" . $db->idate($tms_end) . "'))";
+			$sql .= " AND ((a.datep <= '".$db->idate($tms_end)."') OR (a.datep2 <= '".$db->idate($tms_end)."'))";
 		} elseif (!empty($tms_start) && empty($tms_end)) {
-			$sql .= " AND ((a.datep >= '" . $db->idate($tms_start) . "') OR (a.datep2 >= '" . $db->idate($tms_start) . "'))";
+			$sql .= " AND ((a.datep >= '".$db->idate($tms_start)."') OR (a.datep2 >= '".$db->idate($tms_start)."'))";
 		}
 
 		if (is_array($actioncode) && !empty($actioncode)) {
@@ -2097,7 +2097,7 @@ 
 
 		// Fields from hook
 		$parameters = array('sql' => &$sql, 'filterobj' => $filterobj, 'objcon' => $objcon, 'module' => $module);
-		$reshook = $hookmanager->executeHooks('showActionsDoneListWhere', $parameters);    // Note that $action and $object may have been modified by hook
+		$reshook = $hookmanager->executeHooks('showActionsDoneListWhere', $parameters); // Note that $action and $object may have been modified by hook
 		if (!empty($hookmanager->resPrint)) {
 			$sql .= $hookmanager->resPrint;
 		}
@@ -2108,7 +2108,7 @@ 
 				$sql2 = addMailingEventTypeSQL($code, $objcon, $filterobj);
 				if (!empty($sql2)) {
 					if (!empty($sql)) {
-						$sql = $sql . " UNION " . $sql2;
+						$sql = $sql." UNION ".$sql2;
 					} elseif (empty($sql)) {
 						$sql = $sql2;
 					}
@@ -2118,7 +2118,7 @@ 
 		} else {
 			$sql2 = addMailingEventTypeSQL($actioncode, $objcon, $filterobj);
 			if (!empty($sql) && !empty($sql2)) {
-				$sql = $sql . " UNION " . $sql2;
+				$sql = $sql." UNION ".$sql2;
 			} elseif (empty($sql) && !empty($sql2)) {
 				$sql = $sql2;
 			}
@@ -2229,10 +2229,10 @@ 
 	if (isModEnabled('agenda') || (isModEnabled('mailing') && !empty($objcon->email))) {
 		$delay_warning = getDolGlobalInt('MAIN_DELAY_ACTIONS_TODO') * 24 * 60 * 60;
 
-		require_once DOL_DOCUMENT_ROOT . '/comm/action/class/actioncomm.class.php';
-		include_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
-		require_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
-		require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 
 		$formactions = new FormActions($db);
 
@@ -2242,20 +2242,20 @@ 
 		$contactstatic = new Contact($db);
 		$elementlinkcache = array();
 
-		$out .= '<form name="listactionsfilter" class="listactionsfilter" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
-		$out .= '<input type="hidden" name="token" value="' . newToken() . '">';
+		$out .= '<form name="listactionsfilter" class="listactionsfilter" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$out .= '<input type="hidden" name="token" value="'.newToken().'">';
 		if (
 			$objcon && get_class($objcon) == 'Contact' &&
 			(is_null($filterobj) || get_class($filterobj) == 'Societe')
 		) {
-			$out .= '<input type="hidden" name="id" value="' . $objcon->id . '" />';
+			$out .= '<input type="hidden" name="id" value="'.$objcon->id.'" />';
 		} else {
-			$out .= '<input type="hidden" name="id" value="' . $filterobj->id . '" />';
+			$out .= '<input type="hidden" name="id" value="'.$filterobj->id.'" />';
 		}
 		if ($filterobj && get_class($filterobj) == 'Societe') {
-			$out .= '<input type="hidden" name="socid" value="' . $filterobj->id . '" />';
+			$out .= '<input type="hidden" name="socid" value="'.$filterobj->id.'" />';
 		} else {
-			$out .= '<input type="hidden" name="userid" value="' . $filterobj->id . '" />';
+			$out .= '<input type="hidden" name="userid" value="'.$filterobj->id.'" />';
 		}
 
 		$out .= "\n";
@@ -2278,7 +2278,7 @@ 
 		}
 
 		// ID
-		$out .= '<td class="liste_titre"><input type="text" class="width50" name="search_rowid" value="' . (isset($filters['search_rowid']) ? $filters['search_rowid'] : '') . '"></td>';
+		$out .= '<td class="liste_titre"><input type="text" class="width50" name="search_rowid" value="'.(isset($filters['search_rowid']) ? $filters['search_rowid'] : '').'"></td>';
 		// Date
 		$out .= '<td class="liste_titre center">';
 		$out .= $form->selectDateToDate($tms_start, $tms_end, 'dateevent', 1);
@@ -2290,7 +2290,7 @@ 
 		$out .= $formactions->select_type_actions($actioncode, "actioncode", '', getDolGlobalString('AGENDA_USE_EVENT_TYPE') ? -1 : 1, 0, (getDolGlobalString('AGENDA_USE_MULTISELECT_TYPE') ? 1 : 0), 1, 'selecttype combolargeelem minwidth100 maxwidth150', 1);
 		$out .= '</td>';
 		// Label
-		$out .= '<td class="liste_titre maxwidth100onsmartphone"><input type="text" class="maxwidth100onsmartphone" name="search_agenda_label" value="' . $filters['search_agenda_label'] . '"></td>';
+		$out .= '<td class="liste_titre maxwidth100onsmartphone"><input type="text" class="maxwidth100onsmartphone" name="search_agenda_label" value="'.$filters['search_agenda_label'].'"></td>';
 		$out .= '<td class="liste_titre"></td>';
 		$out .= '<td class="liste_titre"></td>';
 		$out .= '<td class="liste_titre"></td>';
@@ -2311,10 +2311,10 @@ 
 		if ($donetodo && $filterobj !== null) {
 			$tmp = '';
 			if (get_class($filterobj) == 'Societe') {
-				$tmp .= '<a href="' . DOL_URL_ROOT . '/comm/action/list.php?mode=show_list&socid=' . $filterobj->id . '&status=done">';
+				$tmp .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php?mode=show_list&socid='.$filterobj->id.'&status=done">';
 			}
 			if (get_class($filterobj) == 'User') {
-				$tmp .= '<a href="' . DOL_URL_ROOT . '/comm/action/list.php?mode=show_list&userid=' . $filterobj->id . '&status=done">';
+				$tmp .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php?mode=show_list&userid='.$filterobj->id.'&status=done">';
 			}
 			$tmp .= ($donetodo != 'done' ? $langs->trans("ActionsToDoShort") : '');
 			$tmp .= ($donetodo != 'done' && $donetodo != 'todo' ? ' / ' : '');
@@ -2342,7 +2342,7 @@ 
 		}
 		$out .= '</tr>';
 
-		require_once DOL_DOCUMENT_ROOT . '/comm/action/class/cactioncomm.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
 		$caction = new CActionComm($db);
 		$arraylist = $caction->liste_array(1, 'code', '', (getDolGlobalString('AGENDA_USE_EVENT_TYPE') ? 0 : 1), '', 1);
 
@@ -2371,7 +2371,7 @@ 
 			// Ref
 			$out .= '<td class="nowraponall">';
 			if (isset($histo[$key]['type']) && $histo[$key]['type'] == 'mailing') {
-				$out .= '<a href="' . DOL_URL_ROOT . '/comm/mailing/card.php?id=' . $histo[$key]['id'] . '">' . img_object($langs->trans("ShowEMailing"), "email") . ' ';
+				$out .= '<a href="'.DOL_URL_ROOT.'/comm/mailing/card.php?id='.$histo[$key]['id'].'">'.img_object($langs->trans("ShowEMailing"), "email").' ';
 				$out .= $histo[$key]['id'];
 				$out .= '</a>';
 			} else {
@@ -2386,9 +2386,9 @@ 
 				$tmpa = dol_getdate($histo[$key]['datestart'], true);
 				$tmpb = dol_getdate($histo[$key]['dateend'], true);
 				if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) {
-					$out .= '-' . dol_print_date($histo[$key]['dateend'], 'hour', 'tzuserrel');
+					$out .= '-'.dol_print_date($histo[$key]['dateend'], 'hour', 'tzuserrel');
 				} else {
-					$out .= '-' . dol_print_date($histo[$key]['dateend'], 'dayhour', 'tzuserrel');
+					$out .= '-'.dol_print_date($histo[$key]['dateend'], 'dayhour', 'tzuserrel');
 				}
 			}
 			$late = 0;
@@ -2405,7 +2405,7 @@ 
 				$late = 1;
 			}
 			if ($late) {
-				$out .= img_warning($langs->trans("Late")) . ' ';
+				$out .= img_warning($langs->trans("Late")).' ';
 			}
 			$out .= "</td>\n";
 
@@ -2443,7 +2443,7 @@ 
 					$labelOfTypeToShow = $langs->trans("Emailing");
 				}
 				if ($actionstatic->type_code == 'AC_OTH_AUTO' && ($actionstatic->type_code != $actionstatic->code) && $labelOfTypeToShow && !empty($arraylist[$actionstatic->code])) {
-					$labelOfTypeToShow .= ' - ' . $arraylist[$actionstatic->code]; // Show also detailed code
+					$labelOfTypeToShow .= ' - '.$arraylist[$actionstatic->code]; // Show also detailed code
 				}
 			}
 
@@ -2452,7 +2452,7 @@ 
 				$labelOfTypeToShowLong .= ' (auto)';
 			}
 
-			$out .= '<td class="tdoverflowmax125" title="' . $labelOfTypeToShowLong . '">';
+			$out .= '<td class="tdoverflowmax125" title="'.$labelOfTypeToShowLong.'">';
 			$out .= $actionstatic->getTypePicto();
 			//if (empty($conf->dol_optimize_smallscreen)) {
 			$out .= $labelOfTypeToShow;
@@ -2462,19 +2462,19 @@ 
 			// Title/Label of event
 			$out .= '<td class="tdoverflowmax300"';
 			if (isset($histo[$key]['type']) && $histo[$key]['type'] == 'action') {
-				$transcode = $langs->trans("Action" . $histo[$key]['acode']);
+				$transcode = $langs->trans("Action".$histo[$key]['acode']);
 				//$libelle = ($transcode != "Action".$histo[$key]['acode'] ? $transcode : $histo[$key]['alabel']);
 				$label = $histo[$key]['note'];
 				$actionstatic->id = $histo[$key]['id'];
-				$out .= ' title="' . dol_escape_htmltag($label) . '">';
+				$out .= ' title="'.dol_escape_htmltag($label).'">';
 				$out .= dol_trunc($label, 120);
 			}
 			if (isset($histo[$key]['type']) && $histo[$key]['type'] == 'mailing') {
-				$transcode = $langs->trans("Action" . $histo[$key]['acode']);
-				$label = ($transcode != "Action" . $histo[$key]['acode'] ? $transcode : 'Send mass mailing');
-				$label .= ' - ' . $histo[$key]['note'];
-				$out .= '<a href="' . DOL_URL_ROOT . '/comm/mailing/card.php?id=' . $histo[$key]['id'] . '"';
-				$out .= ' title="' . dol_escape_htmltag($label) . '">';
+				$transcode = $langs->trans("Action".$histo[$key]['acode']);
+				$label = ($transcode != "Action".$histo[$key]['acode'] ? $transcode : 'Send mass mailing');
+				$label .= ' - '.$histo[$key]['note'];
+				$out .= '<a href="'.DOL_URL_ROOT.'/comm/mailing/card.php?id='.$histo[$key]['id'].'"';
+				$out .= ' title="'.dol_escape_htmltag($label).'">';
 				//$out .= img_object($langs->trans("EMailing").'<br>'.$histo[$key]['note'], "email").' ';
 				$out .= dol_trunc($label, 120);
 				$out .= '</a>';
@@ -2512,7 +2512,7 @@ 
 						$out .= $contact->getNomUrl(-3, '', 10, '', -1, 0, 'paddingright');
 						if (isset($histo[$key]['acode']) && $histo[$key]['acode'] == 'AC_TEL') {
 							if (!empty($contact->phone_pro)) {
-								$out .= '(' . dol_print_phone($contact->phone_pro) . ')';
+								$out .= '('.dol_print_phone($contact->phone_pro).')';
 							}
 						}
 						$out .= '<div class="paddingright"></div>';
@@ -2524,13 +2524,13 @@ 
 				$contactstatic->firstname = $histo[$key]['firstname'];
 				$contactstatic->id = $histo[$key]['contact_id'];
 				$contactstatic->photo = $histo[$key]['contact_photo'];
-				$out .= '<td width="120">' . $contactstatic->getNomUrl(-1, '', 10) . '</td>';
+				$out .= '<td width="120">'.$contactstatic->getNomUrl(-1, '', 10).'</td>';
 			} else {
 				$out .= '<td>&nbsp;</td>';
 			}
 
 			// Status / Progression
-			$out .= '<td class="nowrap center">' . $actionstatic->LibStatut($histo[$key]['percent'], 2, 0, $histo[$key]['datestart']) . '</td>';
+			$out .= '<td class="nowrap center">'.$actionstatic->LibStatut($histo[$key]['percent'], 2, 0, $histo[$key]['datestart']).'</td>';
 
 			// Action column
 			if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
@@ -2541,7 +2541,7 @@ 
 		}
 		if (empty($histo)) {
 			$colspan = 9;
-			$out .= '<tr><td colspan="' . $colspan . '"><span class="opacitymedium">' . $langs->trans("NoRecordFound") . '</span></td></tr>';
+			$out .= '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
 		}
 
 		$out .= "</table>\n";
@@ -2574,9 +2574,9 @@ 
 	$i = -1;
 
 	$sql = "SELECT s.rowid, s.client, s.fournisseur, s.nom as name, s.name_alias, s.email, s.address, s.zip, s.town, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur, s.canvas, s.status";
-	$sql .= " FROM " . MAIN_DB_PREFIX . "societe as s";
-	$sql .= " WHERE s.parent = " . ((int) $object->id);
-	$sql .= " AND s.entity IN (" . getEntity('societe') . ")";
+	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+	$sql .= " WHERE s.parent = ".((int) $object->id);
+	$sql .= " AND s.entity IN (".getEntity('societe').")";
 	$sql .= " ORDER BY s.nom";
 
 	$result = $db->query($sql);
@@ -2587,12 +2587,12 @@ 
 
 		print load_fiche_titre($langs->trans("Subsidiaries"), '', '');
 
-		print "\n" . '<div class="div-table-responsive-no-min">' . "\n";
-		print '<table class="noborder centpercent">' . "\n";
+		print "\n".'<div class="div-table-responsive-no-min">'."\n";
+		print '<table class="noborder centpercent">'."\n";
 
-		print '<tr class="liste_titre"><td>' . $langs->trans("Company") . '</td>';
-		print '<td>' . $langs->trans("Address") . '</td><td>' . $langs->trans("Zip") . '</td>';
-		print '<td>' . $langs->trans("Town") . '</td><td>' . $langs->trans("CustomerCode") . '</td>';
+		print '<tr class="liste_titre"><td>'.$langs->trans("Company").'</td>';
+		print '<td>'.$langs->trans("Address").'</td><td>'.$langs->trans("Zip").'</td>';
+		print '<td>'.$langs->trans("Town").'</td><td>'.$langs->trans("CustomerCode").'</td>';
 		print "<td>&nbsp;</td>";
 		print "</tr>";
 
@@ -2622,13 +2622,13 @@ 
 			print $socstatic->getNomUrl(1);
 			print '</td>';
 
-			print '<td class="tdoverflowmax400" title="' . dol_escape_htmltag($obj->address) . '">' . dol_escape_htmltag($obj->address) . '</td>';
-			print '<td class="tdoverflowmax100" title="' . dol_escape_htmltag($obj->zip) . '">' . $obj->zip . '</td>';
-			print '<td class="tdoverflowmax200" title="' . dol_escape_htmltag($obj->town) . '">' . $obj->town . '</td>';
-			print '<td class="tdoverflowmax200" title="' . dol_escape_htmltag($obj->code_client) . '">' . $obj->code_client . '</td>';
+			print '<td class="tdoverflowmax400" title="'.dol_escape_htmltag($obj->address).'">'.dol_escape_htmltag($obj->address).'</td>';
+			print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($obj->zip).'">'.$obj->zip.'</td>';
+			print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($obj->town).'">'.$obj->town.'</td>';
+			print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($obj->code_client).'">'.$obj->code_client.'</td>';
 
 			print '<td class="center">';
-			print '<a class="editfielda" href="' . DOL_URL_ROOT . '/societe/card.php?socid=' . ((int) $obj->rowid) . '&action=edit&token=' . newToken() . '">';
+			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/societe/card.php?socid='.((int) $obj->rowid).'&action=edit&token='.newToken().'">';
 			print img_edit();
 			print '</a></td>';
 
@@ -2636,7 +2636,7 @@ 
 			$i++;
 		}
 		print "\n</table>\n";
-		print '</div>' . "\n";
+		print '</div>'."\n";
 	}
 
 	print "<br>\n";
@@ -2679,7 +2679,7 @@ 
 		} elseif ($actioncode == 'AC_ALL_AUTO') {
 			$sql .= " $sqlANDOR c.type = 'systemauto'";
 		} else {
-			$sql .= " $sqlANDOR c.code = '" . $db->escape($actioncode) . "'";
+			$sql .= " $sqlANDOR c.code = '".$db->escape($actioncode)."'";
 		}
 	}
 
@@ -2700,9 +2700,9 @@ 
 	global $db;
 
 	if ($donetodo == 'todo') {
-		$sql .= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '" . $db->idate($now) . "'))";
+		$sql .= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))";
 	} elseif ($donetodo == 'done') {
-		$sql .= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '" . $db->idate($now) . "'))";
+		$sql .= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))";
 	}
 	if (is_array($filters) && !empty($filters['search_agenda_label'])) {
 		$sql .= natural_search('a.label', $filters['search_agenda_label']);
@@ -2743,8 +2743,8 @@ 
 		} elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') {
 			$sql2 .= ", '' as ref";
 		}
-		$sql2 .= " FROM " . MAIN_DB_PREFIX . "mailing as m, " . MAIN_DB_PREFIX . "mailing_cibles as mc, " . MAIN_DB_PREFIX . "user as u";
-		$sql2 .= " WHERE mc.email = '" . $db->escape($objcon->email) . "'"; // Search is done on email.
+		$sql2 .= " FROM ".MAIN_DB_PREFIX."mailing as m, ".MAIN_DB_PREFIX."mailing_cibles as mc, ".MAIN_DB_PREFIX."user as u";
+		$sql2 .= " WHERE mc.email = '".$db->escape($objcon->email)."'"; // Search is done on email.
 		$sql2 .= " AND mc.statut = 1";
 		$sql2 .= " AND u.rowid = m.fk_user_valid";
 		$sql2 .= " AND mc.fk_mailing=m.rowid";
@@ -2786,15 +2786,15 @@ 
 	//$urllogo = '';
 	$urllogopublic = '';
 	if ($showlogo) {
-		if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output . '/logos/thumbs/' . $logosmall)) {
+		if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$logosmall)) {
 			//$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$logosmall);
-			$urllogopublic = $dolibarr_main_url_root . '/viewimage.php?modulepart=mycompany&entity=' . $conf->entity . '&file=' . urlencode('logos/thumbs/' . $logosmall);
-		} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output . '/logos/' . $logo)) {
+			$urllogopublic = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$logosmall);
+		} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo)) {
 			//$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/'.$logo);
-			$urllogopublic = $dolibarr_main_url_root . '/viewimage.php?modulepart=mycompany&entity=' . $conf->entity . '&file=' . urlencode('logos/' . $logo);
-		} elseif (is_readable(DOL_DOCUMENT_ROOT . '/theme/dolibarr_logo.svg')) {
+			$urllogopublic = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$logo);
+		} elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg')) {
 			//$urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.svg';
-			$urllogopublic = $dolibarr_main_url_root . '/theme/dolibarr_logo.svg';
+			$urllogopublic = $dolibarr_main_url_root.'/theme/dolibarr_logo.svg';
 		}
 	}
 
@@ -2806,19 +2806,19 @@ 
 		print '<div class="logopublicpayment">';
 		if ($urllogopublic) {
 			if (!is_numeric($showlogo)) {
-				print '<a href="' . $showlogo . '">';
+				print '<a href="'.$showlogo.'">';
 			}
-			print '<img id="dolpaymentlogo" src="' . $urllogopublic . '">';
+			print '<img id="dolpaymentlogo" src="'.$urllogopublic.'">';
 			if (!is_numeric($showlogo)) {
 				print '</a>';
 			}
 		}
 		if ($alttext) {
-			print '<div class="clearboth"></div><strong>' . $alttext . '</strong>';
+			print '<div class="clearboth"></div><strong>'.$alttext.'</strong>';
 		}
 		print '</div>';
 		if (!getDolGlobalString('MAIN_HIDE_POWERED_BY')) {
-			print '<div class="poweredbypublicpayment opacitymedium right hideonsmartphone"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">' . $langs->trans("PoweredBy") . '<br><img class="poweredbyimg" src="' . DOL_URL_ROOT . '/theme/dolibarr_logo.svg" width="80px"></a></div>';
+			print '<div class="poweredbypublicpayment opacitymedium right hideonsmartphone"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
 		}
 		print '</div>';
 	}
@@ -2826,7 +2826,7 @@ 
 	// Add an optional image under the ban with logo/title
 	if (getDolGlobalString($subimageconst)) {
 		print '<div class="backimagepublicsubimage">';
-		print '<img id="id' . $subimageconst . '" src="' . getDolGlobalString($subimageconst) . '">';
+		print '<img id="id'.$subimageconst.'" src="'.getDolGlobalString($subimageconst).'">';
 		print '</div>';
 	}
 
@@ -2853,11 +2853,11 @@ 
 	// Juridical status
 	$line1 = "";
 	if ($fromcompany->forme_juridique_code) {
-		$line1 .= ($line1 ? " - " : "") . getFormeJuridiqueLabel((string) $fromcompany->forme_juridique_code);
+		$line1 .= ($line1 ? " - " : "").getFormeJuridiqueLabel((string) $fromcompany->forme_juridique_code);
 	}
 	// Capital
 	if ($fromcompany->capital) {
-		$line1 .= ($line1 ? " - " : "") . $langs->transnoentities("CapitalOf", (string) $fromcompany->capital) . " " . $langs->transnoentities("Currency" . $conf->currency);
+		$line1 .= ($line1 ? " - " : "").$langs->transnoentities("CapitalOf", (string) $fromcompany->capital)." ".$langs->transnoentities("Currency".$conf->currency);
 	}
 	// Prof Id 1
 	if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || !$fromcompany->idprof2)) {
@@ -2865,7 +2865,7 @@ 
 		if (preg_match('/\((.*)\)/i', $field, $reg)) {
 			$field = $reg[1];
 		}
-		$line1 .= ($line1 ? " - " : "") . $field . ": " . $fromcompany->idprof1;
+		$line1 .= ($line1 ? " - " : "").$field.": ".$fromcompany->idprof1;
 	}
 	// Prof Id 2
 	if ($fromcompany->idprof2) {
@@ -2873,7 +2873,7 @@ 
 		if (preg_match('/\((.*)\)/i', $field, $reg)) {
 			$field = $reg[1];
 		}
-		$line1 .= ($line1 ? " - " : "") . $field . ": " . $fromcompany->idprof2;
+		$line1 .= ($line1 ? " - " : "").$field.": ".$fromcompany->idprof2;
 	}
 
 	// Second line of company infos
@@ -2884,7 +2884,7 @@ 
 		if (preg_match('/\((.*)\)/i', $field, $reg)) {
 			$field = $reg[1];
 		}
-		$line2 .= ($line2 ? " - " : "") . $field . ": " . $fromcompany->idprof3;
+		$line2 .= ($line2 ? " - " : "").$field.": ".$fromcompany->idprof3;
 	}
 	// Prof Id 4
 	if ($fromcompany->idprof4) {
@@ -2892,33 +2892,33 @@ 
 		if (preg_match('/\((.*)\)/i', $field, $reg)) {
 			$field = $reg[1];
 		}
-		$line2 .= ($line2 ? " - " : "") . $field . ": " . $fromcompany->idprof4;
+		$line2 .= ($line2 ? " - " : "").$field.": ".$fromcompany->idprof4;
 	}
 	// IntraCommunautary VAT
 	if ($fromcompany->tva_intra != '') {
-		$line2 .= ($line2 ? " - " : "") . $langs->transnoentities("VATIntraShort") . ": " . $fromcompany->tva_intra;
+		$line2 .= ($line2 ? " - " : "").$langs->transnoentities("VATIntraShort").": ".$fromcompany->tva_intra;
 	}
 
-	print '<!-- htmlPrintOnlineFooter -->' . "\n";
+	print '<!-- htmlPrintOnlineFooter -->'."\n";
 
 	// css centpercent has been removed from class="..." because not compatible with paddingleft/right and there is an horizontal scroll appearring on payment page for example.
-	print '<footer class="center centpercent opacitymedium">' . "\n";
+	print '<footer class="center centpercent opacitymedium">'."\n";
 	print '<br>';
 	if ($addformmessage) {
-		print '<!-- object = ' . (empty($object) ? 'undefined' : $object->element) . ' -->';
+		print '<!-- object = '.(empty($object) ? 'undefined' : $object->element).' -->';
 		print '<br>';
 
-		$parammessageform = 'ONLINE_PAYMENT_MESSAGE_FORM_' . $suffix;
+		$parammessageform = 'ONLINE_PAYMENT_MESSAGE_FORM_'.$suffix;
 		if (getDolGlobalString($parammessageform) !== '') {
 			print $langs->transnoentities(getDolGlobalString($parammessageform));
-		} elseif (getDolGlobalString('ONLINE_PAYMENT_MESSAGE_FORM')  !== '') {
+		} elseif (getDolGlobalString('ONLINE_PAYMENT_MESSAGE_FORM') !== '') {
 			print $langs->transnoentities(getDolGlobalString('ONLINE_PAYMENT_MESSAGE_FORM'));
 		}
 
 		// Add other message if VAT exists
 		if (!empty($object->total_vat) || !empty($object->total_tva)) {
-			$parammessageform = 'ONLINE_PAYMENT_MESSAGE_FORMIFVAT_' . $suffix;
-			if (getDolGlobalString($parammessageform)  !== '') {
+			$parammessageform = 'ONLINE_PAYMENT_MESSAGE_FORMIFVAT_'.$suffix;
+			if (getDolGlobalString($parammessageform) !== '') {
 				print $langs->transnoentities(getDolGlobalString($parammessageform));
 			} elseif (getDolGlobalString('ONLINE_PAYMENT_MESSAGE_FORMIFVAT') !== '') {
 				print $langs->transnoentities(getDolGlobalString('ONLINE_PAYMENT_MESSAGE_FORMIFVAT'));
@@ -2926,15 +2926,15 @@ 
 		}
 	}
 
-	print '<span style="font-size: 10px;"><br><hr>' . "\n";
-	print $fromcompany->name . '<br>';
+	print '<span style="font-size: 10px;"><br><hr>'."\n";
+	print $fromcompany->name.'<br>';
 	print $line1;
-	if (strlen($line1 . $line2) > 50) {
+	if (strlen($line1.$line2) > 50) {
 		print '<br>';
 	} else {
 		print ' - ';
 	}
 	print $line2;
 	print '</span>';
-	print '</footer>' . "\n";
+	print '</footer>'."\n";
 }

htdocs/accountancy/admin/index.php

Spacing +17 added lines, -17 removed lines

@@ -414,19 +414,19 @@ 
 
 // Show message if accountancy hidden options are activated to help to resolve some problems
 if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {
-	print '<div class="info">' . $langs->trans("ConstantIsOn", "FACTURE_DEPOSITS_ARE_JUST_PAYMENTS") . '</div>';
+	print '<div class="info">'.$langs->trans("ConstantIsOn", "FACTURE_DEPOSITS_ARE_JUST_PAYMENTS").'</div>';
 }
 if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {
-	print '<div class="info">' . $langs->trans("ConstantIsOn", "FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS") . '</div>';
+	print '<div class="info">'.$langs->trans("ConstantIsOn", "FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS").'</div>';
 }
 if (getDolGlobalString('ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY')) {
-	print '<div class="info">' . $langs->trans("ConstantIsOn", "ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY") . '</div>';
+	print '<div class="info">'.$langs->trans("ConstantIsOn", "ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY").'</div>';
 }
 if (getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
-	print '<div class="info">' . $langs->trans("ConstantIsOn", "MAIN_COMPANY_PERENTITY_SHARED") . '</div>';
+	print '<div class="info">'.$langs->trans("ConstantIsOn", "MAIN_COMPANY_PERENTITY_SHARED").'</div>';
 }
 if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
-	print '<div class="info">' . $langs->trans("ConstantIsOn", "MAIN_PRODUCT_PERENTITY_SHARED") . '</div>';
+	print '<div class="info">'.$langs->trans("ConstantIsOn", "MAIN_PRODUCT_PERENTITY_SHARED").'</div>';
 }
 
 print '<br>';
@@ -496,8 +496,8 @@ 
 		print $form->selectarray($key, $array, getDolGlobalInt('ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER', 0), 0, 0, 0, '', 0, 0, 0, '', 'onrightofpage width200');
 	} elseif ($key == 'ACCOUNTING_LABEL_OPERATION_ON_TRANSFER') {
 		$array = array(
-			0=>$langs->trans("ThirdPartyName") . ' - ' . $langs->trans("NumPiece") . ' - ' . $langs->trans("LabelAccount"),
-			1=>$langs->trans("ThirdPartyName") . ' - ' . $langs->trans("NumPiece"),
+			0=>$langs->trans("ThirdPartyName").' - '.$langs->trans("NumPiece").' - '.$langs->trans("LabelAccount"),
+			1=>$langs->trans("ThirdPartyName").' - '.$langs->trans("NumPiece"),
 			2=>$langs->trans("ThirdPartyName")
 		);
 		print $form->selectarray($key, $array, getDolGlobalInt('ACCOUNTING_LABEL_OPERATION_ON_TRANSFER', 0), 0, 0, 0, '', 0, 0, 0, '', 'onrightofpage width300');
@@ -706,7 +706,7 @@ 
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
-print '<td colspan="2">' . $langs->trans('OptionsAdvanced') . '</td>';
+print '<td colspan="2">'.$langs->trans('OptionsAdvanced').'</td>';
 print "</tr>\n";
 
 print '<tr class="oddeven">';
@@ -727,7 +727,7 @@ 
 	// Number of letters for lettering (3 by default (AAA), min 2 (AA))
 	print '<tr class="oddeven">';
 	print '<td>';
-	print $form->textwithpicto($langs->trans("ACCOUNTING_LETTERING_NBLETTERS"), $langs->trans("ACCOUNTING_LETTERING_NBLETTERS_DESC")) . '</td>';
+	print $form->textwithpicto($langs->trans("ACCOUNTING_LETTERING_NBLETTERS"), $langs->trans("ACCOUNTING_LETTERING_NBLETTERS_DESC")).'</td>';
 	print '<td class="right">';
 
 	if (empty($letter)) {
@@ -738,19 +738,19 @@ 
 		}
 	}
 
-	print '<input class="flat right" name="ACCOUNTING_LETTERING_NBLETTERS" id="ACCOUNTING_LETTERING_NBLETTERS" value="' . $nbletter . '" type="number" step="1" min="2" max="3" >' . "\n";
+	print '<input class="flat right" name="ACCOUNTING_LETTERING_NBLETTERS" id="ACCOUNTING_LETTERING_NBLETTERS" value="'.$nbletter.'" type="number" step="1" min="2" max="3" >'."\n";
 	print '</tr>';
 
 	// Auto Lettering when transfer in accountancy is realized
 	print '<tr class="oddeven">';
 	print '<td>';
-	print $form->textwithpicto($langs->trans("ACCOUNTING_ENABLE_AUTOLETTERING"), $langs->trans("ACCOUNTING_ENABLE_AUTOLETTERING_DESC")) . '</td>';
+	print $form->textwithpicto($langs->trans("ACCOUNTING_ENABLE_AUTOLETTERING"), $langs->trans("ACCOUNTING_ENABLE_AUTOLETTERING_DESC")).'</td>';
 	if (getDolGlobalInt('ACCOUNTING_ENABLE_AUTOLETTERING')) {
-		print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?token=' . newToken() . '&action=setenableautolettering&value=0">';
+		print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&action=setenableautolettering&value=0">';
 		print img_picto($langs->trans("Activated"), 'switch_on');
 		print '</a></td>';
 	} else {
-		print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?token=' . newToken() . '&action=setenableautolettering&value=1">';
+		print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&action=setenableautolettering&value=1">';
 		print img_picto($langs->trans("Disabled"), 'switch_off');
 		print '</a></td>';
 	}
@@ -761,11 +761,11 @@ 
 print '<td>';
 print $form->textwithpicto($langs->trans("ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE"), $langs->trans("ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC", $langs->transnoentities("MenuDefaultAccounts"))).'</td>';
 if (getDolGlobalString('ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE')) {
-	print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?token=' . newToken() . '&action=setenablevatreversecharge&value=0">';
+	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&action=setenablevatreversecharge&value=0">';
 	print img_picto($langs->trans("Activated"), 'switch_on');
 	print '</a></td>';
 } else {
-	print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?token=' . newToken() . '&action=setenablevatreversecharge&value=1">';
+	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&action=setenablevatreversecharge&value=1">';
 	print img_picto($langs->trans("Disabled"), 'switch_off');
 	print '</a></td>';
 }
@@ -775,11 +775,11 @@ 
 print '<td>';
 print $form->textwithpicto($langs->trans("ACCOUNTING_ENABLE_TABONTHIRDPARTY"), $langs->trans("ACCOUNTING_ENABLE_TABONTHIRDPARTY_DESC")).'</td>';
 if (getDolGlobalString('ACCOUNTING_ENABLE_TABONTHIRDPARTY')) {
-	print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?token=' . newToken() . '&action=setenabletabonthirdparty&value=0">';
+	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&action=setenabletabonthirdparty&value=0">';
 	print img_picto($langs->trans("Activated"), 'switch_on');
 	print '</a></td>';
 } else {
-	print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?token=' . newToken() . '&action=setenabletabonthirdparty&value=1">';
+	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&action=setenabletabonthirdparty&value=1">';
 	print img_picto($langs->trans("Disabled"), 'switch_off');
 	print '</a></td>';
 }

htdocs/expedition/card.php

Spacing +348 added lines, -348 removed lines

@@ -39,29 +39,29 @@ 
 
 // Load Dolibarr environment
 require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT . '/expedition/class/expedition.class.php';
-require_once DOL_DOCUMENT_ROOT . '/product/class/html.formproduct.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/product.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/sendings.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/modules/expedition/modules_expedition.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 . '/product/stock/class/entrepot.class.php';
-require_once DOL_DOCUMENT_ROOT . '/product/stock/class/productlot.class.php';
-require_once DOL_DOCUMENT_ROOT . '/commande/class/commande.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/sendings.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.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.'/product/stock/class/entrepot.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
+require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 if (isModEnabled("product") || isModEnabled("service")) {
-	require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/product/class/product.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('productbatch')) {
-	require_once DOL_DOCUMENT_ROOT . '/product/class/productbatch.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
 }
 if (isModEnabled('project')) {
-	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';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
 
 /**
@@ -114,7 +114,7 @@ 
 $extrafields->fetch_name_optionals_label($objectorder->table_element_line);
 
 // Load object. Make an object->fetch
-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'
 
 // Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
 $hookmanager->initHooks(array('expeditioncard', 'globalcard'));
@@ -144,7 +144,7 @@ 
 	$permissiontoeditextra = dol_eval($extrafields->attributes[$object->table_element]['perms'][GETPOST('attribute', 'aZ09')]);
 }
 
-$upload_dir = $conf->expedition->dir_output . '/sending';
+$upload_dir = $conf->expedition->dir_output.'/sending';
 
 $editColspan = 0;
 $objectsrc = null;
@@ -166,7 +166,7 @@ 
 	if ($cancel) {
 		if ($origin && $origin_id > 0) {
 			if ($origin == 'commande') {
-				header("Location: " . DOL_URL_ROOT . '/expedition/shipment.php?id=' . ((int) $origin_id));
+				header("Location: ".DOL_URL_ROOT.'/expedition/shipment.php?id='.((int) $origin_id));
 				exit;
 			}
 		} else {
@@ -175,10 +175,10 @@ 
 		}
 	}
 
-	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'
 
 	// Actions to build doc
-	include DOL_DOCUMENT_ROOT . '/core/actions_builddoc.inc.php';
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 	// Back to draft
 	if ($action == 'setdraft' && $permissiontoadd) {
@@ -187,7 +187,7 @@ 
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		} else {
-			header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $object->id);
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 			exit;
 		}
 	}
@@ -198,7 +198,7 @@ 
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		} else {
-			header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $object->id);
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 			exit;
 		}
 	}
@@ -219,7 +219,7 @@ 
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = 'editref_customer';
 		} else {
-			header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $object->id);
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 			exit;
 		}
 	}
@@ -296,16 +296,16 @@ 
 		$product_batch_used = array();
 
 		for ($i = 0; $i < $num; $i++) {
-			$idl = "idl" . $i;
+			$idl = "idl".$i;
 
 			$sub_qty = array();
 			$subtotalqty = 0;
 
 			$j = 0;
 
-			$batch = "batchl" . $i . "_0";
-			$stockLocation = "ent1" . $i . "_0";
-			$qty = "qtyl" . $i;
+			$batch = "batchl".$i."_0";
+			$stockLocation = "ent1".$i."_0";
+			$qty = "qtyl".$i;
 
 			$is_batch_or_serial = 0;
 			if (!empty($objectsrc->lines[$i]->fk_product)) {
@@ -320,7 +320,7 @@ 
 			if (isModEnabled('productbatch') && $objectsrc->lines[$i]->product_tobatch) {
 				if (GETPOSTISSET($batch)) {
 					//shipment line with batch-enable product
-					$qty .= '_' . $j;
+					$qty .= '_'.$j;
 					while (GETPOSTISSET($batch)) {
 						// save line of detail into sub_qty
 						$sub_qty[$j]['q'] = price2num(GETPOST($qty, 'alpha'), 'MS'); // the qty we want to move for this stock record
@@ -339,8 +339,8 @@ 
 						}
 
 						$j++;
-						$batch = "batchl" . $i . "_" . $j;
-						$qty = "qtyl" . $i . '_' . $j;
+						$batch = "batchl".$i."_".$j;
+						$qty = "qtyl".$i.'_'.$j;
 					}
 
 					$batch_line[$i]['detail'] = $sub_qty; // array of details
@@ -354,13 +354,13 @@ 
 						// We try to set an amount
 						// Case we don't use the list of available qty for each warehouse/lot
 						// GUI does not allow this yet
-						setEventMessages($langs->trans("StockIsRequiredToChooseWhichLotToUse") . ' (' . $langs->trans("Line") . ' ' . GETPOSTINT($idl) . ')', null, 'errors');
+						setEventMessages($langs->trans("StockIsRequiredToChooseWhichLotToUse").' ('.$langs->trans("Line").' '.GETPOSTINT($idl).')', null, 'errors');
 						$error++;
 					}
 				}
 			} elseif (GETPOSTISSET($stockLocation)) {
 				//shipment line from multiple stock locations
-				$qty .= '_' . $j;
+				$qty .= '_'.$j;
 				while (GETPOSTISSET($stockLocation)) {
 					// save sub line of warehouse
 					$stockLine[$i][$j]['qty'] = price2num(GETPOST($qty, 'alpha'), 'MS');
@@ -371,8 +371,8 @@ 
 					$subtotalqty += price2num(GETPOST($qty, 'alpha'), 'MS');
 
 					$j++;
-					$stockLocation = "ent1" . $i . "_" . $j;
-					$qty = "qtyl" . $i . '_' . $j;
+					$stockLocation = "ent1".$i."_".$j;
+					$qty = "qtyl".$i.'_'.$j;
 				}
 			} else {
 				//shipment line for product with no batch management and no multiple stock location
@@ -395,7 +395,7 @@ 
 			if (isset($extrafields->attributes[$object->table_element_line]['label']) && is_array($extrafields->attributes[$object->table_element_line]['label'])) {
 				// Get extra fields
 				foreach ($extrafields->attributes[$object->table_element_line]['label'] as $key => $value) {
-					unset($_POST["options_" . $key]);
+					unset($_POST["options_".$key]);
 				}
 			}
 		}
@@ -403,7 +403,7 @@ 
 		if (($totalqty > 0 || getDolGlobalString('SHIPMENT_GETS_ALL_ORDER_PRODUCTS')) && !$error) {		// There is at least one thing to ship and no error
 			$selected_subtotal_lines = GETPOST('subtotal_toselect', 'array');
 			for ($i = 0; $i < $num; $i++) {
-				$qty = "qtyl" . $i;
+				$qty = "qtyl".$i;
 
 				if (!isset($batch_line[$i])) {
 					// not batch mode
@@ -421,8 +421,8 @@ 
 						}
 					} else {
 						if (GETPOSTFLOAT($qty) > 0 || getDolGlobalString('SHIPMENT_GETS_ALL_ORDER_PRODUCTS')) {
-							$ent = "entl" . $i;
-							$idl = "idl" . $i;
+							$ent = "entl".$i;
+							$idl = "idl".$i;
 							$entrepot_id = is_numeric(GETPOSTINT($ent)) ? GETPOSTINT($ent) : GETPOSTINT('entrepot_id');
 							if ($entrepot_id < 0) {
 								$entrepot_id = '';
@@ -475,7 +475,7 @@ 
 		} elseif (!$error) {
 			$labelfieldmissing = $langs->transnoentitiesnoconv("QtyToShip");
 			if (isModEnabled('stock')) {
-				$labelfieldmissing .= '/' . $langs->transnoentitiesnoconv("Warehouse");
+				$labelfieldmissing .= '/'.$langs->transnoentitiesnoconv("Warehouse");
 			}
 			setEventMessages($langs->trans("ErrorFieldRequired", $labelfieldmissing), null, 'errors');
 			$error++;
@@ -491,7 +491,7 @@ 
 				$line->extraparams = $objectsrc_line->extraparams;
 				$line->setExtraParameters();
 			}
-			header("Location: card.php?id=" . $object->id);
+			header("Location: card.php?id=".$object->id);
 			exit;
 		} else {
 			$db->rollback();
@@ -506,7 +506,7 @@ 
 		if ($result > 0) {
 			$db->commit();
 
-			header("Location: " . DOL_URL_ROOT . '/delivery/card.php?action=create_delivery&token=' . newToken() . '&id=' . $result);
+			header("Location: ".DOL_URL_ROOT.'/delivery/card.php?action=create_delivery&token='.newToken().'&id='.$result);
 			exit;
 		} else {
 			$db->rollback();
@@ -559,7 +559,7 @@ 
 		$also_update_stock = (GETPOST('alsoUpdateStock', 'alpha') ? 1 : 0);
 		$result = $object->delete($user, 0, (bool) $also_update_stock);
 		if ($result > 0) {
-			header("Location: " . DOL_URL_ROOT . '/expedition/index.php');
+			header("Location: ".DOL_URL_ROOT.'/expedition/index.php');
 			exit;
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -596,7 +596,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');
@@ -604,7 +604,7 @@ 
 	} elseif ($action == 'confirm_sign' && $confirm == 'yes' && $user->hasRight('expedition', 'creer')) {
 		$result = $object->setSignedStatus($user, GETPOSTINT('signed_status'), 0, 'SHIPPING_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');
@@ -612,7 +612,7 @@ 
 	} elseif ($action == 'confirm_unsign' && $confirm == 'yes' && $user->hasRight('expedition', 'creer')) {
 		$result = $object->setSignedStatus($user, Expedition::$SIGNED_STATUSES['STATUS_NO_SIGNATURE'], 0, 'SHIPPING_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');
@@ -621,7 +621,7 @@ 
 		$datedelivery = dol_mktime(GETPOSTINT('liv_hour'), GETPOSTINT('liv_min'), 0, GETPOSTINT('liv_month'), GETPOSTINT('liv_day'), GETPOSTINT('liv_year'));
 
 		$object->fetch($id);
-		$result = $object->setDeliveryDate($user, $datedelivery);	// Set the planned delivery date
+		$result = $object->setDeliveryDate($user, $datedelivery); // Set the planned delivery date
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -663,7 +663,7 @@ 
 
 		if (!$error) {
 			if ($object->update($user) >= 0) {
-				header("Location: card.php?id=" . $object->id);
+				header("Location: card.php?id=".$object->id);
 				exit;
 			}
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -674,7 +674,7 @@ 
 		$object->fetch($id);
 		$result = $object->setBilled();
 		if ($result >= 0) {
-			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit();
 		}
 		setEventMessages($object->error, $object->errors, 'errors');
@@ -682,7 +682,7 @@ 
 		$object->fetch($id);
 		$result = $object->setClosed();
 		if ($result >= 0) {
-			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit();
 		}
 		setEventMessages($object->error, $object->errors, 'errors');
@@ -716,7 +716,7 @@ 
 		}
 
 		if (!$error) {
-			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit();
 		} else {
 			setEventMessages($line->error, $line->errors, 'errors');
@@ -740,7 +740,7 @@ 
 				// Unset extrafield POST Data
 				if (is_array($extrafields->attributes[$object->table_element_line]['label'])) {
 					foreach ($extrafields->attributes[$object->table_element_line]['label'] as $key => $value) {
-						unset($_POST["options_" . $key]);
+						unset($_POST["options_".$key]);
 					}
 				}
 				$line->fk_product = $lines[$i]->fk_product;
@@ -748,8 +748,8 @@ 
 					// line with lot
 					foreach ($lines[$i]->detail_batch as $detail_batch) {
 						$lotStock = new Productbatch($db);
-						$batch = "batchl" . $detail_batch->fk_expeditiondet . "_" . $detail_batch->fk_origin_stock;
-						$qty = "qtyl" . $detail_batch->fk_expeditiondet . '_' . $detail_batch->id;
+						$batch = "batchl".$detail_batch->fk_expeditiondet."_".$detail_batch->fk_origin_stock;
+						$qty = "qtyl".$detail_batch->fk_expeditiondet.'_'.$detail_batch->id;
 						$batch_id = GETPOSTINT($batch);
 						$batch_qty = GETPOSTFLOAT($qty);
 						if (!empty($batch_id)) {
@@ -785,8 +785,8 @@ 
 					}
 					// add new batch
 					$lotStock = new Productbatch($db);
-					$batch = "batchl" . $line_id . "_0";
-					$qty = "qtyl" . $line_id . "_0";
+					$batch = "batchl".$line_id."_0";
+					$qty = "qtyl".$line_id."_0";
 					$batch_id = GETPOSTINT($batch);
 					$batch_qty = GETPOSTFLOAT($qty);
 					$lineIdToAddLot = 0;
@@ -849,8 +849,8 @@ 
 						// line without lot
 						if ($lines[$i]->entrepot_id == 0) {
 							// single warehouse shipment line or line in several warehouses context but with warehouse not defined
-							$stockLocation = "entl" . $line_id;
-							$qty = "qtyl" . $line_id;
+							$stockLocation = "entl".$line_id;
+							$qty = "qtyl".$line_id;
 							$line->id = $line_id;
 							$line->entrepot_id = GETPOSTINT((string) $stockLocation);
 							$line->qty = GETPOSTFLOAT($qty);
@@ -862,8 +862,8 @@ 
 							unset($_POST[$qty]);
 						} elseif ($lines[$i]->entrepot_id > 0) {
 							// single warehouse shipment line
-							$stockLocation = "entl" . $line_id;
-							$qty = "qtyl" . $line_id;
+							$stockLocation = "entl".$line_id;
+							$qty = "qtyl".$line_id;
 							$line->id = $line_id;
 							$line->entrepot_id = GETPOSTINT($stockLocation);
 							$line->qty = GETPOSTFLOAT($qty);
@@ -877,8 +877,8 @@ 
 							// multi warehouse shipment lines
 							foreach ($lines[$i]->details_entrepot as $detail_entrepot) {
 								if (!$error) {
-									$stockLocation = "entl" . $detail_entrepot->line_id;
-									$qty = "qtyl" . $detail_entrepot->line_id;
+									$stockLocation = "entl".$detail_entrepot->line_id;
+									$qty = "qtyl".$detail_entrepot->line_id;
 									$warehouse = GETPOSTINT($stockLocation);
 									if (!empty($warehouse)) {
 										$line->id = $detail_entrepot->line_id;
@@ -896,7 +896,7 @@ 
 								}
 							}
 						} elseif (!isModEnabled('stock') && empty($conf->productbatch->enabled)) { // both product batch and stock are not activated.
-							$qty = "qtyl" . $line_id;
+							$qty = "qtyl".$line_id;
 							$line->id = $line_id;
 							$line->qty = GETPOSTFLOAT($qty);
 							$line->entrepot_id = 0;
@@ -910,7 +910,7 @@ 
 						}
 					} else {
 						// Product no predefined
-						$qty = "qtyl" . $line_id;
+						$qty = "qtyl".$line_id;
 						$line->id = $line_id;
 						$line->qty = GETPOSTFLOAT($qty);
 						$line->entrepot_id = 0;
@@ -953,11 +953,11 @@ 
 				$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 		} else {
-			header('Location: ' . $_SERVER['PHP_SELF'] . '?id=' . $object->id); // To redisplay the form being edited
+			header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // To redisplay the form being edited
 			exit();
 		}
 	} elseif ($action == 'updateline' && $permissiontoadd && GETPOST('cancel', 'alpha') == $langs->trans("Cancel")) {
-		header('Location: ' . $_SERVER['PHP_SELF'] . '?id=' . $object->id); // To redisplay the form being edited
+		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // To redisplay the form being edited
 		exit();
 	} elseif ($action == 'confirm_sign' && $confirm == 'yes' && $permissiontoadd) {
 		$result = $object->setSignedStatus($user, GETPOSTINT('signed_status'), 0, 'SHIPPING_MODIFY');
@@ -979,7 +979,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 {
 			$mesg = $object->error;
@@ -1004,14 +1004,14 @@ 
 				$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 {
 			$mesg = $object->error;
 		}
 	}
 
-	include DOL_DOCUMENT_ROOT . '/core/actions_printing.inc.php';
+	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
 	// Actions to send emails
 	if (empty($id)) {
@@ -1021,8 +1021,8 @@ 
 	$paramname = 'id';
 	$autocopy = 'MAIN_MAIL_AUTOCOPY_SHIPMENT_TO';
 	$mode = 'emailfromshipment';
-	$trackid = 'shi' . $object->id;
-	include DOL_DOCUMENT_ROOT . '/core/actions_sendmails.inc.php';
+	$trackid = 'shi'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 }
 
 
@@ -1030,7 +1030,7 @@ 
  * View
  */
 
-$title = $object->ref . ' - ' . $langs->trans("Shipment");
+$title = $object->ref.' - '.$langs->trans("Shipment");
 if ($action == 'create2') {
 	$title = $langs->trans("CreateShipment");
 }
@@ -1058,7 +1058,7 @@ 
 if ($action == 'create2') {
 	print load_fiche_titre($langs->trans("CreateShipment"), '', 'dolly');
 
-	print '<br>' . $langs->trans("ShipmentCreationIsDoneFromOrder");
+	print '<br>'.$langs->trans("ShipmentCreationIsDoneFromOrder");
 	$action = '';
 	$id = '';
 	$ref = '';
@@ -1092,13 +1092,13 @@ 
 				$entrepot = new Entrepot($db);
 			}
 
-			print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">';
-			print '<input type="hidden" name="token" value="' . newToken() . '">';
+			print '<form 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="origin" value="' . $origin . '">';
-			print '<input type="hidden" name="origin_id" value="' . $object->id . '">';
+			print '<input type="hidden" name="origin" value="'.$origin.'">';
+			print '<input type="hidden" name="origin_id" value="'.$object->id.'">';
 			if (GETPOSTINT('entrepot_id')) {
-				print '<input type="hidden" name="entrepot_id" value="' . GETPOSTINT('entrepot_id') . '">';
+				print '<input type="hidden" name="entrepot_id" value="'.GETPOSTINT('entrepot_id').'">';
 			}
 
 			print dol_get_fiche_head([]);
@@ -1128,13 +1128,13 @@ 
 				print $langs->trans('RefCustomer');
 			}
 			print '</td><td colspan="3">';
-			print '<input type="text" name="ref_customer" value="' . $object->ref_client . '" />';
+			print '<input type="text" name="ref_customer" value="'.$object->ref_client.'" />';
 			print '</td>';
 			print '</tr>';
 
 			// Tiers
-			print '<tr><td class="titlefieldcreate fieldrequired">' . $langs->trans('Company') . '</td>';
-			print '<td colspan="3">' . $soc->getNomUrl(1) . '</td>';
+			print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans('Company').'</td>';
+			print '<td colspan="3">'.$soc->getNomUrl(1).'</td>';
 			print '</tr>';
 
 			// Project
@@ -1149,16 +1149,16 @@ 
 
 				$langs->load("projects");
 				print '<tr>';
-				print '<td>' . $langs->trans("Project") . '</td><td colspan="2">';
+				print '<td>'.$langs->trans("Project").'</td><td colspan="2">';
 				print img_picto('', 'project', 'class="pictofixedwidth"');
 				print $formproject->select_projects($soc->id, $projectid, 'projectid', 0, 0, 1, 0, 0, 0, 0, '', 1, 0, 'widthcentpercentminusxx');
-				print ' <a class="paddingleft" 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"></span></a>';
+				print ' <a class="paddingleft" 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"></span></a>';
 				print '</td>';
 				print '</tr>';
 			}
 
 			// Date delivery planned
-			print '<tr><td>' . $langs->trans("DateDeliveryPlanned") . '</td>';
+			print '<tr><td>'.$langs->trans("DateDeliveryPlanned").'</td>';
 			print '<td colspan="3">';
 			print img_picto('', 'action', 'class="pictofixedwidth"');
 			$date_delivery = ($date_delivery ? $date_delivery : $object->delivery_date); // $date_delivery comes from GETPOST
@@ -1167,7 +1167,7 @@ 
 			print '</tr>';
 
 			// Date shipment (sending)
-			print '<tr><td>' . $langs->trans("DateShipping") . '</td>';
+			print '<tr><td>'.$langs->trans("DateShipping").'</td>';
 			print '<td colspan="3">';
 			print img_picto('', 'action', 'class="pictofixedwidth"');
 			//$date_shipping = ($date_shipping ? $date_shipping : $object->date_shipping); // $date_shipping comes from GETPOST
@@ -1176,7 +1176,7 @@ 
 			print '</tr>';
 
 			// Note Public
-			print '<tr><td>' . $langs->trans("NotePublic") . '</td>';
+			print '<tr><td>'.$langs->trans("NotePublic").'</td>';
 			print '<td colspan="3">';
 			$doleditor = new DolEditor('note_public', $object->note_public, '', 60, 'dolibarr_notes', 'In', false, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PUBLIC') ? 0 : 1, ROWS_3, '90%');
 			print $doleditor->Create(1);
@@ -1184,7 +1184,7 @@ 
 
 			// Note Private
 			if ($object->note_private && !$user->socid) {
-				print '<tr><td>' . $langs->trans("NotePrivate") . '</td>';
+				print '<tr><td>'.$langs->trans("NotePrivate").'</td>';
 				print '<td colspan="3">';
 				$doleditor = new DolEditor('note_private', $object->note_private, '', 60, 'dolibarr_notes', 'In', false, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PRIVATE') ? 0 : 1, ROWS_3, '90%');
 				print $doleditor->Create(1);
@@ -1196,19 +1196,19 @@ 
 			print $langs->trans("Weight");
 			print '</td><td colspan="3">';
 			print img_picto('', 'fa-balance-scale', 'class="pictofixedwidth"');
-			print '<input name="weight" size="4" value="' . GETPOSTINT('weight') . '"> ';
+			print '<input name="weight" size="4" value="'.GETPOSTINT('weight').'"> ';
 			$text = $formproduct->selectMeasuringUnits("weight_units", "weight", (string) GETPOSTINT('weight_units'), 0, 2);
 			$htmltext = $langs->trans("KeepEmptyForAutoCalculation");
 			print $form->textwithpicto($text, $htmltext);
 			print '</td></tr>';
 			// Dim
 			print '<tr><td>';
-			print $langs->trans("Width") . ' x ' . $langs->trans("Height") . ' x ' . $langs->trans("Depth");
+			print $langs->trans("Width").' x '.$langs->trans("Height").' x '.$langs->trans("Depth");
 			print ' </td><td colspan="3">';
 			print img_picto('', 'fa-ruler', 'class="pictofixedwidth"');
-			print '<input name="sizeW" size="4" value="' . GETPOSTINT('sizeW') . '">';
-			print ' x <input name="sizeH" size="4" value="' . GETPOSTINT('sizeH') . '">';
-			print ' x <input name="sizeS" size="4" value="' . GETPOSTINT('sizeS') . '">';
+			print '<input name="sizeW" size="4" value="'.GETPOSTINT('sizeW').'">';
+			print ' x <input name="sizeH" size="4" value="'.GETPOSTINT('sizeH').'">';
+			print ' x <input name="sizeS" size="4" value="'.GETPOSTINT('sizeS').'">';
 			print ' ';
 			$text = $formproduct->selectMeasuringUnits("size_units", "size", (string) GETPOSTINT('size_units'), 0, 2);
 			$htmltext = $langs->trans("KeepEmptyForAutoCalculation");
@@ -1216,7 +1216,7 @@ 
 			print '</td></tr>';
 
 			// Delivery method
-			print "<tr><td>" . $langs->trans("DeliveryMethod") . "</td>";
+			print "<tr><td>".$langs->trans("DeliveryMethod")."</td>";
 			print '<td colspan="3">';
 			$expe->fetch_delivery_methods();
 			print img_picto('', 'dolly', 'class="pictofixedwidth"');
@@ -1227,16 +1227,16 @@ 
 			print "</td></tr>\n";
 
 			// Tracking number
-			print "<tr><td>" . $langs->trans("TrackingNumber") . "</td>";
+			print "<tr><td>".$langs->trans("TrackingNumber")."</td>";
 			print '<td colspan="3">';
 			print img_picto('', 'barcode', 'class="pictofixedwidth"');
-			print '<input name="tracking_number" size="20" value="' . GETPOST('tracking_number', 'alpha') . '">';
+			print '<input name="tracking_number" size="20" value="'.GETPOST('tracking_number', 'alpha').'">';
 			print "</td></tr>\n";
 
 			// Incoterms
 			if (isModEnabled('incoterm')) {
 				print '<tr>';
-				print '<td><label for="incoterm_id">' . $form->textwithpicto($langs->trans("IncotermLabel"), $object->label_incoterms, 1) . '</label></td>';
+				print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $object->label_incoterms, 1).'</label></td>';
 				print '<td colspan="3" class="maxwidthonsmartphone">';
 				print img_picto('', 'incoterm', 'class="pictofixedwidth"');
 				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''));
@@ -1244,10 +1244,10 @@ 
 			}
 
 			// Document model
-			include_once DOL_DOCUMENT_ROOT . '/core/modules/expedition/modules_expedition.php';
+			include_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php';
 			$list = ModelePdfExpedition::liste_modeles($db);
 			if (is_countable($list) && count($list) > 1) {
-				print "<tr><td>" . $langs->trans("DefaultModel") . "</td>";
+				print "<tr><td>".$langs->trans("DefaultModel")."</td>";
 				print '<td colspan="3">';
 				print img_picto('', 'pdf', 'class="pictofixedwidth"');
 				print $form->selectarray('model', $list, getDolGlobalString('EXPEDITION_ADDON_PDF'), 0, 0, 0, '', 0, 0, 0, '', 'widthcentpercentminusx');
@@ -1256,7 +1256,7 @@ 
 
 			// Other attributes. Fields from hook formObjectOptions and Extrafields.
 			// $objectsrc is Commande|Facture
-			$objectsav = $object;	// Because Expedition is $expe and not $object that is wrongly a duplicate of $objectsrc.
+			$objectsav = $object; // Because Expedition is $expe and not $object that is wrongly a duplicate of $objectsrc.
 			$object = $expe;
 			$parameters = array('objectsrc' => isset($objectsrc) ? $objectsrc : '', 'cols' => '3', 'socid' => $socid);
 			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
@@ -1271,22 +1271,22 @@ 
 
 			$numAsked = count($object->lines);
 
-			print '<script type="text/javascript">' . "\n";
-			print 'jQuery(document).ready(function() {' . "\n";
+			print '<script type="text/javascript">'."\n";
+			print 'jQuery(document).ready(function() {'."\n";
 			print 'jQuery("#autofill").click(function() {';
 			$i = 0;
 			while ($i < $numAsked) {
-				print 'jQuery("#qtyl' . $i . '").val(jQuery("#qtyasked' . $i . '").val() - jQuery("#qtydelivered' . $i . '").val());' . "\n";
+				print 'jQuery("#qtyl'.$i.'").val(jQuery("#qtyasked'.$i.'").val() - jQuery("#qtydelivered'.$i.'").val());'."\n";
 				if (isModEnabled('productbatch')) {
-					print 'jQuery("#qtyl' . $i . '_' . $i . '").val(jQuery("#qtyasked' . $i . '").val() - jQuery("#qtydelivered' . $i . '").val());' . "\n";
+					print 'jQuery("#qtyl'.$i.'_'.$i.'").val(jQuery("#qtyasked'.$i.'").val() - jQuery("#qtydelivered'.$i.'").val());'."\n";
 				}
 				$i++;
 			}
-			print 'return false; });' . "\n";
-			print 'jQuery("#autoreset").click(function() { console.log("Reset values to 0"); jQuery(".qtyl").val(0);' . "\n";
-			print 'return false; });' . "\n";
-			print '});' . "\n";
-			print '</script>' . "\n";
+			print 'return false; });'."\n";
+			print 'jQuery("#autoreset").click(function() { console.log("Reset values to 0"); jQuery(".qtyl").val(0);'."\n";
+			print 'return false; });'."\n";
+			print '});'."\n";
+			print '</script>'."\n";
 
 			print '<br>';
 
@@ -1320,26 +1320,26 @@ 
 				}
 				print $langs->trans("Description");
 				print '</td>';
-				print '<td class="center">' . $langs->trans("QtyOrdered") . '</td>';
-				print '<td class="center">' . $langs->trans("QtyShipped") . '</td>';
-				print '<td class="center">' . $langs->trans("QtyToShip");
+				print '<td class="center">'.$langs->trans("QtyOrdered").'</td>';
+				print '<td class="center">'.$langs->trans("QtyShipped").'</td>';
+				print '<td class="center">'.$langs->trans("QtyToShip");
 				if (empty($conf->productbatch->enabled)) {
-					print '<br><a href="#" id="autofill" class="opacitymedium link cursor cursorpointer">' . img_picto($langs->trans("Autofill"), 'autofill', 'class="paddingrightonly"') . '</a>';
+					print '<br><a href="#" id="autofill" class="opacitymedium link cursor cursorpointer">'.img_picto($langs->trans("Autofill"), 'autofill', 'class="paddingrightonly"').'</a>';
 					print ' / ';
 				} else {
 					print '<br>';
 				}
-				print '<span id="autoreset" class="opacitymedium link cursor cursorpointer">' . img_picto($langs->trans("Reset"), 'eraser') . '</span>';
+				print '<span id="autoreset" class="opacitymedium link cursor cursorpointer">'.img_picto($langs->trans("Reset"), 'eraser').'</span>';
 				print '</td>';
 				if (isModEnabled('stock')) {
 					if (empty($conf->productbatch->enabled)) {
-						print '<td class="left">' . $langs->trans("Warehouse") . ' (' . $langs->trans("Stock") . ')</td>';
+						print '<td class="left">'.$langs->trans("Warehouse").' ('.$langs->trans("Stock").')</td>';
 					} else {
-						print '<td class="left">' . $langs->trans("Warehouse") . ' / ' . $langs->trans("Batch") . ' (' . $langs->trans("Stock") . ')</td>';
+						print '<td class="left">'.$langs->trans("Warehouse").' / '.$langs->trans("Batch").' ('.$langs->trans("Stock").')</td>';
 					}
 				}
 				if (getDolGlobalString('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) {
-					print '<td class="left">' . $langs->trans('StockEntryDate') . '</td>';
+					print '<td class="left">'.$langs->trans('StockEntryDate').'</td>';
 				}
 				print "</tr>\n";
 			}
@@ -1376,8 +1376,8 @@ 
 						$type = 1;
 					}
 
-					print '<!-- line for order line ' . $line->id . ' -->' . "\n";
-					print '<tr class="oddeven" id="row-' . $line->id . '">' . "\n";
+					print '<!-- line for order line '.$line->id.' -->'."\n";
+					print '<tr class="oddeven" id="row-'.$line->id.'">'."\n";
 
 					$qtyProdCom = $line->qty;
 					$productChildrenNb = 0;
@@ -1398,7 +1398,7 @@ 
 						//var_dump($product->stock_warehouse[1]);
 
 						print '<td>';
-						print '<a name="' . $line->id . '"></a>'; // ancre pour retourner sur la ligne
+						print '<a name="'.$line->id.'"></a>'; // ancre pour retourner sur la ligne
 
 						// Show product and description
 						$product_static->type = $line->fk_product_type;
@@ -1411,7 +1411,7 @@ 
 						$showdescinproductdesc = getDolGlobalString('PRODUIT_DESC_IN_FORM_ACCORDING_TO_DEVICE');
 
 						$text = $product_static->getNomUrl(1);
-						$text .= ' - ' . (!empty($line->label) ? $line->label : $line->product_label);
+						$text .= ' - '.(!empty($line->label) ? $line->label : $line->product_label);
 						$description = ($showdescinproductdesc ? '' : dol_htmlentitiesbr($line->desc));
 						$description .= empty($product->stockable_product) ? $langs->trans('StockDisabled') : $langs->trans('StockEnabled');
 						print $form->textwithtooltip($text, $description, 3, 0, '', (string) $i);
@@ -1421,7 +1421,7 @@ 
 
 						// Add description in form
 						if ($showdescinproductdesc) {
-							print ($line->desc && $line->desc != $line->product_label) ? '<br>' . dol_htmlentitiesbr($line->desc) : '';
+							print ($line->desc && $line->desc != $line->product_label) ? '<br>'.dol_htmlentitiesbr($line->desc) : '';
 						}
 
 						print '</td>';
@@ -1434,10 +1434,10 @@ 
 						}
 
 						if (!empty($line->label)) {
-							$text .= ' <strong>' . $line->label . '</strong>';
+							$text .= ' <strong>'.$line->label.'</strong>';
 							print $form->textwithtooltip($text, $line->desc, 3, 0, '', (string) $i);
 						} else {
-							print $text . ' ' . nl2br($line->desc);
+							print $text.' '.nl2br($line->desc);
 						}
 
 						// Show range
@@ -1452,16 +1452,16 @@ 
 					}
 
 					// Qty
-					print '<td class="center">' . $line->qty;
-					print '<input name="qtyasked' . $indiceAsked . '" id="qtyasked' . $indiceAsked . '" type="hidden" value="' . $line->qty . '">';
-					print '' . $unit_order . '</td>';
+					print '<td class="center">'.$line->qty;
+					print '<input name="qtyasked'.$indiceAsked.'" id="qtyasked'.$indiceAsked.'" type="hidden" value="'.$line->qty.'">';
+					print ''.$unit_order.'</td>';
 
 					// Qty already shipped
 					print '<td class="center">';
 					$quantityDelivered = isset($object->expeditions[$line->id]) ? $object->expeditions[$line->id] : '';
 					print $quantityDelivered;
-					print '<input name="qtydelivered' . $indiceAsked . '" id="qtydelivered' . $indiceAsked . '" type="hidden" value="' . $quantityDelivered . '">';
-					print '' . $unit_order . '</td>';
+					print '<input name="qtydelivered'.$indiceAsked.'" id="qtydelivered'.$indiceAsked.'" type="hidden" value="'.$quantityDelivered.'">';
+					print ''.$unit_order.'</td>';
 
 					// Qty to ship
 					$quantityAsked = $line->qty;
@@ -1492,19 +1492,19 @@ 
 							// Quantity to send
 							print '<td class="center">';
 							if ($line->product_type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES') || ($line->product_type == Product::TYPE_SERVICE && getDolGlobalString('SHIPMENT_SUPPORTS_SERVICES'))) {
-								if (GETPOSTINT('qtyl' . $indiceAsked)) {
-									$deliverableQty = GETPOSTINT('qtyl' . $indiceAsked);
+								if (GETPOSTINT('qtyl'.$indiceAsked)) {
+									$deliverableQty = GETPOSTINT('qtyl'.$indiceAsked);
 								}
-								print '<input name="idl' . $indiceAsked . '" type="hidden" value="' . $line->id . '">';
+								print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
 								$qtylValue = $deliverableQty;
 								if (getDolGlobalBool('SHIPMENT_DONT_PREFILL_QTY', false)) {
 									$qtylValue = '';
 								}
-								print '<input name="qtyl' . $indiceAsked . '" id="qtyl' . $indiceAsked . '" class="qtyl right" type="text" size="4" value="' . $qtylValue . '">';
+								print '<input name="qtyl'.$indiceAsked.'" id="qtyl'.$indiceAsked.'" class="qtyl right" type="text" size="4" value="'.$qtylValue.'">';
 							} else {
 								if (getDolGlobalString('SHIPMENT_GETS_ALL_ORDER_PRODUCTS')) {
-									print '<input name="idl' . $indiceAsked . '" type="hidden" value="' . $line->id . '">';
-									print '<input name="qtyl' . $indiceAsked . '" id="qtyl' . $indiceAsked . '" type="hidden" value="0">';
+									print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
+									print '<input name="qtyl'.$indiceAsked.'" id="qtyl'.$indiceAsked.'" type="hidden" value="0">';
 								}
 
 								print $langs->trans("NA");
@@ -1516,8 +1516,8 @@ 
 								print '<td class="left">';
 								if ($line->product_type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {   // Type of product need stock change ?
 									// Show warehouse combo list
-									$ent = "entl" . $indiceAsked;
-									$idl = "idl" . $indiceAsked;
+									$ent = "entl".$indiceAsked;
+									$idl = "idl".$indiceAsked;
 									$tmpentrepot_id = is_numeric(GETPOST($ent)) ? GETPOSTINT($ent) : $warehouse_id;
 									if ($line->fk_product > 0) {
 										print '<!-- Show warehouse selection -->';
@@ -1527,24 +1527,24 @@ 
 											$stockMin = 0;
 										}
 										if ($productChildrenNb > 0) {
-											print $formproduct->selectWarehouses($tmpentrepot_id, 'entl' . $indiceAsked, '', 1, 0, 0, '', 0, 0, array(), 'minwidth200', array(), 1, $stockMin, 'stock DESC, e.ref');
+											print $formproduct->selectWarehouses($tmpentrepot_id, 'entl'.$indiceAsked, '', 1, 0, 0, '', 0, 0, array(), 'minwidth200', array(), 1, $stockMin, 'stock DESC, e.ref');
 										} else {
 											if ($product->stockable_product == Product::ENABLED_STOCK) {
-												print $formproduct->selectWarehouses($tmpentrepot_id, 'entl' . $indiceAsked, '', 1, 0, $line->fk_product, '', 1, 0, array(), 'minwidth200', array(), 1, $stockMin, 'stock DESC, e.ref');
+												print $formproduct->selectWarehouses($tmpentrepot_id, 'entl'.$indiceAsked, '', 1, 0, $line->fk_product, '', 1, 0, array(), 'minwidth200', array(), 1, $stockMin, 'stock DESC, e.ref');
 											} else {
-												print img_warning() . ' ' . $langs->trans('StockDisabled');
+												print img_warning().' '.$langs->trans('StockDisabled');
 											}
 										}
 
 										if ($tmpentrepot_id > 0 && $tmpentrepot_id == $warehouse_id) {
 											//print $stock.' '.$quantityToBeDelivered;
 											if ($stock < $quantityToBeDelivered) {
-												print ' ' . img_warning($langs->trans("StockTooLow")); // Stock too low for this $warehouse_id but you can change warehouse
+												print ' '.img_warning($langs->trans("StockTooLow")); // Stock too low for this $warehouse_id but you can change warehouse
 											}
 										}
 									}
 								} else {
-									print '<span class="opacitymedium">(' . $langs->trans("Service") . ')</span><input name="entl' . $indiceAsked . '" id="entl' . $indiceAsked . '" type="hidden" value="0">';
+									print '<span class="opacitymedium">('.$langs->trans("Service").')</span><input name="entl'.$indiceAsked.'" id="entl'.$indiceAsked.'" type="hidden" value="0">';
 								}
 								print '</td>';
 							}
@@ -1565,9 +1565,9 @@ 
 											$img = img_warning($langs->trans("StockTooLow"));
 										}
 										print "<tr class=\"oddeven\"><td>&nbsp; &nbsp; &nbsp; ->
-											<a href=\"" . DOL_URL_ROOT . "/product/card.php?id=" . $value['id'] . "\">" . $value['fullpath'] . "
-											</a> (" . $value['nb'] . ")</td><td class=\"center\"> " . $value['nb_total'] . "</td><td>&nbsp;</td><td>&nbsp;</td>
-											<td class=\"center\">" . $value['stock'] . " " . $img . "</td>";
+											<a href=\"" . DOL_URL_ROOT."/product/card.php?id=".$value['id']."\">".$value['fullpath']."
+											</a> (" . $value['nb'].")</td><td class=\"center\"> ".$value['nb_total']."</td><td>&nbsp;</td><td>&nbsp;</td>
+											<td class=\"center\">" . $value['stock']." ".$img."</td>";
 										if (getDolGlobalString('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) {
 											print '<td></td>';
 										} //StockEntrydate
@@ -1597,7 +1597,7 @@ 
 									$nbofsuggested++;
 								}
 							}
-							print '<input name="idl' . $indiceAsked . '" type="hidden" value="' . $line->id . '">';
+							print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
 							if (is_object($product->stock_warehouse[$warehouse_id]) && count($product->stock_warehouse[$warehouse_id]->detail_batch)) {
 								foreach ($product->stock_warehouse[$warehouse_id]->detail_batch as $dbatch) {	// $dbatch is instance of Productbatch
 									//var_dump($dbatch);
@@ -1623,7 +1623,7 @@ 
 										$deliverableQty = 0;
 									}
 
-									$inputName = 'qtyl' . $indiceAsked . '_' . $subj;
+									$inputName = 'qtyl'.$indiceAsked.'_'.$subj;
 									if (GETPOSTISSET($inputName)) {
 										$deliverableQty = GETPOST($inputName, 'int');
 									}
@@ -1631,37 +1631,37 @@ 
 									$tooltipClass = $tooltipTitle = '';
 									if (!empty($alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)])) {
 										$tooltipClass = ' classfortooltip';
-										$tooltipTitle = $langs->trans('StockQuantitiesAlreadyAllocatedOnPreviousLines') . ' : ' . $alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)];
+										$tooltipTitle = $langs->trans('StockQuantitiesAlreadyAllocatedOnPreviousLines').' : '.$alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)];
 									} else {
 										$alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)] = 0;
 									}
 									$alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)] = $deliverableQty + $alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)];
 
-									print '<!-- subj=' . $subj . '/' . $nbofsuggested . ' --><tr ' . ((($subj + 1) == $nbofsuggested) ? 'oddeven' : '') . '>';
+									print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested) ? 'oddeven' : '').'>';
 									print '<td colspan="3" ></td><td class="center">';
 									$qtylValue = $deliverableQty;
 									if (getDolGlobalBool('SHIPMENT_DONT_PREFILL_QTY', false)) {
 										$qtylValue = '';
 									}
-									print '<input class="qtyl ' . $tooltipClass . ' right" title="' . $tooltipTitle . '" name="qtyl' . $indiceAsked . '_' . $subj . '" id="qtyl' . $indiceAsked . '_' . $subj . '" type="text" size="4" value="' . $qtylValue . '">';
+									print '<input class="qtyl '.$tooltipClass.' right" title="'.$tooltipTitle.'" name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="'.$qtylValue.'">';
 									print '</td>';
 
 									print '<!-- Show details of lot -->';
 									print '<td class="left">';
 
-									print $staticwarehouse->getNomUrl(0) . ' / ';
+									print $staticwarehouse->getNomUrl(0).' / ';
 
-									print '<input name="batchl' . $indiceAsked . '_' . $subj . '" type="hidden" value="' . $dbatch->id . '">';
+									print '<input name="batchl'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$dbatch->id.'">';
 
 									$detail = '';
-									$detail .= $langs->trans("Batch") . ': ' . $dbatch->batch;
+									$detail .= $langs->trans("Batch").': '.$dbatch->batch;
 									if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY') && !empty($dbatch->sellby)) {
-										$detail .= ' - ' . $langs->trans("SellByDate") . ': ' . dol_print_date($dbatch->sellby, "day");
+										$detail .= ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby, "day");
 									}
 									if (!getDolGlobalString('PRODUCT_DISABLE_EATBY') && !empty($dbatch->eatby)) {
-										$detail .= ' - ' . $langs->trans("EatByDate") . ': ' . dol_print_date($dbatch->eatby, "day");
+										$detail .= ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby, "day");
 									}
-									$detail .= ' - ' . $langs->trans("Qty") . ': ' . $dbatch->qty;
+									$detail .= ' - '.$langs->trans("Qty").': '.$dbatch->qty;
 									$detail .= '<br>';
 									print $detail;
 
@@ -1672,18 +1672,18 @@ 
 									$subj++;
 									print '</td>';
 									if (getDolGlobalInt('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) {
-										print '<td>' . dol_print_date($dbatch->context['stock_entry_date'], 'day') . '</td>'; //StockEntrydate
+										print '<td>'.dol_print_date($dbatch->context['stock_entry_date'], 'day').'</td>'; //StockEntrydate
 									}
 									print '</tr>';
 								}
 							} else {
 								print '<!-- Case there is no details of lot at all -->';
 								print '<tr class="oddeven"><td colspan="3"></td><td class="center">';
-								print '<input class="qtyl right" name="qtyl' . $indiceAsked . '_' . $subj . '" id="qtyl' . $indiceAsked . '_' . $subj . '" type="text" size="4" value="0" disabled="disabled"> ';
+								print '<input class="qtyl right" name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="0" disabled="disabled"> ';
 								print '</td>';
 
 								print '<td class="left">';
-								print img_warning() . ' ' . $langs->trans("NoProductToShipFoundIntoStock", $staticwarehouse->label);
+								print img_warning().' '.$langs->trans("NoProductToShipFoundIntoStock", $staticwarehouse->label);
 								print '</td>';
 								if (getDolGlobalInt('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) {
 									print '<td></td>';
@@ -1699,9 +1699,9 @@ 
 							if (getDolGlobalString('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) {
 								print '<td></td>';
 							} //StockEntrydate
-							print '</tr>' . "\n"; // end line and start a new one for each warehouse
+							print '</tr>'."\n"; // end line and start a new one for each warehouse
 
-							print '<input name="idl' . $indiceAsked . '" type="hidden" value="' . $line->id . '">';
+							print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
 							$subj = 0;
 							// Define nb of lines suggested for this order line
 							$nbofsuggested = 0;
@@ -1725,8 +1725,8 @@ 
 									$deliverableQty = min($quantityToBeDelivered, $stock);
 									$deliverableQty = max(0, $deliverableQty);
 									// Quantity to send
-									print '<!-- subj=' . $subj . '/' . $nbofsuggested . ' --><tr ' . ((($subj + 1) == $nbofsuggested) ? 'oddeven' : '') . '>';
-									print '<td colspan="3" ></td><td class="center"><!-- qty to ship (no lot management for product line indiceAsked=' . $indiceAsked . ') -->';
+									print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested) ? 'oddeven' : '').'>';
+									print '<td colspan="3" ></td><td class="center"><!-- qty to ship (no lot management for product line indiceAsked='.$indiceAsked.') -->';
 									if ($line->product_type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES') || getDolGlobalString('SHIPMENT_SUPPORTS_SERVICES')) {
 										if (isset($alreadyQtySetted[$line->fk_product][intval($warehouse_id)])) {
 											$deliverableQty = min($quantityToBeDelivered, $stock - $alreadyQtySetted[$line->fk_product][intval($warehouse_id)]);
@@ -1745,14 +1745,14 @@ 
 										$tooltipClass = $tooltipTitle = '';
 										if (!empty($alreadyQtySetted[$line->fk_product][intval($warehouse_id)])) {
 											$tooltipClass = ' classfortooltip';
-											$tooltipTitle = $langs->trans('StockQuantitiesAlreadyAllocatedOnPreviousLines') . ' : ' . $alreadyQtySetted[$line->fk_product][intval($warehouse_id)];
+											$tooltipTitle = $langs->trans('StockQuantitiesAlreadyAllocatedOnPreviousLines').' : '.$alreadyQtySetted[$line->fk_product][intval($warehouse_id)];
 										} else {
 											$alreadyQtySetted[$line->fk_product][intval($warehouse_id)] = 0;
 										}
 
 										$alreadyQtySetted[$line->fk_product][intval($warehouse_id)] = $deliverableQty + $alreadyQtySetted[$line->fk_product][intval($warehouse_id)];
 
-										$inputName = 'qtyl' . $indiceAsked . '_' . $subj;
+										$inputName = 'qtyl'.$indiceAsked.'_'.$subj;
 										if (GETPOSTISSET($inputName)) {
 											$deliverableQty = GETPOSTINT($inputName);
 										}
@@ -1760,11 +1760,11 @@ 
 										if (getDolGlobalBool('SHIPMENT_DONT_PREFILL_QTY', false)) {
 											$qtylValue = '';
 										}
-										print '<input class="qtyl' . $tooltipClass . ' right" title="' . $tooltipTitle . '" name="qtyl' . $indiceAsked . '_' . $subj . '" id="qtyl' . $indiceAsked . '" type="text" size="4" value="' . $qtylValue . '">';
-										print '<input name="ent1' . $indiceAsked . '_' . $subj . '" type="hidden" value="' . $warehouse_id . '">';
+										print '<input class="qtyl'.$tooltipClass.' right" title="'.$tooltipTitle.'" name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$qtylValue.'">';
+										print '<input name="ent1'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$warehouse_id.'">';
 									} else {
 										if (getDolGlobalString('SHIPMENT_GETS_ALL_ORDER_PRODUCTS')) {
-											print '<input name="qtyl' . $indiceAsked . '_' . $subj . '" id="qtyl' . $indiceAsked . '" type="hidden" value="0">';
+											print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'" type="hidden" value="0">';
 										}
 
 										print $langs->trans("NA");
@@ -1776,16 +1776,16 @@ 
 										print '<td class="left">';
 										if ($line->product_type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 											if ($product->stockable_product == Product::ENABLED_STOCK || $productChildrenNb > 0) {
-												print $tmpwarehouseObject->getNomUrl(0) . ' ';
+												print $tmpwarehouseObject->getNomUrl(0).' ';
 												if ($productChildrenNb <= 0) {
 													print '<!-- Show details of stock -->';
-													print '(' . $stock . ')';
+													print '('.$stock.')';
 												}
 											} else {
-												print img_warning() . ' ' . $langs->trans('StockDisabled');
+												print img_warning().' '.$langs->trans('StockDisabled');
 											}
 										} else {
-											print '<span class="opacitymedium">(' . $langs->trans("Service") . ')</span>';
+											print '<span class="opacitymedium">('.$langs->trans("Service").')</span>';
 										}
 										print '</td>';
 									}
@@ -1813,9 +1813,9 @@ 
 										}
 										print '<tr class"oddeven"><td>';
 										print "&nbsp; &nbsp; &nbsp; ->
-										<a href=\"" . DOL_URL_ROOT . "/product/card.php?id=" . $value['id'] . "\">" . $value['fullpath'] . "
-										</a> (" . $value['nb'] . ")</td><td class=\"center\"> " . $value['nb_total'] . "</td><td>&nbsp;</td><td>&nbsp;</td>
-										<td class=\"center\">" . $value['stock'] . " " . $img . "</td>";
+										<a href=\"" . DOL_URL_ROOT."/product/card.php?id=".$value['id']."\">".$value['fullpath']."
+										</a> (" . $value['nb'].")</td><td class=\"center\"> ".$value['nb_total']."</td><td>&nbsp;</td><td>&nbsp;</td>
+										<td class=\"center\">" . $value['stock']." ".$img."</td>";
 										if (getDolGlobalString('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) {
 											print '<td></td>';
 										} //StockEntrydate
@@ -1832,7 +1832,7 @@ 
 							print '</tr>'; // end line and start a new one for lot/serial
 
 							$subj = 0;
-							print '<input name="idl' . $indiceAsked . '" type="hidden" value="' . $line->id . '">';
+							print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
 
 							$tmpwarehouseObject = new Entrepot($db);
 							$productlotObject = new Productlot($db);
@@ -1874,7 +1874,7 @@ 
 											$deliverableQty = 0;
 										}
 
-										$inputName = 'qtyl' . $indiceAsked . '_' . $subj;
+										$inputName = 'qtyl'.$indiceAsked.'_'.$subj;
 										if (GETPOSTISSET($inputName)) {
 											$deliverableQty = GETPOSTINT($inputName);
 										}
@@ -1882,29 +1882,29 @@ 
 										$tooltipClass = $tooltipTitle = '';
 										if (!empty($alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)])) {
 											$tooltipClass = ' classfortooltip';
-											$tooltipTitle = $langs->trans('StockQuantitiesAlreadyAllocatedOnPreviousLines') . ' : ' . $alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)];
+											$tooltipTitle = $langs->trans('StockQuantitiesAlreadyAllocatedOnPreviousLines').' : '.$alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)];
 										} else {
 											$alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)] = 0;
 										}
 										$alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)] = $deliverableQty + $alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)];
 
-										print '<!-- subj=' . $subj . '/' . $nbofsuggested . ' --><tr ' . ((($subj + 1) == $nbofsuggested) ? 'oddeven' : '') . '><td colspan="3"></td><td class="center">';
+										print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested) ? 'oddeven' : '').'><td colspan="3"></td><td class="center">';
 										$qtylValue = $deliverableQty;
 										if (getDolGlobalBool('SHIPMENT_DONT_PREFILL_QTY', false)) {
 											$qtylValue = '';
 										}
-										print '<input class="qtyl right ' . $tooltipClass . '" title="' . $tooltipTitle . '" name="' . $inputName . '" id="' . $inputName . '" type="text" size="4" value="' . $qtylValue . '">';
+										print '<input class="qtyl right '.$tooltipClass.'" title="'.$tooltipTitle.'" name="'.$inputName.'" id="'.$inputName.'" type="text" size="4" value="'.$qtylValue.'">';
 										print '</td>';
 
 										print '<td class="left">';
 
-										print $tmpwarehouseObject->getNomUrl(0) . ' / ';
+										print $tmpwarehouseObject->getNomUrl(0).' / ';
 
 										print '<!-- Show details of lot -->';
-										print '<input name="batchl' . $indiceAsked . '_' . $subj . '" type="hidden" value="' . $dbatch->id . '">';
+										print '<input name="batchl'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$dbatch->id.'">';
 
 										//print '|'.$line->fk_product.'|'.$dbatch->batch.'|<br>';
-										print $langs->trans("Batch") . ': ';
+										print $langs->trans("Batch").': ';
 										$result = $productlotObject->fetch(0, $line->fk_product, $dbatch->batch);
 										if ($result > 0) {
 											print $productlotObject->getNomUrl(1);
@@ -1912,12 +1912,12 @@ 
 											print $langs->trans("TableLotIncompleteRunRepairWithParamStandardEqualConfirmed");
 										}
 										if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY') && !empty($dbatch->sellby)) {
-											print ' - ' . $langs->trans("SellByDate") . ': ' . dol_print_date($dbatch->sellby, "day");
+											print ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby, "day");
 										}
 										if (!getDolGlobalString('PRODUCT_DISABLE_EATBY') && !empty($dbatch->eatby)) {
-											print ' - ' . $langs->trans("EatByDate") . ': ' . dol_print_date($dbatch->eatby, "day");
+											print ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby, "day");
 										}
-										print ' (' . $dbatch->qty . ')';
+										print ' ('.$dbatch->qty.')';
 										$quantityToBeDelivered -= $deliverableQty;
 										if ($quantityToBeDelivered < 0) {
 											$quantityToBeDelivered = 0;
@@ -1926,7 +1926,7 @@ 
 										$subj++;
 										print '</td>';
 										if (getDolGlobalString('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) {
-											print '<td class="left">' . dol_print_date($dbatch->context['stock_entry_date'], 'day') . '</td>';
+											print '<td class="left">'.dol_print_date($dbatch->context['stock_entry_date'], 'day').'</td>';
 										}
 										print '</tr>';
 									}
@@ -1951,9 +1951,9 @@ 
 								if ($product->stockable_product == Product::DISABLED_STOCK) {
 									$disabled = '';
 								}
-								print '<input class="qtyl right" name="qtyl' . $indiceAsked . '_' . $subj . '" id="qtyl' . $indiceAsked . '_' . $subj . '" type="text" size="4" value="0"' . ($disabled ? ' ' . $disabled : '') . '> ';
+								print '<input class="qtyl right" name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="0"'.($disabled ? ' '.$disabled : '').'> ';
 								if (empty($disabled) && !getDolGlobalInt('STOCK_DISALLOW_NEGATIVE_TRANSFER')) {
-									print '<input name="ent1' . $indiceAsked . '_' . $subj . '" type="hidden" value="' . $warehouse_selected_id . '">';
+									print '<input name="ent1'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$warehouse_selected_id.'">';
 								}
 							} elseif ($line->product_type == Product::TYPE_SERVICE && getDolGlobalString('SHIPMENT_SUPPORTS_SERVICES')) {
 								$disabled = '';
@@ -1963,9 +1963,9 @@ 
 								if ($warehouse_selected_id <= 0) {		// We did not force a given warehouse, so we won't have no warehouse to change qty.
 									$disabled = 'disabled="disabled"';
 								}
-								print '<input class="qtyl right" name="qtyl' . $indiceAsked . '_' . $subj . '" id="qtyl' . $indiceAsked . '_' . $subj . '" type="text" size="4" value="' . $quantityToBeDelivered . '"' . ($disabled ? ' ' . $disabled : '') . '> ';
+								print '<input class="qtyl right" name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="'.$quantityToBeDelivered.'"'.($disabled ? ' '.$disabled : '').'> ';
 								if (empty($disabled) && !getDolGlobalInt('STOCK_DISALLOW_NEGATIVE_TRANSFER')) {
-									print '<input name="ent1' . $indiceAsked . '_' . $subj . '" type="hidden" value="' . $warehouse_selected_id . '">';
+									print '<input name="ent1'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$warehouse_selected_id.'">';
 								}
 							} else {
 								print $langs->trans("NA");
@@ -1977,20 +1977,20 @@ 
 								if ($warehouse_selected_id > 0) {
 									$warehouseObject = new Entrepot($db);
 									$warehouseObject->fetch($warehouse_selected_id);
-									print img_warning() . ' ' . $langs->trans("NoProductToShipFoundIntoStock", $warehouseObject->label);
+									print img_warning().' '.$langs->trans("NoProductToShipFoundIntoStock", $warehouseObject->label);
 								} else {
 									if ($line->fk_product) {
 										if ($product->stockable_product == Product::ENABLED_STOCK) {
-											print img_warning() . ' ' . $langs->trans('StockTooLow');
+											print img_warning().' '.$langs->trans('StockTooLow');
 										} else {
-											print img_warning() . ' ' . $langs->trans('StockDisabled');
+											print img_warning().' '.$langs->trans('StockDisabled');
 										}
 									} else {
 										print '';
 									}
 								}
 							} else {
-								print '<span class="opacitymedium">(' . $langs->trans("Service") . ')</span>';
+								print '<span class="opacitymedium">('.$langs->trans("Service").')</span>';
 							}
 							print '</td>';
 							if (getDolGlobalString('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) {
@@ -2037,7 +2037,7 @@ 
 		}
 	}
 } elseif ($object->id > 0) {
-	'@phan-var-force Expedition $object';  // Need to force it (type overridden earlier)
+	'@phan-var-force Expedition $object'; // Need to force it (type overridden earlier)
 
 	// Edit and view mode
 
@@ -2077,7 +2077,7 @@ 
 			);
 		}
 		$formconfirm = $form->formconfirm(
-			$_SERVER['PHP_SELF'] . '?id=' . $object->id,
+			$_SERVER['PHP_SELF'].'?id='.$object->id,
 			$langs->trans('DeleteSending'),
 			$langs->trans("ConfirmDeleteSending", $object->ref),
 			'confirm_delete',
@@ -2098,7 +2098,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);
 	}
 
 	// Confirm validation
@@ -2112,13 +2112,13 @@ 
 
 		$text = $langs->trans("ConfirmValidateSending", $numref);
 		if (getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT')) {
-			$text .= '<br>' . img_picto('', 'movement', 'class="pictofixedwidth"') . $langs->trans("StockMovementWillBeRecorded") . '.';
+			$text .= '<br>'.img_picto('', 'movement', 'class="pictofixedwidth"').$langs->trans("StockMovementWillBeRecorded").'.';
 		} elseif (getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT_CLOSE')) {
-			$text .= '<br>' . img_picto('', 'movement', 'class="pictofixedwidth"') . $langs->trans("StockMovementNotYetRecorded") . '.';
+			$text .= '<br>'.img_picto('', 'movement', 'class="pictofixedwidth"').$langs->trans("StockMovementNotYetRecorded").'.';
 		}
 
 		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('SHIPPING_VALIDATE', $object->socid, $object);
@@ -2129,14 +2129,14 @@ 
 
 	// Confirm cancellation
 	if ($action == 'cancel') {
-		$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'] . '?id=' . $object->id, $langs->trans('CancelSending'), $langs->trans("ConfirmCancelSending", $object->ref), 'confirm_cancel', '', 0, 1);
+		$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('CancelSending'), $langs->trans("ConfirmCancelSending", $object->ref), 'confirm_cancel', '', 0, 1);
 	}
 
 	// Confirm sign
 	if ($action == 'sign') {
 		$text = $langs->trans('ConfirmSignShipping');
 		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('SHIPPING_MODIFY', $object->socid, $object);
@@ -2146,22 +2146,22 @@ 
 			'type' 		=> 'select',
 			'name' 		=> 'signed_status',
 			'select_show_empty' => 0,
-			'label'		=> '<span class="fieldrequired">' . $langs->trans('SignStatus') . '</span>',
+			'label'		=> '<span class="fieldrequired">'.$langs->trans('SignStatus').'</span>',
 			'values'	=> $object->getSignedStatusLocalisedArray()
 		];
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('SignShipping'), $text, 'confirm_sign', $formquestion, 0, 1);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('SignShipping'), $text, 'confirm_sign', $formquestion, 0, 1);
 	}
 
 	// Confirm unsign
 	if ($action == 'unsign') {
 		$text = $langs->trans('ConfirmUnsignShipping');
 		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('SHIPPING_MODIFY', $object->socid, $object);
 		}
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('UnsignShipping'), $text, 'confirm_unsign', '', 0, 1);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('UnsignShipping'), $text, 'confirm_unsign', '', 0, 1);
 	}
 
 	// Call Hook formConfirm
@@ -2192,13 +2192,13 @@ 
 	}
 
 	// Shipment card
-	$linkback = '<a href="' . DOL_URL_ROOT . '/expedition/list.php?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/expedition/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 	$morehtmlref = '<div class="refidno">';
 	// Ref customer shipment
 	$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->hasRight('expedition', 'creer'), 'string', '', 0, 1);
-	$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->hasRight('expedition', 'creer'), 'string' . (isset($conf->global->THIRDPARTY_REF_INPUT_SIZE) ? ':' . getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') : ''), '', null, null, '', 1);
+	$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->hasRight('expedition', 'creer'), 'string'.(isset($conf->global->THIRDPARTY_REF_INPUT_SIZE) ? ':'.getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') : ''), '', null, null, '', 1);
 	// Thirdparty
-	$morehtmlref .= '<br>' . $object->thirdparty->getNomUrl(1);
+	$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1);
 	// Project
 	if (isModEnabled('project')) {
 		$langs->load("projects");
@@ -2206,16 +2206,16 @@ 
 		if (0) {	// @phpstan-ignore-line  Do not change on shipment
 			$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, $objectsrc->socid, (string) $objectsrc->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $objectsrc->socid, (string) $objectsrc->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($objectsrc) && !empty($objectsrc->fk_project)) {
 				$proj = new Project($db);
 				$proj->fetch($objectsrc->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>';
 				}
 			}
 		}
@@ -2235,7 +2235,7 @@ 
 	// Linked documents
 	if (!empty($typeobject) && $typeobject == 'commande' && $object->origin_object->id && isModEnabled('order')) {
 		print '<tr><td>';
-		print $langs->trans("RefOrder") . '</td>';
+		print $langs->trans("RefOrder").'</td>';
 		print '<td>';
 		print $objectsrc->getNomUrl(1, 'commande');
 		print "</td>\n";
@@ -2243,7 +2243,7 @@ 
 	}
 	if (!empty($typeobject) && $typeobject == 'propal' && $object->origin_object->id && isModEnabled("propal")) {
 		print '<tr><td>';
-		print $langs->trans("RefProposal") . '</td>';
+		print $langs->trans("RefProposal").'</td>';
 		print '<td>';
 		print $objectsrc->getNomUrl(1, 'expedition');
 		print "</td>\n";
@@ -2251,8 +2251,8 @@ 
 	}
 
 	// Date creation
-	print '<tr><td class="titlefieldmiddle">' . $langs->trans("DateCreation") . '</td>';
-	print '<td>' . dol_print_date($object->date_creation, "dayhour") . "</td>\n";
+	print '<tr><td class="titlefieldmiddle">'.$langs->trans("DateCreation").'</td>';
+	print '<td>'.dol_print_date($object->date_creation, "dayhour")."</td>\n";
 	print '</tr>';
 
 	// Delivery date planned
@@ -2261,16 +2261,16 @@ 
 	print $langs->trans('DateDeliveryPlanned');
 	print '</td>';
 	if ($action != 'editdate_livraison') {
-		print '<td class="right"><a class="editfielda" href="' . $_SERVER["PHP_SELF"] . '?action=editdate_livraison&token=' . newToken() . '&id=' . $object->id . '">' . img_edit($langs->trans('SetDeliveryDate'), 1) . '</a></td>';
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).'</a></td>';
 	}
 	print '</tr></table>';
 	print '</td><td>';
 	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 $form->selectDate($object->date_delivery ? $object->date_delivery : -1, 'liv_', 1, 1, 0, "setdate_livraison", 1, 0);
-		print '<input type="submit" class="button button-edit smallpaddingimp" value="' . $langs->trans('Modify') . '">';
+		print '<input type="submit" class="button button-edit smallpaddingimp" value="'.$langs->trans('Modify').'">';
 		print '</form>';
 	} else {
 		print $object->date_delivery ? dol_print_date($object->date_delivery, 'dayhour') : '&nbsp;';
@@ -2284,16 +2284,16 @@ 
 	print $langs->trans('DateShipping');
 	print '</td>';
 	if ($action != 'editdate_shipping') {
-		print '<td class="right"><a class="editfielda" href="' . $_SERVER["PHP_SELF"] . '?action=editdate_shipping&token=' . newToken() . '&id=' . $object->id . '">' . img_edit($langs->trans('SetShippingDate'), 1) . '</a></td>';
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_shipping&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetShippingDate'), 1).'</a></td>';
 	}
 	print '</tr></table>';
 	print '</td><td>';
 	if ($action == 'editdate_shipping') {
-		print '<form name="setdate_shipping" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="post">';
-		print '<input type="hidden" name="token" value="' . newToken() . '">';
+		print '<form name="setdate_shipping" 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_shipping">';
 		print $form->selectDate($object->date_shipping ? $object->date_shipping : -1, 'ship_', 1, 1, 0, "setdate_shipping", 1, 0);
-		print '<input type="submit" class="button button-edit smallpaddingimp" value="' . $langs->trans('Modify') . '">';
+		print '<input type="submit" class="button button-edit smallpaddingimp" value="'.$langs->trans('Modify').'">';
 		print '</form>';
 	} else {
 		print $object->date_shipping ? dol_print_date($object->date_shipping, 'dayhour') : '&nbsp;';
@@ -2307,24 +2307,24 @@ 
 	print '</td><td>';
 
 	if ($action == 'edittrueWeight') {
-		print '<form name="settrueweight" action="' . $_SERVER["PHP_SELF"] . '" method="post">';
+		print '<form name="settrueweight" action="'.$_SERVER["PHP_SELF"].'" method="post">';
 		print '<input name="action" value="settrueWeight" type="hidden">';
-		print '<input name="id" value="' . $object->id . '" type="hidden">';
-		print '<input type="hidden" name="token" value="' . newToken() . '">';
-		print '<input id="trueWeight" name="trueWeight" value="' . $object->trueWeight . '" type="text" class="width50 valignmiddle">';
+		print '<input name="id" value="'.$object->id.'" type="hidden">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input id="trueWeight" name="trueWeight" value="'.$object->trueWeight.'" type="text" class="width50 valignmiddle">';
 		print $formproduct->selectMeasuringUnits("weight_units", "weight", (string) $object->weight_units, 0, 2, 'maxwidth125 valignmiddle');
-		print ' <input class="button smallpaddingimp valignmiddle" name="modify" value="' . $langs->trans("Modify") . '" type="submit">';
-		print ' <input class="button button-cancel smallpaddingimp valignmiddle" name="cancel" value="' . $langs->trans("Cancel") . '" type="submit">';
+		print ' <input class="button smallpaddingimp valignmiddle" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
+		print ' <input class="button button-cancel smallpaddingimp valignmiddle" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
 		print '</form>';
 	} else {
 		print $object->trueWeight;
-		print ($object->trueWeight && $object->weight_units != '') ? ' ' . measuringUnitString(0, "weight", $object->weight_units) : '';
+		print ($object->trueWeight && $object->weight_units != '') ? ' '.measuringUnitString(0, "weight", $object->weight_units) : '';
 	}
 
 	// Calculated
 	if ($totalWeight > 0) {
 		if (!empty($object->trueWeight)) {
-			print ' (' . $langs->trans("SumOfProductWeights") . ': ';
+			print ' ('.$langs->trans("SumOfProductWeights").': ';
 		}
 		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');
 		if (!empty($object->trueWeight)) {
@@ -2334,34 +2334,34 @@ 
 	print '</td></tr>';
 
 	// Width
-	print '<tr><td>' . $form->editfieldkey("Width", 'trueWidth', $object->trueWidth, $object, $user->hasRight('expedition', 'creer')) . '</td><td>';
+	print '<tr><td>'.$form->editfieldkey("Width", 'trueWidth', $object->trueWidth, $object, $user->hasRight('expedition', 'creer')).'</td><td>';
 	print $form->editfieldval("Width", 'trueWidth', $object->trueWidth, $object, $user->hasRight('expedition', 'creer'));
-	print ($object->trueWidth && $object->width_units != '') ? ' ' . measuringUnitString(0, "size", $object->width_units) : '';
+	print ($object->trueWidth && $object->width_units != '') ? ' '.measuringUnitString(0, "size", $object->width_units) : '';
 	print '</td></tr>';
 
 	// Height
-	print '<tr><td>' . $form->editfieldkey("Height", 'trueHeight', $object->trueHeight, $object, $user->hasRight('expedition', 'creer')) . '</td><td>';
+	print '<tr><td>'.$form->editfieldkey("Height", 'trueHeight', $object->trueHeight, $object, $user->hasRight('expedition', 'creer')).'</td><td>';
 	if ($action == 'edittrueHeight') {
-		print '<form name="settrueHeight" action="' . $_SERVER["PHP_SELF"] . '" method="post">';
+		print '<form name="settrueHeight" action="'.$_SERVER["PHP_SELF"].'" method="post">';
 		print '<input name="action" value="settrueHeight" type="hidden">';
-		print '<input name="id" value="' . $object->id . '" type="hidden">';
-		print '<input type="hidden" name="token" value="' . newToken() . '">';
-		print '<input id="trueHeight" name="trueHeight" value="' . $object->trueHeight . '" type="text" class="width50">';
+		print '<input name="id" value="'.$object->id.'" type="hidden">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input id="trueHeight" name="trueHeight" value="'.$object->trueHeight.'" type="text" class="width50">';
 		print $formproduct->selectMeasuringUnits("size_units", "size", $object->size_units, 0, 2);
-		print ' <input class="button smallpaddingimp" name="modify" value="' . $langs->trans("Modify") . '" type="submit">';
-		print ' <input class="button button-cancel smallpaddingimp" name="cancel" value="' . $langs->trans("Cancel") . '" type="submit">';
+		print ' <input class="button smallpaddingimp" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
+		print ' <input class="button button-cancel smallpaddingimp" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
 		print '</form>';
 	} else {
 		print $object->trueHeight;
-		print ($object->trueHeight && $object->height_units != '') ? ' ' . measuringUnitString(0, "size", $object->height_units) : '';
+		print ($object->trueHeight && $object->height_units != '') ? ' '.measuringUnitString(0, "size", $object->height_units) : '';
 	}
 
 	print '</td></tr>';
 
 	// Depth
-	print '<tr><td>' . $form->editfieldkey("Depth", 'trueDepth', $object->trueDepth, $object, $user->hasRight('expedition', 'creer')) . '</td><td>';
+	print '<tr><td>'.$form->editfieldkey("Depth", 'trueDepth', $object->trueDepth, $object, $user->hasRight('expedition', 'creer')).'</td><td>';
 	print $form->editfieldval("Depth", 'trueDepth', $object->trueDepth, $object, $user->hasRight('expedition', 'creer'));
-	print ($object->trueDepth && $object->depth_units != '') ? ' ' . measuringUnitString(0, "size", $object->depth_units) : '';
+	print ($object->trueDepth && $object->depth_units != '') ? ' '.measuringUnitString(0, "size", $object->depth_units) : '';
 	print '</td></tr>';
 
 	// Volume
@@ -2380,12 +2380,12 @@ 
 		if ($volumeUnit < 50) {
 			print showDimensionInBestUnit($calculatedVolume, $volumeUnit, "volume", $langs, getDolGlobalInt('MAIN_VOLUME_DEFAULT_ROUND', -1), getDolGlobalString('MAIN_VOLUME_DEFAULT_UNIT', 'no'));
 		} else {
-			print $calculatedVolume . ' ' . measuringUnitString(0, "volume", $volumeUnit);
+			print $calculatedVolume.' '.measuringUnitString(0, "volume", $volumeUnit);
 		}
 	}
 	if ($totalVolume > 0) {
 		if ($calculatedVolume) {
-			print ' (' . $langs->trans("SumOfProductVolumes") . ': ';
+			print ' ('.$langs->trans("SumOfProductVolumes").': ';
 		}
 		print showDimensionInBestUnit($totalVolume, 0, "volume", $langs, getDolGlobalInt('MAIN_VOLUME_DEFAULT_ROUND', -1), getDolGlobalString('MAIN_VOLUME_DEFAULT_UNIT', 'no'));
 		//if (empty($calculatedVolume)) print ' ('.$langs->trans("Calculated").')';
@@ -2398,7 +2398,7 @@ 
 
 	// Other attributes
 	//$cols = 2;
-	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 	print '</table>';
 
@@ -2415,33 +2415,33 @@ 
 	print '</td>';
 
 	if ($action != 'editshipping_method_id' && $permissiontoadd) {
-		print '<td class="right"><a class="editfielda" href="' . $_SERVER["PHP_SELF"] . '?action=editshipping_method_id&token=' . newToken() . '&id=' . $object->id . '">' . img_edit($langs->trans('SetSendingMethod'), 1) . '</a></td>';
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editshipping_method_id&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetSendingMethod'), 1).'</a></td>';
 	}
 	print '</tr></table>';
 	print '</td><td>';
 	if ($action == 'editshipping_method_id') {
-		print '<form name="setshipping_method_id" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="post">';
-		print '<input type="hidden" name="token" value="' . newToken() . '">';
+		print '<form name="setshipping_method_id" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="setshipping_method_id">';
 		$object->fetch_delivery_methods();
 		print $form->selectarray("shipping_method_id", $object->meths, $object->shipping_method_id, 1, 0, 0, "", 1);
 		if ($user->admin) {
 			print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		}
-		print '<input type="submit" class="button button-edit smallpaddingimp" value="' . $langs->trans('Modify') . '">';
+		print '<input type="submit" class="button button-edit smallpaddingimp" value="'.$langs->trans('Modify').'">';
 		print '</form>';
 	} else {
 		if ($object->shipping_method_id > 0) {
 			// Get code using getLabelFromKey
 			$code = $langs->getLabelFromKey($db, (string) $object->shipping_method_id, 'c_shipment_mode', 'rowid', 'code');
-			print $langs->trans("SendingMethod" . strtoupper($code));
+			print $langs->trans("SendingMethod".strtoupper($code));
 		}
 	}
 	print '</td>';
 	print '</tr>';
 
 	// Tracking Number
-	print '<tr><td class="titlefieldmiddle">' . $form->editfieldkey("TrackingNumber", 'tracking_number', $object->tracking_number, $object, $user->hasRight('expedition', 'creer')) . '</td><td>';
+	print '<tr><td class="titlefieldmiddle">'.$form->editfieldkey("TrackingNumber", 'tracking_number', $object->tracking_number, $object, $user->hasRight('expedition', 'creer')).'</td><td>';
 	print $form->editfieldval("TrackingNumber", 'tracking_number', $object->tracking_url, $object, $user->hasRight('expedition', 'creer'), 'safehtmlstring', $object->tracking_number);
 	print '</td></tr>';
 
@@ -2452,7 +2452,7 @@ 
 		print $langs->trans('IncotermLabel');
 		print '<td><td class="right">';
 		if ($permissiontoadd) {
-			print '<a class="editfielda" href="' . DOL_URL_ROOT . '/expedition/card.php?id=' . $object->id . '&action=editincoterm&token=' . newToken() . '">' . img_edit() . '</a>';
+			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/expedition/card.php?id='.$object->id.'&action=editincoterm&token='.newToken().'">'.img_edit().'</a>';
 		} else {
 			print '&nbsp;';
 		}
@@ -2462,7 +2462,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>';
 	}
@@ -2483,11 +2483,11 @@ 
 	// Lines of products
 
 	if ($action == 'editline') {
-		print '	<form name="updateline" id="updateline" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;lineid=' . $line_id . '" method="POST">
-		<input type="hidden" name="token" value="' . newToken() . '">
+		print '	<form name="updateline" id="updateline" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;lineid='.$line_id.'" method="POST">
+		<input type="hidden" name="token" value="' . newToken().'">
 		<input type="hidden" name="action" value="updateline">
 		<input type="hidden" name="mode" value="">
-		<input type="hidden" name="id" value="' . $object->id . '">
+		<input type="hidden" name="id" value="' . $object->id.'">
 		';
 	}
 	print '<br>';
@@ -2501,11 +2501,11 @@ 
 		print '<td width="5" class="center linecolnum">&nbsp;</td>';
 	}
 	// Product/Service
-	print '<td  class="linecoldescription" >' . $langs->trans("Products") . '</td>';
+	print '<td  class="linecoldescription" >'.$langs->trans("Products").'</td>';
 	// Qty
-	print '<td class="center linecolqty">' . $langs->trans("QtyOrdered") . '</td>';
+	print '<td class="center linecolqty">'.$langs->trans("QtyOrdered").'</td>';
 	if ($origin && $origin_id > 0) {
-		print '<td class="center linecolqtyinothershipments">' . $langs->trans("QtyInOtherShipments") . '</td>';
+		print '<td class="center linecolqtyinothershipments">'.$langs->trans("QtyInOtherShipments").'</td>';
 	}
 	if ($action == 'editline') {
 		$editColspan = 3;
@@ -2515,35 +2515,35 @@ 
 		if (empty($conf->productbatch->enabled)) {
 			$editColspan--;
 		}
-		print '<td class="center linecoleditlineotherinfo" colspan="' . $editColspan . '">';
+		print '<td class="center linecoleditlineotherinfo" colspan="'.$editColspan.'">';
 		if ($object->status <= 1) {
 			print $langs->trans("QtyToShip");
 		} else {
 			print $langs->trans("QtyShipped");
 		}
 		if (isModEnabled('stock')) {
-			print ' - ' . $langs->trans("WarehouseSource");
+			print ' - '.$langs->trans("WarehouseSource");
 		}
 		if (isModEnabled('productbatch')) {
-			print ' - ' . $langs->trans("Batch");
+			print ' - '.$langs->trans("Batch");
 		}
 		print '</td>';
 	} else {
 		if ($object->status <= 1) {
-			print '<td class="center linecolqtytoship">' . $langs->trans("QtyToShip") . '</td>';
+			print '<td class="center linecolqtytoship">'.$langs->trans("QtyToShip").'</td>';
 		} else {
-			print '<td class="center linecolqtyshipped">' . $langs->trans("QtyShipped") . '</td>';
+			print '<td class="center linecolqtyshipped">'.$langs->trans("QtyShipped").'</td>';
 		}
 		if (isModEnabled('stock')) {
-			print '<td class="left linecolwarehousesource">' . $langs->trans("WarehouseSource") . '</td>';
+			print '<td class="left linecolwarehousesource">'.$langs->trans("WarehouseSource").'</td>';
 		}
 
 		if (isModEnabled('productbatch')) {
-			print '<td class="left linecolbatch">' . $langs->trans("Batch") . '</td>';
+			print '<td class="left linecolbatch">'.$langs->trans("Batch").'</td>';
 		}
 	}
-	print '<td class="center linecolweight">' . $langs->trans("CalculatedWeight") . '</td>';
-	print '<td class="center linecolvolume">' . $langs->trans("CalculatedVolume") . '</td>';
+	print '<td class="center linecolweight">'.$langs->trans("CalculatedWeight").'</td>';
+	print '<td class="center linecolvolume">'.$langs->trans("CalculatedVolume").'</td>';
 	//print '<td class="center">'.$langs->trans("Size").'</td>';
 	if ($object->status == 0) {
 		print '<td class="linecoledit"></td>';
@@ -2578,13 +2578,13 @@ 
 		//if (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY')) $sql .= ", l.rowid as livraison_id, l.ref as livraison_ref, l.date_delivery, ld.qty as qty_received";
 		$sql .= ', p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid, p.tosell as product_tosell, p.tobuy as product_tobuy, p.tobatch as product_tobatch';
 		$sql .= ', p.description as product_desc';
-		$sql .= " FROM " . MAIN_DB_PREFIX . "expeditiondet as ed";
-		$sql .= ", " . MAIN_DB_PREFIX . "expedition as e";
-		$sql .= ", " . MAIN_DB_PREFIX . $origin . "det as obj";
+		$sql .= " FROM ".MAIN_DB_PREFIX."expeditiondet as ed";
+		$sql .= ", ".MAIN_DB_PREFIX."expedition as e";
+		$sql .= ", ".MAIN_DB_PREFIX.$origin."det as obj";
 		//if (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY')) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."delivery as l ON l.fk_expedition = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."deliverydet as ld ON ld.fk_delivery = l.rowid  AND obj.rowid = ld.fk_origin_line";
-		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON obj.fk_product = p.rowid";
-		$sql .= " WHERE e.entity IN (" . getEntity('expedition') . ")";
-		$sql .= " AND obj.fk_" . $origin . " = " . ((int) $origin_id);
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON obj.fk_product = p.rowid";
+		$sql .= " WHERE e.entity IN (".getEntity('expedition').")";
+		$sql .= " AND obj.fk_".$origin." = ".((int) $origin_id);
 		$sql .= " AND obj.rowid = ed.fk_elementdet";
 		$sql .= " AND ed.fk_expedition = e.rowid";
 		//if ($filter) $sql.= $filter;
@@ -2631,12 +2631,12 @@ 
 		}
 
 		if (empty($reshook) && $lines[$i]->product_type != "9") {
-			print '<!-- origin line id = ' . $lines[$i]->origin_line_id . ' -->'; // id of order line
-			print '<tr class="oddeven" id="row-' . $lines[$i]->id . '" data-id="' . $lines[$i]->id . '" data-element="' . $lines[$i]->element . '" >';
+			print '<!-- origin line id = '.$lines[$i]->origin_line_id.' -->'; // id of order line
+			print '<tr class="oddeven" id="row-'.$lines[$i]->id.'" data-id="'.$lines[$i]->id.'" data-element="'.$lines[$i]->element.'" >';
 
 			// #
 			if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) {
-				print '<td class="center linecolnum">' . ($i + 1) . '</td>';
+				print '<td class="center linecolnum">'.($i + 1).'</td>';
 			}
 
 			// Predefined product or service
@@ -2681,12 +2681,12 @@ 
 				$product_static->stockable_product = $lines[$i]->stockable_product;
 
 				$text = $product_static->getNomUrl(1);
-				$text .= ' - ' . $label;
+				$text .= ' - '.$label;
 				$description = (getDolGlobalInt('PRODUIT_DESC_IN_FORM_ACCORDING_TO_DEVICE') ? '' : dol_htmlentitiesbr($lines[$i]->description));
 				print $form->textwithtooltip($text, $description, 3, 0, '', (string) $i);
 				print_date_range(!empty($lines[$i]->date_start) ? $lines[$i]->date_start : '', !empty($lines[$i]->date_end) ? $lines[$i]->date_end : '');
 				if (getDolGlobalInt('PRODUIT_DESC_IN_FORM_ACCORDING_TO_DEVICE')) {
-					print (!empty($lines[$i]->description) && $lines[$i]->description != $lines[$i]->product) ? '<br>' . dol_htmlentitiesbr($lines[$i]->description) : '';
+					print (!empty($lines[$i]->description) && $lines[$i]->description != $lines[$i]->product) ? '<br>'.dol_htmlentitiesbr($lines[$i]->description) : '';
 				}
 				print "</td>\n";
 			} else {
@@ -2698,10 +2698,10 @@ 
 				}
 
 				if (!empty($lines[$i]->label)) {
-					$text .= ' <strong>' . $lines[$i]->label . '</strong>';
+					$text .= ' <strong>'.$lines[$i]->label.'</strong>';
 					print $form->textwithtooltip($text, $lines[$i]->description, 3, 0, '', (string) $i);
 				} else {
-					print $text . ' ' . nl2br($lines[$i]->description);
+					print $text.' '.nl2br($lines[$i]->description);
 				}
 
 				print_date_range($lines[$i]->date_start, $lines[$i]->date_end);
@@ -2714,7 +2714,7 @@ 
 			}
 
 			// Qty ordered
-			print '<td class="center linecolqty">' . $lines[$i]->qty_asked . ' ' . $unit_order . '</td>';
+			print '<td class="center linecolqty">'.$lines[$i]->qty_asked.' '.$unit_order.'</td>';
 
 			// Qty in other shipments (with shipment and warehouse used)
 			if ($origin && $origin_id > 0) {
@@ -2735,8 +2735,8 @@ 
 							}
 							$shipment_static->fetch($shipmentline_var['shipment_id']);
 							$htmltooltip .= $shipment_static->getNomUrl(1, '', 0, 0, 1);
-							$htmltooltip .= ' - ' . $shipmentline_var['qty_shipped'];
-							$htmltooltip .= ' - ' . $langs->trans("DateValidation") . ' : ' . (empty($shipmentline_var['date_valid']) ? $langs->trans("Draft") : dol_print_date($shipmentline_var['date_valid'], 'dayhour'));
+							$htmltooltip .= ' - '.$shipmentline_var['qty_shipped'];
+							$htmltooltip .= ' - '.$langs->trans("DateValidation").' : '.(empty($shipmentline_var['date_valid']) ? $langs->trans("Draft") : dol_print_date($shipmentline_var['date_valid'], 'dayhour'));
 							/*if (isModEnabled('stock') && $shipmentline_var['warehouse'] > 0) {
 								$warehousestatic->fetch($shipmentline_var['warehouse']);
 								$htmltext .= '<br>'.$langs->trans("FromLocation").' : '.$warehousestatic->getNomUrl(1, '', 0, 1);
@@ -2746,39 +2746,39 @@ 
 							$qtyalreadysent += $shipmentline_var['qty_shipped'];
 						}
 						if ($j) {
-							$htmltooltip = $langs->trans("QtyInOtherShipments") . '...<br><br>' . $htmltooltip . '<br><input type="submit" name="dummyhiddenbuttontogetfocus" style="display:none" autofocus>';
+							$htmltooltip = $langs->trans("QtyInOtherShipments").'...<br><br>'.$htmltooltip.'<br><input type="submit" name="dummyhiddenbuttontogetfocus" style="display:none" autofocus>';
 						}
 					}
 				}
-				print $form->textwithpicto((string) $qtyalreadysent, $htmltooltip, 1, 'info', '', 0, 3, 'tooltip' . $lines[$i]->id);
+				print $form->textwithpicto((string) $qtyalreadysent, $htmltooltip, 1, 'info', '', 0, 3, 'tooltip'.$lines[$i]->id);
 				print '</td>';
 			}
 
 			if ($action == 'editline' && $lines[$i]->id == $line_id) {
 				// edit mode
-				print '<td colspan="' . $editColspan . '" class="center"><table class="nobordernopadding centpercent">';
+				print '<td colspan="'.$editColspan.'" class="center"><table class="nobordernopadding centpercent">';
 				if (is_array($lines[$i]->detail_batch) && count($lines[$i]->detail_batch) > 0) {
 					print '<!-- case edit 1 -->';
 					$line = new ExpeditionLigne($db);
 					foreach ($lines[$i]->detail_batch as $detail_batch) {
 						print '<tr>';
 						// Qty to ship or shipped
-						print '<td><input class="qtyl right" name="qtyl' . $detail_batch->fk_expeditiondet . '_' . $detail_batch->id . '" id="qtyl' . $line_id . '_' . $detail_batch->id . '" type="text" size="4" value="' . $detail_batch->qty . '"></td>';
+						print '<td><input class="qtyl right" name="qtyl'.$detail_batch->fk_expeditiondet.'_'.$detail_batch->id.'" id="qtyl'.$line_id.'_'.$detail_batch->id.'" type="text" size="4" value="'.$detail_batch->qty.'"></td>';
 						// Batch number management
 						if ($lines[$i]->entrepot_id == 0) {
 							// only show lot numbers from src warehouse when shipping from multiple warehouses
 							$line->fetch($detail_batch->fk_expeditiondet);
 						}
 						$entrepot_id = !empty($detail_batch->entrepot_id) ? $detail_batch->entrepot_id : $lines[$i]->entrepot_id;
-						print '<td>' . $formproduct->selectLotStock($detail_batch->fk_origin_stock, 'batchl' . $detail_batch->fk_expeditiondet . '_' . $detail_batch->fk_origin_stock, '', 1, 0, $lines[$i]->fk_product, $entrepot_id) . '</td>';
+						print '<td>'.$formproduct->selectLotStock($detail_batch->fk_origin_stock, 'batchl'.$detail_batch->fk_expeditiondet.'_'.$detail_batch->fk_origin_stock, '', 1, 0, $lines[$i]->fk_product, $entrepot_id).'</td>';
 						print '</tr>';
 					}
 					// add a 0 qty lot row to be able to add a lot
 					print '<tr>';
 					// Qty to ship or shipped
-					print '<td><input class="qtyl" name="qtyl' . $line_id . '_0" id="qtyl' . $line_id . '_0" type="text" size="4" value="0"></td>';
+					print '<td><input class="qtyl" name="qtyl'.$line_id.'_0" id="qtyl'.$line_id.'_0" type="text" size="4" value="0"></td>';
 					// Batch number management
-					print '<td>' . $formproduct->selectLotStock('', 'batchl' . $line_id . '_0', '', 1, 0, $lines[$i]->fk_product) . '</td>';
+					print '<td>'.$formproduct->selectLotStock('', 'batchl'.$line_id.'_0', '', 1, 0, $lines[$i]->fk_product).'</td>';
 					print '</tr>';
 				} elseif (isModEnabled('stock')) {
 					if ($lines[$i]->fk_product > 0) {
@@ -2786,13 +2786,13 @@ 
 							print '<!-- case edit 2 -->';
 							print '<tr>';
 							// Qty to ship or shipped
-							print '<td><input class="qtyl right" name="qtyl' . $line_id . '" id="qtyl' . $line_id . '" type="text" size="4" value="' . $lines[$i]->qty_shipped . '">' . $unit_order . '</td>';
+							print '<td><input class="qtyl right" name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'">'.$unit_order.'</td>';
 							// Warehouse source
-							print '<td>' . $formproduct->selectWarehouses($lines[$i]->entrepot_id, 'entl' . $line_id, '', 1, 0, $lines[$i]->fk_product, '', 1, 0, array(), 'minwidth200') . '</td>';
+							print '<td>'.$formproduct->selectWarehouses($lines[$i]->entrepot_id, 'entl'.$line_id, '', 1, 0, $lines[$i]->fk_product, '', 1, 0, array(), 'minwidth200').'</td>';
 							// Batch number management
 							print '<td>';
 							if (isModEnabled('productbatch')) {
-								print ' - ' . $langs->trans("NA");
+								print ' - '.$langs->trans("NA");
 							}
 							print '</td>';
 							print '</tr>';
@@ -2801,13 +2801,13 @@ 
 							foreach ($lines[$i]->details_entrepot as $detail_entrepot) {
 								print '<tr>';
 								// Qty to ship or shipped
-								print '<td><input class="qtyl right" name="qtyl' . $detail_entrepot->line_id . '" id="qtyl' . $detail_entrepot->line_id . '" type="text" size="4" value="' . $detail_entrepot->qty_shipped . '">' . $unit_order . '</td>';
+								print '<td><input class="qtyl right" name="qtyl'.$detail_entrepot->line_id.'" id="qtyl'.$detail_entrepot->line_id.'" type="text" size="4" value="'.$detail_entrepot->qty_shipped.'">'.$unit_order.'</td>';
 								// Warehouse source
-								print '<td>' . $formproduct->selectWarehouses($detail_entrepot->entrepot_id, 'entl' . $detail_entrepot->line_id, '', 1, 0, $lines[$i]->fk_product, '', 1, 0, array(), 'minwidth200') . '</td>';
+								print '<td>'.$formproduct->selectWarehouses($detail_entrepot->entrepot_id, 'entl'.$detail_entrepot->line_id, '', 1, 0, $lines[$i]->fk_product, '', 1, 0, array(), 'minwidth200').'</td>';
 								// Batch number management
 								print '<td>';
 								if (isModEnabled('productbatch')) {
-									print ' - ' . $langs->trans("NA");
+									print ' - '.$langs->trans("NA");
 								}
 								print '</td>';
 								print '</tr>';
@@ -2816,19 +2816,19 @@ 
 							print '<!-- case edit 4 -->';
 							print '<tr>';
 							// Qty to ship or shipped
-							print '<td><input class="qtyl right" name="qtyl' . $line_id . '" id="qtyl' . $line_id . '" type="text" size="4" value="' . $lines[$i]->qty_shipped . '"></td>';
-							print '<td><span class="opacitymedium">(' . $langs->trans("Service") . ')</span></td>';
+							print '<td><input class="qtyl right" name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'"></td>';
+							print '<td><span class="opacitymedium">('.$langs->trans("Service").')</span></td>';
 							print '<td></td>';
 							print '</tr>';
 						} else {
 							print '<!-- case edit 5 -->';
-							print '<tr><td colspan="3">' . $langs->trans("ErrorStockIsNotEnough") . '</td></tr>';
+							print '<tr><td colspan="3">'.$langs->trans("ErrorStockIsNotEnough").'</td></tr>';
 						}
 					} else {
 						print '<!-- case edit 6 -->';
 						print '<tr>';
 						// Qty to ship or shipped
-						print '<td><input class="qtyl right" name="qtyl' . $line_id . '" id="qtyl' . $line_id . '" type="text" size="4" value="' . $lines[$i]->qty_shipped . '">' . $unit_order . '</td>';
+						print '<td><input class="qtyl right" name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'">'.$unit_order.'</td>';
 						// Warehouse source
 						print '<td></td>';
 						// Batch number management
@@ -2839,7 +2839,7 @@ 
 					print '<!-- case edit 7 -->';
 					print '<tr>';
 					// Qty to ship or shipped
-					print '<td><input class="qtyl right" name="qtyl' . $line_id . '" id="qtyl' . $line_id . '" type="text" size="4" value="' . $lines[$i]->qty_shipped . '"></td>';
+					print '<td><input class="qtyl right" name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'"></td>';
 					// Warehouse source
 					print '<td></td>';
 					// Batch number management
@@ -2850,13 +2850,13 @@ 
 				print '</table></td>';
 			} else {
 				// Qty to ship or shipped
-				print '<td class="linecolqtytoship center">' . $lines[$i]->qty_shipped . ' ' . $unit_order . '</td>';
+				print '<td class="linecolqtytoship center">'.$lines[$i]->qty_shipped.' '.$unit_order.'</td>';
 
 				// Warehouse source
 				if (isModEnabled('stock')) {
 					print '<td class="linecolwarehousesource tdoverflowmax200">';
 					if ($lines[$i]->product_type == Product::TYPE_SERVICE && getDolGlobalString('SHIPMENT_SUPPORTS_SERVICES')) {
-						print '<span class="opacitymedium">(' . $langs->trans("Service") . ')</span>';
+						print '<span class="opacitymedium">('.$langs->trans("Service").')</span>';
 					} elseif ($lines[$i]->entrepot_id > 0 && $lines[$i]->stockable_product == Product::ENABLED_STOCK) {
 						$warehouse_id = $lines[$i]->entrepot_id;
 						if (!isset($conf->cache['warehouse'][$warehouse_id])) {
@@ -2879,7 +2879,7 @@ 
 								} else {
 									$warehouse = $conf->cache['warehouse'][$warehouse_id];
 								}
-								$detail .= $langs->trans("DetailWarehouseFormat", $warehouse->label, $detail_entrepot->qty_shipped) . '<br>';
+								$detail .= $langs->trans("DetailWarehouseFormat", $warehouse->label, $detail_entrepot->qty_shipped).'<br>';
 							}
 						}
 						print $form->textwithtooltip(img_picto('', 'object_stock').' '.$langs->trans("DetailWarehouseNumber"), $detail);
@@ -2896,7 +2896,7 @@ 
 								} else {
 									$child_product = $conf->cache['product'][$child_product_id];
 								}
-								$child_product_label = $child_product->ref . ' ' . $child_product->label;
+								$child_product_label = $child_product->ref.' '.$child_product->label;
 
 								// get warehouse from cache
 								if (!isset($conf->cache['warehouse'][$warehouse_id])) {
@@ -2907,10 +2907,10 @@ 
 									$child_warehouse = $conf->cache['warehouse'][$warehouse_id];
 								}
 
-								$detail .= $langs->trans('DetailChildrenFormat', $child_product_label, $child_warehouse->label, price2num($total_qty, 'MS')) . '<br>';
+								$detail .= $langs->trans('DetailChildrenFormat', $child_product_label, $child_warehouse->label, price2num($total_qty, 'MS')).'<br>';
 							}
 						}
-						print $form->textwithtooltip(img_picto('', 'object_stock') . ' ' . $langs->trans('DetailWarehouseNumber'), $detail);
+						print $form->textwithtooltip(img_picto('', 'object_stock').' '.$langs->trans('DetailWarehouseNumber'), $detail);
 					}
 					print '</td>';
 				}
@@ -2923,17 +2923,17 @@ 
 						if ($lines[$i]->product_tobatch) {
 							$detail = '';
 							foreach ($lines[$i]->detail_batch as $dbatch) {	// $dbatch is instance of ExpeditionLineBatch
-								$detail .= $langs->trans("Batch") . ': ' . $dbatch->batch;
+								$detail .= $langs->trans("Batch").': '.$dbatch->batch;
 								if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
-									$detail .= ' - ' . $langs->trans("SellByDate") . ': ' . dol_print_date($dbatch->sellby, "day");
+									$detail .= ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby, "day");
 								}
 								if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
-									$detail .= ' - ' . $langs->trans("EatByDate") . ': ' . dol_print_date($dbatch->eatby, "day");
+									$detail .= ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby, "day");
 								}
-								$detail .= ' - ' . $langs->trans("Qty") . ': ' . $dbatch->qty;
+								$detail .= ' - '.$langs->trans("Qty").': '.$dbatch->qty;
 								$detail .= '<br>';
 							}
-							print $form->textwithtooltip(img_picto('', 'object_barcode') . ' ' . $langs->trans("DetailBatchNumber"), $detail);
+							print $form->textwithtooltip(img_picto('', 'object_barcode').' '.$langs->trans("DetailBatchNumber"), $detail);
 						} else {
 							print $langs->trans("NA");
 						}
@@ -2947,7 +2947,7 @@ 
 			// Weight
 			print '<td class="center linecolweight">';
 			if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) {
-				print $lines[$i]->weight * $lines[$i]->qty_shipped . ' ' . measuringUnitString(0, "weight", $lines[$i]->weight_units);
+				print $lines[$i]->weight * $lines[$i]->qty_shipped.' '.measuringUnitString(0, "weight", $lines[$i]->weight_units);
 			} else {
 				print '&nbsp;';
 			}
@@ -2956,7 +2956,7 @@ 
 			// Volume
 			print '<td class="center linecolvolume">';
 			if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) {
-				print $lines[$i]->volume * $lines[$i]->qty_shipped . ' ' . measuringUnitString(0, "volume", $lines[$i]->volume_units);
+				print $lines[$i]->volume * $lines[$i]->qty_shipped.' '.measuringUnitString(0, "volume", $lines[$i]->volume_units);
 			} else {
 				print '&nbsp;';
 			}
@@ -2967,11 +2967,11 @@ 
 
 			if ($action == 'editline' && $lines[$i]->id == $line_id) {
 				print '<td class="center" colspan="2" valign="middle">';
-				print '<input type="submit" class="button button-save" id="savelinebutton marginbottomonly" name="save" value="' . $langs->trans("Save") . '"><br>';
-				print '<input type="submit" class="button button-cancel" id="cancellinebutton" name="cancel" value="' . $langs->trans("Cancel") . '"><br>';
+				print '<input type="submit" class="button button-save" id="savelinebutton marginbottomonly" name="save" value="'.$langs->trans("Save").'"><br>';
+				print '<input type="submit" class="button button-cancel" id="cancellinebutton" name="cancel" value="'.$langs->trans("Cancel").'"><br>';
 				print '</td>';
 			} elseif ($object->status == Expedition::STATUS_DRAFT) {
-				$edit_url = $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=editline&token=' . newToken() . '&lineid=' . $lines[$i]->id;
+				$edit_url = $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=editline&token='.newToken().'&lineid='.$lines[$i]->id;
 				if (getDolGlobalInt('PRODUIT_SOUSPRODUITS')) {
 					$product_id = $lines[$i]->fk_product;
 					if (!isset($conf->cache['product'][$product_id])) {
@@ -2983,16 +2983,16 @@ 
 					}
 
 					if ($product->hasFatherOrChild(1)) {
-						$edit_url = dol_buildpath('/expedition/dispatch.php?id=' . $object->id, 1);
+						$edit_url = dol_buildpath('/expedition/dispatch.php?id='.$object->id, 1);
 					}
 				}
 
 				// edit-delete buttons
 				print '<td class="linecoledit center">';
-				print '<a class="editfielda reposition" href="' . $edit_url . '">' . img_edit() . '</a>';
+				print '<a class="editfielda reposition" href="'.$edit_url.'">'.img_edit().'</a>';
 				print '</td>';
 				print '<td class="linecoldelete" width="10">';
-				print '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=deleteline&token=' . newToken() . '&lineid=' . $lines[$i]->id . '">' . img_delete() . '</a>';
+				print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=deleteline&token='.newToken().'&lineid='.$lines[$i]->id.'">'.img_delete().'</a>';
 				print '</td>';
 
 				// Display lines extrafields
@@ -3041,7 +3041,7 @@ 
 	// TODO Show also lines ordered but not delivered
 
 	if (empty($num_prod)) {
-		print '<tr><td colspan="8"><span class="opacitymedium">' . $langs->trans("NoLineGoOnTabToAddSome", $langs->transnoentitiesnoconv("ShipmentDistribution")) . '</span></td></tr>';
+		print '<tr><td colspan="8"><span class="opacitymedium">'.$langs->trans("NoLineGoOnTabToAddSome", $langs->transnoentitiesnoconv("ShipmentDistribution")).'</span></td></tr>';
 	}
 
 	print "</table>\n";
@@ -3070,21 +3070,21 @@ 
 				if ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('expedition', 'creer'))
 					|| (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('expedition', 'shipping_advance', 'validate'))
 				) {
-					print dolGetButtonAction('', $langs->trans('Validate'), 'default', $_SERVER["PHP_SELF"] . '?action=valid&token=' . newToken() . '&id=' . $object->id, '');
+					print dolGetButtonAction('', $langs->trans('Validate'), 'default', $_SERVER["PHP_SELF"].'?action=valid&token='.newToken().'&id='.$object->id, '');
 				} else {
-					print dolGetButtonAction($langs->trans('NotAllowed'), $langs->trans('Validate'), 'default', $_SERVER['PHP_SELF'] . '#', '', false);
+					print dolGetButtonAction($langs->trans('NotAllowed'), $langs->trans('Validate'), 'default', $_SERVER['PHP_SELF'].'#', '', false);
 				}
 			}
 
 			// 0=draft, 1=validated/delivered, 2=closed/delivered
 			if ($object->status == Expedition::STATUS_VALIDATED && !getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT')) {
 				if ($user->hasRight('expedition', 'creer')) {
-					print dolGetButtonAction('', $langs->trans('SetToDraft'), 'default', $_SERVER["PHP_SELF"] . '?action=setdraft&token=' . newToken() . '&id=' . $object->id, '');
+					print dolGetButtonAction('', $langs->trans('SetToDraft'), 'default', $_SERVER["PHP_SELF"].'?action=setdraft&token='.newToken().'&id='.$object->id, '');
 				}
 			}
 			if ($object->status == Expedition::STATUS_CLOSED) {
 				if ($user->hasRight('expedition', 'creer')) {
-					print dolGetButtonAction('', $langs->trans('ReOpen'), 'default', $_SERVER["PHP_SELF"] . '?action=reopen&token=' . newToken() . '&id=' . $object->id, '');
+					print dolGetButtonAction('', $langs->trans('ReOpen'), 'default', $_SERVER["PHP_SELF"].'?action=reopen&token='.newToken().'&id='.$object->id, '');
 				}
 			}
 
@@ -3092,9 +3092,9 @@ 
 			if (empty($user->socid)) {
 				if ($object->status > 0) {
 					if (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || $user->hasRight('expedition', 'shipping_advance', 'send')) {
-						print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER["PHP_SELF"] . '?action=presend&token=' . newToken() . '&id=' . $object->id . '&mode=init#formmailbeforetitle', '');
+						print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER["PHP_SELF"].'?action=presend&token='.newToken().'&id='.$object->id.'&mode=init#formmailbeforetitle', '');
 					} else {
-						print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER['PHP_SELF'] . '#', '', false);
+						print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER['PHP_SELF'].'#', '', false);
 					}
 				}
 			}
@@ -3102,15 +3102,15 @@ 
 			// This is just to generate a delivery receipt when option to do this is on
 			//var_dump($object->linkedObjectsIds['delivery']);
 			if (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY') && ($object->status == Expedition::STATUS_VALIDATED || $object->status == Expedition::STATUS_CLOSED) && $user->hasRight('expedition', 'delivery', 'creer') && empty($object->linkedObjectsIds['delivery'])) {
-				print dolGetButtonAction('', $langs->trans('CreateDeliveryOrder'), 'default', $_SERVER["PHP_SELF"] . '?action=create_delivery&token=' . newToken() . '&id=' . $object->id, '');
+				print dolGetButtonAction('', $langs->trans('CreateDeliveryOrder'), 'default', $_SERVER["PHP_SELF"].'?action=create_delivery&token='.newToken().'&id='.$object->id, '');
 			}
 
 			// Sign (to set to status "Signed" without using the online signature page)
 			if ($object->status > Expedition::STATUS_DRAFT) {
 				if ($object->signed_status != Expedition::$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("SignShipping") . '</a></div>';
+					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=sign&token='.newToken().'">'.$langs->trans("SignShipping").'</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("UnsignShipping") . '</a></div>';
+					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=unsign&token='.newToken().'">'.$langs->trans("UnsignShipping").'</a></div>';
 				}
 			}
 
@@ -3118,7 +3118,7 @@ 
 			if (isModEnabled('invoice') && ($object->status == Expedition::STATUS_VALIDATED || $object->status == Expedition::STATUS_CLOSED)) {
 				if ($user->hasRight('facture', 'creer')) {
 					if (getDolGlobalString('WORKFLOW_BILL_ON_SHIPMENT') !== '0') {
-						print dolGetButtonAction('', $langs->trans('CreateBill'), 'default', DOL_URL_ROOT . '/compta/facture/card.php?action=create&origin=' . $object->element . '&originid=' . $object->id . '&socid=' . $object->socid, '');
+						print dolGetButtonAction('', $langs->trans('CreateBill'), 'default', DOL_URL_ROOT.'/compta/facture/card.php?action=create&origin='.$object->element.'&originid='.$object->id.'&socid='.$object->socid, '');
 					}
 				}
 			}
@@ -3127,22 +3127,22 @@ 
 			if ($object->status == Expedition::STATUS_VALIDATED) {
 				if ($user->hasRight('expedition', 'creer') && $object->status > 0) {
 					if (!$object->billed && getDolGlobalString('WORKFLOW_BILL_ON_SHIPMENT') !== '0') {
-						print dolGetButtonAction('', $langs->trans('ClassifyBilled'), 'default', $_SERVER["PHP_SELF"] . '?action=classifybilled&token=' . newToken() . '&id=' . $object->id, '');
+						print dolGetButtonAction('', $langs->trans('ClassifyBilled'), 'default', $_SERVER["PHP_SELF"].'?action=classifybilled&token='.newToken().'&id='.$object->id, '');
 					}
-					print dolGetButtonAction('', $langs->trans("Close"), 'default', $_SERVER["PHP_SELF"] . '?action=classifyclosed&token=' . newToken() . '&id=' . $object->id, '');
+					print dolGetButtonAction('', $langs->trans("Close"), 'default', $_SERVER["PHP_SELF"].'?action=classifyclosed&token='.newToken().'&id='.$object->id, '');
 				}
 			}
 
 			// Cancel
 			if ($object->status == Expedition::STATUS_VALIDATED) {
 				if ($user->hasRight('expedition', 'creer')) {
-					print dolGetButtonAction('', $langs->trans('Cancel'), 'danger', $_SERVER["PHP_SELF"] . '?action=cancel&token=' . newToken() . '&id=' . $object->id . '&mode=init#formmailbeforetitle', '');
+					print dolGetButtonAction('', $langs->trans('Cancel'), 'danger', $_SERVER["PHP_SELF"].'?action=cancel&token='.newToken().'&id='.$object->id.'&mode=init#formmailbeforetitle', '');
 				}
 			}
 
 			// Delete
 			if ($user->hasRight('expedition', 'supprimer')) {
-				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, '');
 			}
 		}
 
@@ -3158,9 +3158,9 @@ 
 		print '<div class="fichecenter"><div class="fichehalfleft">';
 
 		$objectref = dol_sanitizeFileName($object->ref);
-		$filedir = $conf->expedition->dir_output . "/sending/" . $objectref;
+		$filedir = $conf->expedition->dir_output."/sending/".$objectref;
 
-		$urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
+		$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
 
 		$genallowed = $user->hasRight('expedition', 'lire');
 		$delallowed = $user->hasRight('expedition', 'creer');
@@ -3181,8 +3181,8 @@ 
 
 		if ($object->status != Expedition::STATUS_DRAFT && $useonlinesignature) {
 			print '<br><!-- Link to sign -->';
-			require_once DOL_DOCUMENT_ROOT . '/core/lib/signature.lib.php';
-			print showOnlineSignatureUrl('expedition', $object->ref, $object) . '<br>';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/signature.lib.php';
+			print showOnlineSignatureUrl('expedition', $object->ref, $object).'<br>';
 		}
 
 		print '</div><div class="fichehalfright">';
@@ -3190,13 +3190,13 @@ 
 
 
 		// 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);
 
 		//button to go to messaging from the events box
 		$MAXEVENT = 10;
-		$morehtmlcenter = dolGetButtonTitle($langs->trans('FullConversation'), '', 'fa fa-comments imgforviewmode', DOL_URL_ROOT . '/expedition/messaging.php?id=' . $object->id);
-		$morehtmlcenter .= dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT . '/expedition/agenda.php?id=' . $object->id);
+		$morehtmlcenter = dolGetButtonTitle($langs->trans('FullConversation'), '', 'fa fa-comments imgforviewmode', DOL_URL_ROOT.'/expedition/messaging.php?id='.$object->id);
+		$morehtmlcenter .= dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT.'/expedition/agenda.php?id='.$object->id);
 
 		$somethingshown = $formactions->showactions($object, 'shipping', $socid, 1, '', $MAXEVENT, '', $morehtmlcenter);
 
@@ -3216,10 +3216,10 @@ 
 	// Presend form
 	$modelmail = 'shipping_send';
 	$defaulttopic = 'SendShippingRef';
-	$diroutput = $conf->expedition->dir_output . '/sending';
-	$trackid = 'shi' . $object->id;
+	$diroutput = $conf->expedition->dir_output.'/sending';
+	$trackid = 'shi'.$object->id;
 
-	include DOL_DOCUMENT_ROOT . '/core/tpl/card_presend.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
 }
 
 // End of page