Dolibarr / dolibarr

htdocs/accountancy/journal/bankjournal.php

Spacing +18 added lines, -18 removed lines

@@ -121,7 +121,7 @@ 
 $date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);
 $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
 
-$pastmonth = null;  // Initialise for static analysis  (could be really unseg)
+$pastmonth = null; // Initialise for static analysis  (could be really unseg)
 $pastmonthyear = null;
 
 if (empty($date_startmonth)) {
@@ -171,7 +171,7 @@ 
 $sql .= " LEFT JOIN ".$db->prefix()."bank_url as bu4 ON bu4.fk_bank = b.rowid AND bu4.type='payment_supplier'";
 $sql .= " LEFT JOIN ".$db->prefix()."societe as soc on bu1.url_id=soc.rowid";
 if (getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
-	$sql .= " LEFT JOIN " . $db->prefix() . "societe_perentity as spe ON spe.fk_soc = soc.rowid AND spe.entity = " . ((int) $conf->entity);
+	$sql .= " LEFT JOIN ".$db->prefix()."societe_perentity as spe ON spe.fk_soc = soc.rowid AND spe.entity = ".((int) $conf->entity);
 }
 $sql .= " LEFT JOIN ".$db->prefix()."user as u on bu2.url_id=u.rowid";
 $sql .= " WHERE ba.fk_accountancy_journal=".((int) $id_journal);
@@ -385,7 +385,7 @@ 
 		// in case option FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS is on, payment could be for more than one third-partie
 		// so we have to find which part of the payment is affected to each third-parties
 		// (because in this case $obj-amount = the total of the paiement and not the paiement for each third-parties)
-		if (getDolGlobalString('FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS') && ($lineisapurchase == 1 || $lineisasale == 1) ) {
+		if (getDolGlobalString('FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS') && ($lineisapurchase == 1 || $lineisasale == 1)) {
 			if ($lineisapurchase == 1) {
 				$sqlamount = "SELECT SUM(pf.amount) as amount";
 				$sqlamount .= " FROM ".MAIN_DB_PREFIX."paiementfounr_facturefourn AS pf";
@@ -478,7 +478,7 @@ 
 						// we will pass here n times for each payment line
 						// so we have to add $amoutouse only if the line $links[$key] correspond to the payment line we are in used ( socid correspondinf at the payment line $links)
 						// if FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS is off we add $amounttouse
-						if (!getDolGlobalString('FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS') || $obj->socid == $links[$key]['url_id']){
+						if (!getDolGlobalString('FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS') || $obj->socid == $links[$key]['url_id']) {
 							if (empty($tabtp[$obj->rowid][$compta_soc])) {
 								$tabtp[$obj->rowid][$compta_soc] = $amounttouse;
 							} else {
@@ -753,7 +753,7 @@ 
 				if ($mt) {
 					if (empty($conf->cache['accountingaccountincurrententity'][$k])) {
 						$accountingaccount = new AccountingAccount($db);
-						$accountingaccount->fetch(0, $k, true);	// $k is accounting account of the bank.
+						$accountingaccount->fetch(0, $k, true); // $k is accounting account of the bank.
 						$conf->cache['accountingaccountincurrententity'][$k] = $accountingaccount;
 					} else {
 						$accountingaccount = $conf->cache['accountingaccountincurrententity'][$k];
@@ -874,43 +874,43 @@ 
 						} elseif (in_array($tabtype[$key], array('sc', 'payment_sc'))) {   // If payment is payment of social contribution
 							$bookkeeping->subledger_account = '';
 							$bookkeeping->subledger_label = '';
-							$accountingaccount->fetch(0, $k, true);	// TODO Use a cache
+							$accountingaccount->fetch(0, $k, true); // TODO Use a cache
 							$bookkeeping->numero_compte = $k;
 							$bookkeeping->label_compte = $accountingaccount->label;
 						} elseif ($tabtype[$key] == 'payment_vat') {
 							$bookkeeping->subledger_account = '';
 							$bookkeeping->subledger_label = '';
-							$accountingaccount->fetch(0, $k, true);		// TODO Use a cache
+							$accountingaccount->fetch(0, $k, true); // TODO Use a cache
 							$bookkeeping->numero_compte = $k;
 							$bookkeeping->label_compte = $accountingaccount->label;
 						} elseif ($tabtype[$key] == 'payment_donation') {
 							$bookkeeping->subledger_account = '';
 							$bookkeeping->subledger_label = '';
-							$accountingaccount->fetch(0, $k, true);		// TODO Use a cache
+							$accountingaccount->fetch(0, $k, true); // TODO Use a cache
 							$bookkeeping->numero_compte = $k;
 							$bookkeeping->label_compte = $accountingaccount->label;
 						} elseif ($tabtype[$key] == 'member') {
 							$bookkeeping->subledger_account = '';
 							$bookkeeping->subledger_label = '';
-							$accountingaccount->fetch(0, $k, true);		// TODO Use a cache
+							$accountingaccount->fetch(0, $k, true); // TODO Use a cache
 							$bookkeeping->numero_compte = $k;
 							$bookkeeping->label_compte = $accountingaccount->label;
 						} elseif ($tabtype[$key] == 'payment_loan') {
 							$bookkeeping->subledger_account = '';
 							$bookkeeping->subledger_label = '';
-							$accountingaccount->fetch(0, $k, true);		// TODO Use a cache
+							$accountingaccount->fetch(0, $k, true); // TODO Use a cache
 							$bookkeeping->numero_compte = $k;
 							$bookkeeping->label_compte = $accountingaccount->label;
 						} elseif ($tabtype[$key] == 'payment_various') {
 							$bookkeeping->subledger_account = $k;
 							$bookkeeping->subledger_label = $tabcompany[$key]['name'];
-							$accountingaccount->fetch(0, $tabpay[$key]["account_various"], true);	// TODO Use a cache
+							$accountingaccount->fetch(0, $tabpay[$key]["account_various"], true); // TODO Use a cache
 							$bookkeeping->numero_compte = $tabpay[$key]["account_various"];
 							$bookkeeping->label_compte = $accountingaccount->label;
 						} elseif ($tabtype[$key] == 'banktransfert') {
 							$bookkeeping->subledger_account = '';
 							$bookkeeping->subledger_label = '';
-							$accountingaccount->fetch(0, $k, true);		// TODO Use a cache
+							$accountingaccount->fetch(0, $k, true); // TODO Use a cache
 							$bookkeeping->numero_compte = $k;
 							$bookkeeping->label_compte = $accountingaccount->label;
 						} else {
@@ -941,7 +941,7 @@ 
 							}
 						} else {
 							if ($lettering && getDolGlobalInt('ACCOUNTING_ENABLE_LETTERING') && getDolGlobalInt('ACCOUNTING_ENABLE_AUTOLETTERING')) {
-								require_once DOL_DOCUMENT_ROOT . '/accountancy/class/lettering.class.php';
+								require_once DOL_DOCUMENT_ROOT.'/accountancy/class/lettering.class.php';
 								$lettering_static = new Lettering($db);
 								$nb_lettering = $lettering_static->bookkeepingLetteringAll(array($bookkeeping->id));
 							}
@@ -1202,7 +1202,7 @@ 
 		1 => $langs->trans("TransfertAllBankLines"),
 		2 => $langs->trans("TransfertOnlyConciliatedBankLine")
 	);
-	$moreoptions = [ "BankLineConciliated" => $form->selectarray('only_rappro', $listofchoices, $only_rappro, 0, 0, 0, '', 0, 0, 0, '', 'minwidth75 valignmiddle')];
+	$moreoptions = ["BankLineConciliated" => $form->selectarray('only_rappro', $listofchoices, $only_rappro, 0, 0, 0, '', 0, 0, 0, '', 'minwidth75 valignmiddle')];
 
 	journalHead($nom, '', $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''), '', $varlink, $moreoptions);
 
@@ -1362,7 +1362,7 @@ 
 
 				// Label operation
 				print '<td class="maxwidth300 nopaddingtopimp nopaddingbottomimp">';
-				print $reflabel;	// This is already html escaped content
+				print $reflabel; // This is already html escaped content
 				print "</td>";
 
 				print '<td class="center">'.$val["type_payment"]."</td>";
@@ -1456,7 +1456,7 @@ 
 						}
 					}
 					print '<td class="maxwidth300" title="'.dol_escape_htmltag(dol_string_nohtmltag($accounttoshow)).'">';
-					print $accounttoshow;	// This is a HTML string
+					print $accounttoshow; // This is a HTML string
 					print "</td>";
 
 					// Subledger account
@@ -1484,12 +1484,12 @@ 
 						}
 					}
 					print '<td class="maxwidth300 nopaddingtopimp nopaddingbottomimp" title="'.dolPrintHTMLForAttribute(dol_string_nohtmltag($accounttoshowsubledger)).'">';
-					print $accounttoshowsubledger;	// This is a html string
+					print $accounttoshowsubledger; // This is a html string
 					print "</td>";
 
 					// Label operation
 					print '<td class="nopaddingtopimpo paddingbottomimp">';
-					print $reflabel;		// This is a html string
+					print $reflabel; // This is a html string
 					print "</td>";
 
 					print '<td class="center">'.$val["type_payment"]."</td>";

Braces +3 added lines, -1 removed lines

@@ -404,7 +404,9 @@
 			$resultamount = $db->query($sqlamount);
 			if ($resultamount) {
 				$objamount = $db->fetch_object($resultamount);
-				if (!empty($objamount->amount)) $amounttouse = $objamount->amount;
+				if (!empty($objamount->amount)) {
+					$amounttouse = $objamount->amount;
+				}
 			}
 		}
 

htdocs/printing/admin/printing.php

Spacing +1 added lines, -1 removed lines

@@ -160,7 +160,7 @@
 		}
 		require_once $classfile;
 		$classname = 'printing_'.$driver;
