Dolibarr / dolibarr

htdocs/categories/photos.php

Spacing +2 added lines, -2 removed lines

@@ -69,7 +69,7 @@ 
 
 $type = $object->type;
 if (is_numeric($type)) {
-	$type = array_search($type, $object->MAP_ID);	// For backward compatibility
+	$type = array_search($type, $object->MAP_ID); // For backward compatibility
 }
 
 $upload_dir = $conf->categorie->multidir_output[$object->entity ?? $conf->entity];
@@ -84,7 +84,7 @@ 
  * Actions
  */
 
-$parameters = array('id' => $id,  'label' => $label, 'confirm' => $confirm, 'type' => $type, 'uploaddir' => $upload_dir, 'sendfile' => (GETPOST("sendit") ? true : false));
+$parameters = array('id' => $id, 'label' => $label, 'confirm' => $confirm, 'type' => $type, 'uploaddir' => $upload_dir, 'sendfile' => (GETPOST("sendit") ? true : false));
 // Note that $action and $object may be modified by some hooks
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
 if ($reshook < 0) {

htdocs/core/ajax/onlineSign.php

Spacing +109 added lines, -109 removed lines

@@ -49,12 +49,12 @@ 
 if (!defined('NOBROWSERNOTIF')) {
 	define('NOBROWSERNOTIF', '1');
 }
-$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));	// Keep $_GET and $_POST here. GETPOST not yet defined.
+$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1)); // Keep $_GET and $_POST here. GETPOST not yet defined.
 if (is_numeric($entity)) {
 	define("DOLENTITY", $entity);
 }
 include '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 /**
  * @var Conf $conf
  * @var DoliDB $db
@@ -67,7 +67,7 @@ 
 
 $signature = GETPOST('signaturebase64');
 $ref = GETPOST('ref', 'aZ09');
-$mode = GETPOST('mode', 'aZ09');    // 'proposal', ...
+$mode = GETPOST('mode', 'aZ09'); // 'proposal', ...
 $SECUREKEY = GETPOST("securekey"); // Secure key
 $online_sign_name = GETPOST("onlinesignname");
 
@@ -88,8 +88,8 @@ 
 	$securekeyseed = getDolGlobalString(strtoupper($type).'_ONLINE_SIGNATURE_SECURITY_TOKEN');
 }
 
