Dolibarr / dolibarr

htdocs/compta/prelevement/create.php

Spacing +3 added lines, -3 removed lines

@@ -438,7 +438,7 @@ 
 	}
 	$title = $langs->trans("InvoiceWaitingWithdraw");
 	$picto = 'bill';
-	if ($type =='bank-transfer') {
+	if ($type == 'bank-transfer') {
 		if ($sourcetype != 'salary') {
 			$title = $langs->trans("InvoiceWaitingPaymentByBankTransfer");
 		} else {
@@ -480,7 +480,7 @@ 
 		print '<td>'.$langs->trans("Employee").'</td>';
 	}
 	print '<td>'.$langs->trans("RIB").'</td>';
-	print ($sourcetype != 'salary'? '<td>'.$langs->trans("RUM").'</td>' : '');
+	print ($sourcetype != 'salary' ? '<td>'.$langs->trans("RUM").'</td>' : '');
 	print '<td class="right">'.$langs->trans("AmountTTC").'</td>';
 	print '<td class="right">'.$langs->trans("DateRequest").'</td>';
 	// Action column
@@ -502,7 +502,7 @@ 
 		while ($i < $num && $i < $limit) {
 			$obj = $db->fetch_object($resql);
 			if ($sourcetype != 'salary') {
-				$bac = new CompanyBankAccount($db);	// Must include the new in loop so the fetch is clean
+				$bac = new CompanyBankAccount($db); // Must include the new in loop so the fetch is clean
 				$bac->fetch(0, $obj->socid);
 
 				$invoicestatic->id = $obj->rowid;

htdocs/compta/prelevement/demandes.php

Spacing +2 added lines, -2 removed lines

@@ -181,7 +181,7 @@ 
 	$sql .= MAIN_DB_PREFIX."prelevement_demande as pd";
 	$sql .= " WHERE s.rowid = pd.fk_salary";
 	$sql .= " AND u.rowid = s.fk_user";
-	$sql .=" AND s.paye = 0 AND pd.traite = 0";
+	$sql .= " AND s.paye = 0 AND pd.traite = 0";
 	if ($search_facture) {
 		$sql .= natural_search("s.rowid", $search_facture);
 	}
@@ -252,7 +252,7 @@ 
 
 print '<tr class="liste_titre">';
 print_liste_field_titre(($sourcetype ? "RefSalary" : "Bill"), $_SERVER["PHP_SELF"]);
-print_liste_field_titre(($sourcetype ? "Employee" :"Company"), $_SERVER["PHP_SELF"]);
+print_liste_field_titre(($sourcetype ? "Employee" : "Company"), $_SERVER["PHP_SELF"]);
 print_liste_field_titre("AmountRequested", $_SERVER["PHP_SELF"], "", "", $param, '', '', '', 'right ');
 print_liste_field_titre("DateRequest", $_SERVER["PHP_SELF"], "", "", $param, '', '', '', 'center ');
 print_liste_field_titre('');

htdocs/compta/prelevement/factures.php

Spacing +3 added lines, -3 removed lines

@@ -268,7 +268,7 @@ 
 	$i = 0;
 
 	if ($limit > 0 && $limit != $conf->liste_limit) {
-		$param.='&limit='.((int) $limit);
+		$param .= '&limit='.((int) $limit);
 	}
 	$param = "&id=".urlencode($id);
 
@@ -299,7 +299,7 @@ 
 		print_liste_field_titre("RefSupplierShort", $_SERVER["PHP_SELF"], "f.ref_supplier", '', $param, '', $sortfield, $sortorder);
 	}
 	print_liste_field_titre(($salaryBonPl ? "Employee" : "ThirdParty"), $_SERVER["PHP_SELF"], "s.nom", '', $param, '', $sortfield, $sortorder);
-	print_liste_field_titre(($salaryBonPl ? "AmountSalary": "AmountInvoice"), $_SERVER["PHP_SELF"], "f.total_ttc", "", $param, 'class="right"', $sortfield, $sortorder);
+	print_liste_field_titre(($salaryBonPl ? "AmountSalary" : "AmountInvoice"), $_SERVER["PHP_SELF"], "f.total_ttc", "", $param, 'class="right"', $sortfield, $sortorder);
 	print_liste_field_titre("AmountRequested", $_SERVER["PHP_SELF"], "pl.amount", "", $param, 'class="right"', $sortfield, $sortorder);
 	print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", $param, 'align="center"', $sortfield, $sortorder);
 	print_liste_field_titre('');
@@ -348,7 +348,7 @@ 
 		print "</td>\n";
 
 		// Amount of invoice
-		print '<td class="right"><span class="amount">'.price(($salaryBonPl ? $obj->amount :$obj->total_ttc))."</span></td>\n";
+		print '<td class="right"><span class="amount">'.price(($salaryBonPl ? $obj->amount : $obj->total_ttc))."</span></td>\n";
 
 		// Amount requested
 		print '<td class="right"><span class="amount">'.price($obj->amount_requested)."</span></td>\n";

htdocs/compta/prelevement/card.php

Spacing +3 added lines, -3 removed lines

@@ -433,7 +433,7 @@ 
 	 */
 	if ($salaryBonPl) {
 		$sql = "SELECT pl.rowid, pl.statut, pl.amount,pl.fk_user";
-		$sql .=" FROM llx_prelevement as p, llx_prelevement_lignes as pl, llx_salary as s";
+		$sql .= " FROM llx_prelevement as p, llx_prelevement_lignes as pl, llx_salary as s";
 		$sql .= " WHERE pl.rowid = p.fk_prelevement_lignes";
 		$sql .= " AND p.fk_salary = s.rowid";
 		$sql .= " AND pl.fk_prelevement_bons = ".((int) $id);
@@ -445,7 +445,7 @@ 
 		$sql .= ", ".MAIN_DB_PREFIX."societe as s";
 		$sql .= " WHERE pl.fk_prelevement_bons = ".((int) $id);
 		$sql .= " AND pl.fk_prelevement_bons = pb.rowid";
-		$sql .= " AND pb.entity = ".((int) $conf->entity);	// No sharing of entity here
+		$sql .= " AND pb.entity = ".((int) $conf->entity); // No sharing of entity here
 		$sql .= " AND pl.fk_soc = s.rowid";
 		if ($socid) {
 			$sql .= " AND s.rowid = ".((int) $socid);
@@ -525,7 +525,7 @@ 
 				$userSalary->fetch($obj->fk_user);
 			}
 			print '<td>';
-			print (!$salaryBonPl  ? $thirdparty->getNomUrl(1) : $userSalary->getNomUrl(1));
+			print (!$salaryBonPl ? $thirdparty->getNomUrl(1) : $userSalary->getNomUrl(1));
 			print "</td>\n";
 
 			print '<td class="right"><span class="amount">'.price($obj->amount)."</span></td>\n";

htdocs/compta/prelevement/class/bonprelevement.class.php

Spacing +30 added lines, -30 removed lines

@@ -97,8 +97,8 @@ 
 
 	const STATUS_DRAFT = 0;
 	const STATUS_TRANSFERED = 1;
-	const STATUS_CREDITED = 2;		// STATUS_CREDITED and STATUS_DEBITED is same. Difference is in ->type
-	const STATUS_DEBITED = 2;		// STATUS_CREDITED and STATUS_DEBITED is same. Difference is in ->type
+	const STATUS_CREDITED = 2; // STATUS_CREDITED and STATUS_DEBITED is same. Difference is in ->type
+	const STATUS_DEBITED = 2; // STATUS_CREDITED and STATUS_DEBITED is same. Difference is in ->type
 
 
 	/**
@@ -144,7 +144,7 @@ 
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
+	public $fields = array(
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>0,),
 		'ref' => array('type'=>'varchar(12)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>15, 'notnull'=>0, 'visible'=>-1, 'csslist'=>'tdoverflowmax150', 'showoncombobox'=>'1',),
 		'datec' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>25, 'notnull'=>0, 'visible'=>-1,),
@@ -340,7 +340,7 @@ 
 			$sql .= ", '".$this->db->escape($code_guichet)."'";
 			$sql .= ", '".$this->db->escape($number)."'";
 			$sql .= ", '".$this->db->escape($number_key)."'";
-			$sql .= (!empty($sourcetype) ? ", ". ((int) $client_id) : '');
+			$sql .= (!empty($sourcetype) ? ", ".((int) $client_id) : '');
 			$sql .= ")";
 			if ($this->db->query($sql)) {
 				$line_id = $this->db->last_insert_id(MAIN_DB_PREFIX."prelevement_lignes");
@@ -564,7 +564,7 @@ 
 						} else {
 							$modeforaddpayment = 'payment';
 							$labelforaddpayment = '(CustomerInvoicePayment)';
-							$addbankurl = 'direct-debit';	// = 'directdebit'
+							$addbankurl = 'direct-debit'; // = 'directdebit'
 						}
 
 						$result = $paiement->addPaymentToBank($user, $modeforaddpayment, $labelforaddpayment, $fk_bank_account, '', '', 0, '', $addbankurl);
@@ -824,7 +824,7 @@ 
 		// phpcs:enable
 		global $conf;
 
-		if ($forsalary == 1 ) {
+		if ($forsalary == 1) {
 			$sql = "SELECT count(s.rowid) as nb";
 			$sql .= " FROM ".MAIN_DB_PREFIX."salary as s";
 		} else {
@@ -1077,12 +1077,12 @@ 
 							} else {
 								$invoice_url = "<a href='".DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$fac[0]."'>".$fac[9]."</a>";
 							}
-							dol_syslog(__METHOD__ . " Check BAN Error on default bank number IBAN/BIC for thirdparty reported by verif() " . $fac->fk_soc . " " . $soc->name, LOG_WARNING);
-							$this->invoice_in_error[$fac[0]] = "Error on default bank number IBAN/BIC for invoice " . $invoice_url . " for thirdparty " . $soc->getNomUrl(0);
-							$this->thirdparty_in_error[$soc->id] = "Error on default bank number IBAN/BIC for invoice " . $invoice_url . " for thirdparty " . $soc->getNomUrl(0);
+							dol_syslog(__METHOD__." Check BAN Error on default bank number IBAN/BIC for thirdparty reported by verif() ".$fac->fk_soc." ".$soc->name, LOG_WARNING);
+							$this->invoice_in_error[$fac[0]] = "Error on default bank number IBAN/BIC for invoice ".$invoice_url." for thirdparty ".$soc->getNomUrl(0);
+							$this->thirdparty_in_error[$soc->id] = "Error on default bank number IBAN/BIC for invoice ".$invoice_url." for thirdparty ".$soc->getNomUrl(0);
 						}
 					} else {
-						dol_syslog(__METHOD__ . " Check BAN Failed to read company", LOG_WARNING);
+						dol_syslog(__METHOD__." Check BAN Failed to read company", LOG_WARNING);
 					}
 					/*
 					} else {
@@ -1135,7 +1135,7 @@ 
 				$ref = substr($year, -2).$month;
 
 				// Get next free nuber for the ref of bon
-				$sql = "SELECT substring(ref from char_length(ref) - 1)";	// To extract "YYMMXX" from "TYYMMXX"
+				$sql = "SELECT substring(ref from char_length(ref) - 1)"; // To extract "YYMMXX" from "TYYMMXX"
 				$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons";
 				$sql .= " WHERE ref LIKE '_".$this->db->escape($ref)."%'";
 				$sql .= " AND entity = ".((int) $conf->entity);
@@ -2145,7 +2145,7 @@ 
 			$XML_CREDITOR .= '					<EndToEndId>'.(($conf->global->PRELEVEMENT_END_TO_END != "") ? $conf->global->PRELEVEMENT_END_TO_END : ('CT-'.dol_trunc($row_idfac.'-'.$row_ref, 20, 'right', 'UTF-8', 1)).'-'.$Rowing).'</EndToEndId>'.$CrLf; // ISO20022 states that EndToEndId has a MaxLength of 35 characters
 			$XML_CREDITOR .= '				</PmtId>'.$CrLf;
 			if (!empty($this->sepa_xml_pti_in_ctti)) {
-				$XML_CREDITOR .= '				<PmtTpInf>' . $CrLf;
+				$XML_CREDITOR .= '				<PmtTpInf>'.$CrLf;
 
 				// Can be 'NORM' for normal or 'HIGH' for high priority level
 				if (!empty($conf->global->PAYMENTBYBANKTRANSFER_FORCE_HIGH_PRIORITY)) {
@@ -2153,14 +2153,14 @@ 
 				} else {
 					$instrprty = 'NORM';
 				}
-				$XML_CREDITOR .= '					<InstrPrty>'.$instrprty.'</InstrPrty>' . $CrLf;
-				$XML_CREDITOR .= '					<SvcLvl>' . $CrLf;
-				$XML_CREDITOR .= '						<Cd>SEPA</Cd>' . $CrLf;
-				$XML_CREDITOR .= '					</SvcLvl>' . $CrLf;
-				$XML_CREDITOR .= '					<CtgyPurp>' . $CrLf;
-				$XML_CREDITOR .= '						<Cd>CORE</Cd>' . $CrLf;
-				$XML_CREDITOR .= '					</CtgyPurp>' . $CrLf;
-				$XML_CREDITOR .= '				</PmtTpInf>' . $CrLf;
+				$XML_CREDITOR .= '					<InstrPrty>'.$instrprty.'</InstrPrty>'.$CrLf;
+				$XML_CREDITOR .= '					<SvcLvl>'.$CrLf;
+				$XML_CREDITOR .= '						<Cd>SEPA</Cd>'.$CrLf;
+				$XML_CREDITOR .= '					</SvcLvl>'.$CrLf;
+				$XML_CREDITOR .= '					<CtgyPurp>'.$CrLf;
+				$XML_CREDITOR .= '						<Cd>CORE</Cd>'.$CrLf;
+				$XML_CREDITOR .= '					</CtgyPurp>'.$CrLf;
+				$XML_CREDITOR .= '				</PmtTpInf>'.$CrLf;
 			}
 			$XML_CREDITOR .= '				<Amt>'.$CrLf;
 			$XML_CREDITOR .= '					<InstdAmt Ccy="EUR">'.round($row_somme, 2).'</InstdAmt>'.$CrLf;
@@ -2321,7 +2321,7 @@ 
 			$this->emetteur_iban = $account->iban;
 			$this->emetteur_bic = $account->bic;
 
-			$this->emetteur_ics = ($type == 'bank-transfer' ? $account->ics_transfer : $account->ics);  // Ex: PRELEVEMENT_ICS = "FR78ZZZ123456";
+			$this->emetteur_ics = ($type == 'bank-transfer' ? $account->ics_transfer : $account->ics); // Ex: PRELEVEMENT_ICS = "FR78ZZZ123456";
 
 			$this->raison_sociale = $account->proprio;
 		}
@@ -2412,15 +2412,15 @@ 
 				$XML_SEPA_INFO .= '			<NbOfTxs>'.$nombre.'</NbOfTxs>'.$CrLf;
 				$XML_SEPA_INFO .= '			<CtrlSum>'.$total.'</CtrlSum>'.$CrLf;
 				if (!empty($this->sepa_xml_pti_in_ctti) && !empty($format)) {	// @TODO Using $format (FRST ou RCUR) in a section for a Credit Transfer looks strange.
-					$XML_SEPA_INFO .= '			<PmtTpInf>' . $CrLf;
-					$XML_SEPA_INFO .= '				<SvcLvl>' . $CrLf;
-					$XML_SEPA_INFO .= '					<Cd>SEPA</Cd>' . $CrLf;
-					$XML_SEPA_INFO .= '				</SvcLvl>' . $CrLf;
-					$XML_SEPA_INFO .= '				<LclInstrm>' . $CrLf;
-					$XML_SEPA_INFO .= '					<Cd>CORE</Cd>' . $CrLf;
-					$XML_SEPA_INFO .= '				</LclInstrm>' . $CrLf;
-					$XML_SEPA_INFO .= '				<SeqTp>' . $format . '</SeqTp>' . $CrLf;
-					$XML_SEPA_INFO .= '			</PmtTpInf>' . $CrLf;
+					$XML_SEPA_INFO .= '			<PmtTpInf>'.$CrLf;
+					$XML_SEPA_INFO .= '				<SvcLvl>'.$CrLf;
+					$XML_SEPA_INFO .= '					<Cd>SEPA</Cd>'.$CrLf;
+					$XML_SEPA_INFO .= '				</SvcLvl>'.$CrLf;
+					$XML_SEPA_INFO .= '				<LclInstrm>'.$CrLf;
+					$XML_SEPA_INFO .= '					<Cd>CORE</Cd>'.$CrLf;
+					$XML_SEPA_INFO .= '				</LclInstrm>'.$CrLf;
+					$XML_SEPA_INFO .= '				<SeqTp>'.$format.'</SeqTp>'.$CrLf;
+					$XML_SEPA_INFO .= '			</PmtTpInf>'.$CrLf;
 				}
 				$XML_SEPA_INFO .= '			<ReqdExctnDt>'.dol_print_date($dateTime_ETAD, 'dayrfc').'</ReqdExctnDt>'.$CrLf;
 				$XML_SEPA_INFO .= '			<Dbtr>'.$CrLf;

htdocs/comm/action/list.php

Spacing +10 added lines, -10 removed lines

@@ -41,11 +41,11 @@ 
 $langs->loadLangs(array("users", "companies", "agenda", "commercial", "other", "orders", "bills"));
 
 // Get Parameters
-$action 	= GETPOST('action', 'aZ09');
+$action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
-$confirm 	= GETPOST('confirm', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
 $cancel     = GETPOST('cancel', 'alpha');
-$toselect 	= GETPOST('toselect', 'array');
+$toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'actioncommlist'; // To manage different context of search
 $optioncss 	= GETPOST('optioncss', 'alpha');
 
@@ -54,7 +54,7 @@ 
 
 $mode = GETPOST('mode', 'aZ09');
 if (empty($mode) && preg_match('/show_/', $action)) {
-	$mode = $action;	// For backward compatibility
+	$mode = $action; // For backward compatibility
 }
 $resourceid = GETPOST("search_resourceid", "int") ?GETPOST("search_resourceid", "int") : GETPOST("resourceid", "int");
 $pid = GETPOST("search_projectid", 'int', 3) ?GETPOST("search_projectid", 'int', 3) : GETPOST("projectid", 'int', 3);
@@ -405,7 +405,7 @@ 
 if (isModEnabled('category') && $user->hasRight('agenda', 'myactions', 'create')) {
 	$arrayofmassactions['preaffecttag'] = img_picto('', 'category', 'class="pictofixedwidth"').$langs->trans("AffectTag");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete','preaffecttag'))) {
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete', 'preaffecttag'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
@@ -701,7 +701,7 @@ 
 $newparam = '&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$tmpforcreatebutton['year'];
 
 //$param='month='.$monthshown.'&year='.$year;
-$hourminsec = dol_print_date(dol_mktime(10, 0, 0, 1, 1, 1970, 'gmt'), '%H', 'gmt').'0000';	// Set $hourminsec to '100000' to auto set hour to 10:00 at creation
+$hourminsec = dol_print_date(dol_mktime(10, 0, 0, 1, 1, 1970, 'gmt'), '%H', 'gmt').'0000'; // Set $hourminsec to '100000' to auto set hour to 10:00 at creation
 
 $url = DOL_URL_ROOT.'/comm/action/card.php?action=create';
 $url .= '&datep='.sprintf("%04d%02d%02d", $tmpforcreatebutton['year'], $tmpforcreatebutton['mon'], $tmpforcreatebutton['mday']).$hourminsec;
@@ -711,7 +711,7 @@ 
 
 $param .= '&mode='.$mode;
 
-print_barre_liste($langs->trans("Agenda"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num,  is_numeric($nbtotalofrecords) ? -1 * $nbtotalofrecords: $nbtotalofrecords, 'object_action', 0, $nav.$newcardbutton, '', $limit, 0, 0, 1, $viewmode);
+print_barre_liste($langs->trans("Agenda"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, is_numeric($nbtotalofrecords) ? -1 * $nbtotalofrecords : $nbtotalofrecords, 'object_action', 0, $nav.$newcardbutton, '', $limit, 0, 0, 1, $viewmode);
 
 print $s;
 
@@ -956,7 +956,7 @@ 
 	$event_owner_style = '';
 	// We decide to choose color of owner of event (event->userownerid is user id of owner, event->userassigned contains all users assigned to event)
 	if ($cache_user_list[$obj->fk_user_action]->color != '') {
-		$event_owner_style .= 'border-left: #' . $cache_user_list[$obj->fk_user_action]->color . ' 5px solid;';
+		$event_owner_style .= 'border-left: #'.$cache_user_list[$obj->fk_user_action]->color.' 5px solid;';
 	}
 
 	// get event style for start and end date
@@ -991,7 +991,7 @@ 
 	}
 	$event_start_date_css = $event_end_date_css = $event_more_class;
 
-	print '<tr class="oddeven' . ($event_more_class != '' ? ' '.$event_more_class : '') . '">';
+	print '<tr class="oddeven'.($event_more_class != '' ? ' '.$event_more_class : '').'">';
 	// Action column
 	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 		print '<td class="nowrap center">';
@@ -1080,7 +1080,7 @@ 
 		}
 		print '</span>';
 		$late = 0;
-		if ($actionstatic->hasDelay() && $actionstatic->percentage >= 0 && $actionstatic->percentage < 100 ) {
+		if ($actionstatic->hasDelay() && $actionstatic->percentage >= 0 && $actionstatic->percentage < 100) {
 			$late = 1;
 		}
 		if ($late) {

test/phpunit/ModulesTest.php

Spacing +36 added lines, -36 removed lines

@@ -24,7 +24,7 @@ 
  *		\remarks	To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -34,7 +34,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -63,11 +63,11 @@ 
 		parent::__construct($name);
 
 		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
+		global $conf, $user, $langs, $db;
+		$this->savconf = $conf;
+		$this->savuser = $user;
+		$this->savlangs = $langs;
+		$this->savdb = $db;
 
 		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
 		//print " - db ".$db->db;
@@ -81,8 +81,8 @@ 
 	 */
 	public static function setUpBeforeClass(): void
 	{
-		global $conf,$user,$langs,$db;
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+		global $conf, $user, $langs, $db;
+		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
 		print __METHOD__."\n";
 	}
@@ -94,7 +94,7 @@ 
 	 */
 	public static function tearDownAfterClass(): void
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$db->rollback();
 
 		print __METHOD__."\n";
@@ -107,11 +107,11 @@ 
 	 */
 	protected function setUp(): void
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		print __METHOD__."\n";
 	}
@@ -132,35 +132,35 @@ 
 	 */
 	public function testModulesInit()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$modulelist=array('Accounting','Adherent','Agenda','Api','Asset','Banque','Barcode','BlockedLog','Bom','Bookmark',
-		'Categorie','ClickToDial','Collab','Commande','Comptabilite','Contrat','Cron','DataPolicy','Dav','DebugBar','Deplacement','DocumentGeneration','Don','DynamicPrices',
-		'ECM','EmailCollector','EventOrganization','Expedition','ExpenseReport','Export','ExternalRss','ExternalSite',
-		'Facture','Fckeditor','Ficheinter','Fournisseur','FTP','GeoIPMaxmind','Gravatar','Holiday','HRM','Import','Incoterm','Intracommreport',
-		'KnowledgeManagement','Label','Ldap','Loan',
-		'Mailing','MailmanSpip','Margin','ModuleBuilder','Mrp','MultiCurrency',
-		'Notification','Oauth','OpenSurvey','Paybox','PaymentByBankTransfer','Paypal','Prelevement','Printing','Product','ProductBatch','Projet','Propale',
-		'ReceiptPrinter','Reception','Recruitment','Resource',
-		'Salaries','Service','SocialNetworks','Societe','Stock','Stripe','SupplierProposal','Syslog',
-		'TakePos','Tax','Ticket','User','Variants','WebServices','WebServicesClient','Website','Workflow','Workstation','Zapier');
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$modulelist = array('Accounting', 'Adherent', 'Agenda', 'Api', 'Asset', 'Banque', 'Barcode', 'BlockedLog', 'Bom', 'Bookmark',
+		'Categorie', 'ClickToDial', 'Collab', 'Commande', 'Comptabilite', 'Contrat', 'Cron', 'DataPolicy', 'Dav', 'DebugBar', 'Deplacement', 'DocumentGeneration', 'Don', 'DynamicPrices',
+		'ECM', 'EmailCollector', 'EventOrganization', 'Expedition', 'ExpenseReport', 'Export', 'ExternalRss', 'ExternalSite',
+		'Facture', 'Fckeditor', 'Ficheinter', 'Fournisseur', 'FTP', 'GeoIPMaxmind', 'Gravatar', 'Holiday', 'HRM', 'Import', 'Incoterm', 'Intracommreport',
+		'KnowledgeManagement', 'Label', 'Ldap', 'Loan',
+		'Mailing', 'MailmanSpip', 'Margin', 'ModuleBuilder', 'Mrp', 'MultiCurrency',
+		'Notification', 'Oauth', 'OpenSurvey', 'Paybox', 'PaymentByBankTransfer', 'Paypal', 'Prelevement', 'Printing', 'Product', 'ProductBatch', 'Projet', 'Propale',
+		'ReceiptPrinter', 'Reception', 'Recruitment', 'Resource',
+		'Salaries', 'Service', 'SocialNetworks', 'Societe', 'Stock', 'Stripe', 'SupplierProposal', 'Syslog',
+		'TakePos', 'Tax', 'Ticket', 'User', 'Variants', 'WebServices', 'WebServicesClient', 'Website', 'Workflow', 'Workstation', 'Zapier');
 		foreach ($modulelist as $modlabel) {
 			require_once DOL_DOCUMENT_ROOT.'/core/modules/mod'.$modlabel.'.class.php';
-			$class='mod'.$modlabel;
-			$mod=new $class($db);
+			$class = 'mod'.$modlabel;
+			$mod = new $class($db);
 
-			$result=$mod->remove();
-			$result=$mod->init();
+			$result = $mod->remove();
+			$result = $mod->init();
 
 			$this->assertLessThan($result, 0, $modlabel." ".$mod->error);
 			print __METHOD__." test remove/init for module ".$modlabel.", result=".$result."\n";
 
 			if (in_array($modlabel, array('Ldap', 'MailmanSpip'))) {
-				$result=$mod->remove();
+				$result = $mod->remove();
 			}
 		}