-		$printer = new $classname($db);		// Example: new printing_printgcp(). This run the construct that load the token. TODO Move this into another load function().
+		$printer = new $classname($db); // Example: new printing_printgcp(). This run the construct that load the token. TODO Move this into another load function().
 
 		$i = 0;
 		$submit_enabled = 0;

htdocs/includes/OAuth/Common/Storage/DoliStorage.php

Spacing +4 added lines, -4 removed lines

@@ -65,7 +65,7 @@ 
 	public $date_creation;
 	public $date_modification;
 
-	public $userid;		// ID of user for user specific OAuth entries
+	public $userid; // ID of user for user specific OAuth entries
 
 
 	/**
@@ -132,7 +132,7 @@ 
 		$sql .= " WHERE service = '".$this->db->escape($servicepluskeyforprovider)."'";
 		$sql .= " AND entity IN (".getEntity('oauth_token').")";
 		$resql = $this->db->query($sql);
-		if (! $resql) {
+		if (!$resql) {
 			dol_print_error($this->db);
 		}
 		$obj = $this->db->fetch_array($resql);
@@ -186,7 +186,7 @@ 
 		$sql .= " AND entity IN (".getEntity('oauth_token').")";
 
 		$resql = $this->db->query($sql);
-		if (! $resql) {
+		if (!$resql) {
 			dol_print_error($this->db);
 		}
 		$result = $this->db->fetch_array($resql);
@@ -304,7 +304,7 @@ 
 		$sql .= " WHERE service = '".$this->db->escape($servicepluskeyforprovider)."'";
 		$sql .= " AND entity IN (".getEntity('oauth_token').")";
 		$resql = $this->db->query($sql);
-		if (! $resql) {
+		if (!$resql) {
 			dol_print_error($this->db);
 		}
 		$obj = $this->db->fetch_array($resql);