-if (empty($SECUREKEY) || !dol_verifyHash($securekeyseed . $type . $ref . (!isModEnabled('multicompany') ? '' : $entity), $SECUREKEY, '0')) {
-	httponly_accessforbidden('Bad value for securitykey. Value provided ' . dol_escape_htmltag($SECUREKEY) . ' does not match expected value for ref=' . dol_escape_htmltag($ref), 403);
+if (empty($SECUREKEY) || !dol_verifyHash($securekeyseed.$type.$ref.(!isModEnabled('multicompany') ? '' : $entity), $SECUREKEY, '0')) {
+	httponly_accessforbidden('Bad value for securitykey. Value provided '.dol_escape_htmltag($SECUREKEY).' does not match expected value for ref='.dol_escape_htmltag($ref), 403);
 }
 
 // Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
@@ -116,29 +116,29 @@ 
 		$data = base64_decode($signature);
 
 		if ($mode == "propale" || $mode == 'proposal') {
-			require_once DOL_DOCUMENT_ROOT . '/comm/propal/class/propal.class.php';
-			require_once DOL_DOCUMENT_ROOT . '/core/lib/pdf.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 			$object = new Propal($db);
 			$object->fetch(0, $ref);
 
 			$upload_dir = !empty($conf->propal->multidir_output[$object->entity ?? $conf->entity]) ? $conf->propal->multidir_output[$object->entity ?? $conf->entity] : $conf->propal->dir_output;
-			$upload_dir .= '/' . dol_sanitizeFileName($object->ref) . '/';
+			$upload_dir .= '/'.dol_sanitizeFileName($object->ref).'/';
 
-			$default_font_size = pdf_getPDFFontSize($langs);    // Must be after pdf_getInstance
-			$default_font = pdf_getPDFFont($langs);    // Must be after pdf_getInstance
+			$default_font_size = pdf_getPDFFontSize($langs); // Must be after pdf_getInstance
+			$default_font = pdf_getPDFFont($langs); // Must be after pdf_getInstance
 			$langs->loadLangs(array("main", "companies"));
 
 			$date = dol_print_date(dol_now(), "%Y%m%d%H%M%S");
-			$filename = "signatures/" . $date . "_signature.png";
-			if (!is_dir($upload_dir . "signatures/")) {
-				if (!dol_mkdir($upload_dir . "signatures/")) {
-					$response = "Error mkdir. Failed to create dir " . $upload_dir . "signatures/";
+			$filename = "signatures/".$date."_signature.png";
+			if (!is_dir($upload_dir."signatures/")) {
+				if (!dol_mkdir($upload_dir."signatures/")) {
+					$response = "Error mkdir. Failed to create dir ".$upload_dir."signatures/";
 					$error++;
 				}
 			}
 
 			if (!$error) {
-				$return = file_put_contents($upload_dir . $filename, $data);
+				$return = file_put_contents($upload_dir.$filename, $data);
 				if ($return == false) {
 					$error++;
 					$response = 'Error file_put_content: failed to create signature file.';
@@ -148,14 +148,14 @@ 
 			if (!$error) {
 				// Defined modele of doc
 				$last_main_doc_file = $object->last_main_doc;
-				$directdownloadlink = $object->getLastMainDocLink('proposal');    // url to download the $object->last_main_doc
+				$directdownloadlink = $object->getLastMainDocLink('proposal'); // url to download the $object->last_main_doc
 
 				if (preg_match('/\.pdf/i', $last_main_doc_file)) {
 					$ref_pdf = pathinfo($last_main_doc_file, PATHINFO_FILENAME); // Retrieves the name of external or internal PDF
 					$ref_pdf = preg_replace('/_signed-(\d+)/', '', $ref_pdf);
 
-					$newpdffilename = $upload_dir . $ref_pdf . "_signed-" . $date . ".pdf";
-					$sourcefile = $upload_dir . $ref_pdf . ".pdf";
+					$newpdffilename = $upload_dir.$ref_pdf."_signed-".$date.".pdf";
+					$sourcefile = $upload_dir.$ref_pdf.".pdf";
 
 					if (dol_is_file($sourcefile)) {
 						$parameters = array('sourcefile' => $sourcefile, 'newpdffilename' => $newpdffilename);
@@ -178,15 +178,15 @@ 
 							}
 
 							//$pdf->Open();
-							$pagecount = $pdf->setSourceFile($sourcefile);        // original PDF
+							$pagecount = $pdf->setSourceFile($sourcefile); // original PDF
 
 							$param = array();
 							$param['online_sign_name'] = $online_sign_name;
-							$param['pathtoimage'] = $upload_dir . $filename;
+							$param['pathtoimage'] = $upload_dir.$filename;
 
 							$propalsignonspecificpage = getDolGlobalInt("PROPAL_SIGNATURE_ON_SPECIFIC_PAGE");
 
-							$s = array();    // Array with size of each page. Example array(w'=>210, 'h'=>297);
+							$s = array(); // Array with size of each page. Example array(w'=>210, 'h'=>297);
 							for ($i = 1; $i < ($pagecount + 1); $i++) {
 								try {
 									$tppl = $pdf->importPage($i);
@@ -230,7 +230,7 @@ 
 										dolPrintSignatureImage($pdf, $langs, $param);
 									}
 								} catch (Exception $e) {
-									dol_syslog("Error when manipulating the PDF " . $sourcefile . " by onlineSign: " . $e->getMessage(), LOG_ERR);
+									dol_syslog("Error when manipulating the PDF ".$sourcefile." by onlineSign: ".$e->getMessage(), LOG_ERR);
 									$response = $e->getMessage();
 									$error++;
 								}
@@ -279,14 +279,14 @@ 
 
 				$online_sign_ip = getUserRemoteIP();
 
-				$sql = "UPDATE " . MAIN_DB_PREFIX . "propal";
-				$sql .= " SET fk_statut = " . ((int) $object::STATUS_SIGNED) . ", note_private = '" . $db->escape($object->note_private) . "',";
-				$sql .= " date_signature = '" . $db->idate(dol_now()) . "',";
-				$sql .= " online_sign_ip = '" . $db->escape($online_sign_ip) . "'";
+				$sql = "UPDATE ".MAIN_DB_PREFIX."propal";
+				$sql .= " SET fk_statut = ".((int) $object::STATUS_SIGNED).", note_private = '".$db->escape($object->note_private)."',";
+				$sql .= " date_signature = '".$db->idate(dol_now())."',";
+				$sql .= " online_sign_ip = '".$db->escape($online_sign_ip)."'";
 				if ($online_sign_name) {
-					$sql .= ", online_sign_name = '" . $db->escape($online_sign_name) . "'";
+					$sql .= ", online_sign_name = '".$db->escape($online_sign_name)."'";
 				}
-				$sql .= " WHERE rowid = " . ((int) $object->id);
+				$sql .= " WHERE rowid = ".((int) $object->id);
 
 				dol_syslog(__FILE__, LOG_DEBUG);
 				$resql = $db->query($sql);
@@ -305,7 +305,7 @@ 
 						$result = $object->call_trigger('PROPAL_CLOSE_SIGNED', $user);
 						if ($result < 0) {
 							$error++;
-							$response = "error in trigger " . $object->error;
+							$response = "error in trigger ".$object->error;
 						} else {
 							$soc = new Societe($db);
 							$soc->id = $object->socid;
@@ -334,25 +334,25 @@ 
 				}
 			}
 		} elseif ($mode == 'contract') {
-			require_once DOL_DOCUMENT_ROOT . '/contrat/class/contrat.class.php';
-			require_once DOL_DOCUMENT_ROOT . '/core/lib/pdf.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 			$object = new Contrat($db);
 			$object->fetch(0, $ref);
 
 			$upload_dir = !empty($conf->contrat->multidir_output[$object->entity ?? $conf->entity]) ? $conf->contrat->multidir_output[$object->entity ?? $conf->entity] : $conf->contrat->dir_output;
-			$upload_dir .= '/' . dol_sanitizeFileName($object->ref) . '/';
+			$upload_dir .= '/'.dol_sanitizeFileName($object->ref).'/';
 
 			$date = dol_print_date(dol_now(), "%Y%m%d%H%M%S");
-			$filename = "signatures/" . $date . "_signature.png";
-			if (!is_dir($upload_dir . "signatures/")) {
-				if (!dol_mkdir($upload_dir . "signatures/")) {
-					$response = "Error mkdir. Failed to create dir " . $upload_dir . "signatures/";
+			$filename = "signatures/".$date."_signature.png";
+			if (!is_dir($upload_dir."signatures/")) {
+				if (!dol_mkdir($upload_dir."signatures/")) {
+					$response = "Error mkdir. Failed to create dir ".$upload_dir."signatures/";
 					$error++;
 				}
 			}
 
 			if (!$error) {
-				$return = file_put_contents($upload_dir . $filename, $data);
+				$return = file_put_contents($upload_dir.$filename, $data);
 				if ($return == false) {
 					$error++;
 					$response = 'Error file_put_content: failed to create signature file.';
@@ -362,13 +362,13 @@ 
 			if (!$error) {
 				// Defined modele of doc
 				$last_main_doc_file = $object->last_main_doc;
-				$directdownloadlink = $object->getLastMainDocLink('contrat');    // url to download the $object->last_main_doc
+				$directdownloadlink = $object->getLastMainDocLink('contrat'); // url to download the $object->last_main_doc
 
 				if (preg_match('/\.pdf/i', $last_main_doc_file)) {
 					$ref_pdf = pathinfo($last_main_doc_file, PATHINFO_FILENAME); // Retrieves the name of external or internal PDF
 
-					$newpdffilename = $upload_dir . $ref_pdf . "_signed-" . $date . ".pdf";
-					$sourcefile = $upload_dir . $ref_pdf . ".pdf";
+					$newpdffilename = $upload_dir.$ref_pdf."_signed-".$date.".pdf";
+					$sourcefile = $upload_dir.$ref_pdf.".pdf";
 
 					if (dol_is_file($sourcefile)) {
 						$parameters = array('sourcefile' => $sourcefile, 'newpdffilename' => $newpdffilename);
@@ -391,13 +391,13 @@ 
 							}
 
 							//$pdf->Open();
-							$pagecount = $pdf->setSourceFile($sourcefile);        // original PDF
+							$pagecount = $pdf->setSourceFile($sourcefile); // original PDF
 
 							$param = array();
 							$param['online_sign_name'] = $online_sign_name;
-							$param['pathtoimage'] = $upload_dir . $filename;
+							$param['pathtoimage'] = $upload_dir.$filename;
 
-							$s = array();    // Array with size of each page. Example array(w'=>210, 'h'=>297);
+							$s = array(); // Array with size of each page. Example array(w'=>210, 'h'=>297);
 							for ($i = 1; $i < ($pagecount + 1); $i++) {
 								try {
 									$tppl = $pdf->importPage($i);
@@ -428,7 +428,7 @@ 
 										dolPrintSignatureImage($pdf, $langs, $param);
 									}
 								} catch (Exception $e) {
-									dol_syslog("Error when manipulating some PDF by onlineSign: " . $e->getMessage(), LOG_ERR);
+									dol_syslog("Error when manipulating some PDF by onlineSign: ".$e->getMessage(), LOG_ERR);
 									$response = $e->getMessage();
 									$error++;
 								}
@@ -466,8 +466,8 @@ 
 				$object->setSignedStatus($user, Contrat::$SIGNED_STATUSES['STATUS_SIGNED_RECEIVER_ONLINE'], 0, 'CONTRACT_MODIFY');
 			}
 		} elseif ($mode == 'fichinter') {
-			require_once DOL_DOCUMENT_ROOT . '/fichinter/class/fichinter.class.php';
-			require_once DOL_DOCUMENT_ROOT . '/core/lib/pdf.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 			$object = new Fichinter($db);
 			$object->fetch(0, $ref);
 
@@ -476,20 +476,20 @@ 
 
 			$langs->loadLangs(array("main", "companies"));
 
-			$default_font_size = pdf_getPDFFontSize($langs);	// Must be after pdf_getInstance
-			$default_font = pdf_getPDFFont($langs);	// Must be
+			$default_font_size = pdf_getPDFFontSize($langs); // Must be after pdf_getInstance
+			$default_font = pdf_getPDFFont($langs); // Must be
 
 			$date = dol_print_date(dol_now(), "%Y%m%d%H%M%S");
-			$filename = "signatures/" . $date . "_signature.png";
-			if (!is_dir($upload_dir . "signatures/")) {
-				if (!dol_mkdir($upload_dir . "signatures/")) {
-					$response = "Error mkdir. Failed to create dir " . $upload_dir . "signatures/";
+			$filename = "signatures/".$date."_signature.png";
+			if (!is_dir($upload_dir."signatures/")) {
+				if (!dol_mkdir($upload_dir."signatures/")) {
+					$response = "Error mkdir. Failed to create dir ".$upload_dir."signatures/";
 					$error++;
 				}
 			}
 
 			if (!$error) {
-				$return = file_put_contents($upload_dir . $filename, $data);
+				$return = file_put_contents($upload_dir.$filename, $data);
 				if ($return == false) {
 					$error++;
 					$response = 'Error file_put_content: failed to create signature file.';
@@ -499,13 +499,13 @@ 
 			if (!$error) {
 				// Defined modele of doc
 				$last_main_doc_file = $object->last_main_doc;
-				$directdownloadlink = $object->getLastMainDocLink('fichinter');    // url to download the $object->last_main_doc
+				$directdownloadlink = $object->getLastMainDocLink('fichinter'); // url to download the $object->last_main_doc
 
 				if (preg_match('/\.pdf/i', $last_main_doc_file)) {
 					$ref_pdf = pathinfo($last_main_doc_file, PATHINFO_FILENAME); // Retrieves the name of external or internal PDF
 
-					$newpdffilename = $upload_dir . $ref_pdf . "_signed-" . $date . ".pdf";
-					$sourcefile = $upload_dir . $ref_pdf . ".pdf";
+					$newpdffilename = $upload_dir.$ref_pdf."_signed-".$date.".pdf";
+					$sourcefile = $upload_dir.$ref_pdf.".pdf";
 
 					if (dol_is_file($sourcefile)) {
 						$parameters = array('sourcefile' => $sourcefile, 'newpdffilename' => $newpdffilename);
@@ -528,13 +528,13 @@ 
 							}
 
 							//$pdf->Open();
-							$pagecount = $pdf->setSourceFile($sourcefile);        // original PDF
+							$pagecount = $pdf->setSourceFile($sourcefile); // original PDF
 
 							$param = array();
 							$param['online_sign_name'] = $online_sign_name;
-							$param['pathtoimage'] = $upload_dir . $filename;
+							$param['pathtoimage'] = $upload_dir.$filename;
 
-							$s = array();    // Array with size of each page. Example array(w'=>210, 'h'=>297);
+							$s = array(); // Array with size of each page. Example array(w'=>210, 'h'=>297);
 							for ($i = 1; $i < ($pagecount + 1); $i++) {
 								try {
 									$tppl = $pdf->importPage($i);
@@ -565,7 +565,7 @@ 
 										dolPrintSignatureImage($pdf, $langs, $param);
 									}
 								} catch (Exception $e) {
-									dol_syslog("Error when manipulating some PDF by onlineSign: " . $e->getMessage(), LOG_ERR);
+									dol_syslog("Error when manipulating some PDF by onlineSign: ".$e->getMessage(), LOG_ERR);
 									$response = $e->getMessage();
 									$error++;
 								}
@@ -604,39 +604,39 @@ 
 			}
 		} elseif ($mode == "societe_rib") {
 			$langs->load('withdrawals');
-			require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php';
-			require_once DOL_DOCUMENT_ROOT . '/core/lib/pdf.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 			$modelpath = "core/modules/bank/doc/";
 			$object = new CompanyBankAccount($db);
 			$object->fetch(0, $ref);
 			if (!empty($object->id)) {
 				$object->fetch_thirdparty();
 
-				$upload_dir = $conf->societe->multidir_output[$object->thirdparty->entity] . '/' . dol_sanitizeFileName((string) $object->thirdparty->id) . '/';
+				$upload_dir = $conf->societe->multidir_output[$object->thirdparty->entity].'/'.dol_sanitizeFileName((string) $object->thirdparty->id).'/';
 
-				$default_font_size = pdf_getPDFFontSize($langs);    // Must be after pdf_getInstance
-				$default_font = pdf_getPDFFont($langs);    // Must be after pdf_getInstance
+				$default_font_size = pdf_getPDFFontSize($langs); // Must be after pdf_getInstance
+				$default_font = pdf_getPDFFont($langs); // Must be after pdf_getInstance
 				$langs->loadLangs(array("main", "companies"));
 
 				$date = dol_print_date(dol_now(), "%Y%m%d%H%M%S");
-				$filename = "signatures/" . $date . "_signature.png";
-				if (!dol_is_dir($upload_dir . "signatures/")) {
-					if (!dol_mkdir($upload_dir . "signatures/")) {
-						$response = "Error mkdir. Failed to create dir " . $upload_dir . "signatures/";
+				$filename = "signatures/".$date."_signature.png";
+				if (!dol_is_dir($upload_dir."signatures/")) {
+					if (!dol_mkdir($upload_dir."signatures/")) {
+						$response = "Error mkdir. Failed to create dir ".$upload_dir."signatures/";
 						$error++;
 					}
 				}
-				if (!dol_is_writable($upload_dir . "signatures/")) {
-					$response = "Error directory " . $upload_dir . "signatures/ is not writable";
+				if (!dol_is_writable($upload_dir."signatures/")) {
+					$response = "Error directory ".$upload_dir."signatures/ is not writable";
 					$error++;
 				}
 				if (!dol_is_writable(DOL_DATA_ROOT.'/admin/temp/')) {	// This is used by TCPDF as working directory
-					$response = "Error directory " . DOL_DATA_ROOT."/admin/temp/ is not writable";
+					$response = "Error directory ".DOL_DATA_ROOT."/admin/temp/ is not writable";
 					$error++;
 				}
 
 				if (!$error) {
-					$return = file_put_contents($upload_dir . $filename, $data);
+					$return = file_put_contents($upload_dir.$filename, $data);
 					if ($return == false) {
 						$error++;
 						$response = 'Error file_put_content: failed to create signature file.';
@@ -647,14 +647,14 @@ 
 					// Defined modele of doc
 					$last_main_doc_file = $object->last_main_doc;
 					$last_modelpdf = $object->model_pdf;
-					$directdownloadlink = $object->getLastMainDocLink('company');    // url to download the $object->last_main_doc
+					$directdownloadlink = $object->getLastMainDocLink('company'); // url to download the $object->last_main_doc
 
 					if (preg_match('/\.pdf/i', $last_main_doc_file)) {
 						$sourcefile = '';
 						$newpdffilename = '';
 						if ($last_modelpdf == 'sepamandate') {
-							$newpdffilename = $upload_dir . $langs->transnoentitiesnoconv("SepaMandateShort") . ' ' . dol_sanitizeFileName($object->ref) . "-" . dol_sanitizeFileName($object->rum) . "_signed-" . $date . ".pdf";
-							$sourcefile = $upload_dir . $langs->transnoentitiesnoconv("SepaMandateShort") . ' ' . dol_sanitizeFileName($object->ref) . "-" . dol_sanitizeFileName($object->rum) . ".pdf";
+							$newpdffilename = $upload_dir.$langs->transnoentitiesnoconv("SepaMandateShort").' '.dol_sanitizeFileName($object->ref)."-".dol_sanitizeFileName($object->rum)."_signed-".$date.".pdf";
+							$sourcefile = $upload_dir.$langs->transnoentitiesnoconv("SepaMandateShort").' '.dol_sanitizeFileName($object->ref)."-".dol_sanitizeFileName($object->rum).".pdf";
 						}
 						if (dol_is_file($sourcefile)) {
 							$parameters = array('sourcefile' => $sourcefile, 'newpdffilename' => $newpdffilename);
@@ -677,9 +677,9 @@ 
 								}
 
 								//$pdf->Open();
-								$pagecount = $pdf->setSourceFile($sourcefile);        // original PDF
+								$pagecount = $pdf->setSourceFile($sourcefile); // original PDF
 
-								$s = array();    // Array with size of each page. Example array(w'=>210, 'h'=>297);
+								$s = array(); // Array with size of each page. Example array(w'=>210, 'h'=>297);
 								for ($i = 1; $i < ($pagecount + 1); $i++) {
 									try {
 										$tppl = $pdf->importPage($i);
@@ -687,7 +687,7 @@ 
 										$pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
 										$pdf->useTemplate($tppl);
 									} catch (Exception $e) {
-										dol_syslog("Error when manipulating the PDF " . $sourcefile . " by onlineSign: " . $e->getMessage(), LOG_ERR);
+										dol_syslog("Error when manipulating the PDF ".$sourcefile." by onlineSign: ".$e->getMessage(), LOG_ERR);
 										$response = $e->getMessage();
 										$error++;
 									}
@@ -703,18 +703,18 @@ 
 									$dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);
 								}
 								foreach ($dirmodels as $reldir) {
-									$file = "pdf_" . $last_modelpdf . ".modules.php";
+									$file = "pdf_".$last_modelpdf.".modules.php";
 									// On vérifie l'emplacement du modele
-									$file = dol_buildpath($reldir . $modelpath . $file, 0);
+									$file = dol_buildpath($reldir.$modelpath.$file, 0);
 									if (file_exists($file)) {
 										$filefound = $file;
-										$classname = 'pdf_' . $last_modelpdf;
+										$classname = 'pdf_'.$last_modelpdf;
 										break;
 									}
 								}
 
 								if ($filefound === '') {
-									$response = $langs->trans("Error") . ' Failed to load doc generator with modelpaths=' . $modelpath . ' - modele=' . $last_modelpdf;
+									$response = $langs->trans("Error").' Failed to load doc generator with modelpaths='.$modelpath.' - modele='.$last_modelpdf;
 									dol_syslog($response, LOG_ERR);
 									$error++;
 								}
@@ -738,7 +738,7 @@ 
 
 									$param = array();
 									$param['online_sign_name'] = $online_sign_name;
-									$param['pathtoimage'] = $upload_dir . $filename;
+									$param['pathtoimage'] = $upload_dir.$filename;
 
 									// A signature image file is 720 x 180 (ratio 1/4) but we use only the size into PDF
 									// TODO Get position of box from PDF template
@@ -774,16 +774,16 @@ 
 
 				$online_sign_ip = getUserRemoteIP();
 
-				$sql = "UPDATE " . MAIN_DB_PREFIX . $object->table_element;
+				$sql = "UPDATE ".MAIN_DB_PREFIX.$object->table_element;
 				$sql .= " SET ";
-				$sql .= " date_signature = '" . $db->idate(dol_now()) . "',";
-				$sql .= " online_sign_ip = '" . $db->escape($online_sign_ip) . "'";
+				$sql .= " date_signature = '".$db->idate(dol_now())."',";
+				$sql .= " online_sign_ip = '".$db->escape($online_sign_ip)."'";
 				if ($online_sign_name) {
-					$sql .= ", online_sign_name = '" . $db->escape($online_sign_name) . "'";
+					$sql .= ", online_sign_name = '".$db->escape($online_sign_name)."'";
 				}
 				//$sql .= ", last_main_doc = '" . $db->escape($object->element'..') . "'";
 
-				$sql .= " WHERE rowid = " . ((int) $object->id);
+				$sql .= " WHERE rowid = ".((int) $object->id);
 
 				dol_syslog(__FILE__, LOG_DEBUG);
 				$resql = $db->query($sql);
@@ -809,8 +809,8 @@ 
 				}
 			}
 		} elseif ($mode == 'expedition') {
-			require_once DOL_DOCUMENT_ROOT . '/expedition/class/expedition.class.php';
-			require_once DOL_DOCUMENT_ROOT . '/core/lib/pdf.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 
 			$object = new Expedition($db);
 			$object->fetch(0, $ref);
@@ -820,20 +820,20 @@ 
 
 			$langs->loadLangs(array("main", "companies"));
 
-			$default_font_size = pdf_getPDFFontSize($langs);	// Must be after pdf_getInstance
-			$default_font = pdf_getPDFFont($langs);	// Must be
+			$default_font_size = pdf_getPDFFontSize($langs); // Must be after pdf_getInstance
+			$default_font = pdf_getPDFFont($langs); // Must be
 
 			$date = dol_print_date(dol_now(), "%Y%m%d%H%M%S");
-			$filename = "signatures/" . $date . "_signature.png";
-			if (!is_dir($upload_dir . "signatures/")) {
-				if (!dol_mkdir($upload_dir . "signatures/")) {
-					$response = "Error mkdir. Failed to create dir " . $upload_dir . "signatures/";
+			$filename = "signatures/".$date."_signature.png";
+			if (!is_dir($upload_dir."signatures/")) {
+				if (!dol_mkdir($upload_dir."signatures/")) {
+					$response = "Error mkdir. Failed to create dir ".$upload_dir."signatures/";
 					$error++;
 				}
 			}
 
 			if (!$error) {
-				$return = file_put_contents($upload_dir . $filename, $data);
+				$return = file_put_contents($upload_dir.$filename, $data);
 				if ($return == false) {
 					$error++;
 					$response = 'Error file_put_content: failed to create signature file.';
@@ -846,17 +846,17 @@ 
 				if (empty($last_main_doc_file) || !dol_is_file(DOL_DATA_ROOT.'/'.$object->last_main_doc)) {
 					// It seems document has never been generated, or was generated and then deleted.
 					// So we try to regenerate it with its default template.
-					$defaulttemplate = '';		// We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used.
+					$defaulttemplate = ''; // We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used.
 					$object->generateDocument($defaulttemplate, $langs);
 				}
 				$last_main_doc_file = $object->last_main_doc;
-				$directdownloadlink = $object->getLastMainDocLink('expedition');    // url to download the $object->last_main_doc
+				$directdownloadlink = $object->getLastMainDocLink('expedition'); // url to download the $object->last_main_doc
 
 				if (preg_match('/\.pdf/i', $last_main_doc_file)) {
 					$ref_pdf = pathinfo($last_main_doc_file, PATHINFO_FILENAME); // Retrieves the name of external or internal PDF
 
-					$newpdffilename = $upload_dir . $ref_pdf . "_signed-" . $date . ".pdf";
-					$sourcefile = $upload_dir . $ref_pdf . ".pdf";
+					$newpdffilename = $upload_dir.$ref_pdf."_signed-".$date.".pdf";
+					$sourcefile = $upload_dir.$ref_pdf.".pdf";
 
 					if (dol_is_file($sourcefile)) {
 						$parameters = array('sourcefile' => $sourcefile, 'newpdffilename' => $newpdffilename);
@@ -879,13 +879,13 @@ 
 							}
 
 							//$pdf->Open();
-							$pagecount = $pdf->setSourceFile($sourcefile);        // original PDF
+							$pagecount = $pdf->setSourceFile($sourcefile); // original PDF
 
 							$param = array();
 							$param['online_sign_name'] = $online_sign_name;
-							$param['pathtoimage'] = $upload_dir . $filename;
+							$param['pathtoimage'] = $upload_dir.$filename;
 
-							$s = array();    // Array with size of each page. Example array(w'=>210, 'h'=>297);
+							$s = array(); // Array with size of each page. Example array(w'=>210, 'h'=>297);
 							for ($i = 1; $i < ($pagecount + 1); $i++) {
 								try {
 									$tppl = $pdf->importPage($i);
@@ -904,7 +904,7 @@ 
 										dolPrintSignatureImage($pdf, $langs, $param);
 									}
 								} catch (Exception $e) {
-									dol_syslog("Error when manipulating some PDF by onlineSign: " . $e->getMessage(), LOG_ERR);
+									dol_syslog("Error when manipulating some PDF by onlineSign: ".$e->getMessage(), LOG_ERR);
 									$response = $e->getMessage();
 									$error++;
 								}
@@ -965,8 +965,8 @@ 
  */
 function dolPrintSignatureImage(TCPDF $pdf, $langs, $params)
 {
-	$default_font_size = pdf_getPDFFontSize($langs);	// Must be after pdf_getInstance
-	$default_font = pdf_getPDFFont($langs);	// Must be
+	$default_font_size = pdf_getPDFFontSize($langs); // Must be after pdf_getInstance
+	$default_font = pdf_getPDFFont($langs); // Must be
 	$xforimgstart = $params['xforimgstart'];
 	$yforimgstart = $params['yforimgstart'];
 	$wforimg = $params['wforimg'];
@@ -974,7 +974,7 @@ 
 	$pdf->SetXY($xforimgstart, $yforimgstart + round($wforimg / 4) - 4);
 	$pdf->SetFont($default_font, '', $default_font_size - 1);
 	$pdf->SetTextColor(80, 80, 80);
-	$pdf->MultiCell($wforimg, 4, $langs->trans("Signature") . ': ' . dol_print_date(dol_now(), "day", false, $langs, true). ' - '.$params['online_sign_name'], 0, 'L');
+	$pdf->MultiCell($wforimg, 4, $langs->trans("Signature").': '.dol_print_date(dol_now(), "day", false, $langs, true).' - '.$params['online_sign_name'], 0, 'L');
 	//$pdf->SetXY($xforimgstart, $yforimgstart + round($wforimg / 4));
 	//$pdf->MultiCell($wforimg, 4, $langs->trans("Lastname") . ': ' . $online_sign_name, 0, 'L');
 

htdocs/core/tpl/objectline_edit.tpl.php

Spacing +11 added lines, -11 removed lines

@@ -284,7 +284,7 @@ 
 		if (!$multicurrency_upinctax) {
 			$multicurrency_upinctax = price2num($line->multicurrency_subprice * (1 + ($line->tva_tx / 100)), 'MU'); // One tax
 		}
-		print '<td class="right"><input rel="'.$object->multicurrency_tx.'" type="text" class="flat right width50" id="multicurrency_price_ttc" name="multicurrency_price_ttc" value="'. ($multicurrency_upinctax ? $multicurrency_upinctax : price($line->multicurrency_subprice)).'" /></td>';
+		print '<td class="right"><input rel="'.$object->multicurrency_tx.'" type="text" class="flat right width50" id="multicurrency_price_ttc" name="multicurrency_price_ttc" value="'.($multicurrency_upinctax ? $multicurrency_upinctax : price($line->multicurrency_subprice)).'" /></td>';
 	}
 	?>
 	<td class="right">
@@ -350,7 +350,7 @@ 
 
 			print '<td class="nowrap right linecolcycleref"><input class="right" type="text" size="1" value="'.$fieldv.'" name="progress">%</td>';
 		} else {
-			print '<td class="nowrap right linecolcycleref"><input class="right" type="text" size="1" value="' . (GETPOSTISSET('progress') ? GETPOST('progress') : $line->situation_percent) . '" name="progress">%</td>';
+			print '<td class="nowrap right linecolcycleref"><input class="right" type="text" size="1" value="'.(GETPOSTISSET('progress') ? GETPOST('progress') : $line->situation_percent).'" name="progress">%</td>';
 		}
 		$coldisplay++;
 		print '<td></td>';
@@ -451,37 +451,37 @@ 
 	}
 	if (!$line->date_start) {
 		if (getDolGlobalString('MAIN_DEFAULT_DATE_START_HOUR') != '') {
-			print 'jQuery("#date_starthour").val("' . getDolGlobalString('MAIN_DEFAULT_DATE_START_HOUR').'");';
+			print 'jQuery("#date_starthour").val("'.getDolGlobalString('MAIN_DEFAULT_DATE_START_HOUR').'");';
 		}
 		if (getDolGlobalString('MAIN_DEFAULT_DATE_START_MIN') != '') {
-			print 'jQuery("#date_startmin").val("' . getDolGlobalString('MAIN_DEFAULT_DATE_START_MIN').'");';
+			print 'jQuery("#date_startmin").val("'.getDolGlobalString('MAIN_DEFAULT_DATE_START_MIN').'");';
 		}
 
 		$res = 1;
 		if (!is_object($line->product)) {
-			$res = $line->fetch_product();		// fetch product to know its type and allow isMandatoryperiod()
+			$res = $line->fetch_product(); // fetch product to know its type and allow isMandatoryperiod()
 		}
 		if ($res > 0) {
 			if ($line->product->isMandatoryPeriod() && $line->product->isService()) {
-				print  'jQuery("#date_start").addClass("inputmandatory");';	// Do not add tag "required", this block the cancel action when value not set
+				print  'jQuery("#date_start").addClass("inputmandatory");'; // Do not add tag "required", this block the cancel action when value not set
 			}
 		}
 	}
 	if (!$line->date_end) {
 		if (getDolGlobalString('MAIN_DEFAULT_DATE_END_HOUR') != '') {
-			print 'jQuery("#date_endhour").val("' . getDolGlobalString('MAIN_DEFAULT_DATE_END_HOUR').'");';
+			print 'jQuery("#date_endhour").val("'.getDolGlobalString('MAIN_DEFAULT_DATE_END_HOUR').'");';
 		}
 		if (getDolGlobalString('MAIN_DEFAULT_DATE_END_MIN') != '') {
-			print 'jQuery("#date_endmin").val("' . getDolGlobalString('MAIN_DEFAULT_DATE_END_MIN').'");';
+			print 'jQuery("#date_endmin").val("'.getDolGlobalString('MAIN_DEFAULT_DATE_END_MIN').'");';
 		}
 
 		$res = 1;
 		if (!is_object($line->product)) {
-			$res = $line->fetch_product();		// fetch product to know its type and allow isMandatoryperiod()
+			$res = $line->fetch_product(); // fetch product to know its type and allow isMandatoryperiod()
 		}
-		if ($res  > 0) {
+		if ($res > 0) {
 			if ($line->product->isMandatoryperiod() && $line->product->isService()) {
-				print  'jQuery("#date_end").addClass("inputmandatory");';	// Do not add tag "required", this block the cancel action when value not set
+				print  'jQuery("#date_end").addClass("inputmandatory");'; // Do not add tag "required", this block the cancel action when value not set
 			}
 		}
 	}

htdocs/core/modules/facture/doc/pdf_sponge.modules.php

Spacing +35 added lines, -35 removed lines

@@ -160,7 +160,7 @@ 
 		$this->watermark = '';
 
 		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;
 		}
 
@@ -363,7 +363,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);
 				}
 
@@ -460,7 +460,7 @@ 
 				// $pdf->GetY() here can't be used. It is bottom of the second address box but first one may be higher
 
 				// $this->tab_top is y where we must continue content (90 = 42 + 48: 42 is height of logo and ref, 48 is address blocks)
-				$this->tab_top = 90 + $top_shift + $shipp_shift;		// top_shift is an addition for linked objects or addons (0 in most cases)
+				$this->tab_top = 90 + $top_shift + $shipp_shift; // top_shift is an addition for linked objects or addons (0 in most cases)
 				$this->tab_top_newpage = (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD') ? 42 + $top_shift : 10);
 
 				// You can add more thing under header here, if you increase $extra_under_address_shift too.
@@ -807,7 +807,7 @@ 
 							$bg_color = colorStringToArray(getDolGlobalString("SUBTOTAL_BACK_COLOR_LEVEL_".abs($object->lines[$i]->qty)));
 							$pdf->SetFillColor($bg_color[0], $bg_color[1], $bg_color[2]);
 							$pdf->SetXY($pdf->GetX(), $curY);
-							$pdf->MultiCell($this->page_largeur - $this->marge_droite  - $this->marge_gauche, 6, '', 0, '', true);
+							$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->marge_gauche, 6, '', 0, '', true);
 							$previous_align = array();
 							$previous_align['align'] = $this->cols['desc']['content']['align'];
 							if ($object->lines[$i]->qty < 0) {
@@ -910,7 +910,7 @@ 
 								$extrafieldValue = $this->getExtrafieldContent($object->lines[$i], $extrafieldColKey, $outputlangs);
 								$this->printStdColumnContent($pdf, $curY, $extrafieldColKey, $extrafieldValue);
 
-								$this->setAfterColsLinePositionsData('options_' . $extrafieldColKey, $pdf->GetY(), $pdf->getPage());
+								$this->setAfterColsLinePositionsData('options_'.$extrafieldColKey, $pdf->GetY(), $pdf->getPage());
 							}
 						}
 					}
@@ -989,11 +989,11 @@ 
 					if (!isset($this->tva[$vatrate])) {
 						$this->tva[$vatrate] = 0;
 					}
-					$this->tva[$vatrate] += $tvaligne;    // ->tva is abandoned, we use now ->tva_array that is more complete
+					$this->tva[$vatrate] += $tvaligne; // ->tva is abandoned, we use now ->tva_array that is more complete
 					$vatcode = $object->lines[$i]->vat_src_code;
 					if (getDolGlobalInt('PDF_INVOICE_SHOW_VAT_ANALYSIS')) {
 						if (empty($this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['tot_ht'])) {
-							$this->tva_array[$vatrate . ($vatcode ? ' (' . $vatcode . ')' : '')]['tot_ht'] = 0;
+							$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['tot_ht'] = 0;
 						}
 						$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate' => $vatrate, 'vatcode' => $vatcode, 'amount' => $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne, 'tot_ht' => $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['tot_ht'] + $object->lines[$i]->total_ht);
 					} else {
@@ -1103,7 +1103,7 @@ 
 
 				// Add number of pages in footer
 				if (method_exists($pdf, 'AliasNbPages')) {
-					$pdf->AliasNbPages();  // @phan-suppress-current-line PhanUndeclaredMethod
+					$pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod
 				}
 				// Add terms to sale
 				if (!empty($mysoc->termsofsale) && getDolGlobalInt('MAIN_PDF_ADD_TERMSOFSALE_INVOICE')) {
@@ -1357,7 +1357,7 @@ 
 			foreach ($this->tva_array as $tvakey => $tvaval) {
 				$pdf->SetFont('', '', $default_font_size - 2);
 				$pdf->SetXY($this->marge_gauche, $posy);
-				$titre = round((float) $tvakey, 2) . "%";
+				$titre = round((float) $tvakey, 2)."%";
 				$pdf->MultiCell(25, 4, $titre, 0, 'L');
 
 				$pdf->SetFont('', '', $default_font_size - 2);
@@ -1398,8 +1398,8 @@ 
 			$posy = $pdf->GetY() + 4;
 		}
 
-		$posxval = 52;	// Position of values of properties shown on left side
-		$posxend = 110;	// End of x for text on left side
+		$posxval = 52; // Position of values of properties shown on left side
+		$posxend = 110; // End of x for text on left side
 		if ($this->page_largeur < 210) { // To work with US executive format
 			$posxend -= 10;
 		}
@@ -1408,13 +1408,13 @@ 
 		if ($object->status > Facture::STATUS_DRAFT && getDolGlobalInt('PDF_INVOICE_SHOW_BALANCE_SUMMARY')) {
 			// All customer previous invoices
 			$sql = "SELECT f.rowid, f.datef, f.total_ttc";
-			$sql.= " FROM " . MAIN_DB_PREFIX . "facture as f";
-			$sql.= " WHERE f.fk_soc = " . ((int) $object->socid);
-			$sql.= " AND f.entity IN (" . getEntity('invoice') . ")";
-			$sql.= " AND f.datef <= '" . $this->db->idate($object->date) . "'";
-			$sql.= " AND f.rowid < " . ((int) $object->id);
-			$sql.= " AND f.fk_statut > 0";
-			$sql.= " ORDER BY f.datef ASC";
+			$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
+			$sql .= " WHERE f.fk_soc = ".((int) $object->socid);
+			$sql .= " AND f.entity IN (".getEntity('invoice').")";
+			$sql .= " AND f.datef <= '".$this->db->idate($object->date)."'";
+			$sql .= " AND f.rowid < ".((int) $object->id);
+			$sql .= " AND f.fk_statut > 0";
+			$sql .= " ORDER BY f.datef ASC";
 
 			$old_balance = 0;
 			$invoices = array();
@@ -1429,12 +1429,12 @@ 
 
 			// All payments before current date
 			$sql_payments = "SELECT p.datep, pf.fk_facture, pf.amount";
-			$sql_payments.= " FROM " . MAIN_DB_PREFIX . "paiement_facture as pf";
-			$sql_payments.= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as p ON p.rowid = pf.fk_paiement";
-			$sql_payments.= " INNER JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = pf.fk_facture";
-			$sql_payments.= " WHERE f.fk_soc = " . ((int) $object->socid);
-			$sql_payments.= " AND p.datep < '" . $this->db->idate($object->date) . "'";
-			$sql_payments.= " ORDER BY p.datep ASC";
+			$sql_payments .= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf";
+			$sql_payments .= " INNER JOIN ".MAIN_DB_PREFIX."paiement as p ON p.rowid = pf.fk_paiement";
+			$sql_payments .= " INNER JOIN ".MAIN_DB_PREFIX."facture as f ON f.rowid = pf.fk_facture";
+			$sql_payments .= " WHERE f.fk_soc = ".((int) $object->socid);
+			$sql_payments .= " AND p.datep < '".$this->db->idate($object->date)."'";
+			$sql_payments .= " ORDER BY p.datep ASC";
 
 			$total_payments = 0;
 			$resql_payments = $this->db->query($sql_payments);
@@ -1447,11 +1447,11 @@ 
 
 			// Payments made on current invoice date (including current invoice)
 			$sql_current_date_payments = "SELECT p.datep, pf.fk_facture, pf.amount";
-			$sql_current_date_payments.= " FROM " . MAIN_DB_PREFIX . "paiement_facture as pf";
-			$sql_current_date_payments.= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as p ON p.rowid = pf.fk_paiement";
-			$sql_current_date_payments.= " INNER JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = pf.fk_facture";
-			$sql_current_date_payments.= " WHERE f.fk_soc = " . ((int) $object->socid);
-			$sql_current_date_payments.= " AND DATE(p.datep) = DATE('" . $this->db->idate($object->date) . "')";
+			$sql_current_date_payments .= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf";
+			$sql_current_date_payments .= " INNER JOIN ".MAIN_DB_PREFIX."paiement as p ON p.rowid = pf.fk_paiement";
+			$sql_current_date_payments .= " INNER JOIN ".MAIN_DB_PREFIX."facture as f ON f.rowid = pf.fk_facture";
+			$sql_current_date_payments .= " WHERE f.fk_soc = ".((int) $object->socid);
+			$sql_current_date_payments .= " AND DATE(p.datep) = DATE('".$this->db->idate($object->date)."')";
 
 			$current_date_payments = 0;
 			$resql_current_date = $this->db->query($sql_current_date_payments);
@@ -1475,7 +1475,7 @@ 
 			$pdf->MultiCell($posxval - $this->marge_gauche + 8, 4, $titre, 0, 'L', true);
 
 			$pdf->SetFont('', '', $default_font_size - 2);
-			$pdf->SetXY($posxval+8, $posy);
+			$pdf->SetXY($posxval + 8, $posy);
 			$titre = $outputlangs->transnoentities("NewBalance").' : '.price($new_balance);
 			$pdf->MultiCell($posxend - $posxval - 8, 4, $titre, 0, 'L', true);
 
@@ -1507,7 +1507,7 @@ 
 
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posxval, $posy);
-			$categoryOfOperationLabel = $outputlangs->transnoentities("MentionCategoryOfOperations" . $this->categoryOfOperation);
+			$categoryOfOperationLabel = $outputlangs->transnoentities("MentionCategoryOfOperations".$this->categoryOfOperation);
 			$pdf->MultiCell($posxend - $posxval, 4, $categoryOfOperationLabel, 0, 'L');
 
 			$posy = $pdf->GetY() + 3; // for 2 lines
@@ -1685,7 +1685,7 @@ 
 						include_once DOL_DOCUMENT_ROOT.'/core/lib/functions_be.lib.php';
 						$invoicePaymentKey = dolBECalculateStructuredCommunication($object->ref, $object->type);
 
-						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('StructuredCommunication').": " . $outputlangs->convToOutputCharset($invoicePaymentKey), 0, 'L', false);
+						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('StructuredCommunication').": ".$outputlangs->convToOutputCharset($invoicePaymentKey), 0, 'L', false);
 					}
 				}
 			}
@@ -2371,7 +2371,7 @@ 
 		if (empty($hidetop)) {
 			// Show category of operations
 			if (getDolGlobalInt('INVOICE_CATEGORY_OF_OPERATION') == 1 && $this->categoryOfOperation >= 0) {
-				$categoryOfOperations = $outputlangs->transnoentities("MentionCategoryOfOperations") . ' : ' . $outputlangs->transnoentities("MentionCategoryOfOperations" . $this->categoryOfOperation);
+				$categoryOfOperations = $outputlangs->transnoentities("MentionCategoryOfOperations").' : '.$outputlangs->transnoentities("MentionCategoryOfOperations".$this->categoryOfOperation);
 				$pdf->SetXY($this->marge_gauche, $tab_top - 4);
 				$pdf->MultiCell(($pdf->GetStringWidth($categoryOfOperations)) + 4, 2, $categoryOfOperations);
 			}
@@ -2487,7 +2487,7 @@ 
 		}
 		if ($this->situationinvoice) {
 			$outputlangs->loadLangs(array("other"));
-			$title = $outputlangs->transnoentities("PDFInvoiceSituation") . " " . $outputlangs->transnoentities("NumberingShort") . $object->situation_counter . " -";
+			$title = $outputlangs->transnoentities("PDFInvoiceSituation")." ".$outputlangs->transnoentities("NumberingShort").$object->situation_counter." -";
 		}
 		if (getDolGlobalString('PDF_USE_ALSO_LANGUAGE_CODE') && is_object($outputlangsbis)) {
 			$title .= ' - ';
@@ -2777,7 +2777,7 @@ 
 				if (!empty($carac_client_shipping)) {
 					$posy += $hautcadre;
 
-					$hautcadre -= 10;	// Height for the shipping address does not need to be as high as main box
+					$hautcadre -= 10; // Height for the shipping address does not need to be as high as main box
 
 					// Show shipping frame
 					$pdf->SetXY($posx + 2, $posy - 5);

htdocs/core/modules/facture/doc/pdf_octopus.modules.php

Spacing +69 added lines, -69 removed lines

@@ -78,7 +78,7 @@ 
 	 * Dolibarr version of the loaded document
 	 * @var string Version, possible values are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'''|'development'|'dolibarr'|'experimental'
 	 */
-	public $version = 'disabled';	// Disabled by default. Enabled in constructor if option INVOICE_USE_SITUATION is 2.
+	public $version = 'disabled'; // Disabled by default. Enabled in constructor if option INVOICE_USE_SITUATION is 2.
 
 	/**
 	 * @var int height for info total
@@ -248,7 +248,7 @@ 
 		}
 
 		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;
 		}
 
@@ -298,7 +298,7 @@ 
 			$outputlangsbis->loadLangs(array("main", "bills", "products", "dict", "companies", "compta"));
 		}
 
-		if (empty($object) || ($object->type != Facture::TYPE_SITUATION && ($object->type != Facture::TYPE_CREDIT_NOTE &&  !empty($object->situation_cycle_ref)))) {
+		if (empty($object) || ($object->type != Facture::TYPE_SITUATION && ($object->type != Facture::TYPE_CREDIT_NOTE && !empty($object->situation_cycle_ref)))) {
 			setEventMessage($langs->trans('WarningsObjectIsNotASituation'), 'warnings');
 			return 1;
 		}
@@ -418,15 +418,15 @@ 
 				$pdf->setAutoPageBreak(true, 0);
 
 				// compute height for situation invoices
-				$this->heightforinfotot = 45;	// Height reserved to output the info and total part and payment part
+				$this->heightforinfotot = 45; // Height reserved to output the info and total part and payment part
 				if (!getDolGlobalString('INVOICE_NO_PAYMENT_DETAILS') && $nbpayments > 0) {
 					$this->heightforinfotot += 4 * ($nbpayments + 3);
 				}
 				if ($nbprevsituation > 0) {
 					$this->heightforinfotot += 4 * ($nbprevsituation + 3);
 				}
-				$this->heightforfreetext = (getDolGlobalInt('MAIN_PDF_FREETEXT_HEIGHT', 5));	// Height reserved to output the free text on last page
-				$this->heightforfooter = $this->marge_basse + (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS') ? 12 : 22);	// Height reserved to output the footer (value include bottom margin)
+				$this->heightforfreetext = (getDolGlobalInt('MAIN_PDF_FREETEXT_HEIGHT', 5)); // Height reserved to output the free text on last page
+				$this->heightforfooter = $this->marge_basse + (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS') ? 12 : 22); // Height reserved to output the footer (value include bottom margin)
 
 				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
@@ -440,7 +440,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'));
 					$this->tplidx = $pdf->importPage(1);
 				}
 
@@ -532,7 +532,7 @@ 
 				// $pdf->GetY() here can't be used. It is bottom of the second address box but first one may be higher
 
 				// $this->tab_top is y where we must continue content (90 = 42 + 48: 42 is height of logo and ref, 48 is address blocks)
-				$this->tab_top = 90 + $top_shift + $shipp_shift;		// top_shift is an addition for linked objects or addons (0 in most cases)
+				$this->tab_top = 90 + $top_shift + $shipp_shift; // top_shift is an addition for linked objects or addons (0 in most cases)
 				$this->tab_top_newpage = (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD') ? 42 + $top_shift : 10);
 
 				// You can add more thing under header here, if you increase $extra_under_address_shift too.
@@ -1032,11 +1032,11 @@ 
 					if (!isset($this->tva[$vatrate])) {
 						$this->tva[$vatrate] = 0;
 					}
-					$this->tva[$vatrate] += $tvaligne;	// ->tva is abandoned, we use now ->tva_array that is more complete
+					$this->tva[$vatrate] += $tvaligne; // ->tva is abandoned, we use now ->tva_array that is more complete
 					$vatcode = $object->lines[$i]->vat_src_code;
 					if (getDolGlobalInt('PDF_INVOICE_SHOW_VAT_ANALYSIS')) {
 						if (empty($this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['tot_ht'])) {
-							$this->tva_array[$vatrate . ($vatcode ? ' (' . $vatcode . ')' : '')]['tot_ht'] = 0;
+							$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['tot_ht'] = 0;
 						}
 						$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate' => $vatrate, 'vatcode' => $vatcode, 'amount' => $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne, 'tot_ht' => $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['tot_ht'] + $object->lines[$i]->total_ht);
 					} else {
@@ -1128,7 +1128,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
 				}
 
 				$this->resumeLastPage($pdf, $object, 0, $tab_top, $outputlangs, $outputlangsbis);
@@ -1364,7 +1364,7 @@ 
 			foreach ($this->tva_array as $tvakey => $tvaval) {
 				$pdf->SetFont('', '', $default_font_size - 2);
 				$pdf->SetXY($this->marge_gauche, $posy);
-				$titre = round((float) $tvakey, 2) . "%";
+				$titre = round((float) $tvakey, 2)."%";
 				$pdf->MultiCell(25, 4, $titre, 0, 'L');
 
 				$pdf->SetFont('', '', $default_font_size - 2);
@@ -1405,8 +1405,8 @@ 
 			$posy = $pdf->GetY() + 4;
 		}
 
-		$posxval = 52;	// Position of values of properties shown on left side
-		$posxend = 110;	// End of x for text on left side
+		$posxval = 52; // Position of values of properties shown on left side
+		$posxend = 110; // End of x for text on left side
 		if ($this->page_largeur < 210) { // To work with US executive format
 			$posxend -= 10;
 		}
@@ -1415,13 +1415,13 @@ 
 		if ($object->status > Facture::STATUS_DRAFT && getDolGlobalInt('PDF_INVOICE_SHOW_BALANCE_SUMMARY')) {
 			// All customer previous invoices
 			$sql = "SELECT f.rowid, f.datef, f.total_ttc";
-			$sql.= " FROM " . MAIN_DB_PREFIX . "facture as f";
-			$sql.= " WHERE f.fk_soc = " . ((int) $object->socid);
-			$sql.= " AND f.entity IN (" . getEntity('invoice') . ")";
-			$sql.= " AND f.datef <= '" . $this->db->idate($object->date) . "'";
-			$sql.= " AND f.rowid < " . ((int) $object->id);
-			$sql.= " AND f.fk_statut > 0";
-			$sql.= " ORDER BY f.datef ASC";
+			$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
+			$sql .= " WHERE f.fk_soc = ".((int) $object->socid);
+			$sql .= " AND f.entity IN (".getEntity('invoice').")";
+			$sql .= " AND f.datef <= '".$this->db->idate($object->date)."'";
+			$sql .= " AND f.rowid < ".((int) $object->id);
+			$sql .= " AND f.fk_statut > 0";
+			$sql .= " ORDER BY f.datef ASC";
 
 			$old_balance = 0;
 			$invoices = array();
@@ -1436,12 +1436,12 @@ 
 
 			// All payments before current date
 			$sql_payments = "SELECT p.datep, pf.fk_facture, pf.amount";
-			$sql_payments.= " FROM " . MAIN_DB_PREFIX . "paiement_facture as pf";
-			$sql_payments.= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as p ON p.rowid = pf.fk_paiement";
-			$sql_payments.= " INNER JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = pf.fk_facture";
-			$sql_payments.= " WHERE f.fk_soc = " . ((int) $object->socid);
-			$sql_payments.= " AND p.datep < '" . $this->db->idate($object->date) . "'";
-			$sql_payments.= " ORDER BY p.datep ASC";
+			$sql_payments .= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf";
+			$sql_payments .= " INNER JOIN ".MAIN_DB_PREFIX."paiement as p ON p.rowid = pf.fk_paiement";
+			$sql_payments .= " INNER JOIN ".MAIN_DB_PREFIX."facture as f ON f.rowid = pf.fk_facture";
+			$sql_payments .= " WHERE f.fk_soc = ".((int) $object->socid);
+			$sql_payments .= " AND p.datep < '".$this->db->idate($object->date)."'";
+			$sql_payments .= " ORDER BY p.datep ASC";
 
 			$total_payments = 0;
 			$resql_payments = $this->db->query($sql_payments);
@@ -1454,11 +1454,11 @@ 
 
 			// Payments made on current invoice date (including current invoice)
 			$sql_current_date_payments = "SELECT p.datep, pf.fk_facture, pf.amount";
-			$sql_current_date_payments.= " FROM " . MAIN_DB_PREFIX . "paiement_facture as pf";
-			$sql_current_date_payments.= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as p ON p.rowid = pf.fk_paiement";
-			$sql_current_date_payments.= " INNER JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = pf.fk_facture";
-			$sql_current_date_payments.= " WHERE f.fk_soc = " . ((int) $object->socid);
-			$sql_current_date_payments.= " AND DATE(p.datep) = DATE('" . $this->db->idate($object->date) . "')";
+			$sql_current_date_payments .= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf";
+			$sql_current_date_payments .= " INNER JOIN ".MAIN_DB_PREFIX."paiement as p ON p.rowid = pf.fk_paiement";
+			$sql_current_date_payments .= " INNER JOIN ".MAIN_DB_PREFIX."facture as f ON f.rowid = pf.fk_facture";
+			$sql_current_date_payments .= " WHERE f.fk_soc = ".((int) $object->socid);
+			$sql_current_date_payments .= " AND DATE(p.datep) = DATE('".$this->db->idate($object->date)."')";
 
 			$current_date_payments = 0;
 			$resql_current_date = $this->db->query($sql_current_date_payments);
@@ -1482,7 +1482,7 @@ 
 			$pdf->MultiCell($posxval - $this->marge_gauche + 8, 4, $titre, 0, 'L', true);
 
 			$pdf->SetFont('', '', $default_font_size - 2);
-			$pdf->SetXY($posxval+8, $posy);
+			$pdf->SetXY($posxval + 8, $posy);
 			$titre = $outputlangs->transnoentities("NewBalance").' : '.price($new_balance);
 			$pdf->MultiCell($posxend - $posxval - 8, 4, $titre, 0, 'L', true);
 
@@ -1514,7 +1514,7 @@ 
 
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posxval, $posy);
-			$categoryOfOperationLabel = $outputlangs->transnoentities("MentionCategoryOfOperations" . $this->categoryOfOperation);
+			$categoryOfOperationLabel = $outputlangs->transnoentities("MentionCategoryOfOperations".$this->categoryOfOperation);
 			$pdf->MultiCell($posxend - $posxval, 4, $categoryOfOperationLabel, 0, 'L');
 
 			$posy = $pdf->GetY() + 3; // for 2 lines
@@ -1681,7 +1681,7 @@ 
 						include_once DOL_DOCUMENT_ROOT.'/core/lib/functions_be.lib.php';
 						$invoicePaymentKey = dolBECalculateStructuredCommunication($object->ref, $object->type);
 
-						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('StructuredCommunication').": " . $outputlangs->convToOutputCharset($invoicePaymentKey), 0, 'L', false);
+						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('StructuredCommunication').": ".$outputlangs->convToOutputCharset($invoicePaymentKey), 0, 'L', false);
 					}
 				}
 			}
@@ -1852,7 +1852,7 @@ 
 						if (($object->lines[$i]->info_bits & 0x01) == 0x01) {
 							$vatrate .= '*';
 						}
-						if (! isset($tvas[$vatrate])) {
+						if (!isset($tvas[$vatrate])) {
 							$tvas[$vatrate] = 0;
 						}
 						$tvas[$vatrate] += $tvaligne;
@@ -2121,7 +2121,7 @@ 
 		if (empty($hidetop)) {
 			// Show category of operations
 			if (getDolGlobalInt('INVOICE_CATEGORY_OF_OPERATION') == 1 && $this->categoryOfOperation >= 0) {
-				$categoryOfOperations = $outputlangs->transnoentities("MentionCategoryOfOperations") . ' : ' . $outputlangs->transnoentities("MentionCategoryOfOperations" . $this->categoryOfOperation);
+				$categoryOfOperations = $outputlangs->transnoentities("MentionCategoryOfOperations").' : '.$outputlangs->transnoentities("MentionCategoryOfOperations".$this->categoryOfOperation);
 				$pdf->SetXY($this->marge_gauche, $tab_top - 4);
 				$pdf->MultiCell(($pdf->GetStringWidth($categoryOfOperations)) + 4, 2, $categoryOfOperations);
 			}
@@ -2141,7 +2141,7 @@ 
 		$pdf->SetFont('', '', $default_font_size - 1);
 
 		// Output Rect
-		$this->printRoundedRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $this->corner_radius, $hidetop, $hidebottom, 'D');	// Rect prend une longueur en 3eme param et 4eme param
+		$this->printRoundedRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $this->corner_radius, $hidetop, $hidebottom, 'D'); // Rect prend une longueur en 3eme param et 4eme param
 
 		// situation invoice
 		$pdf->SetFont('', '', $default_font_size - 2);
@@ -2181,7 +2181,7 @@ 
 		$pdf->SetFont('', '', $default_font_size - 1);
 
 		if (empty($hidetop)) {
-			$pdf->line($this->marge_gauche, $tab_top + 5, $this->page_largeur - $this->marge_droite, $tab_top + 5);	// line prend une position y en 2eme param et 4eme param
+			$pdf->line($this->marge_gauche, $tab_top + 5, $this->page_largeur - $this->marge_droite, $tab_top + 5); // line prend une position y en 2eme param et 4eme param
 		}
 	}
 
@@ -2760,7 +2760,7 @@ 
 			'overtitle' => array(
 				'textkey' => 'Chantier', // use lang key is useful in somme case with module
 				'align' => 'C',
-				'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+				'padding' => array(0.5, 0.5, 0.5, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 				'width' => 18
 			),
 		);
@@ -2785,13 +2785,13 @@ 
 			),
 			'border-left' => true, // add left line separator
 			'overtitle' => array(
-				'textkey' => 'S'.$derniere_situation->situation_counter . ' - ' . dol_print_date($derniere_situation->date, "%d/%m/%Y"),
+				'textkey' => 'S'.$derniere_situation->situation_counter.' - '.dol_print_date($derniere_situation->date, "%d/%m/%Y"),
 				'align' => 'C',
-				'padding' => array(0.5,0.2,0.5,0.2), // Like css 0 => top, 1 => right, 2 => bottom, 3 => left
+				'padding' => array(0.5, 0.2, 0.5, 0.2), // Like css 0 => top, 1 => right, 2 => bottom, 3 => left
 				'width' => 10 + 15 //current width + amount cell width
 			),
 		);
-		if ($this->situationinvoice && ! empty($this->TDataSituation['date_derniere_situation'])) {
+		if ($this->situationinvoice && !empty($this->TDataSituation['date_derniere_situation'])) {
 			$this->cols['prev_progress']['status'] = true;
 		}
 
@@ -2806,7 +2806,7 @@ 
 			),
 			'border-left' => true, // add left line separator
 		);
-		if ($this->situationinvoice && ! empty($this->TDataSituation['date_derniere_situation'])) {
+		if ($this->situationinvoice && !empty($this->TDataSituation['date_derniere_situation'])) {
 			$this->cols['prev_progress_amount']['status'] = true;
 		}
 
@@ -2821,9 +2821,9 @@ 
 			),
 			'border-left' => true, // add left line separator
 			'overtitle' => array(
-				'textkey' => 'S'.$object->situation_counter . ' - ' . dol_print_date($object->date, "%d/%m/%Y"),
+				'textkey' => 'S'.$object->situation_counter.' - '.dol_print_date($object->date, "%d/%m/%Y"),
 				'align' => 'C',
-				'padding' => array(0.5,0.2,0.5,0.2), // Like css 0 => top, 1 => right, 2 => bottom, 3 => left
+				'padding' => array(0.5, 0.2, 0.5, 0.2), // Like css 0 => top, 1 => right, 2 => bottom, 3 => left
 				'width' => 10 + 15
 			),
 		);
@@ -2947,7 +2947,7 @@ 
 
 		// Output Rect
 		// KEEPTHIS => Affiche les bords extérieurs
-		$this->printRoundedRectBtp($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $this->corner_radius, $hidetop, $hidebottom, 'D');	// Rect prend une longueur en 3eme param et 4eme param
+		$this->printRoundedRectBtp($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $this->corner_radius, $hidetop, $hidebottom, 'D'); // Rect prend une longueur en 3eme param et 4eme param
 
 		$pdf->line($this->posx_cumul_anterieur - 1, $tab_top, $this->posx_cumul_anterieur - 1, $tab_top + $tab_height);
 		if (empty($hidetop)) {
@@ -3004,7 +3004,7 @@ 
 			$pdf->SetXY($this->marge_gauche + 10, $tab_top + 24 + $i);
 			$pdf->MultiCell(80, 2, $outputlangs->transnoentities("TotalHT").' '.$TVatInfo['label'], '', 'L');
 
-			if (! empty($this->TDataSituation['current'][$tva_tx_formated]['TVA'])) {
+			if (!empty($this->TDataSituation['current'][$tva_tx_formated]['TVA'])) {
 				$pdf->SetXY($this->marge_gauche + 10, $tab_top + 28 + $i);
 				$pdf->MultiCell(80, 2, $outputlangs->transnoentities("VAT").' '.$TVatInfo['label'], '', 'L');
 			} else {
@@ -3068,7 +3068,7 @@ 
 				$pdf->MultiCell(32, 2, price($this->TDataSituation[$col][$tva_tx_formated]['HT'], 0, '', 1, -1, 2), '', 'R');
 
 				// Total TVA
-				if (! empty($this->TDataSituation['current'][$tva_tx_formated]['TVA'])) {
+				if (!empty($this->TDataSituation['current'][$tva_tx_formated]['TVA'])) {
 					$pdf->SetXY($x, $tab_top + 28 + $i);
 					$pdf->MultiCell(32, 2, price($this->TDataSituation[$col][$tva_tx_formated]['TVA'], 0, '', 1, -1, 2), '', 'R');
 				} else {
@@ -3145,7 +3145,7 @@ 
 
 		$TDataSituation = array();
 
-		if (! empty($facDerniereSituation)) {
+		if (!empty($facDerniereSituation)) {
 			$TDataSituation['derniere_situation'] = $facDerniereSituation;
 			$TDataSituation['date_derniere_situation'] = $facDerniereSituation->date;
 		}
@@ -3154,9 +3154,9 @@ 
 		$retenue_garantie_anterieure = 0;
 		// Init tous les champs à 0
 		$TDataSituation['cumul_anterieur'] = array(
-			'HT' => 0,	//montant HT normal
-			'TVA' => 0,   //montant de la TVA sur le HTnet
-			'TTC' => 0,   //montant TTC (HTnet + TVA)
+			'HT' => 0, //montant HT normal
+			'TVA' => 0, //montant de la TVA sur le HTnet
+			'TTC' => 0, //montant TTC (HTnet + TVA)
 			'retenue_garantie' => 0,
 			'travaux_sup' => 0,
 			'HTnet' => 0, //montant HT
@@ -3186,7 +3186,7 @@ 
 					$isFirstSituation = false;
 					if (!empty($l->fk_prev_id)) {
 						$prevSituationPercent = $l->get_prev_progress($previousInvoice->id, true);
-					} elseif (! array_key_exists($i + 1, $TPreviousInvoices)) {
+					} elseif (!array_key_exists($i + 1, $TPreviousInvoices)) {
 						$isFirstSituation = true;
 					}
 
@@ -3196,7 +3196,7 @@ 
 
 					//1ere ligne
 					$amounttva = $calc_ht * ($ltvatx / 100);
-					if (! isset($TDataSituation['cumul_anterieur'][$ltvatx])) {
+					if (!isset($TDataSituation['cumul_anterieur'][$ltvatx])) {
 						$TDataSituation['cumul_anterieur'][$ltvatx]['HT'] = $calc_ht;
 						$TDataSituation['cumul_anterieur'][$ltvatx]['TVA'] = $amounttva;
 					} else {
@@ -3208,14 +3208,14 @@ 
 					//le grand total de TVA
 					// $TDataSituation['cumul_anterieur']['TVA'] += $amounttva;
 
-					if (empty($l->fk_prev_id) && ! $isFirstSituation) {
+					if (empty($l->fk_prev_id) && !$isFirstSituation) {
 						// TODO: à clarifier, mais pour moi, un facture de situation précédente qui a des progressions à 0% c'est pas logique
 						$TDataSituation['cumul_anterieur']['travaux_sup'] += $calc_ht;
 					}
 				}
 			}
 
-			if (! empty($previousInvoice->retained_warranty) && !getDolGlobalString('USE_RETAINED_WARRANTY_ONLY_FOR_SITUATION_FINAL')) {
+			if (!empty($previousInvoice->retained_warranty) && !getDolGlobalString('USE_RETAINED_WARRANTY_ONLY_FOR_SITUATION_FINAL')) {
 				$retenue_garantie_anterieure += $previousInvoice->getRetainedWarrantyAmount();
 			}
 
@@ -3229,7 +3229,7 @@ 
 		// print json_encode($facDerniereSituation->lines);exit;
 		$TDataSituation['current'] = $this->btpGetInvoiceAmounts($object->id);
 
-		if (! empty($facDerniereSituation->lines)) {
+		if (!empty($facDerniereSituation->lines)) {
 			$TFacLinesKey = array_keys($facDerniereSituation->lines);
 			$TObjectLinesKey = array_keys($object->lines);
 			$TDiffKey = array_diff($TObjectLinesKey, $TFacLinesKey);
@@ -3441,16 +3441,16 @@ 
 		$facDerniereSituation = $TPreviousInvoices[0];
 
 		$ret = array(
-			'HT' => 0,	//montant HT normal
+			'HT' => 0, //montant HT normal
 			'HTnet' => 0, //montant HT
-			'TVA' => 0,   //montant de la TVA sur le HTnet
-			'TTC' => 0,   //montant TTC (HTnet + TVA)
+			'TVA' => 0, //montant de la TVA sur le HTnet
+			'TTC' => 0, //montant TTC (HTnet + TVA)
 			'retenue_garantie' => 0,
 			'travaux_sup' => 0,
 			'total_a_payer' => 0 //montant "a payer" sur la facture
 		);
 
-		if (! empty($facDerniereSituation)) {
+		if (!empty($facDerniereSituation)) {
 			$ret['derniere_situation'] = $facDerniereSituation;
 			$ret['date_derniere_situation'] = $facDerniereSituation->date;
 		}
@@ -3584,7 +3584,7 @@ 
 			$label = $outputlangs->transnoentities("SituationInvoiceTotalProposal");
 			$pdf->MultiCell($this->page_largeur - ($this->marge_droite + $this->marge_gauche), 3, $label, 0, 'L', false, 1, $posx, $posy + 1);
 
-			$amount = price($sign * ($total_ht + (! empty($propal->remise) ? $propal->remise : 0)));
+			$amount = price($sign * ($total_ht + (!empty($propal->remise) ? $propal->remise : 0)));
 			$pdf->MultiCell($width2, 3, $amount, 0, 'R', false, 1, $posx + $width, $posy + 1);
 
 			$pdf->SetFont('', '', $default_font_size - 1);
@@ -3627,7 +3627,7 @@ 
 
 		$force_to_zero = false;
 
-		$idinv = 0;//count($previousinvoices);
+		$idinv = 0; //count($previousinvoices);
 		while ($idinv < count($previousinvoices)) {
 			$invoice = $previousinvoices[$idinv];
 
@@ -3649,7 +3649,7 @@ 
 				$force_to_zero = true;
 			}
 
-			$ref .= ' - '. $invoice->ref;
+			$ref .= ' - '.$invoice->ref;
 			$ref .= ' ('.dol_print_date($invoice->date, "%d/%m/%Y", false, $outputlangs).')';
 			$pdf->MultiCell($this->page_largeur - ($this->marge_droite + $this->marge_gauche), 3, $ref, 0, 'L', false);
 
@@ -3680,7 +3680,7 @@ 
 				if (($invoice->lines[$i]->info_bits & 0x01) == 0x01) {
 					$vatrate .= '*';
 				}
-				if (! isset($tvas[$vatrate])) {
+				if (!isset($tvas[$vatrate])) {
 					$tvas[$vatrate] = 0;
 				}
 				$tvas[$vatrate] += $tvaligne;
@@ -3858,7 +3858,7 @@ 
 						$pdf->SetXY($posx + $width4, $posy + $height * $index + $y);
 						$pdf->MultiCell($width4, $height - 1, price($sign * $payment['amount'], 0, $outputlangs), 0, 'L', false);
 						$pdf->SetXY($posx + $width4 * 2, $posy + $height * $index + $y);
-						$oper = $outputlangs->transnoentitiesnoconv("PaymentTypeShort" . $payment['type']);
+						$oper = $outputlangs->transnoentitiesnoconv("PaymentTypeShort".$payment['type']);
 
 						$pdf->MultiCell($width4, $height - 1, $oper, 0, 'L', false);
 						$pdf->SetXY($posx + $width4 * 3, $posy + $height * $index + $y);
@@ -3889,7 +3889,7 @@ 
 					$this->_pagehead($pdf, $object, 0, $outputlangs);
 				}
 				$pdf->setPage($pageposafter + 1);
-				$pdf->setPageOrientation('', true, 0);	// The only function to edit the bottom margin of current page to set it.
+				$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 
 				$posy = $this->tab_top_newpage + 1;
 			} else {
@@ -3921,7 +3921,7 @@ 
 
 		$posy += 10;
 
-		$pdf->setPageOrientation('', true, 0);	// The only function to edit the bottom margin of current page to set it.
+		$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->SetFont('', '', $default_font_size - 1);

htdocs/core/modules/facture/doc/pdf_crabe.modules.php

Spacing +34 added lines, -34 removed lines

@@ -175,7 +175,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;
 		}
 
@@ -337,7 +337,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);
 				}
 
@@ -451,7 +451,7 @@ 
 				// $pdf->GetY() here can't be used. It is bottom of the second address box but first one may be higher
 
 				// $tab_top is y where we must continue content (90 = 42 + 48: 42 is height of logo and ref, 48 is address blocks)
-				$tab_top = 90 + $top_shift;		// top_shift is an addition for linked objects or addons (0 in most cases)
+				$tab_top = 90 + $top_shift; // top_shift is an addition for linked objects or addons (0 in most cases)
 				$tab_top_newpage = (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD') ? 42 + $top_shift : 10);
 
 				// You can add more thing under header here, if you increase $extra_under_address_shift too.
@@ -783,11 +783,11 @@ 
 					if (!isset($this->tva[$vatrate])) {
 						$this->tva[$vatrate] = 0;
 					}
-					$this->tva[$vatrate] += $tvaligne;	// ->tva is abandoned, we use now ->tva_array that is more complete
+					$this->tva[$vatrate] += $tvaligne; // ->tva is abandoned, we use now ->tva_array that is more complete
 					$vatcode = $object->lines[$i]->vat_src_code;
 					if (getDolGlobalInt('PDF_INVOICE_SHOW_VAT_ANALYSIS')) {
 						if (empty($this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['tot_ht'])) {
-							$this->tva_array[$vatrate . ($vatcode ? ' (' . $vatcode . ')' : '')]['tot_ht'] = 0;
+							$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['tot_ht'] = 0;
 						}
 						$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate' => $vatrate, 'vatcode' => $vatcode, 'amount' => $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne, 'tot_ht' => $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['tot_ht'] + $object->lines[$i]->total_ht);
 					} else {
@@ -877,7 +877,7 @@ 
 				// Pagefoot
 				$this->_pagefoot($pdf, $object, $outputlangs, 0, $this->getHeightForQRInvoice($pdf->getPage(), $object, $langs));
 				if (method_exists($pdf, 'AliasNbPages')) {
-					$pdf->AliasNbPages();  // @phan-suppress-current-line PhanUndeclaredMethod
+					$pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod
 				}
 
 				// Add terms to sale
@@ -1194,7 +1194,7 @@ 
 			foreach ($this->tva_array as $tvakey => $tvaval) {
 				$pdf->SetFont('', '', $default_font_size - 2);
 				$pdf->SetXY($this->marge_gauche, $posy);
-				$titre = round((float) $tvakey, 2) . "%";
+				$titre = round((float) $tvakey, 2)."%";
 				$pdf->MultiCell(25, 4, $titre, 0, 'L');
 
 				$pdf->SetFont('', '', $default_font_size - 2);
@@ -1236,7 +1236,7 @@ 
 		}
 
 		$posxval = 52;
-		$posxend = 110;	// End of x for text on left side
+		$posxend = 110; // End of x for text on left side
 		if ($this->page_largeur < 210) { // To work with US executive format
 			$posxend -= 10;
 		}
@@ -1245,13 +1245,13 @@ 
 		if ($object->status > Facture::STATUS_DRAFT && getDolGlobalInt('PDF_INVOICE_SHOW_BALANCE_SUMMARY')) {
 			// All customer previous invoices
 			$sql = "SELECT f.rowid, f.datef, f.total_ttc";
-			$sql.= " FROM " . MAIN_DB_PREFIX . "facture as f";
-			$sql.= " WHERE f.fk_soc = " . ((int) $object->socid);
-			$sql.= " AND f.entity IN (" . getEntity('invoice') . ")";
-			$sql.= " AND f.datef <= '" . $this->db->idate($object->date) . "'";
-			$sql.= " AND f.rowid < " . ((int) $object->id);
-			$sql.= " AND f.fk_statut > 0";
-			$sql.= " ORDER BY f.datef ASC";
+			$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
+			$sql .= " WHERE f.fk_soc = ".((int) $object->socid);
+			$sql .= " AND f.entity IN (".getEntity('invoice').")";
+			$sql .= " AND f.datef <= '".$this->db->idate($object->date)."'";
+			$sql .= " AND f.rowid < ".((int) $object->id);
+			$sql .= " AND f.fk_statut > 0";
+			$sql .= " ORDER BY f.datef ASC";
 
 			$old_balance = 0;
 			$invoices = array();
@@ -1266,12 +1266,12 @@ 
 
 			// All payments before current date
 			$sql_payments = "SELECT p.datep, pf.fk_facture, pf.amount";
-			$sql_payments.= " FROM " . MAIN_DB_PREFIX . "paiement_facture as pf";
-			$sql_payments.= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as p ON p.rowid = pf.fk_paiement";
-			$sql_payments.= " INNER JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = pf.fk_facture";
-			$sql_payments.= " WHERE f.fk_soc = " . ((int) $object->socid);
-			$sql_payments.= " AND p.datep < '" . $this->db->idate($object->date) . "'";
-			$sql_payments.= " ORDER BY p.datep ASC";
+			$sql_payments .= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf";
+			$sql_payments .= " INNER JOIN ".MAIN_DB_PREFIX."paiement as p ON p.rowid = pf.fk_paiement";
+			$sql_payments .= " INNER JOIN ".MAIN_DB_PREFIX."facture as f ON f.rowid = pf.fk_facture";
+			$sql_payments .= " WHERE f.fk_soc = ".((int) $object->socid);
+			$sql_payments .= " AND p.datep < '".$this->db->idate($object->date)."'";
+			$sql_payments .= " ORDER BY p.datep ASC";
 
 			$total_payments = 0;
 			$resql_payments = $this->db->query($sql_payments);
@@ -1284,11 +1284,11 @@ 
 
 			// Payments made on current invoice date (including current invoice)
 			$sql_current_date_payments = "SELECT p.datep, pf.fk_facture, pf.amount";
-			$sql_current_date_payments.= " FROM " . MAIN_DB_PREFIX . "paiement_facture as pf";
-			$sql_current_date_payments.= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as p ON p.rowid = pf.fk_paiement";
-			$sql_current_date_payments.= " INNER JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = pf.fk_facture";
-			$sql_current_date_payments.= " WHERE f.fk_soc = " . ((int) $object->socid);
-			$sql_current_date_payments.= " AND DATE(p.datep) = DATE('" . $this->db->idate($object->date) . "')";
+			$sql_current_date_payments .= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf";
+			$sql_current_date_payments .= " INNER JOIN ".MAIN_DB_PREFIX."paiement as p ON p.rowid = pf.fk_paiement";
+			$sql_current_date_payments .= " INNER JOIN ".MAIN_DB_PREFIX."facture as f ON f.rowid = pf.fk_facture";
+			$sql_current_date_payments .= " WHERE f.fk_soc = ".((int) $object->socid);
+			$sql_current_date_payments .= " AND DATE(p.datep) = DATE('".$this->db->idate($object->date)."')";
 
 			$current_date_payments = 0;
 			$resql_current_date = $this->db->query($sql_current_date_payments);
@@ -1312,7 +1312,7 @@ 
 			$pdf->MultiCell($posxval - $this->marge_gauche + 8, 4, $titre, 0, 'L', true);
 
 			$pdf->SetFont('', '', $default_font_size - 2);
-			$pdf->SetXY($posxval+8, $posy);
+			$pdf->SetXY($posxval + 8, $posy);
 			$titre = $outputlangs->transnoentities("NewBalance").' : '.price($new_balance);
 			$pdf->MultiCell($posxend - $posxval - 8, 4, $titre, 0, 'L', true);
 
@@ -1332,7 +1332,7 @@ 
 			$lib_condition_paiement = str_replace('\n', "\n", $lib_condition_paiement);
 			$pdf->MultiCell(67, 4, $lib_condition_paiement, 0, 'L');
 
-			$posy = $pdf->GetY() + 3;	// We need spaces for 2 lines payment conditions
+			$posy = $pdf->GetY() + 3; // We need spaces for 2 lines payment conditions
 		}
 
 		// Show category of operations
@@ -1344,7 +1344,7 @@ 
 
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posxval, $posy);
-			$categoryOfOperationLabel = $outputlangs->transnoentities("MentionCategoryOfOperations" . $this->categoryOfOperation);
+			$categoryOfOperationLabel = $outputlangs->transnoentities("MentionCategoryOfOperations".$this->categoryOfOperation);
 			$pdf->MultiCell($posxend - $posxval, 4, $categoryOfOperationLabel, 0, 'L');
 
 			$posy = $pdf->GetY() + 3; // for 2 lines
@@ -1496,7 +1496,7 @@ 
 						include_once DOL_DOCUMENT_ROOT.'/core/lib/functions_be.lib.php';
 						$invoicePaymentKey = dolBECalculateStructuredCommunication($object->ref, $object->type);
 
-						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('StructuredCommunication').": " . $outputlangs->convToOutputCharset($invoicePaymentKey), 0, 'L', false);
+						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('StructuredCommunication').": ".$outputlangs->convToOutputCharset($invoicePaymentKey), 0, 'L', false);
 					}
 				}
 			}
@@ -1952,7 +1952,7 @@ 
 		if (empty($hidetop)) {
 			// Show category of operations
 			if (getDolGlobalInt('INVOICE_CATEGORY_OF_OPERATION') == 1 && $this->categoryOfOperation >= 0) {
-				$categoryOfOperations = $outputlangs->transnoentities("MentionCategoryOfOperations") . ' : ' . $outputlangs->transnoentities("MentionCategoryOfOperations" . $this->categoryOfOperation);
+				$categoryOfOperations = $outputlangs->transnoentities("MentionCategoryOfOperations").' : '.$outputlangs->transnoentities("MentionCategoryOfOperations".$this->categoryOfOperation);
 				$pdf->SetXY($this->marge_gauche, $tab_top - 4);
 				$pdf->MultiCell(($pdf->GetStringWidth($categoryOfOperations)) + 4, 2, $categoryOfOperations);
 			}
@@ -2121,7 +2121,7 @@ 
 		}
 		if ($this->situationinvoice) {
 			$outputlangs->loadLangs(array("other"));
-			$title = $outputlangs->transnoentities("PDFInvoiceSituation") . " " . $outputlangs->transnoentities("NumberingShort") . $object->situation_counter . " -";
+			$title = $outputlangs->transnoentities("PDFInvoiceSituation")." ".$outputlangs->transnoentities("NumberingShort").$object->situation_counter." -";
 		}
 		if (getDolGlobalString('PDF_USE_ALSO_LANGUAGE_CODE') && is_object($outputlangsbis)) {
 			$title .= ' - ';
@@ -2356,7 +2356,7 @@ 
 
 			$carac_client_name = is_object($thirdparty) ? pdfBuildThirdpartyName($thirdparty, $outputlangs) : '';
 
-			$mode =  'target';
+			$mode = 'target';
 			$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), ($usecontact ? 1 : 0), $mode, $object);
 
 			// Show recipient
@@ -2411,7 +2411,7 @@ 
 				if (!empty($carac_client_shipping)) {
 					$posy += $hautcadre;
 
-					$hautcadre -= 10;	// Height for the shipping address does not need to be as high as main box
+					$hautcadre -= 10; // Height for the shipping address does not need to be as high as main box
 
 					// Show shipping frame
 					$pdf->SetXY($posx + 2, $posy - 5);

htdocs/core/modules/propale/doc/pdf_azur.modules.php

Spacing +4 added lines, -4 removed lines

@@ -160,7 +160,7 @@ 
 		$this->atleastonediscount = 0;
 
 		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;
 		}
 
@@ -329,7 +329,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);
 				}
 
@@ -766,7 +766,7 @@ 
 				// Pied de page
 				$this->_pagefoot($pdf, $object, $outputlangs);
 				if (method_exists($pdf, 'AliasNbPages')) {
-					$pdf->AliasNbPages();  // @phan-suppress-current-line PhanUndeclaredMethod
+					$pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod
 				}
 
 				// Add terms to sale
@@ -1783,7 +1783,7 @@ 
 
 			$carac_client_name = pdfBuildThirdpartyName($thirdparty, $outputlangs);
 
-			$mode =  'target';
+			$mode = 'target';
 			$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), ($usecontact ? 1 : 0), $mode, $object);
 
 			// Show recipient

htdocs/core/modules/propale/doc/pdf_cyan.modules.php

Spacing +8 added lines, -8 removed lines

@@ -135,7 +135,7 @@ 
 		$this->atleastonediscount = 0;
 
 		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;
 		}
 
@@ -307,7 +307,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);
 				}
 
@@ -348,7 +348,7 @@ 
 				$heightforfooter = $this->marge_basse + (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS') ? 12 : 22); // Height reserved to output the footer (value include bottom margin)
 				//print $heightforinfotot + $heightforsignature + $heightforfreetext + $heightforfooter;exit;
 
-				$save_note_public = $object->note_public;	// Because $object->note_public may be modified by _pagehead() that calls pdf_writeLinkedObjects() that calls ... that modify $object->note_private
+				$save_note_public = $object->note_public; // Because $object->note_public may be modified by _pagehead() that calls pdf_writeLinkedObjects() that calls ... that modify $object->note_private
 
 				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs, $outputlangsbis);
 				$pdf->SetFont('', '', $default_font_size - 1);
@@ -400,7 +400,7 @@ 
 					}
 				}
 
-				$object->note_public = $save_note_public;	// Now that we have output the note_public, we can restore it to initial value.
+				$object->note_public = $save_note_public; // Now that we have output the note_public, we can restore it to initial value.
 
 				// Extrafields in note
 				$extranote = $this->getExtrafieldsInHtml($object, $outputlangs);
@@ -668,7 +668,7 @@ 
 							$bg_color = colorStringToArray(getDolGlobalString("SUBTOTAL_BACK_COLOR_LEVEL_".abs($object->lines[$i]->qty)));
 							$pdf->SetFillColor($bg_color[0], $bg_color[1], $bg_color[2]);
 							$pdf->SetXY($pdf->GetX(), $curY);
-							$pdf->MultiCell($this->page_largeur - $this->marge_droite  - $this->marge_gauche, 6, '', 0, '', true);
+							$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->marge_gauche, 6, '', 0, '', true);
 							$previous_align = array();
 							$previous_align['align'] = $this->cols['desc']['content']['align'];
 							if ($object->lines[$i]->qty < 0) {
@@ -953,7 +953,7 @@ 
 
 				// Add number of pages in footer
 				if (method_exists($pdf, 'AliasNbPages')) {
-					$pdf->AliasNbPages();  // @phan-suppress-current-line PhanUndeclaredMethod
+					$pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod
 				}
 
 				// Add terms to sale
@@ -1860,7 +1860,7 @@ 
 		$top_shift = 0;
 		// Show list of linked objects
 		$current_y = $pdf->getY();
-		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, $w, 3, 'R', $default_font_size);	// May modify $object->note_public
+		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, $w, 3, 'R', $default_font_size); // May modify $object->note_public
 		if ($current_y < $pdf->getY()) {
 			$top_shift = $pdf->getY() - $current_y;
 		}
@@ -1993,7 +1993,7 @@ 
 				if (!empty($carac_client_shipping)) {
 					$posy += $hautcadre;
 
-					$hautcadre -= 10;	// Height for the shipping address does not need to be as high as main box
+					$hautcadre -= 10; // Height for the shipping address does not need to be as high as main box
 
 					// Show shipping frame
 					$pdf->SetXY($posx + 2, $posy - 5);

htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php

Spacing +5 added lines, -5 removed lines

@@ -129,7 +129,7 @@ 
 		$this->atleastonediscount = 0;
 
 		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;
 		}
 
@@ -297,7 +297,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);
 				}
 
@@ -808,7 +808,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();
@@ -852,7 +852,7 @@ 
 	protected function drawInfoTable(&$pdf, $object, $posy, $outputlangs)
 	{
 		global $conf, $mysoc;
-		'@phan-var-force Commande|Propal|Facture $object';  // availability_code,... does not exist on Facture.
+		'@phan-var-force Commande|Propal|Facture $object'; // availability_code,... does not exist on Facture.
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
@@ -1449,7 +1449,7 @@ 
 			// Show recipient
 			$widthrecbox = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 92 : 100;
 			if ($this->page_largeur < 210) {
-				$widthrecbox = 84;	// To work with US executive format
+				$widthrecbox = 84; // To work with US executive format
 			}
 			$posy = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 40 : 42;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;